xm-mvs.h, [...]: Delete references to the USG macro.

	* config/i370/xm-mvs.h, config/i370/xm-oe.h,
	config/i386/xm-beos.h, config/i386/xm-mingw32.h,
	config/m88k/xm-m88k.h, config/mips/xm-iris6.h,
	config/mips/xm-openbsd.h, config/pa/xm-pa64hpux.h,
	config/pa/xm-pahpux.h, config/rs6000/xm-beos.h,
	config/rs6000/xm-darwin.h, config/rs6000/xm-mach.h,
	config/rs6000/xm-rs6000.h, config/xm-interix.h: Delete references
	to the USG macro.

	* config/vax/xm-vaxv.h, config/a29k/xm-unix.h,
	config/i370/xm-i370.h, config/i386/xm-dgux.h,
	config/i386/xm-sun.h, config/i386/xm-sysv3.h,
	config/m68k/xm-tower.h, config/m68k/xm-aux.h,
	config/m68k/xm-hp320.h, config/m68k/xm-amix.h,
	config/m68k/xm-altos3068.h, config/m68k/xm-mot3300.h,
	config/m68k/xm-m68kv.h, config/m88k/xm-openbsd.h,
	config/mips/xm-nws3250v4.h, config/mips/xm-sysv.h,
	config/mips/xm-iris3.h, config/mips/xm-iris4.h, config/xm-svr3.h,
	config/xm-svr4.h, config/sparc/xm-pbd.h, config/clipper/xm-clix.h:
	Delete unused and/or empty files.

	* config.gcc: Define USG in xm_defines as appropriate.  Define
	POSIX in lieu of xm-svr4.h.  Delete all references to the SVR3
	macro.  Remove deleted xm-* files from $xm_files variable.

From-SVN: r40310

gcc/ChangeLog

+2001-03-07  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* config/i370/xm-mvs.h, config/i370/xm-oe.h,
+	config/i386/xm-beos.h, config/i386/xm-mingw32.h,
+	config/m88k/xm-m88k.h, config/mips/xm-iris6.h,
+	config/mips/xm-openbsd.h, config/pa/xm-pa64hpux.h,
+	config/pa/xm-pahpux.h, config/rs6000/xm-beos.h,
+	config/rs6000/xm-darwin.h, config/rs6000/xm-mach.h,
+	config/rs6000/xm-rs6000.h, config/xm-interix.h: Delete references
+	to the USG macro.
+
+	* config/vax/xm-vaxv.h, config/a29k/xm-unix.h,
+	config/i370/xm-i370.h, config/i386/xm-dgux.h,
+	config/i386/xm-sun.h, config/i386/xm-sysv3.h,
+	config/m68k/xm-tower.h, config/m68k/xm-aux.h,
+	config/m68k/xm-hp320.h, config/m68k/xm-amix.h,
+	config/m68k/xm-altos3068.h, config/m68k/xm-mot3300.h,
+	config/m68k/xm-m68kv.h, config/m88k/xm-openbsd.h,
+	config/mips/xm-nws3250v4.h, config/mips/xm-sysv.h,
+	config/mips/xm-iris3.h, config/mips/xm-iris4.h, config/xm-svr3.h,
+	config/xm-svr4.h, config/sparc/xm-pbd.h, config/clipper/xm-clix.h:
+	Delete unused and/or empty files.
+
+	* config.gcc: Define USG in xm_defines as appropriate.  Define
+	POSIX in lieu of xm-svr4.h.  Delete all references to the SVR3
+	macro.  Remove deleted xm-* files from $xm_files variable.
+
 2001-03-07  Tom Tromey  <tromey@redhat.com>
 
 	* configure: Rebuilt.

gcc/config.gcc

@@ -357,6 +357,7 @@ alpha-*-interix)
 	# GAS + IEEE_CONFORMANT
 	target_cpu_default="MASK_GAS|MASK_IEEE_CONFORMANT"
 
+	xm_defines=USG
 	xm_file="alpha/xm-alpha-interix.h xm-interix.h"
 	xmake_file=x-interix
 	tmake_file="alpha/t-alpha alpha/t-interix alpha/t-ieee"
@@ -609,7 +610,7 @@ c4x-*)
 	;;
 clipper-intergraph-clix*)
 	tm_file="${tm_file} svr3.h clipper/clix.h"
-	xm_file=clipper/xm-clix.h
+	xm_defines=USG
 	extra_headers=va-clipper.h
 	extra_parts="crtbegin.o crtend.o"
 	install_headers_dir=install-headers-cpio
@@ -693,6 +694,7 @@ hppa1.0-*-bsd*)
 	;;
 hppa1.0-*-hpux7*)
 	tm_file="pa/pa-oldas.h ${tm_file} pa/pa32-regs.h pa/som.h pa/pa-hpux7.h"
