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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 46e6d3eedc2726b0fb61b522da0c4d77c2a28711..b97153a3a167defbd6de2ae82a43b2c903306749 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2003-03-08  Hans-Peter Nilsson  <hp@bitrange.com>
+
+       * 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  <neil@daikokuya.co.uk>
 
        * 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 1484499ff710efd0c61196c170d8bbe74a64c80f..8c4e7b7f6dc066bea4a428f81137d98de755afa6 100644 (file)
--- 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 200edabd92d9e430ee5666edd679e5b92761b59c..d3d44e8252f239fcbec192690e5131a1801c7ead 100644 (file)
--- 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 a30d2052f5379b3cc951aa860fe0e824edadb836..a6b0318b1c05030e8fd0ca7482f8671b23fef548 100644 (file)
--- 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 <hp@axis.se>, 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__