From b32c2a3ab9ca52945d197bbd12e8a750f8978bf3 Mon Sep 17 00:00:00 2001
From: tv <tv@NetBSD.org>
Date: Sun, 16 Aug 1998 21:14:33 +0000
Subject: [PATCH] Use the proper <arch>/xm-netbsd.h file as the xm_file on each
 port.

---
 gnu/dist/gcc/configure    | 16 ++++++++--------
 gnu/dist/gcc/configure.in | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/gnu/dist/gcc/configure b/gnu/dist/gcc/configure
index 36963db6a48d..c47db204d09c 100644
--- a/gnu/dist/gcc/configure
+++ b/gnu/dist/gcc/configure
@@ -2305,7 +2305,7 @@ for machine in $build $host $target; do
 		;;
 	alpha*-*-netbsd*)
 		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsdl-elf.h"
-		xm_file="alpha/xm-netbsd.h"
+		xm_file=alpha/xm-netbsd.h
 		target_cpu_default="MASK_GAS"
 		tmake_file="alpha/t-crtbe"
 		extra_parts="crtbegin.o crtend.o"
@@ -2408,7 +2408,7 @@ for machine in $build $host $target; do
 		;;
 	arm*-*-netbsd*)
 		tm_file=arm/netbsd.h
-		xm_file="xm-netbsd.h ${xm_file}"
+		xm_file=arm/xm-netbsd.h
 		tmake_file="t-netbsd arm/t-netbsd"
 		# On NetBSD, the headers are already okay, except for math.h.
 		fixincludes=fixinc.wrap
@@ -2765,7 +2765,7 @@ for machine in $build $host $target; do
 		;;
 	i[34567]86-*-netbsd*)
 		tm_file=i386/netbsd.h
-		xm_file="xm-netbsd.h ${xm_file}"
+		xm_file=i386/xm-netbsd.h
 		# On NetBSD, the headers are already okay, except for math.h.
 		fixincludes=fixinc.wrap
 		tmake_file=t-netbsd
@@ -3532,7 +3532,7 @@ for machine in $build $host $target; do
 		;;
 	m68k*-*-netbsd*)
 		tm_file=m68k/netbsd.h
-		xm_file="xm-netbsd.h ${xm_file}"
+		xm_file=m68k/xm-netbsd.h
 		# On NetBSD, the headers are already okay, except for math.h.
 		fixincludes=fixinc.wrap
 		tmake_file=t-netbsd
@@ -3853,7 +3853,7 @@ for machine in $build $host $target; do
 	      ;;
 	mipsel-*-netbsd* | mips-dec-netbsd*)    # Decstation running NetBSD
 		tm_file=mips/netbsd.h
-		xm_file="xm-netbsd.h ${xm_file}"
+		xm_file=mips/xm-netbsd.h
 		# On NetBSD, the headers are already okay, except for math.h.
 		fixincludes=fixinc.wrap
 		tmake_file=t-netbsd
@@ -4184,7 +4184,7 @@ for machine in $build $host $target; do
 		;;
 	ns32k-*-netbsd*)
 		tm_file=ns32k/netbsd.h
-		xm_file="xm-netbsd.h ${xm_file}"
+		xm_file=ns32k/xm-netbsd.h
 		# On NetBSD, the headers are already okay, except for math.h.
 		fixincludes=fixinc.wrap
 		tmake_file=t-netbsd
@@ -4486,7 +4486,7 @@ for machine in $build $host $target; do
 		;;
 	sparc-*-netbsd*)
 		tm_file=sparc/netbsd.h
-		xm_file="xm-netbsd.h ${xm_file}"
+		xm_file=sparc/xm-netbsd.h
 		# On NetBSD, the headers are already okay, except for math.h.
 		fixincludes=fixinc.wrap
 		tmake_file=t-netbsd
@@ -4679,7 +4679,7 @@ for machine in $build $host $target; do
 		;;
 	vax-*-netbsd*)
 		tm_file="${tm_file} netbsd.h vax/netbsd.h"