+	xm_defines=USG
 	xm_file=pa/xm-pahpux.h
 	xmake_file=pa/x-pa-hpux
 	if test x$gas = xyes
@@ -704,6 +706,7 @@ hppa1.0-*-hpux7*)
 	;;
 hppa1.0-*-hpux8.0[0-2]*)
 	tm_file="${tm_file} pa/pa32-regs.h pa/som.h pa/pa-hpux.h"
+	xm_defines=USG
 	xm_file=pa/xm-pahpux.h
 	xmake_file=pa/x-pa-hpux
 	if test x$gas = xyes
@@ -718,6 +721,7 @@ hppa1.0-*-hpux8.0[0-2]*)
 hppa1.1-*-hpux8.0[0-2]*)
 	target_cpu_default="MASK_PA_11"
 	tm_file="${tm_file} pa/pa32-regs.h pa/som.h pa/pa-hpux.h"
+	xm_defines=USG
 	xm_file=pa/xm-pahpux.h
 	xmake_file=pa/x-pa-hpux
 	if test x$gas = xyes
@@ -732,6 +736,7 @@ hppa1.1-*-hpux8.0[0-2]*)
 hppa1.1-*-hpux8*)
 	target_cpu_default="MASK_PA_11"
 	tm_file="${tm_file} pa/pa32-regs.h pa/som.h pa/pa-hpux.h"
+	xm_defines=USG
 	xm_file=pa/xm-pahpux.h
 	xmake_file=pa/x-pa-hpux
 	if test x$gas = xyes
@@ -743,6 +748,7 @@ hppa1.1-*-hpux8*)
 	;;
 hppa1.0-*-hpux8*)
 	tm_file="${tm_file} pa/pa32-regs.h pa/som.h pa/pa-hpux.h"
+	xm_defines=USG
 	xm_file=pa/xm-pahpux.h
 	xmake_file=pa/x-pa-hpux
 	if test x$gas = xyes
@@ -756,6 +762,7 @@ hppa1.1-*-hpux10* | hppa2*-*-hpux10*)
 	target_cpu_default="MASK_PA_11"
 	tm_file="${tm_file} pa/pa32-regs.h pa/long_double.h pa/som.h pa/pa-hpux.h pa/pa-hpux10.h"
 	float_format=i128
+	xm_defines=USG
 	xm_file=pa/xm-pahpux.h
 	xmake_file=pa/x-pa-hpux
 	tmake_file=pa/t-pa
@@ -777,6 +784,7 @@ hppa1.1-*-hpux10* | hppa2*-*-hpux10*)
 hppa1.0-*-hpux10*)
 	tm_file="${tm_file} pa/pa32-regs.h pa/long_double.h pa/som.h pa/pa-hpux.h pa/pa-hpux10.h"
 	float_format=i128
+	xm_defines=USG
 	xm_file=pa/xm-pahpux.h
 	xmake_file=pa/x-pa-hpux
 	tmake_file=pa/t-pa
@@ -796,6 +804,7 @@ hppa1.0-*-hpux10*)
 	use_collect2=yes
 	;;
 hppa*64*-*-hpux11*)
+	xm_defines=USG
 	xm_file=pa/xm-pa64hpux.h
 	xmake_file=pa/x-pa-hpux
 	tmake_file=pa/t-pa
@@ -822,6 +831,7 @@ hppa1.1-*-hpux11* | hppa2*-*-hpux11*)
 	target_cpu_default="MASK_PA_11"
 	tm_file="${tm_file} pa/pa32-regs.h pa/long_double.h pa/som.h pa/pa-hpux.h pa/pa-hpux11.h"
 	float_format=i128
+	xm_defines=USG
 	xm_file=pa/xm-pahpux.h
 	xmake_file=pa/x-pa-hpux
 	tmake_file=pa/t-pa
@@ -842,6 +852,7 @@ hppa1.1-*-hpux11* | hppa2*-*-hpux11*)
 hppa1.0-*-hpux11*)
 	tm_file="${tm_file} pa/pa32-regs.h pa/long_double.h pa/som.h pa/pa-hpux.h pa/pa-hpux11.h"
 	float_format=i128
+	xm_defines=USG
 	xm_file=pa/xm-pahpux.h
 	xmake_file=pa/x-pa-hpux
 	if test x$gas = xyes
@@ -861,6 +872,7 @@ hppa1.0-*-hpux11*)
 hppa1.1-*-hpux* | hppa2*-*-hpux*)
 	target_cpu_default="MASK_PA_11"
 	tm_file="${tm_file} pa/pa32-regs.h pa/som.h pa/pa-hpux.h pa/pa-hpux9.h"
+	xm_defines=USG
 	xm_file=pa/xm-pahpux.h
 	xmake_file=pa/x-pa-hpux
 	if test x$gas = xyes
