[llvm-branch-commits] [llvm-gcc-branch] r103645 - in /llvm-gcc-4.2/branches/Apple/Morbo: ./ gcc/config/arm/darwin.h gcc/config/i386/darwin.h gcc/config/rs6000/darwin.h gcc/doc/llvm-gcc.1

[Devang Patel]

Author: dpatel
Date: Wed May 12 15:50:00 2010
New Revision: 103645

URL: http://llvm.org/viewvc/llvm-project?rev=103645&view=rev
Log:
Merge r103644 from trunk.

Modified:
    llvm-gcc-4.2/branches/Apple/Morbo/   (props changed)
    llvm-gcc-4.2/branches/Apple/Morbo/gcc/config/arm/darwin.h
    llvm-gcc-4.2/branches/Apple/Morbo/gcc/config/i386/darwin.h
    llvm-gcc-4.2/branches/Apple/Morbo/gcc/config/rs6000/darwin.h
    llvm-gcc-4.2/branches/Apple/Morbo/gcc/doc/llvm-gcc.1

Propchange: llvm-gcc-4.2/branches/Apple/Morbo/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 12 15:50:00 2010
@@ -1,2 +1,2 @@
 /llvm/trunk:100565
-/llvm-gcc-4.2/trunk:98728,98841,98893,99196,99305,99592-99593,99629,99670,99982,99984-99986,99988,99992-99993,99995,99997-99999,100035,100149,100303,100565,100624-100626,100712,100721,101090-101091,101199,101216,101304,101333,101804,101959,102139,102148,102433,102444,102506-102507,102511,102532,102561,102636,102648,102745,103361,103366-103367,103394,103414
+/llvm-gcc-4.2/trunk:98728,98841,98893,99196,99305,99592-99593,99629,99670,99982,99984-99986,99988,99992-99993,99995,99997-99999,100035,100149,100303,100565,100624-100626,100712,100721,101090-101091,101199,101216,101304,101333,101804,101959,102139,102148,102433,102444,102506-102507,102511,102532,102561,102636,102648,102745,103361,103366-103367,103394,103414,103644

Modified: llvm-gcc-4.2/branches/Apple/Morbo/gcc/config/arm/darwin.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Morbo/gcc/config/arm/darwin.h?rev=103645&r1=103644&r2=103645&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Morbo/gcc/config/arm/darwin.h (original)
+++ llvm-gcc-4.2/branches/Apple/Morbo/gcc/config/arm/darwin.h Wed May 12 15:50:00 2010
@@ -36,10 +36,6 @@
 %{!fbuiltin-strcpy:-fno-builtin-strcpy} \
 %<fbuiltin-strcat \
 %<fbuiltin-strcpy \
-"/* LLVM LOCAL ignore -g in LTO mode */"\
-"/* On Darwin, debug info is stored in separate .dSYM files. */"\
-"/* This requires special support in LTO mode. */" \
-%{O4|flto: %<g* } \
 %<pg"
 
 #undef LIB_SPEC

Modified: llvm-gcc-4.2/branches/Apple/Morbo/gcc/config/i386/darwin.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Morbo/gcc/config/i386/darwin.h?rev=103645&r1=103644&r2=103645&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Morbo/gcc/config/i386/darwin.h (original)
+++ llvm-gcc-4.2/branches/Apple/Morbo/gcc/config/i386/darwin.h Wed May 12 15:50:00 2010
@@ -101,10 +101,6 @@
   %{!mmacosx-version-min=*: %{!miphoneos-version-min=*: %(darwin_cc1_minversion)}} \
   "/* APPLE LOCAL ignore -mcpu=G4 -mcpu=G5 */"\
   %<faltivec %<mno-fused-madd %<mlong-branch %<mlongcall %<mcpu=G4 %<mcpu=G5 \
-  "/* LLVM LOCAL ignore -g in LTO mode */"\
-  "/* On Darwin, debug info is stored in separate .dSYM files. */"\
-  "/* This requires special support in LTO mode. */" \
-  %{O4|flto: %<g* } \
   %{g: %{!fno-eliminate-unused-debug-symbols: -feliminate-unused-debug-symbols }}"
 
 /* APPLE LOCAL AltiVec */

Modified: llvm-gcc-4.2/branches/Apple/Morbo/gcc/config/rs6000/darwin.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Morbo/gcc/config/rs6000/darwin.h?rev=103645&r1=103644&r2=103645&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Morbo/gcc/config/rs6000/darwin.h (original)
+++ llvm-gcc-4.2/branches/Apple/Morbo/gcc/config/rs6000/darwin.h Wed May 12 15:50:00 2010
@@ -114,10 +114,6 @@
   "/* APPLE LOCAL ARM 5683689 */"\
   %{!mmacosx-version-min=*: %{!miphoneos-version-min=*: %(darwin_cc1_minversion)}} \
   "/* APPLE LOCAL -fast or -fastf or -fastcp */"\
-  "/* LLVM LOCAL ignore -g in LTO mode */"\
-  "/* On Darwin, debug info is stored in separate .dSYM files. */"\
-  "/* This requires special support in LTO mode. */" \
-  %{O4|flto: %<g* } \
   %{!mkernel:%{!static:%{!fast:%{!fastf:%{!fastcp:%{!mdynamic-no-pic:-fPIC}}}}}}"
 
 #define DARWIN_ARCH_SPEC "%{m64:ppc64;:ppc}"

Modified: llvm-gcc-4.2/branches/Apple/Morbo/gcc/doc/llvm-gcc.1
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Morbo/gcc/doc/llvm-gcc.1?rev=103645&r1=103644&r2=103645&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Morbo/gcc/doc/llvm-gcc.1 (original)
+++ llvm-gcc-4.2/branches/Apple/Morbo/gcc/doc/llvm-gcc.1 Wed May 12 15:50:00 2010
@@ -24,7 +24,7 @@
 .Pp
 .Bl -tag -width -indent
 .It Fl flto
-Enables Link Time Optimization. Link Time Optimization is performed by ld(1) transparently using the LLVM optimizer. The object file generated contains intermediate LLVM bitcode instead of Mach-O objects. This option disables debugging information.
+Enables Link Time Optimization. Link Time Optimization is performed by ld(1) transparently using the LLVM optimizer. The object file generated contains intermediate LLVM bitcode instead of Mach-O objects.
 .It Fl O4
 Enables Link Time Optimization in addition to all optimizations enabled at -O3.
 .It Fl O