[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#773177: gcc-defaults: enable multilib on mips64*



Source: gcc-defaults
Version: 1.135
Severity: important
Tags: patch

Hi,

This patch enables multilib on mips64 and mips64el. Currently gcc-4.9
build-depends on g++-multilib on mips64el, but that package isn't built
by gcc-defaults.

While I was doing the modifications, I also enabled gccgo on mips64
since it's built by gcc-4.9 as well. I didn't enable gcj in the
gcj_archs field because gcj seems to be broken on mips64el (I haven't
investigated why).

Thanks,
James
From 55efad3ed9530dbfddce85bfce8cc272f162363e Mon Sep 17 00:00:00 2001
From: James Cowgill <james410@cowgill.org.uk>
Date: Mon, 15 Dec 2014 10:39:41 +0000
Subject: [PATCH] Add mips64 and mips64el to gcc-defaults

---
 debian/control | 12 ++++++------
 debian/rules   |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/debian/control b/debian/control
index 07beb43..bef210f 100644
--- a/debian/control
+++ b/debian/control
@@ -44,7 +44,7 @@ Description: GNU C++ compiler
 
 Package: g++-multilib
 Priority: optional
-Architecture: amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc sparc64 x32
+Architecture: amd64 i386 kfreebsd-amd64 mips mips64 mips64el mipsel powerpc ppc64 s390 s390x sparc sparc64 x32
 Depends: cpp (>= ${version:cpp}), gcc-multilib (>= ${version:cpp}), g++ (>= ${version:cpp}), g++-${pv:gpp}-multilib ${reqv:gpp}, ${misc:Depends}
 Description: GNU C++ compiler (multilib files)
  This is the GNU C++ compiler, a fairly portable optimizing compiler for C++.
@@ -67,7 +67,7 @@ Description: GNU Objective-C compiler
 
 Package: gobjc-multilib
 Priority: optional
-Architecture: amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc sparc64 x32
+Architecture: amd64 i386 kfreebsd-amd64 mips mips64 mips64el mipsel powerpc ppc64 s390 s390x sparc sparc64 x32
 Depends: cpp (>= ${version:cpp}), gcc-multilib (>= ${version:cpp}), gobjc (>= ${version:gcc}), gobjc-${pv:gobjc}-multilib ${reqv:gobjc}, ${misc:Depends}
 Description: GNU Objective-C compiler (multilib files)
  This is the GNU Objective-C compiler, which compiles Objective-C on
@@ -92,7 +92,7 @@ Description: GNU Objective-C++ compiler
 
 Package: gobjc++-multilib
 Priority: optional
-Architecture: amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc sparc64 x32
+Architecture: amd64 i386 kfreebsd-amd64 mips mipsel mips64 mips64el powerpc ppc64 s390 s390x sparc sparc64 x32
 Depends: cpp (>= ${version:cpp}), gobjc-multilib (>= ${version:cpp}), gobjc++ (>= ${version:gcc}), gobjc++-${pv:gobjcxx}-multilib ${reqv:gobjcxx}, ${misc:Depends}
 Description: GNU Objective-C++ compiler (multilib files)
  This is the GNU Objective-C++ compiler, which compiles Objective-C++ on
@@ -116,7 +116,7 @@ Description: GNU Fortran 95 compiler
 
 Package: gfortran-multilib
 Priority: optional
-Architecture: amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc sparc64 x32
+Architecture: amd64 i386 kfreebsd-amd64 mips mips64 mips64el mipsel powerpc ppc64 s390 s390x sparc sparc64 x32
 Depends: cpp (>= ${version:cpp}), gcc-multilib (>= ${version:cpp}), gfortran (>= ${version:gcc}), gfortran-${pv:gfort}-multilib ${reqv:gfort}, ${misc:Depends}
 Description: GNU Fortran 95 compiler (multilib files)
  This is the GNU Fortran compiler, which compiles Fortran 95 on platforms
@@ -139,7 +139,7 @@ Description: Go compiler, based on the GCC backend
 
 Package: gccgo-multilib
 Priority: optional
-Architecture: amd64 i386 mips mipsel powerpc ppc64 s390 s390x x32
+Architecture: amd64 i386 mips mips64 mips64el mipsel powerpc ppc64 s390 s390x x32
 Depends: cpp (>= ${version:cpp}), gcc-multilib (>= ${version:cpp}), gccgo (>= ${version:ggo}), gccgo-${pv:ggo}-multilib ${reqv:ggo}, ${misc:Depends}
 Description: Go compiler, based on the GCC backend (multilib files)
  This is the GNU Go compiler, which compiles Go on platforms supported by
@@ -239,7 +239,7 @@ Description: GNU C compiler
 
 Package: gcc-multilib
 Priority: optional
-Architecture: amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x s390x sparc sparc64 x32
+Architecture: amd64 i386 kfreebsd-amd64 mips mips64 mips64el mipsel powerpc ppc64 s390 s390x s390x sparc sparc64 x32
 Depends: cpp (>= ${version:cpp}), gcc (>= ${version:gcc}), gcc-${pv:gcc}-multilib ${reqv:gcc}, ${misc:Depends}, linux-libc-dev (>= 3.0.0-2) [linux-any]
 Breaks: gcc-4.9-arm-linux-gnueabihf, gcc-4.9-arm-linux-gnueabi, gcc-4.9-powerpc-linux-gnu, gcc-4.9-powerpc64el-linux-gnu, gcc-4.9-mipsel-linux-gnu
 Description: GNU C compiler (multilib files)
diff --git a/debian/rules b/debian/rules
index 59bf438..b1b689a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -259,10 +259,10 @@ gcj_native_archs = alpha amd64 armel armhf arm64 hppa i386 ia64 mips mipsel \
 	powerpc powerpcspe ppc64 ppc64el s390 s390x sh4 sparc sparc64 x32 \
 	kfreebsd-amd64 kfreebsd-i386 hurd-i386
 
-multilib_archs = amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 \
-	s390 s390x sparc sparc64 x32
+multilib_archs = amd64 i386 kfreebsd-amd64 mips mips64 mips64el mipsel \
+	powerpc ppc64 s390 s390x sparc sparc64 x32
 
-go_archs = amd64 arm64 armel armhf i386 ia64 mips mipsel \
+go_archs = amd64 arm64 armel armhf i386 ia64 mips mips64 mips64el mipsel \
 	powerpc ppc64 ppc64el s390 s390x x32
 
 phobos_archs = amd64 armel armhf i386 x32 hppa
-- 
2.1.3


Reply to: