[llvm-branch-commits] [llvm-gcc-branch] r100888 - in /llvm-gcc-4.2/branches/release_27/gcc: c-config-lang.in config.gcc

[Tanya Lattner]

Author: tbrethou
Date: Fri Apr  9 15:23:42 2010
New Revision: 100888

URL: http://llvm.org/viewvc/llvm-project?rev=100888&view=rev
Log:
Merge 100823 from mainline to fix PR6778.

Modified:
    llvm-gcc-4.2/branches/release_27/gcc/c-config-lang.in
    llvm-gcc-4.2/branches/release_27/gcc/config.gcc

Modified: llvm-gcc-4.2/branches/release_27/gcc/c-config-lang.in
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/release_27/gcc/c-config-lang.in?rev=100888&r1=100887&r2=100888&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/release_27/gcc/c-config-lang.in (original)
+++ llvm-gcc-4.2/branches/release_27/gcc/c-config-lang.in Fri Apr  9 15:23:42 2010
@@ -24,3 +24,10 @@
 # which therefore need to be scanned by gengtype.c.
 
 gtfiles="\$(srcdir)/c-lang.c \$(srcdir)/c-tree.h \$(srcdir)/c-decl.c \$(srcdir)/c-common.c \$(srcdir)/c-common.h \$(srcdir)/c-pragma.c \$(srcdir)/c-objc-common.c \$(srcdir)/c-parser.c"
+
+# LLVM LOCAL begin 7210265
+case "$target" in
+*-*-darwin*)
+  gtfiles="${gtfiles} \$(srcdir)/config/darwin-c.c"
+esac
+#LLVM LOCAL end 7210265

Modified: llvm-gcc-4.2/branches/release_27/gcc/config.gcc
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/release_27/gcc/config.gcc?rev=100888&r1=100887&r2=100888&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/release_27/gcc/config.gcc (original)
+++ llvm-gcc-4.2/branches/release_27/gcc/config.gcc Fri Apr  9 15:23:42 2010
@@ -430,8 +430,7 @@
   tm_p_file="${tm_p_file} darwin-protos.h"
   # APPLE LOCAL 5681645
   tmake_file="t-darwin ${cpu_type}/t-darwin"
-  # LLVM LOCAL put va_opt in GC memory 7210265
-  target_gtfiles="\$(srcdir)/config/darwin.c \$(srcdir)/config/darwin-c.c"
+  target_gtfiles="\$(srcdir)/config/darwin.c"
   extra_options="${extra_options} darwin.opt"
   c_target_objs="darwin-c.o"
   cxx_target_objs="darwin-c.o"