@@ -872,6 +884,7 @@ hppa1.1-*-hpux* | hppa2*-*-hpux*)
 	;;
 hppa1.0-*-hpux*)
 	tm_file="${tm_file} pa/pa32-regs.h pa/som.h pa/pa-hpux.h pa/pa-hpux9.h"
+	xm_defines=USG
 	xm_file=pa/xm-pahpux.h
 	xmake_file=pa/x-pa-hpux
 	if test x$gas = xyes
@@ -884,6 +897,7 @@ hppa1.0-*-hpux*)
 hppa1.1-*-hiux* | hppa2*-*-hiux*)
 	target_cpu_default="MASK_PA_11"
 	tm_file="${tm_file} pa/pa32-regs.h pa/som.h pa/pa-hpux.h pa/pa-hiux.h"
+	xm_defines=USG
 	xm_file=pa/xm-pahpux.h
 	xmake_file=pa/x-pa-hpux
 	if test x$gas = xyes
@@ -895,6 +909,7 @@ hppa1.1-*-hiux* | hppa2*-*-hiux*)
 	;;
 hppa1.0-*-hiux*)
 	tm_file="${tm_file} pa/pa32-regs.h pa/som.h pa/pa-hpux.h pa/pa-hiux.h"
+	xm_defines=USG
 	xm_file=pa/xm-pahpux.h
 	xmake_file=pa/x-pa-hpux
 	if test x$gas = xyes
@@ -918,12 +933,14 @@ hppa*-*-mpeix*)
 	use_collect2=yes 
 	;; 
 i370-*-opened*)			 # IBM 360/370/390 Architecture
+	xm_defines=USG
 	xm_file=i370/xm-oe.h
 	tm_file=i370/oe.h
 	xmake_file=i370/x-oe
 	tmake_file=i370/t-oe
 	;;
 i370-*-mvs*)
+	xm_defines=USG
 	xm_file=i370/xm-mvs.h
 	tm_file=i370/mvs.h
 	tmake_file=i370/t-mvs
@@ -944,7 +961,7 @@ i370-*-linux*)
 	fi
 	;;
 i[34567]86-*-chorusos*)
-	xm_file="${xm_file} xm-svr4.h"
+	xm_defines='USG POSIX'
 	tm_file="i386/i386.h i386/att.h elfos.h i386/i386afe.h i386/i386elf.h i386/chorus.h"
 	tmake_file=i386/t-i386elf
 	xmake_file=x-svr4
@@ -955,7 +972,7 @@ i[34567]86-*-chorusos*)
 	esac
 	;;
 i[34567]86-*-elf*)
-	xm_file="${xm_file} xm-svr4.h"
+	xm_defines='USG POSIX'
 	tm_file="i386/i386.h i386/att.h elfos.h i386/i386afe.h i386/i386elf.h"
 	tmake_file=i386/t-i386elf
 	xmake_file=x-svr4
@@ -1010,7 +1027,7 @@ i[34567]86-sequent-bsd*) 		# 80386 from Sequent
 	fi
 	;;
 i[34567]86-sequent-ptx1*)
-	xm_defines="USG SVR3"
+	xm_defines=USG
 	xmake_file=i386/x-sysv3
 	tm_file=i386/seq-sysv3.h
 	tmake_file=i386/t-crtstuff
@@ -1018,7 +1035,7 @@ i[34567]86-sequent-ptx1*)
 	install_headers_dir=install-headers-cpio
 	;;
 i[34567]86-sequent-ptx2* | i[34567]86-sequent-sysv3*)
-	xm_defines="USG SVR3"
+	xm_defines=USG
 	xmake_file=i386/x-sysv3
 	tm_file=i386/seq2-sysv3.h
 	tmake_file=i386/t-crtstuff
@@ -1052,6 +1069,7 @@ i[34567]86-*-aout*)
 	tmake_file=i386/t-i386bare
 	;;
 i[34567]86-*-beoself* | i[34567]86-*-beos*)
+	xm_defines=USG
 	xm_file=i386/xm-beos.h
 	tmake_file='i386/t-beos i386/t-crtpic'
 	tm_file=i386/beos-elf.h
@@ -1101,7 +1119,7 @@ i[34567]86-*-coff*)
 	;;
 i[34567]86-*-isc*)		# 80386 running ISC system
 	xm_file="${xm_file} i386/xm-isc.h"
-	xm_defines="USG SVR3"
+	xm_defines=USG
 	case $machine in
 	  i[34567]86-*-isc[34]*)
 	    xmake_file=i386/x-isc3
@@ -1247,7 +1265,7 @@ i[34567]86-*-rtems*|i[34567]86-*-rtemself*)
 	;;
 i[34567]86-*-sco3.2v5*)	# 80386 running SCO Open Server 5
 	xm_file="${xm_file} i386/xm-sco5.h"
