[llvm-commits] [llvm-gcc-4.2] r81455 - in /llvm-gcc-4.2/trunk/gcc: config.gcc config/darwin-c.c config/t-darwin

[Dale Johannesen]

Author: johannes
Date: Thu Sep 10 13:28:53 2009
New Revision: 81455

URL: http://llvm.org/viewvc/llvm-project?rev=81455&view=rev
Log:
Move va_opt in darwin-c.c into GC memory.  The
varray code was allocating this in GC memory but
the mechanism wasn't being told about it, so GC
could reuse the memory causing a crash.  7210265.

Users with local darwin llvm-gcc builds may have
to rerun configure.


Modified:
    llvm-gcc-4.2/trunk/gcc/config.gcc
    llvm-gcc-4.2/trunk/gcc/config/darwin-c.c
    llvm-gcc-4.2/trunk/gcc/config/t-darwin

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=81455&r1=81454&r2=81455&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config.gcc (original)
+++ llvm-gcc-4.2/trunk/gcc/config.gcc Thu Sep 10 13:28:53 2009
@@ -430,7 +430,7 @@
   tm_p_file="${tm_p_file} darwin-protos.h"
   # APPLE LOCAL 5681645
   tmake_file="t-darwin ${cpu_type}/t-darwin"
-  target_gtfiles="\$(srcdir)/config/darwin.c"
+  target_gtfiles="\$(srcdir)/config/darwin.c \$(srcdir)/config/darwin-c.c"
   extra_options="${extra_options} darwin.opt"
   c_target_objs="darwin-c.o"
   cxx_target_objs="darwin-c.o"

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

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/darwin-c.c (original)
+++ llvm-gcc-4.2/trunk/gcc/config/darwin-c.c Thu Sep 10 13:28:53 2009
@@ -412,7 +412,7 @@
 /* APPLE LOCAL end pragma reverse_bitfields */
 
 /* APPLE LOCAL begin optimization pragmas 3124235/3420242 */
-varray_type va_opt;
+static GTY(()) varray_type va_opt;
 
 static void
 push_opt_level (int level, int size)
@@ -1245,3 +1245,4 @@
   return decl;
 }
 /* APPLE LOCAL end radar 2996215 - 6068877 */
+#include "gt-darwin-c.h"

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

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/t-darwin (original)
+++ llvm-gcc-4.2/trunk/gcc/config/t-darwin Thu Sep 10 13:28:53 2009
@@ -16,10 +16,11 @@
 
 darwin-c.o: $(srcdir)/config/darwin-c.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
   $(TM_H) $(CPPLIB_H) $(TREE_H) c-pragma.h $(C_TREE_H) toplev.h $(TM_P_H) \
-  c-incpath.h flags.h $(C_COMMON_H)
+  c-incpath.h flags.h $(C_COMMON_H) gt-darwin-c.h
 	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $(srcdir)/config/darwin-c.c $(PREPROCESSOR_DEFINES)
 
 gt-darwin.h : s-gtype ; @true
+gt-darwin-c.h : s-gtype ; @true
 
 # APPLE LOCAL begin mainline 2007-06-14 5235474
 darwin-driver.o: $(srcdir)/config/darwin-driver.c \