diff options
| author | zack <zack@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-08-21 17:27:29 +0000 |
|---|---|---|
| committer | zack <zack@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-08-21 17:27:29 +0000 |
| commit | 0ac7fc08da6b24d43aff4eb968cdd9f785520c48 (patch) | |
| tree | 04fae098a4bda65ba102a84f5e996698e769f492 | |
| parent | 108ed0fbfc597f8548880f11ed8c0d5c46ed7557 (diff) | |
| download | gcc-0ac7fc08da6b24d43aff4eb968cdd9f785520c48.tar.gz | |
* Makefile.in (INCLUDES): Remove -I$(srcdir)/config.
* config.gcc (*-*-openbsd): Don't set tm_file.
(alpha*-*-openbsd, arm*-*-coff*, arm*-wince-pe*,
arm-*-pe*, avr-*-*, h8300-*-rtems*, h8300-*-elf*,
h8300-*-*, hppa*-*-osf*, hppa*-*-bsd*, hppa*-*-hpux*,
i370-*-opened*, i370-*-mvs*, i370-*-linux*, i?86-*-openbsd*,
i?86-*-lynxos, i?86-*-nto-qnx*, iq2000*-*-elf*, m68000-hp-hpux*,
m68k-hp-hpux*, m68k-*-aout*, m68k-*-coff*, m68020-*-elf*,
m68k-*-elf*, m68k*-*-netbsd*, m68k*-*-openbsd*, m68k-*-sysv4*,
m68k-*-linux*, m68k-*-rtems*, mcore-*-pe*, mips*-*-netbsd*,
mips*-*-openbsd*, rs6000-*-lynxos*, sh*-*-elf*, sh*-*-ka,
sh-*-rtemself, sparc-*-openbsd*, strongarm-*-pe, vax-*-openbsd*,
xscale-*-coff): Use explicit and complete lists of target headers
to include. Move definitions to tm_defines where appropriate.
(hppa*-*-openbsd*, powerpc-*-openbsd*): Comment out stanza for
not-yet-contributed configuration.
* config/lynx.h, config/alpha/openbsd.h, config/arm/coff.h
* config/avr/avr.h, config/frv/frv.h, config/h8300/elf.h
* config/i370/linux.h, config/i370/mvs.h, config/i370/oe.h
* config/i386/nto.h, config/iq2000/iq2000.h,
* config/m68k/coff.h, config/m68k/hp310.h, config/m68k/hp320.h
* config/m68k/linux.h, config/m68k/m68k-aout.h
* config/m68k/m68k-none.h, config/m68k/m68kv4.h
* config/m68k/netbsd.h, config/m68k/openbsd.h
* config/m68k/sgs.h, config/mcore/mcore-pe.h,
* config/mips/netbsd.h, config/mips/openbsd.h, config/pa/pa.h,
* config/rs6000/lynx.h, config/sh/embed-elf.h, config/sparc/openbsd.h:
Remove includes of other target config headers, and
definitions of macros moved to tm_defines lists. Add #undefs
where now necessary to prevent redefinition warnings.
* config/h8300/coff.h: New file split out of...
* config/h8300/elf.h: ...here.
* config/m68k/hp320base.h: New file split out of...
* config/m68k/hp320.h: ...here.
* config/rs6000/lynxbase.h: New file split out of...
* config/rs6000/lynx.h: ...here.
* config/m68k/hp310g.h, config/m68k/hp320g.h, config/m68k/hpux7.h
* config/m68k/m68k-coff.h, config/mips/openbsd-be.h: Delete file.
* config/sol2.h: Remove #if 0-ed #include of sys/mman.h.
* config/m68k/m68kelf.h: Remove commented out #include of m68k/sgs.h.
* config/mcore/mcore.h: Don't include hwint.h nor machmode.h.
Remove unnecessary #ifndef.
* config/s390/s390.h: Prefix #include of s390/fixdfdi.h
[under IN_LIBGCC2] with config/.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@70651 138bc75d-0d04-0410-961f-82ee72b054a4
44 files changed, 332 insertions, 446 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d572aa4efaf..db6b316c586 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,54 @@ +2003-08-21 Zack Weinberg <zack@codesourcery.com> + + * Makefile.in (INCLUDES): Remove -I$(srcdir)/config. + * config.gcc (*-*-openbsd): Don't set tm_file. + (alpha*-*-openbsd, arm*-*-coff*, arm*-wince-pe*, + arm-*-pe*, avr-*-*, h8300-*-rtems*, h8300-*-elf*, + h8300-*-*, hppa*-*-osf*, hppa*-*-bsd*, hppa*-*-hpux*, + i370-*-opened*, i370-*-mvs*, i370-*-linux*, i?86-*-openbsd*, + i?86-*-lynxos, i?86-*-nto-qnx*, iq2000*-*-elf*, m68000-hp-hpux*, + m68k-hp-hpux*, m68k-*-aout*, m68k-*-coff*, m68020-*-elf*, + m68k-*-elf*, m68k*-*-netbsd*, m68k*-*-openbsd*, m68k-*-sysv4*, + m68k-*-linux*, m68k-*-rtems*, mcore-*-pe*, mips*-*-netbsd*, + mips*-*-openbsd*, rs6000-*-lynxos*, sh*-*-elf*, sh*-*-ka, + sh-*-rtemself, sparc-*-openbsd*, strongarm-*-pe, vax-*-openbsd*, + xscale-*-coff): Use explicit and complete lists of target headers + to include. Move definitions to tm_defines where appropriate. + (hppa*-*-openbsd*, powerpc-*-openbsd*): Comment out stanza for + not-yet-contributed configuration. + + * config/lynx.h, config/alpha/openbsd.h, config/arm/coff.h + * config/avr/avr.h, config/frv/frv.h, config/h8300/elf.h + * config/i370/linux.h, config/i370/mvs.h, config/i370/oe.h + * config/i386/nto.h, config/iq2000/iq2000.h, + * config/m68k/coff.h, config/m68k/hp310.h, config/m68k/hp320.h + * config/m68k/linux.h, config/m68k/m68k-aout.h + * config/m68k/m68k-none.h, config/m68k/m68kv4.h + * config/m68k/netbsd.h, config/m68k/openbsd.h + * config/m68k/sgs.h, config/mcore/mcore-pe.h, + * config/mips/netbsd.h, config/mips/openbsd.h, config/pa/pa.h, + * config/rs6000/lynx.h, config/sh/embed-elf.h, config/sparc/openbsd.h: + Remove includes of other target config headers, and + definitions of macros moved to tm_defines lists. Add #undefs + where now necessary to prevent redefinition warnings. + + * config/h8300/coff.h: New file split out of... + * config/h8300/elf.h: ...here. + * config/m68k/hp320base.h: New file split out of... + * config/m68k/hp320.h: ...here. + * config/rs6000/lynxbase.h: New file split out of... + * config/rs6000/lynx.h: ...here. + + * config/m68k/hp310g.h, config/m68k/hp320g.h, config/m68k/hpux7.h + * config/m68k/m68k-coff.h, config/mips/openbsd-be.h: Delete file. + + * config/sol2.h: Remove #if 0-ed #include of sys/mman.h. + * config/m68k/m68kelf.h: Remove commented out #include of m68k/sgs.h. + * config/mcore/mcore.h: Don't include hwint.h nor machmode.h. + Remove unnecessary #ifndef. + * config/s390/s390.h: Prefix #include of s390/fixdfdi.h + [under IN_LIBGCC2] with config/. + 2003-08-21 Per Bothner <bothner@pbothner.com> * cppfiles.c (stack_file): Correctly pass return_at_eof parameter @@ -27,13 +78,13 @@ * configure.in: When testing with_libs and with_headers, treat 'no' as unset. Based on a patch by Dan Kegel <dank@kegel.com>. * configure: Regenerate. - + 2003-08-20 Peter Barada <peter@baradas.org> * longlong.h (umul_ppmm): Add ColdFire support. 2003-08-20 Peter Barada <peter@baradas.org> - Bernardo Innocenti <bernie@develer.com> + Bernardo Innocenti <bernie@develer.com> * config/m68k/m68k-none.h: Introduce new ColdFire archs. * config/m68k/m68k.h: Likewise. @@ -115,7 +166,7 @@ 2003-08-20 Jason Merrill <jason@redhat.com> * builtins.c (expand_builtin_mathfn): Use get_callee_fndecl. - (expand_builtin_mathfn2, expand_builtin, builtin_mathfn_code, + (expand_builtin_mathfn2, expand_builtin, builtin_mathfn_code, fold_trunc_transparent_mathfn, fold_builtin): Likewise. * dojump.c (do_jump): Likewise. * fold-const.c (operand_equal_p, fold): Likewise. @@ -123,7 +174,7 @@ * stor-layout.c (do_type_align): Only copy DECL_USER_ALIGN from TYPE_USER_ALIGN for FIELD_DECLs. - + * attribs.c (decl_attributes): Rebuild the function pointer type after changing the target type. * tree.c (get_qualified_type): Also check that the attributes match. diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 4a437564124..38fe77bc332 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -726,9 +726,8 @@ BUILD_VARRAY = $(BUILD_PREFIX)varray.o # currently being compiled, in both source trees, to be examined as well. # libintl.h will be found in ../intl if we are using the included libintl. INCLUDES = -I. -I$(@D) -I$(srcdir) -I$(srcdir)/$(@D) \ - -I$(srcdir)/config -I$(srcdir)/../include @INCINTL@ + -I$(srcdir)/../include @INCINTL@ -# Always use -I$(srcdir)/config when compiling. .c.o: $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION) diff --git a/gcc/config.gcc b/gcc/config.gcc index 83f4bb70abe..4dd37aa1dca 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -412,7 +412,6 @@ case $machine in esac ;; *-*-openbsd*) - tm_file=${cpu_type}/openbsd.h tmake_file="t-libc-ok t-openbsd t-libgcc-pic" if test x$enable_threads = xyes; then thread_file='posix' @@ -578,7 +577,8 @@ alpha*-*-netbsd*) ;; alpha*-*-openbsd*) - tm_file="${cpu_type}/${cpu_type}.h ${tm_file}" + tm_defines="OBSD_NO_DYNAMIC_LIBRARIES OBSD_HAS_DECLARE_FUNCTION_NAME OBSD_HAS_DECLARE_FUNCTION_SIZE OBSD_HAS_DECLARE_OBJECT" + tm_file="alpha/alpha.h openbsd.h alpha/openbsd.h" # default x-alpha is only appropriate for dec-osf. target_cpu_default="MASK_GAS" tmake_file="alpha/t-alpha alpha/t-ieee" @@ -659,7 +659,7 @@ arc-*-elf*) extra_parts="crtinit.o crtfini.o" ;; arm-*-coff* | armel-*-coff*) - tm_file="arm/semi.h arm/aout.h arm/arm.h arm/coff.h" + tm_file="arm/semi.h arm/aout.h arm/arm.h arm/coff.h dbxcoff.h" tmake_file=arm/t-arm-coff ;; arm-semi-aof | armel-semi-aof) @@ -711,12 +711,12 @@ arm*-*-elf | ep9312-*-elf) tmake_file=arm/t-arm-elf ;; arm*-wince-pe*) - tm_file="arm/semi.h arm/aout.h arm/arm.h arm/coff.h arm/pe.h arm/wince-pe.h" + tm_file="arm/semi.h arm/aout.h arm/arm.h arm/coff.h dbxcoff.h arm/pe.h arm/wince-pe.h" tmake_file=arm/t-wince-pe extra_objs="pe.o" ;; arm-*-pe*) - tm_file="arm/semi.h arm/aout.h arm/arm.h arm/coff.h arm/pe.h" + tm_file="arm/semi.h arm/aout.h arm/arm.h arm/coff.h dbxcoff.h arm/pe.h" tmake_file=arm/t-pe extra_objs="pe.o" ;; @@ -725,6 +725,7 @@ arm*-*-kaos*) tmake_file=arm/t-arm-elf ;; avr-*-*) + tm_file="avr/avr.h dbxelf.h" ;; c4x-*-rtems* | tic4x-*-rtems*) tmake_file="c4x/t-c4x t-rtems" @@ -770,16 +771,17 @@ frv-*-elf) ;; h8300-*-rtems*) tmake_file="h8300/t-h8300 t-rtems" - tm_file="h8300/h8300.h h8300/rtems.h rtems.h" + tm_file="h8300/h8300.h dbxcoff.h h8300/coff.h h8300/rtems.h rtems.h" if test x$enable_threads = xyes; then thread_file='rtems' fi ;; h8300-*-elf*) tmake_file="h8300/t-h8300 h8300/t-elf" - tm_file="h8300/h8300.h h8300/elf.h" + tm_file="h8300/h8300.h dbxelf.h elfos.h h8300/elf.h" ;; h8300-*-*) + tm_file="h8300/h8300.h dbxcoff.h h8300/coff.h" ;; hppa*64*-*-linux* | parisc*64*-*-linux*) target_cpu_default="(MASK_PA_11 | MASK_PA_20)" @@ -795,10 +797,11 @@ hppa*-*-linux* | parisc*-*-linux*) pa/pa32-regs.h pa/pa32-linux.h" tmake_file="t-slibgcc-elf-ver t-linux pa/t-linux" ;; -hppa*-*-openbsd*) - target_cpu_default="MASK_PA_11" - tmake_file=pa/t-bsd - ;; +# port not yet contributed. +#hppa*-*-openbsd*) +# target_cpu_default="MASK_PA_11" +# tmake_file=pa/t-bsd +# ;; hppa1.1-*-pro*) target_cpu_default="(MASK_JUMP_IN_DELAY | MASK_PORTABLE_RUNTIME | MASK_GAS | MASK_NO_SPACE_REGS | MASK_SOFT_FLOAT)" tm_file="${tm_file} pa/pa32-regs.h dbxelf.h elfos.h pa/elf.h pa/pa-pro-end.h libgloss.h" @@ -807,7 +810,7 @@ hppa1.1-*-pro*) ;; hppa1.1-*-osf*) target_cpu_default="MASK_PA_11" - tm_file="${tm_file} pa/pa32-regs.h pa/som.h pa/pa-osf.h" + tm_file="${tm_file} pa/pa32-regs.h dbxelf.h pa/som.h pa/pa-osf.h" tmake_file="pa/t-bsd pa/t-pa" xmake_file="pa/x-ada" use_collect2=yes @@ -822,7 +825,7 @@ hppa1.1-*-rtems*) fi ;; hppa1.1-*-bsd*) - tm_file="${tm_file} pa/pa32-regs.h pa/som.h" + tm_file="${tm_file} pa/pa32-regs.h dbxelf.h pa/som.h" target_cpu_default="MASK_PA_11" tmake_file="pa/t-bsd pa/t-pa" xmake_file="pa/x-ada" @@ -830,7 +833,7 @@ hppa1.1-*-bsd*) ;; hppa1.1-*-hpux10* | hppa2*-*-hpux10*) target_cpu_default="MASK_PA_11" - tm_file="${tm_file} pa/pa32-regs.h pa/long_double.h pa/som.h pa/pa-hpux.h pa/pa-hpux10.h" + tm_file="${tm_file} pa/pa32-regs.h pa/long_double.h dbxelf.h pa/som.h pa/pa-hpux.h pa/pa-hpux10.h" tmake_file="pa/t-pa pa/t-pa-hpux pa/t-hpux-shlib" xmake_file="pa/x-ada" if test x$enable_threads = x; then @@ -845,7 +848,7 @@ hppa1.1-*-hpux10* | hppa2*-*-hpux10*) use_collect2=yes ;; hppa1.0-*-hpux10*) - tm_file="${tm_file} pa/pa32-regs.h pa/long_double.h pa/som.h pa/pa-hpux.h pa/pa-hpux10.h" + tm_file="${tm_file} pa/pa32-regs.h pa/long_double.h dbxelf.h pa/som.h pa/pa-hpux.h pa/pa-hpux10.h" tmake_file="pa/t-pa pa/t-pa-hpux pa/t-hpux-shlib" xmake_file="pa/x-ada" if test x$enable_threads = x; then @@ -890,7 +893,7 @@ hppa*64*-*-hpux11*) ;; hppa1.1-*-hpux11* | hppa2*-*-hpux11*) target_cpu_default="MASK_PA_11" - tm_file="${tm_file} pa/pa32-regs.h pa/long_double.h pa/som.h pa/pa-hpux.h pa/pa-hpux11.h" + tm_file="${tm_file} pa/pa32-regs.h pa/long_double.h dbxelf.h pa/som.h pa/pa-hpux.h pa/pa-hpux11.h" tmake_file="pa/t-pa pa/t-pa-hpux pa/t-hpux-shlib" xmake_file="pa/x-ada" # if test x$enable_threads = x; then @@ -904,7 +907,7 @@ hppa1.1-*-hpux11* | hppa2*-*-hpux11*) use_collect2=yes ;; hppa1.0-*-hpux11*) - tm_file="${tm_file} pa/pa32-regs.h pa/long_double.h pa/som.h pa/pa-hpux.h pa/pa-hpux11.h" + tm_file="${tm_file} pa/pa32-regs.h pa/long_double.h dbxelf.h pa/som.h pa/pa-hpux.h pa/pa-hpux11.h" tmake_file="pa/t-pa pa/t-pa-hpux pa/t-hpux-shlib" xmake_file="pa/x-ada" # if test x$enable_threads = x; then @@ -919,20 +922,20 @@ hppa1.0-*-hpux11*) ;; i370-*-opened*) # IBM 360/370/390 Architecture xm_defines='FATAL_EXIT_CODE=12' - tm_file=i370/oe.h + tm_file="i370/oe.h i370/i370.h" tmake_file="i370/t-oe i370/t-i370" c_target_objs="i370-c.o" cxx_target_objs="i370-c.o" ;; i370-*-mvs*) xm_defines='FATAL_EXIT_CODE=12' - tm_file=i370/mvs.h + tm_file="i370/mvs.h i370/i370.h" tmake_file="i370/t-i370" c_target_objs="i370-c.o" cxx_target_objs="i370-c.o" ;; i370-*-linux*) - tm_file="dbxelf.h elfos.h svr4.h linux.h i370/linux.h ${tm_file}" + tm_file="dbxelf.h elfos.h svr4.h linux.h i370/linux.h i370/i370.h" tmake_file="t-slibgcc-elf-ver t-linux" # broken_install=yes elf=yes @@ -996,7 +999,7 @@ x86_64-*-netbsd*) tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h netbsd.h netbsd-elf.h i386/x86-64.h i386/netbsd64.h" ;; i[34567]86-*-openbsd*) - tm_file="${cpu_type}/${cpu_type}.h i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h openbsd-oldgas.h openbsd.h ${tm_file}" + tm_file="i386/i386.h i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h openbsd-oldgas.h openbsd.h i386/openbsd.h" # needed to unconfuse gdb tmake_file="t-libc-ok t-openbsd i386/t-openbsd" # we need collect2 until our bug is fixed... @@ -1056,7 +1059,7 @@ i[34567]86-moss-msdos* | i[34567]86-*-moss*) i[34567]86-*-lynxos*) if test x$gas = xyes then - tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h lynx.h i386/lynx.h" + tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h svr3.h lynx.h i386/lynx.h" else tm_file="${tm_file} i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h lynx-ng.h i386/lynx-ng.h" fi @@ -1067,7 +1070,7 @@ i[34567]86-*-mach*) use_collect2=yes ;; i[34567]86-*-nto-qnx*) - tm_file="${tm_file} i386/att.h dbxelf.h tm-dwarf2.h elfos.h svr4.h i386/nto.h" + tm_file="${tm_file} i386/att.h dbxelf.h tm-dwarf2.h elfos.h svr4.h i386/unix.h i386/nto.h" tmake_file=i386/t-nto gnu_ld=yes gas=yes @@ -1297,7 +1300,7 @@ ip2k-*-elf) tm_file="elfos.h ${tm_file}" ;; iq2000*-*-elf*) - tm_file="iq2000/iq2000.h" + tm_file="svr4.h elfos.h iq2000/iq2000.h" tmake_file=iq2000/t-iq2000 out_file=iq2000/iq2000.c md_file=iq2000/iq2000.md @@ -1322,46 +1325,47 @@ m68hc12-*-*|m6812-*-*) tmake_file="m68hc11/t-m68hc11-gas" ;; m68000-hp-hpux*) # HP 9000 series 300 + tm_file="m68k/hp320base.h m68k/m68k.h m68k/hp320.h m68k/hp310.h" + tm_defines="TARGET_DEFAULT=0" # 68000, no 68881, no bitfield ops if test x$gas = xyes then - tm_file=m68k/hp310g.h - else - tm_file=m68k/hp310.h + tm_defines="${tm_defines} DBX_DEBUGGING_INFO=1 USE_GAS" fi tmake_file=m68k/t-hp320 install_headers_dir=install-headers-cpio use_collect2=yes ;; m68k-hp-hpux7*) # HP 9000 series 300 running HPUX version 7. + tm_file="m68k/hp320base.h m68k/m68k.h m68k/hp320.h" if test x$gas = xyes then - tm_file=m68k/hp320g.h + tm_defines="DBX_DEBUGGING_INFO=1 USE_GAS" else - tm_file=m68k/hpux7.h + tm_defines="NO_DOT_IN_LABEL NO_BUGS" fi install_headers_dir=install-headers-cpio use_collect2=yes ;; m68k-hp-hpux*) # HP 9000 series 300 + tm_file="m68k/hp320base.h m68k/m68k.h m68k/hp320.h" if test x$gas = xyes then - tm_file=m68k/hp320g.h - else - tm_file=m68k/hp320.h + tm_defines="DBX_DEBUGGING_INFO=1 USE_GAS" fi install_headers_dir=install-headers-cpio use_collect2=yes ;; m68k-*-aout*) tmake_file=m68k/t-m68kbare - tm_file="m68k/m68k-aout.h libgloss.h" + tm_file="m68k/m68k.h m68k/m68k-none.h m68k/m68kemb.h m68k/m68k-aout.h libgloss.h" ;; m68k-*-coff*) tmake_file=m68k/t-m68kbare - tm_file="m68k/m68k-coff.h dbx.h" + tm_defines="MOTOROLA USE_GAS" + tm_file="m68k/m68k.h m68k/m68k-none.h m68k/m68kemb.h dbxcoff.h m68k/coff.h dbx.h" ;; m68020-*-elf* | m68k-*-elf*) - tm_file="m68k/m68k-none.h m68k/m68kelf.h dbxelf.h elfos.h m68k/m68kemb.h m68k/m68020-elf.h" + tm_file="m68k/m68k.h m68k/m68k-none.h m68k/m68kelf.h dbxelf.h elfos.h m68k/m68kemb.h m68k/m68020-elf.h" tmake_file=m68k/t-m68kelf extra_parts="crtbegin.o crtend.o" ;; @@ -1377,31 +1381,35 @@ m68010-*-netbsdelf* | m68k*-*-netbsdelf*) esac ;; m68k*-*-netbsd*) - tm_file=m68k/netbsd.h + tm_file="m68k/m68k.h netbsd.h netbsd-aout.h m68k/netbsd.h" tmake_file=t-netbsd extra_parts="" use_collect2=yes ;; m68k*-*-openbsd*) # needed to unconfuse gdb + tm_defines="OBSD_OLD_GAS TARGET_DEFAULT=(MASK_68020|MASK_68881|MASK_BITFIELD)" + tm_file="m68k/m68k.h openbsd.h m68k/openbsd.h" tmake_file="t-libc-ok t-openbsd m68k/t-openbsd" # we need collect2 until our bug is fixed... use_collect2=yes ;; m68k-*-sysv4*) # Motorola m68k's running system V.4 - tm_file=m68k/m68kv4.h + tm_file="m68k/m68k.h m68k/sgs.h dbxelf.h elfos.h svr4.h m68k/m68kv4.h" + tm_defines="MOTOROLA SGS SGS_CMP_ORDER SGS_SWITCH_TABLES" tmake_file=t-svr4 extra_parts="crtbegin.o crtend.o" ;; m68k-*-linux*) # Motorola m68k's running GNU/Linux # with ELF format using glibc 2 # aka the GNU/Linux C library 6. - tm_file=m68k/linux.h + tm_file="m68k/m68k.h dbxelf.h elfos.h svr4.h linux.h m68k/linux.h" + tm_defines="MOTOROLA USE_GAS LINUX_DEFAULT_ELF" tmake_file="t-slibgcc-elf-ver t-linux" ;; m68k-*-rtems*) tmake_file="m68k/t-m68kbare t-rtems m68k/t-crtstuff" - tm_file="m68k/m68k-none.h m68k/m68kelf.h dbxelf.h elfos.h m68k/m68kemb.h m68k/m68020-elf.h m68k/rtemself.h rtems.h" + tm_file="m68k/m68k.h m68k/m68k-none.h m68k/m68kelf.h dbxelf.h elfos.h m68k/m68kemb.h m68k/m68020-elf.h m68k/rtemself.h rtems.h" extra_parts="crtbegin.o crtend.o" if test x$enable_threads = xyes; then thread_file='rtems' @@ -1412,7 +1420,7 @@ mcore-*-elf) tmake_file=mcore/t-mcore ;; mcore-*-pe*) - tm_file=mcore/mcore-pe.h + tm_file="svr3.h dbxcoff.h ${tm_file} mcore/mcore-pe.h" tmake_file=mcore/t-mcore-pe ;; mips-sgi-irix6*o32) # SGI System V.4., IRIX 6, O32 ABI @@ -1490,7 +1498,7 @@ mips-sgi-irix5*) # SGI System V.4., IRIX 5 ;; mips*-*-netbsd*) # NetBSD/mips, either endian. target_cpu_default="MASK_GAS|MASK_ABICALLS" - tm_file="elfos.h ${tm_file} mips/netbsd.h" + tm_file="elfos.h ${tm_file} mips/elf.h netbsd.h netbsd-elf.h mips/netbsd.h" tmake_file="${tmake_file}" ;; mips64*-*-linux*) @@ -1521,13 +1529,15 @@ mips*-*-linux*) # Linux MIPS, either endian. esac tmake_file="t-slibgcc-elf-ver t-linux" ;; -mips*el-*-openbsd*) # mips little endian - target_cpu_default="MASK_GAS|MASK_ABICALLS" - tm_file="${tm_file} mips/sdb.h" - ;; -mips*-*-openbsd*) # mips big endian +mips*-*-openbsd*) + tm_defines="OBSD_HAS_DECLARE_FUNCTION_NAME OBSD_HAS_DECLARE_OBJECT OBSD_HAS_CORRECT_SPECS" target_cpu_default="MASK_GAS|MASK_ABICALLS" - tm_file="mips/openbsd-be.h ${tm_file} mips/sdb.h" + tm_file="mips/mips.h openbsd.h mips/openbsd.h mips/sdb.h" + case $machine in + mips*el-*-openbsd*) + tm_defines="${tm_defines} TARGET_ENDIAN_DEFAULT=0";; + *) tm_defines="${tm_defines} TARGET_ENDIAN_DEFAULT=MASK_BIG_ENDIAN";; + esac ;; mipsisa32-*-elf* | mipsisa32el-*-elf*) tm_file="${tm_file} mips/elf.h" @@ -1618,10 +1628,11 @@ pdp11-*-*) ;; avr-*-*) ;; -powerpc-*-openbsd*) - tmake_file="${tmake_file} rs6000/t-fprules " - extra_headers= - ;; +# port not yet contributed +#powerpc-*-openbsd*) +# tmake_file="${tmake_file} rs6000/t-fprules " +# extra_headers= +# ;; powerpc64-*-linux*) tm_file="rs6000/biarch64.h ${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h" case x$with_cpu in @@ -1788,7 +1799,7 @@ rs6000-ibm-aix[56789].* | powerpc-ibm-aix[56789].*) extra_headers= ;; rs6000-*-lynxos*) - tm_file="lynx.h rs6000/lynx.h" + tm_file="svr3.h lynx.h rs6000/lynxbase.h rs6000/rs6000.h rs6000/lynx.h" tmake_file=rs6000/t-fprules use_collect2=yes ;; @@ -1812,7 +1823,7 @@ sh-*-elf* | sh[2346l]*-*-elf* | sh*-*-kaos*) tmake_file="${tmake_file} sh/t-le" ;; esac - tm_file="${tm_file} dbxelf.h elfos.h svr4.h sh/embed-elf.h" + tm_file="${tm_file} dbxelf.h elfos.h svr4.h sh/elf.h sh/embed-elf.h" case $machine in sh64*) tmake_file="${tmake_file} sh/t-sh64" @@ -1835,7 +1846,7 @@ sh-*-elf* | sh[2346l]*-*-elf* | sh*-*-kaos*) ;; sh-*-rtemself*) tmake_file="sh/t-sh sh/t-elf t-rtems" - tm_file="${tm_file} dbxelf.h elfos.h svr4.h sh/embed-elf.h sh/rtemself.h rtems.h" + tm_file="${tm_file} dbxelf.h elfos.h svr4.h sh/elf.h sh/embed-elf.h sh/rtemself.h rtems.h" if test x$enable_threads = xyes; then thread_file='rtems' fi @@ -1920,7 +1931,8 @@ sparc-*-netbsdelf*) tm_file="${tm_file} elfos.h svr4.h sparc/sysv4.h netbsd.h netbsd-elf.h sparc/netbsd-elf.h" ;; sparc-*-openbsd*) - tm_file="sparc/sparc.h ${tm_file}" + tm_defines=OBSD_OLD_GAS + tm_file="sparc/sparc.h openbsd.h sparc/openbsd.h" # needed to unconfuse gdb tmake_file="t-libc-ok t-openbsd sparc/t-openbsd" # we need collect2 until our bug is fixed... @@ -2077,7 +2089,7 @@ strongarm-*-elf*) extra_modes=arm/arm-modes.def ;; strongarm-*-pe) - tm_file="arm/semi.h arm/aout.h arm/coff.h arm/strongarm-coff.h arm/arm.h arm/pe.h arm/strongarm-pe.h" + tm_file="arm/semi.h arm/aout.h arm/coff.h dbxcoff.h arm/strongarm-coff.h arm/arm.h arm/pe.h arm/strongarm-pe.h" tmake_file=arm/t-strongarm-pe out_file=arm/arm.c md_file=arm/arm.md @@ -2135,7 +2147,7 @@ vax-*-netbsd*) use_collect2=yes ;; vax-*-openbsd*) - tm_file="vax/vax.h vax/openbsd1.h openbsd.h ${tm_file}" + tm_file="vax/vax.h vax/openbsd1.h openbsd.h vax/openbsd.h" use_collect2=yes ;; vax-*-ultrix*) # VAXen running ultrix @@ -2155,7 +2167,7 @@ xscale-*-elf) extra_modes=arm/arm-modes.def ;; xscale-*-coff) - tm_file="arm/semi.h arm/aout.h arm/coff.h arm/xscale-coff.h arm/arm.h" + tm_file="arm/semi.h arm/aout.h arm/coff.h dbxcoff.h arm/xscale-coff.h arm/arm.h" tmake_file=arm/t-xscale-coff out_file=arm/arm.c md_file=arm/arm.md diff --git a/gcc/config/alpha/openbsd.h b/gcc/config/alpha/openbsd.h index f574e8da1f7..fa9a5111173 100644 --- a/gcc/config/alpha/openbsd.h +++ b/gcc/config/alpha/openbsd.h @@ -1,5 +1,5 @@ /* Configuration file for an alpha OpenBSD target. - Copyright (C) 1999 Free Software Foundation, Inc. + Copyright (C) 1999, 2003 Free Software Foundation, Inc. This file is part of GNU CC. @@ -21,16 +21,6 @@ Boston, MA 02111-1307, USA. */ /* We settle for little endian for now. */ #define TARGET_ENDIAN_DEFAULT 0 -#define OBSD_NO_DYNAMIC_LIBRARIES -#define OBSD_HAS_DECLARE_FUNCTION_NAME -#define OBSD_HAS_DECLARE_FUNCTION_SIZE -#define OBSD_HAS_DECLARE_OBJECT - -/* alpha ecoff supports only weak aliases, see below. */ -#define ASM_WEAKEN_LABEL(FILE,NAME) ASM_OUTPUT_WEAK_ALIAS (FILE,NAME,0) - -#include <openbsd.h> - /* Controlling the compilation driver. */ /* alpha needs __start. */ @@ -90,6 +80,10 @@ Boston, MA 02111-1307, USA. */ /* Assembler format: label output. */ +/* alpha ecoff supports only weak aliases. */ +#undef ASM_WEAKEN_LABEL +#define ASM_WEAKEN_LABEL(FILE,NAME) ASM_OUTPUT_WEAK_ALIAS (FILE,NAME,0) + #define ASM_OUTPUT_WEAK_ALIAS(FILE,NAME,VALUE) \ do { \ fputs ("\t.weakext\t", FILE); \ diff --git a/gcc/config/arm/coff.h b/gcc/config/arm/coff.h index c4f0932e9ce..310c4fba8ec 100644 --- a/gcc/config/arm/coff.h +++ b/gcc/config/arm/coff.h @@ -1,6 +1,6 @@ /* Definitions of target machine for GNU compiler. For ARM with COFF object format. - Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2002 + Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003 Free Software Foundation, Inc. Contributed by Doug Evans (devans@cygnus.com). @@ -43,7 +43,6 @@ #define PREFERRED_DEBUGGING_TYPE DBX_DEBUG -#include "dbxcoff.h" #define TARGET_ASM_FILE_START_APP_OFF true diff --git a/gcc/config/avr/avr.h b/gcc/config/avr/avr.h index 83c91ee6240..e2063c7abde 100644 --- a/gcc/config/avr/avr.h +++ b/gcc/config/avr/avr.h @@ -2499,6 +2499,3 @@ extern struct rtx_def *zero_reg_rtx; extern struct rtx_def *ldi_reg_rtx; #define PREFERRED_DEBUGGING_TYPE DBX_DEBUG - -/* Get the standard ELF stabs definitions. */ -#include "dbxelf.h" diff --git a/gcc/config/frv/frv.h b/gcc/config/frv/frv.h index dda5a059e8e..feadc791b9c 100644 --- a/gcc/config/frv/frv.h +++ b/gcc/config/frv/frv.h @@ -1,5 +1,5 @@ /* Target macros for the FRV port of GCC. - Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. Contributed by Red Hat Inc. This file is part of GCC. @@ -22,10 +22,6 @@ #ifndef __FRV_H__ #define __FRV_H__ -/* Set up System V.4 (aka ELF) defaults. */ -#include "svr4.h" - - /* Frv general purpose macros. */ /* Align an address. */ #define ADDR_ALIGN(addr,align) (((addr) + (align) - 1) & ~((align) - 1)) diff --git a/gcc/config/h8300/coff.h b/gcc/config/h8300/coff.h new file mode 100644 index 00000000000..7b56a494ac6 --- /dev/null +++ b/gcc/config/h8300/coff.h @@ -0,0 +1,56 @@ +/* Definitions of target machine for GNU compiler. + Hitachi H8/300 version generating coff + Copyright (C) 2003 Free Software Foundation, Inc. + Contributed by Steve Chamberlain (sac@cygnus.com), + Jim Wilson (wilson@cygnus.com), and Doug Evans (dje@cygnus.com). + +This file is part of GCC. + +GCC is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GCC is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GCC; see the file COPYING. If not, write to +the Free Software Foundation, 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ + +#ifndef GCC_H8300_COFF_H +#define GCC_H8300_COFF_H + +#define SDB_DEBUGGING_INFO 1 +#define SDB_DELIM "\n" + +/* Override definition in dbxcoff.h. */ +/* Generate a blank trailing N_SO to mark the end of the .o file, since + we can't depend upon the linker to mark .o file boundaries with + embedded stabs. */ + +#undef DBX_OUTPUT_MAIN_SOURCE_FILE_END +#define DBX_OUTPUT_MAIN_SOURCE_FILE_END(FILE, FILENAME) \ + fprintf (FILE, \ + "\t.text\n.stabs \"\",%d,0,0,.Letext\n.Letext:\n", N_SO) + +/* This is how to output an assembler line + that says to advance the location counter by SIZE bytes. */ + +#define ASM_OUTPUT_IDENT(FILE, NAME) \ + fprintf (FILE, "%s\"%s\"\n", IDENT_ASM_OP, NAME) + +#define IDENT_ASM_OP "\t.ident\t" +#define INIT_SECTION_ASM_OP "\t.section .init" +#define READONLY_DATA_SECTION_ASM_OP "\t.section .rodata" + +/* Switch into a generic section. */ +#define TARGET_ASM_NAMED_SECTION h8300_asm_named_section + +/* A bit-field declared as `int' forces `int' alignment for the struct. */ +#define PCC_BITFIELD_TYPE_MATTERS 0 + +#endif /* h8300/coff.h */ diff --git a/gcc/config/h8300/elf.h b/gcc/config/h8300/elf.h index 7f67a3a78b1..bae8c265040 100644 --- a/gcc/config/h8300/elf.h +++ b/gcc/config/h8300/elf.h @@ -1,25 +1,28 @@ -/* Undefine some macros defined in h8300 that conflict with elfos.h . */ -#undef SDB_DEBUGGING_INFO -#undef DBX_DEBUGGING_INFO -#undef ASM_OUTPUT_IDENT -#undef IDENT_ASM_OP -#undef CTORS_SECTION_ASM_OP -#undef DTORS_SECTION_ASM_OP -#undef INIT_SECTION_ASM_OP -#undef READONLY_DATA_SECTION_ASM_OP -#undef TARGET_ASM_NAMED_SECTION -#undef TARGET_MEM_FUNCTIONS -#undef PREFERRED_DEBUGGING_TYPE -/* ??? h8300.h defines PCC_BITFIELD_TYPE_MATTERS to 0, but it - doesn't define STRUCTURE_SIZE_BOUNDARY, nor does h8300.md - have a full set of bit field instructions. */ -#undef PCC_BITFIELD_TYPE_MATTERS - -#define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG - -#include "dbxelf.h" -#include "elfos.h" +/* Definitions of target machine for GNU compiler. + Hitachi H8/300 version generating elf + Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. + Contributed by Steve Chamberlain (sac@cygnus.com), + Jim Wilson (wilson@cygnus.com), and Doug Evans (dje@cygnus.com). +This file is part of GCC. + +GCC is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GCC is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GCC; see the file COPYING. If not, write to +the Free Software Foundation, 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ + +#ifndef GCC_H8300_ELF_H +#define GCC_H8300_ELF_H #undef ENDFILE_SPEC #define ENDFILE_SPEC "crtend.o%s %{pg:gcrtn.o%s}%{!pg:crtn.o%s}" @@ -38,3 +41,5 @@ #undef LINK_SPEC #define LINK_SPEC "%{mh:%{mn:-m h8300hnelf}} %{mh:%{!mn:-m h8300helf}} %{ms:%{mn:-m h8300snelf}} %{ms:%{!mn:-m h8300self}}" + +#endif /* h8300/elf.h */ diff --git a/gcc/config/h8300/h8300.h b/gcc/config/h8300/h8300.h index ba8dcffdeb1..8e5e96e0e2a 100644 --- a/gcc/config/h8300/h8300.h +++ b/gcc/config/h8300/h8300.h @@ -1,5 +1,5 @@ /* Definitions of target machine for GNU compiler. - Hitachi H8/300 version generating coff + Hitachi H8/300 (generic) Copyright (C) 1992, 1993, 1994, 1995, 1996, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. Contributed by Steve Chamberlain (sac@cygnus.com), @@ -257,9 +257,6 @@ extern int target_flags; structure layouts. */ #define EMPTY_FIELD_BOUNDARY 16 -/* A bit-field declared as `int' forces `int' alignment for the struct. */ -#define PCC_BITFIELD_TYPE_MATTERS 0 - /* No data type wants to be aligned rounder than this. 32 bit values are aligned as such on the H8/300H and H8S for speed. */ #define BIGGEST_ALIGNMENT \ @@ -1038,7 +1035,6 @@ struct cum_arg #define ASM_APP_OFF "; #NO_APP\n" #define FILE_ASM_OP "\t.file\n" -#define IDENT_ASM_OP "\t.ident\t" /* The assembler op to get a word, 2 bytes for the H8/300, 4 for H8/300H. */ #define ASM_WORD_OP \ @@ -1047,8 +1043,6 @@ struct cum_arg #define TEXT_SECTION_ASM_OP "\t.section .text" #define DATA_SECTION_ASM_OP "\t.section .data" #define BSS_SECTION_ASM_OP "\t.section .bss" -#define INIT_SECTION_ASM_OP "\t.section .init" -#define READONLY_DATA_SECTION_ASM_OP "\t.section .rodata" #undef DO_GLOBAL_CTORS_BODY #define DO_GLOBAL_CTORS_BODY \ @@ -1086,26 +1080,6 @@ struct cum_arg { {"er0", 0}, {"er1", 1}, {"er2", 2}, {"er3", 3}, {"er4", 4}, \ {"er5", 5}, {"er6", 6}, {"er7", 7}, {"r7", 7} } -#define SDB_DEBUGGING_INFO 1 -#define SDB_DELIM "\n" - -/* Support -gstabs. */ - -#include "dbxcoff.h" - -/* Override definition in dbxcoff.h. */ -/* Generate a blank trailing N_SO to mark the end of the .o file, since - we can't depend upon the linker to mark .o file boundaries with - embedded stabs. */ - -#undef DBX_OUTPUT_MAIN_SOURCE_FILE_END -#define DBX_OUTPUT_MAIN_SOURCE_FILE_END(FILE, FILENAME) \ - fprintf (FILE, \ - "\t.text\n.stabs \"\",%d,0,0,.Letext\n.Letext:\n", N_SO) - -/* Switch into a generic section. */ -#define TARGET_ASM_NAMED_SECTION h8300_asm_named_section - #define ASM_OUTPUT_EXTERNAL(FILE, DECL, NAME) /* Globalizing directive for a label. */ @@ -1158,12 +1132,6 @@ struct cum_arg if ((LOG) != 0) \ fprintf (FILE, "\t.align %d\n", (LOG)) -/* This is how to output an assembler line - that says to advance the location counter by SIZE bytes. */ - -#define ASM_OUTPUT_IDENT(FILE, NAME) \ - fprintf (FILE, "%s\"%s\"\n", IDENT_ASM_OP, NAME) - #define ASM_OUTPUT_SKIP(FILE, SIZE) \ fprintf (FILE, "\t.space %d\n", (int)(SIZE)) @@ -1221,7 +1189,7 @@ struct cum_arg (and ANSI C) library functions `memcpy' and `memset' rather than the BSD functions `bcopy' and `bzero'. */ -#define TARGET_MEM_FUNCTIONS 1 +#define TARGET_MEM_FUNCTIONS #define MULHI3_LIBCALL "__mulhi3" #define DIVHI3_LIBCALL "__divhi3" diff --git a/gcc/config/i370/linux.h b/gcc/config/i370/linux.h index 730d6b0e996..abf1a021819 100644 --- a/gcc/config/i370/linux.h +++ b/gcc/config/i370/linux.h @@ -1,5 +1,6 @@ /* Definitions of target machine for GNU compiler. System/370 version. - Copyright (C) 1989, 1993, 1995, 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 1989, 1993, 1995, 1996, 1997, 2003 + Free Software Foundation, Inc. Contributed by Jan Stein (jan@cd.chalmers.se). Modified for Linux/390 by Linas Vepstas (linas@linas.org) @@ -28,10 +29,6 @@ Boston, MA 02111-1307, USA. */ #define TARGET_ELF_ABI #define LINUX_DEFAULT_ELF -/* Include system common definitions */ -/* TODO: convert include to ${tm_file} list in config.gcc. */ -#include "i370/i370.h" - /* Target OS preprocessor built-ins. */ #define TARGET_OS_CPP_BUILTINS() \ do { \ diff --git a/gcc/config/i370/mvs.h b/gcc/config/i370/mvs.h index 0e29fa4c8f1..0b8a374375f 100644 --- a/gcc/config/i370/mvs.h +++ b/gcc/config/i370/mvs.h @@ -1,5 +1,6 @@ /* Definitions of target machine for GNU compiler. System/370 version. - Copyright (C) 1989, 1993, 1995, 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 1989, 1993, 1995, 1996, 1997, 2003 + Free Software Foundation, Inc. Contributed by Jan Stein (jan@cd.chalmers.se). Modified for OS/390 LanguageEnvironment C by Dave Pitts (dpitts@cozx.com) @@ -46,8 +47,3 @@ Boston, MA 02111-1307, USA. */ #else # define MAYBE_LE370_MACROS() #endif - -/* Include system common definitions */ - -#include "config/i370/i370.h" - diff --git a/gcc/config/i370/oe.h b/gcc/config/i370/oe.h index afc9bd3073d..9d36ea9bbf5 100644 --- a/gcc/config/i370/oe.h +++ b/gcc/config/i370/oe.h @@ -1,5 +1,6 @@ /* Definitions of target machine for GNU compiler. System/370 version. - Copyright (C) 1989, 1993, 1995, 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 1989, 1993, 1995, 1996, 1997, 2003 + Free Software Foundation, Inc. Contributed by Jan Stein (jan@cd.chalmers.se). Modified for OS/390 OpenEdition by Dave Pitts (dpitts@cozx.com) @@ -50,7 +51,3 @@ Boston, MA 02111-1307, USA. */ builtin_assert ("system=unix"); \ } while (0) -/* Include system common definitions */ - -#include "config/i370/i370.h" - diff --git a/gcc/config/i386/nto.h b/gcc/config/i386/nto.h index 76fa8e7946b..db60ad6ab08 100644 --- a/gcc/config/i386/nto.h +++ b/gcc/config/i386/nto.h @@ -1,5 +1,5 @@ /* Definitions for Intel 386 running QNX/Neutrino. - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2003 Free Software Foundation, Inc. This file is part of GNU CC. @@ -18,8 +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/unix.h" - #undef DEFAULT_PCC_STRUCT_RETURN #define DEFAULT_PCC_STRUCT_RETURN 1 diff --git a/gcc/config/iq2000/iq2000.h b/gcc/config/iq2000/iq2000.h index 4f4bf39627d..4361c28f098 100644 --- a/gcc/config/iq2000/iq2000.h +++ b/gcc/config/iq2000/iq2000.h @@ -19,11 +19,6 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* Set up System V.4 (aka ELF) defaults. */ -#include "svr4.h" -#include "elfos.h" - - /* Driver configuration. */ #undef SWITCH_TAKES_ARG diff --git a/gcc/config/lynx.h b/gcc/config/lynx.h index 267f499e221..a2366d106da 100644 --- a/gcc/config/lynx.h +++ b/gcc/config/lynx.h @@ -1,5 +1,5 @@ /* Target independent definitions for LynxOS using gas and gnu ld. - Copyright (C) 1993, 1994, 1995, 1996, 1999, 2000, 2002 + Copyright (C) 1993, 1994, 1995, 1996, 1999, 2000, 2002, 2003 Free Software Foundation, Inc. This file is part of GCC. @@ -19,10 +19,7 @@ along with GCC; see the file COPYING. If not, write to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* LynxOS is a multi-platform Unix, similar to SVR3, but not identical. - We can get quite a bit from generic svr3, but have to do some overrides. */ - -#include "svr3.h" +/* LynxOS is a multi-platform Unix, similar to SVR3, but not identical. */ /* Define various macros, depending on the combination of flags. */ diff --git a/gcc/config/m68k/coff.h b/gcc/config/m68k/coff.h index 7b9565ebf2c..0f199cf08b2 100644 --- a/gcc/config/m68k/coff.h +++ b/gcc/config/m68k/coff.h @@ -26,10 +26,6 @@ Boston, MA 02111-1307, USA. */ #define SDB_DEBUGGING_INFO 1 -/* Output DBX (stabs) debugging information if using -gstabs. */ - -#include "dbxcoff.h" - /* COFF symbols don't start with an underscore. */ #undef USER_LABEL_PREFIX diff --git a/gcc/config/m68k/hp310.h b/gcc/config/m68k/hp310.h index 4c765b89f55..1abbeaeddc9 100644 --- a/gcc/config/m68k/hp310.h +++ b/gcc/config/m68k/hp310.h @@ -1,10 +1,5 @@ /* Definitions of target machine for GNU compiler. HP-UX 68010 version. */ -/* See m68k.h. 0 means 68000 without 68881 and no bitfields. */ -#define TARGET_DEFAULT 0 - -#include "m68k/hp320.h" - /* Don't try using XFmode. */ #undef LONG_DOUBLE_TYPE_SIZE #define LONG_DOUBLE_TYPE_SIZE 64 diff --git a/gcc/config/m68k/hp310g.h b/gcc/config/m68k/hp310g.h deleted file mode 100644 index d5c543eb3b2..00000000000 --- a/gcc/config/m68k/hp310g.h +++ /dev/null @@ -1,12 +0,0 @@ -/* Definitions of target machine for GNU compiler. HP-UX 68010 version. - Use this file if GCC is supposed to work with the GNU assembler, - GNU linker and GNU debugger using DBX debugging information. - (In other words, much of HPUX has been cast aside.) */ - -/* This wants DBX format. */ - -#define DBX_DEBUGGING_INFO 1 - -#define USE_GAS - -#include "m68k/hp310.h" diff --git a/gcc/config/m68k/hp320.h b/gcc/config/m68k/hp320.h index 17ce3504d9b..3f09240ce3b 100644 --- a/gcc/config/m68k/hp320.h +++ b/gcc/config/m68k/hp320.h @@ -1,5 +1,5 @@ /* Definitions of target machine for GNU compiler. HP-UX 68000/68020 version. - Copyright (C) 1987, 1988, 1993, 1994, 1995, 1996, 1997, 1999, 2000, 2002 + Copyright (C) 1987, 1988, 1993, 1994, 1995, 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc. This file is part of GNU CC. @@ -19,34 +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. */ -/* Define USE_GAS if GCC is supposed to work with the GNU assembler, - GNU linker and GNU debugger using DBX debugging information. - (In other words, much of HPUX has been cast aside.) - Undefine USE_GAS if you want GCC to feed the HP assembler. */ - -/* #define USE_GAS */ /* Use hp320g.h if you want this. */ - -/* Control assembler-syntax conditionals in m68k.md. */ - -#ifndef USE_GAS -#define MOTOROLA /* Use Motorola syntax rather than "MIT" */ -#define SGS /* Uses SGS assembler */ -#define SGS_CMP_ORDER /* Takes cmp operands in reverse order */ -#define HPUX_ASM - -#if !defined (CROSS_COMPILE) && !defined (NO_BUGS) -/* The assembler on HP 9k3xx machines running HPUX 8.0 doesn't translate - floating point constants behind some operands. The workaround is to - use hex constants. Reported by Thomas Nau (nau@medizin.uni-ulm.de). */ -#define AS_BUG_FLOATING_CONSTANT -/* The assembler on HP 9k3xx machines running HPUX 8.0 doesn't accept - labels followed by a text, data, or other section directive. Reported - by Thomas Nau (nau@medizin.uni-ulm.de). */ -#define AS_BUG_TRAILING_LABEL -#endif - -#endif /* not USE_GAS */ - /* gcc.c should find libgcc.a itself rather than expecting linker to. */ #define LINK_LIBGCC_SPECIAL /* The arguments of -L must be a separate argv element. */ @@ -57,8 +29,6 @@ Boston, MA 02111-1307, USA. */ /* Be compatible with system stddef.h. */ #define SIZE_TYPE "unsigned int" -#include "m68k/m68k.h" - #undef INT_OP_GROUP #define INT_OP_GROUP INT_OP_NO_DOT diff --git a/gcc/config/m68k/hp320base.h b/gcc/config/m68k/hp320base.h new file mode 100644 index 00000000000..ad84d45600d --- /dev/null +++ b/gcc/config/m68k/hp320base.h @@ -0,0 +1,40 @@ +/* Configuration file for an HP 320. + Copyright (C) 2003 Free Software Foundation, Inc. + +This file is part of GNU CC. + +GNU CC is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU CC is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +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. */ + +/* Control assembler-syntax conditionals in m68k.md. */ + +#ifndef USE_GAS +#define MOTOROLA /* Use Motorola syntax rather than "MIT" */ +#define SGS /* Uses SGS assembler */ +#define SGS_CMP_ORDER /* Takes cmp operands in reverse order */ +#define HPUX_ASM + +#if !defined (CROSS_COMPILE) && !defined (NO_BUGS) +/* The assembler on HP 9k3xx machines running HPUX 8.0 doesn't translate + floating point constants behind some operands. The workaround is to + use hex constants. Reported by Thomas Nau (nau@medizin.uni-ulm.de). */ +#define AS_BUG_FLOATING_CONSTANT +/* The assembler on HP 9k3xx machines running HPUX 8.0 doesn't accept + labels followed by a text, data, or other section directive. Reported + by Thomas Nau (nau@medizin.uni-ulm.de). */ +#define AS_BUG_TRAILING_LABEL +#endif + +#endif /* not USE_GAS */ diff --git a/gcc/config/m68k/hp320g.h b/gcc/config/m68k/hp320g.h deleted file mode 100644 index b20cc3d03cc..00000000000 --- a/gcc/config/m68k/hp320g.h +++ /dev/null @@ -1,12 +0,0 @@ -/* Definitions of target machine for GNU compiler. HP-UX 68000/68020 version. - Use this file if GCC is supposed to work with the GNU assembler, - GNU linker and GNU debugger using DBX debugging information. - (In other words, much of HPUX has been cast aside.) */ - -/* This wants DBX format. */ - -#define DBX_DEBUGGING_INFO 1 - -#define USE_GAS - -#include "m68k/hp320.h" diff --git a/gcc/config/m68k/hpux7.h b/gcc/config/m68k/hpux7.h deleted file mode 100644 index ae584bde097..00000000000 --- a/gcc/config/m68k/hpux7.h +++ /dev/null @@ -1,7 +0,0 @@ -/* tm.h for m68k running HPUX version 7. */ - -/* fletcher@cs.utexas.edu says this is needed. */ -#define NO_DOT_IN_LABEL -#define NO_BUGS - -#include "m68k/hp320.h" diff --git a/gcc/config/m68k/linux.h b/gcc/config/m68k/linux.h index 99996a4e670..ed9ba6b7033 100644 --- a/gcc/config/m68k/linux.h +++ b/gcc/config/m68k/linux.h @@ -19,21 +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. */ -#define LINUX_DEFAULT_ELF -#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 "dbxelf.h" -#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)"); diff --git a/gcc/config/m68k/m68k-aout.h b/gcc/config/m68k/m68k-aout.h index 095ec874795..cf553fbf220 100644 --- a/gcc/config/m68k/m68k-aout.h +++ b/gcc/config/m68k/m68k-aout.h @@ -1,6 +1,6 @@ /* Definitions of target machine for GNU compiler. "naked" 68020, a.out object files and debugging, version. - Copyright (C) 1994, 1996 Free Software Foundation, Inc. + Copyright (C) 1994, 1996, 2003 Free Software Foundation, Inc. This file is part of GNU CC. @@ -19,11 +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. */ -/* This comment is here to see if it will keep Sun's cpp from dying. */ - -#include "m68k/m68k-none.h" -#include "m68k/m68kemb.h" - #define DBX_DEBUGGING_INFO 1 #undef SDB_DEBUGGING_INFO diff --git a/gcc/config/m68k/m68k-coff.h b/gcc/config/m68k/m68k-coff.h deleted file mode 100644 index ad08a48579b..00000000000 --- a/gcc/config/m68k/m68k-coff.h +++ /dev/null @@ -1,31 +0,0 @@ -/* Definitions of target machine for GNU compiler. "naked" 68020, - COFF object files and debugging, version. - Copyright (C) 1994 Free Software Foundation, Inc. - -This file is part of GNU CC. - -GNU CC is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -GNU CC is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -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. */ - -#define MOTOROLA /* Use Motorola syntax rather than MIT. */ -#ifndef USE_GAS /* forces jsbr instead of jsr. */ -#define USE_GAS -#endif - -#include "m68k/m68k-none.h" -#include "m68k/m68kemb.h" -#include "m68k/coff.h" - -/* end of m68k-coff.h */ diff --git a/gcc/config/m68k/m68k-none.h b/gcc/config/m68k/m68k-none.h index 8bd885521e3..f4a658171b0 100644 --- a/gcc/config/m68k/m68k-none.h +++ b/gcc/config/m68k/m68k-none.h @@ -18,8 +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 "m68k/m68k.h" - /* Default to m68k (m68020). */ #ifndef TARGET_CPU_DEFAULT #define TARGET_CPU_DEFAULT M68K_CPU_m68k diff --git a/gcc/config/m68k/m68kelf.h b/gcc/config/m68k/m68kelf.h index bb9edccf3ca..419f86a6961 100644 --- a/gcc/config/m68k/m68kelf.h +++ b/gcc/config/m68k/m68kelf.h @@ -1,7 +1,7 @@ /* m68kelf support, derived from m68kv4.h */ /* Target definitions for GNU compiler for mc680x0 running System V.4 - Copyright (C) 1991, 1993, 2000, 2002 Free Software Foundation, Inc. + Copyright (C) 1991, 1993, 2000, 2002, 2003 Free Software Foundation, Inc. Written by Ron Guilmette (rfg@netcom.com) and Fred Fish (fnf@cygnus.com). @@ -22,8 +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. */ -/* #notinclude "m68k/sgs.h" / * The m68k/SVR4 assembler is SGS based */ - /* These are necessary for -fpic/-fPIC to work correctly. */ #ifndef MOTOROLA #define MOTOROLA /* Use MOTOROLA syntax. */ diff --git a/gcc/config/m68k/m68kv4.h b/gcc/config/m68k/m68kv4.h index f826f0fbf04..161d60703af 100644 --- a/gcc/config/m68k/m68kv4.h +++ b/gcc/config/m68k/m68kv4.h @@ -1,5 +1,5 @@ /* Target definitions for GNU compiler for mc680x0 running System V.4 - Copyright (C) 1991, 1993, 1994, 1995, 1996, 1998, 1999, 2000 + Copyright (C) 1991, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2003 Free Software Foundation, Inc. Contributed by Ron Guilmette (rfg@monkeys.com) and Fred Fish (fnf@cygnus.com). @@ -34,19 +34,6 @@ Boston, MA 02111-1307, USA. */ } \ while (0) -/* Use SGS_* macros to control compilation in m68k.md */ - -#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 "dbxelf.h" -#include "elfos.h" -#include "svr4.h" /* Pick up the generic SVR4 macros */ - -/* See m68k.h. 7 means 68020 with 68881. */ - #ifndef TARGET_DEFAULT #define TARGET_DEFAULT (MASK_BITFIELD|MASK_68881|MASK_68020) #endif @@ -257,7 +244,7 @@ do { \ switch_table_difference_label_flag = 0; \ } while (0) -int switch_table_difference_label_flag; +extern int switch_table_difference_label_flag; #undef ASM_OUTPUT_COMMON #undef ASM_OUTPUT_LOCAL diff --git a/gcc/config/m68k/netbsd.h b/gcc/config/m68k/netbsd.h index 382adc0fa17..2bd0f3a900b 100644 --- a/gcc/config/m68k/netbsd.h +++ b/gcc/config/m68k/netbsd.h @@ -11,13 +11,6 @@ } \ while (0) -#include <m68k/m68k.h> - -/* Get generic NetBSD definitions. */ - -#include <netbsd.h> -#include <netbsd-aout.h> - #define TARGET_DEFAULT (MASK_BITFIELD|MASK_68881|MASK_68020) #define EXTRA_SPECS \ diff --git a/gcc/config/m68k/openbsd.h b/gcc/config/m68k/openbsd.h index f577ca5afed..8fc5198f01b 100644 --- a/gcc/config/m68k/openbsd.h +++ b/gcc/config/m68k/openbsd.h @@ -1,5 +1,5 @@ /* Configuration file for an m68k OpenBSD target. - Copyright (C) 1999, 2002 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2003 Free Software Foundation, Inc. This file is part of GNU CC. @@ -29,16 +29,6 @@ Boston, MA 02111-1307, USA. */ } \ while (0) -/* m68k is an old configuration that does not yet use the TARGET_CPU_DEFAULT - framework. */ -#define TARGET_DEFAULT (MASK_BITFIELD | MASK_68881 | MASK_68020) - -#include <m68k/m68k.h> - -/* Get generic OpenBSD definitions. */ -#define OBSD_OLD_GAS -#include <openbsd.h> - /* Define __HAVE_68881__ in preprocessor, unless -msoft-float is specified. This will control the use of inline 68881 insns in certain macros. */ #undef CPP_SPEC diff --git a/gcc/config/m68k/sgs.h b/gcc/config/m68k/sgs.h index 470c066c995..b41908c9e08 100644 --- a/gcc/config/m68k/sgs.h +++ b/gcc/config/m68k/sgs.h @@ -20,16 +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. */ -/* Control assembler-syntax conditionals in m68k.md and conditionals in - m68k.h. Note that some systems may also require SGS_SWAP_W and/or - SGS_SWITCH_TABLES to be defined as well. */ - -#define MOTOROLA /* Use Motorola syntax rather than "MIT" */ -#define SGS /* Uses SGS assembler */ -#define SGS_CMP_ORDER /* Takes cmp operands in reverse order */ - -#include "m68k/m68k.h" - #undef INT_OP_GROUP #define INT_OP_GROUP INT_OP_STANDARD diff --git a/gcc/config/mcore/mcore-pe.h b/gcc/config/mcore/mcore-pe.h index 35055e5762f..48b65d5219e 100644 --- a/gcc/config/mcore/mcore-pe.h +++ b/gcc/config/mcore/mcore-pe.h @@ -1,5 +1,5 @@ /* Definitions of target machine for GNU compiler, for MCore using COFF/PE. - Copyright (C) 1994, 1999, 2000, 2002 Free Software Foundation, Inc. + Copyright (C) 1994, 1999, 2000, 2002, 2003 Free Software Foundation, Inc. Contributed by Michael Tiemann (tiemann@cygnus.com). This file is part of GNU CC. @@ -31,12 +31,9 @@ Boston, MA 02111-1307, USA. */ /* The MCore ABI says that bitfields are unsigned by default. */ /* The EPOC C++ environment does not support exceptions. */ +#undef CC1_SPEC #define CC1_SPEC "-funsigned-bitfields %{!DIN_GCC:-fno-rtti} %{!DIN_GCC:-fno-exceptions}" -#include "svr3.h" -#include "mcore/mcore.h" -#include "dbxcoff.h" - #undef SDB_DEBUGGING_INFO #define DBX_DEBUGGING_INFO 1 diff --git a/gcc/config/mcore/mcore.h b/gcc/config/mcore/mcore.h index dddd5c15232..7a33f7754dd 100644 --- a/gcc/config/mcore/mcore.h +++ b/gcc/config/mcore/mcore.h @@ -28,12 +28,6 @@ #define MCORE_STRUCT_ARGS /* RBE: end of "move elsewhere". */ -#include "hwint.h" - -#ifndef HAVE_MACHINE_MODES -#include "machmode.h" -#endif - /* Run-time Target Specification. */ #define TARGET_MCORE @@ -179,10 +173,8 @@ extern const char * mcore_stack_increment_string; N_("Maximum amount for a single stack increment operation"), 0} \ } -#ifndef CC1_SPEC /* The MCore ABI says that bitfields are unsigned by default. */ #define CC1_SPEC "-funsigned-bitfields" -#endif /* What options are we going to default to specific settings when -O* happens; the user can subsequently override these settings. diff --git a/gcc/config/mips/netbsd.h b/gcc/config/mips/netbsd.h index 3e6d2a7f459..4bdc8aad692 100644 --- a/gcc/config/mips/netbsd.h +++ b/gcc/config/mips/netbsd.h @@ -128,21 +128,10 @@ Boston, MA 02111-1307, USA. */ while (0) -/* Include the generic MIPS ELF configuration. */ -#include <mips/elf.h> - -/* Now clean up after it. */ +/* Clean up after the generic MIPS/ELF configuration. */ #undef MD_EXEC_PREFIX #undef MD_STARTFILE_PREFIX -/* Get generic NetBSD definitions. */ -#include <netbsd.h> - - -/* Get generic NetBSD ELF definitions. */ -#include <netbsd-elf.h> - - /* Extra specs we need. */ #undef SUBTARGET_EXTRA_SPECS #define SUBTARGET_EXTRA_SPECS \ diff --git a/gcc/config/mips/openbsd-be.h b/gcc/config/mips/openbsd-be.h deleted file mode 100644 index 2f07c8fe110..00000000000 --- a/gcc/config/mips/openbsd-be.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Configuration fragment for a mips big-endian OpenBSD target - Copyright (C) 1999 Free Software Foundation, Inc. - -This file is part of GNU CC. - -GNU CC is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -GNU CC is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -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. */ - -#define TARGET_ENDIAN_DEFAULT MASK_BIG_ENDIAN diff --git a/gcc/config/mips/openbsd.h b/gcc/config/mips/openbsd.h index 03cc6484c30..6ca833bb372 100644 --- a/gcc/config/mips/openbsd.h +++ b/gcc/config/mips/openbsd.h @@ -1,5 +1,5 @@ /* Configuration for a Mips ABI32 OpenBSD target. - Copyright (C) 1999 Free Software Foundation, Inc. + Copyright (C) 1999, 2003 Free Software Foundation, Inc. This file is part of GNU CC. @@ -21,35 +21,24 @@ Boston, MA 02111-1307, USA. */ /* Definitions needed for OpenBSD, to avoid picking mips 'defaults'. */ /* GAS must know this. */ +#undef SUBTARGET_ASM_SPEC #define SUBTARGET_ASM_SPEC "%{fPIC|fPIE:-KPIC}" #define AS_NEEDS_DASH_FOR_PIPED_INPUT /* CPP specific OpenBSD specs. */ +#undef SUBTARGET_CPP_SPEC #define SUBTARGET_CPP_SPEC OBSD_CPP_SPEC /* Needed for ELF (inspired by netbsd-elf). */ #define PREFERRED_DEBUGGING_TYPE DBX_DEBUG +#undef LOCAL_LABEL_PREFIX #define LOCAL_LABEL_PREFIX "." /* The profiling lib spec here is not really correct but we leave it as it is until we have some kind of profiling working. */ #define LIB_SPEC OBSD_LIB_SPEC -/* By default, OpenBSD mips is little endian. This is important to set - here as mips/mips.h defaults to big endian. */ -#ifndef TARGET_ENDIAN_DEFAULT -#define TARGET_ENDIAN_DEFAULT 0 -#endif - -#include <mips/mips.h> - -/* Get generic OpenBSD definitions. */ -#define OBSD_HAS_DECLARE_FUNCTION_NAME -#define OBSD_HAS_DECLARE_OBJECT -#define OBSD_HAS_CORRECT_SPECS -#include <openbsd.h> - /* mips assembler uses .set for arcane purposes. __attribute__((alias)) and friends won't work until we get recent binutils with .weakext support. */ diff --git a/gcc/config/pa/pa.h b/gcc/config/pa/pa.h index 1f281d5ba1b..7eb4e3c7e52 100644 --- a/gcc/config/pa/pa.h +++ b/gcc/config/pa/pa.h @@ -325,9 +325,7 @@ extern int target_flags; #define OVERRIDE_OPTIONS override_options () -/* stabs-in-som is nearly identical to stabs-in-elf. To avoid useless - code duplication we simply include this file and override as needed. */ -#include "dbxelf.h" +/* Override some settings from dbxelf.h. */ /* We do not have to be compatible with dbx, so we enable gdb extensions by default. */ diff --git a/gcc/config/rs6000/lynx.h b/gcc/config/rs6000/lynx.h index 04ed1219aab..b32b07890ae 100644 --- a/gcc/config/rs6000/lynx.h +++ b/gcc/config/rs6000/lynx.h @@ -19,31 +19,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* Definitions we want to override with those from rs6000.h: */ -#undef LIB_SPEC -#undef PTRDIFF_TYPE -#undef WCHAR_TYPE -#undef WCHAR_TYPE_SIZE -#undef EXTRA_SECTIONS -#undef READONLY_DATA_SECTION -#undef READONLY_DATA_SECTION_ASM_OP -#undef EXTRA_SECTION_FUNCTIONS -#undef TARGET_ASM_SELECT_RTX_SECTION -#undef TARGET_ASM_SELECT_SECTION -#undef USER_LABEL_PREFIX -#undef ASM_OUTPUT_LABELREF -#undef ASM_GENERATE_INTERNAL_LABEL -#undef ASM_OUTPUT_COMMON -#undef ASM_OUTPUT_LOCAL - -#undef SDB_DEBUGGING_INFO -#undef DBX_DEBUGGING_INFO -#undef PREFERRED_DEBUGGING_TYPE - -#undef FUNCTION_PROFILER - -#include <rs6000/rs6000.h> - /* Print subsidiary information on the compiler version in use. */ #define TARGET_VERSION fprintf (stderr, " (LynxOS-RS/6000)"); diff --git a/gcc/config/rs6000/lynxbase.h b/gcc/config/rs6000/lynxbase.h new file mode 100644 index 00000000000..02a255254a5 --- /dev/null +++ b/gcc/config/rs6000/lynxbase.h @@ -0,0 +1,45 @@ +/* Definitions for Rs6000 running LynxOS. + Copyright (C) 2003 Free Software Foundation, Inc. + Contributed by David Henkel-Wallace, Cygnus Support (gumby@cygnus.com) + + This file is part of GCC. + + GCC is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published + by the Free Software Foundation; either version 2, or (at your + option) any later version. + + GCC is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY + or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public + License for more details. + + You should have received a copy of the GNU General Public License + along with GCC; see the file COPYING. If not, write to the + Free Software Foundation, 59 Temple Place - Suite 330, Boston, + MA 02111-1307, USA. */ + +/* Definitions we want to override with those from rs6000.h: */ +#undef LIB_SPEC +#undef PTRDIFF_TYPE +#undef SIZE_TYPE +#undef WCHAR_TYPE +#undef WCHAR_TYPE_SIZE +#undef EXTRA_SECTIONS +#undef READONLY_DATA_SECTION +#undef READONLY_DATA_SECTION_ASM_OP +#undef EXTRA_SECTION_FUNCTIONS +#undef TARGET_ASM_SELECT_RTX_SECTION +#undef TARGET_ASM_SELECT_SECTION +#undef USER_LABEL_PREFIX +#undef ASM_OUTPUT_LABELREF +#undef ASM_GENERATE_INTERNAL_LABEL +#undef ASM_OUTPUT_COMMON +#undef ASM_OUTPUT_LOCAL + +#undef SDB_DEBUGGING_INFO +#undef DBX_DEBUGGING_INFO +#undef PREFERRED_DEBUGGING_TYPE + +#undef FUNCTION_PROFILER +#undef SUBTARGET_SWITCHES diff --git a/gcc/config/s390/s390.h b/gcc/config/s390/s390.h index 73b2fc7edbe..12bdb5f210c 100644 --- a/gcc/config/s390/s390.h +++ b/gcc/config/s390/s390.h @@ -26,7 +26,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA /* Override the __fixdfdi etc. routines when building libgcc2. ??? This should be done in a cleaner way ... */ #if defined (IN_LIBGCC2) && !defined (__s390x__) -#include <s390/fixdfdi.h> +#include <config/s390/fixdfdi.h> #endif /* Which processor to generate code or schedule for. The cpu attribute diff --git a/gcc/config/sh/embed-elf.h b/gcc/config/sh/embed-elf.h index 3d8fd59c204..e96de90b860 100644 --- a/gcc/config/sh/embed-elf.h +++ b/gcc/config/sh/embed-elf.h @@ -1,6 +1,6 @@ /* Definitions of target machine for GNU compiler for Renesas / SuperH SH non-Linux embedded targets. - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2003 Free Software Foundation, Inc. Contributed by J"orn Rennecke <joern.rennecke@superh.com> This file is part of GNU CC. @@ -20,8 +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 "sh/elf.h" - #undef USER_LABEL_PREFIX #define USER_LABEL_PREFIX "_" diff --git a/gcc/config/sol2.h b/gcc/config/sol2.h index 950472d77ac..a532d3e75d9 100644 --- a/gcc/config/sol2.h +++ b/gcc/config/sol2.h @@ -1,6 +1,6 @@ /* Operating system specific defines to be used when targeting GCC for any Solaris 2 system. - Copyright 2002 Free Software Foundation, Inc. + Copyright 2002, 2003 Free Software Foundation, Inc. This file is part of GCC. @@ -166,13 +166,9 @@ Boston, MA 02111-1307, USA. */ * */ -/* This declares mprotect (used in TRANSFER_FROM_TRAMPOLINE) for - libgcc2.c. */ -/* We don't want to include this because sys/mman.h is not present on - some non-Solaris configurations that use sol2.h. */ -#if 0 /* def L_trampoline */ -#include <sys/mman.h> -#endif +/* sys/mman.h is not present on some non-Solaris configurations + that use sol2.h, so TRANSFER_FROM_TRAMPOLINE must use a magic + number instead of the appropriate PROT_* flags. */ #define TRANSFER_FROM_TRAMPOLINE \ \ diff --git a/gcc/config/sparc/openbsd.h b/gcc/config/sparc/openbsd.h index 6717e222151..e36f51eb602 100644 --- a/gcc/config/sparc/openbsd.h +++ b/gcc/config/sparc/openbsd.h @@ -1,5 +1,5 @@ /* Configuration file for sparc OpenBSD target. - Copyright (C) 1999, 2002 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2003 Free Software Foundation, Inc. This file is part of GCC. @@ -18,10 +18,6 @@ along with GCC; see the file COPYING. If not, write to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* Get generic OpenBSD definitions. */ -#define OBSD_OLD_GAS -#include <openbsd.h> - /* Target OS builtins. */ #define TARGET_OS_CPP_BUILTINS() \ do \ |