OSDN Git Service

2001-10-19 Franz Sirl <Franz.Sirl-kernel@lauterbach.com>
authorsirl <sirl@138bc75d-0d04-0410-961f-82ee72b054a4>
Fri, 19 Oct 2001 22:27:41 +0000 (22:27 +0000)
committersirl <sirl@138bc75d-0d04-0410-961f-82ee72b054a4>
Fri, 19 Oct 2001 22:27:41 +0000 (22:27 +0000)
* config.gcc (i[34567]86-*-gnu*, arc-*-elf*, d30v-*,
fr30-*-elf, hppa*64*-*-linux*, parisc*64*-*-linux*, hppa*-*-linux*,
parisc*-*-linux*, i370-*-linux*, i[34567]86-*-chorusos*,
i[34567]86-*-elf*, i[34567]86-ncr-sysv4*, i[34567]86-*-netware,
i[34567]86-sequent-ptx4*, i[34567]86-sequent-sysv4*,
i[34567]86-*-beoself*, i[34567]86-*-beos*, i[34567]86-*-freebsd*,
i[34567]86-*-netbsdelf*, i[34567]86-*-linux*libc1,
i[34567]86-*-linux*, i[34567]86-moss-msdos*, i[34567]86-*-moss*,
i[34567]86-go32-rtems*, i[34567]86-*-rtems*, i[34567]86-*-rtemself*,
i[34567]86-*-solaris2*, i[34567]86-*-sysv5*, i[34567]86-*-sysv4*,
i[34567]86-*-udk*, i[34567]86-*-osf1*, i[34567]86-dg-dgux*,
i860-alliant-*, i860-*-sysv4*, ia64*-*-aix*, ia64*-*-linux*,
ia64*-*-hpux*, m32r-*-elf*, m88k-dg-dgux*, m88k-*-sysv4*, mcore-*-elf,
mips*-*-linux*, mn10200-*-*, mn10300-*-*, pj*-linux*, pjl-*,
powerpc64-*-linux*, powerpc-*-sysv*, powerpc-*-netbsd*,
powerpc-*-chorusos*, powerpc-*-eabiaix*, powerpc-*-eabisim*,
powerpc-*-elf*, powerpc-*-eabi*, powerpc-*-rtems*,
powerpc-*-linux*libc1, powerpc-*-linux*, powerpc-wrs-vxworks*,
powerpcle-wrs-vxworks*, powerpcle-*-sysv*, powerpcle-*-elf*,
powerpcle-*-eabisim*, powerpcle-*-eabi*, powerpcle-*-solaris2*,
rs6000-*-mach*, s390-*-linux*, s390x-*-linux*, sh-*-elf*,
sh-*-rtemself*, sh-*-rtems*, sh-*-linux*, stormy16-*-elf,
v850-*-rtems*, v850-*-*, x86_64-*-linux*), cris-*-aout, cris-*-elf,
cris-*-none, cris-*-linux*: Update ${tmfile} list.
(c4x-*-rtems*, c4x-*, i[34567]86-go32-rtems*, i[34567]86-*-rtemscoff*,
i[34567]86-*-rtems*, i[34567]86-*-rtemself*, i[34567]86-*-osf1*,
mn10200-*-*, mn10300-*-*, powerpc-*-beos*, powerpc-*-darwin*,
powerpc-wrs-vxworks*, powerpcle-wrs-vxworks*, v850-*-rtems*,
v850-*-*): Delete superflous ${cpu_type} setting.
* config/linux.h: Delete svr4.h include.
(SET_ASM_OP): Delete.
* config/netware.h (INT_ASM_OP): Undef before define.
* config/ptx4.h: Delete elfos.h include.
(PREFERRED_DEBUGGING_TYPE): Undef instead of wrapping.
* config/svr4.h: Delete elfos.h include. Update commentary.
* config/arc/arc.h, config/d30v/d30v.h, config/fr30/fr30.h,
config/m32r/m32r.h, config/m88k/sysv4.h, config/mn10200/mn10200.h,
config/mn10200/mn10300.h, config/stormy16/stormy16.h,
config/v850/v850.h: Delete svr4.h include.
* config/i370/linux.h, config/i386/osf1elf.h, config/m68k/linux.h,
config/m68k/m68kv4.h, config/m88k/sysv4.h,
config/sparc/sysv4.h: Update includes.
* config/i386/beos-elf.h, config/i386/netware.h, config/i386/ptx4-i.h,
config/i386/rtemself.h, config/i386/sol2.h, config/i386/sysv4.h,
config/i386/sysv5.h, config/i386/udk.h, config/ia64/linux.h,
config/m88k/dguxbcs.h: Delete includes.
* config/i386/dgux.h, config/i386/osf1elfgdb.h: Delete include.
(PREFERRED_DEBUGGING_TYPE): Undef before defining it.
* config/i860/fx2800.h (ASM_OUTPUT_SOURCE_LINE): Undef before defining
it.
* config/m88k/dgux.h: Delete include.
(SDB_DEBUGGING_INFO, PREFERRED_DEBUGGING_TYPE):  Undef before
defining it.
* config/pj/pj.h (ASM_GENERATE_INTERNAL_LABEL,
ASM_OUTPUT_INTERNAL_LABEL, ASM_OUTPUT_SKIP): Undef before defining it.
* config/sh/elf.h: Update include.
(SDB_DEBUGGING_INFO, DWARF2_DEBUGGING_INFO, PREFERRED_DEBUGGING_TYPE,
DWARF2_ASM_LINE_DEBUG_INFO): Move behind includes.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@46366 138bc75d-0d04-0410-961f-82ee72b054a4

38 files changed:
gcc/ChangeLog
gcc/config.gcc
gcc/config/arc/arc.h
gcc/config/d30v/d30v.h
gcc/config/fr30/fr30.h
gcc/config/i370/linux.h
gcc/config/i386/beos-elf.h
gcc/config/i386/dgux.h
gcc/config/i386/netware.h
gcc/config/i386/osf1elf.h
gcc/config/i386/osf1elfgdb.h
gcc/config/i386/ptx4-i.h
gcc/config/i386/rtemself.h
gcc/config/i386/sol2.h
gcc/config/i386/sysv4.h
gcc/config/i386/sysv5.h
gcc/config/i386/udk.h
gcc/config/i860/fx2800.h
gcc/config/ia64/elf.h
gcc/config/ia64/linux.h
gcc/config/linux.h
gcc/config/m32r/m32r.h
gcc/config/m68k/linux.h
gcc/config/m68k/m68kv4.h
gcc/config/m88k/dgux.h
gcc/config/m88k/dguxbcs.h
gcc/config/m88k/sysv4.h
gcc/config/mcore/mcore-elf.h
gcc/config/mn10200/mn10200.h
gcc/config/mn10300/mn10300.h
gcc/config/netware.h
gcc/config/pj/pj.h
gcc/config/ptx4.h
gcc/config/sh/elf.h
gcc/config/sparc/sysv4.h
gcc/config/stormy16/stormy16.h
gcc/config/svr4.h
gcc/config/v850/v850.h

