summaryrefslogtreecommitdiff
path: root/gcc/cppdefault.h
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2006-01-20 21:00:03 +0000
committerJoseph Myers <jsm28@gcc.gnu.org>2006-01-20 21:00:03 +0000
commit2b6dd222bbb82a052974fa931473702700ecfda9 (patch)
treef48eda30525ee2ab01e82568bb55e5e407a8a604 /gcc/cppdefault.h
parent6018b746be62c693c34c10e760172d34a1dfc4f9 (diff)
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/cppdefault.h')
-rw-r--r--gcc/cppdefault.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/gcc/cppdefault.h b/gcc/cppdefault.h
index f5b38884de6..a3a24169554 100644
--- a/gcc/cppdefault.h
+++ b/gcc/cppdefault.h
@@ -1,6 +1,6 @@
/* CPP Library.
Copyright (C) 1986, 1987, 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
- 1999, 2000, 2003, 2004 Free Software Foundation, Inc.
+ 1999, 2000, 2003, 2004, 2006 Free Software Foundation, Inc.
Contributed by Per Bothner, 1994-95.
Based on CCCP program by Paul Rubin, June 1986
Adapted to ANSI C, Richard Stallman, Jan 1987
@@ -43,6 +43,9 @@ struct default_include
C++. */
const char add_sysroot; /* FNAME should be prefixed by
cpp_SYSROOT. */
+ const char multilib; /* FNAME should have the multilib path
+ specified with -imultilib
+ appended. */
};
extern const struct default_include cpp_include_defaults[];