[llvm-commits] [llvm-gcc-4.2] r100823 - in /llvm-gcc-4.2/trunk/gcc: c-config-lang.in config.gcc

[Dale Johannesen]

Author: johannes
Date: Thu Apr  8 18:02:40 2010
New Revision: 100823

URL: http://llvm.org/viewvc/llvm-project?rev=100823&view=rev
Log:
Fix build of non-C-based languages on Darwin.  PR 6778.


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

Modified: llvm-gcc-4.2/trunk/gcc/c-config-lang.in
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/c-config-lang.in?rev=100823&r1=100822&r2=100823&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/c-config-lang.in (original)
+++ llvm-gcc-4.2/trunk/gcc/c-config-lang.in Thu Apr  8 18:02:40 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/trunk/gcc/config.gcc
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config.gcc?rev=100823&r1=100822&r2=100823&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config.gcc (original)
+++ llvm-gcc-4.2/trunk/gcc/config.gcc Thu Apr  8 18:02:40 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"