[llvm-commits] [llvm-gcc-4.2] r64114 - in /llvm-gcc-4.2/trunk/gcc: builtins.def c-typeck.c config.gcc config/darwin.c config/i386/i386.c config/i386/predicates.md config/rs6000/rs6000.h config/rs6000/t-darwin gcc.c gimplify.c objc/objc-act.c tree-eh.c

Bill Wendling isanbard at gmail.com
Sun Feb 8 20:08:05 PST 2009


Author: void
Date: Sun Feb  8 22:08:04 2009
New Revision: 64114

URL: http://llvm.org/viewvc/llvm-project?rev=64114&view=rev
Log:
Fix LLVM local tags. And other whitespace issues.

Modified:
    llvm-gcc-4.2/trunk/gcc/builtins.def
    llvm-gcc-4.2/trunk/gcc/c-typeck.c
    llvm-gcc-4.2/trunk/gcc/config.gcc
    llvm-gcc-4.2/trunk/gcc/config/darwin.c
    llvm-gcc-4.2/trunk/gcc/config/i386/i386.c
    llvm-gcc-4.2/trunk/gcc/config/i386/predicates.md
    llvm-gcc-4.2/trunk/gcc/config/rs6000/rs6000.h
    llvm-gcc-4.2/trunk/gcc/config/rs6000/t-darwin
    llvm-gcc-4.2/trunk/gcc/gcc.c
    llvm-gcc-4.2/trunk/gcc/gimplify.c
    llvm-gcc-4.2/trunk/gcc/objc/objc-act.c
    llvm-gcc-4.2/trunk/gcc/tree-eh.c

Modified: llvm-gcc-4.2/trunk/gcc/builtins.def
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/builtins.def?rev=64114&r1=64113&r2=64114&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/builtins.def (original)
+++ llvm-gcc-4.2/trunk/gcc/builtins.def Sun Feb  8 22:08:04 2009
@@ -691,9 +691,9 @@
 DEF_EXT_LIB_BUILTIN    (BUILT_IN__EXIT, "_exit", BT_FN_VOID_INT, ATTR_NORETURN_NOTHROW_LIST)
 DEF_C99_BUILTIN        (BUILT_IN__EXIT2, "_Exit", BT_FN_VOID_INT, ATTR_NORETURN_NOTHROW_LIST)
 
-/* APPLE LOCAL begin LLVM */
+/* LLVM LOCAL begin */
 DEF_GCC_BUILTIN        (BUILT_IN_ANNOTATION, "annotation", BT_FN_UINT_UINT_CONST_STRING, ATTR_NULL)
-/* APPLE LOCAL end LLVM */
+/* LLVM LOCAL end */
 
 /* Implementing nested functions.  */
 DEF_BUILTIN_STUB (BUILT_IN_INIT_TRAMPOLINE, "__builtin_init_trampoline")

Modified: llvm-gcc-4.2/trunk/gcc/c-typeck.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/c-typeck.c?rev=64114&r1=64113&r2=64114&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/c-typeck.c (original)
+++ llvm-gcc-4.2/trunk/gcc/c-typeck.c Sun Feb  8 22:08:04 2009
@@ -2081,13 +2081,13 @@
       if (TREE_CODE (type) != ARRAY_TYPE && !objc_is_object_ptr (type))
       /* APPLE LOCAL end radar 6164211 */
 	type = TYPE_MAIN_VARIANT (type);
-      
       /* LLVM LOCAL begin propagate objc_volatilized: rdar://6551276 */
+#ifdef ENABLE_LLVM
       if (lookup_attribute ("objc_volatilized", 
                             TYPE_ATTRIBUTES (TREE_TYPE (TREE_TYPE (array)))))
         type = objc_build_volatilized_type(type);
+#endif
       /* LLVM LOCAL end propagate objc_volatilized: rdar://6551276 */
-      
       rval = build4 (ARRAY_REF, type, array, index, NULL_TREE, NULL_TREE);
       /* Array ref is const/volatile if the array elements are
 	 or if the array is.  */
@@ -2104,7 +2104,6 @@
 	       in an inline function.
 	       Hope it doesn't break something else.  */
 	    | TREE_THIS_VOLATILE (array));
-
       return require_complete_type (fold (rval));
     }
   else
@@ -2143,7 +2142,6 @@
       }
 #endif
       /* LLVM LOCAL end */
-      
       return build_indirect_ref (build_binary_op (PLUS_EXPR, ar, index, 0),
 				 "array indexing");
     }

Modified: llvm-gcc-4.2/trunk/gcc/config.gcc
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config.gcc?rev=64114&r1=64113&r2=64114&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config.gcc (original)
+++ llvm-gcc-4.2/trunk/gcc/config.gcc Sun Feb  8 22:08:04 2009
@@ -280,22 +280,22 @@
 # LLVM LOCAL begin
 	out_cxx_file=i386/llvm-i386.cpp
 # LLVM LOCAL end                               
- 	# APPLE LOCAL begin 5612787 mainline sse4
-  	extra_headers="mmintrin.h mm3dnow.h xmmintrin.h emmintrin.h
- 		       pmmintrin.h tmmintrin.h ammintrin.h smmintrin.h
- 		       nmmintrin.h"
- 	# APPLE LOCAL end 5612787 mainline sse4
+	# APPLE LOCAL begin 5612787 mainline sse4
+	extra_headers="mmintrin.h mm3dnow.h xmmintrin.h emmintrin.h
+		       pmmintrin.h tmmintrin.h ammintrin.h smmintrin.h
+		       nmmintrin.h"
+	# APPLE LOCAL end 5612787 mainline sse4
 	;;
 x86_64-*-*)
 	cpu_type=i386
 # LLVM LOCAL begin
 	out_cxx_file=i386/llvm-i386.cpp
 # LLVM LOCAL end                               
- 	# APPLE LOCAL begin 5612787 mainline sse4
-  	extra_headers="mmintrin.h mm3dnow.h xmmintrin.h emmintrin.h
- 		       pmmintrin.h tmmintrin.h ammintrin.h smmintrin.h
- 		       nmmintrin.h"
- 	# APPLE LOCAL end 5612787 mainline sse4
+	# APPLE LOCAL begin 5612787 mainline sse4
+	extra_headers="mmintrin.h mm3dnow.h xmmintrin.h emmintrin.h
+		       pmmintrin.h tmmintrin.h ammintrin.h smmintrin.h
+		       nmmintrin.h"
+	# APPLE LOCAL end 5612787 mainline sse4
 	need_64bit_hwint=yes
 	;;
 # APPLE LOCAL end mainline

Modified: llvm-gcc-4.2/trunk/gcc/config/darwin.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/darwin.c?rev=64114&r1=64113&r2=64114&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/darwin.c (original)
+++ llvm-gcc-4.2/trunk/gcc/config/darwin.c Sun Feb  8 22:08:04 2009
@@ -299,12 +299,14 @@
   name = XSTR (sym_ref, 0);
 
   lprefix = (((name[0] == '*' || name[0] == '&')
+	      /* APPLE LOCAL begin fix-and-continue 6227434 */
               && (name[1] == 'L'
 		  || (name[1] == '"' && name[2] == 'L')
 		  /* Don't indirect writable strings.  */
 		  || (name[1] == 'l' && name[2] == 'C')))
              || (strncmp (name, "_OBJC_", 6) == 0)
 	     || objc_anonymous_local_objc_name (name));
+	      /* APPLE LOCAL end fix-and-continue 6227434 */
 
   return ! lprefix;
 }

Modified: llvm-gcc-4.2/trunk/gcc/config/i386/i386.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/i386/i386.c?rev=64114&r1=64113&r2=64114&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/i386/i386.c (original)
+++ llvm-gcc-4.2/trunk/gcc/config/i386/i386.c Sun Feb  8 22:08:04 2009
@@ -2438,7 +2438,7 @@
   flag_trapping_math = 0;
   /* APPLE LOCAL end pragma fenv */
 
-  /* APPLE LOCAL begin LLVM */
+  /* LLVM LOCAL begin */
   /* Enable -fno-math-errno by default, even on systems whose libm functions set
      errno.  This is a deviation from what mainline GCC does, but it is a) good
      for performance, b) controllable with -fmath-errno, and c) the default
@@ -2446,7 +2446,7 @@
      depend on errno and can use -fmath-errno when they want it.  Because errno
      is not set on all targets anyway, their code is inherently non-portable. */
   if (TARGET_MACHO || 1)
-  /* APPLE LOCAL end LLVM */
+  /* LLVM LOCAL end */
   
     /* The Darwin libraries never set errno, so we might as well
        avoid calling them when that's the only reason we would.  */

Modified: llvm-gcc-4.2/trunk/gcc/config/i386/predicates.md
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/i386/predicates.md?rev=64114&r1=64113&r2=64114&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/i386/predicates.md (original)
+++ llvm-gcc-4.2/trunk/gcc/config/i386/predicates.md Sun Feb  8 22:08:04 2009
@@ -470,7 +470,7 @@
 /* LLVM LOCAL begin non-Darwin hack. */
 #ifdef TARGET_FIX_AND_CONTINUE
       if (!indirect_data (op)
-          || machopic_data_defined_p (op))
+	  || machopic_data_defined_p (op))  
 #endif
 /* LLVM LOCAL end non-Darwin hack */
       return 1;

Modified: llvm-gcc-4.2/trunk/gcc/config/rs6000/rs6000.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/rs6000/rs6000.h?rev=64114&r1=64113&r2=64114&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/rs6000/rs6000.h (original)
+++ llvm-gcc-4.2/trunk/gcc/config/rs6000/rs6000.h Sun Feb  8 22:08:04 2009
@@ -1216,7 +1216,6 @@
    arguments.  */
 #define FRAME_GROWS_DOWNWARD (flag_stack_protect != 0)
 
-
 /* Size of the outgoing register save area */
 #define RS6000_REG_SAVE ((DEFAULT_ABI == ABI_AIX			\
 			  || DEFAULT_ABI == ABI_DARWIN)			\

Modified: llvm-gcc-4.2/trunk/gcc/config/rs6000/t-darwin
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/rs6000/t-darwin?rev=64114&r1=64113&r2=64114&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/rs6000/t-darwin (original)
+++ llvm-gcc-4.2/trunk/gcc/config/rs6000/t-darwin Sun Feb  8 22:08:04 2009
@@ -25,9 +25,9 @@
 TARGET_LIBGCC2_STATIC_CFLAGS = -mmacosx-version-min=10.4
 # APPLE LOCAL end gcov 5573505
 
-# APPLE LOCAL 5901604
+# APPLE LOCAL 5901604 6499452
 # LLVM LOCAL begin
-#MULTILIB_EXTRA_OPTS = isysroot/Developer/SDKs/MacOSX10.5.sdk
+#MULTILIB_EXTRA_OPTS = isysroot/Developer/SDKs/MacOSX10.5.sdk mmacosx-version-min=10.5
 # LLVM LOCAL end
 
 # Export the _xlq* symbols from darwin-ldouble.c.

Modified: llvm-gcc-4.2/trunk/gcc/gcc.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/gcc.c?rev=64114&r1=64113&r2=64114&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/gcc.c (original)
+++ llvm-gcc-4.2/trunk/gcc/gcc.c Sun Feb  8 22:08:04 2009
@@ -727,6 +727,7 @@
     %{!nostdlib:%{!nodefaultlibs:%(link_ssp) %(link_gcc_c_sequence)}}\
     %{!A:%{!nostdlib:%{!nostartfiles:%E}}} %{T*} }}}}}}"
 #endif
+/* LLVM LOCAL end add use-gold-plugin, remove emit-llvm */
 /* APPLE LOCAL end add fcreate-profile */
 
 #ifndef LINK_LIBGCC_SPEC
@@ -1645,9 +1646,10 @@
   INIT_STATIC_SPEC ("multilib_options",		&multilib_options),
   INIT_STATIC_SPEC ("linker",			&linker_name_spec),
   INIT_STATIC_SPEC ("link_libgcc",		&link_libgcc_spec),
-  /* LLVM LOCAL */
+  /* LLVM LOCAL begin */
   INIT_STATIC_SPEC ("gold_plugin_file",		&gold_plugin_file_spec),
   INIT_STATIC_SPEC ("llvm_options",		&llvm_options),
+  /* LLVM LOCAL end */
   INIT_STATIC_SPEC ("md_exec_prefix",		&md_exec_prefix),
   INIT_STATIC_SPEC ("md_startfile_prefix",	&md_startfile_prefix),
   INIT_STATIC_SPEC ("md_startfile_prefix_1",	&md_startfile_prefix_1),

Modified: llvm-gcc-4.2/trunk/gcc/gimplify.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/gimplify.c?rev=64114&r1=64113&r2=64114&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/gimplify.c (original)
+++ llvm-gcc-4.2/trunk/gcc/gimplify.c Sun Feb  8 22:08:04 2009
@@ -3096,7 +3096,11 @@
 		gimple_add_tmp_var (new);
 		TREE_STATIC (new) = 1;
 		TREE_READONLY (new) = 1;
+                /* LLVM LOCAL begin */
+#ifdef ENABLE_LLVM
 		DECL_LLVM_PRIVATE (new) = 1;
