This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
*-rtems cleanup patches for gcc 3.0 branch
- From: joel dot sherrill at OARcorp dot com
- To: gcc-patches at gcc dot gnu dot org
- Date: Fri, 15 Feb 2002 08:36:50 -0600
- Subject: *-rtems cleanup patches for gcc 3.0 branch
- Organization: OAR Corporation
- Reply-to: joel dot sherrill at OARcorp dot com
Hi,
Attached are patches that impact only RTEMS specific
files (and rtems stanzas in config.gcc) for the 3.0
branch.
I have committed them.
--
Joel Sherrill, Ph.D. Director of Research & Development
joel@OARcorp.com On-Line Applications Research
Ask me about RTEMS: a free RTOS Huntsville AL 35805
Support Available (256) 722-9985
2002-02-13 Joel Sherrill <joel@OARcorp.com>
* config/a29k/rtems.h: Remove -Drtems in favor of -D__rtems__.
* config.gcc (arm-*-rtems), config/arm/rtems.h: Ditto plus fix
build problems and place this closer to similar targets.
* config.gcc (c4x-*-rtems), config/c4x/rtems.h: Ditto.
* config.gcc (h8300-*-rtems), config/h8300/rtems.h: Ditto.
* config.gcc (i[34567]86-*-rtems*), config/i386/djgpp-rtems.h,
config/i386/rtems.h, config/i386/rtemself.h: Ditto plus i386-rtemself
target made more similar to i386-elf.
* gthr-rtems.h: Encapsulate with extern "C" for C++.
* config.gcc (hppa1.1-*-rtems), config/pa/rtems.h: Ditto.
* config.gcc (i960-*-rtems), config/i960/rtems.h: Ditto.
* config.gcc (m68k-*-rtems*), config/m68k/rtems.h,
config/m68k/rtemself.h: Ditto.
* config.gcc (mips*-*-rtems*), config/mips/rtems.h,
config/mips/rtems64.h: Ditto.
* config.gcc (powerpc-*-rtems*), config/rs6000/rtems.h: Ditto.
* config.gcc (sh-*-rtems*), config/sh/rtems.h, config/sh/rtemself.h:
Ditto.
* config.gcc (sparc-*-rtems*), config/sparc/rtems.h,
config/sparc/rtemself.h: Ditto.
* config.gcc (v850-*-rtems*), config/v850/rtems.h: Ditto.
* config.gcc (arm-rtems), config/arm/rtems-elf.h: Ditto plus moved
arm-rtems stanza closer to other arm-elf targets and made arm-rtems
more like arm-elf.
* config/i386/t-rtems-i386: Added soft float support and multilibs.
* config/m68k/t-m68kbare: Add 68040 and 68060 as multilib alternatives.
Index: gcc/config.gcc
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config.gcc,v
retrieving revision 1.27.2.20
diff -u -r1.27.2.20 config.gcc
--- config.gcc 2002/01/31 20:42:55 1.27.2.20
+++ config.gcc 2002/02/15 14:16:04
@@ -1,5 +1,5 @@
# GCC build-, host- and target-specific configuration file.
-# Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
#This file is part of GNU CC.
@@ -539,13 +539,6 @@
xm_file="${xm_file} alpha/xm-vms.h"
tmake_file="alpha/t-alpha alpha/t-vms alpha/t-ieee"
;;
-arm*-*-rtems*)
- tm_file=arm/rtems-elf.h
- tmake_file="arm/t-arm-elf t-rtems"
- if test x$enable_threads = xyes; then
- thread_file='rtems'
- fi
- ;;
arc-*-elf*)
extra_parts="crtinit.o crtfini.o"
;;
@@ -611,6 +604,13 @@
tm_file=arm/ecos-elf.h
tmake_file=arm/t-arm-elf
;;
+arm*-*-rtems*)
+ tm_file="arm/rtems-elf.h rtems.h"
+ tmake_file="arm/t-arm-elf t-rtems"
+ if test x$enable_threads = xyes; then
+ thread_file='rtems'
+ fi
+ ;;
arm*-*-elf)
tm_file=arm/unknown-elf.h
tmake_file=arm/t-arm-elf
@@ -1297,10 +1297,10 @@
fi
;;
i[34567]86-*-rtems*|i[34567]86-*-rtemself*)
- cpu_type=i386
- tm_file=i386/rtemself.h
- extra_parts="crtbegin.o crtend.o crti.o crtn.o"
- tmake_file="i386/t-rtems-i386 i386/t-crtstuff t-rtems"
+ xm_file="${xm_file} xm-svr4.h i386/xm-sysv4.h"
+ tm_file="i386/i386.h i386/att.h elfos.h i386/i386elf.h i386/rtemself.h"
+ xmake_file=x-svr4
+ tmake_file="i386/t-rtems-i386 t-rtems"
if test x$enable_threads = xyes; then
thread_file='rtems'
fi
Index: gcc/gthr-rtems.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/gthr-rtems.h,v
retrieving revision 1.1.4.1
diff -u -r1.1.4.1 gthr-rtems.h
--- gthr-rtems.h 2001/07/25 01:46:30 1.1.4.1
+++ gthr-rtems.h 2002/02/15 14:16:07
@@ -1,7 +1,7 @@
/* RTEMS threads compatibily routines for libgcc2 and libobjc.
by: Rosimildo da Silva( rdasilva@connecttel.com ) */
/* Compile this one with gcc. */
-/* Copyright (C) 1997, 1999, 2000 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 1999, 2000, 2002 Free Software Foundation, Inc.
This file is part of GNU CC.
@@ -30,6 +30,9 @@
#ifndef __gthr_rtems_h
#define __gthr_rtems_h
+#ifdef __cplusplus
+extern "C" {
+#endif
#define __GTHREADS 1
@@ -123,5 +126,10 @@
{
return rtems_gxx_mutex_unlock( mutex );
}
+
+#ifdef __cplusplus
+}
+#endif
+
#endif /* __gthr_rtems_h */
Index: gcc/config/a29k/rtems.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/a29k/rtems.h,v
retrieving revision 1.1
diff -u -r1.1 rtems.h
--- rtems.h 2000/12/07 02:42:01 1.1
+++ rtems.h 2002/02/15 14:16:07
@@ -1,5 +1,5 @@
/* Definitions for rtems targeting a AMD A29K using COFF.
- Copyright (C) 1997, 1998, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1998, 2000, 2002 Free Software Foundation, Inc.
Contributed by Joel Sherrill (joel@OARcorp.com).
This file is part of GNU CC.
@@ -24,7 +24,7 @@
/* Specify predefined symbols in preprocessor. */
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-D_AM29K -D_AM29000 -D_EPI -Drtems -D__rtems__ \
+#define CPP_PREDEFINES "-D_AM29K -D_AM29000 -D_EPI -D__rtems__ \
-Asystem(rtems) -Acpu(a29k) -Amachine(a29k)"
/* Generate calls to memcpy, memcmp and memset. */
Index: gcc/config/arm/rtems-elf.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/arm/rtems-elf.h,v
retrieving revision 1.1.4.1
diff -u -r1.1.4.1 rtems-elf.h
--- rtems-elf.h 2001/08/17 00:21:00 1.1.4.1
+++ rtems-elf.h 2002/02/15 14:16:07
@@ -1,5 +1,5 @@
/* Definitions for RTEMS based ARM systems using ELF
- Copyright (C) 2000 Free Software Foundation, Inc.
+ Copyright (C) 2000, 2002 Free Software Foundation, Inc.
This file is part of GNU CC.
@@ -26,12 +26,8 @@
#include "unknown-elf.h"
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Drtems -D__rtems__ -D__ELF__ \
+#define CPP_PREDEFINES "-D__rtems__ -D__ELF__ \
-Asystem(rtems) -Acpu(arm) -Amachine(arm)"
-/*#undef INVOKE_main*/
-
-/* Get machine-independent configuration parameters for RTEMS. */
-#include <rtems.h>
-
+#undef INVOKE_main
Index: gcc/config/c4x/rtems.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/c4x/rtems.h,v
retrieving revision 1.3
diff -u -r1.3 rtems.h
--- rtems.h 2000/11/02 23:29:08 1.3
+++ rtems.h 2002/02/15 14:16:07
@@ -1,5 +1,5 @@
/* Definitions of RTEMS executing on an TMS320C[34]x using coff
- Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 1999, 2002 Free Software Foundation, Inc.
Contributed by Joel Sherrill (joel@OARcorp.com).
This file is part of GNU CC.
@@ -24,7 +24,7 @@
/* Specify predefined symbols in preprocessor. */
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-D__rtems__ -Asystem=rtems"
+#define CPP_PREDEFINES "-D__rtems__ -Asystem=rtems -D__USE_INIT_FINI__"
/* Generate calls to memcpy, memcmp and memset. */
#ifndef TARGET_MEM_FUNCTIONS
Index: gcc/config/h8300/rtems.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/h8300/rtems.h,v
retrieving revision 1.1
diff -u -r1.1 rtems.h
--- rtems.h 2000/12/07 02:42:02 1.1
+++ rtems.h 2002/02/15 14:16:07
@@ -1,5 +1,5 @@
/* Definitions for rtems targeting a H8
- Copyright (C) 1996, 1997, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 2000, 2002 Free Software Foundation, Inc.
Contributed by Joel Sherrill (joel@OARcorp.com).
This file is part of GNU CC.
@@ -26,7 +26,7 @@
#undef CPP_PREDEFINES
#define CPP_PREDEFINES "-Dh8300 \
-D__LONG_MAX__=2147483647L -D__LONG_LONG_MAX__=2147483647L \
- -Drtems -D__rtems__ -Asystem(rtems) -Acpu(h8300) -Amachine(h8300)"
+ -D__rtems__ -Asystem(rtems) -Acpu(h8300) -Amachine(h8300)"
/* Generate calls to memcpy, memcmp and memset. */
#ifndef TARGET_MEM_FUNCTIONS
Index: gcc/config/i386/rtems.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/i386/rtems.h,v
retrieving revision 1.11
diff -u -r1.11 rtems.h
--- rtems.h 2000/11/02 23:29:10 1.11
+++ rtems.h 2002/02/15 14:16:07
@@ -1,5 +1,5 @@
/* Definitions for rtems targeting an Intel i386 using coff.
- Copyright (C) 1996, 1997, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 2000, 2002 Free Software Foundation, Inc.
Contributed by Joel Sherrill (joel@OARcorp.com).
This file is part of GNU CC.
@@ -24,7 +24,7 @@
/* Specify predefined symbols in preprocessor. */
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Drtems -D__rtems__ -Asystem=rtems"
+#define CPP_PREDEFINES "-D__rtems__ -Asystem=rtems"
/* Generate calls to memcpy, memcmp and memset. */
#ifndef TARGET_MEM_FUNCTIONS
Index: gcc/config/i386/rtemself.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/i386/rtemself.h,v
retrieving revision 1.9
diff -u -r1.9 rtemself.h
--- rtemself.h 2000/11/02 23:29:10 1.9
+++ rtemself.h 2002/02/15 14:16:07
@@ -1,8 +1,6 @@
-/* Definitions for Intel 386 running Linux-based GNU systems with ELF format.
- Copyright (C) 1994, 1995, 1996, 1997, 1998, 2000
- Free Software Foundation, Inc.
- Contributed by Eric Youngdale.
- Modified for stabs-in-ELF by H.J. Lu.
+/* Definitions for rtems targeting a ix86 using ELF.
+ Copyright (C) 1996, 1997, 2000, 2001, 2002 Free Software Foundation, Inc.
+ Contributed by Joel Sherrill (joel@OARcorp.com).
This file is part of GNU CC.
@@ -21,89 +19,26 @@
the Free Software Foundation, 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-#define LINUX_DEFAULT_ELF
+/* Specify predefined symbols in preprocessor. */
-/* A lie, I guess, but the general idea behind linux/ELF is that we are
- supposed to be outputting something that will assemble under SVr4.
- This gets us pretty close. */
-#include <i386/i386.h> /* Base i386 target machine definitions */
-#include <i386/att.h> /* Use the i386 AT&T assembler syntax */
-#include <linux.h> /* some common stuff */
-
-#undef TARGET_VERSION
-#define TARGET_VERSION fprintf (stderr, " (i386 RTEMS with ELF)");
-
-/* The svr4 ABI for the i386 says that records and unions are returned
- in memory. */
-#undef DEFAULT_PCC_STRUCT_RETURN
-#define DEFAULT_PCC_STRUCT_RETURN 1
-
-/* This is how to output an element of a case-vector that is relative.
- This is only used for PIC code. See comments by the `casesi' insn in
- i386.md for an explanation of the expression this outputs. */
-#undef ASM_OUTPUT_ADDR_DIFF_ELT
-#define ASM_OUTPUT_ADDR_DIFF_ELT(FILE, BODY, VALUE, REL) \
- fprintf (FILE, "\t.long _GLOBAL_OFFSET_TABLE_+[.-%s%d]\n", LPREFIX, VALUE)
-
-/* Indicate that jump tables go in the text section. This is
- necessary when compiling PIC code. */
-#define JUMP_TABLES_IN_TEXT_SECTION (flag_pic)
-
-#undef DBX_REGISTER_NUMBER
-#define DBX_REGISTER_NUMBER(n) svr4_dbx_register_map[n]
-
-/* Output assembler code to FILE to increment profiler label # LABELNO
- for profiling a function entry. */
-
-#undef FUNCTION_PROFILER
-#define FUNCTION_PROFILER(FILE, LABELNO) \
-{ \
- if (flag_pic) \
- { \
- fprintf (FILE, "\tleal %sP%d@GOTOFF(%%ebx),%%edx\n", \
- LPREFIX, (LABELNO)); \
- fprintf (FILE, "\tcall *mcount@GOT(%%ebx)\n"); \
- } \
- else \
- { \
- fprintf (FILE, "\tmovl $%sP%d,%%edx\n", LPREFIX, (LABELNO)); \
- fprintf (FILE, "\tcall mcount\n"); \
- } \
-}
-
-#undef SIZE_TYPE
-#define SIZE_TYPE "unsigned int"
-
-#undef PTRDIFF_TYPE
-#define PTRDIFF_TYPE "int"
-
-#undef WCHAR_TYPE
-#define WCHAR_TYPE "long int"
-
-#undef WCHAR_TYPE_SIZE
-#define WCHAR_TYPE_SIZE BITS_PER_WORD
-
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Drtems -D__rtems__ -Asystem=rtems"
+#define CPP_PREDEFINES "-D__rtems__ -Asystem=rtems \
+ -D__ELF__ -D__i386__ -D__USE_INIT_FINI__"
-/* Get perform_* macros to build libgcc.a. */
-#include "i386/perform.h"
+#undef CPP_SPEC
+#define CPP_SPEC "%(cpp_cpu) %{msoft-float:-D_SOFT_FLOAT}"
-/* A C statement (sans semicolon) to output to the stdio stream
- FILE the assembler definition of uninitialized global DECL named
- NAME whose size is SIZE bytes and alignment is ALIGN bytes.
- Try to use asm_output_aligned_bss to implement this macro. */
-
-#define ASM_OUTPUT_ALIGNED_BSS(FILE, DECL, NAME, SIZE, ALIGN) \
- asm_output_aligned_bss (FILE, DECL, NAME, SIZE, ALIGN)
-
#undef STARTFILE_SPEC
#define STARTFILE_SPEC "crt0.o%s crti.o%s crtbegin.o%s"
#undef ENDFILE_SPEC
#define ENDFILE_SPEC "crtend.o%s crtn.o%s"
+/* Generate calls to memcpy, memcmp and memset. */
+#ifndef TARGET_MEM_FUNCTIONS
+#define TARGET_MEM_FUNCTIONS
+#endif
+
/* Get machine-independent configuration parameters for RTEMS. */
#include <rtems.h>
-/* end of i386/rtemself.h */
Index: gcc/config/i386/t-rtems-i386
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/i386/t-rtems-i386,v
retrieving revision 1.1
diff -u -r1.1 t-rtems-i386
--- t-rtems-i386 1999/09/14 09:52:06 1.1
+++ t-rtems-i386 2002/02/15 14:16:07
@@ -5,9 +5,6 @@
# version of these files.
#
-LIBGCC1 =
-CROSS_LIBGCC1 =
-
crti.o: $(srcdir)/config/i386/sol2-ci.asm $(GCC_PASSES)
sed -e '/^!/d' <$(srcdir)/config/i386/sol2-ci.asm >crti.s
$(GCC_FOR_TARGET) -c -o crti.o crti.s
@@ -15,3 +12,43 @@
sed -e '/^!/d' <$(srcdir)/config/i386/sol2-cn.asm >crtn.s
$(GCC_FOR_TARGET) -c -o crtn.o crtn.s
+# We want fine grained libraries, so use the new code to build the
+# floating point emulation libraries.
+FPBIT = fp-bit.c
+DPBIT = dp-bit.c
+
+LIB2FUNCS_EXTRA = xp-bit.c
+
+dp-bit.c: $(srcdir)/config/fp-bit.c
+ echo '#ifdef __LITTLE_ENDIAN__' > dp-bit.c
+ echo '#define FLOAT_BIT_ORDER_MISMATCH' >>dp-bit.c
+ echo '#endif' >> dp-bit.c
+ cat $(srcdir)/config/fp-bit.c >> dp-bit.c
+
+fp-bit.c: $(srcdir)/config/fp-bit.c
+ echo '#define FLOAT' > fp-bit.c
+ echo '#ifdef __LITTLE_ENDIAN__' >> fp-bit.c
+ echo '#define FLOAT_BIT_ORDER_MISMATCH' >>fp-bit.c
+ echo '#endif' >> fp-bit.c
+ cat $(srcdir)/config/fp-bit.c >> fp-bit.c
+
+xp-bit.c: $(srcdir)/config/fp-bit.c
+ echo '#define EXTENDED_FLOAT_STUBS' > xp-bit.c
+ cat $(srcdir)/config/fp-bit.c >> xp-bit.c
+
+MULTILIB_OPTIONS = mcpu=i486/mcpu=pentium/mcpu=pentiumpro/mcpu=k6/mcpu=athlon \
+msoft-float mno-fp-ret-in-387
+MULTILIB_DIRNAMES= m486 mpentium mpentiumpro k6 athlon soft-float nofp
+MULTILIB_MATCHES = msoft-float=mno-m80387
+MULTILIB_EXCEPTIONS = \
+mno-fp-ret-in-387 \
+mcpu=i486/*mno-fp-ret-in-387* \
+mcpu=pentium/*msoft-float* mcpu=pentium/*mno-fp-ret-in-387* \
+mcpu=pentiumpro/*msoft-float* mcpu=pentiumpro/*mno-fp-ret-in-387* \
+mcpu=k6/*msoft-float* mcpu=k6/*mno-fp-ret-in-387* \
+mcpu=athlon/*msoft-float* mcpu=athlon/*mno-fp-ret-in-387*
+
+EXTRA_MULTILIB_PARTS = crtbegin.o crtend.o
+
+LIBGCC = stmp-multilib
+INSTALL_LIBGCC = install-multilib
Index: gcc/config/i960/rtems.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/i960/rtems.h,v
retrieving revision 1.9
diff -u -r1.9 rtems.h
--- rtems.h 2000/11/02 23:29:10 1.9
+++ rtems.h 2002/02/15 14:16:07
@@ -1,5 +1,5 @@
/* Definitions for rtems targeting an Intel i960.
- Copyright (C) 1996, 1997, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 2000, 2002 Free Software Foundation, Inc.
Contributed by Joel Sherrill (joel@OARcorp.com).
This file is part of GNU CC.
@@ -24,7 +24,7 @@
/* Specify predefined symbols in preprocessor. */
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Di960 -Di80960 -DI960 -DI80960 -Drtems -D__rtems__ \
+#define CPP_PREDEFINES "-Di960 -Di80960 -DI960 -DI80960 -D__rtems__ \
-Asystem=rtems -Acpu=i960 -Amachine=i960"
/* Generate calls to memcpy, memcmp and memset. */
Index: gcc/config/m68k/rtems.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/m68k/rtems.h,v
retrieving revision 1.9
diff -u -r1.9 rtems.h
--- rtems.h 2000/11/02 23:29:11 1.9
+++ rtems.h 2002/02/15 14:16:07
@@ -1,5 +1,5 @@
/* Definitions for rtems targeting a Motorola m68k using coff.
- Copyright (C) 1996, 1997, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 2000, 2002 Free Software Foundation, Inc.
Contributed by Joel Sherrill (joel@OARcorp.com).
This file is part of GNU CC.
@@ -24,7 +24,7 @@
/* Specify predefined symbols in preprocessor. */
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Dmc68000 -Drtems -D__rtems__ \
+#define CPP_PREDEFINES "-Dmc68000 -D__rtems__ \
-Asystem=rtems -Acpu=mc68000 -Acpu=m68k -Amachine=m68k"
/* Generate calls to memcpy, memcmp and memset. */
Index: gcc/config/m68k/rtemself.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/m68k/rtemself.h,v
retrieving revision 1.4
diff -u -r1.4 rtemself.h
--- rtemself.h 2000/11/02 23:29:11 1.4
+++ rtemself.h 2002/02/15 14:16:07
@@ -1,5 +1,5 @@
/* Definitions for rtems targeting a Motorola m68k using elf.
- Copyright (C) 1999, 2000, National Research Council of Canada.
+ Copyright (C) 1999, 2000, 2002 National Research Council of Canada.
Contributed by Charles-Antoine Gauthier (charles.gauthier@nrc.ca).
This file is part of GNU CC.
@@ -27,8 +27,8 @@
/* Specify predefined symbols in preprocessor. */
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Dmc68000 -Drtems -D__rtems__ -D__ELF__ \
- -Asystem=rtems -Acpu=mc68000 -Acpu=m68k -Amachine=m68k"
+#define CPP_PREDEFINES "-Dmc68000 -D__rtems__ -D__ELF__ \
+ -Asystem=rtems -Acpu=mc68000 -Acpu=m68k -Amachine=m68k -D__USE_INIT_FINI__"
/* Generate calls to memcpy, memcmp and memset. */
#ifndef TARGET_MEM_FUNCTIONS
Index: gcc/config/m68k/t-m68kbare
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/m68k/t-m68kbare,v
retrieving revision 1.3
diff -u -r1.3 t-m68kbare
--- t-m68kbare 1998/12/16 21:07:29 1.3
+++ t-m68kbare 2002/02/15 14:16:07
@@ -15,10 +15,10 @@
echo '#define EXTFLOAT' > xfgnulib.c
cat $(srcdir)/config/m68k/fpgnulib.c >> xfgnulib.c
-MULTILIB_OPTIONS = m68000/m68020/m5200/mcpu32 m68881/msoft-float
+MULTILIB_OPTIONS = m68000/m68020/m5200/mcpu32/m68040/m68060 m68881/msoft-float
MULTILIB_DIRNAMES =
-MULTILIB_MATCHES = m68000=mc68000 m68000=m68302 mcpu32=m68332 m68020=mc68020 m68020=m68040 m68020=m68060
-MULTILIB_EXCEPTIONS = m68000/msoft-float m5200/m68881 m5200/msoft-float mcpu32/m68881 mcpu32/msoft-float
+MULTILIB_MATCHES = m68000=mc68000 m68000=m68302 mcpu32=m68332 m68020=mc68020
+MULTILIB_EXCEPTIONS = m68000/msoft-float m5200/m68881 m5200/msoft-float mcpu32/m68881 mcpu32/msoft-float m68040/m68681 m68060/m68681
LIBGCC = stmp-multilib
INSTALL_LIBGCC = install-multilib
Index: gcc/config/mips/rtems.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/mips/rtems.h,v
retrieving revision 1.1
diff -u -r1.1 rtems.h
--- rtems.h 2000/12/07 02:42:02 1.1
+++ rtems.h 2002/02/15 14:16:07
@@ -23,7 +23,7 @@
#undef CPP_PREDEFINES
#define CPP_PREDEFINES "-Dmips -DMIPSEB -D_mips -D_MIPSEB \
- -Drtems -D__rtems__ -Asystem(rtems)"
+ -D__rtems__ -Asystem(rtems)"
/* Generate calls to memcpy, memcmp and memset. */
#ifndef TARGET_MEM_FUNCTIONS
Index: gcc/config/mips/rtems64.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/mips/rtems64.h,v
retrieving revision 1.11
diff -u -r1.11 rtems64.h
--- rtems64.h 2000/11/02 23:29:12 1.11
+++ rtems64.h 2002/02/15 14:16:07
@@ -1,5 +1,5 @@
/* Definitions for rtems targeting a MIPS ORION using ecoff.
- Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002 Free Software Foundation, Inc.
Contributed by Joel Sherrill (joel@OARcorp.com).
This file is part of GNU CC.
@@ -23,7 +23,7 @@
#undef CPP_PREDEFINES
#define CPP_PREDEFINES "-Dmips -DMIPSEB -DR4000 -D_mips -D_MIPSEB -D_R4000 \
- -Drtems -D__rtems__ -Asystem=rtems"
+ -D__rtems__ -Asystem=rtems"
/* Generate calls to memcpy, memcmp and memset. */
#ifndef TARGET_MEM_FUNCTIONS
Index: gcc/config/pa/rtems.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/pa/rtems.h,v
retrieving revision 1.8
diff -u -r1.8 rtems.h
--- rtems.h 2000/11/02 23:29:12 1.8
+++ rtems.h 2002/02/15 14:16:07
@@ -1,5 +1,5 @@
/* Definitions of target machine for GNU compiler, for PRO.
- Copyright (C) 1997, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1997, 2000, 2002 Free Software Foundation, Inc.
Contributed by Joel Sherrill (joel@OARcorp.com).
This file is part of GNU CC.
@@ -23,7 +23,7 @@
#undef CPP_PREDEFINES
#define CPP_PREDEFINES "-Dhppa -DPWB -Acpu=hppa -Amachine=hppa \
- -Drtems -D__rtems__ -Asystem=rtems"
+ -D__rtems__ -Asystem=rtems"
/* Generate calls to memcpy, memcmp and memset. */
#ifndef TARGET_MEM_FUNCTIONS
Index: gcc/config/rs6000/rtems.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/rs6000/rtems.h,v
retrieving revision 1.12.4.1
diff -u -r1.12.4.1 rtems.h
--- rtems.h 2001/08/17 00:21:00 1.12.4.1
+++ rtems.h 2002/02/15 14:16:07
@@ -1,5 +1,5 @@
/* Definitions for rtems targeting a PowerPC using elf.
- Copyright (C) 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 2000, 2001, 2002 Free Software Foundation, Inc.
Contributed by Joel Sherrill (joel@OARcorp.com).
This file is part of GNU CC.
@@ -22,8 +22,8 @@
/* Specify predefined symbols in preprocessor. */
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-DPPC -Drtems -D__rtems__ \
- -Asystem=rtems -Acpu=powerpc -Amachine=powerpc"
+#define CPP_PREDEFINES "-DPPC -D__rtems__ \
+ -Asystem=rtems -Acpu=powerpc -Amachine=powerpc -D__USE_INIT_FINI__"
/* Generate calls to memcpy, memcmp and memset. */
#ifndef TARGET_MEM_FUNCTIONS
Index: gcc/config/sh/rtems.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/sh/rtems.h,v
retrieving revision 1.12
diff -u -r1.12 rtems.h
--- rtems.h 2000/11/02 23:29:13 1.12
+++ rtems.h 2002/02/15 14:16:07
@@ -1,5 +1,5 @@
/* Definitions for rtems targeting a SH using COFF.
- Copyright (C) 1997, 1998, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1998, 2000, 2002 Free Software Foundation, Inc.
Contributed by Joel Sherrill (joel@OARcorp.com).
This file is part of GNU CC.
@@ -22,7 +22,7 @@
/* Specify predefined symbols in preprocessor. */
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-D__sh__ -Drtems -D__rtems__ \
+#define CPP_PREDEFINES "-D__sh__ -D__rtems__ \
-Asystem=rtems -Acpu=sh -Amachine=sh"
/* Generate calls to memcpy, memcmp and memset. */
Index: gcc/config/sh/rtemself.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/sh/rtemself.h,v
retrieving revision 1.6
diff -u -r1.6 rtemself.h
--- rtemself.h 2000/11/02 23:29:13 1.6
+++ rtemself.h 2002/02/15 14:16:07
@@ -1,5 +1,5 @@
/* Definitions for rtems targeting a SH using elf.
- Copyright (C) 1997, 1998, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1998, 2000, 2002 Free Software Foundation, Inc.
Contributed by Joel Sherrill (joel@OARcorp.com).
This file is part of GNU CC.
@@ -22,7 +22,7 @@
/* Specify predefined symbols in preprocessor. */
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-D__sh__ -D__ELF__ -Drtems -D__rtems__ \
+#define CPP_PREDEFINES "-D__sh__ -D__ELF__ -D__rtems__ \
-Asystem=rtems -Acpu=sh -Amachine=sh"
/* Generate calls to memcpy, memcmp and memset. */
Index: gcc/config/sparc/rtems.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/sparc/rtems.h,v
retrieving revision 1.9.4.1
diff -u -r1.9.4.1 rtems.h
--- rtems.h 2001/07/25 01:54:05 1.9.4.1
+++ rtems.h 2002/02/15 14:16:07
@@ -1,5 +1,5 @@
/* Definitions for rtems targeting a SPARC using a.out.
- Copyright (C) 1996, 1997, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 2000, 2002 Free Software Foundation, Inc.
Contributed by Joel Sherrill (joel@OARcorp.com).
This file is part of GNU CC.
@@ -24,7 +24,7 @@
/* Specify predefined symbols in preprocessor. */
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Dsparc -D__GCC_NEW_VARARGS__ -Drtems -D__rtems__ \
+#define CPP_PREDEFINES "-Dsparc -D__GCC_NEW_VARARGS__ -D__rtems__ \
-Asystem=rtems"
/* Generate calls to memcpy, memcmp and memset. */
Index: gcc/config/sparc/rtemself.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/sparc/rtemself.h,v
retrieving revision 1.4.4.1
diff -u -r1.4.4.1 rtemself.h
--- rtemself.h 2001/07/25 01:54:05 1.4.4.1
+++ rtemself.h 2002/02/15 14:16:07
@@ -1,5 +1,5 @@
/* Definitions for rtems targeting a SPARC using ELF.
- Copyright (C) 1996, 1997, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 2000, 2002 Free Software Foundation, Inc.
Contributed by Joel Sherrill (joel@OARcorp.com).
This file is part of GNU CC.
@@ -22,8 +22,8 @@
/* Specify predefined symbols in preprocessor. */
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Dsparc -D__GCC_NEW_VARARGS__ -Drtems -D__rtems__ \
- -Asystem=rtems"
+#define CPP_PREDEFINES "-Dsparc -D__GCC_NEW_VARARGS__ -D__rtems__ \
+ -Asystem=rtems -D__USE_INIT_FINI__"
/* Generate calls to memcpy, memcmp and memset. */
#ifndef TARGET_MEM_FUNCTIONS
Index: gcc/config/v850/rtems.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/v850/rtems.h,v
retrieving revision 1.2
diff -u -r1.2 rtems.h
--- rtems.h 2000/11/02 23:29:13 1.2
+++ rtems.h 2002/02/15 14:16:07
@@ -1,5 +1,5 @@
/* Definitions for rtems targeting a v850 using elf
- Copyright (C) 1996, 1997, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 2000, 2002 Free Software Foundation, Inc.
Contributed by Joel Sherrill (joel@OARcorp.com).
This file is part of GNU CC.
@@ -24,7 +24,7 @@
/* Specify predefined symbols in preprocessor. */
#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-D__v851__ -D__v850 -Drtems \
+#define CPP_PREDEFINES "-D__v851__ -D__v850 \
-Asystem=rtems -Acpu=v850 -Amachine=v850"
/* Generate calls to memcpy, memcmp and memset. */