[llvm-commits] [llvm-gcc-4.2] r129154 - in /llvm-gcc-4.2/trunk/gcc: common.opt config/arm/arm.h config/arm/arm.opt llvm-backend.cpp

[Evan Cheng]

Author: evancheng
Date: Fri Apr  8 16:38:05 2011
New Revision: 129154

URL: http://llvm.org/viewvc/llvm-project?rev=129154&view=rev
Log:
Rename -mtrap_function= to -ftrap_function= since it's now a target neutral options.

Modified:
    llvm-gcc-4.2/trunk/gcc/common.opt
    llvm-gcc-4.2/trunk/gcc/config/arm/arm.h
    llvm-gcc-4.2/trunk/gcc/config/arm/arm.opt
    llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp

Modified: llvm-gcc-4.2/trunk/gcc/common.opt
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/common.opt?rev=129154&r1=129153&r2=129154&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/common.opt (original)
+++ llvm-gcc-4.2/trunk/gcc/common.opt Fri Apr  8 16:38:05 2011
@@ -1113,6 +1113,12 @@
 Trap for signed overflow in addition, subtraction and multiplication
 ; APPLE LOCAL end optimization pragmas 3124235/3420242
 
+; APPLE LOCAL begin 9249183
+ftrap-function=
+Target RejectNegative Joined Var(flag_trap_funcname_string)
+Emit a call to the specified 'trap' function rather than a trap instruction
+; APPLE LOCAL end 9249183
+
 ; APPLE LOCAL begin optimization pragmas 3124235/3420242
 ftree-ccp
 Common Report Var(flag_tree_ccp) PerFunc

Modified: llvm-gcc-4.2/trunk/gcc/config/arm/arm.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/arm/arm.h?rev=129154&r1=129153&r2=129154&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/arm/arm.h (original)
+++ llvm-gcc-4.2/trunk/gcc/config/arm/arm.h Fri Apr  8 16:38:05 2011
@@ -3570,13 +3570,7 @@
   if (flag_mkernel || flag_apple_kext) {               \
     argvec.push_back("-arm-long-calls");               \
     argvec.push_back("-arm-strict-align");             \
-  }                                                    \
-  if (arm_trap_funcname_string) {                      \
-    char *arg = (char*)alloca(strlen(arm_trap_funcname_string) + 16); \
-    sprintf(arg, "-arm-trap-func=%s", arm_trap_funcname_string); \
-    argvec.push_back(arg);                             \
   }
-    
 
 /* Doing struct copy by partial-word loads and stores is not a good idea on ARM. */
 #define TARGET_LLVM_MIN_BYTES_COPY_BY_MEMCPY 4

Modified: llvm-gcc-4.2/trunk/gcc/config/arm/arm.opt
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/arm/arm.opt?rev=129154&r1=129153&r2=129154&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/arm/arm.opt (original)
+++ llvm-gcc-4.2/trunk/gcc/config/arm/arm.opt Fri Apr  8 16:38:05 2011
@@ -185,9 +185,3 @@
 Target Report Mask(NEON_VECTORIZE_QUAD)
 Use Neon quad-word (rather than double-word) registers for vectorization
 ; APPLE LOCAL end v7 support. Merge from Codesourcery
-
-; APPLE LOCAL begin 9249183
-mtrap-function=
-Target RejectNegative Joined Var(arm_trap_funcname_string)
-Emit a call to the specified 'trap' function rather than a trap instruction
-; APPLE LOCAL end 9249183

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=129154&r1=129153&r2=129154&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp Fri Apr  8 16:38:05 2011
@@ -465,6 +465,12 @@
     ArgStrings.push_back(Arg);
   }
 
+  if (flag_trap_funcname_string) {
+    std::string Arg("-trap-func=");
+    Arg += flag_trap_funcname_string;
+    ArgStrings.push_back(Arg);
+  }
+
   for (unsigned i = 0, e = ArgStrings.size(); i != e; ++i)
     Args.push_back(ArgStrings[i].c_str());