diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2013-10-25 03:29:42 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2013-10-25 03:29:42 +0000 |
| commit | be3cf5f3e449ea54785ab49d9f01543b710a5125 (patch) | |
| tree | 189914e1db13a4c077c9d5fc21d1e51c358231cf /include/llvm/MC | |
| parent | 81e3828be14cf5b35329c0a2372acf998980f271 (diff) | |
| download | external_llvm-be3cf5f3e449ea54785ab49d9f01543b710a5125.zip external_llvm-be3cf5f3e449ea54785ab49d9f01543b710a5125.tar.gz external_llvm-be3cf5f3e449ea54785ab49d9f01543b710a5125.tar.bz2 | |
Fix ODR violation.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@193391 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/llvm/MC')
| -rw-r--r-- | include/llvm/MC/MCELFSymbolFlags.h | 2 | ||||
| -rw-r--r-- | include/llvm/MC/MCMachOSymbolFlags.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/llvm/MC/MCELFSymbolFlags.h b/include/llvm/MC/MCELFSymbolFlags.h index 2225ea0..d0e1dac 100644 --- a/include/llvm/MC/MCELFSymbolFlags.h +++ b/include/llvm/MC/MCELFSymbolFlags.h @@ -27,7 +27,7 @@ namespace llvm { ELF_Other_Shift = 10 // Shift value for other flags. }; - enum SymbolFlags { + enum ELFSymbolFlags { ELF_STB_Local = (ELF::STB_LOCAL << ELF_STB_Shift), ELF_STB_Global = (ELF::STB_GLOBAL << ELF_STB_Shift), ELF_STB_Weak = (ELF::STB_WEAK << ELF_STB_Shift), diff --git a/include/llvm/MC/MCMachOSymbolFlags.h b/include/llvm/MC/MCMachOSymbolFlags.h index 696436d..71f01fa 100644 --- a/include/llvm/MC/MCMachOSymbolFlags.h +++ b/include/llvm/MC/MCMachOSymbolFlags.h @@ -19,9 +19,9 @@ // the correct relocation information. namespace llvm { - /// SymbolFlags - We store the value for the 'desc' symbol field in the lowest - /// 16 bits of the implementation defined flags. - enum SymbolFlags { // See <mach-o/nlist.h>. + /// MachOSymbolFlags - We store the value for the 'desc' symbol field in the + /// lowest 16 bits of the implementation defined flags. + enum MachOSymbolFlags { // See <mach-o/nlist.h>. SF_DescFlagsMask = 0xFFFF, // Reference type flags. |