This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Patch to config.gcc extra_headers settings
- From: "Joseph S. Myers" <jsm28 at cam dot ac dot uk>
- To: <gcc-patches at gcc dot gnu dot org>
- Date: Sat, 22 Dec 2001 15:48:21 +0000 (GMT)
- Subject: Patch to config.gcc extra_headers settings
In config.gcc, most (but not all) m68k targets have
extra_headers=math-68881.h, and most (but not all) powerpc targets
have extra_headers=ppc-asm.h. This patch moves these settings to be
default settings for these architectures, making those targets that
don't use them override them. (Quite possibly, some or all of these
targets should in fact be using the default settings, especially
m68020-*-elf* | m68k-*-elf* which did set an unused variable
header_files. This patch tries to be bug-compatible with the old
behaviour. If in fact all m68k targets should be using math-68881.h
and all powerpc targets should be using ppc-asm.h, what then of
targets listed as rs6000-*-*?)
Bootstrapped with no regressions on i686-pc-linux-gnu. Cross-tested
with no regressions to powerpc-eabisim. OK to commit?
2001-12-22 Joseph S. Myers <jsm28@cam.ac.uk>
* config.gcc (extra_headers): Move settings to math-68881.h and
ppc-asm.h to common code for CPU types.
(header_files): Remove unused setting.
--- config.gcc.orig Wed Dec 19 20:25:09 2001
+++ config.gcc Thu Dec 20 23:54:07 2001
@@ -208,7 +208,8 @@
enable_threads=$enable_threads_flag
# Set default cpu_type, tm_file, tm_p_file and xm_file so it can be
-# updated in each machine entry.
+# updated in each machine entry. Also set default extra_headers for some
+# machines.
tm_p_file=
cpu_type=`echo $machine | sed 's/-.*$//'`
case $machine in
@@ -238,6 +239,10 @@
;;
m680[02]0-*-*)
cpu_type=m68k
+ extra_headers=math-68881.h
+ ;;
+m68k-*-*)
+ extra_headers=math-68881.h
;;
mips*-*-*)
cpu_type=mips
@@ -247,6 +252,7 @@
;;
powerpc*-*-*)
cpu_type=rs6000
+ extra_headers=ppc-asm.h
;;
sparc*-*-*)
cpu_type=sparc
@@ -1606,12 +1612,10 @@
tm_file=m68k/ctix.h
xm_defines=POSIX
use_collect2=yes
- extra_headers=math-68881.h
;;
m68000-hp-bsd*) # HP 9000/200 running BSD
tm_file=m68k/hp2bsd.h
use_collect2=yes
- extra_headers=math-68881.h
;;
m68000-hp-hpux*) # HP 9000 series 300
xm_defines=POSIX
@@ -1624,17 +1628,14 @@
tmake_file=m68k/t-hp320
install_headers_dir=install-headers-cpio
use_collect2=yes
- extra_headers=math-68881.h
;;
m68000-sun-sunos3*)
tm_file=m68k/sun2.h
use_collect2=yes
- extra_headers=math-68881.h
;;
m68000-sun-sunos4*)
tm_file=m68k/sun2o4.h
use_collect2=yes
- extra_headers=math-68881.h
;;
m68000-att-sysv*)
xm_defines=POSIX
@@ -1645,13 +1646,11 @@
tm_file=m68k/3b1.h
fi
use_collect2=yes
- extra_headers=math-68881.h
;;
m68k-apple-aux*) # Apple Macintosh running A/UX
xm_defines=POSIX
tmake_file=m68k/t-aux
install_headers_dir=install-headers-cpio
- extra_headers=math-68881.h
extra_parts="crt1.o mcrt1.o maccrt1.o crt2.o crtn.o"
tm_file=
if test "$gnu_ld" = yes
@@ -1672,7 +1671,6 @@
m68k-apollo-*)
tm_file=m68k/apollo68.h
use_collect2=yes
- extra_headers=math-68881.h
float_format=m68k
;;
m68k-altos-sysv*) # Altos 3068
@@ -1684,7 +1682,6 @@
echo "The Altos is supported only with the GNU assembler" 1>&2
exit 1
fi
- extra_headers=math-68881.h
;;
m68k-bull-sysv*) # Bull DPX/2
if test x$gas = xyes
@@ -1700,14 +1697,12 @@
fi
xm_defines=POSIX
use_collect2=yes
- extra_headers=math-68881.h
;;
m68k-atari-sysv4*) # Atari variant of V.4.
tm_file=m68k/atari.h
xm_defines=POSIX
tmake_file=t-svr4
extra_parts="crtbegin.o crtend.o"
- extra_headers=math-68881.h
float_format=m68k
;;
m68k-motorola-sysv*)
@@ -1733,56 +1728,47 @@
fi
gdb_needs_out_file_path=yes
extra_parts="crt0.o mcrt0.o"
- extra_headers=math-68881.h
float_format=m68k
;;
m68k-ncr-sysv*) # NCR Tower 32 SVR3
tm_file=m68k/tower-as.h
xm_defines=POSIX
extra_parts="crtbegin.o crtend.o"
- extra_headers=math-68881.h
;;
m68k-plexus-sysv*)
tm_file=m68k/plexus.h
xm_defines=POSIX
use_collect2=yes
- extra_headers=math-68881.h
;;
m68k-tti-*)
tm_file=m68k/pbb.h
xm_defines=POSIX
- extra_headers=math-68881.h
;;
m68k-crds-unos*)
xm_defines=POSIX
tm_file=m68k/crds.h
use_collect2=yes
- extra_headers=math-68881.h
;;
m68k-cbm-sysv4*) # Commodore variant of V.4.
tm_file=m68k/amix.h
xm_defines=POSIX
tmake_file=t-svr4
extra_parts="crtbegin.o crtend.o"
- extra_headers=math-68881.h
float_format=m68k
;;
m68k-ccur-rtu)
tm_file=m68k/ccur-GAS.h
- extra_headers=math-68881.h
use_collect2=yes
float_format=m68k
;;
m68k-hp-bsd4.4*) # HP 9000/3xx running 4.4bsd
tm_file=m68k/hp3bsd44.h
use_collect2=yes
- extra_headers=math-68881.h
float_format=m68k
;;
m68k-hp-bsd*) # HP 9000/3xx running Berkeley Unix
tm_file=m68k/hp3bsd.h
use_collect2=yes
- extra_headers=math-68881.h
float_format=m68k
;;
m68k-isi-bsd*)
@@ -1794,7 +1780,6 @@
float_format=m68k
fi
use_collect2=yes
- extra_headers=math-68881.h
;;
m68k-hp-hpux7*) # HP 9000 series 300 running HPUX version 7.
xm_defines=POSIX
@@ -1808,7 +1793,6 @@
fi
install_headers_dir=install-headers-cpio
use_collect2=yes
- extra_headers=math-68881.h
float_format=m68k
;;
m68k-hp-hpux*) # HP 9000 series 300
@@ -1823,13 +1807,11 @@
fi
install_headers_dir=install-headers-cpio
use_collect2=yes
- extra_headers=math-68881.h
float_format=m68k
;;
m68k-sun-mach*)
tm_file=m68k/sun3mach.h
use_collect2=yes
- extra_headers=math-68881.h
float_format=m68k
;;
m68k-sony-newsos3*)
@@ -1840,7 +1822,6 @@
tm_file=m68k/news3.h
fi
use_collect2=yes
- extra_headers=math-68881.h
float_format=m68k
;;
m68k-sony-bsd* | m68k-sony-newsos*)
@@ -1851,7 +1832,6 @@
tm_file=m68k/news.h
fi
use_collect2=yes
- extra_headers=math-68881.h
float_format=m68k
;;
m68k-next-nextstep2*)
@@ -1860,7 +1840,6 @@
tmake_file=m68k/t-next
xmake_file=m68k/x-next
extra_objs=nextstep.o
- extra_headers=math-68881.h
use_collect2=yes
float_format=m68k
;;
@@ -1871,7 +1850,6 @@
xmake_file=m68k/x-next
extra_objs=nextstep.o
extra_parts="crtbegin.o crtend.o"
- extra_headers=math-68881.h
float_format=m68k
if test x$enable_threads = xyes; then
thread_file='mach'
@@ -1886,7 +1864,6 @@
float_format=m68k
fi
use_collect2=yes
- extra_headers=math-68881.h
;;
m68k-sun-sunos*) # For SunOS 4 (the default).
if test x$with_fp = xno
@@ -1897,32 +1874,28 @@
float_format=m68k
fi
use_collect2=yes
- extra_headers=math-68881.h
;;
m68k-wrs-vxworks*)
tm_file=m68k/vxm68k.h
tmake_file=m68k/t-vxworks68
- extra_headers=math-68881.h
thread_file='vxworks'
float_format=m68k
;;
m68k-*-aout*)
tmake_file=m68k/t-m68kbare
tm_file="m68k/m68k-aout.h libgloss.h"
- extra_headers=math-68881.h
float_format=m68k
;;
m68k-*-coff*)
tmake_file=m68k/t-m68kbare
tm_file="m68k/m68k-coff.h dbx.h"
- extra_headers=math-68881.h
float_format=m68k
;;
m68020-*-elf* | m68k-*-elf*)
tm_file="m68k/m68k-none.h m68k/m68kelf.h dbxelf.h elfos.h m68k/m68kemb.h m68k/m68020-elf.h"
xm_defines=POSIX
tmake_file=m68k/t-m68kelf
- header_files=math-68881.h
+ extra_headers=
extra_parts="crtbegin.o crtend.o"
;;
m68k-*-lynxos*)
@@ -1933,18 +1906,19 @@
tm_file=m68k/lynx-ng.h
fi
tmake_file=m68k/t-lynx
- extra_headers=math-68881.h
float_format=m68k
;;
m68k*-*-netbsd*)
tm_file=m68k/netbsd.h
tmake_file=t-netbsd
+ extra_headers=
float_format=m68k
use_collect2=yes
;;
m68k*-*-openbsd*)
# needed to unconfuse gdb
tmake_file="t-libc-ok t-openbsd m68k/t-openbsd"
+ extra_headers=
float_format=m68k
# we need collect2 until our bug is fixed...
use_collect2=yes
@@ -1952,7 +1926,6 @@
m68k-*-sysv3*) # Motorola m68k's running system V.3
xm_defines=POSIX
extra_parts="crtbegin.o crtend.o"
- extra_headers=math-68881.h
float_format=m68k
;;
m68k-*-sysv4*) # Motorola m68k's running system V.4
@@ -1960,14 +1933,12 @@
xm_defines=POSIX
tmake_file=t-svr4
extra_parts="crtbegin.o crtend.o"
- extra_headers=math-68881.h
float_format=m68k
;;
m68k-*-linux*aout*) # Motorola m68k's running GNU/Linux
# with a.out format
tm_file=m68k/linux-aout.h
tmake_file="t-linux-aout m68k/t-linux-aout"
- extra_headers=math-68881.h
float_format=m68k
gnu_ld=yes
;;
@@ -1977,7 +1948,6 @@
tm_file=m68k/linux.h
tmake_file="t-slibgcc-elf-ver t-linux t-linux-gnulibc1 m68k/t-linux"
extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
- extra_headers=math-68881.h
float_format=m68k
gnu_ld=yes
;;
@@ -1987,7 +1957,6 @@
tm_file=m68k/linux.h
tmake_file="t-slibgcc-elf-ver t-linux m68k/t-linux"
extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
- extra_headers=math-68881.h
float_format=m68k
gnu_ld=yes
if test x$enable_threads = xyes; then
@@ -1997,13 +1966,11 @@
m68k-*-psos*)
tmake_file=m68k/t-m68kbare
tm_file=m68k/m68k-psos.h
- extra_headers=math-68881.h
float_format=m68k
;;
m68k-*-rtemscoff*)
tmake_file="m68k/t-m68kbare t-rtems"
tm_file=m68k/rtems.h
- extra_headers=math-68881.h
float_format=m68k
if test x$enable_threads = xyes; then
thread_file='rtems'
@@ -2012,7 +1979,6 @@
m68k-*-rtemself*|m68k-*-rtems*)
tmake_file="m68k/t-m68kbare t-rtems m68k/t-crtstuff"
tm_file=m68k/rtemself.h
- extra_headers=math-68881.h
float_format=m68k
extra_parts="crtbegin.o crtend.o"
if test x$enable_threads = xyes; then
@@ -2647,18 +2613,19 @@
;;
powerpc-*-openbsd*)
tmake_file="${tmake_file} rs6000/t-rs6000 rs6000/t-openbsd"
+ extra_headers=
;;
powerpc64-*-linux*)
tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/linux64.h"
out_file=rs6000/rs6000.c
tmake_file="rs6000/t-ppcos t-slibgcc-elf-ver t-linux rs6000/t-ppccomm"
- extra_headers=ppc-asm.h
;;
powerpc-*-beos*)
tm_file="${tm_file} rs6000/aix.h rs6000/beos.h rs6000/xcoff.h"
xm_defines=POSIX
xm_file=rs6000/xm-beos.h
tmake_file=rs6000/t-beos
+ extra_headers=
;;
powerpc-*-darwin*)
tm_file="${tm_file} darwin.h rs6000/darwin.h"
@@ -2674,31 +2641,28 @@
cxx_target_objs="darwin-c.o"
# Darwin linker does collect2 functionality
use_collect2=no
+ extra_headers=
;;
powerpc*-*-freebsd*)
tm_file="${tm_file} dbxelf.h elfos.h ${fbsd_tm_file} rs6000/sysv4.h rs6000/freebsd.h"
xm_file=rs6000/xm-sysv4.h
out_file=rs6000/rs6000.c
tmake_file="rs6000/t-ppcos ${tmake_file} rs6000/t-ppccomm"
- extra_headers=ppc-asm.h
;;
powerpc-*-sysv*)
tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h"
xm_defines=POSIX
- extra_headers=ppc-asm.h
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"
- extra_headers=ppc-asm.h
;;
powerpc-*-chorusos*)
xm_defines=POSIX
tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h chorus.h"
tmake_file="rs6000/t-ppcos rs6000/t-ppccomm"
- extra_headers=ppc-asm.h
case x${enable_threads} in
xyes | xpthreads | xposix)
thread_file='posix'
@@ -2709,43 +2673,36 @@
xm_defines=POSIX
tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h rs6000/eabiaix.h"
tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
- extra_headers=ppc-asm.h
;;
powerpc-*-eabisimaltivec*)
xm_defines=POSIX
tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h rs6000/eabisim.h rs6000/eabialtivec.h"
tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
- extra_headers=ppc-asm.h
;;
powerpc-*-eabisim*)
xm_defines=POSIX
tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.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=POSIX
tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h"
tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
- extra_headers=ppc-asm.h
;;
powerpc-*-eabialtivec*)
xm_defines=POSIX
tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h rs6000/eabialtivec.h"
tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
- extra_headers=ppc-asm.h
;;
powerpc-*-eabi*)
xm_defines=POSIX
tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h"
tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
- extra_headers=ppc-asm.h
;;
powerpc-*-rtems*)
xm_defines=POSIX
tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.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
if test x$enable_threads = xyes; then
thread_file='rtems'
fi
@@ -2754,7 +2711,6 @@
tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/linux.h"
out_file=rs6000/rs6000.c
tmake_file="rs6000/t-ppcos t-slibgcc-elf-ver t-linux t-linux-gnulibc1 rs6000/t-ppccomm"
- extra_headers=ppc-asm.h
if test x$enable_threads = xyes; then
thread_file='posix'
fi
@@ -2763,7 +2719,6 @@
tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/linux.h rs6000/linuxaltivec.h"
out_file=rs6000/rs6000.c
tmake_file="rs6000/t-ppcos t-slibgcc-elf-ver t-linux rs6000/t-ppccomm"
- extra_headers=ppc-asm.h
if test x$enable_threads = xyes; then
thread_file='posix'
fi
@@ -2772,7 +2727,6 @@
tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/linux.h"
out_file=rs6000/rs6000.c
tmake_file="rs6000/t-ppcos t-slibgcc-elf-ver t-linux rs6000/t-ppccomm"
- extra_headers=ppc-asm.h
if test x$enable_threads = xyes; then
thread_file='posix'
fi
@@ -2781,39 +2735,33 @@
xm_defines=POSIX
tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/vxppc.h"
tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
- extra_headers=ppc-asm.h
thread_file='vxworks'
;;
powerpcle-wrs-vxworks*)
xm_defines=POSIX
tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/sysv4le.h rs6000/vxppc.h"
tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
- extra_headers=ppc-asm.h
thread_file='vxworks'
;;
powerpcle-*-sysv*)
tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/sysv4le.h"
xm_defines=POSIX
tmake_file="rs6000/t-ppcos rs6000/t-ppccomm"
- extra_headers=ppc-asm.h
;;
powerpcle-*-elf*)
xm_defines=POSIX
tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/sysv4le.h"
tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
- extra_headers=ppc-asm.h
;;
powerpcle-*-eabisim*)
xm_defines=POSIX
tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.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=POSIX
tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/sysv4le.h rs6000/eabi.h"
tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
- extra_headers=ppc-asm.h
;;
rs6000-ibm-aix3.[01]*)
xm_defines=POSIX
@@ -2827,6 +2775,7 @@
tmake_file=rs6000/t-newas
float_format=none
use_collect2=yes
+ extra_headers=
;;
rs6000-ibm-aix4.[12]* | powerpc-ibm-aix4.[12]*)
xm_defines=POSIX
@@ -2834,6 +2783,7 @@
tmake_file=rs6000/t-newas
float_format=none
use_collect2=yes
+ extra_headers=
;;
rs6000-ibm-aix4.[3456789]* | powerpc-ibm-aix4.[3456789]*)
xm_defines=POSIX
@@ -2842,6 +2792,7 @@
float_format=none
use_collect2=yes
thread_file='aix'
+ extra_headers=
;;
rs6000-ibm-aix[56789].* | powerpc-ibm-aix[56789].*)
xm_defines=POSIX
@@ -2850,6 +2801,7 @@
float_format=none
use_collect2=yes
thread_file='aix'
+ extra_headers=
;;
rs6000-ibm-aix*)
xm_defines=POSIX
--
Joseph S. Myers
jsm28@cam.ac.uk