From 13529ec2ea537588e4778697251370cea95d176d Mon Sep 17 00:00:00 2001
From: lloyd <lloyd@randombit.net>
Date: Mon, 10 Aug 2009 05:07:15 +0000
Subject: Use the default ABI instead of forcing n32 for mips32 systems. This
 was something that for whatever reason that I have long since forogotten was
 a good idea on IRIX running MIPS circa a decade ago, but was reported to
 cause problems on the Debian builds.

Add mipsel as an alias for the mips32 architecture for Debian.

The mips32 submodel names were badly typoed and did not work
correctly.

Remove the leading mips32- and mips64- from MIPS submodel names.
---
 src/build-data/arch/mips32 | 17 ++++++++---------
 src/build-data/arch/mips64 | 36 +++++++++++++-----------------------
 src/build-data/cc/gcc      |  1 -
 3 files changed, 21 insertions(+), 33 deletions(-)

(limited to 'src/build-data')

diff --git a/src/build-data/arch/mips32 b/src/build-data/arch/mips32
index a07a0a145..9846c8fb2 100644
--- a/src/build-data/arch/mips32
+++ b/src/build-data/arch/mips32
@@ -4,20 +4,19 @@ default_submodel r3000
 
 <aliases>
 mips
+mipsel # For Debian
 </aliases>
 
 <submodels>
-mip32-r3000
-mip32-r6000
+r3000
+r6000
 </submodels>
 
 <submodel_aliases>
-r3k -> mips32-r3000
-r6k -> mips32-r6000
+r3k -> r3000
+r6k -> r6000
 
-r3000 -> mips32-r3000
-r6000 -> mips32-r6000
-
-mipsbe -> mips3000 # For RPM
-mipsle -> mips3000 # For RPM
+# These are for RPM
+mipsbe -> r3000
+mipsle -> r3000
 </submodel_aliases>
diff --git a/src/build-data/arch/mips64 b/src/build-data/arch/mips64
index 228083848..dbb49d028 100644
--- a/src/build-data/arch/mips64
+++ b/src/build-data/arch/mips64
@@ -3,30 +3,20 @@ realname "MIPS64"
 default_submodel r4400
 
 <submodels>
-mips64-r4000
-mips64-r4100
-mips64-r4300
-mips64-r4400
-mips64-r4600
-mips64-r4560
-mips64-r5000
-mips64-r8000
-mips64-r10000
+r4000
+r4100
+r4300
+r4400
+r4600
+r4560
+r5000
+r8000
+r10000
 </submodels>
 
 <submodel_aliases>
-r4k -> mips64-r4000
-r5k -> mips64-r5000
-r8k -> mips64-r8000
-r10k -> mips64-r10000
-
-r4000  -> mips64-r4000
-r4100  -> mips64-r4100
-r4300  -> mips64-r4300
-r4400  -> mips64-r4400
-r4600  -> mips64-r4600
-r4560  -> mips64-r4560
-r5000  -> mips64-r5000
-r8000  -> mips64-r8000
-r10000 -> mips64-r10000
+r4k -> r4000
+r5k -> r5000
+r8k -> r8000
+r10k -> r10000
 </submodel_aliases>
diff --git a/src/build-data/cc/gcc b/src/build-data/cc/gcc
index 30576eb72..978ed6d58 100644
--- a/src/build-data/cc/gcc
+++ b/src/build-data/cc/gcc
@@ -73,7 +73,6 @@ ppc64     -> "-mcpu=SUBMODEL" ppc
 # Note that the 'linking' bit means "use this for both compiling *and* linking"
 <mach_abi_linking>
 amd64   -> "-m64"
-mips32  -> "-mabi=n32"
 mips64  -> "-mabi=64"
 s390    -> "-m31"
 s390x   -> "-m64"
-- 
cgit v1.2.3