-	xm_defines="USG SVR3"
+	xm_defines=USG
 	xmake_file=i386/x-sco5
 	install_headers_dir=install-headers-cpio
 	tm_file=i386/sco5.h
@@ -1263,7 +1281,7 @@ i[34567]86-*-sco3.2v5*)	# 80386 running SCO Open Server 5
 	;;
 i[34567]86-*-sco3.2v4*) 	# 80386 running SCO 3.2v4 system
 	xm_file="${xm_file} i386/xm-sco.h"
-	xm_defines="USG SVR3 BROKEN_LDEXP SMALL_ARG_MAX"
+	xm_defines="USG BROKEN_LDEXP SMALL_ARG_MAX"
 	xmake_file=i386/x-sco4
 	install_headers_dir=install-headers-cpio
         if test x$stabs = xyes
@@ -1358,8 +1376,8 @@ i[34567]86-*-udk*)      # Intel x86 on SCO UW/OSR5 Dev Kit
 	;;
 i[34567]86-*-osf1*)		# Intel 80386's running OSF/1 1.3+
 	cpu_type=i386
-	xm_file="${xm_file} xm-svr4.h i386/xm-osf1elf.h"
-	xm_defines="USE_C_ALLOCA SMALL_ARG_MAX"
+	xm_file="${xm_file} i386/xm-osf1elf.h"
+	xm_defines='USG POSIX USE_C_ALLOCA SMALL_ARG_MAX'
 	if test x$stabs = xyes
 	then
 		tm_file=i386/osf1elfgdb.h
@@ -1371,7 +1389,7 @@ i[34567]86-*-osf1*)		# Intel 80386's running OSF/1 1.3+
 	extra_parts="crti.o crtn.o crtbegin.o crtend.o"
 	;;
 i[34567]86-*-sysv*)		# Intel 80386's running system V
-	xm_defines="USG SVR3"
+	xm_defines=USG
 	xmake_file=i386/x-sysv3
 	if test x$gas = xyes
 	then
@@ -1425,6 +1443,7 @@ i[34567]86-*-pe | i[34567]86-*-cygwin*)
 i[34567]86-*-mingw32*)
 	tm_file=i386/mingw32.h
 	float_format=i386
+	xm_defines=USG
 	xm_file="${xm_file} i386/xm-mingw32.h"
 	tmake_file="i386/t-cygwin i386/t-mingw32"
 	extra_objs=winnt.o
@@ -1493,16 +1512,16 @@ i860-*-mach*)
 	;;
 i860-*-osf*)			# Intel Paragon XP/S, OSF/1AD
 	tm_file="${tm_file} svr3.h i860/paragon.h"
-	xm_defines="USG SVR3"
+	xm_defines=USG
 	;;
 i860-*-sysv3*)
 	tm_file="${tm_file} svr3.h i860/sysv3.h"
-	xm_defines="USG SVR3"
+	xm_defines=USG
 	extra_parts="crtbegin.o crtend.o"
 	;;
 i860-*-sysv4*)
 	tm_file="${tm_file} svr4.h i860/sysv4.h"
-	xm_defines="USG SVR3"
+	xm_defines=USG
 	xmake_file=i860/x-sysv4
 	tmake_file=t-svr4
 	extra_parts="crtbegin.o crtend.o"
@@ -1698,7 +1717,7 @@ m68k-atari-sysv4*)              # Atari variant of V.4.
 	;;
 m68k-motorola-sysv*)
 	tm_file=m68k/mot3300.h
-	xm_file="m68k/xm-mot3300.h ${xm_file}"
+	xm_defines=USG
 	if test x$gas = xyes
 	then
 		xmake_file=m68k/x-mot3300-gas
@@ -1726,7 +1745,7 @@ m68k-motorola-sysv*)
 	;;
 m68k-ncr-sysv*)			# NCR Tower 32 SVR3
 	tm_file=m68k/tower-as.h
-	xm_defines="USG SVR3"
+	xm_defines=USG
 	xmake_file=m68k/x-tower
 	extra_parts="crtbegin.o crtend.o"
 	extra_headers=math-68881.h
@@ -1913,7 +1932,7 @@ m68k-*-coff*)
 	;;
 m68020-*-elf* | m68k-*-elf*)
 	tm_file="m68k/m68020-elf.h"
-	xm_file=m68k/xm-m68kv.h
+	xm_defines=USG
 	tmake_file=m68k/t-m68kelf
 	header_files=math-68881.h
 	;;
@@ -2013,6 +2032,7 @@ m68k-*-rtemself*|m68k-*-rtems*)
 	fi
 	;;
 m88k-dg-dgux*)
