Help stupid cvs fixing basic conflicts.

1 files changed, 47 insertions, 65 deletions

diff --git a/gnu/usr.bin/binutils/gas/README b/gnu/usr.bin/binutils/gas/README
index 7cf2ca39270..4ac27db82fe 100644
--- a/gnu/usr.bin/binutils/gas/README
+++ b/gnu/usr.bin/binutils/gas/README
@@ -1,7 +1,4 @@
--*- text -*-
-
 		README for GAS
-	  [cribbed largely from GDB's README file]
 
 A number of things have changed since version 1 and the wonderful world of gas
 looks very different.  There's still a lot of irrelevant garbage lying around
@@ -84,8 +81,8 @@ options not listed here.
      configure [--help]
                [--prefix=DIR]
                [--srcdir=PATH]
-               [--norecursion] [--rm]
-               [--target=TARGET] HOST
+               [--host=HOST]
+               [--target=TARGET]
                [--with-OPTION]
                [--enable-OPTION]
 
@@ -93,27 +90,22 @@ You may introduce options with a single `-' rather than `--' if you
 prefer; but you may abbreviate option names if you use `--'.
 
 `--help'
-     Display a quick summary of how to invoke `configure'.
+     Print a summary of the options to `configure', and exit.
 
 `-prefix=DIR'
      Configure the source to install programs and files under directory
      `DIR'.
 
 `--srcdir=PATH'
-     *Warning: using this option requires GNU `make', or another `make'
-     that implements the `VPATH' feature.*
-     Use this option to make configurations in directories separate
-     from the GAS source directories.  Among other things, you can use
-     this to build (or maintain) several configurations simultaneously,
-     in separate directories.  `configure' writes configuration
-     specific files in the current directory, but arranges for them to
-     use the source in the directory PATH.  `configure' will create
-     directories under the working directory in parallel to the source
-     directories below PATH.
-
-`--norecursion'
-     Configure only the directory level where `configure' is executed;
-     do not propagate configuration to subdirectories.
+     Look for the package's source code in directory DIR.  Usually
+     `configure' can determine that directory automatically.
+
+`--host=HOST'
+     Configure GAS to run on the specified HOST.  Normally the
+     configure script can figure this out automatically.
+
+     There is no convenient way to generate a list of all available
+     hosts.
 
 `--target=TARGET'
      Configure GAS for cross-assembling programs for the specified
@@ -129,12 +121,6 @@ prefer; but you may abbreviate option names if you use `--'.
      host/target combination.  See below for a list of `--enable'
      options recognized in the gas distribution.
 
-`HOST ...'
-     Configure GAS to run on the specified HOST.
-
-     There is no convenient way to generate a list of all available
-     hosts.
-
 `configure' accepts other options, for compatibility with configuring
 other GNU tools recursively; but these are the only options that affect
 GAS or its supporting libraries.
@@ -151,7 +137,7 @@ The `--enable' options recognized by software in the gas distribution are:
      BFD data structures internally, and use BFD for writing object files.
      For most targets, this isn't supported yet.  For most targets where it has
      been done, it's already the default.  So generally you won't need to use
-     this option.  See `BFD CONVERSION' in the file `gas/NOTES'.
+     this option.
 
 Supported platforms
 ===================
@@ -170,46 +156,39 @@ Native assembling should work on:
 	bsd/386
 	delta (m68k-sysv from Motorola)
 	delta88 (m88k-sysv from Motorola)
-	linux
+	GNU/linux
 	m68k hpux 8.0 (hpux 7.0 may be a problem)
 	vax bsd, ultrix, vms
 	hp9000s300
 	decstation
-	iris
+	irix 4
+	irix 5
 	miniframe (m68k-sysv from Convergent Technologies)
 	i386-aix (ps/2)
 	hppa (hpux 4.3bsd, osf1)
-	rs6000
+	AIX
 	unixware
 	sco 3.2v4.2
 	sco openserver 5.0 (a.k.a. 3.2v5.0 )
-	sparc solaris 2.3
-
-For cross-assemblers, I believe hosting to work on any of the machines listed
-above, plus:
+	sparc solaris
+	ns32k (netbsd, lites)
 
-	sun386i
-	at least some flavors of hpux (hpux 7.0 may be a problem)
-	most flavors of sysV
+I believe that gas as a cross-assembler can currently be targetted for
+most of the above hosts, plus
 
-I believe that gas as a cross-assembler can currently be targetted for:
-
-	386bsd
-	bsd/386
 	decstation-bsd (a.out format, to be used in BSD 4.4)
 	ebmon29k
 	go32 (DOS on i386, with DJGPP -- old a.out version)
 	h8/300, h8/500 (Hitachi)
-	hp9000/300
 	i386-aix (ps/2)
 	i960-coff
-	linux
 	mips ecoff (decstation-ultrix, iris, mips magnum, mips-idt-ecoff)
+	Mitsubishi d10v and d30v
 	nindy960
-	powerpc
+	powerpc EABI
+	SH (Hitachi)
 	sco386
-	sun3
-	sun4
+	TI tic30 and tic80
 	vax bsd or ultrix?
 	vms
 	vxworks68k
@@ -220,9 +199,10 @@ MIPS ECOFF support has been added, but GAS will not run a C-style
 preprocessor.  If you want that, rename your file to have a ".S" suffix, and
 run gcc on it.  Or run "gcc -xassembler-with-cpp foo.s".
 
-Support for ELF should work now for sparc, hppa, i386, alpha, m68k.
+Support for ELF should work now for sparc, hppa, i386, alpha, m68k,
+MIPS, powerpc.
 
-Support for ns32k, tahoe, i860, m88k may be suffering from bitrot.
+Support for sequent (ns32k), tahoe, i860, m88k may be suffering from bitrot.
 
 If you try out gas on some host or target not listed above, please let me know
 the results, so I can update the list.
@@ -230,27 +210,29 @@ the results, so I can update the list.
 Compiler Support Hacks
 ======================
 
-The assembler has been modified to support a feature that is potentially
-useful when assembling compiler output, but which may confuse assembly
-language programmers.  If assembler encounters a .word pseudo-op of the form
-symbol1-symbol2 (the difference of two symbols), and the difference of those
-two symbols will not fit in 16 bits, the assembler will create a branch around
-a long jump to symbol1, and insert this into the output directly before the
-next label: The .word will (instead of containing garbage, or giving an error
-message) contain (the address of the long jump)-symbol2.  This allows the
-assembler to assemble jump tables that jump to locations very far away into
-code that works properly.  If the next label is more than 32K away from the
-.word, you lose (silently); RMS claims this will never happen.  If the -K
-option is given, you will get a warning message when this happens.
+On a few targets, the assembler has been modified to support a feature
+that is potentially useful when assembling compiler output, but which
+may confuse assembly language programmers.  If assembler encounters a
+.word pseudo-op of the form symbol1-symbol2 (the difference of two
+symbols), and the difference of those two symbols will not fit in 16
+bits, the assembler will create a branch around a long jump to
+symbol1, and insert this into the output directly before the next
+label: The .word will (instead of containing garbage, or giving an
+error message) contain (the address of the long jump)-symbol2.  This
+allows the assembler to assemble jump tables that jump to locations
+very far away into code that works properly.  If the next label is
+more than 32K away from the .word, you lose (silently); RMS claims
+this will never happen.  If the -K option is given, you will get a
+warning message when this happens.
 
 
 REPORTING BUGS IN GAS
 =====================
 
-Bugs in gas should be reported to bug-gnu-utils@prep.ai.mit.edu.  They may be
-cross-posted to bug-gcc if they affect the use of gas with gcc.  They should
-not be reported just to bug-gcc, since I don't read that list, and therefore
-wouldn't see them.
+Bugs in gas should be reported to bug-gnu-utils@gnu.org.  They may be
+cross-posted to bug-gcc if they affect the use of gas with gcc.  They
+should not be reported just to bug-gcc, since I don't read that list,
+and therefore wouldn't see them.
 
 If you report a bug in GAS, please remember to include:
 
@@ -274,7 +256,7 @@ think we have access to.
 1. You might be mistaken.
 2. It might take us a lot of time to install things to regenerate that file.
 3. We might get a different file from the one you got, and might not see any
-bug.
+   bug.
 
 To save us these delays and uncertainties, always send the input file for the
 program that failed.  A smaller test case that demonstrates the problem is of