netbsd.h (TARGET_HAS_F_SETLKW): define.

* config/netbsd.h (TARGET_HAS_F_SETLKW): define.
Split a.out-specific bits into...
* config/netbsd-aout.h: ...this.
* config/netbsd-elf.h: New file.
* config/alpha/netbsd-elf.h: Remove.
* config/alpha/netbsd.h: Rewrite for a NetBSD/alpha ELF target.
* config/i386/netbsd-elf.h (LIB_SPEC): Remove.
(STARTFILE_SPEC): Remove redundant definition.
(ENDFILE_SPEC): Likewise.
(LINK_SPEC): Likewise.
(CPP_SPEC): Likewise.
(ASM_SPEC): Likewise.
(LIB_SPEC): Likewise.
(SWITCH_TAKES_ARG): Likewise.
(TARGET_MEM_FUNCTIONS): Likewise.
(CPP_PREDEFINES): Redefine.
(ASM_FINAL_SPEC): Remove redefinition.
(ASM_COMMENT_START): Redefine.
(FUNCTION_PROFILER): Define.
(TARGET_VERSION): Redefine.
Comment and formatting cleanup.
* config/i386/netbsd.h: Include <netbsd-aout.h>.
* config/m68k/netbsd.h: Include <netbsd-aout.h>.
* config/mips/netbsd.h: Rewrite for NetBSD/mips ELF target,
big- or little-endian.
* config/ns32k/netbsd.h: Include <netbsd-aout.h>.
* config.gcc (*-*-netbsd*): Add definitions common to all
NetBSD configs.
(alpha*-*-netbsd*): Remove redundant xm_defines, gas, and
gnu_ld definitions.  Add netbsd-elf.h to and remove
alpha/netbsd-elf.h from tm_file.  Remove alpha/t-crtfm from
tmake_file, and don't lose previous tmake_file contents.
(arm*-*-netbsd*): Add netbsd-aout.h to tm_file.
(i[34567]86-*-netbsdelf*): Remove redundant xm_defines, gas, and
gnu_ld definitions.  Add netbsd-elf.h to tm_file.
(mips-dec-netbsd*): Remove as alias for mipsel-*-netbsd*.
(mipsel-*-netbsd*): Rename this to...
(mips*-*-netbsd*): ...this.  Add elfos.h to tm_file.  Add
mips/little.h to tm_file for mips*el-*.
(powerpc-*-netbsd*): Remove redundant xm_defines definition.
(sparc-*-netbsd*): Add netbsd-aout.h to tm_file.
(vax-*-netbsd*): Add netbsd-aout.h to tm_file.

From-SVN: r49064

1 files changed, 20 insertions, 17 deletions

diff --git a/gcc/config.gcc b/gcc/config.gcc
index 1996c2f..7a86bee 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -277,7 +277,7 @@ case $machine in
 	;;
 esac
 
-# Common parts for GNU/Linux, GNU/Hurd, OpenBSD and FreeBSD systems.
+# Common parts for GNU/Linux, GNU/Hurd, OpenBSD, NetBSD, and FreeBSD systems.
 case $machine in
 *-*-linux*)
 	xm_defines=POSIX
@@ -312,6 +312,12 @@ case $machine in
 		tmake_file="${tmake_file} t-openbsd-thread"
 	fi
 	;;
+*-*-netbsd*)
+	tmake_file="t-libc-ok t-netbsd"
+	xm_defines=POSIX
+	gas=yes
+	gnu_ld=yes
+	;;
 *-*-freebsd[12] | *-*-freebsd[12].* | *-*-freebsd*aout*)
 	# This is the place-holder for the generic a.out configuration
 	# of FreeBSD.  No actual configuration resides here since
@@ -469,11 +475,9 @@ alpha*-*-freebsd*)
 	tmake_file="${tmake_file} alpha/t-crtbe alpha/t-crtfm alpha/t-alpha alpha/t-ieee"
 	;;
 alpha*-*-netbsd*)
