diff -urN gcc-5.4.0-orig/gcc/ChangeLog-2012 gcc-5.4.0/gcc/ChangeLog-2012
--- gcc-5.4.0-orig/gcc/ChangeLog-2012	2013-10-24 06:30:54 +0900
+++ gcc-5.4.0/gcc/ChangeLog-2012	2016-06-14 20:24:53 +0900
@@ -34611,6 +34611,13 @@
 	(ELIMINABLE_REGS): Eliminate from the soft frame pointer,
 	remove the HARD_FRAME_POINTER self-elimination.
 
+2012-02-02  Andrew Church  <achurch@achurch.org>
+
+	* c-family/c-opts.c (case OPT_I): Undeprecate -I- support.
+	* doc/invoke.texi: Likewise.
+	* doc/cpp.texi: Likewise.
+	* doc/cppopts.texi: Likewise.
+
 2012-01-12  Georg-Johann Lay  <avr@gjlay.de>
 
 	PR target/51756
diff -urN gcc-5.4.0-orig/gcc/c-family/c-opts.c gcc-5.4.0/gcc/c-family/c-opts.c
--- gcc-5.4.0-orig/gcc/c-family/c-opts.c	2015-07-02 02:06:52 +0900
+++ gcc-5.4.0/gcc/c-family/c-opts.c	2016-06-14 20:24:53 +0900
@@ -329,7 +329,6 @@
 	    error ("-I- specified twice");
 	  quote_chain_split = true;
 	  split_quote_chain ();
-	  inform (input_location, "obsolete option -I- used, please use -iquote instead");
 	}
       break;
 
