[src/trunk]: src/external/gpl3/gcc/dist/gcc/c-family Re-add -cxx-isystem and ...

[joerg <joerg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1f8178b8c5a2
branches:  trunk
changeset: 329654:1f8178b8c5a2
user:      joerg <joerg%NetBSD.org@localhost>
date:      Mon Jun 02 10:14:35 2014 +0000

description:
Re-add -cxx-isystem and -iremap, lost in the GCC 4.8 transition.

diffstat:

 external/gpl3/gcc/dist/gcc/c-family/c-opts.c |   8 ++++++++
 external/gpl3/gcc/dist/gcc/c-family/c.opt    |  10 ++++++++++
 2 files changed, 18 insertions(+), 0 deletions(-)

diffs (52 lines):

diff -r 0aff3bed410f -r 1f8178b8c5a2 external/gpl3/gcc/dist/gcc/c-family/c-opts.c
--- a/external/gpl3/gcc/dist/gcc/c-family/c-opts.c      Mon Jun 02 04:57:02 2014 +0000
+++ b/external/gpl3/gcc/dist/gcc/c-family/c-opts.c      Mon Jun 02 10:14:35 2014 +0000
@@ -284,6 +284,10 @@
       cpp_opts->discard_comments_in_macro_exp = 0;
       break;
 
+    case OPT_cxx_isystem:
+      add_path (xstrdup (arg), SYSTEM, 1, true);
+      break;
+
     case OPT_D:
       defer_opt (code, arg);
       break;
@@ -606,6 +610,10 @@
       add_path (xstrdup (arg), QUOTE, 0, true);
       break;
 
+    case OPT_iremap:
+      add_cpp_remap_path (arg);
+      break;
+
     case OPT_isysroot:
       sysroot = arg;
       break;
diff -r 0aff3bed410f -r 1f8178b8c5a2 external/gpl3/gcc/dist/gcc/c-family/c.opt
--- a/external/gpl3/gcc/dist/gcc/c-family/c.opt Mon Jun 02 04:57:02 2014 +0000
+++ b/external/gpl3/gcc/dist/gcc/c-family/c.opt Mon Jun 02 10:14:35 2014 +0000
@@ -801,6 +801,12 @@
 C ObjC C++ ObjC++
 A synonym for -std=c89 (for C) or -std=c++98 (for C++)
 
+; This should really just be C++/ObjC++ but we (NetBSD) use it when
+; calling C and ObjC compilers as well.
+cxx-isystem
+C ObjC C++ ObjC++ Joined Separate MissingArgError(missing path after %qs)
+-cxx-isystem <dir>     Add <dir> to the start of the C++ system include path
+
 d
 C ObjC C++ ObjC++ Joined
 ; Documented in common.opt.  FIXME - what about -dI, -dD, -dN and -dD?
@@ -1277,6 +1283,10 @@
 C ObjC C++ ObjC++ Joined Separate MissingArgError(missing path after %qs)
 -iquote <dir>  Add <dir> to the end of the quote include path
 
+iremap
+C ObjC C++ ObjC++ Joined Separate MissingArgError(missing path after %qs)
+-iremap <src:dst>      Convert <src> to <dst> if it occurs as prefix in __FILE__.
+
 iwithprefix
 C ObjC C++ ObjC++ Joined Separate
 -iwithprefix <dir>     Add <dir> to the end of the system include path