index 9e5da09..26c6fd3 100644 (file)
@@ -1,3 +1,64 @@
+2001-10-19  Franz Sirl  <Franz.Sirl-kernel@lauterbach.com>
+
+       * config.gcc (i[34567]86-*-gnu*, arc-*-elf*, d30v-*,
+       fr30-*-elf, hppa*64*-*-linux*, parisc*64*-*-linux*, hppa*-*-linux*,
+       parisc*-*-linux*, i370-*-linux*, i[34567]86-*-chorusos*,
+       i[34567]86-*-elf*, i[34567]86-ncr-sysv4*, i[34567]86-*-netware,
+       i[34567]86-sequent-ptx4*, i[34567]86-sequent-sysv4*,
+       i[34567]86-*-beoself*, i[34567]86-*-beos*, i[34567]86-*-freebsd*,
+       i[34567]86-*-netbsdelf*, i[34567]86-*-linux*libc1,
+       i[34567]86-*-linux*, i[34567]86-moss-msdos*, i[34567]86-*-moss*,
+       i[34567]86-go32-rtems*, i[34567]86-*-rtems*, i[34567]86-*-rtemself*,
+       i[34567]86-*-solaris2*, i[34567]86-*-sysv5*, i[34567]86-*-sysv4*,
+       i[34567]86-*-udk*, i[34567]86-*-osf1*, i[34567]86-dg-dgux*,
+       i860-alliant-*, i860-*-sysv4*, ia64*-*-aix*, ia64*-*-linux*,
+       ia64*-*-hpux*, m32r-*-elf*, m88k-dg-dgux*, m88k-*-sysv4*, mcore-*-elf,
+       mips*-*-linux*, mn10200-*-*, mn10300-*-*, pj*-linux*, pjl-*,
+       powerpc64-*-linux*, powerpc-*-sysv*, powerpc-*-netbsd*,
+       powerpc-*-chorusos*, powerpc-*-eabiaix*, powerpc-*-eabisim*,
+       powerpc-*-elf*, powerpc-*-eabi*, powerpc-*-rtems*,
+       powerpc-*-linux*libc1, powerpc-*-linux*, powerpc-wrs-vxworks*,
+       powerpcle-wrs-vxworks*, powerpcle-*-sysv*, powerpcle-*-elf*,
+       powerpcle-*-eabisim*, powerpcle-*-eabi*, powerpcle-*-solaris2*,
+       rs6000-*-mach*, s390-*-linux*, s390x-*-linux*, sh-*-elf*,
+       sh-*-rtemself*, sh-*-rtems*, sh-*-linux*, stormy16-*-elf,
+       v850-*-rtems*, v850-*-*, x86_64-*-linux*), cris-*-aout, cris-*-elf,
+       cris-*-none, cris-*-linux*: Update ${tmfile} list.
+       (c4x-*-rtems*, c4x-*, i[34567]86-go32-rtems*, i[34567]86-*-rtemscoff*,
+       i[34567]86-*-rtems*, i[34567]86-*-rtemself*, i[34567]86-*-osf1*,
+       mn10200-*-*, mn10300-*-*, powerpc-*-beos*, powerpc-*-darwin*,
+       powerpc-wrs-vxworks*, powerpcle-wrs-vxworks*, v850-*-rtems*,
+       v850-*-*): Delete superflous ${cpu_type} setting.
+       * config/linux.h: Delete svr4.h include.
+       (SET_ASM_OP): Delete.
+       * config/netware.h (INT_ASM_OP): Undef before define.
+       * config/ptx4.h: Delete elfos.h include.
+       (PREFERRED_DEBUGGING_TYPE): Undef instead of wrapping.
+       * config/svr4.h: Delete elfos.h include. Update commentary.
+       * config/arc/arc.h, config/d30v/d30v.h, config/fr30/fr30.h,
+       config/m32r/m32r.h, config/m88k/sysv4.h, config/mn10200/mn10200.h,
+       config/mn10200/mn10300.h, config/stormy16/stormy16.h,
+       config/v850/v850.h: Delete svr4.h include.
+       * config/i370/linux.h, config/i386/osf1elf.h, config/m68k/linux.h,
+       config/m68k/m68kv4.h, config/m88k/sysv4.h,
+       config/sparc/sysv4.h: Update includes.
+       * config/i386/beos-elf.h, config/i386/netware.h, config/i386/ptx4-i.h,
+       config/i386/rtemself.h, config/i386/sol2.h, config/i386/sysv4.h,
+       config/i386/sysv5.h, config/i386/udk.h, config/ia64/linux.h,
+       config/m88k/dguxbcs.h: Delete includes.
+       * config/i386/dgux.h, config/i386/osf1elfgdb.h: Delete include.
+       (PREFERRED_DEBUGGING_TYPE): Undef before defining it.
+       * config/i860/fx2800.h (ASM_OUTPUT_SOURCE_LINE): Undef before defining
+       it.
+       * config/m88k/dgux.h: Delete include.
+       (SDB_DEBUGGING_INFO, PREFERRED_DEBUGGING_TYPE):  Undef before
+       defining it.
+       * config/pj/pj.h (ASM_GENERATE_INTERNAL_LABEL,
+       ASM_OUTPUT_INTERNAL_LABEL, ASM_OUTPUT_SKIP): Undef before defining it.
+       * config/sh/elf.h: Update include.
+       (SDB_DEBUGGING_INFO, DWARF2_DEBUGGING_INFO, PREFERRED_DEBUGGING_TYPE,
+       DWARF2_ASM_LINE_DEBUG_INFO): Move behind includes.
+
 2001-10-19  Catherine Moore  <clm@redhat.com>
 
         * config/stormy16/stormy-abi:  Updates to varargs descriptions.
index b1bd55d..36a10ba 100644 (file)
 #  cpu_type            The name of the cpu, if different from machine.
 #
 #  tm_file             A list of target macro files, if different from
-#                      "$cpu_type/$cpu_type.h".
+#                      "$cpu_type/$cpu_type.h". Usually it's constructed
+#                      per target in a way like this:
+#                      tm_file="${tm_file} elfos.h svr4.h ${cpu_type.h}/elf.h"
+#                      Note that the preferred order is:
+#                      - specific target header "${cpu_type}/${cpu_type.h}"
+#                      - generic headers like elfos.h, netware.h, etc.
+#                      - specializing target headers like ${cpu_type.h}/elf.h
+#                      This helps to keep OS specific stuff out of the CPU
+#                      defining header ${cpu_type}/${cpu_type.h}.
 #
 #  tm_p_file           Location of file with declarations for functions
 #                      in $out_file.
@@ -280,7 +288,7 @@ case $machine in
        tmake_file="t-slibgcc-elf-ver t-linux t-gnu"
        case $machine in
        i[34567]86-*-*)
-               tm_file="${cpu_type}/${cpu_type}.h i386/att.h linux.h i386/linux.h gnu.h ${tm_file}"
+               tm_file="${cpu_type}/${cpu_type}.h i386/att.h elfos.h svr4.h linux.h i386/linux.h gnu.h ${tm_file}"
                ;;
        esac
        ;;
@@ -528,6 +536,7 @@ alpha*-dec-vms*)
        tmake_file="alpha/t-alpha alpha/t-vms alpha/t-ieee"
        ;;
 arc-*-elf*)
+       tm_file="elfos.h svr4.h ${tm_file}"
        extra_parts="crtinit.o crtfini.o"
        ;;
 arm*-*-rtems*)
@@ -638,7 +647,6 @@ c38-convex-*)
        use_collect2=yes
        ;;
 c4x-*-rtems*)
-       cpu_type=c4x
        tmake_file="c4x/t-c4x t-rtems"
        tm_file=c4x/rtems.h
        if test x$enable_threads = xyes; then
@@ -648,7 +656,6 @@ c4x-*-rtems*)
        cxx_target_objs="c4x-c.o"
        ;;
 c4x-*)
-       cpu_type=c4x
        float_format=c4x
        tmake_file=c4x/t-c4x
        c_target_objs="c4x-c.o"
@@ -662,17 +669,17 @@ clipper-intergraph-clix*)
        install_headers_dir=install-headers-cpio
        ;;
 cris-*-aout)
-       tm_file="dbxelf.h cris/cris.h cris/aout.h"
+       tm_file="dbxelf.h ${tm_file} cris/aout.h"
        gas=yes
        tmake_file="cris/t-cris cris/t-aout"
        ;;
 cris-*-elf | cris-*-none)
-       tm_file="elfos.h cris/cris.h"
+       tm_file="elfos.h ${tm_file}"
        tmake_file="cris/t-cris cris/t-elfmulti"
        gas=yes
        ;;
 cris-*-linux*)
-       tm_file="linux.h cris/cris.h cris/linux.h"
+       tm_file="elfos.h svr4.h linux.h ${tm_file} cris/linux.h"
        tmake_file="cris/t-cris t-slibgcc-elf-ver cris/t-linux"
        extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
        case x${enable_threads} in
@@ -683,6 +690,7 @@ cris-*-linux*)
        gas=yes
        ;;
 d30v-*)
+       tm_file="elfos.h svr4.h ${tm_file}"
        float_format=i64
        ;;
 dsp16xx-*)