diff -urN gcc-5.4.0-orig/gcc/doc/cpp.1 gcc-5.4.0/gcc/doc/cpp.1
--- gcc-5.4.0-orig/gcc/doc/cpp.1	2016-06-03 17:54:10 +0900
+++ gcc-5.4.0/gcc/doc/cpp.1	2016-06-14 20:24:53 +0900
@@ -617,8 +617,6 @@
 .Sp
 In addition, \fB\-I\-\fR inhibits the use of the directory of the current
 file directory as the first search directory for \f(CW\*(C`#include\ "\f(CIfile\f(CW"\*(C'\fR.
-.Sp
-This option has been deprecated.
 .IP "\fB\-nostdinc\fR" 4
 .IX Item "-nostdinc"
 Do not search the standard system directories for header files.
diff -urN gcc-5.4.0-orig/gcc/doc/cpp.info gcc-5.4.0/gcc/doc/cpp.info
--- gcc-5.4.0-orig/gcc/doc/cpp.info	2016-06-03 19:32:20 +0900
+++ gcc-5.4.0/gcc/doc/cpp.info	2016-06-14 20:24:53 +0900
@@ -809,7 +809,6 @@
 Directories after `-I-' are searched for all headers.  Second, the
 directory containing the current file is not searched for anything,
 unless it happens to be one of the directories named by an `-I' switch.
-`-I-' is deprecated, `-iquote' should be used instead.
 
    `-I. -I-' is not the same as no `-I' options at all, and does not
 cause the same behavior for `<>' includes that `""' includes get with
@@ -3972,11 +3971,6 @@
 used 2.96 and 2.97 development snapshots.  Where there are differences,
 they generally represent bugs in the snapshots.
 
-   * -I- deprecated
-
-     This option has been deprecated in 4.0.  `-iquote' is meant to
-     replace the need for this option.
-
    * Order of evaluation of `#' and `##' operators
 
      The standard does not specify the order of evaluation of a chain of
@@ -4415,7 +4409,7 @@
 
      In addition, `-I-' inhibits the use of the directory of the current
      file directory as the first search directory for `#include "FILE"'.
-     *Note Search Path::.  This option has been deprecated.
+     *Note Search Path::.
 
 `-nostdinc'
      Do not search the standard system directories for header files.
diff -urN gcc-5.4.0-orig/gcc/doc/cpp.texi gcc-5.4.0/gcc/doc/cpp.texi
--- gcc-5.4.0-orig/gcc/doc/cpp.texi	2015-03-23 10:12:06 +0900
+++ gcc-5.4.0/gcc/doc/cpp.texi	2016-06-14 20:24:53 +0900
@@ -894,8 +894,7 @@
 quote marks.  Directories after @option{-I-} are searched for all
 headers.  Second, the directory containing the current file is not
 searched for anything, unless it happens to be one of the directories
-named by an @option{-I} switch.  @option{-I-} is deprecated, @option{-iquote}
-should be used instead.
+named by an @option{-I} switch.
 
 @option{-I. -I-} is not the same as no @option{-I} options at all, and does
 not cause the same behavior for @samp{<>} includes that @samp{""}
@@ -4343,11 +4342,6 @@
 
 @itemize @bullet
 
-@item -I- deprecated
-
-This option has been deprecated in 4.0.  @option{-iquote} is meant to
-replace the need for this option.
-
 @item Order of evaluation of @samp{#} and @samp{##} operators
 
 The standard does not specify the order of evaluation of a chain of
diff -urN gcc-5.4.0-orig/gcc/doc/cppopts.texi gcc-5.4.0/gcc/doc/cppopts.texi
--- gcc-5.4.0-orig/gcc/doc/cppopts.texi	2015-03-23 10:12:06 +0900
+++ gcc-5.4.0/gcc/doc/cppopts.texi	2016-06-14 20:24:53 +0900
@@ -432,7 +432,6 @@
 @ifset cppmanual
 @xref{Search Path}.
 @end ifset
-This option has been deprecated.
 
 @item -nostdinc
 @opindex nostdinc
diff -urN gcc-5.4.0-orig/gcc/doc/g++.1 gcc-5.4.0/gcc/doc/g++.1
--- gcc-5.4.0-orig/gcc/doc/g++.1	2016-06-03 19:32:25 +0900
+++ gcc-5.4.0/gcc/doc/g++.1	2016-06-14 20:24:53 +0900
@@ -10613,7 +10613,6 @@
 .Sp
 In addition, \fB\-I\-\fR inhibits the use of the directory of the current
 file directory as the first search directory for \f(CW\*(C`#include\ "\f(CIfile\f(CW"\*(C'\fR.
-This option has been deprecated.
 .IP "\fB\-nostdinc\fR" 4
 .IX Item "-nostdinc"
 Do not search the standard system directories for header files.
diff -urN gcc-5.4.0-orig/gcc/doc/gcc.1 gcc-5.4.0/gcc/doc/gcc.1
--- gcc-5.4.0-orig/gcc/doc/gcc.1	2016-06-03 19:32:24 +0900
+++ gcc-5.4.0/gcc/doc/gcc.1	2016-06-14 20:24:59 +0900
@@ -10613,7 +10613,6 @@
 .Sp
 In addition, \fB\-I\-\fR inhibits the use of the directory of the current
 file directory as the first search directory for \f(CW\*(C`#include\ "\f(CIfile\f(CW"\*(C'\fR.
-This option has been deprecated.
 .IP "\fB\-nostdinc\fR" 4
 .IX Item "-nostdinc"
 Do not search the standard system directories for header files.
@@ -11369,9 +11368,6 @@
 such a suffix.
 .IP "\fB\-I\-\fR" 4
 .IX Item "-I-"
-This option has been deprecated.  Please use \fB\-iquote\fR instead for
-\&\fB\-I\fR directories before the \fB\-I\-\fR and remove the \fB\-I\-\fR
-option.
 Any directories you specify with \fB\-I\fR options before the \fB\-I\-\fR
 option are searched only for the case of \f(CW\*(C`#include "\f(CIfile\f(CW"\*(C'\fR;
 they are not searched for \f(CW\*(C`#include <\f(CIfile\f(CW>\*(C'\fR.
diff -urN gcc-5.4.0-orig/gcc/doc/gcc.info gcc-5.4.0/gcc/doc/gcc.info
--- gcc-5.4.0-orig/gcc/doc/gcc.info	2016-06-03 19:32:21 +0900
+++ gcc-5.4.0/gcc/doc/gcc.info	2016-06-14 20:25:00 +0900
@@ -10551,7 +10551,6 @@
 
      In addition, `-I-' inhibits the use of the directory of the current
      file directory as the first search directory for `#include "FILE"'.
-     This option has been deprecated.
 
 `-nostdinc'
      Do not search the standard system directories for header files.
@@ -11306,8 +11305,6 @@
      such a suffix.
 
 `-I-'
-     This option has been deprecated.  Please use `-iquote' instead for
-     `-I' directories before the `-I-' and remove the `-I-' option.
      Any directories you specify with `-I' options before the `-I-'
      option are searched only for the case of `#include "FILE"'; they
      are not searched for `#include <FILE>'.
diff -urN gcc-5.4.0-orig/gcc/doc/invoke.texi gcc-5.4.0/gcc/doc/invoke.texi
--- gcc-5.4.0-orig/gcc/doc/invoke.texi	2016-05-18 03:42:16 +0900
+++ gcc-5.4.0/gcc/doc/invoke.texi	2016-06-14 20:25:01 +0900
@@ -11547,9 +11547,6 @@
 
 @item -I-
 @opindex I-
-This option has been deprecated.  Please use @option{-iquote} instead for
-@option{-I} directories before the @option{-I-} and remove the @option{-I-}
-option.
 Any directories you specify with @option{-I} options before the @option{-I-}
 option are searched only for the case of @code{#include "@var{file}"};
 they are not searched for @code{#include <@var{file}>}.
