From 32b0bbaa6de3eae13ba5d3ff3303f2d7c60849eb Mon Sep 17 00:00:00 2001 From: Hans-Peter Nilsson Date: Sat, 8 Mar 2003 22:59:10 +0000 Subject: [PATCH] cris_abi_symbol.c: #include tconfig.h and tm.h, not config.h. * config/cris/cris_abi_symbol.c: #include tconfig.h and tm.h, not config.h. * config/cris/cris.h (HAVE_GAS_HIDDEN): Don't define here. * config/cris/aout.h (HAVE_GAS_HIDDEN): Undef. From-SVN: r64003 --- gcc/ChangeLog | 7 +++++++ gcc/config/cris/aout.h | 7 +++++++ gcc/config/cris/cris.h | 5 ----- gcc/config/cris/cris_abi_symbol.c | 5 +++-- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 46e6d3eedc2..b97153a3a16 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2003-03-08 Hans-Peter Nilsson + + * config/cris/cris_abi_symbol.c: #include tconfig.h and tm.h, not + config.h. + * config/cris/cris.h (HAVE_GAS_HIDDEN): Don't define here. + * config/cris/aout.h (HAVE_GAS_HIDDEN): Undef. + 2003-03-08 Neil Booth * config/sh/rtemself.h (TARGET_OS_CPP_BUILTINS): Use instead of diff --git a/gcc/config/cris/aout.h b/gcc/config/cris/aout.h index 1484499ff71..8c4e7b7f6dc 100644 --- a/gcc/config/cris/aout.h +++ b/gcc/config/cris/aout.h @@ -344,6 +344,13 @@ Boston, MA 02111-1307, USA. */ } \ while (0) +/* The configure machinery invokes the assembler without options, which is + not how gcc invokes it. Without options, the multi-target assembler + will probably be found, which is ELF by default. To counter that, we + need to override ELF auto-host.h config stuff which we know collides + with a.out. */ +#undef HAVE_GAS_HIDDEN + /* Node: Alignment Output */ diff --git a/gcc/config/cris/cris.h b/gcc/config/cris/cris.h index 200edabd92d..d3d44e8252f 100644 --- a/gcc/config/cris/cris.h +++ b/gcc/config/cris/cris.h @@ -1494,11 +1494,6 @@ call_ ## FUNC (void) \ #define SUPPORTS_WEAK 1 -/* FIXME: This macro isn't documented, but this would probably be an - appropriate location. It's only used in crtstuff.c, else we'd have to - handle (to #undef or ignore it) in a.out. */ -#define HAVE_GAS_HIDDEN 1 - /* Remove any previous definition (elfos.h). */ #undef ASM_GENERATE_INTERNAL_LABEL #define ASM_GENERATE_INTERNAL_LABEL(LABEL, PREFIX, NUM) \ diff --git a/gcc/config/cris/cris_abi_symbol.c b/gcc/config/cris/cris_abi_symbol.c index a30d2052f53..a6b0318b1c0 100644 --- a/gcc/config/cris/cris_abi_symbol.c +++ b/gcc/config/cris/cris_abi_symbol.c @@ -2,7 +2,7 @@ Contributed by Axis Communications. Written by Hans-Peter Nilsson , c:a 1992. - Copyright (C) 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 2000, 2001, 2003 Free Software Foundation, Inc. This file is part of GCC. @@ -37,7 +37,8 @@ Boston, MA 02111-1307, USA. the executable file or object might be covered by the GNU General Public License. */ -#include "config.h" +#include "tconfig.h" +#include "tm.h" #ifdef __AOUT__ -- 2.30.2