@@ -691,7 +699,7 @@ elxsi-elxsi-*)
        use_collect2=yes
        ;;
 fr30-*-elf)
-       tm_file="fr30/fr30.h"
+       tm_file="elfos.h svr4.h ${tm_file}"
        tmake_file=fr30/t-fr30
        extra_parts="crti.o crtn.o crtbegin.o crtend.o"
        ;;
@@ -713,14 +721,14 @@ h8300-*-*)
        ;;
 hppa*64*-*-linux* | parisc*64*-*-linux*)
        target_cpu_default="(MASK_PA_11 | MASK_PA_20)"
-       tm_file="pa/pa64-start.h ${tm_file} linux.h pa/pa-linux.h \
+       tm_file="pa/pa64-start.h ${tm_file} elfos.h svr4.h linux.h pa/pa-linux.h \
                 pa/pa64-regs.h pa/pa-64.h pa/pa64-linux.h"
        tmake_file=pa/t-linux64
        gas=yes gnu_ld=yes
        ;;
 hppa*-*-linux* | parisc*-*-linux*)
        target_cpu_default="MASK_PA_11"
-       tm_file="${tm_file} linux.h pa/pa-linux.h \
+       tm_file="${tm_file} elfos.h svr4.h linux.h pa/pa-linux.h \
                 pa/pa32-regs.h pa/pa32-linux.h"
        tmake_file="t-slibgcc-elf-ver t-linux pa/t-linux"
        extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
@@ -959,7 +967,7 @@ i370-*-mvs*)
        ;;
 i370-*-linux*)
        xmake_file=x-linux
-       tm_file="i370/linux.h ${tm_file}"
+       tm_file="elfos.h svr4.h linux.h i370/linux.h ${tm_file}"
        tmake_file="t-slibgcc-elf-ver t-linux"
        # broken_install=yes
        extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
@@ -973,7 +981,7 @@ i370-*-linux*)
        ;;
 i[34567]86-*-chorusos*)
        xm_defines=POSIX
-       tm_file="i386/i386.h i386/att.h elfos.h i386/i386elf.h chorus.h"
+       tm_file="${tm_file} i386/att.h elfos.h i386/i386elf.h chorus.h"
        tmake_file=i386/t-i386elf
        xmake_file=x-svr4
        case x${enable_threads} in
@@ -984,7 +992,7 @@ i[34567]86-*-chorusos*)
        ;;
 i[34567]86-*-elf*)
        xm_defines=POSIX
-       tm_file="i386/i386.h i386/att.h elfos.h i386/i386elf.h"
+       tm_file="${tm_file} i386/att.h elfos.h i386/i386elf.h"
        tmake_file=i386/t-i386elf
        xmake_file=x-svr4
        ;;
@@ -1006,7 +1014,7 @@ i[34567]86-ncr-sysv4*)            # NCR 3000 - ix86 running system V.4
        then
                tm_file=i386/sysv4gdb.h
        else
-               tm_file=i386/sysv4.h
+               tm_file="${tm_file} i386/att.h elfos.h svr4.h i386/sysv4.h"
        fi
        extra_parts="crtbegin.o crtend.o"
        tmake_file=i386/t-crtpic
@@ -1021,7 +1029,7 @@ i[34567]86-next-*)
        fi
        ;;
 i[34567]86-*-netware)          # Intel 80386's running netware
-       tm_file=i386/netware.h
+       tm_file="${tm_file} i386/att.h elfos.h svr4.h i386/sysv4.h netware.h i386/netware.h"
        tmake_file=i386/t-netware
        ;;
 i[34567]86-sequent-bsd*)               # 80386 from Sequent
@@ -1054,7 +1062,7 @@ i[34567]86-sequent-ptx4* | i[34567]86-sequent-sysv4*)
        fi
        xm_defines="POSIX SMALL_ARG_MAX"
        xmake_file=x-svr4
-       tm_file=i386/ptx4-i.h
+       tm_file="${tm_file} i386/att.h elfos.h ptx4.h i386/ptx4-i.h"
        tmake_file=t-svr4
        extra_parts="crtbegin.o crtend.o"
        install_headers_dir=install-headers-cpio
@@ -1074,7 +1082,7 @@ i[34567]86-*-aout*)
 i[34567]86-*-beoself* | i[34567]86-*-beos*)
        xm_defines=POSIX
        tmake_file='i386/t-beos i386/t-crtpic'
-       tm_file=i386/beos-elf.h
+       tm_file="${tm_file} i386/att.h elfos.h svr4.h i386/beos-elf.h"
        xmake_file=i386/x-beos
        extra_parts='crtbegin.o crtend.o'
        ;;
@@ -1093,11 +1101,11 @@ i[34567]86-*-freebsd[12] | i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd*aou
        tmake_file=t-freebsd
        ;;
 i[34567]86-*-freebsd*)
-       tm_file="${tm_file} i386/att.h svr4.h ${fbsd_tm_file} i386/freebsd.h"
+       tm_file="${tm_file} i386/att.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 svr4.h i386/netbsd-elf.h"
+       tm_file="${tm_file} i386/att.h elfos.h svr4.h i386/netbsd-elf.h"
        tmake_file=t-netbsd
        gnu_ld=yes
        float_format=i386
@@ -1148,8 +1156,8 @@ i[34567]86-*-linux*aout*) # Intel 80386's running GNU/Linux
 i[34567]86-*-linux*libc1)      # Intel 80386's running GNU/Linux
                                # with ELF format using the
                                # GNU/Linux C library 5
-       xmake_file=x-linux
-       tm_file="i386/i386.h i386/att.h linux.h i386/linux.h"
+       xmake_file=x-linux      
+       tm_file="${tm_file} i386/att.h elfos.h svr4.h linux.h i386/linux.h"
        tmake_file="t-slibgcc-elf-ver t-linux t-linux-gnulibc1 i386/t-crtstuff"
        extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
        gnu_ld=yes
@@ -1162,7 +1170,7 @@ i[34567]86-*-linux*)      # Intel 80386's running GNU/Linux
                        # with ELF format using glibc 2
                        # aka GNU/Linux C library 6
        xmake_file=x-linux
-       tm_file="i386/i386.h i386/att.h linux.h i386/linux.h"
+       tm_file="${tm_file} i386/att.h elfos.h svr4.h linux.h i386/linux.h"
        tmake_file="t-slibgcc-elf-ver t-linux i386/t-crtstuff"
        extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
        gnu_ld=yes
@@ -1173,8 +1181,8 @@ i[34567]86-*-linux*)      # Intel 80386's running GNU/Linux
        ;;
 x86_64-*-linux*)
        xmake_file=x-linux
-       tm_file="i386/biarch64.h i386/i386.h i386/att.h linux.h i386/x86-64.h \
-                i386/linux64.h"
+       tm_file="i386/biarch64.h i386/i386.h i386/att.h elfos.h svr4.h linux.h \
+                i386/x86-64.h i386/linux64.h"
        tmake_file="t-slibgcc-elf-ver t-linux i386/t-crtstuff"
        extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
        gnu_ld=yes
@@ -1204,7 +1212,7 @@ i[34567]86-pc-msdosdjgpp*)
        esac
        ;;
 i[34567]86-moss-msdos* | i[34567]86-*-moss*)
-       tm_file="i386/i386.h i386/att.h linux.h i386/linux.h i386/moss.h"
+       tm_file="${tm_file} i386/att.h elfos.h svr4.h linux.h i386/linux.h i386/moss.h"
        tmake_file=t-libc-ok
        gnu_ld=yes
        gas=yes
@@ -1235,15 +1243,13 @@ i[34567]86-*-osfrose*)          # 386 using OSF/rose
        extra_objs=halfpic.o
        ;;
 i[34567]86-go32-rtems*)
-       cpu_type=i386
-       tm_file=i386/go32-rtems.h
+       tm_file=i386/djgpp-rtems.h
        tmake_file=t-rtems
        if test x$enable_threads = xyes; then
          thread_file='rtems'
        fi
        ;;
 i[34567]86-*-rtemscoff*)
