[llvm-commits] [llvm-gcc-4.2] r107629 - in /llvm-gcc-4.2/trunk/gcc: Makefile.in llvm-backend.cpp

[Eric Christopher]

Author: echristo
Date: Mon Jul  5 18:23:33 2010
New Revision: 107629

URL: http://llvm.org/viewvc/llvm-project?rev=107629&view=rev
Log:
Use the normalized target, not the one we were configured with for
the TargetTriple.

Modified:
    llvm-gcc-4.2/trunk/gcc/Makefile.in
    llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp

Modified: llvm-gcc-4.2/trunk/gcc/Makefile.in
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/Makefile.in?rev=107629&r1=107628&r2=107629&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/Makefile.in (original)
+++ llvm-gcc-4.2/trunk/gcc/Makefile.in Mon Jul  5 18:23:33 2010
@@ -965,6 +965,7 @@
 ALL_CXXFLAGS = $(filter-out -Wstrict-prototypes -Wmissing-prototypes \
                             -Wold-style-definition -Wno-overlength-strings, $(ALL_CFLAGS)) -Wno-unused
 ALL_CXXFLAGS += -DTARGET_NAME=\"$(target_noncanonical)\"
+ALL_CXXFLAGS += -DTARGET_CANONICAL_NAME=\"$(target)\"
 ALL_CXXFLAGS += -frandom-seed=0
 
 # Turn off LLVM assertions in a non-checking build.

Modified: llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp?rev=107629&r1=107628&r2=107629&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp Mon Jul  5 18:23:33 2010
@@ -478,7 +478,7 @@
   // If the target wants to override the architecture, e.g. turning
   // powerpc-darwin-... into powerpc64-darwin-... when -m64 is enabled, do so
   // now.
-  std::string TargetTriple = TARGET_NAME;
+  std::string TargetTriple = TARGET_CANONICAL_NAME;
 #ifdef LLVM_OVERRIDE_TARGET_ARCH
   std::string Arch = LLVM_OVERRIDE_TARGET_ARCH();
   if (!Arch.empty()) {