diff options
author | Robert Lytton <robert@xmos.com> | 2014-03-10 12:06:29 +0000 |
---|---|---|
committer | Robert Lytton <robert@xmos.com> | 2014-03-10 12:06:29 +0000 |
commit | 2c942c64fb521357ed98c380823e79833a121d18 (patch) | |
tree | dac568d06598d043dfe810be644c51d63e2460c5 /clang/lib | |
parent | 81a20787db26abec2fdb4664c1d0cf0bdfd27b31 (diff) | |
download | bcm5719-llvm-2c942c64fb521357ed98c380823e79833a121d18.tar.gz bcm5719-llvm-2c942c64fb521357ed98c380823e79833a121d18.zip |
Make __LITTLE_ENDIAN__/__BIG_ENDOAN__ common PredefinedMacros
llvm-svn: 203455
Diffstat (limited to 'clang/lib')
-rw-r--r-- | clang/lib/Basic/Targets.cpp | 12 | ||||
-rw-r--r-- | clang/lib/Frontend/InitPreprocessor.cpp | 8 |
2 files changed, 5 insertions, 15 deletions
diff --git a/clang/lib/Basic/Targets.cpp b/clang/lib/Basic/Targets.cpp index 42bb60d708e..7a6f92ba57f 100644 --- a/clang/lib/Basic/Targets.cpp +++ b/clang/lib/Basic/Targets.cpp @@ -939,12 +939,10 @@ void PPCTargetInfo::getTargetDefines(const LangOptions &Opts, // Target properties. if (getTriple().getArch() == llvm::Triple::ppc64le) { Builder.defineMacro("_LITTLE_ENDIAN"); - Builder.defineMacro("__LITTLE_ENDIAN__"); } else { if (getTriple().getOS() != llvm::Triple::NetBSD && getTriple().getOS() != llvm::Triple::OpenBSD) Builder.defineMacro("_BIG_ENDIAN"); - Builder.defineMacro("__BIG_ENDIAN__"); } // Subtarget options. @@ -2678,7 +2676,6 @@ void X86TargetInfo::getTargetDefines(const LangOptions &Opts, } // Target properties. - Builder.defineMacro("__LITTLE_ENDIAN__"); Builder.defineMacro("__REGISTER_PREFIX__", ""); // Define __NO_MATH_INLINES on linux/x86 so that we don't get inline @@ -3447,13 +3444,6 @@ public: if (BigEndian) Builder.defineMacro("__AARCH_BIG_ENDIAN"); - if (getTriple().getOS() == llvm::Triple::NetBSD) { - if (BigEndian) - Builder.defineMacro("__BIG_ENDIAN__"); - else - Builder.defineMacro("__LITTLE_ENDIAN__"); - } - if (FPU == NeonMode) { Builder.defineMacro("__ARM_NEON"); // 64-bit NEON supports half, single and double precision operations. @@ -4029,7 +4019,6 @@ public: // Target properties. Builder.defineMacro("__ARMEL__"); - Builder.defineMacro("__LITTLE_ENDIAN__"); Builder.defineMacro("__REGISTER_PREFIX__", ""); StringRef CPUArch = getCPUDefineSuffix(CPU); @@ -5448,7 +5437,6 @@ public: } virtual void getTargetDefines(const LangOptions &Opts, MacroBuilder &Builder) const { - Builder.defineMacro("__LITTLE_ENDIAN__"); getArchDefines(Opts, Builder); } virtual bool hasFeature(StringRef Feature) const { diff --git a/clang/lib/Frontend/InitPreprocessor.cpp b/clang/lib/Frontend/InitPreprocessor.cpp index ca51297bb28..a5b02673555 100644 --- a/clang/lib/Frontend/InitPreprocessor.cpp +++ b/clang/lib/Frontend/InitPreprocessor.cpp @@ -541,11 +541,13 @@ static void InitializePredefinedMacros(const TargetInfo &TI, Builder.defineMacro("__ORDER_LITTLE_ENDIAN__", "1234"); Builder.defineMacro("__ORDER_BIG_ENDIAN__", "4321"); Builder.defineMacro("__ORDER_PDP_ENDIAN__", "3412"); - if (TI.isBigEndian()) + if (TI.isBigEndian()) { Builder.defineMacro("__BYTE_ORDER__", "__ORDER_BIG_ENDIAN__"); - else + Builder.defineMacro("__BIG_ENDIAN__"); + } else { Builder.defineMacro("__BYTE_ORDER__", "__ORDER_LITTLE_ENDIAN__"); - + Builder.defineMacro("__LITTLE_ENDIAN__"); + } if (TI.getPointerWidth(0) == 64 && TI.getLongWidth() == 64 && TI.getIntWidth() == 32) { |