-       cpu_type=i386
        tm_file=i386/rtems.h
        tmake_file=t-rtems
        if test x$enable_threads = xyes; then
@@ -1251,8 +1257,7 @@ i[34567]86-*-rtemscoff*)
        fi
        ;;
 i[34567]86-*-rtems*|i[34567]86-*-rtemself*)
-       cpu_type=i386
-       tm_file=i386/rtemself.h
+       tm_file="${tm_file} i386/att.h elfos.h svr4.h linux.h i386/rtemself.h rtems.h"
        extra_parts="crtbegin.o crtend.o crti.o crtn.o"
        tmake_file="i386/t-rtems-i386 i386/t-crtstuff t-rtems"
        if test x$enable_threads = xyes; then
@@ -1275,7 +1280,7 @@ i[34567]86-*-sco3.2v5*)   # 80386 running SCO Open Server 5
        ;;
 i[34567]86-*-solaris2*)
        xm_defines="POSIX SMALL_ARG_MAX"
-       tm_file=i386/sol2.h
+       tm_file="${tm_file} i386/att.h elfos.h svr4.h i386/sysv4.h i386/sol2.h"
        if test x$gas = xyes; then
                # Only needed if gas does not support -s
                tm_file="i386/sol2gas.h ${tm_file}"
@@ -1304,7 +1309,7 @@ i[34567]86-*-solaris2*)
        ;;
 i[34567]86-*-sysv5*)           # Intel x86 on System V Release 5
        xm_defines=POSIX
-       tm_file=i386/sysv5.h
+       tm_file="${tm_file} i386/att.h elfos.h svr4.h i386/sysv4.h i386/sysv5.h"
        if test x$stabs = xyes
        then
                tm_file="${tm_file} dbx.h"
@@ -1318,7 +1323,7 @@ i[34567]86-*-sysv5*)           # Intel x86 on System V Release 5
        ;;
 i[34567]86-*-sysv4*)           # Intel 80386's running system V.4
        xm_defines="POSIX SMALL_ARG_MAX"
-       tm_file=i386/sysv4.h
+       tm_file="${tm_file} i386/att.h elfos.h svr4.h i386/sysv4.h"
        if test x$stabs = xyes
        then
                tm_file="${tm_file} dbx.h"
@@ -1329,21 +1334,20 @@ i[34567]86-*-sysv4*)            # Intel 80386's running system V.4
        ;;
 i[34567]86-*-udk*)      # Intel x86 on SCO UW/OSR5 Dev Kit
        xm_defines=POSIX
-       tm_file=i386/udk.h
+       tm_file="${tm_file} i386/att.h elfos.h svr4.h i386/sysv4.h i386/sysv5.h i386/udk.h"
        tmake_file="i386/t-crtpic i386/t-udk"
        xmake_file=x-svr4
        extra_parts="crtbegin.o crtend.o"
        install_headers_dir=install-headers-cpio
        ;;
 i[34567]86-*-osf1*)            # Intel 80386's running OSF/1 1.3+
-       cpu_type=i386
        xm_file=i386/xm-osf1elf.h
        xm_defines='POSIX USE_C_ALLOCA SMALL_ARG_MAX'
        if test x$stabs = xyes
        then
-               tm_file=i386/osf1elfgdb.h
+               tm_file="${tm_file} i386/att.h elfos.h svr4.h i386/sysv4.h i386/osf1elf.h i386/osf1elfgdb.h"
        else
-               tm_file=i386/osf1elf.h
+               tm_file="${tm_file} i386/att.h elfos.h svr4.h i386/sysv4.h i386/osf1elf.h"
        fi
        tmake_file=i386/t-osf1elf
        extra_parts="crti.o crtn.o crtbegin.o crtend.o"
@@ -1446,13 +1450,13 @@ i[34567]86-*-interix*)
 i[34567]86-dg-dgux*)
        xm_defines=POSIX
        out_file=i386/dgux.c
-       tm_file=i386/dgux.h
+       tm_file="${tm_file} i386/att.h elfos.h svr4.h i386/sysv4.h i386/dgux.h"
        tmake_file=i386/t-dgux
        xmake_file=i386/x-dgux
        install_headers_dir=install-headers-cpio
       ;;
 i860-alliant-*)                # Alliant FX/2800
-       tm_file="${tm_file} svr4.h i860/sysv4.h i860/fx2800.h"
+       tm_file="${tm_file} elfos.h svr4.h i860/sysv4.h i860/fx2800.h"
        tmake_file=i860/t-fx2800
        extra_parts="crtbegin.o crtend.o"
        ;;
@@ -1478,7 +1482,7 @@ i860-*-sysv3*)
        extra_parts="crtbegin.o crtend.o"
        ;;
 i860-*-sysv4*)
-       tm_file="${tm_file} svr4.h i860/sysv4.h"
+       tm_file="${tm_file} elfos.h svr4.h i860/sysv4.h"
        xm_defines=POSIX
        tmake_file=t-svr4
        extra_parts="crtbegin.o crtend.o"
@@ -1528,7 +1532,7 @@ i960-*-*)                 # Default i960 environment.
        cxx_target_objs="i960-c.o"
        ;;
 ia64*-*-aix*)
-       tm_file="${tm_file} svr4.h ia64/sysv4.h ia64/aix.h"
+       tm_file="${tm_file} elfos.h svr4.h ia64/sysv4.h ia64/aix.h"
        tmake_file="ia64/t-ia64 ia64/t-aix"
        target_cpu_default="MASK_GNU_AS|MASK_GNU_LD"
        ;;
@@ -1547,7 +1551,7 @@ ia64*-*-elf*)
        float_format=i386
        ;;
 ia64*-*-linux*)
-       tm_file=ia64/linux.h
+       tm_file="${tm_file} elfos.h svr4.h linux.h ia64/sysv4.h ia64/linux.h"
        tmake_file="t-slibgcc-elf-ver t-linux ia64/t-ia64 ia64/t-glibc"
        target_cpu_default="MASK_GNU_AS|MASK_GNU_LD"
        if test x$enable_threads = xyes; then
@@ -1556,7 +1560,7 @@ ia64*-*-linux*)
        float_format=i386
        ;;
 ia64*-*-hpux*)
-       tm_file="ia64/ia64.h svr4.h ia64/sysv4.h ia64/hpux.h ia64/hpux_longdouble.h"
+       tm_file="${tm_file} elfos.h svr4.h ia64/sysv4.h ia64/hpux.h ia64/hpux_longdouble.h"
        tmake_file="ia64/t-ia64 ia64/t-hpux"
        target_cpu_default="MASK_GNU_AS"
        if test x$enable_threads = xyes; then
@@ -1565,6 +1569,7 @@ ia64*-*-hpux*)
        float_format=i386
        ;;
 m32r-*-elf*)
+       tm_file="elfos.h svr4.h ${tm_file}"
        extra_parts="crtinit.o crtfini.o"
        ;;
 # m68hc11 and m68hc12 share the same machine description.
@@ -2005,11 +2010,11 @@ m88k-dg-dgux*)
        xm_defines=POSIX
        case $machine in
          m88k-dg-dguxbcs*)
-           tm_file=m88k/dguxbcs.h
+           tm_file="elfos.h svr4.h m88k/dgux.h m88k/dguxbcs.h"
            tmake_file=m88k/t-dguxbcs
            ;;
          *)
-           tm_file=m88k/dgux.h
+           tm_file="elfos.h svr4.h m88k/dgux.h"
            tmake_file=m88k/t-dgux
            ;;
        esac
@@ -2074,12 +2079,12 @@ m88k-*-sysv3*)
        ;;
 m88k-*-sysv4*)
        xm_defines=POSIX
-       tm_file=m88k/sysv4.h
+       tm_file="elfos.h svr4.h m88k/sysv4.h"
        extra_parts="crtbegin.o crtend.o"
        tmake_file=m88k/t-sysv4
        ;;
 mcore-*-elf)
-       tm_file=mcore/mcore-elf.h
+       tm_file="elfos.h svr4.h ${tm_file} mcore/mcore-elf.h"
        tmake_file=mcore/t-mcore
        ;;
 mcore-*-pe*)
