summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Smith <richard-llvm@metafoo.co.uk>2013-10-25 03:29:42 +0000
committerRichard Smith <richard-llvm@metafoo.co.uk>2013-10-25 03:29:42 +0000
commita2d566fa98c9d6b118da9d9dd4e116178d43d202 (patch)
treee257a6f64a36974429bae18adca7a5be3538c5b2
parent03678157b5694dc45b3585f3f7802d7aa1ee07ff (diff)
downloadbcm5719-llvm-a2d566fa98c9d6b118da9d9dd4e116178d43d202.tar.gz
bcm5719-llvm-a2d566fa98c9d6b118da9d9dd4e116178d43d202.zip
Fix ODR violation.
llvm-svn: 193391
-rw-r--r--llvm/include/llvm/MC/MCELFSymbolFlags.h2
-rw-r--r--llvm/include/llvm/MC/MCMachOSymbolFlags.h6
2 files changed, 4 insertions, 4 deletions
diff --git a/llvm/include/llvm/MC/MCELFSymbolFlags.h b/llvm/include/llvm/MC/MCELFSymbolFlags.h
index 2225ea07868..d0e1dace99d 100644
--- a/llvm/include/llvm/MC/MCELFSymbolFlags.h
+++ b/llvm/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/llvm/include/llvm/MC/MCMachOSymbolFlags.h b/llvm/include/llvm/MC/MCMachOSymbolFlags.h
index 696436dffa6..71f01fab206 100644
--- a/llvm/include/llvm/MC/MCMachOSymbolFlags.h
+++ b/llvm/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.
OpenPOWER on IntegriCloud