Bring Cygnus versions into the trunk, keeping our local patches

9 files changed, 68 insertions, 67 deletions

diff --git a/gnu/usr.bin/binutils/config/ChangeLog b/gnu/usr.bin/binutils/config/ChangeLog
index 7576a359bd9..5c38ca2137c 100644
--- a/gnu/usr.bin/binutils/config/ChangeLog
+++ b/gnu/usr.bin/binutils/config/ChangeLog
@@ -1,3 +1,42 @@
+Tue Mar 26 14:10:41 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* mh-go32 (CFLAGS): Define.
+
+Thu Mar 14 19:20:54 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* mh-necv4: New file.
+
+Thu Feb 15 13:07:43 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* mh-cxux (CC): New variable.
+	(CFLAGS, LDFLAGS): Remove.
+	* mh-ncrsvr43 (CC): New variable.
+	(CFLAGS): Remove.
+	* mh-solaris (CFLAGS): Remove.
+
+	* mh-go32: Remove most variable settings, since they presumed a
+	Canadian Cross, which is now handled correctly by the configure
+	script.
+
+	* mh-sparcpic (PICFLAG): Set to -fPIC, not -fpic.
+
+Mon Feb 12 14:53:39 1996  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* mh-m68kpic, mt-m68kpic: New files.
+
+Thu Feb  1 14:15:42 1996  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mpw-mh-mpw (CC_MWC68K): Add options similar to those used
+	in CC_MWCPPC, and -mc68020 -model far.
+	(AR_MWLINK68K): Add -xm library.
+	(AR_AR): Define.
+	(CC_LD_MWLINK68K): Remove -d.
+	(EXTRALIBS_MWC68K): Define.
+
+Thu Jan 25 16:05:33 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* mh-ncrsvr43 (CFLAGS): Remove -Hnocopyr.
+
 Tue Nov  7 15:41:30 1995  Stan Shebs  <shebs@andros.cygnus.com>
 
 	* mpw-mh-mpw (CC_MWC68K, CC_MWCPPC): Remove unused include path.
diff --git a/gnu/usr.bin/binutils/config/mh-cxux b/gnu/usr.bin/binutils/config/mh-cxux
index c5f4bb149e8..54b2a16c834 100644
--- a/gnu/usr.bin/binutils/config/mh-cxux
+++ b/gnu/usr.bin/binutils/config/mh-cxux
@@ -11,5 +11,4 @@ CXXFLAGS=-O
 AR_FLAGS = cq
 
 # Under CX/UX, we want to tell the compiler to use ANSI mode.
-CFLAGS=-Xa -g
-LDFLAGS=-Xa -g
+CC=cc -Xa
diff --git a/gnu/usr.bin/binutils/config/mh-go32 b/gnu/usr.bin/binutils/config/mh-go32
index 4f9d27a9346..f496b5b260e 100644
--- a/gnu/usr.bin/binutils/config/mh-go32
+++ b/gnu/usr.bin/binutils/config/mh-go32
@@ -1,27 +1,10 @@
-CC=i386-go32-gcc
-AR=i386-go32-ar
-RANLIB=i386-go32-ranlib
-CC_FOR_BUILD=gcc
-HOST_CC=gcc
-HOST_CFLAGS=
+# We don't want to use debugging information on DOS.  Unfortunately,
+# this requires that we set CFLAGS.
 CFLAGS=-O2 -fno-omit-frame-pointer
-HOST_PREFIX=foo
-HOST_PREFIX_1=foo
-RANLIB=i386-go32-ranlib
-AR=i386-go32-ar
-GCC_FOR_TARGET=${target_alias}-gcc
-CXX_FOR_TARGET=${target_alias}-gcc
-CC_FOR_TARGET=${target_alias}-gcc
-AS_FOR_TARGET=${target_alias}-as
-AR_FOR_TARGET=${target_alias}-ar
-NM_FOR_TARGET=${target_alias}-nm
-RANLIB_FOR_TARGET=${target_alias}-ranlib
-HOST_PREFIX=cross
-HOST_PREFIX_1=cross
+
+# We set MAKEINFOFLAGS to not split .info files, because the resulting
+# file names don't work on DOS.
 MAKEINFOFLAGS=--no-split
 
+# This does some sort of DOS specific installation, I guess.
 INSTALL_DOSREL=install-dosrel
-
-
-
-
diff --git a/gnu/usr.bin/binutils/config/mh-i386win32 b/gnu/usr.bin/binutils/config/mh-i386win32
deleted file mode 100644
index 6f6d998e7d7..00000000000
--- a/gnu/usr.bin/binutils/config/mh-i386win32
+++ /dev/null
@@ -1,26 +0,0 @@
-CC=i386-win32-gcc
-AR=i386-win32-ar
-ARFLAGS=rv
-RANLIB=i386-win32-ranlib
-BISON=byacc
-CC_FOR_BUILD=gcc
-HOST_CC=gcc
-HOST_CFLAGS=
-CFLAGS=-O2
-CXXFLAGS=-O2 
-HOST_PREFIX=foo
-HOST_PREFIX_1=foo
-RANLIB=i386-win32-ranlib
-AR=i386-win32-ar
-GCC_FOR_TARGET=${target_alias}-gcc
-CXX_FOR_TARGET=${target_alias}-gcc
-CC_FOR_TARGET=${target_alias}-gcc
-AS_FOR_TARGET=${target_alias}-as
-DLLTOOL_FOR_TARGET=${target_alias}-dlltool
-AR_FOR_TARGET=${target_alias}-ar
-NM_FOR_TARGET=${target_alias}-nm
-RANLIB_FOR_TARGET=${target_alias}-ranlib
-LD_FOR_TARGET=${target_alias}-ld
-HOST_PREFIX=cross
-HOST_PREFIX_1=cross
-MAKEINFOFLAGS=--no-split
diff --git a/gnu/usr.bin/binutils/config/mh-ncrsvr43 b/gnu/usr.bin/binutils/config/mh-ncrsvr43
index 4717f67efaf..43b09912ca9 100644
--- a/gnu/usr.bin/binutils/config/mh-ncrsvr43
+++ b/gnu/usr.bin/binutils/config/mh-ncrsvr43
@@ -1,8 +1,8 @@
 # Host configuration file for an NCR 3000 (i486/SVR43) system.
 
 # The MetaWare compiler will generate a copyright message unless you