@@ -2551,8 +2556,7 @@ mips-*-*)                         # Default MIPS RISC-OS 4.0.
        ;;
 mn10200-*-*)
        float_format=i32
-       cpu_type=mn10200
-       tm_file="mn10200/mn10200.h"
+       tm_file="elfos.h svr4.h ${tm_file}"
        if test x$stabs = xyes
        then
                tm_file="${tm_file} dbx.h"
@@ -2560,8 +2564,7 @@ mn10200-*-*)
        use_collect2=no
        ;;
 mn10300-*-*)
-       cpu_type=mn10300
-       tm_file="mn10300/mn10300.h"
+       tm_file="elfos.h svr4.h ${tm_file}"
        if test x$stabs = xyes
        then
                tm_file="${tm_file} dbx.h"
@@ -2614,12 +2617,12 @@ ns32k-*-openbsd*)
        # Nothing special
        ;;
 pj*-linux*)
-       tm_file="svr4.h pj/linux.h ${tm_file}"
+       tm_file="elfos.h svr4.h pj/linux.h ${tm_file}"
        ;;
 pj-*)
        ;;
 pjl-*)
-       tm_file="svr4.h pj/pjl.h ${tm_file}"
+       tm_file="elfos.h svr4.h pj/pjl.h ${tm_file}"
        ;;
 
 romp-*-aos*)
@@ -2635,21 +2638,19 @@ powerpc-*-openbsd*)
        tmake_file="${tmake_file} rs6000/t-rs6000 rs6000/t-openbsd"
        ;;
 powerpc64-*-linux*)
-       tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/linux64.h"
+       tm_file="${tm_file} elfos.h svr4.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"
        xmake_file=x-linux
        extra_headers=ppc-asm.h
        ;;
 powerpc-*-beos*)
-       cpu_type=rs6000
        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
        ;;
 powerpc-*-darwin*)
-       cpu_type=rs6000
        tm_file="${tm_file} darwin.h rs6000/darwin.h"
        tm_p_file="${tm_p_file} darwin-protos.h"
        tmake_file=rs6000/t-darwin
@@ -2665,20 +2666,20 @@ powerpc-*-darwin*)
        use_collect2=no
        ;;
 powerpc-*-sysv*)
-       tm_file="${tm_file} svr4.h rs6000/sysv4.h"
+       tm_file="${tm_file} elfos.h svr4.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} svr4.h rs6000/sysv4.h rs6000/netbsd.h"
+       tm_file="${tm_file} elfos.h svr4.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} svr4.h rs6000/sysv4.h chorus.h"
+       tm_file="${tm_file} elfos.h svr4.h rs6000/sysv4.h chorus.h"
        tmake_file="rs6000/t-ppcos rs6000/t-ppccomm"
        extra_headers=ppc-asm.h
        case x${enable_threads} in
@@ -2689,31 +2690,31 @@ powerpc-*-chorusos*)
        ;;
 powerpc-*-eabiaix*)
        xm_defines=POSIX
-       tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/eabi.h rs6000/eabiaix.h"
+       tm_file="${tm_file} elfos.h svr4.h rs6000/sysv4.h rs6000/eabi.h rs6000/eabiaix.h"
        tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
        extra_headers=ppc-asm.h
        ;;
 powerpc-*-eabisim*)
        xm_defines=POSIX
-       tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/eabi.h rs6000/eabisim.h"
+       tm_file="${tm_file} elfos.h svr4.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} svr4.h rs6000/sysv4.h"
+       tm_file="${tm_file} elfos.h svr4.h rs6000/sysv4.h"
        tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
        extra_headers=ppc-asm.h
        ;;
 powerpc-*-eabi*)
        xm_defines=POSIX
-       tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/eabi.h"
+       tm_file="${tm_file} elfos.h svr4.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} svr4.h rs6000/sysv4.h rs6000/eabi.h rtems.h rs6000/rtems.h"
+       tm_file="${tm_file} elfos.h svr4.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
@@ -2721,7 +2722,7 @@ powerpc-*-rtems*)
        fi
        ;;
 powerpc-*-linux*libc1)
-       tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/linux.h"
+       tm_file="${tm_file} elfos.h svr4.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"
        xmake_file=x-linux
@@ -2731,7 +2732,7 @@ powerpc-*-linux*libc1)
        fi
        ;;
 powerpc-*-linux*)
-       tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/linux.h"
+       tm_file="${tm_file} elfos.h svr4.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"
        xmake_file=x-linux
@@ -2741,47 +2742,45 @@ powerpc-*-linux*)
        fi
        ;;
 powerpc-wrs-vxworks*)
-        cpu_type=rs6000
        xm_defines=POSIX
-        tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/vxppc.h"
+        tm_file="${tm_file} elfos.h svr4.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*)
-        cpu_type=rs6000
        xm_defines=POSIX
-        tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/sysv4le.h rs6000/vxppc.h"
+        tm_file="${tm_file} elfos.h svr4.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} svr4.h rs6000/sysv4.h rs6000/sysv4le.h"
+       tm_file="${tm_file} elfos.h svr4.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} svr4.h rs6000/sysv4.h rs6000/sysv4le.h"
+       tm_file="${tm_file} elfos.h svr4.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} svr4.h rs6000/sysv4.h rs6000/sysv4le.h rs6000/eabi.h rs6000/eabisim.h"
+       tm_file="${tm_file} elfos.h svr4.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} svr4.h rs6000/sysv4.h rs6000/sysv4le.h rs6000/eabi.h"
+       tm_file="${tm_file} elfos.h svr4.h rs6000/sysv4.h rs6000/sysv4le.h rs6000/eabi.h"
        tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
        extra_headers=ppc-asm.h
        ;;
 powerpcle-*-solaris2*)
-       tm_file="${tm_file} svr4.h rs6000/sysv4.h rs6000/sysv4le.h rs6000/sol2.h"
+       tm_file="${tm_file} elfos.h svr4.h rs6000/sysv4.h rs6000/sysv4le.h rs6000/sol2.h"
        xm_defines=POSIX
        tmake_file="rs6000/t-ppcos rs6000/t-ppccomm"
        extra_headers=ppc-asm.h
@@ -2835,7 +2834,7 @@ rs6000-bull-bosx)
        use_collect2=yes
        ;;
 rs6000-*-mach*)
-       tm_file="rs6000/rs6000.h rs6000/mach.h"
+       tm_file="${tm_file} rs6000/mach.h"
        xm_defines=POSIX
        use_collect2=yes
        ;;
@@ -2846,7 +2845,7 @@ rs6000-*-lynxos*)
        ;;
 s390-*-linux*)
        xmake_file=x-linux
-       tm_file="s390/s390.h linux.h s390/linux.h"
+       tm_file="s390/s390.h elfos.h svr4.h linux.h s390/linux.h"
        tmake_file="t-slibgcc-elf-ver t-linux s390/t-linux"
        extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o"
        if test x$enable_threads = xyes; then
@@ -2855,7 +2854,7 @@ s390-*-linux*)
        ;;
 s390x-*-linux*)
        xmake_file=x-linux
-       tm_file="s390/s390.h linux.h s390/linux.h s390/linux64.h"
+       tm_file="s390/s390.h elfos.h svr4.h linux.h s390/linux.h s390/linux64.h"
        tm_p_file=s390/s390-protos.h
        md_file=s390/s390.md
        out_file=s390/s390.c
@@ -2867,12 +2866,12 @@ s390x-*-linux*)
        ;;
 sh-*-elf*)
        tmake_file="sh/t-sh sh/t-elf"
-       tm_file="sh/sh.h sh/elf.h"
+       tm_file="${tm_file} sh/elf.h"
        float_format=sh
        ;;
 sh-*-rtemself*)
        tmake_file="sh/t-sh sh/t-elf t-rtems"
-       tm_file="sh/sh.h sh/elf.h sh/rtemself.h"
+       tm_file="${tm_file} sh/elf.h sh/rtemself.h"
        float_format=sh
        if test x$enable_threads = xyes; then
          thread_file='rtems'
@@ -2880,14 +2879,14 @@ sh-*-rtemself*)
        ;;
 sh-*-rtems*)
        tmake_file="sh/t-sh t-rtems"
