[llvm-commits] [llvm-gcc-4.2] r46858 - in /llvm-gcc-4.2/trunk/gcc: config/darwin.h gcc.c

[Devang Patel]

Author: dpatel
Date: Thu Feb  7 13:20:51 2008
New Revision: 46858

URL: http://llvm.org/viewvc/llvm-project?rev=46858&view=rev
Log:
Do not supply --emit-llvm to darwin linker.

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

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

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config/darwin.h (original)
+++ llvm-gcc-4.2/trunk/gcc/config/darwin.h Thu Feb  7 13:20:51 2008
@@ -134,6 +134,7 @@
   { "-dylib_file", "-Zdylib_file" }, \
   { "-dynamic", "-Zdynamic" },  \
   { "-dynamiclib", "-Zdynamiclib" },  \
+  { "-emit-llvm", "-Zemit-llvm" },  \
   { "-exported_symbols_list", "-Zexported_symbols_list" },  \
   { "-gfull", "-g -fno-eliminate-unused-debug-symbols" }, \
   { "-gused", "-g -feliminate-unused-debug-symbols" }, \

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=46858&r1=46857&r2=46858&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/gcc.c (original)
+++ llvm-gcc-4.2/trunk/gcc/gcc.c Thu Feb  7 13:20:51 2008
@@ -825,12 +825,12 @@
 /* LLVM LOCAL begin */
 static const char *llvm_options =
 #ifdef ENABLE_LLVM
-"%{O4|emit-llvm:%{S:-emit-llvm} \
+"%{O4|Zemit-llvm:%{S:-emit-llvm} \
                 %{!S:-emit-llvm-bc \
                   %{c: %W{o*} %{!o*:-o %b%w.o}} \
                   %{!c:-o %d%w%u%O}}}"
 #else
-  "%{emit-llvm:%e--emit-llvm is not supported in this configuration.}"
+  "%{Zemit-llvm:%e--emit-llvm is not supported in this configuration.}"
 #endif
   ;
 /* LLVM LOCAL end */
@@ -860,10 +860,10 @@
 static const char *invoke_as =
 #ifdef AS_NEEDS_DASH_FOR_PIPED_INPUT
 /* LLVM LOCAL */
-"%{!O4:%{!emit-llvm:%{!S:-o %|.s |\n as %(asm_options) %|.s %A }}}";
+"%{!O4:%{!Zemit-llvm:%{!S:-o %|.s |\n as %(asm_options) %|.s %A }}}";
 #else
 /* LLVM LOCAL */
-"%{!O4:%{!emit-llvm:%{!S:-o %|.s |\n as %(asm_options) %m.s %A }}}";
+"%{!O4:%{!Zemit-llvm:%{!S:-o %|.s |\n as %(asm_options) %m.s %A }}}";
 #endif
 
 /* Some compilers have limits on line lengths, and the multilib_select