-		xm_file="xm-netbsd.h ${xm_file}"
+		xm_file=vax/xm-netbsd.h
 		# On NetBSD, the headers are already okay, except for math.h.
 		fixincludes=fixinc.wrap
 		tmake_file=t-netbsd
diff --git a/gnu/dist/gcc/configure.in b/gnu/dist/gcc/configure.in
index 3e47403c8018..499efc268049 100644
--- a/gnu/dist/gcc/configure.in
+++ b/gnu/dist/gcc/configure.in
@@ -403,7 +403,7 @@ for machine in $build $host $target; do
 		;;
 	alpha*-*-netbsd*)
 		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsdl-elf.h"
-		xm_file="xm-netbsd.h ${xm_file}"
+		xm_file=alpha/xm-netbsd.h
 		target_cpu_default="MASK_GAS"
 		tmake_file="alpha/t-crtbe"
 		extra_parts="crtbegin.o crtend.o"
@@ -506,7 +506,7 @@ for machine in $build $host $target; do
 		;;
 	arm*-*-netbsd*)
 		tm_file=arm/netbsd.h
-		xm_file="xm-netbsd.h ${xm_file}"
+		xm_file=arm/xm-netbsd.h
 		tmake_file="t-netbsd arm/t-netbsd"
 		# On NetBSD, the headers are already okay, except for math.h.
 		fixincludes=fixinc.wrap
@@ -863,7 +863,7 @@ for machine in $build $host $target; do
 		;;
 	i[[34567]]86-*-netbsd*)
 		tm_file=i386/netbsd.h
-		xm_file="xm-netbsd.h ${xm_file}"
+		xm_file=i386/xm-netbsd.h
 		# On NetBSD, the headers are already okay, except for math.h.
 		fixincludes=fixinc.wrap
 		tmake_file=t-netbsd
@@ -1630,7 +1630,7 @@ for machine in $build $host $target; do
 		;;
 	m68k*-*-netbsd*)
 		tm_file=m68k/netbsd.h
-		xm_file="xm-netbsd.h ${xm_file}"
+		xm_file=m68k/xm-netbsd.h
 		# On NetBSD, the headers are already okay, except for math.h.
 		fixincludes=fixinc.wrap
 		tmake_file=t-netbsd
@@ -1951,7 +1951,7 @@ for machine in $build $host $target; do
 	      ;;
 	mipsel-*-netbsd* | mips-dec-netbsd*)    # Decstation running NetBSD
 		tm_file=mips/netbsd.h
-		xm_file="xm-netbsd.h ${xm_file}"
+		xm_file=mips/xm-netbsd.h
 		# On NetBSD, the headers are already okay, except for math.h.
 		fixincludes=fixinc.wrap
 		tmake_file=t-netbsd
@@ -2282,7 +2282,7 @@ for machine in $build $host $target; do
 		;;
 	ns32k-*-netbsd*)
 		tm_file=ns32k/netbsd.h
-		xm_file="xm-netbsd.h ${xm_file}"
+		xm_file=ns32k/xm-netbsd.h
 		# On NetBSD, the headers are already okay, except for math.h.
 		fixincludes=fixinc.wrap
 		tmake_file=t-netbsd
@@ -2584,7 +2584,7 @@ for machine in $build $host $target; do
 		;;
 	sparc-*-netbsd*)
 		tm_file=sparc/netbsd.h
-		xm_file="xm-netbsd.h ${xm_file}"
+		xm_file=sparc/xm-netbsd.h
 		# On NetBSD, the headers are already okay, except for math.h.
 		fixincludes=fixinc.wrap
 		tmake_file=t-netbsd
@@ -2777,7 +2777,7 @@ for machine in $build $host $target; do
 		;;
 	vax-*-netbsd*)
 		tm_file="${tm_file} netbsd.h vax/netbsd.h"
-		xm_file="xm-netbsd.h ${xm_file}"
+		xm_file=vax/xm-netbsd.h
 		# On NetBSD, the headers are already okay, except for math.h.
 		fixincludes=fixinc.wrap
 		tmake_file=t-netbsd