[llvm-commits] [llvm-gcc-4.2] r46927 - /llvm-gcc-4.2/trunk/gcc/gcc.c

[Wojciech Matyjewicz]

Author: wmat
Date: Sun Feb 10 04:41:01 2008
New Revision: 46927

URL: http://llvm.org/viewvc/llvm-project?rev=46927&view=rev
Log:
Revert commits: r46886, r46860, r46858. Restore proper working of -emit-llvm and --emit-llvm options on, at 
least, Linux/x86.

Modified:
    llvm-gcc-4.2/trunk/gcc/gcc.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=46927&r1=46926&r2=46927&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/gcc.c (original)
+++ llvm-gcc-4.2/trunk/gcc/gcc.c Sun Feb 10 04:41:01 2008
@@ -825,12 +825,12 @@
 /* LLVM LOCAL begin */
 static const char *llvm_options =
 #ifdef ENABLE_LLVM
-"%{O4|Zemit-llvm:%{S:-emit-llvm} \
+"%{O4|emit-llvm:%{S:-emit-llvm} \
                 %{!S:-emit-llvm-bc \
                   %{c: %W{o*} %{!o*:-o %b%w.o}} \
                   %{!c:-o %d%w%u%O}}}"
 #else
-  "%{Zemit-llvm:%e--emit-llvm is not supported in this configuration.}"
+  "%{emit-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:%{!Zemit-llvm:%{!S:-o %|.s |\n as %(asm_options) %|.s %A }}}";
+"%{!O4:%{!emit-llvm:%{!S:-o %|.s |\n as %(asm_options) %|.s %A }}}";
 #else
 /* LLVM LOCAL */
-"%{!O4:%{!Zemit-llvm:%{!S:-o %|.s |\n as %(asm_options) %m.s %A }}}";
+"%{!O4:%{!emit-llvm:%{!S:-o %|.s |\n as %(asm_options) %m.s %A }}}";
 #endif
 
 /* Some compilers have limits on line lengths, and the multilib_select
@@ -1226,8 +1226,6 @@
   const char *const replacements;
 } target_option_translations[] =
 {
-  /* LLVM LOCAL */
-  {"-emit-llvm", "-Zemit-llvm"}, 
   TARGET_OPTION_TRANSLATE_TABLE,
   { 0, 0 }
 };