-	xm_defines=POSIX
-	tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
+	tm_file="${tm_file} netbsd.h alpha/elf.h netbsd-elf.h alpha/netbsd.h"
 	target_cpu_default="MASK_GAS"
-	tmake_file="alpha/t-crtbe alpha/t-crtfm alpha/t-alpha alpha/t-ieee"
-	gas=yes gnu_ld=yes
+	tmake_file="${tmake_file} alpha/t-alpha alpha/t-crtbe alpha/t-ieee"
 	;;
 
 alpha*-*-openbsd*)
@@ -613,7 +617,7 @@ arm*-*-freebsd*|strongarm*-*-freebsd*)
 	tmake_file="${tmake_file} arm/t-strongarm-elf"
 	;;
 arm*-*-netbsd*)
-	tm_file="arm/aout.h arm/arm.h netbsd.h arm/netbsd.h"
+	tm_file="arm/aout.h arm/arm.h netbsd.h netbsd-aout.h arm/netbsd.h"
 	tmake_file="t-netbsd arm/t-netbsd"
 	use_collect2=yes
 	;;
@@ -1124,10 +1128,7 @@ i[34567]86-*-freebsd*)
 	tm_file="${tm_file} i386/att.h dbxelf.h elfos.h svr4.h ${fbsd_tm_file} i386/freebsd.h"
 	;;
 i[34567]86-*-netbsdelf*)
-	xm_defines=POSIX
-	tm_file="${tm_file} i386/att.h dbxelf.h elfos.h svr4.h i386/netbsd-elf.h"
-	tmake_file=t-netbsd
-	gnu_ld=yes
+	tm_file="${tm_file} i386/att.h dbxelf.h elfos.h netbsd.h netbsd-elf.h i386/netbsd-elf.h"
 	float_format=i386
 	;;
 i[34567]86-*-netbsd*)
@@ -2231,10 +2232,13 @@ mips-dec-bsd*)                  # Decstation running 4.4 BSD
 		use_collect2=yes
       fi
       ;;
-mipsel-*-netbsd* | mips-dec-netbsd*)    # Decstation running NetBSD
-	tm_file=mips/netbsd.h
-	# On NetBSD, the headers are already okay, except for math.h.
-	tmake_file=t-netbsd
+mips*-*-netbsd*)			# NetBSD/mips, either endian.
+	tm_file="elfos.h mips/netbsd.h"
+	case $machine in
+	mips*el-*)
+		tm_file="mips/little.h $tm_file" 
+		;;
+	esac
 	;;
 mips*-*-linux*)				# Linux MIPS, either endian.
         tm_file="dbxelf.h elfos.h svr4.h linux.h mips/linux.h"
@@ -2650,7 +2654,6 @@ powerpc-*-sysv*)
 	tmake_file="rs6000/t-ppcos rs6000/t-ppccomm"
 	;;
 powerpc-*-netbsd*)
-	xm_defines=POSIX
 	tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/netbsd.h"
 	tmake_file="rs6000/t-ppcos rs6000/t-ppccomm"
 	;;
@@ -2892,7 +2895,7 @@ sparc-*-aout*)
 	tm_file="sparc/sparc.h aoutos.h sparc/aout.h libgloss.h"
 	;;
 sparc-*-netbsd*)
-	tm_file="${tm_file} sparc/aout.h netbsd.h sparc/netbsd.h"
+	tm_file="${tm_file} sparc/aout.h netbsd.h netbsd-aout.h sparc/netbsd.h"
 	tmake_file=t-netbsd
 	use_collect2=yes
 	;;
@@ -3206,7 +3209,7 @@ vax-*-sysv*)			# VAXen running system V
 	float_format=vax
 	;;
 vax-*-netbsd*)
-	tm_file="${tm_file} netbsd.h vax/netbsd.h"
+	tm_file="${tm_file} netbsd.h netbsd-aout.h vax/netbsd.h"
 	tmake_file=t-netbsd
 	float_format=vax
 	use_collect2=yes