summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog7
-rw-r--r--debian/rules.patch4
-rw-r--r--debian/rules218
3 files changed, 20 insertions, 9 deletions
diff --git a/debian/changelog b/debian/changelog
index b034bf4..a47fc85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,17 @@
gcc-5 (5.2.1-17) UNRELEASED; urgency=medium
+ [ Matthias Klose ]
* Build-depend on linux-libc-dev [m68k] for gcc and gcc-snapshot builds.
Closes: #796906.
* Don't ignore anymore bootstrap comparison failures on sh4. Closes: #796939.
* Fix stage1 cross build for KFreeBSD. Closes: #796901.
+ [ Aurelien Jarno ]
+ * Use --with-mips-plt on mips*.
+ * Build for R2 ISA on mips, mips64 and mips64el.
+ * Optimize for R2 ISA on mipsel.
+ * Only apply mips-fix-loongson2f-nop on mipsel.
+
-- Matthias Klose <doko@debian.org> Mon, 07 Sep 2015 21:51:27 +0200
gcc-5 (5.2.1-16) unstable; urgency=medium
diff --git a/debian/rules.patch b/debian/rules.patch
index 092fcfc..f1975d3 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -310,7 +310,9 @@ ifneq (,$(filter $(derivative),Ubuntu))
else # Debian
#debian_patches += gcc-as-needed
endif
-debian_patches += mips-fix-loongson2f-nop
+ifeq ($(DEB_TARGET_ARCH),mipsel)
+ debian_patches += mips-fix-loongson2f-nop
+endif
debian_patches += libgomp-kfreebsd-testsuite
debian_patches += go-testsuite
# FIXME: Still relevant?
diff --git a/debian/rules2 b/debian/rules2
index ddddf76..efec45d 100644
--- a/debian/rules2
+++ b/debian/rules2
@@ -585,21 +585,23 @@ ifneq (,$(filter $(DEB_TARGET_ARCH), amd64 i386 hurd-i386 kfreebsd-i386 kfreebsd
endif
ifneq (,$(findstring mips-linux,$(DEB_TARGET_GNU_TYPE)))
- CONFARGS += --with-arch-32=mips2 --with-tune-32=mips32 --with-fp-32=xx
+ CONFARGS += --with-mips-plt
+ CONFARGS += --with-arch-32=mips32r2 --with-fp-32=xx
ifeq ($(multilib),yes)
ifeq ($(biarchn32)-$(biarch64),yes-yes)
CONFARGS += --enable-targets=all
- CONFARGS += --with-arch-64=mips3 --with-tune-64=mips64
+ CONFARGS += --with-arch-64=mips64r2
endif
endif
endif
ifneq (,$(findstring mipsel-linux,$(DEB_TARGET_GNU_TYPE)))
- CONFARGS += --with-arch-32=mips2 --with-tune-32=mips32 --with-fp-32=xx
+ CONFARGS += --with-mips-plt
+ CONFARGS += --with-arch-32=mips2 --with-tune-32=mips32r2 --with-fp-32=xx
ifeq ($(multilib),yes)
ifeq ($(biarchn32)-$(biarch64),yes-yes)
CONFARGS += --enable-targets=all
- CONFARGS += --with-arch-64=mips3 --with-tune-64=mips64
+ CONFARGS += --with-arch-64=mips3 --with-tune-64=mips64r2
endif
endif
endif
@@ -629,22 +631,22 @@ endif
ifneq (,$(findstring mips64el-linux-gnuabi64,$(DEB_TARGET_GNU_TYPE)))
CONFARGS += --with-mips-plt
- CONFARGS += --with-arch-64=mips64 --with-tune-64=mips64r2
+ CONFARGS += --with-arch-64=mips64r2
ifeq ($(multilib),yes)
ifeq ($(biarchn32)-$(biarch32),yes-yes)
CONFARGS += --enable-targets=all
- CONFARGS += --with-arch-32=mips2 --with-tune-32=mips32 --with-fp-32=xx
+ CONFARGS += --with-arch-32=mips32r2 --with-fp-32=xx
endif
endif
endif
ifneq (,$(findstring mips64-linux-gnuabi64,$(DEB_TARGET_GNU_TYPE)))
CONFARGS += --with-mips-plt
- CONFARGS += --with-arch-64=mips3 --with-tune-64=mips64
+ CONFARGS += --with-arch-64=mips64r2
ifeq ($(multilib),yes)
ifeq ($(biarchn32)-$(biarch32),yes-yes)
CONFARGS += --enable-targets=all
- CONFARGS += --with-arch-32=mips2 --with-tune-32=mips32 --with-fp-32=xx
+ CONFARGS += --with-arch-32=mips32r2 --with-fp-32=xx
endif
endif
endif