+	xm_defines=USG
 	case $machine in
 	  m88k-dg-dguxbcs*)
 	    tm_file=m88k/dguxbcs.h
@@ -2031,6 +2051,7 @@ m88k-dg-dgux*)
 	fi
 	;;
 m88k-dolphin-sysv3*)
+	xm_defines=USG
 	tm_file=m88k/dolph.h
 	extra_parts="crtbegin.o crtend.o"
 	xmake_file=m88k/x-dolph
@@ -2040,6 +2061,7 @@ m88k-dolphin-sysv3*)
 	fi
 	;;
 m88k-tektronix-sysv3)
+	xm_defines=USG
 	tm_file=m88k/tekXD88.h
 	extra_parts="crtbegin.o crtend.o"
 	xmake_file=m88k/x-tekXD88
@@ -2049,9 +2071,11 @@ m88k-tektronix-sysv3)
 	fi
 	;;
 m88k-*-aout*)
+	xm_defines=USG
 	tm_file=m88k/m88k-aout.h
 	;;
 m88k-*-coff*)
+	xm_defines=USG
 	tm_file=m88k/m88k-coff.h
 	tmake_file=m88k/t-bug
 	;;
@@ -2068,9 +2092,10 @@ m88k-*-luna*)
 m88k-*-openbsd*)
 	tmake_file="${tmake_file} m88k/t-luna-gas"
 	tm_file="m88k/aout-dbx.h aoutos.h m88k/m88k.h openbsd.h ${tm_file}"
-	xm_file="xm-openbsd.h m88k/xm-m88k.h ${xm_file}"
+	xm_file='m88k/xm-m88k.h xm-openbsd.h'
 	;;
 m88k-*-sysv3*)
+	xm_defines=USG
 	tm_file=m88k/sysv3.h
 	extra_parts="crtbegin.o crtend.o"
 	if test x$gas = xyes
@@ -2079,6 +2104,7 @@ m88k-*-sysv3*)
 	fi
 	;;
 m88k-*-sysv4*)
+	xm_defines=USG
 	tm_file=m88k/sysv4.h
 	extra_parts="crtbegin.o crtend.o"
 	xmake_file=m88k/x-sysv4
@@ -2100,7 +2126,8 @@ mips-sgi-irix6*)		# SGI System V.4., IRIX 6
 		tm_file=mips/iris6.h
 	fi
 	tmake_file=mips/t-iris6
-	xm_file=mips/xm-iris6.h
+	xm_defines=USG
+	xm_file='mips/xm-mips.h mips/xm-iris6.h'
 	xmake_file=mips/x-iris6
 #	if test x$enable_threads = xyes; then
 #		thread_file='irix'
@@ -2659,6 +2686,7 @@ powerpc-*-openbsd*)
 powerpc-*-beos*)
 	cpu_type=rs6000
 	tm_file="${tm_file} rs6000/aix.h rs6000/beos.h"
+	xm_defines=USG
 	xm_file=rs6000/xm-beos.h
 	tmake_file=rs6000/t-beos
 	xmake_file=rs6000/x-beos
@@ -2676,6 +2704,7 @@ powerpc-*-sysv*)
 	xmake_file=rs6000/x-sysv4
 	;;
 powerpc-*-chorusos*)
+	xm_defines=USG
 	tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/chorus.h"
 	tmake_file="rs6000/t-ppcos rs6000/t-ppccomm"
 	extra_headers=ppc-asm.h
@@ -2686,26 +2715,31 @@ powerpc-*-chorusos*)
 	esac
 	;;
 powerpc-*-eabiaix*)
+	xm_defines=USG
 	tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/eabi.h rs6000/eabiaix.h"
 	tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
 	extra_headers=ppc-asm.h
 	;;
 powerpc-*-eabisim*)
+	xm_defines=USG
 	tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/eabi.h rs6000/eabisim.h"
 	tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
 	extra_headers=ppc-asm.h
 	;;
 powerpc-*-elf*)
+	xm_defines=USG
 	tm_file="${tm_file} svr4.h rs6000/sysv4.h"
 	tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
 	extra_headers=ppc-asm.h
 	;;
 powerpc-*-eabi*)
+	xm_defines=USG
 	tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/eabi.h"
 	tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
 	extra_headers=ppc-asm.h
 	;;
 powerpc-*-rtems*)
+	xm_defines=USG
 	tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/eabi.h rtems.h rs6000/rtems.h"
 	tmake_file="rs6000/t-ppcgas t-rtems rs6000/t-ppccomm"
 	extra_headers=ppc-asm.h
@@ -2715,6 +2749,7 @@ powerpc-*-rtems*)
 	;;
 powerpc-*-linux*libc1)
 	tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/linux.h"
+	xm_defines=USG
 	xm_file=rs6000/xm-sysv4.h
 	out_file=rs6000/rs6000.c
 	tmake_file="rs6000/t-ppcos t-linux t-linux-gnulibc1 rs6000/t-ppccomm"
