[llvm-commits] [llvm-gcc-4.0] r44155 - in /llvm-gcc-4.0/trunk/gcc/config/rs6000: linux.h rs6000.c

[Nick Lewycky]

Author: nicholas
Date: Wed Nov 14 20:41:26 2007
New Revision: 44155

URL: http://llvm.org/viewvc/llvm-project?rev=44155&view=rev
Log:
Fix build errors on PowerPC Linux.

Modified:
    llvm-gcc-4.0/trunk/gcc/config/rs6000/linux.h
    llvm-gcc-4.0/trunk/gcc/config/rs6000/rs6000.c

Modified: llvm-gcc-4.0/trunk/gcc/config/rs6000/linux.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.0/trunk/gcc/config/rs6000/linux.h?rev=44155&r1=44154&r2=44155&view=diff

==============================================================================
--- llvm-gcc-4.0/trunk/gcc/config/rs6000/linux.h (original)
+++ llvm-gcc-4.0/trunk/gcc/config/rs6000/linux.h Wed Nov 14 20:41:26 2007
@@ -110,3 +110,13 @@
 #define TARGET_HAS_F_SETLKW
 
 #define MD_UNWIND_SUPPORT "config/rs6000/linux-unwind.h"
+
+#undef ADJUST_FIELD_ALIGN
+#define ADJUST_FIELD_ALIGN(FIELD, COMPUTED, FIRST_FIELD_P)	\
+  (TARGET_ALIGN_NATURAL ? (COMPUTED) :				\
+   (((COMPUTED) == RS6000_VECTOR_ALIGNMENT)			\
+    ? RS6000_VECTOR_ALIGNMENT					\
+    : (MIN ((COMPUTED), 					\
+    	    (TARGET_ALIGN_MAC68K ? 16 				\
+    	    			 : ((FIRST_FIELD_P) ? (COMPUTED) \
+    	    			 		    : 32))))))

Modified: llvm-gcc-4.0/trunk/gcc/config/rs6000/rs6000.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.0/trunk/gcc/config/rs6000/rs6000.c?rev=44155&r1=44154&r2=44155&view=diff

==============================================================================
--- llvm-gcc-4.0/trunk/gcc/config/rs6000/rs6000.c (original)
+++ llvm-gcc-4.0/trunk/gcc/config/rs6000/rs6000.c Wed Nov 14 20:41:26 2007
@@ -16202,8 +16202,6 @@
 	  /* If we're saving vector or FP regs via a function call,
 	     then don't bother with this ObjC R12 optimization.
 	     This test also eliminates world_save.  */
-	  && (info->first_altivec_reg_save > LAST_ALTIVEC_REGNO
-	      || VECTOR_SAVE_INLINE (info->first_altivec_reg_save))
 	  && (info->first_fp_reg_save == 64 
 	      || FP_SAVE_INLINE (info->first_fp_reg_save)))
 	{
@@ -16531,10 +16529,7 @@
 	     while scheduling insns after global_alloc!  */
 	  && (optimize == 0 || !flag_schedule_insns_after_reload)
 #endif
-	  /* If this is the last CALL in the prolog, then we've got our PC.
-	     If we're saving AltiVec regs via a function, we're not last.  */
-	  && (info->first_altivec_reg_save > LAST_ALTIVEC_REGNO 
-	      || VECTOR_SAVE_INLINE (info->first_altivec_reg_save)))
+	  )
 	gen_following_label =
 #if TARGET_MACHO
                               lr_already_set_up_for_pic =
@@ -17879,7 +17874,6 @@
 #if TARGET_MACHO
   if (MACHOPIC_INDIRECT)
     funexp = machopic_indirect_call_target (funexp);
-#endif
 
   /* APPLE LOCAL begin 4299630 */
   if (DEFAULT_ABI == ABI_DARWIN
@@ -17894,6 +17888,7 @@
 	is_longcall_p = (TARGET_LONG_BRANCH);
     }
   if (!is_longcall_p)
+#endif
     {
       /* gen_sibcall expects reload to convert scratch pseudo to LR so we must
 	 generate sibcall RTL explicitly to avoid constraint abort.  */
@@ -17909,6 +17904,7 @@
 				     gen_rtx_RETURN (VOIDmode))));
       SIBLING_CALL_P (insn) = 1;
     }
+#if TARGET_MACHO
   else
     {
       /* APPLE LOCAL begin 4380289 */
@@ -17936,6 +17932,7 @@
 					   XEXP (DECL_RTL (function), 0)));
       /* APPLE LOCAL end 4380289 */
     }
+#endif
   /* APPLE LOCAL end 4299630 */
   emit_barrier ();
 
@@ -20088,11 +20085,11 @@
   fatal_insn ("bad address", op);
 }
 
-#if TARGET_MACHO
-
 /* APPLE LOCAL mlongcall long names 4271187 */
 static GTY (()) tree branch_island_list = 0;
 
+#if TARGET_MACHO
+
 /* APPLE LOCAL begin 4380289 */
 /* Remember to generate a branch island for far calls to the given
    function.  Force the creation of a Mach-O stub.  */