contrib.texi, [...]: Update references to C9X.

	* contrib.texi, cpp.texi, extend.texi, invoke.texi: Update
	references to C9X.  Change references to -fstd and -flang-isoc9x
	to refer to -std.

From-SVN: r35087

5 files changed, 41 insertions, 23 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2eabd16..2c05057 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -28,6 +28,10 @@ Mon Jul 17 02:37:06 2000  Marc Espie <espie@openbsd.org>
 
 2000-07-17  Joseph S. Myers  <jsm28@cam.ac.uk>
 
+	* contrib.texi, cpp.texi, extend.texi, invoke.texi: Update
+	references to C9X.  Change references to -fstd and -flang-isoc9x
+	to refer to -std.
+
 	* c-common.c (scan_char_table): Allow "z" length modifiers on
 	diouxXn formats.
 	(check_format_info): Use TYPE_DOMAIN on the type matched against
diff --git a/gcc/contrib.texi b/gcc/contrib.texi
index cca7181..4fdcd8c 100644
--- a/gcc/contrib.texi
+++ b/gcc/contrib.texi
@@ -86,7 +86,7 @@ that print a copy of their source.
 
 @item
 Ulrich Drepper for his work on the C++ runtime libraries, glibc, 
- testing of GCC using glibc, ISO C9X support, CFG dumping support, etc.
+ testing of GCC using glibc, ISO C99 support, CFG dumping support, etc.
 
 @item
 Richard Earnshaw for his ongoing work with the ARM.
@@ -321,7 +321,7 @@ David Mosberger-Tang for various Alpha improvements.
 @item
 Stephen Moshier contributed the floating point emulator that assists in
 cross-compilation and permits support for floating point numbers wider
-than 64 bits and for ISO C9X support.
+than 64 bits and for ISO C99 support.
 
 @item
 Bill Moyer for his behind the scenes work on various issues.
diff --git a/gcc/cpp.texi b/gcc/cpp.texi
index 0e30e1d..0898a8b 100644
--- a/gcc/cpp.texi
+++ b/gcc/cpp.texi
@@ -3303,25 +3303,28 @@ added in the future.
 may be one of:
 @table @code
 @item iso9899:1990
-The ISO C standard from 1990.
-
-@item iso9899:199409
 @itemx c89
-The 1990 C standard, as amended in 1994.  @samp{c89} is the customary
-shorthand for this version of the standard.
+The ISO C standard from 1990.  @samp{c89} is the customary shorthand for
+this version of the standard.
 
 The @samp{-ansi} option is equivalent to @samp{-std=c89}.
 
-@item iso9899:199x
+@item iso9899:199409
+The 1990 C standard, as amended in 1994.
+
+@item iso9899:1999
+@itemx c99
+@itemx iso9899:199x
 @itemx c9x
-The revised ISO C standard, which is expected to be promulgated some
-time in 1999.  It has not been approved yet, hence the @samp{x}.
+The revised ISO C standard, published in December 1999.  Before
+publication, this was known as C9X.
 
 @item gnu89
 The 1990 C standard plus GNU extensions.  This is the default.
 
-@item gnu9x
-The 199x C standard plus GNU extensions.
+@item gnu99
+@itemx gnu9x
+The 1999 C standard plus GNU extensions.
 @end table
 
 @item -Wp,-lint
diff --git a/gcc/extend.texi b/gcc/extend.texi
index a34ba2b..3b8899b 100644
--- a/gcc/extend.texi
+++ b/gcc/extend.texi
@@ -3308,7 +3308,7 @@ Predefined Macros,cpp.info,The C Preprocessor}).
 * Naming Results::      Giving a name to C++ function return values.
 * Min and Max::		C++ Minimum and maximum operators.
 * Volatiles::		What constitutes an access to a volatile object.
-* Restricted Pointers:: C9X restricted pointers and references.
+* Restricted Pointers:: C99 restricted pointers and references.
 * C++ Interface::       You can use a single C++ header file for both
                          declarations and definitions.
 * Template Instantiation:: Methods for ensuring that exactly one copy of
@@ -3562,9 +3562,9 @@ an rvalue.
 @cindex restricted references
 @cindex restricted this pointer
 
-As with gcc, g++ understands the C9X proposal of restricted pointers,
+As with gcc, g++ understands the C99 feature of restricted pointers,
 specified with the @code{__restrict__}, or @code{__restrict} type
-qualifier. Because you cannot compile C++ by specifying the -flang-isoc9x
+qualifier. Because you cannot compile C++ by specifying the -std=c99
 language flag, @code{restrict} is not a keyword in C++.
 
 In addition to allowing restricted pointers, you can specify restricted
diff --git a/gcc/invoke.texi b/gcc/invoke.texi
index 95d7435..fc8b20d 100644
--- a/gcc/invoke.texi
+++ b/gcc/invoke.texi
@@ -96,7 +96,7 @@ in the following sections.
 @item C Language Options
 @xref{C Dialect Options,,Options Controlling C Dialect}.
 @smallexample
--ansi -fstd  -fallow-single-precision  -fcond-mismatch  -fno-asm
+-ansi -std  -fallow-single-precision  -fcond-mismatch  -fno-asm
 -fno-builtin  -ffreestanding  -fhosted  -fsigned-bitfields  -fsigned-char
 -funsigned-bitfields  -funsigned-char  -fwritable-strings
 -traditional  -traditional-cpp  -trigraphs -fsingle-precision-constant
@@ -717,7 +717,7 @@ programs that might use these names for other things.
 The functions @code{alloca}, @code{abort}, @code{exit}, and
 @code{_exit} are not builtin functions when @samp{-ansi} is used.
 
-@item -fstd=
+@item -std=
 Determine the language standard.  A value for this option must be provided;
 possible values are 
 
@@ -728,26 +728,37 @@ Same as -ansi
 @item iso9899:199409
 ISO C as modified in amend. 1
 
-@item iso9899:199x
-ISO C 9x
+@item iso9899:1999
+ISO C99.  Note that this standard is not yet fully supported; see
+@url{http://gcc.gnu.org/c99status.html} for more information.
 
 @item c89
 same as -std=iso9899:1990
 
-@item c9x
-same as -std=iso9899:199x
+@item c99
+same as -std=iso9899:1999
 
 @item gnu89
 default, iso9899:1990 + gnu extensions
 
+@item gnu99
+iso9899:1999 + gnu extensions
+
+@item iso9899:199x
+same as -std=iso9899:1999, deprecated
+
+@item c9x
+same as -std=iso9899:1999, deprecated
+
 @item gnu9x
-iso9899:199x + gnu extensions
+same as -std=gnu99, deprecated
+
 @end itemize
 
 Even when this option is not specified, you can still use some of the
 features of newer standards in so far as they do not conflict with
 previous C standards.  For example, you may use @code{__restrict__} even
-when -fstd=c9x is not specified.
+when -std=c99 is not specified.
 
 @item -fno-asm
 Do not recognize @code{asm}, @code{inline} or @code{typeof} as a