+#endif
+                /* LLVM LOCAL end */
 		DECL_INITIAL (new) = ctor;
 		if (align > DECL_ALIGN (new))
 		  {
@@ -5154,10 +5158,12 @@
   decl = built_in_decls[base + index + 1];
   itype = TREE_TYPE (TREE_TYPE (decl));
 
+  /* LLVM LOCAL begin */
 #ifdef ENABLE_LLVM
-  /* LLVM LOCAL fix me. Add target specific check. */
+  /* FIXME: Add target specific check. */
   return GS_UNHANDLED;
 #endif
+  /* LLVM LOCAL end */
   if (optab[TYPE_MODE (itype)] == CODE_FOR_nothing)
     return GS_UNHANDLED;
 
@@ -5234,10 +5240,12 @@
   type = TYPE_MAIN_VARIANT (TREE_TYPE (TREE_TYPE (addr)));
   itype = TREE_TYPE (TREE_TYPE (cmpxchg));
 
+  /* LLVM LOCAL begin */
 #ifdef ENABLE_LLVM
-  /* LLVM LOCAL fix me. Add target specific check. */
+  /* FIXME: Add target specific check. */
   return GS_UNHANDLED;
 #endif
+  /* LLVM LOCAL end */
   if (sync_compare_and_swap[TYPE_MODE (itype)] == CODE_FOR_nothing)
     return GS_UNHANDLED;
 

Modified: llvm-gcc-4.2/trunk/gcc/objc/objc-act.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/objc/objc-act.c?rev=64114&r1=64113&r2=64114&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/objc/objc-act.c (original)
+++ llvm-gcc-4.2/trunk/gcc/objc/objc-act.c Sun Feb  8 22:08:04 2009
@@ -3452,8 +3452,12 @@
 /* Build a type differing from TYPE only in that TYPE_VOLATILE is set.
    Unlike tree.c:build_qualified_type(), preserve TYPE_LANG_SPECIFIC in the
    process.  */
-/* LLVM LOCAL rdar 6551276 */
+/* LLVM LOCAL begin rdar 6551276 */
+#ifndef ENABLE_LLVM
+static
+#endif
 tree
+/* LLVM LOCAL end rdar 6551276 */
 objc_build_volatilized_type (tree type)
 {
   tree t;
@@ -14152,11 +14156,11 @@
   set_user_assembler_name (decl, proto_name);
   /* APPLE LOCAL end radar 6255913 */
   PROTOCOL_V2_FORWARD_DECL (p) = decl;
-  /* APPLE LOCAL begin - LLVM radar 5476262 */
+  /* LLVM LOCAL begin - radar 5476262 */
 #ifdef ENABLE_LLVM
   pushdecl_top_level(decl);
 #endif
-  /* APPLE LOCAL end - LLVM radar 5476262 */
+  /* LLVM LOCAL end - radar 5476262 */
 }
 /* APPLE LOCAL end radar 4695109 */
 

Modified: llvm-gcc-4.2/trunk/gcc/tree-eh.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/tree-eh.c?rev=64114&r1=64113&r2=64114&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/tree-eh.c (original)
+++ llvm-gcc-4.2/trunk/gcc/tree-eh.c Sun Feb  8 22:08:04 2009
@@ -838,22 +838,25 @@
       tree save_eptr, save_filt;
 
       save_eptr = create_tmp_var (ptr_type_node, "save_eptr");
+      /* LLVM LOCAL begin */
 #if ENABLE_LLVM
       /* LLVM exceptions use 64 bits for these on 64-bit targets. */
       save_filt = create_tmp_var (long_integer_type_node, "save_filt");
 #else
       save_filt = create_tmp_var (integer_type_node, "save_filt");
 #endif
+      /* LLVM LOCAL end */
       i = tsi_start (finally);
       x = build0 (EXC_PTR_EXPR, ptr_type_node);
       x = build2 (MODIFY_EXPR, void_type_node, save_eptr, x);
       tsi_link_before (&i, x, TSI_CONTINUE_LINKING);
-
+      /* LLVM LOCAL begin */
 #if ENABLE_LLVM
       x = build0 (FILTER_EXPR, long_integer_type_node);
 #else
       x = build0 (FILTER_EXPR, integer_type_node);
 #endif
+      /* LLVM LOCAL end */
       x = build2 (MODIFY_EXPR, void_type_node, save_filt, x);
       tsi_link_before (&i, x, TSI_CONTINUE_LINKING);
 
@@ -862,11 +865,13 @@
       x = build2 (MODIFY_EXPR, void_type_node, x, save_eptr);
       tsi_link_after (&i, x, TSI_CONTINUE_LINKING);
 
+      /* LLVM LOCAL begin */
 #if ENABLE_LLVM
       x = build0 (FILTER_EXPR, long_integer_type_node);
 #else
       x = build0 (FILTER_EXPR, integer_type_node);
 #endif
+      /* LLVM LOCAL end */
       x = build2 (MODIFY_EXPR, void_type_node, x, save_filt);
       tsi_link_after (&i, x, TSI_CONTINUE_LINKING);
 
@@ -1328,13 +1333,13 @@
 {
   int f_estimate, sw_estimate;
 
-  /* LLVM local begin - let LLVM make this decision.  */
+  /* LLVM LOCAL begin - let LLVM make this decision.  */
 #ifdef ENABLE_LLVM
   if (1)
 #else
   if (!optimize)
 #endif
-  /* LLVM local end */
+  /* LLVM LOCAL end */
     return false;
 
   /* Finally estimate N times, plus N gotos.  */





More information about the llvm-commits mailing list