@@ -2763,16 +2798,19 @@ powerpcle-*-sysv*)
 	extra_headers=ppc-asm.h
 	;;
 powerpcle-*-elf*)
+	xm_defines=USG
 	tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/sysv4le.h"
 	tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
 	extra_headers=ppc-asm.h
 	;;
 powerpcle-*-eabisim*)
+	xm_defines=USG
 	tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/sysv4le.h rs6000/eabi.h rs6000/eabisim.h"
 	tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
 	extra_headers=ppc-asm.h
 	;;
 powerpcle-*-eabi*)
+	xm_defines=USG
 	tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/sysv4le.h rs6000/eabi.h"
 	tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
 	extra_headers=ppc-asm.h
@@ -2786,18 +2824,21 @@ powerpcle-*-solaris2*)
 	extra_headers=ppc-asm.h
 	;;
 rs6000-ibm-aix3.[01]*)
+	xm_defines=USG
 	tm_file="${tm_file} rs6000/aix.h rs6000/aix31.h"
 	xmake_file=rs6000/x-aix31
 	float_format=none
 	use_collect2=yes
 	;;
 rs6000-ibm-aix3.2.[456789]* | powerpc-ibm-aix3.2.[456789]*)
+	xm_defines=USG
 	tm_file="${tm_file} rs6000/aix.h rs6000/aix3newas.h"
 	tmake_file=rs6000/t-newas
 	float_format=none
 	use_collect2=yes
 	;;
 rs6000-ibm-aix4.[12]* | powerpc-ibm-aix4.[12]*)
+	xm_defines=USG
 	tm_file="${tm_file} rs6000/aix.h rs6000/aix41.h"
 	tmake_file=rs6000/t-newas
 	xmake_file=rs6000/x-aix41
@@ -2805,6 +2846,7 @@ rs6000-ibm-aix4.[12]* | powerpc-ibm-aix4.[12]*)
 	use_collect2=yes
 	;;
 rs6000-ibm-aix4.[3456789]* | powerpc-ibm-aix4.[3456789]*)
+	xm_defines=USG
 	tm_file="${tm_file} rs6000/aix.h rs6000/aix43.h"
 	tmake_file=rs6000/t-aix43
 	xmake_file=rs6000/x-aix41
@@ -2813,6 +2855,7 @@ rs6000-ibm-aix4.[3456789]* | powerpc-ibm-aix4.[3456789]*)
 	thread_file='aix'
 	;;
 rs6000-ibm-aix[56789].* | powerpc-ibm-aix[56789].*)
+	xm_defines=USG
 	tm_file="${tm_file} rs6000/aix.h rs6000/aix51.h"
 	tmake_file=rs6000/t-aix43
 	xmake_file=rs6000/x-aix41
@@ -2821,17 +2864,20 @@ rs6000-ibm-aix[56789].* | powerpc-ibm-aix[56789].*)
 	thread_file='aix'
 	;;
 rs6000-ibm-aix*)
+	xm_defines=USG
 	tm_file="${tm_file} rs6000/aix.h"
 	float_format=none
 	use_collect2=yes
 	;;
 rs6000-bull-bosx)
+	xm_defines=USG
 	tm_file="${tm_file} rs6000/aix.h"
 	float_format=none
 	use_collect2=yes
 	;;
 rs6000-*-mach*)
 	tm_file=rs6000/mach.h
+	xm_defines=USG
 	xm_file="${xm_file} rs6000/xm-mach.h"
 	xmake_file=rs6000/x-mach
 	use_collect2=yes
@@ -3255,7 +3301,7 @@ vax-*-*)			# vax default entry
 	float_format=vax
 	;;
 we32k-att-sysv*)
-	xm_file="${xm_file} xm-svr3"
+	xm_defines=USG
 	use_collect2=yes
 	;;
 xscale-*-elf)

gcc/config/a29k/xm-unix.h

-/* Configuration for GNU C-compiler for AMD Am29000 processor. 
-   Copyright (C) 1987, 1988, 1993, 2001 Free Software Foundation, Inc.
-
-This file is part of GNU CC.
-
-GNU CC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU CC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-/* This describes the machine the compiler is hosted on.  */
-#define HOST_WORDS_BIG_ENDIAN
-
-/* Ultra is V7, which is closest to USG.  */
-#define USG

gcc/config/clipper/xm-clix.h

-/* Config file for Clipper running Clix, system V. 3.2 clone  */
-
-#define USG

gcc/config/i370/xm-i370.h

