Module Name:    src
Committed By:   joerg
Date:           Mon Jun  2 10:14:35 UTC 2014

Modified Files:
        src/external/gpl3/gcc/dist/gcc/c-family: c-opts.c c.opt

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


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 src/external/gpl3/gcc/dist/gcc/c-family/c-opts.c \
    src/external/gpl3/gcc/dist/gcc/c-family/c.opt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/gpl3/gcc/dist/gcc/c-family/c-opts.c
diff -u src/external/gpl3/gcc/dist/gcc/c-family/c-opts.c:1.1.1.2 src/external/gpl3/gcc/dist/gcc/c-family/c-opts.c:1.2
--- src/external/gpl3/gcc/dist/gcc/c-family/c-opts.c:1.1.1.2	Tue May 27 08:52:37 2014
+++ src/external/gpl3/gcc/dist/gcc/c-family/c-opts.c	Mon Jun  2 10:14:35 2014
@@ -284,6 +284,10 @@ c_common_handle_option (size_t scode, co
       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 @@ c_common_handle_option (size_t scode, co
       add_path (xstrdup (arg), QUOTE, 0, true);
       break;
 
+    case OPT_iremap:
+      add_cpp_remap_path (arg);
+      break;
+
     case OPT_isysroot:
       sysroot = arg;
       break;
Index: src/external/gpl3/gcc/dist/gcc/c-family/c.opt
diff -u src/external/gpl3/gcc/dist/gcc/c-family/c.opt:1.1.1.2 src/external/gpl3/gcc/dist/gcc/c-family/c.opt:1.2
--- src/external/gpl3/gcc/dist/gcc/c-family/c.opt:1.1.1.2	Tue May 27 08:52:44 2014
+++ src/external/gpl3/gcc/dist/gcc/c-family/c.opt	Mon Jun  2 10:14:35 2014
@@ -801,6 +801,12 @@ ansi
 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 @@ iquote
 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

Reply via email to