-# turn it off.
-CFLAGS = -g -Hnocopyr
+# turn it off by adding the -Hnocopyr flag.
+CC = cc -Hnocopyr
 
 # Define SYSV as -DSYSV if you are using a System V operating system.
 SYSV = -DSYSV -DSVR4
diff --git a/gnu/usr.bin/binutils/config/mh-solaris b/gnu/usr.bin/binutils/config/mh-solaris
index 7170cae1a88..ddbea549b93 100644
--- a/gnu/usr.bin/binutils/config/mh-solaris
+++ b/gnu/usr.bin/binutils/config/mh-solaris
@@ -2,6 +2,5 @@
 
 SYSV = -DSYSV
 RANLIB = true
-CFLAGS = -g 
 
 X11_EXTRA_LIBS = -lnsl -lsocket
diff --git a/gnu/usr.bin/binutils/config/mh-sparcpic b/gnu/usr.bin/binutils/config/mh-sparcpic
index 92e48d90fbd..35cf2c8ee4e 100644
--- a/gnu/usr.bin/binutils/config/mh-sparcpic
+++ b/gnu/usr.bin/binutils/config/mh-sparcpic
@@ -1 +1 @@
-PICFLAG=-fpic
+PICFLAG=-fPIC
diff --git a/gnu/usr.bin/binutils/config/mpw-mh-mpw b/gnu/usr.bin/binutils/config/mpw-mh-mpw
index a41dff0bef0..38168d11bb3 100644
--- a/gnu/usr.bin/binutils/config/mpw-mh-mpw
+++ b/gnu/usr.bin/binutils/config/mpw-mh-mpw
@@ -11,7 +11,7 @@ CC_MPW_C = C -d MPW_C -d ALMOST_STDC -d ANSI_PROTOTYPES -d MPW -mc68020 -model f
 
 CC_SC = SC -d ALMOST_STDC -d ANSI_PROTOTYPES -d MPW -mc68020 -model far -b -i '' -i :
 
-CC_MWC68K = MWC68K -d MPW -i "{topsrcdir}"include:mpw:sys: -sym on
+CC_MWC68K = MWC68K -d MPW -enum int -mpw_chars -sym on -w off -mc68020 -model far
 
 CC_PPCC = PPCC -d powerc=1 -d pascal= -d ALMOST_STDC -d ANSI_PROTOTYPES -d MPW -w
 
@@ -50,12 +50,14 @@ SEGFLAG_PPC = -d dumdum_
 
 AR_LIB = Lib
 
-AR_MWLINK68K = MWLink68K
+AR_MWLINK68K = MWLink68K -xm library
 
 AR_PPCLINK = PPCLink -xm library
 
 AR_MWLINKPPC = MWLinkPPC -xm library
 
+AR_AR = ar
+
 AR_FLAGS = -o
 
 RANLIB_NULL = null-command
@@ -66,7 +68,7 @@ RANLIB_RANLIB = ranlib
 
 CC_LD_LINK = Link -w -d -model far {CC_LD_TOOL_FLAGS}
 
-CC_LD_MWLINK68K = MWLink68K -w -d -model far {CC_LD_TOOL_FLAGS} -sym on
+CC_LD_MWLINK68K = MWLink68K -w {CC_LD_TOOL_FLAGS} -sym on -model far
 
 CC_LD_PPCLINK = PPCLink -main __start -outputformat xcoff
 
@@ -102,6 +104,16 @@ EXTRALIBS_C = \Option-d
 	"{Libraries}"Interface.o \Option-d
 	"{Libraries}"ToolLibs.o
 
+EXTRALIBS_MWC68K = \Option-d
+	"{CLibraries}"StdClib.o \Option-d
+	"{CLibraries}"Math.o \Option-d
+	"{CLibraries}"CSANELib.o \Option-d
+	"{Libraries}"Stubs.o \Option-d
+	"{Libraries}"Runtime.o \Option-d
+	"{Libraries}"Interface.o \Option-d
+	"{Libraries}"ToolLibs.o \Option-d
+	"{MW68KLibraries}MPW ANSI (4i) C.68K.Lib"
+
 EXTRALIBS_PPC = \Option-d
 	"{PPCLibraries}"StdCRuntime.o \Option-d
 	"{PPCLibraries}"InterfaceLib.xcoff \Option-d
diff --git a/gnu/usr.bin/binutils/config/mt-v810 b/gnu/usr.bin/binutils/config/mt-v810
index c5d2a889f5e..97da6c26592 100644
--- a/gnu/usr.bin/binutils/config/mt-v810
+++ b/gnu/usr.bin/binutils/config/mt-v810
@@ -1,9 +1,4 @@
-CC = ca732
-AS = as732
-AR = ar732
-RANLIB = true
-NEWLIB_CFLAGS =
-TARGET_CFLAGS =
-CFLAGS =
-INCLUDES =
-
+CC_FOR_TARGET = ca732 -ansi
+AS_FOR_TARGET = as732
+AR_FOR_TARGET = ar732
+RANLIB_FOR_TARGET = true