[llvm-commits] [llvm-gcc-4.2] r66457 - in /llvm-gcc-4.2/branches/Apple/Dib/gcc: config/arm/arm.h llvm-backend.cpp
Bill Wendling
isanbard at gmail.com
Mon Mar 9 13:54:41 PDT 2009
Author: void
Date: Mon Mar 9 15:54:41 2009
New Revision: 66457
URL: http://llvm.org/viewvc/llvm-project?rev=66457&view=rev
Log:
--- Merging (from foreign repository) r66436 into '.':
U gcc/llvm-backend.cpp
Enhance error message to help debugging.
--- Merging (from foreign repository) r66438 into '.':
U gcc/config/arm/arm.h
Encode arm arch version in thumb triplets as well.
Modified:
llvm-gcc-4.2/branches/Apple/Dib/gcc/config/arm/arm.h
llvm-gcc-4.2/branches/Apple/Dib/gcc/llvm-backend.cpp
Modified: llvm-gcc-4.2/branches/Apple/Dib/gcc/config/arm/arm.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Dib/gcc/config/arm/arm.h?rev=66457&r1=66456&r2=66457&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Dib/gcc/config/arm/arm.h (original)
+++ llvm-gcc-4.2/branches/Apple/Dib/gcc/config/arm/arm.h Mon Mar 9 15:54:41 2009
@@ -2949,8 +2949,22 @@
} \
}
-#define LLVM_OVERRIDE_TARGET_ARCH() \
- (TARGET_THUMB ? "thumb" : "")
+/* Encode arm / thumb modes and arm subversion number in the triplet. e.g.
+ * armv6-apple-darwin, thumbv5-apple-darwin. FIXME: Replace thumb triplets
+ * with function notes.
+ */
+#define LLVM_OVERRIDE_TARGET_ARCH() \
+ (TARGET_THUMB \
+ ? (arm_arch6 \
+ ? "thumbv6" : (arm_arch5e \
+ ? "thumbv5e" : (arm_arch5 \
+ ? "thumbv5" : (arm_arch4t \
+ ? "thumbv4t" : "")))) \
+ : (arm_arch6 \
+ ? "armv6" : (arm_arch5e \
+ ? "armv5e" : (arm_arch5 \
+ ? "armv5" : (arm_arch4t \
+ ? "armv4t" : "")))))
#define LLVM_SET_MACHINE_OPTIONS(argvec) \
if (TARGET_SOFT_FLOAT) \
Modified: llvm-gcc-4.2/branches/Apple/Dib/gcc/llvm-backend.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Dib/gcc/llvm-backend.cpp?rev=66457&r1=66456&r2=66457&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Dib/gcc/llvm-backend.cpp (original)
+++ llvm-gcc-4.2/branches/Apple/Dib/gcc/llvm-backend.cpp Mon Mar 9 15:54:41 2009
@@ -222,7 +222,7 @@
const TargetMachineRegistry::entry *TME =
TargetMachineRegistry::getClosestStaticTargetForModule(*TheModule, Err);
if (!TME) {
- cerr << "Did not get a target machine!\n";
+ cerr << "Did not get a target machine! Triplet is " << TargetTriple << '\n';
exit(1);
}
More information about the llvm-commits
mailing list