Committed: make cris-axis-aout build again.
Hans-Peter Nilsson
hp@bitrange.com
Sat Mar 8 23:06:00 GMT 2003
Unfortunately I don't build cris-axis-aout very often, so it has rotted.
I will include it in my usual test-round. These are just changes to make
"all-gcc" buildable again; further cleanups may be forthcoming. Indeed
cris_abi_symbol.c was not modified in 2002.
* 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.
Index: aout.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/cris/aout.h,v
retrieving revision 1.7
diff -p -c -r1.7 aout.h
*** aout.h 26 Jan 2003 14:40:22 -0000 1.7
--- aout.h 8 Mar 2003 22:55:10 -0000
*************** Boston, MA 02111-1307, USA. */
*** 344,349 ****
--- 344,356 ----
} \
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 */
Index: cris.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/cris/cris.h,v
retrieving revision 1.46
diff -p -c -r1.46 cris.h
*** cris.h 8 Mar 2003 16:10:30 -0000 1.46
--- cris.h 8 Mar 2003 22:55:12 -0000
*************** call_ ## FUNC (void) \
*** 1494,1504 ****
#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) \
--- 1494,1499 ----
Index: cris_abi_symbol.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/cris/cris_abi_symbol.c,v
retrieving revision 1.1
diff -p -c -r1.1 cris_abi_symbol.c
*** cris_abi_symbol.c 11 Oct 2001 17:02:36 -0000 1.1
--- cris_abi_symbol.c 8 Mar 2003 22:55:12 -0000
***************
*** 2,8 ****
Contributed by Axis Communications.
Written by Hans-Peter Nilsson <hp@axis.se>, c:a 1992.
! Copyright (C) 2000, 2001 Free Software Foundation, Inc.
This file is part of GCC.
--- 2,8 ----
Contributed by Axis Communications.
Written by Hans-Peter Nilsson <hp@axis.se>, c:a 1992.
! Copyright (C) 2000, 2001, 2003 Free Software Foundation, Inc.
This file is part of GCC.
*************** Boston, MA 02111-1307, USA.
*** 37,43 ****
the executable file or object might be covered by the GNU General
Public License. */
! #include "config.h"
#ifdef __AOUT__
--- 37,44 ----
the executable file or object might be covered by the GNU General
Public License. */
! #include "tconfig.h"
! #include "tm.h"
#ifdef __AOUT__
brgds, H-P
More information about the Gcc-patches
mailing list