mips.opt: Remove -mint64 option.

2005-05-06  Eric Christopher  <echristo@redhat.com>

	* config/mips/mips.opt: Remove -mint64 option.
	* config/mips/mips.c (override_options): Remove -mint64
	handling.
	* config/mips/mips.h (INT_TYPE_SIZE): Define to 32.
	* config/mips/linux.h (TARGET_OS_CPP_BUILTINS): Remove
	64-bit integer handling.
	* doc/invoke.texi (Option Summary): Remove -mint64 for
	mips.

From-SVN: r99337

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9a94371..108a559 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,14 @@
+2005-05-06  Eric Christopher  <echristo@redhat.com>
+
+       * config/mips/mips.opt: Remove -mint64 option.
+       * config/mips/mips.c (override_options): Remove -mint64
+       handling.
+       * config/mips/mips.h (INT_TYPE_SIZE): Define to 32.
+       * config/mips/linux.h (TARGET_OS_CPP_BUILTINS): Remove
+       64-bit integer handling.
+       * doc/invoke.texi (Option Summary): Remove -mint64 for
+       mips.
+
 2005-05-06  Zdenek Dvorak  <dvorakz@suse.cz>
 
        PR tree-optimization/19401

diff --git a/gcc/config/mips/linux.h b/gcc/config/mips/linux.h
index 47e24b6..24e4f0b 100644 (file)
--- a/gcc/config/mips/linux.h
+++ b/gcc/config/mips/linux.h
@@ -54,48 +54,45 @@ Boston, MA 02111-1307, USA.  */
 #define TARGET_DEFAULT MASK_ABICALLS
 
 #define TARGET_OS_CPP_BUILTINS()                               \
-    do {                                                       \
-       LINUX_TARGET_OS_CPP_BUILTINS();                         \
-       if (TARGET_ABICALLS)                                    \
-         {                                                     \
-           builtin_define ("__PIC__");                         \
-           builtin_define ("__pic__");                         \
-         }                                                     \
-       /* The GNU C++ standard library requires this.  */      \
-       if (c_dialect_cxx ())                                   \
-         builtin_define ("_GNU_SOURCE");                       \
-                                                               \
-      if (mips_abi == ABI_N32)                                 \
+  do {                                                         \
+    LINUX_TARGET_OS_CPP_BUILTINS();                            \
+    if (TARGET_ABICALLS)                                       \
+      {                                                                \
+       builtin_define ("__PIC__");                             \
+       builtin_define ("__pic__");                             \
+      }                                                                \
+    /* The GNU C++ standard library requires this.  */         \
+    if (c_dialect_cxx ())                                      \
+      builtin_define ("_GNU_SOURCE");                          \
+                                                               \
+    if (mips_abi == ABI_N32)                                   \
       {                                                                \
         builtin_define ("_ABIN32=2");                          \
         builtin_define ("_MIPS_SIM=_ABIN32");                  \
         builtin_define ("_MIPS_SZLONG=32");                    \
         builtin_define ("_MIPS_SZPTR=32");                     \
       }                                                                \
-     else if (mips_abi == ABI_64)                              \
+    else if (mips_abi == ABI_64)                               \
       {                                                                \
         builtin_define ("_ABI64=3");                           \
         builtin_define ("_MIPS_SIM=_ABI64");                   \
         builtin_define ("_MIPS_SZLONG=64");                    \
         builtin_define ("_MIPS_SZPTR=64");                     \
       }                                                                \
-     else                                                      \
+    else                                                       \
       {                                                                \
-       builtin_define ("_ABIO32=1");                   \
-       builtin_define ("_MIPS_SIM=_ABIO32");           \
+       builtin_define ("_ABIO32=1");                           \
+       builtin_define ("_MIPS_SIM=_ABIO32");                   \
         builtin_define ("_MIPS_SZLONG=32");                    \
         builtin_define ("_MIPS_SZPTR=32");                     \
       }                                                                \
-     if (TARGET_FLOAT64)                                       \
-        builtin_define ("_MIPS_FPSET=32");                     \
-     else                                                      \
-        builtin_define ("_MIPS_FPSET=16");                     \
-                                                               \
-     if (TARGET_INT64)                                         \
-        builtin_define ("_MIPS_SZINT=64");                     \
-     else                                                      \
-        builtin_define ("_MIPS_SZINT=32");                     \
-} while (0)
+    if (TARGET_FLOAT64)                                                \
+      builtin_define ("_MIPS_FPSET=32");                       \
+    else                                                       \
+      builtin_define ("_MIPS_FPSET=16");                       \
+                                                               \
+    builtin_define ("_MIPS_SZINT=32");                         \
+  } while (0)
 
 #undef  SUBTARGET_CPP_SPEC
 #define SUBTARGET_CPP_SPEC "%{pthread:-D_REENTRANT}"

diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c
index 84576b2..afc69ea 100644 (file)
--- a/gcc/config/mips/mips.c
+++ b/gcc/config/mips/mips.c
@@ -4336,25 +4336,12 @@ override_options (void)
 
   if ((target_flags_explicit & MASK_LONG64) == 0)
     {
-      if (TARGET_INT64)
-       target_flags |= MASK_LONG64;
-      /* If no type size setting options (-mlong64,-mint64,-mlong32)
-        were used, then set the type sizes.  In the EABI in 64 bit mode,
-        longs and pointers are 64 bits.  Likewise for the SGI Irix6 N64
-        ABI.  */
-      else if ((mips_abi == ABI_EABI && TARGET_64BIT) || mips_abi == ABI_64)
+      if ((mips_abi == ABI_EABI && TARGET_64BIT) || mips_abi == ABI_64)
        target_flags |= MASK_LONG64;
       else
        target_flags &= ~MASK_LONG64;
     }
 
-  /* Deprecate -mint64. Remove after 4.0 branches.  */
-  if (TARGET_INT64)
-    warning (0, "-mint64 is a deprecated option");
-
-  if (TARGET_INT64 && !TARGET_LONG64)
-    error ("unsupported combination: %s", "-mint64 -mlong32");
-
   if (MIPS_MARCH_CONTROLS_SOFT_FLOAT
       && (target_flags_explicit & MASK_SOFT_FLOAT) == 0)
     {

diff --git a/gcc/config/mips/mips.h b/gcc/config/mips/mips.h
index f81e7e9..bca317c 100644 (file)
--- a/gcc/config/mips/mips.h
+++ b/gcc/config/mips/mips.h
@@ -970,7 +970,7 @@ extern const struct mips_cpu_info *mips_tune_info;
 
 /* Set the sizes of the core types.  */
 #define SHORT_TYPE_SIZE 16
-#define INT_TYPE_SIZE (TARGET_INT64 ? 64 : 32)
+#define INT_TYPE_SIZE 32
 #define LONG_TYPE_SIZE (TARGET_LONG64 ? 64 : 32)
 #define LONG_LONG_TYPE_SIZE 64
 

diff --git a/gcc/config/mips/mips.opt b/gcc/config/mips/mips.opt
index 1db377e..cb78b8e 100644 (file)
--- a/gcc/config/mips/mips.opt
+++ b/gcc/config/mips/mips.opt
@@ -133,10 +133,6 @@ mhard-float
 Target Report RejectNegative InverseMask(SOFT_FLOAT, HARD_FLOAT)
 Allow the use of hardware floating-point instructions
 
-mint64
-Target Report RejectNegative Mask(INT64)
-Use a 64-bit int type
-
 mips
 Target RejectNegative Joined
 -mipsN Generate code for ISA level N

diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index f9acaeb..632b4bb 100644 (file)
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -560,7 +560,7 @@ Objective-C and Objective-C++ Dialects}.
 -mxgot  -mno-xgot  -mgp32  -mgp64  -mfp32  -mfp64 @gol
 -mhard-float  -msoft-float  -msingle-float  -mdouble-float @gol
 -mpaired-single  -mips3d @gol
--mint64  -mlong64  -mlong32  -msym32  -mno-sym32 @gol
+-mlong64  -mlong32  -msym32  -mno-sym32 @gol
 -G@var{num}  -membedded-data  -mno-embedded-data @gol
 -muninit-const-in-rodata  -mno-uninit-const-in-rodata @gol
 -msplit-addresses  -mno-split-addresses  @gol