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

+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

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 */
 

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)	\

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__