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/c-opts.c | |
| 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/c-opts.c')
| -rw-r--r-- | gcc/c-opts.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/gcc/c-opts.c b/gcc/c-opts.c index 9968c9b..f508e4e 100644 --- a/gcc/c-opts.c +++ b/gcc/c-opts.c @@ -1,5 +1,5 @@ /* C/ObjC/C++ command line option handling. - Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. Contributed by Neil Booth. This file is part of GCC. @@ -79,6 +79,9 @@ static const char *deps_file; /* The prefix given by -iprefix, if any. */ static const char *iprefix; +/* The multilib directory given by -imultilib, if any. */ +static const char *imultilib; + /* The system root, if any. Overridden by -isysroot. */ static const char *sysroot = TARGET_SYSTEM_ROOT; @@ -815,6 +818,10 @@ c_common_handle_option (size_t scode, const char *arg, int value) defer_opt (code, arg); break; + case OPT_imultilib: + imultilib = arg; + break; + case OPT_iprefix: iprefix = arg; break; @@ -967,7 +974,7 @@ c_common_post_options (const char **pfilename) sanitize_cpp_opts (); - register_include_chains (parse_in, sysroot, iprefix, + register_include_chains (parse_in, sysroot, iprefix, imultilib, std_inc, std_cxx_inc && c_dialect_cxx (), verbose); flag_inline_trees = 1; |