diff -ur gcc-4.5.3-orig/gcc/ChangeLog gcc-4.5.3/gcc/ChangeLog --- gcc-4.5.3-orig/gcc/ChangeLog 2011-04-28 23:11:53 +0900 +++ gcc-4.5.3/gcc/ChangeLog 2012-02-02 02:06:51 +0900 @@ -1,3 +1,10 @@ +2012-02-02 Andrew Church + + * c-opts.c (case OPT_I): Undeprecate -I- support. + * doc/invoke.texi: Likewise. + * doc/cpp.texi: Likewise. + * doc/cppopts.texi: Likewise. + 2011-04-28 Release Manager * GCC 4.5.3 released. diff -ur gcc-4.5.3-orig/gcc/c-opts.c gcc-4.5.3/gcc/c-opts.c --- gcc-4.5.3-orig/gcc/c-opts.c 2010-04-03 04:54:46 +0900 +++ gcc-4.5.3/gcc/c-opts.c 2012-02-02 01:58:09 +0900 @@ -326,7 +326,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 -ur gcc-4.5.3-orig/gcc/doc/cpp.1 gcc-4.5.3/gcc/doc/cpp.1 --- gcc-4.5.3-orig/gcc/doc/cpp.1 2011-04-28 23:39:47 +0900 +++ gcc-4.5.3/gcc/doc/cpp.1 2012-02-02 02:01:20 +0900 @@ -594,8 +594,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 -ur gcc-4.5.3-orig/gcc/doc/cpp.info gcc-4.5.3/gcc/doc/cpp.info --- gcc-4.5.3-orig/gcc/doc/cpp.info 2011-04-29 00:20:24 +0900 +++ gcc-4.5.3/gcc/doc/cpp.info 2012-02-02 02:00:16 +0900 @@ -813,7 +813,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 @@ -3881,11 +3880,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 @@ -4314,7 +4308,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 -ur gcc-4.5.3-orig/gcc/doc/cpp.texi gcc-4.5.3/gcc/doc/cpp.texi --- gcc-4.5.3-orig/gcc/doc/cpp.texi 2011-02-26 08:20:40 +0900 +++ gcc-4.5.3/gcc/doc/cpp.texi 2012-02-02 02:00:50 +0900 @@ -897,8 +897,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{""} @@ -4251,11 +4250,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 -ur gcc-4.5.3-orig/gcc/doc/cppopts.texi gcc-4.5.3/gcc/doc/cppopts.texi --- gcc-4.5.3-orig/gcc/doc/cppopts.texi 2010-04-03 04:54:46 +0900 +++ gcc-4.5.3/gcc/doc/cppopts.texi 2012-02-02 01:59:11 +0900 @@ -423,7 +423,6 @@ @ifset cppmanual @xref{Search Path}. @end ifset -This option has been deprecated. @item -nostdinc @opindex nostdinc diff -ur gcc-4.5.3-orig/gcc/doc/g++.1 gcc-4.5.3/gcc/doc/g++.1 --- gcc-4.5.3-orig/gcc/doc/g++.1 2011-04-29 00:20:27 +0900 +++ gcc-4.5.3/gcc/doc/g++.1 2012-02-02 01:59:54 +0900 @@ -8224,7 +8224,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 -ur gcc-4.5.3-orig/gcc/doc/gcc.1 gcc-4.5.3/gcc/doc/gcc.1 --- gcc-4.5.3-orig/gcc/doc/gcc.1 2011-04-29 00:20:27 +0900 +++ gcc-4.5.3/gcc/doc/gcc.1 2012-02-02 02:02:29 +0900 @@ -8224,7 +8224,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. @@ -8861,8 +8860,6 @@ library aspect will not. .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. Any directories you specify with \fB\-I\fR options before the \fB\-I\-\fR option are searched only for the case of \fB#include "\fR\fIfile\fR\fB"\fR; they are not searched for \fB#include <\fR\fIfile\fR\fB>\fR. diff -ur gcc-4.5.3-orig/gcc/doc/gcc.info gcc-4.5.3/gcc/doc/gcc.info --- gcc-4.5.3-orig/gcc/doc/gcc.info 2011-04-29 00:20:24 +0900 +++ gcc-4.5.3/gcc/doc/gcc.info 2012-02-02 02:03:05 +0900 @@ -8297,7 +8297,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. @@ -8940,11 +8939,9 @@ the library aspect will not. `-I-' - This option has been deprecated. Please use `-iquote' instead for - `-I' directories before the `-I-' and remove the `-I-'. 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 '. + 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 '. If additional directories are specified with `-I' options after the `-I-', these directories are searched for all `#include' diff -ur gcc-4.5.3-orig/gcc/doc/invoke.texi gcc-4.5.3/gcc/doc/invoke.texi --- gcc-4.5.3-orig/gcc/doc/invoke.texi 2011-03-24 07:03:29 +0900 +++ gcc-4.5.3/gcc/doc/invoke.texi 2012-02-02 02:04:03 +0900 @@ -8948,8 +8948,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-}. Any directories you specify with @option{-I} options before the @option{-I-} option are searched only for the case of @samp{#include "@var{file}"}; they are not searched for @samp{#include <@var{file}>}.