From ea2746b6f01ba78a5bae1c6fcadcb26198a865fc Mon Sep 17 00:00:00 2001
From: Todd Vierling <tv@netbsd.org>
Date: Wed, 29 Jul 1998 16:54:56 -0600
Subject: [PATCH] configure.in: Use xm-netbsd.h as the NetBSD xm file (not
 xm-siglist).

a
        * configure.in: Use xm-netbsd.h as the NetBSD xm file (not xm-siglist).
        Accept arm32 as arm, m68k4k as m68k, mipsle as mips-dec, and any
        manufacturer id for ns32k.
        * configure: Regenerated.
        * config/netbsd.h: When using ASM_WEAKEN_LABEL, make it global too.
        * config/t-netbsd: Don't compile libgcc1-test as the fns are in libc.
        * config/i386/netbsd.h: Undefine DWARF2_UNWIND_INFO, not define as 0.
        * config/m68k/netbsd.h: Same.
        * config/ns32k/netbsd.h: Same.
        * config/sparc/netbsd.h: Same.

From-SVN: r21482
---
 gcc/configure    | 19 +++++++++++++------
 gcc/configure.in | 17 ++++++++++++-----
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/gcc/configure b/gcc/configure
index 0832bf5bc4f5..81829c26b573 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -2305,6 +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="xm-netbsd.h ${xm_file}"
 		target_cpu_default="MASK_GAS"
 		tmake_file="alpha/t-crtbe"
 		extra_parts="crtbegin.o crtend.o"
@@ -2405,9 +2406,9 @@ for machine in $build $host $target; do
 		tmake_file=arm/t-semiaof
 		fixincludes=Makefile.in # There is nothing to fix
 		;;
-	arm-*-netbsd*)
+	arm*-*-netbsd*)
 		tm_file=arm/netbsd.h
-		xm_file="xm-siglist.h ${xm_file}"
+		xm_file="xm-netbsd.h ${xm_file}"
 		tmake_file="t-netbsd arm/t-netbsd"
 		# On NetBSD, the headers are already okay, except for math.h.
 		fixincludes=fixinc.wrap
@@ -2764,6 +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}"
 		# On NetBSD, the headers are already okay, except for math.h.
 		fixincludes=fixinc.wrap
 		tmake_file=t-netbsd
@@ -3528,8 +3530,9 @@ for machine in $build $host $target; do
 		extra_headers=math-68881.h
 		float_format=m68k
 		;;
-	m68k-*-netbsd*)
+	m68k*-*-netbsd*)
 		tm_file=m68k/netbsd.h
+		xm_file="xm-netbsd.h ${xm_file}"
 		# On NetBSD, the headers are already okay, except for math.h.
 		fixincludes=fixinc.wrap
 		tmake_file=t-netbsd
@@ -3848,8 +3851,9 @@ for machine in $build $host $target; do
 			use_collect2=yes
 	      fi
 	      ;;
-	mips-dec-netbsd*)                  # Decstation running NetBSD
+	mipsel-*-netbsd* | mips-dec-netbsd*)    # Decstation running NetBSD
 		tm_file=mips/netbsd.h
+		xm_file="xm-netbsd.h ${xm_file}"
 		# On NetBSD, the headers are already okay, except for math.h.
 		fixincludes=fixinc.wrap
 		tmake_file=t-netbsd
@@ -4178,8 +4182,9 @@ for machine in $build $host $target; do
 		xm_defines=USG
 		use_collect2=yes
 		;;
-	ns32k-pc532-netbsd*)
+	ns32k-*-netbsd*)
 		tm_file=ns32k/netbsd.h
+		xm_file="xm-netbsd.h ${xm_file}"
 		# On NetBSD, the headers are already okay, except for math.h.
 		fixincludes=fixinc.wrap
 		tmake_file=t-netbsd
@@ -4474,6 +4479,7 @@ for machine in $build $host $target; do
 		;;
 	sparc-*-netbsd*)
 		tm_file=sparc/netbsd.h
