[llvm-commits] [llvm-gcc-4.2] r46702 - /llvm-gcc-4.2/branches/release_22/gcc/config/arm/arm.c

[Tanya Lattner]

Author: tbrethou
Date: Mon Feb  4 00:48:51 2008
New Revision: 46702

URL: http://llvm.org/viewvc/llvm-project?rev=46702&view=rev
Log:
Merge from mainline.
Eliminate a compilation warning.

Modified:
    llvm-gcc-4.2/branches/release_22/gcc/config/arm/arm.c

Modified: llvm-gcc-4.2/branches/release_22/gcc/config/arm/arm.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/release_22/gcc/config/arm/arm.c?rev=46702&r1=46701&r2=46702&view=diff

==============================================================================
--- llvm-gcc-4.2/branches/release_22/gcc/config/arm/arm.c (original)
+++ llvm-gcc-4.2/branches/release_22/gcc/config/arm/arm.c Mon Feb  4 00:48:51 2008
@@ -15233,11 +15233,14 @@
 	     (inter-module thumbness is fixed up by the linker).  */
 	  rtx tem = gen_rtx_SYMBOL_REF (Pmode, function_name);
 
-	  if (TARGET_MACHO
-	      && ! machopic_data_defined_p (function_rtx))
+#if TARGET_MACHO
+          if (! machopic_data_defined_p (function_rtx))
 	    tem = gen_rtx_PLUS (GET_MODE (tem), tem, GEN_INT (-8));
 	  else
 	    tem = gen_rtx_PLUS (GET_MODE (tem), tem, GEN_INT (-7));
+#else
+          tem = gen_rtx_PLUS (GET_MODE (tem), tem, GEN_INT (-7));
+#endif
 	  /* APPLE LOCAL end ARM 4745175 */
 
 	  tem = gen_rtx_MINUS (GET_MODE (tem),