-/* Configuration for GNU C-compiler for System/370.
-   Copyright (C) 1989, 1993, 1997, 2001 Free Software Foundation, Inc.
-   Contributed by Jan Stein (jan@cd.chalmers.se).
-   Modified for MVS C/370 by Dave Pitts (dpitts@nyx.cs.du.edu)
-
-This file is part of GNU CC.
-
-GNU CC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU CC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-/* This describes the machine the compiler is hosted on.  */
-
-#define HOST_FLOAT_FORMAT	IBM_FLOAT_FORMAT
-#define HOST_EBCDIC		1
-
-#define USG
-
-/* Arguments to use with `exit'.  */
-#define FATAL_EXIT_CODE		12

gcc/config/i370/xm-mvs.h

@@ -25,7 +25,5 @@ Boston, MA 02111-1307, USA.  */
 #define HOST_FLOAT_FORMAT	IBM_FLOAT_FORMAT
 #define HOST_EBCDIC		1
 
-#define USG
-
 /* Arguments to use with `exit'.  */
 #define FATAL_EXIT_CODE		12

gcc/config/i370/xm-oe.h

@@ -29,7 +29,5 @@ Boston, MA 02111-1307, USA.  */
 
 #define ONLY_INT_FIELDS		1
 
-#define USG
-
 /* Arguments to use with `exit'.  */
 #define FATAL_EXIT_CODE		12

gcc/config/i386/xm-beos.h

@@ -34,10 +34,6 @@ Boston, MA 02111-1307, USA.  */
 #undef bcopy
 #define bcopy(s,d,n)	memmove((d),(s),(n))
 
-/* BeOS is closer to USG than BSD */
-
-#define USG
-
 /* Define various things that the BeOS host has. */
 
 #ifndef HAVE_VPRINTF

gcc/config/i386/xm-dgux.h

-/* Configuration for GCC for Intel i386 running DG/ux */
-
-/* looks just like sysv4 for now */
-
-#include "i386/xm-i386.h"
-#include "xm-svr4.h"

gcc/config/i386/xm-mingw32.h

@@ -19,10 +19,6 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA. */
 
-#ifndef USG
-#define USG 1
-#endif
-
 #ifndef ONLY_INT_FIELD
 #define ONLY_INT_FIELDS 1
 #endif

gcc/config/i386/xm-sun.h

-/* Configuration for GNU C-compiler for Intel 80386 running SunOS 4.0.
-   Copyright (C) 1988, 1997 Free Software Foundation, Inc.
-
-This file is part of GNU CC.
-
-GNU CC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU CC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-#define USG
-
-#include "i386/xm-i386.h"

gcc/config/i386/xm-sysv3.h

-/* Configuration for GCC for Intel i386 running System V Release 3.  */
-
-#include "i386/xm-i386.h"
-#include "xm-svr3.h"

gcc/config/m68k/xm-altos3068.h

-#define USG
-
-#include "m68k/xm-m68k.h"

gcc/config/m68k/xm-amix.h

-/* Definitions of host machine for GNU compiler.
-   Commodore Amiga A3000UX version.
-   Copyright (C) 1991, 1997, 2001 Free Software Foundation, Inc.
-
-This file is part of GNU CC.
-
-GNU CC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU CC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-#include "m68k/xm-m68kv.h"	/* Use the System V flavor of m68k host */

gcc/config/m68k/xm-aux.h

-#ifndef USG
-#define USG
-#endif
-
-#include "m68k/xm-m68k.h"

gcc/config/m68k/xm-hp320.h

-/* USG is needed to prevent trying to use getrusage and getwd.  */
-#define USG
-
-#include "m68k/xm-m68k.h"

gcc/config/m68k/xm-m68kv.h

-/* Host environment for 68000's running System V.  */
-
-#include "m68k/xm-m68k.h"
-
-#define USG

gcc/config/m68k/xm-mot3300.h

-/* Configuration for GNU C-compiler for Motorola 68000 family.
-   SysV68 Motorola 3300 Delta Series
-   Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001
-   Free Software Foundation, Inc.
-
-This file is part of GNU CC.
-
-GNU CC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU CC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-#define USG 1

gcc/config/m68k/xm-tower.h

-#include "m68k/xm-m68k.h"
-#include "xm-svr3.h"
-
-#define HAVE_VPRINTF

gcc/config/m88k/xm-m88k.h

@@ -23,14 +23,6 @@ Boston, MA 02111-1307, USA.  */
 /* This describes the machine the compiler is hosted on.  */
 #define HOST_WORDS_BIG_ENDIAN
 
-/* The 88open BCS (and ABI) environment doesn't support BSD features
-   (vfork, getrusage), so use USG.  The Omron Luna/88k is BSD though.  */
-#ifndef luna88k
-#ifndef USG
-#define USG
-#endif
-#endif
-
 /* For DG/UX, the best size is different.  */
 #ifdef __DGUX__
 #define OBSTACK_CHUNK_SIZE (8192-16)