-       tm_file="sh/sh.h sh/rtems.h"
+       tm_file="${tm_file} sh/rtems.h"
        float_format=sh
        if test x$enable_threads = xyes; then
          thread_file='rtems'
        fi
        ;;
 sh-*-linux*)
-       tm_file="sh/sh.h sh/elf.h sh/linux.h"
+       tm_file="${tm_file} sh/elf.h sh/linux.h"
        tmake_file="sh/t-sh sh/t-elf sh/t-linux"
        xmake_file=x-linux
        gas=yes gnu_ld=yes
@@ -3171,6 +3170,7 @@ sparc64-*-linux*)         # 64-bit Sparc's running GNU/Linux
        float_format=sparc
        ;;
 stormy16-*-elf)
+       tm_file="elfos.h svr4.h ${tm_file}"
        tmake_file="stormy16/t-stormy16"
        extra_parts="crtbegin.o crtend.o"
        ;;
@@ -3200,8 +3200,7 @@ thumb*-*-*)
 *** when the -mthumb switch is given to the compiler." 1>&2; exit 1; }
        ;;
 v850-*-rtems*)
-       cpu_type=v850
-       tm_file="v850/rtems.h"
+       tm_file="elfos.h svr4.h ${tm_file} v850/rtems.h"
        tmake_file="v850/t-v850 t-rtems"
        if test x$stabs = xyes
        then
@@ -3213,8 +3212,7 @@ v850-*-rtems*)
        ;;
 v850-*-*)
        target_cpu_default="TARGET_CPU_generic"
-       cpu_type=v850
-       tm_file="v850/v850.h"
+       tm_file="elfos.h svr4.h ${tm_file}"
        tmake_file=v850/t-v850
        if test x$stabs = xyes
        then
index 07507a1..7e1191e 100644 (file)
@@ -28,8 +28,6 @@ Boston, MA 02111-1307, USA.  */
    - print active compiler options in assembler output
 */
 
-/* ??? Create elf.h and have svr4.h include it.  */
-#include "svr4.h"
 
 #undef ASM_SPEC
 #undef LINK_SPEC
index 1ab9dc7..f7e743e 100644 (file)
 #define D30V_ALIGN(addr,align) (((addr) + (align) - 1) & ~((align) - 1))
 
 \f
-/* Set up System V.4 (aka ELF) defaults.  */
-#include "svr4.h"
-
-\f
 /* Driver configuration */
 
 /* A C expression which determines whether the option `-CHAR' takes arguments.
index e94902c..4e947b3 100644 (file)
@@ -22,12 +22,6 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 /*}}}*/ \f
-/*{{{  Includes.  */ 
-
-/* Set up System V.4 (aka ELF) defaults.  */
-#include "svr4.h"
-
-/*}}}*/ \f
 /*{{{  Driver configuration.  */ 
 
 /* A C expression which determines whether the option `-CHAR' takes arguments.
index 6c69c81..842ae6e 100644 (file)
@@ -37,9 +37,8 @@ Boston, MA 02111-1307, USA.  */
 #define REAL_ARITHMETIC
 
 /* Include system common definitions */
-
-#include "config/linux.h"
-#include "config/i370/i370.h"
+/* TODO: convert include to ${tm_file} list in config.gcc.  */
+#include "i370/i370.h"
 
 /* Names to predefine in the preprocessor for this target machine.  */
 
index d4c0de4..1a91fbc 100644 (file)
@@ -1,5 +1,5 @@
 /* Definitions for Intel x86 running BeOS
-   Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -18,9 +18,6 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-#include <i386/i386.h> /* Base i386 target machine definitions */
-#include <i386/att.h>  /* Use the i386 AT&T assembler syntax */
-#include <svr4.h>      /* some common stuff */
 
 #undef TARGET_VERSION
 #define TARGET_VERSION fprintf (stderr, " (i386 BeOS/ELF)");
index 5d7a6aa..a9f9593 100644 (file)
@@ -1,5 +1,5 @@
 /* Target definitions for GNU compiler for Intel 80x86 running DG/ux
-   Copyright (C) 1993, 1995, 1996, 1997, 1998, 2000
+   Copyright (C) 1993, 1995, 1996, 1997, 1998, 2000, 2001
    Free Software Foundation, Inc.
    Currently maintained by gcc@dg-rtp.dg.com.
 
@@ -24,10 +24,8 @@ Boston, MA 02111-1307, USA.  */
    few hacks
 */
 
-#include "i386/sysv4.h"
-
 #ifndef VERSION_INFO2
-#define VERSION_INFO2   "$Revision: 1.13 $"
+#define VERSION_INFO2   "$Revision: 1.14 $"
 #endif
 
 #ifndef VERSION_STRING
@@ -80,6 +78,7 @@ Boston, MA 02111-1307, USA.  */
 #undef  DBX_DEBUGGING_INFO
 #define DBX_DEBUGGING_INFO
 
+#undef  PREFERRED_DEBUGGING_TYPE
 #define PREFERRED_DEBUGGING_TYPE DWARF_DEBUG
 
 /* Override svr[34].h.  */
index bcea0de..8a51cf3 100644 (file)
@@ -21,9 +21,6 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-#include "i386/sysv4.h"                /* Build on the base i386 SVR4 configuration */
-#include "netware.h"           /* Then add netware-specific goo. */
-
 #undef TARGET_VERSION
 #define TARGET_VERSION fprintf (stderr, " (i386 Netware 4)");
 
index 4c52389..c3a2e1b 100644 (file)
@@ -3,7 +3,6 @@
    Copyright (C) 2000 Free Software Foundation, Inc. */
 
 #include <stdio.h>
-#include "i386/sysv4.h"        /* Base i386 target machine definitions */
 
 #undef TARGET_VERSION
 #define TARGET_VERSION fprintf (stderr, " (i386 OSF/1)");
index af6efa2..4071c66 100644 (file)
@@ -2,6 +2,6 @@
    with gas and gdb.  */
 
 /* Use stabs instead of DWARF debug format.  */
+#undef PREFERRED_DEBUGGING_TYPE
 #define PREFERRED_DEBUGGING_TYPE DBX_DEBUG
 
-#include "i386/osf1elf.h"
index ad2df8e..a888d81 100644 (file)
@@ -22,9 +22,6 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-#include "i386/i386.h" /* Base i386 target machine definitions */
-#include "i386/att.h"  /* Use the i386 AT&T assembler syntax */
-#include "ptx4.h"      /* Rest of definitions (non architecture dependent) */
 
 #undef TARGET_VERSION
 #define TARGET_VERSION fprintf (stderr, " (i386 Sequent Dynix/ptx Version 4)");
index ce59e7f..6e31f56 100644 (file)
@@ -23,13 +23,6 @@ Boston, MA 02111-1307, USA.  */
 
 #define LINUX_DEFAULT_ELF
 
-/* A lie, I guess, but the general idea behind linux/ELF is that we are
-   supposed to be outputting something that will assemble under SVr4.
-   This gets us pretty close.  */
-#include <i386/i386.h> /* Base i386 target machine definitions */
-#include <i386/att.h>  /* Use the i386 AT&T assembler syntax */
-#include <linux.h>     /* some common stuff */
-
 #undef TARGET_VERSION
 #define TARGET_VERSION fprintf (stderr, " (i386 RTEMS with ELF)");
 
@@ -89,7 +82,4 @@ Boston, MA 02111-1307, USA.  */
 #undef ENDFILE_SPEC
 #define ENDFILE_SPEC   "crtend.o%s crtn.o%s"
 
-/* Get machine-independent configuration parameters for RTEMS.  */
-#include <rtems.h>
-
 /* end of i386/rtemself.h */
index 890e2e2..85e2aa8 100644 (file)
@@ -20,7 +20,6 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-#include "i386/sysv4.h"
 
 /* We use stabs-in-elf for debugging, because that is what the native
    toolchain uses.  */
