eliminate __USER_LABEL_PREFIX__ from the Targets.cpp file, start moving

integer size #defines over to the Preprocessor.

llvm-svn: 57130

1 files changed, 2 insertions, 16 deletions

diff --git a/clang/lib/Basic/Targets.cpp b/clang/lib/Basic/Targets.cpp
index 4d3c6b36027..7aad3e86545 100644
--- a/clang/lib/Basic/Targets.cpp
+++ b/clang/lib/Basic/Targets.cpp
@@ -129,14 +129,9 @@ static void getPowerPCDefines(std::vector<char> &Defs, bool is64Bit) {
     Define(Defs, "__UINTMAX_TYPE__", "long long unsigned int");
   }
   Define(Defs, "__INT_MAX__", "2147483647");
-  Define(Defs, "__LONG_LONG_MAX__", "9223372036854775807LL");
-  Define(Defs, "__CHAR_BIT__", "8");
-  Define(Defs, "__SCHAR_MAX__", "127");
-  Define(Defs, "__SHRT_MAX__", "32767");
   Define(Defs, "__SIZE_TYPE__", "long unsigned int");
   
   // Subtarget options.
-  Define(Defs, "__USER_LABEL_PREFIX__", "_");
   Define(Defs, "__NATURAL_ALIGNMENT__");
   Define(Defs, "__REGISTER_PREFIX__", "");
 
@@ -229,11 +224,7 @@ static void getX86Defines(std::vector<char> &Defs, bool is64Bit) {
     Define(Defs, "__UINTMAX_TYPE__", "long long unsigned int");
   }
   Define(Defs, "__SIZE_TYPE__", "long unsigned int");
-  Define(Defs, "__CHAR_BIT__", "8");
   Define(Defs, "__INT_MAX__", "2147483647");
-  Define(Defs, "__LONG_LONG_MAX__", "9223372036854775807LL");
-  Define(Defs, "__SCHAR_MAX__", "127");
-  Define(Defs, "__SHRT_MAX__", "32767");
   
   // Subtarget options.
   Define(Defs, "__nocona");
@@ -313,11 +304,7 @@ static void getARMDefines(std::vector<char> &Defs) {
   Define(Defs, "__UINTMAX_TYPE__", "long long unsigned int");
   Define(Defs, "__SIZE_TYPE__", "long unsigned int");
   
-  Define(Defs, "__CHAR_BIT__", "8");
   Define(Defs, "__INT_MAX__", "2147483647");
-  Define(Defs, "__LONG_LONG_MAX__", "9223372036854775807LL");
-  Define(Defs, "__SCHAR_MAX__", "127");
-  Define(Defs, "__SHRT_MAX__", "32767");
   
   // Subtarget options.  [hard coded to v6 for now]
   Define(Defs, "__ARM_ARCH_6K__");
@@ -719,11 +706,11 @@ namespace {
 class LinuxX86_32TargetInfo : public X86_32TargetInfo {
 public:
   LinuxX86_32TargetInfo(const std::string& triple) : X86_32TargetInfo(triple) {
+    UserLabelPrefix = "";
   }
   virtual void getTargetDefines(std::vector<char> &Defines) const {
     X86_32TargetInfo::getTargetDefines(Defines);
     getLinuxDefines(Defines);
-    Define(Defines, "__USER_LABEL_PREFIX__", "");
   }
 };
 } // end anonymous namespace
@@ -750,7 +737,6 @@ public:
     Define(Defines, "WINNT");
     Define(Defines, "_X86_");
     Define(Defines, "__MSVCRT__");
-    Define(Defines, "__USER_LABEL_PREFIX__", "_");
   }
 };
 } // end anonymous namespace
@@ -786,11 +772,11 @@ namespace {
 class LinuxX86_64TargetInfo : public X86_64TargetInfo {
 public:
   LinuxX86_64TargetInfo(const std::string& triple) : X86_64TargetInfo(triple) {
+    UserLabelPrefix = "";
   }
   virtual void getTargetDefines(std::vector<char> &Defines) const {
     X86_64TargetInfo::getTargetDefines(Defines);
     getLinuxDefines(Defines);
-    Define(Defines, "__USER_LABEL_PREFIX__", "");
   }
 };
 } // end anonymous namespace