gcc/config/m88k/xm-openbsd.h

-/* Configuration file for an host running m88k OpenBSD.
-   Copyright (C) 2000 Free Software Foundation, Inc.
-
-This file is part of GNU CC.
-
-GNU CC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU CC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-/* Remove base m88k idiosyncrasies. */
-#undef USG

gcc/config/mips/xm-iris3.h

-#include "mips/xm-mips.h"
-
-#define USG

gcc/config/mips/xm-iris4.h

-#include "mips/xm-mips.h"
-
-#define USG

gcc/config/mips/xm-iris6.h

-#include "mips/xm-mips.h"
-
-#define USG
-
 #undef HOST_BITS_PER_LONG
 #define HOST_BITS_PER_LONG	_MIPS_SZLONG
-
-#ifndef inhibit_libc
-#include "string.h"
-#endif

gcc/config/mips/xm-nws3250v4.h

-#define USG
-
-#include "xm-mips.h"

gcc/config/mips/xm-openbsd.h

@@ -20,6 +20,3 @@ Boston, MA 02111-1307, USA.  */
 
 #include <xm-openbsd.h>
 #include <mips/xm-mips.h>
-
-/* We're NOT systemV.  */
-#undef USG

gcc/config/mips/xm-sysv.h

-/* Configuration for GNU C-compiler for UMIPS operating system
-   Copyright (C) 1989, 1990, 1991, 1997 Free Software Foundation, Inc.
-
-This file is part of GNU CC.
-
-GNU CC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU CC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-/*
- *  Notes for compiling gcc on umips (v3.0)
- *	- change the -g in the CFLAGS to a -g3 or take it out all together.
- *	- do not define DBX_DEBUGGING_INFO in tm.h, it doesn't exist (unless
- *	you get one from a bsd system)
- */
-
-#define USG
-
-#include "mips/xm-mips.h"

gcc/config/pa/xm-pa64hpux.h

@@ -18,9 +18,6 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-/* HP-UX is a flavor of System V */
-#define USG
-
 /* This describes the machine the compiler is hosted on.  */
 #define HOST_BITS_PER_LONG 64
 

gcc/config/pa/xm-pahpux.h

@@ -19,9 +19,6 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-/* HP-UX is a flavor of System V */
-#define USG
-
 /* This describes the machine the compiler is hosted on.  */
 /* Doubles are stored in memory with the high order word first.  This
    matters when cross-compiling.  */

gcc/config/rs6000/xm-beos.h

@@ -32,10 +32,6 @@ Boston, MA 02111-1307, USA.  */
 #undef bcopy
 #define bcopy(s,d,n)	memmove((d),(s),(n))
 
-/* BeOS is closer to USG than BSD */
-
-#define USG
-
 /* Define various things that the BeOS host has. */
 
 #ifndef HAVE_VPRINTF

gcc/config/rs6000/xm-darwin.h

-/* Undo the USG definition in xm-rs6000.h, Darwin is a BSD flavor.  */
-
-#undef USG
-
 /* Override the usual setting, since Apple's GCC has lame bugs and
    can't handle the initializers.  Someday the bugs will be fixed and
    we can get rid of this silliness.  */

gcc/config/rs6000/xm-mach.h

-#undef USG
 #undef COLLECT_EXPORT_LIST

gcc/config/rs6000/xm-rs6000.h

@@ -27,9 +27,6 @@ Boston, MA 02111-1307, USA.  */
 #define	ONLY_INT_FIELDS
 #endif
 
-/* AIX is a flavor of System V */
-#define	USG
-
 /* Big buffers improve performance.  */
 #define IO_BUFFER_SIZE (0x8000 - 4096)
 

gcc/config/sparc/xm-pbd.h

-/* Host environment for the tti "Unicom" PBB 68020 boards */
-
-#include "sparc/xm-sparc.h"
-
-#define USG

gcc/config/vax/xm-vaxv.h

-/* Config file for Vax running system V.  */
-
-#define USG

gcc/config/xm-interix.h

@@ -21,10 +21,6 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-#ifndef USG
-#define USG 1
-#endif
-
 #ifndef ONLY_INT_FIELDS
 #ifndef __GNUC__
 #define ONLY_INT_FIELDS 1

gcc/config/xm-svr3.h

-/* Configuration for GNU C-compiler for hosts running System V Release 3
-   Copyright (C) 1991, 1993, 1996, 2001 Free Software Foundation, Inc.
-
-This file is part of GNU CC.
-
-GNU CC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU CC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-#define USG

gcc/config/xm-svr4.h

-/* Configuration for GNU C-compiler for hosts running System V Release 4
-   Copyright (C) 1988, 1997 Free Software Foundation, Inc.
-
-This file is part of GNU CC.
-
-GNU CC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU CC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-#define USG
-#define POSIX