index 56cd238..b2540b7 100644 (file)
@@ -1,5 +1,5 @@
 /* Target definitions for GNU compiler for Intel 80386 running System V.4
-   Copyright (C) 1991 Free Software Foundation, Inc.
+   Copyright (C) 1991, 2001 Free Software Foundation, Inc.
 
    Written by Ron Guilmette (rfg@netcom.com).
 
@@ -20,9 +20,6 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-#include "i386/i386.h" /* Base i386 target machine definitions */
-#include "i386/att.h"  /* Use the i386 AT&T assembler syntax */
-#include "svr4.h"      /* Definitions common to all SVR4 targets */
 
 #undef TARGET_VERSION
 #define TARGET_VERSION fprintf (stderr, " (i386 System V Release 4)");
index e7e283e..87d6b9c 100644 (file)
@@ -20,8 +20,6 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 
-#include "i386/sysv4.h"
-
 /* Dwarf2 is supported by native debuggers  */
 
 #undef PREFERRED_DEBUGGING_TYPE
index 8e03abf..66f5b87 100644 (file)
@@ -6,8 +6,6 @@
 /* We're very much the SVR4 target with "/udk" prepended to everything that's
    interesting */
 
-#include "i386/sysv5.h"
-
 #undef MD_EXEC_PREFIX
 #define MD_EXEC_PREFIX                 "/udk/usr/ccs/bin/" 
 
index 1ace6e8..3031611 100644 (file)
@@ -157,6 +157,7 @@ Boston, MA 02111-1307, USA.  */
 #define DBX_MEMPARM_STABS_LETTER 'k'
 #define DBX_REGPARM_STABS_LETTER 'r'
 
+#undef  ASM_OUTPUT_SOURCE_LINE
 #define ASM_OUTPUT_SOURCE_LINE(file,num)               \
        fprintf (file, "\t.stab \"\",.,0x%x,0,%d\n",    \
                N_SLINE,num)
index b6c4198..a3b851c 100644 (file)
@@ -1,5 +1,6 @@
 /* Definitions for embedded ia64-elf target.  */
 
+/* TODO: convert includes to ${tm_file} list in config.gcc.  */
 #include "ia64/ia64.h"
 #include "elfos.h"
 #include "sysv4.h"
index 70a5ab0..a78130a 100644 (file)
@@ -1,7 +1,4 @@
 /* Definitions for ia64-linux target.  */
-#include "ia64/ia64.h"
-#include <linux.h>
-#include "sysv4.h"
 
 /* This is for -profile to use -lc_p instead of -lc. */
 #undef CC1_SPEC
index b6ade99..4743ffe 100644 (file)
@@ -37,12 +37,9 @@ Boston, MA 02111-1307, USA.  */
 #undef ASM_APP_OFF
 #define ASM_APP_OFF "#NO_APP\n"
 
-#define SET_ASM_OP     "\t.set\t"
-
 /* Use stabs instead of DWARF debug format.  */
 #undef PREFERRED_DEBUGGING_TYPE
 #define PREFERRED_DEBUGGING_TYPE DBX_DEBUG
-#include "svr4.h"
 
 #undef MD_EXEC_PREFIX
 #undef MD_STARTFILE_PREFIX
index 4cb379e..7a810ae 100644 (file)
@@ -23,9 +23,6 @@ Boston, MA 02111-1307, USA.  */
 - longlong.h?
 */
 
-/* ??? Create elf.h and have svr4.h include it.  */
-#include "svr4.h"
-
 #undef SWITCH_TAKES_ARG
 #undef WORD_SWITCH_TAKES_ARG
 #undef HANDLE_SYSV_PRAGMA
index bf42091..8acb707 100644 (file)
@@ -23,12 +23,15 @@ Boston, MA 02111-1307, USA.  */
 #define MOTOROLA               /* Use Motorola syntax */
 #define USE_GAS                        /* But GAS wants jbsr instead of jsr */
 
+/* TODO: convert includes to ${tm_file} list in config.gcc.  */
 #include <m68k/m68k.h>
 
 /* Make sure CC1 is undefined. */
 #undef CC1_SPEC
 
-#include <linux.h>             /* some common stuff */
+#include "elfos.h"
+#include "svr4.h"
+#include "linux.h"             /* some common stuff */
 
 #undef TARGET_VERSION
 #define TARGET_VERSION fprintf (stderr, " (68k GNU/Linux with ELF)");
index 9bdc487..199caac 100644 (file)
@@ -25,8 +25,10 @@ Boston, MA 02111-1307, USA.  */
 
 #define SGS_SWITCH_TABLES      /* Different switch table handling */
 
+/* TODO: convert includes to ${tm_file} list in config.gcc.  */
 #include "m68k/sgs.h"          /* The m68k/SVR4 assembler is SGS based */
 
+#include "elfos.h"
 #include "svr4.h"              /* Pick up the generic SVR4 macros */
 
 /* See m68k.h.  7 means 68020 with 68881.  */
index 1d91168..380f336 100644 (file)
@@ -1,6 +1,6 @@
 /* Definitions of target machine for GNU compiler.
    Motorola m88100 running DG/UX.
-   Copyright (C) 1988, 1992, 1993, 1994, 1995, 1996, 1997, 2000
+   Copyright (C) 1988, 1992, 1993, 1994, 1995, 1996, 1997, 2000, 2001
    Free Software Foundation, Inc.
    Contributed by Michael Tiemann (tiemann@mcc.com)
    Currently maintained by (gcc@dg-rtp.dg.com)
@@ -26,7 +26,9 @@ Boston, MA 02111-1307, USA.  */
    supported.  The option -msvr4 specifies elf.  With these combinations, 
    -g means dwarf.  */
 /* DWARF_DEBUGGING_INFO defined in svr4.h.  */
+#undef SDB_DEBUGGING_INFO
 #define SDB_DEBUGGING_INFO
+#undef PREFERRED_DEBUGGING_TYPE
 #define PREFERRED_DEBUGGING_TYPE \
   (TARGET_SVR4 ? DWARF_DEBUG : SDB_DEBUG)
 
@@ -36,7 +38,7 @@ Boston, MA 02111-1307, USA.  */
 #define AS_BUG_FLDCR
 #endif
 
-#include "svr4.h"
+/* TODO: convert includes to ${tm_file} list in config.gcc.  */
 #include "m88k/m88k.h"
 
 /* Augment TARGET_SWITCHES with the MXDB options.  */
index 04a09b5..a7b5060 100644 (file)
@@ -1,6 +1,6 @@
 /* Definitions of target machine for GNU compiler.
    Motorola m88100 running DG/UX.
-   Copyright (C) 1988, 1992, 1993, 1994, 1995, 1996
+   Copyright (C) 1988, 1992, 1993, 1994, 1995, 1996, 2001
    Free Software Foundation, Inc.
    Contributed by Michael Tiemann (tiemann@mcc.com)
    Currently maintained by (gcc@dg-rtp.dg.com)
@@ -22,7 +22,6 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-#include "m88k/dgux.h"
 
 /* dgux.h builds an elf gcc which compiles elf objects by default.
    dguxbcs.h builds a bcs gcc which compiles bcs objects by default.
index fdd66ee..64695d1 100644 (file)
@@ -1,6 +1,6 @@
 /* Definitions of target machine for GNU compiler.
    Motorola 88100 in an 88open ABI environment.
-   Copyright (C) 1990, 1991, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1991, 2000, 2001 Free Software Foundation, Inc.
 
    Written by Ron Guilmette (rfg@netcom.com).
    Contributed to FSF by Network Computing Devices.
@@ -33,7 +33,7 @@ Boston, MA 02111-1307, USA.  */
 #define AS_BUG_POUND_TYPE
 #endif
 
-#include "svr4.h"
+/* TODO: convert includes to ${tm_file} list in config.gcc.  */
 #include "m88k/m88k.h"
 
 /* Identify the compiler.  */
index 6058d27..ca2c56d 100644 (file)
@@ -1,5 +1,5 @@
 /* Definitions of MCore target. 
-   Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
    Contributed by Cygnus Solutions.
 
 This file is part of GNU CC.
@@ -27,9 +27,6 @@ Boston, MA 02111-1307, USA.  */
 
 #define SUBTARGET_CPP_PREDEFINES " -D__ELF__"
 
