[llvm-branch-commits] [llvm-gcc-branch] r114963 - in /llvm-gcc-4.2/branches/Apple/Morbo: ./ gcc/ChangeLog.apple gcc/doc/cppopts.texi gcc/doc/invoke.texi

[Bob Wilson]

Author: bwilson
Date: Tue Sep 28 11:47:35 2010
New Revision: 114963

URL: http://llvm.org/viewvc/llvm-project?rev=114963&view=rev
Log:
Merge doc fix for -isysroot and --sysroot options.
--- Merging r114961 into '.':
U    gcc/doc/cppopts.texi
U    gcc/doc/invoke.texi
U    gcc/ChangeLog.apple

Modified:
    llvm-gcc-4.2/branches/Apple/Morbo/   (props changed)
    llvm-gcc-4.2/branches/Apple/Morbo/gcc/ChangeLog.apple
    llvm-gcc-4.2/branches/Apple/Morbo/gcc/doc/cppopts.texi
    llvm-gcc-4.2/branches/Apple/Morbo/gcc/doc/invoke.texi

Propchange: llvm-gcc-4.2/branches/Apple/Morbo/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 28 11:47:35 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,102589,102636,102648,102745,103361,103366-103367,103394,103414,103644,103800,103918,104181,104384,104420,104423,104523,104726,105504,105828-105829,105902,105948-105949,106005,106243-106244,106270,106352,106564,106611-106612,106681,106690,106711,107062,107439,107843,108784-108786,109556-109557,109702,110043,110250,110405,110459,110501,110689,110727,112531,112674,113248,114220,114222
+/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,102589,102636,102648,102745,103361,103366-103367,103394,103414,103644,103800,103918,104181,104384,104420,104423,104523,104726,105504,105828-105829,105902,105948-105949,106005,106243-106244,106270,106352,106564,106611-106612,106681,106690,106711,107062,107439,107843,108784-108786,109556-109557,109702,110043,110250,110405,110459,110501,110689,110727,112531,112674,113248,114220,114222,114961

Modified: llvm-gcc-4.2/branches/Apple/Morbo/gcc/ChangeLog.apple
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Morbo/gcc/ChangeLog.apple?rev=114963&r1=114962&r2=114963&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Morbo/gcc/ChangeLog.apple (original)
+++ llvm-gcc-4.2/branches/Apple/Morbo/gcc/ChangeLog.apple Tue Sep 28 11:47:35 2010
@@ -1,3 +1,10 @@
+2010-09-27  Bob Wilson  <bob.wilson at apple.com>
+
+	Radar 8392704
+	* doc/cppopts.texi: Fix description of -isysroot for Apple's GCC.
+	* doc/invoke.texi (Directory Options): Update --sysroot description to
+	refer Apple users to -isysroot.
+
 2010-06-28 Jim Grosbach <grosbach at apple.com>
 
 	Radar 7449793

Modified: llvm-gcc-4.2/branches/Apple/Morbo/gcc/doc/cppopts.texi
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Morbo/gcc/doc/cppopts.texi?rev=114963&r1=114962&r2=114963&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Morbo/gcc/doc/cppopts.texi (original)
+++ llvm-gcc-4.2/branches/Apple/Morbo/gcc/doc/cppopts.texi Tue Sep 28 11:47:35 2010
@@ -491,7 +491,10 @@
 @item -isysroot @var{dir}
 @opindex isysroot
 This option is like the @option{--sysroot} option, but applies only to
-header files.  See the @option{--sysroot} option for more information.
+header files, except for Apple's version of GCC, where it applies to
+both header files and libraries and effectively replaces the
+ at option{--sysroot} option.
+See the @option{--sysroot} option for more information.
 
 @item -imultilib @var{dir}
 @opindex imultilib

Modified: llvm-gcc-4.2/branches/Apple/Morbo/gcc/doc/invoke.texi
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Morbo/gcc/doc/invoke.texi?rev=114963&r1=114962&r2=114963&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Morbo/gcc/doc/invoke.texi (original)
+++ llvm-gcc-4.2/branches/Apple/Morbo/gcc/doc/invoke.texi Tue Sep 28 11:47:35 2010
@@ -7540,7 +7540,10 @@
 @file{/usr/include} and libraries in @file{/usr/lib}, it will instead
 search @file{@var{dir}/usr/include} and @file{@var{dir}/usr/lib}.  
 
-If you use both this option and the @option{-isysroot} option, then
+With Apple's version of GCC, this option is effectively replaced by
+ at option{-isysroot}, which you should use instead of @option{--sysroot}.
+For other (non-Apple) versions of GCC,
+if you use both this option and the @option{-isysroot} option, then
 the @option{--sysroot} option will apply to libraries, but the
 @option{-isysroot} option will apply to header files.