From 6670e24aed1ca66f21a6af759a0d156bb3df1739 Mon Sep 17 00:00:00 2001 From: Duane Sand Date: Tue, 22 Jul 2014 14:34:00 -0700 Subject: [MIPS] Unite mipsel and mips64el 4.9 gcc toolchains Use 4.9 mips64el toolchain for both 64- and 32-bit builds. Tell ld when 32-bit links are required. Override 4.9's changed defaults for mips floating point register use, to get same assembler rules as 4.8 and earlier. Also: drop unused soft-fp build targets, cleanout redundant compiler options, and remove extraneous Android.mk file. Change-Id: I86f1075266349edb2b08a7709b9f5472d8cfda32 --- core/combo/arch/mips/mips32-fp.mk | 8 +++----- core/combo/arch/mips/mips32.mk | 12 ------------ core/combo/arch/mips/mips32r2-fp-xburst.mk | 8 +++----- core/combo/arch/mips/mips32r2-fp.mk | 8 +++----- core/combo/arch/mips/mips32r2.mk | 13 ------------- core/combo/arch/mips/mips32r2dsp-fp.mk | 8 +++----- core/combo/arch/mips/mips32r2dsp.mk | 17 ----------------- core/combo/arch/mips/mips32r2dspr2-fp.mk | 8 +++----- core/combo/arch/mips/mips32r2dspr2.mk | 17 ----------------- core/combo/arch/mips64/mips64r2.mk | 8 ++------ 10 files changed, 17 insertions(+), 90 deletions(-) delete mode 100644 core/combo/arch/mips/mips32.mk delete mode 100644 core/combo/arch/mips/mips32r2.mk delete mode 100644 core/combo/arch/mips/mips32r2dsp.mk delete mode 100644 core/combo/arch/mips/mips32r2dspr2.mk (limited to 'core/combo/arch') diff --git a/core/combo/arch/mips/mips32-fp.mk b/core/combo/arch/mips/mips32-fp.mk index e60bdac..8320e93 100644 --- a/core/combo/arch/mips/mips32-fp.mk +++ b/core/combo/arch/mips/mips32-fp.mk @@ -4,11 +4,9 @@ ARCH_MIPS_HAS_FPU :=true ARCH_HAVE_ALIGNED_DOUBLES :=true arch_variant_cflags := \ - -EL \ - -march=mips32 \ - -mtune=mips32 \ -mips32 \ - -mhard-float + -mfp32 \ + -modd-spreg \ arch_variant_ldflags := \ - -EL + -Wl,-melf32ltsmip diff --git a/core/combo/arch/mips/mips32.mk b/core/combo/arch/mips/mips32.mk deleted file mode 100644 index 35ef0d8..0000000 --- a/core/combo/arch/mips/mips32.mk +++ /dev/null @@ -1,12 +0,0 @@ -# Configuration for Android on MIPS. -# Generating binaries for MIPS32/soft-float/little-endian - -arch_variant_cflags := \ - -EL \ - -march=mips32 \ - -mtune=mips32 \ - -mips32 \ - -msoft-float - -arch_variant_ldflags := \ - -EL diff --git a/core/combo/arch/mips/mips32r2-fp-xburst.mk b/core/combo/arch/mips/mips32r2-fp-xburst.mk index 8b0fef1..2b4f714 100644 --- a/core/combo/arch/mips/mips32r2-fp-xburst.mk +++ b/core/combo/arch/mips/mips32r2-fp-xburst.mk @@ -5,13 +5,11 @@ ARCH_MIPS_HAS_FPU :=true ARCH_HAVE_ALIGNED_DOUBLES :=true arch_variant_cflags := \ - -EL \ - -march=mips32r2 \ - -mtune=mips32r2 \ -mips32r2 \ - -mhard-float \ + -mfp32 \ + -modd-spreg \ -mno-fused-madd \ -Wa,-mmxu arch_variant_ldflags := \ - -EL + -Wl,-melf32ltsmip diff --git a/core/combo/arch/mips/mips32r2-fp.mk b/core/combo/arch/mips/mips32r2-fp.mk index 08d91df..9acb018 100644 --- a/core/combo/arch/mips/mips32r2-fp.mk +++ b/core/combo/arch/mips/mips32r2-fp.mk @@ -4,12 +4,10 @@ ARCH_MIPS_HAS_FPU :=true ARCH_HAVE_ALIGNED_DOUBLES :=true arch_variant_cflags := \ - -EL \ - -march=mips32r2 \ - -mtune=mips32r2 \ -mips32r2 \ - -mhard-float \ + -mfp32 \ + -modd-spreg \ -msynci arch_variant_ldflags := \ - -EL + -Wl,-melf32ltsmip diff --git a/core/combo/arch/mips/mips32r2.mk b/core/combo/arch/mips/mips32r2.mk deleted file mode 100644 index 16ce76f..0000000 --- a/core/combo/arch/mips/mips32r2.mk +++ /dev/null @@ -1,13 +0,0 @@ -# Configuration for Android on MIPS. -# Generating binaries for MIPS32R2/soft-float/little-endian - -arch_variant_cflags := \ - -EL \ - -march=mips32r2 \ - -mtune=mips32r2 \ - -mips32r2 \ - -msoft-float \ - -msynci - -arch_variant_ldflags := \ - -EL diff --git a/core/combo/arch/mips/mips32r2dsp-fp.mk b/core/combo/arch/mips/mips32r2dsp-fp.mk index fe2b1fe..c4b49b6 100644 --- a/core/combo/arch/mips/mips32r2dsp-fp.mk +++ b/core/combo/arch/mips/mips32r2dsp-fp.mk @@ -6,13 +6,11 @@ ARCH_MIPS_DSP_REV :=1 ARCH_MIPS_HAS_FPU :=true ARCH_HAVE_ALIGNED_DOUBLES :=true arch_variant_cflags := \ - -EL \ - -march=mips32r2 \ - -mtune=mips32r2 \ -mips32r2 \ - -mhard-float \ + -mfp32 \ + -modd-spreg \ -mdsp \ -msynci arch_variant_ldflags := \ - -EL + -Wl,-melf32ltsmip diff --git a/core/combo/arch/mips/mips32r2dsp.mk b/core/combo/arch/mips/mips32r2dsp.mk deleted file mode 100644 index 8a8976c..0000000 --- a/core/combo/arch/mips/mips32r2dsp.mk +++ /dev/null @@ -1,17 +0,0 @@ -# Configuration for Android on MIPS. -# Generating binaries for MIPS32R2/soft-float/little-endian/dsp - -ARCH_MIPS_HAS_DSP :=true -ARCH_MIPS_DSP_REV :=1 - -arch_variant_cflags := \ - -EL \ - -march=mips32r2 \ - -mtune=mips32r2 \ - -mips32r2 \ - -msoft-float \ - -mdsp \ - -msynci - -arch_variant_ldflags := \ - -EL diff --git a/core/combo/arch/mips/mips32r2dspr2-fp.mk b/core/combo/arch/mips/mips32r2dspr2-fp.mk index 7e882b3..8b05ffc 100644 --- a/core/combo/arch/mips/mips32r2dspr2-fp.mk +++ b/core/combo/arch/mips/mips32r2dspr2-fp.mk @@ -6,13 +6,11 @@ ARCH_MIPS_DSP_REV :=2 ARCH_MIPS_HAS_FPU :=true ARCH_HAVE_ALIGNED_DOUBLES :=true arch_variant_cflags := \ - -EL \ - -march=mips32r2 \ - -mtune=mips32r2 \ -mips32r2 \ - -mhard-float \ + -mfp32 \ + -modd-spreg \ -mdspr2 \ -msynci arch_variant_ldflags := \ - -EL + -Wl,-melf32ltsmip diff --git a/core/combo/arch/mips/mips32r2dspr2.mk b/core/combo/arch/mips/mips32r2dspr2.mk deleted file mode 100644 index c311523..0000000 --- a/core/combo/arch/mips/mips32r2dspr2.mk +++ /dev/null @@ -1,17 +0,0 @@ -# Configuration for Android on MIPS. -# Generating binaries for MIPS32R2/soft-float/little-endian/dsp - -ARCH_MIPS_HAS_DSP :=true -ARCH_MIPS_DSP_REV :=2 - -arch_variant_cflags := \ - -EL \ - -march=mips32r2 \ - -mtune=mips32r2 \ - -mips32r2 \ - -msoft-float \ - -mdspr2 \ - -msynci - -arch_variant_ldflags := \ - -EL diff --git a/core/combo/arch/mips64/mips64r2.mk b/core/combo/arch/mips64/mips64r2.mk index 298aeaf..c5710d0 100644 --- a/core/combo/arch/mips64/mips64r2.mk +++ b/core/combo/arch/mips64/mips64r2.mk @@ -1,14 +1,10 @@ # Configuration for Android on mips64r2. +# This target is for temporary use only, until mips64r6 is supported by Android's qemu. + ARCH_MIPS_HAS_FPU :=true ARCH_HAVE_ALIGNED_DOUBLES :=true arch_variant_cflags := \ - -EL \ - -march=mips64r2 \ - -mtune=mips64r2 \ -mips64r2 \ - -mhard-float \ -msynci -arch_variant_ldflags := \ - -EL -- cgit v1.1