Merge from mainline.
Eliminate a compilation warning.
llvm-svn: 46702
diff --git a/llvm-gcc-4.2/gcc/config/arm/arm.c b/llvm-gcc-4.2/gcc/config/arm/arm.c
index 293d5e8..52083d1 100644
--- a/llvm-gcc-4.2/gcc/config/arm/arm.c
+++ b/llvm-gcc-4.2/gcc/config/arm/arm.c
@@ -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),