+		xm_file="xm-netbsd.h ${xm_file}"
 		# On NetBSD, the headers are already okay, except for math.h.
 		fixincludes=fixinc.wrap
 		tmake_file=t-netbsd
@@ -4666,6 +4672,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}"
 		# On NetBSD, the headers are already okay, except for math.h.
 		fixincludes=fixinc.wrap
 		tmake_file=t-netbsd
@@ -5243,7 +5250,7 @@ fi
 
 # Figure out what assembler alignment features are present.
 echo $ac_n "checking assembler alignment features""... $ac_c" 1>&6
-echo "configure:5247: checking assembler alignment features" >&5
+echo "configure:5254: checking assembler alignment features" >&5
 gcc_cv_as=
 gcc_cv_as_alignment_features=
 gcc_cv_as_gas_srcdir=`echo $srcdir | sed -e 's,gcc$,gas,'`
diff --git a/gcc/configure.in b/gcc/configure.in
index 4ce1ba3f1bf0..2805d22c7c30 100644
--- a/gcc/configure.in
+++ b/gcc/configure.in
@@ -403,6 +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}"
 		target_cpu_default="MASK_GAS"
 		tmake_file="alpha/t-crtbe"
 		extra_parts="crtbegin.o crtend.o"
@@ -503,9 +504,9 @@ for machine in $build $host $target; do
 		tmake_file=arm/t-semiaof
 		fixincludes=Makefile.in # There is nothing to fix
 		;;
-	arm-*-netbsd*)
+	arm*-*-netbsd*)
 		tm_file=arm/netbsd.h
-		xm_file="xm-siglist.h ${xm_file}"
+		xm_file="xm-netbsd.h ${xm_file}"
 		tmake_file="t-netbsd arm/t-netbsd"
 		# On NetBSD, the headers are already okay, except for math.h.
 		fixincludes=fixinc.wrap
@@ -862,6 +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}"
 		# On NetBSD, the headers are already okay, except for math.h.
 		fixincludes=fixinc.wrap
 		tmake_file=t-netbsd
@@ -1626,8 +1628,9 @@ for machine in $build $host $target; do
 		extra_headers=math-68881.h
 		float_format=m68k
 		;;
-	m68k-*-netbsd*)
+	m68k*-*-netbsd*)
 		tm_file=m68k/netbsd.h
+		xm_file="xm-netbsd.h ${xm_file}"
 		# On NetBSD, the headers are already okay, except for math.h.
 		fixincludes=fixinc.wrap
 		tmake_file=t-netbsd
@@ -1946,8 +1949,9 @@ for machine in $build $host $target; do
 			use_collect2=yes
 	      fi
 	      ;;
-	mips-dec-netbsd*)                  # Decstation running NetBSD
+	mipsel-*-netbsd* | mips-dec-netbsd*)    # Decstation running NetBSD
 		tm_file=mips/netbsd.h
+		xm_file="xm-netbsd.h ${xm_file}"
 		# On NetBSD, the headers are already okay, except for math.h.
 		fixincludes=fixinc.wrap
 		tmake_file=t-netbsd
@@ -2276,8 +2280,9 @@ for machine in $build $host $target; do
 		xm_defines=USG
 		use_collect2=yes
 		;;
-	ns32k-pc532-netbsd*)
+	ns32k-*-netbsd*)
 		tm_file=ns32k/netbsd.h
+		xm_file="xm-netbsd.h ${xm_file}"
 		# On NetBSD, the headers are already okay, except for math.h.
 		fixincludes=fixinc.wrap
 		tmake_file=t-netbsd
@@ -2572,6 +2577,7 @@ for machine in $build $host $target; do
 		;;
 	sparc-*-netbsd*)
 		tm_file=sparc/netbsd.h
+		xm_file="xm-netbsd.h ${xm_file}"
 		# On NetBSD, the headers are already okay, except for math.h.
 		fixincludes=fixinc.wrap
 		tmake_file=t-netbsd
@@ -2764,6 +2770,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}"
 		# On NetBSD, the headers are already okay, except for math.h.
 		fixincludes=fixinc.wrap
 		tmake_file=t-netbsd
-- 
2.47.2