--- gcc/INSTALL	2018/04/24 18:24:09	1.1.1.8
+++ gcc/INSTALL	2018/04/24 18:31:42	1.1.1.9
@@ -657,76 +657,47 @@ special things you must know:
      Structures are no longer a multiple of 2 bytes.
 
 `hppa*-*-*'
-     There are two variants of this CPU, called 1.0 and 1.1, which have
-     different machine descriptions.  You must use the right one for
-     your machine.  All 7NN machines and 8N7 machines use 1.1, while
-     all other 8NN machines use 1.0.
-
-     The easiest way to handle this problem is to use `configure hpNNN'
-     or `configure hpNNN-hpux', where NNN is the model number of the
-     machine.  Then `configure' will figure out if the machine is a 1.0
-     or 1.1.  Use `uname -a' to find out the model number of your
-     machine.
+     There are several variants of the HP-PA processor which run a
+     variety of operating systems.  GNU CC must be configured to use
+     the correct processor type and operating system, or GNU CC will
+     not function correctly.  The easiest way to handle this problem is
+     to *not* specify a target when configuring GNU CC, the `configure'
+     script will try to automatically determine the right processor
+     type and operating system.
 
      `-g' does not work on HP-UX, since that system uses a peculiar
      debugging format which GNU CC does not know about.  However, `-g'
      will work if you also use GAS and GDB in conjunction with GCC.  We
      highly recommend using GAS for all HP-PA configurations.
 
-     You should be using GAS-2.3 (or later) along with GDB-4.12 (or
+     You should be using GAS-2.6 (or later) along with GDB-4.16 (or
      later).  These can be retrieved from all the traditional GNU ftp
      archive sites.
 
-     Build GAS and install the resulting binary as:
+     GAS will need to be installed into a directory before `/bin',
+     `/usr/bin', and `/usr/ccs/bin' in your search path.  You should
+     install GAS before you build GNU CC.
 
-          /usr/local/lib/gcc-lib/CONFIGURATION/GCCVERSION/as
-
-     where CONFIGURATION is the configuration name (perhaps
-     `hpNNN-hpux') and GCCVERSION is the GNU CC version number.  Do
-     this *before* starting the build process, otherwise you will get
-     errors from the HPUX assembler while building `libgcc2.a'.  The
-     command
-
-          make install-dir
-
-     will create the necessary directory hierarchy so you can install
-     GAS before building GCC.
-
-     To enable debugging, configure GNU CC with the `--with-gnu-as'
-     option before building.
-
-     It has been reported that GNU CC produces invalid assembly code for
-     1.1 machines running HP-UX 8.02 when using the HP assembler.
-     Typically the errors look like this:
-          as: bug.s @line#15 [err#1060]
-            Argument 0 or 2 in FARG upper
-                   - lookahead = ARGW1=FR,RTNVAL=GR
-          as: foo.s @line#28 [err#1060]
-            Argument 0 or 2 in FARG upper
-                   - lookahead = ARGW1=FR
-
-     You can check the version of HP-UX you are running by executing
-     the command `uname -r'.   If you are indeed running HP-UX 8.02 on
-     a PA and using the HP assembler then configure GCC with
-     "hpNNN-hpux8.02".
+     To enable debugging, you must configure GNU CC with the
+     `--with-gnu-as' option before building.
 
 `i370-*-*'
      This port is very preliminary and has many known bugs.  We hope to
      have a higher-quality port for this machine soon.
 
 `i386-*-linuxoldld'
-     Use this configuration to generate a.out binaries on Linux if you
-     do not have gas/binutils version 2.5.2 or later installed. This is
-     an obsolete configuration.
+     Use this configuration to generate a.out binaries on Linux-based
+     GNU systems, if you do not have gas/binutils version 2.5.2 or later
+     installed.  This is an obsolete configuration.
 
 `i386-*-linuxaout'
-     Use this configuration to generate a.out binaries on Linux. This
-     configuration is being superseded. You must use gas/binutils
-     version 2.5.2 or later.
+     Use this configuration to generate a.out binaries on Linux-based
+     GNU systems.  This configuration is being superseded.  You must use
+     gas/binutils version 2.5.2 or later.
 
 `i386-*-linux'
-     Use this configuration to generate ELF binaries on Linux.  You must
-     use gas/binutils version 2.5.2 or later.
+     Use this configuration to generate ELF binaries on Linux-based GNU
+     systems.  You must use gas/binutils version 2.5.2 or later.
 
 `i386-*-sco'
      Compilation with RCC is recommended.  Also, it may be a good idea