Bug#692140: gcc-defaults: Patch for x32 support
Source: gcc-defaults
Version: 1.120
Severity: wishlist
User: debian-x32@lists.debian.org
Usertags: port-x32 ftbfs-x32
Here's the patch I'm using to add x32 support to gcc-defaults.
--
Daniel Schepler
diff -Nru gcc-defaults-1.120/debian/changelog gcc-defaults-1.120+x32/debian/changelog
--- gcc-defaults-1.120/debian/changelog 2012-09-26 16:58:31.000000000 -0700
+++ gcc-defaults-1.120+x32/debian/changelog 2012-11-01 12:11:40.000000000 -0700
@@ -1,3 +1,9 @@
+gcc-defaults (1.120+x32) UNRELEASED; urgency=low
+
+ * Add support for x32.
+
+ -- Daniel Schepler <schepler@debian.org> Thu, 01 Nov 2012 12:11:32 -0700
+
gcc-defaults (1.120) unstable; urgency=low
* Bump GCC 4.7 versions to 4.7.2.
diff -Nru gcc-defaults-1.120/debian/control gcc-defaults-1.120+x32/debian/control
--- gcc-defaults-1.120/debian/control 2012-05-07 08:33:25.000000000 -0700
+++ gcc-defaults-1.120+x32/debian/control 2012-11-01 12:16:03.000000000 -0700
@@ -4,7 +4,7 @@
Maintainer: Debian GCC Maintainers <debian-gcc@lists.debian.org>
Uploaders: Matthias Klose <doko@debian.org>
Standards-Version: 3.9.3
-Build-Depends: m4, debhelper (>= 5), dpkg-dev (>= 1.16.0~ubuntu4), gcj-4.7-base (>= 4.7.0~) [!arm !m68k], gcc-4.6-base (>= 4.6.1~) [!m68k], gcc-4.7-base [amd64 i386], lsb-release
+Build-Depends: m4, debhelper (>= 5), dpkg-dev (>= 1.16.0~ubuntu4), gcj-4.7-base (>= 4.7.0~) [!arm !m68k], gcc-4.6-base (>= 4.6.1~) [!m68k !x32], gcc-4.7-base [amd64 i386 x32], lsb-release
Build-Depends-Indep: ca-certificates, gcj-jdk, python (>= 2.6.6)
Vcs-Svn: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-defaults
Vcs-Browser: http://svn.debian.org/viewsvn/gcccvs/branches/sid/gcc-defaults
@@ -40,7 +40,7 @@
Package: g++-multilib
Priority: optional
-Architecture: amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc
+Architecture: amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc 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++.
@@ -63,7 +63,7 @@
Package: gobjc-multilib
Priority: optional
-Architecture: amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc
+Architecture: amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc 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
@@ -88,7 +88,7 @@
Package: gobjc++-multilib
Priority: optional
-Architecture: amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc
+Architecture: amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc 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
@@ -112,7 +112,7 @@
Package: gfortran-multilib
Priority: optional
-Architecture: amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc
+Architecture: amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc 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
@@ -135,7 +135,7 @@
Package: gccgo-multilib
Priority: optional
-Architecture: amd64 i386 mips mipsel powerpc ppc64 s390 s390x
+Architecture: amd64 i386 mips mipsel powerpc ppc64 s390 s390x x32
Depends: cpp (>= ${version:cpp}), gcc-multilib (>= ${version:cpp}), gccgo (>= ${version:gcc}), 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
@@ -251,7 +251,7 @@
Package: gcc-multilib
Priority: optional
-Architecture: amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x s390x sparc
+Architecture: amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x s390x sparc 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]
Description: GNU C compiler (multilib files)
This is the GNU C compiler, a fairly portable optimizing compiler for C.
diff -Nru gcc-defaults-1.120/debian/rules gcc-defaults-1.120+x32/debian/rules
--- gcc-defaults-1.120/debian/rules 2012-09-26 16:47:12.000000000 -0700
+++ gcc-defaults-1.120+x32/debian/rules 2012-11-01 12:14:02.000000000 -0700
@@ -160,9 +160,9 @@
DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-gcc47_archs = alpha amd64 armel armhf hppa i386 ia64 lpia m68k mips mipsel powerpc powerpcspe ppc64 s390 s390x sh4 sparc sparc64 kfreebsd-amd64 kfreebsd-i386 hurd-i386
-gcc47_archs = amd64 i386 kfreebsd-amd64 kfreebsd-i386 hurd-i386
-gcj47_archs = alpha amd64 armel armhf hppa i386 lpia mips mipsel powerpc powerpcspe ppc64 s390 s390x sh4 sparc sparc64 kfreebsd-amd64 kfreebsd-i386 hurd-i386
+gcc47_archs = alpha amd64 armel armhf hppa i386 ia64 lpia m68k mips mipsel powerpc powerpcspe ppc64 s390 s390x sh4 sparc sparc64 x32 kfreebsd-amd64 kfreebsd-i386 hurd-i386
+gcc47_archs = amd64 i386 x32 kfreebsd-amd64 kfreebsd-i386 hurd-i386
+gcj47_archs = alpha amd64 armel armhf hppa i386 lpia mips mipsel powerpc powerpcspe ppc64 s390 s390x sh4 sparc sparc64 x32 kfreebsd-amd64 kfreebsd-i386 hurd-i386
# CV_XXX is the complete version number, including the release, without epoch
CV_CHILL:= 2.95.4-$(REL_NO_295)
@@ -257,9 +257,9 @@
LIBGCJ_SONAME = 13
endif
-gcj_archs = alpha amd64 armel armhf hppa i386 ia64 lpia m68k mips mipsel powerpc powerpcspe ppc64 s390 s390x sh4 sparc sparc64 kfreebsd-amd64 kfreebsd-i386 hurd-i386
-gcj_native_archs = alpha amd64 armel armhf hppa i386 ia64 lpia mips mipsel powerpc powerpcspe ppc64 s390 s390x sh4 sparc sparc64 kfreebsd-amd64 kfreebsd-i386 hurd-i386
-multilib_archs = amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc
+gcj_archs = alpha amd64 armel armhf hppa i386 ia64 lpia m68k mips mipsel powerpc powerpcspe ppc64 s390 s390x sh4 sparc sparc64 x32 kfreebsd-amd64 kfreebsd-i386 hurd-i386
+gcj_native_archs = alpha amd64 armel armhf hppa i386 ia64 lpia mips mipsel powerpc powerpcspe ppc64 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 x32
ifneq (,$(filter $(DEB_HOST_ARCH), $(multilib_archs)))
with_multilib = yes
@@ -270,7 +270,7 @@
with_gfdl_docs := yes
endif
-go_archs = amd64 armel armhf i386 ia64 mips mipsel powerpc ppc64 s390 s390x
+go_archs = amd64 armel armhf i386 ia64 mips mipsel powerpc ppc64 s390 s390x x32
ifeq (,$(filter $(DEB_HOST_ARCH),$(go_archs)))
no_packages += gccgo
endif
@@ -286,12 +286,12 @@
endif
no_packages += gpc gpc-doc
-gdc_no_archs = alpha armel armhf hppa ia64 m68k mips mipsel powerpc powerpcspe ppc64 s390 s390x sh4 sparc sparc64 hurd-i386
+gdc_no_archs = alpha armel armhf hppa ia64 m68k mips mipsel powerpc powerpcspe ppc64 s390 s390x sh4 sparc sparc64 x32 hurd-i386
ifneq (,$(filter $(DEB_HOST_ARCH),$(gdc_no_archs)))
no_packages += gdc
endif
-gdc1_no_archs := hurd-i386
+gdc1_no_archs := hurd-i386 x32
ifneq (,$(filter $(DEB_HOST_ARCH),$(gdc1_no_archs)))
no_packages += gdc-v1
endif
Reply to: