This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
3.4/3.5 PATCH: Remove support for mips-sgi-irix6*o32 configuration
- From: Rainer Orth <ro at TechFak dot Uni-Bielefeld dot DE>
- To: gcc-patches at gcc dot gnu dot org
- Date: Wed, 21 Jan 2004 20:13:40 +0100 (MET)
- Subject: 3.4/3.5 PATCH: Remove support for mips-sgi-irix6*o32 configuration
Since support for the IRIX 6 O32 ABI has been integrated into GCC 3.4.0,
the separate mips-sgi-irix6*o32 configurations can go. The following patch
does this.
Bootstrap on mips-sgi-irix5.3 (to check that the config.gcc change
introduced no syntax errors) well into stage3.
Ok for mainline and 3.4 branch?
Rainer
-----------------------------------------------------------------------------
Rainer Orth, Faculty of Technology, Bielefeld University
Tue Jan 20 12:03:22 2004 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
* config.gcc (mips-sgi-irix6*o32): Removed.
* config/mips/iris6-o32-as.h: Likewise.
* config/mips/iris6-o32-gas.h: Likewise.
* config/mips/iris6-o32.h: Likewise.
Index: gcc/config.gcc
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config.gcc,v
retrieving revision 1.420
diff -u -p -r1.420 config.gcc
--- gcc/config.gcc 14 Jan 2004 17:51:29 -0000 1.420
+++ gcc/config.gcc 20 Jan 2004 21:24:33 -0000
@@ -1441,34 +1441,6 @@ mcore-*-pe*)
tmake_file=mcore/t-mcore-pe
use_fixproto=yes
;;
-mips-sgi-irix6*o32) # SGI System V.4., IRIX 6, O32 ABI
- tm_file="${tm_file} mips/iris5.h"
- if test x$gas = xyes
- then
- tm_file="${tm_file} mips/sdb.h mips/iris5gas.h mips/iris6-o32-gas.h"
- if test x$stabs = xyes
- then
- tm_file="${tm_file} dbx.h mips/dbxmdebug.h"
- fi
- tmake_file=mips/t-iris5-gas
- else
- tm_file="${tm_file} mips/iris6-o32-as.h"
- tmake_file=mips/t-iris5-as
- fi
- tm_file="${tm_file} mips/iris6-o32.h"
- tmake_file="${tmake_file} mips/t-iris mips/t-iris5-6"
- target_cpu_default="MASK_ABICALLS"
- # mips-tfile doesn't work yet
- # See comment in mips/iris5.h file.
- if test x$gas = xno
- then
- use_collect2=yes
- fi
-# if test x$enable_threads = xyes; then
-# thread_file='irix'
-# fi
- use_fixproto=yes
- ;;
mips-sgi-irix6*) # SGI System V.4., IRIX 6
tm_file="${tm_file} mips/iris5.h mips/iris6.h"
tmake_file="mips/t-iris mips/t-iris5-6 mips/t-iris6"
Index: gcc/config/mips/iris6-o32-as.h
===================================================================
RCS file: gcc/config/mips/iris6-o32-as.h
diff -N gcc/config/mips/iris6-o32-as.h
--- gcc/config/mips/iris6-o32-as.h 17 Sep 2003 17:40:05 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-/* Definitions of target machine for GNU compiler, for MIPS running IRIX 6
- (O32 ABI) using the SGI assembler. */
-
-/* Enforce use of O32 linker, irrespective of SGI_ABI environment variable
- and machine type (e.g., R8000 systems default to -64). Copied from
- iris5.h, only adding -32. The default options -call_shared -no_unresolved
- are only passed if not invoked with -r. */
-#undef LINK_SPEC
-#define LINK_SPEC "\
-%{G*} %{EB} %{EL} %{mips1} %{mips2} %{mips3} \
-%{bestGnum} %{shared} %{non_shared} \
-%{call_shared} %{no_archive} %{exact_version} \
-%{static: -non_shared} \
-%{!static: \
- %{!shared:%{!non_shared:%{!call_shared:%{!r: -call_shared -no_unresolved}}}}} \
-%{rpath} \
--_SYSTYPE_SVR4 \
--32"
Index: gcc/config/mips/iris6-o32-gas.h
===================================================================
RCS file: gcc/config/mips/iris6-o32-gas.h
diff -N gcc/config/mips/iris6-o32-gas.h
--- gcc/config/mips/iris6-o32-gas.h 19 Jul 2002 21:58:12 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-/* Definitions of target machine for GNU compiler, for MIPS running IRIX 6
- (O32 ABI) using the GNU assembler. */
-
-/* Enforce use of O32 linker, irrespective of SGI_ABI environment variable
- and machine type (e.g., R8000 systems default to -64). Copied from
- iris5gas.h, only adding -32. The default options -call_shared
- -no_unresolved are only passed if not invoked with -r. */
-#undef LINK_SPEC
-#define LINK_SPEC "\
-%{G*} %{EB} %{EL} %{mips1} %{mips2} %{mips3} \
-%{bestGnum} %{shared} %{non_shared} \
-%{call_shared} %{no_archive} %{exact_version} \
-%{static: -non_shared} \
-%{!static: \
- %{!shared:%{!non_shared:%{!call_shared:%{!r: -call_shared -no_unresolved}}}}} \
-%{rpath} -init __do_global_ctors -fini __do_global_dtors \
-%{shared:-hidden_symbol __do_global_ctors,__do_global_ctors_1,__do_global_dtors} \
--_SYSTYPE_SVR4 \
--32"
Index: gcc/config/mips/iris6-o32.h
===================================================================
RCS file: gcc/config/mips/iris6-o32.h
diff -N gcc/config/mips/iris6-o32.h
--- gcc/config/mips/iris6-o32.h 17 Sep 2003 17:40:05 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,26 +0,0 @@
-/* Definitions of target machine for GNU compiler, for MIPS running IRIX 6
- (O32 ABI). */
-
-/* The O32 ABI on IRIX 6 defaults to the mips2 ISA. */
-#undef MIPS_CPU_STRING_DEFAULT
-#define MIPS_CPU_STRING_DEFAULT "mips2"
-
-/* Specify wchar_t and wint_t types. */
-#undef WCHAR_TYPE
-#define WCHAR_TYPE "long int"
-
-#undef WCHAR_TYPE_SIZE
-#define WCHAR_TYPE_SIZE 32
-
-#undef WINT_TYPE
-#define WINT_TYPE "long int"
-
-#undef WINT_TYPE_SIZE
-#define WINT_TYPE_SIZE 32
-
-/* Enforce use of O32 assembler, irrespective of SGI_ABI environment variable
- and machine type (e.g., R8000 systems default to -64). Gas doesn't need
- this, but doesn't hurt either. Need to pass -mips2 to gas which defaults
- to -mips1 if no ISA is specified. */
-#undef SUBTARGET_ASM_SPEC
-#define SUBTARGET_ASM_SPEC "-32 %{!mips*:-mips2}"