-#include "svr4.h"
-#include "mcore/mcore.h"
-
 /* Use DWARF2 debugging info.  */
 #ifndef DWARF2_DEBUGGING_INFO
 #define DWARF2_DEBUGGING_INFO 1
index 10b76f1..d6288b8 100644 (file)
@@ -21,7 +21,6 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-#include "svr4.h"
 
 /* Get rid of svr4.h stuff we don't want/need.  */
 #undef ASM_SPEC
index 63fef60..481f524 100644 (file)
@@ -21,7 +21,6 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-#include "svr4.h"
 
 #undef ASM_SPEC
 #undef ASM_FINAL_SPEC
index 509b797..42b2285 100644 (file)
@@ -1,6 +1,6 @@
 /* netware.h -- operating system specific defines to be used when 
    targeting GCC for some generic NetWare 4 system.
-   Copyright (C) 1993, 1994, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 2000, 2001 Free Software Foundation, Inc.
 
    Written by David V. Henkel-Wallace (gumby@cygnus.com)
 
@@ -101,4 +101,5 @@ const_section ()                                                        \
     }                                                                   \
 }
 
+#undef INT_ASM_OP
 #define INT_ASM_OP ".long"
index 320d57a..115062d 100644 (file)
@@ -1162,10 +1162,12 @@ do { fputs (current_function_varargs || current_function_stdarg         \
 #define LOCAL_LABEL_PREFIX "."
 
 /* Make an internal label into a string.  */
+#undef  ASM_GENERATE_INTERNAL_LABEL
 #define ASM_GENERATE_INTERNAL_LABEL(STRING, PREFIX, NUM) \
   sprintf ((STRING), "*%s%s%ld", LOCAL_LABEL_PREFIX, (PREFIX), (long)(NUM))
 
 /* Output an internal label definition.  */
+#undef  ASM_OUTPUT_INTERNAL_LABEL
 #define ASM_OUTPUT_INTERNAL_LABEL(FILE,PREFIX,NUM) \
   asm_fprintf ((FILE), "%L%s%d:\n", (PREFIX), (NUM))
 
@@ -1220,6 +1222,7 @@ do { char dstr[30];                                     \
 /* This is how to output an assembler line
    that says to advance the location counter by SIZE bytes.  */
 
+#undef  ASM_OUTPUT_SKIP
 #define ASM_OUTPUT_SKIP(FILE,SIZE) \
   fprintf ((FILE), "\t.space %d\n", (SIZE))
 
index 57b0464..c934c1c 100644 (file)
@@ -30,11 +30,9 @@ Boston, MA 02111-1307, USA.
 
 /* Use DWARF debugging info by default.  */
 
-#ifndef PREFERRED_DEBUGGING_TYPE
+#undef PREFERRED_DEBUGGING_TYPE
 #define PREFERRED_DEBUGGING_TYPE DWARF_DEBUG
-#endif
 
-#include "elfos.h"
 
 /* Cpp, assembler, linker, library, and startfile spec's.  */
 
index 761b1fb..7d392dc 100644 (file)
@@ -1,5 +1,5 @@
 /* Definitions of target machine for gcc for Hitachi Super-H using ELF.
-   Copyright (C) 1996, 1997, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
    Contributed by Ian Lance Taylor <ian@cygnus.com>.
 
 This file is part of GNU CC.
@@ -19,18 +19,6 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-/* No SDB debugging info.  */
-#undef SDB_DEBUGGING_INFO
-
-/* Generate DWARF2 debugging information and make it the default */
-#define DWARF2_DEBUGGING_INFO
-
-#undef PREFERRED_DEBUGGING_TYPE
-#define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG
-
-/* use a more compact format for line information */
-#define DWARF2_ASM_LINE_DEBUG_INFO 1
-
 /* Undefine some macros defined in both sh.h and svr4.h.  */
 #undef IDENT_ASM_OP
 #undef ASM_FILE_END
@@ -41,8 +29,23 @@ Boston, MA 02111-1307, USA.  */
 #undef MAX_OFILE_ALIGNMENT
 
 /* Be ELF-like.  */
+/* TODO: convert includes to ${tm_file} list in config.gcc.  */
+#include "elfos.h"
 #include "svr4.h"
 
+/* No SDB debugging info.  */
+#undef SDB_DEBUGGING_INFO
+
+/* Generate DWARF2 debugging information and make it the default */
+#undef DWARF2_DEBUGGING_INFO
+#define DWARF2_DEBUGGING_INFO 1
+
+#undef PREFERRED_DEBUGGING_TYPE
+#define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG
+
+/* use a more compact format for line information */
+#define DWARF2_ASM_LINE_DEBUG_INFO 1
+
 /* The prefix to add to user-visible assembler symbols.
    Note that svr4.h redefined it from the original value (that we want)
    in sh.h */
index 6a0a680..ecff5b5 100644 (file)
@@ -20,6 +20,7 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
+/* TODO: convert includes to ${tm_file} list in config.gcc.  */
 #include "sparc/sparc.h"
 
 /* Undefine some symbols which are defined in "sparc.h" but which are
@@ -32,6 +33,7 @@ Boston, MA 02111-1307, USA.  */
 #undef TEXT_SECTION_ASM_OP
 #undef DATA_SECTION_ASM_OP
 
+#include "elfos.h"
 #include "svr4.h"
 
 /* ??? Put back the SIZE_TYPE/PTRDIFF_TYPE definitions set by sparc.h.
index 0372d1c..f6d3848 100644 (file)
@@ -21,10 +21,6 @@ the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 \f
-/* Set up System V.4 (aka ELF) defaults.  */
-#include "svr4.h"
-
-\f
 /* Driver configuration */
 
 /* A C expression which determines whether the option `-CHAR' takes arguments.
index 4e59767..5f74453 100644 (file)
@@ -1,7 +1,7 @@
 /* Operating system specific defines to be used when targeting GCC for some
    generic System V Release 4 system.
    Copyright (C) 1991, 1994, 1995, 1996, 1997, 1998, 1999,
-   2000 Free Software Foundation, Inc.
+   2000, 2001 Free Software Foundation, Inc.
    Contributed by Ron Guilmette (rfg@monkeys.com).
 
 This file is part of GNU CC.
@@ -21,30 +21,23 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.
 
-   To use this file, make up a file with a name like:
+   To use this file, make up a line like that in config.gcc:
 
-       ?????svr4.h
+       tm_file="$tm_file elfos.h svr4.h MACHINE/svr4.h"
 
-   where ????? is replaced by the name of the basic hardware that you
-   are targeting for.  Then, in the file ?????svr4.h, put something
-   like:
-
-       #include "?????.h"
-       #include "svr4.h"
-
-   followed by any really system-specific defines (or overrides of
-   defines) which you find that you need.  For example, CPP_PREDEFINES
-   is defined here with only the defined -Dunix and -DSVR4.  You should
-   probably override that in your target-specific ?????svr4.h file
-   with a set of defines that includes these, but also contains an
-   appropriate define for the type of hardware that you are targeting.
+   where MACHINE is replaced by the name of the basic hardware that you
+   are targeting for.  Then, in the file MACHINE/svr4.h, put any really
+   system-specific defines (or overrides of defines) which you find that
+   you need.  For example, CPP_PREDEFINES is defined here with only the
+   defined -Dunix and -DSVR4.  You should probably override that in your
+   target-specific MACHINE/svr4.h file with a set of defines that
+   includes these, but also contains an appropriate define for the type
+   of hardware that you are targeting.
 */
 
 /* Define a symbol indicating that we are using svr4.h.  */
 #define USING_SVR4_H
 
-#include "elfos.h"
-
 /* Cpp, assembler, linker, library, and startfile spec's.  */
 
 /* This defines which switch letters take arguments.  On svr4, most of
index 42f3c31..dc71c7a 100644 (file)
@@ -22,8 +22,6 @@ Boston, MA 02111-1307, USA.  */
 #ifndef GCC_V850_H
 #define GCC_V850_H
 
-#include "svr4.h"      /* Automatically does #undef CPP_PREDEFINES */
-
 /* These are defiend in svr4.h but we want to override them.  */
 #undef ASM_FINAL_SPEC
 #undef LIB_SPEC