From 58600d24292ba1e772bb72720b3ef68de5c183fa Mon Sep 17 00:00:00 2001 From: Todd Vierling Date: Wed, 29 Jul 1998 22:51:47 +0000 Subject: [PATCH] configure.in: Use xm-netbsd.h as the NetBSD xm file (not xm-siglist). * 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: r21480 --- gcc/ChangeLog | 13 +++++++++++++ gcc/config/i386/netbsd.h | 2 +- gcc/config/m68k/netbsd.h | 2 +- gcc/config/netbsd.h | 13 +++++++------ gcc/config/ns32k/netbsd.h | 2 +- gcc/config/sparc/netbsd.h | 2 +- gcc/config/t-netbsd | 1 + gcc/configure | 19 +++++++++++++------ gcc/configure.in | 17 ++++++++++++----- 9 files changed, 50 insertions(+), 21 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 82c84e737eb..c9f85c8d75a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,16 @@ +Wed Jul 29 23:49:23 1998 Todd Vierling + + * 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. + Wed Jul 29 22:39:21 1998 Jeffrey A Law (law@cygnus.com) * unroll.c (unroll_loop): Do not abort for an UNROLL_MODULO diff --git a/gcc/config/i386/netbsd.h b/gcc/config/i386/netbsd.h index 5978aec5c4b..25660470f6f 100644 --- a/gcc/config/i386/netbsd.h +++ b/gcc/config/i386/netbsd.h @@ -81,5 +81,5 @@ /* Until they use ELF or something that handles dwarf2 unwinds and initialization stuff better. */ -#define DWARF2_UNWIND_INFO 0 +#undef DWARF2_UNWIND_INFO diff --git a/gcc/config/m68k/netbsd.h b/gcc/config/m68k/netbsd.h index 6bd9161c680..c9841992780 100644 --- a/gcc/config/m68k/netbsd.h +++ b/gcc/config/m68k/netbsd.h @@ -59,5 +59,5 @@ /* Until they use ELF or something that handles dwarf2 unwinds and initialization stuff better. */ -#define DWARF2_UNWIND_INFO 0 +#undef DWARF2_UNWIND_INFO diff --git a/gcc/config/netbsd.h b/gcc/config/netbsd.h index 860e10107e5..43a15768d0b 100644 --- a/gcc/config/netbsd.h +++ b/gcc/config/netbsd.h @@ -13,11 +13,11 @@ #define GCC_INCLUDE_DIR "/usr/include" #undef INCLUDE_DEFAULTS -#define INCLUDE_DEFAULTS \ - { \ - { GPLUSPLUS_INCLUDE_DIR, 1, 1 }, \ - { GCC_INCLUDE_DIR, 0, 0 }, \ - { 0, 0, 0 } \ +#define INCLUDE_DEFAULTS \ + { \ + { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1 }, \ + { GCC_INCLUDE_DIR, "GCC", 0, 0 }, \ + { 0, 0, 0, 0 } \ } /* Under NetBSD, the normal location of the compiler back ends is the @@ -100,7 +100,8 @@ #undef ASM_WEAKEN_LABEL #define ASM_WEAKEN_LABEL(FILE,NAME) \ - do { fputs ("\t.weak\t", FILE); assemble_name (FILE, NAME); \ + do { fputs ("\t.globl\t", FILE); assemble_name (FILE, NAME); \ + fputs ("\t.weak\t", FILE); assemble_name (FILE, NAME); \ fputc ('\n', FILE); } while (0) /* The following macro defines the format used to output the second diff --git a/gcc/config/ns32k/netbsd.h b/gcc/config/ns32k/netbsd.h index cef68d82c2e..40c2025bc5f 100644 --- a/gcc/config/ns32k/netbsd.h +++ b/gcc/config/ns32k/netbsd.h @@ -108,5 +108,5 @@ Boston, MA 02111-1307, USA. /* Until they use ELF or something that handles dwarf2 unwinds and initialization stuff better. */ -#define DWARF2_UNWIND_INFO 0 +#undefine DWARF2_UNWIND_INFO diff --git a/gcc/config/sparc/netbsd.h b/gcc/config/sparc/netbsd.h index a512f41e155..ba2fe4e6c04 100644 --- a/gcc/config/sparc/netbsd.h +++ b/gcc/config/sparc/netbsd.h @@ -42,5 +42,5 @@ /* Until they use ELF or something that handles dwarf2 unwinds and initialization stuff better. */ -#define DWARF2_UNWIND_INFO 0 +#undef DWARF2_UNWIND_INFO diff --git a/gcc/config/t-netbsd b/gcc/config/t-netbsd index a3d9e22eaf0..85d6057feb0 100644 --- a/gcc/config/t-netbsd +++ b/gcc/config/t-netbsd @@ -1,5 +1,6 @@ LIBGCC1=libgcc1.null CROSS_LIBGCC1=libgcc1.null +LIBGCC1_TEST= # Don't run fixproto STMP_FIXPROTO = diff --git a/gcc/configure b/gcc/configure index 9c1bc301ac7..0df76d58d4b 100755 --- a/gcc/configure +++ b/gcc/configure @@ -2320,6 +2320,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" @@ -2420,9 +2421,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 @@ -2779,6 +2780,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 @@ -3555,8 +3557,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 @@ -3875,8 +3878,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 @@ -4205,8 +4209,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 @@ -4501,6 +4506,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 @@ -4693,6 +4699,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 @@ -5270,7 +5277,7 @@ fi # Figure out what assembler alignment features are present. echo $ac_n "checking assembler alignment features""... $ac_c" 1>&6 -echo "configure:5274: checking assembler alignment features" >&5 +echo "configure:5281: 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 ef07fbb8467..8a9f2cc45cf 100644 --- a/gcc/configure.in +++ b/gcc/configure.in @@ -413,6 +413,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" @@ -513,9 +514,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 @@ -872,6 +873,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 @@ -1648,8 +1650,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 @@ -1968,8 +1971,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 @@ -2298,8 +2302,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 @@ -2594,6 +2599,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 @@ -2786,6 +2792,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.30.2