diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2006-01-20 21:00:03 +0000 |
|---|---|---|
| committer | Joseph Myers <jsm28@gcc.gnu.org> | 2006-01-20 21:00:03 +0000 |
| commit | 2b6dd222bbb82a052974fa931473702700ecfda9 (patch) | |
| tree | f48eda30525ee2ab01e82568bb55e5e407a8a604 /gcc/doc | |
| parent | 6018b746be62c693c34c10e760172d34a1dfc4f9 (diff) | |
| download | gcc-2b6dd222bbb82a052974fa931473702700ecfda9.zip gcc-2b6dd222bbb82a052974fa931473702700ecfda9.tar.gz gcc-2b6dd222bbb82a052974fa931473702700ecfda9.tar.bz2 | |
re PR libstdc++/25524 (libstdc++ headers should go in multilib directories)
PR libstdc++/25524
* cppdefault.h (struct default_include): Add multilib flag.
* cppdefault.c (cpp_include_defaults): Set it.
* c.opt (-imultilib): New option.
* c-opts.c (imultilib): New.
(c_common_handle_option): Handle -imultilib.
(c_common_post_options): Likewise.
* c-incpath.c (add_standard_paths, register_include_chains):
Likewise.
* c-incpath.h (register_include_chains): Add extra parameter.
* gcc.c (do_spec_1): Generate -imultilib option.
(The Specs Language): Update %I description.
(process_command): Update copyright notice.
* doc/cppopts.texi (-imultilib): Document.
* doc/invoke.texi (-imultilib): Include in option summary.
(%I): Update specs documentation.
libstdc++-v3:
* include/Makefile.am: Install host-specific headers in multilib
subdirectory.
* include/Makefile.in: Regenerate.
From-SVN: r110037
Diffstat (limited to 'gcc/doc')
| -rw-r--r-- | gcc/doc/cppopts.texi | 7 | ||||
| -rw-r--r-- | gcc/doc/invoke.texi | 10 |
2 files changed, 11 insertions, 6 deletions
diff --git a/gcc/doc/cppopts.texi b/gcc/doc/cppopts.texi index adf77e1..06ca0b9 100644 --- a/gcc/doc/cppopts.texi +++ b/gcc/doc/cppopts.texi @@ -1,4 +1,4 @@ -@c Copyright (c) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +@c Copyright (c) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 @c Free Software Foundation, Inc. @c This is part of the CPP and GCC manuals. @c For copying conditions, see the file gcc.texi. @@ -483,6 +483,11 @@ would; @option{-iwithprefix} puts it where @option{-idirafter} would. This option is like the @option{--sysroot} option, but applies only to header files. See the @option{--sysroot} option for more information. +@item -imultilib @var{dir} +@opindex imultilib +Use @var{dir} as a subdirectory of the directory containing +target-specific C++ headers. + @item -isystem @var{dir} @opindex isystem Search @var{dir} for header files, after all directories specified by diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi index 3a19fb9..1e5a216 100644 --- a/gcc/doc/invoke.texi +++ b/gcc/doc/invoke.texi @@ -9,8 +9,8 @@ @c man end @c man begin COPYRIGHT -Copyright @copyright{} 1988, 1989, 1992, 1993, 1994, 1995, 1996, 1997, -1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +Copyright @copyright{} 1988, 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998, +1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.2 or @@ -358,7 +358,7 @@ Objective-C and Objective-C++ Dialects}. -include @var{file} -imacros @var{file} @gol -iprefix @var{file} -iwithprefix @var{dir} @gol -iwithprefixbefore @var{dir} -isystem @var{dir} @gol --isysroot @var{dir} @gol +-imultilib @var{dir} -isysroot @var{dir} @gol -M -MM -MF -MG -MP -MQ -MT -nostdinc @gol -P -fworking-directory -remap @gol -trigraphs -undef -U@var{macro} -Wp,@var{option} @gol @@ -6862,9 +6862,9 @@ C@. @item %I Substitute any of @option{-iprefix} (made from @env{GCC_EXEC_PREFIX}), -@option{-isysroot} (made from @env{TARGET_SYSTEM_ROOT}), and +@option{-isysroot} (made from @env{TARGET_SYSTEM_ROOT}), @option{-isystem} (made from @env{COMPILER_PATH} and @option{-B} options) -as necessary. +and @option{-imultilib} as necessary. @item %s Current argument is the name of a library or startup file of some sort. |