diff options
| author | Derek Schuff <dschuff@chromium.org> | 2012-07-09 10:52:46 -0700 |
|---|---|---|
| committer | Derek Schuff <dschuff@chromium.org> | 2012-07-09 11:00:37 -0700 |
| commit | 5dbcc7e0c9c12f4a4042fb4a226654aee927999c (patch) | |
| tree | b316a3370e9286cb4e6f81b2f9d8bd8b54ce5123 /include/llvm/MC/MCELFObjectWriter.h | |
| parent | 86dc97be9ac3b4804528e087b04b4f4192cdee54 (diff) | |
LOCALMODs from hg 0b098ca44de7 against r158408 (hg 90a87d6bfe45)
(only non-new files; new files in git 4f429c8b)
Change-Id: Ia39f818088485bd90e4d048db404f8d6ba5f836b
Diffstat (limited to 'include/llvm/MC/MCELFObjectWriter.h')
| -rw-r--r-- | include/llvm/MC/MCELFObjectWriter.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/llvm/MC/MCELFObjectWriter.h b/include/llvm/MC/MCELFObjectWriter.h index f153cb0c1a..5718feca88 100644 --- a/include/llvm/MC/MCELFObjectWriter.h +++ b/include/llvm/MC/MCELFObjectWriter.h @@ -67,6 +67,12 @@ public: return ELF::ELFOSABI_FREEBSD; case Triple::Linux: return ELF::ELFOSABI_LINUX; + // @LOCALMOD-BEGIN + // This shouldn't be needed anymore (sel_ldr doesn't check for it), + // but removing it may require some changes in binutils also. + case Triple::NativeClient: + return ELF::ELFOSABI_NACL; + // @LOCALMOD-END default: return ELF::ELFOSABI_NONE; } |