diff -u gmp-4.3.2+dfsg/debian/control gmp-4.3.2+dfsg/debian/control --- gmp-4.3.2+dfsg/debian/control +++ gmp-4.3.2+dfsg/debian/control @@ -3,17 +3,18 @@ Section: libs Priority: optional Build-Depends: m4, debhelper (>= 7), quilt, gcc-multilib [amd64 kfreebsd-amd64 powerpc ppc64], g++-multilib [amd64 kfreebsd-amd64 powerpc ppc64] -Maintainer: Debian Scientific Computing Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Scientific Computing Team Uploaders: Steve M. Robbins Vcs-Browser: http://svn.debian.org/wsvn/pkg-scicomp/gmp/trunk/?rev=0&sc=0 Vcs-Svn: svn://svn.debian.org/svn/pkg-scicomp/gmp/trunk -Standards-Version: 3.8.1 +Standards-Version: 3.8.4 Package: libgmp3c2 Section: libs Priority: optional Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: libgmp3, libgmp2 (<< 2.0.2-10) Replaces: libgmp3 Description: Multiprecision arithmetic library @@ -28,7 +29,7 @@ Section: libs Priority: optional Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: libgmp3, libgmpxx4 Replaces: libgmp3 Description: Multiprecision arithmetic library (C++ bindings) @@ -40,7 +41,7 @@ Section: libdevel Priority: optional Architecture: any -Depends: libgmp3c2 (= ${binary:Version}), libgmpxx4ldbl (= ${binary:Version}) +Depends: libgmp3c2 (= ${binary:Version}), libgmpxx4ldbl (= ${binary:Version}), ${misc:Depends} Replaces: libgmp2-dev Conflicts: libgmp2-dev Recommends: libstdc++-dev @@ -60,7 +61,7 @@ Section: libs Priority: optional Architecture: amd64 ppc64 kfreebsd-amd64 -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: libc6-i386 (<= 2.9-18) Description: Multiprecision arithmetic library (32bit) GNU MP is a programmer's library for arbitrary precision @@ -75,7 +76,7 @@ Section: libs Priority: optional Architecture: amd64 ppc64 kfreebsd-amd64 -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: libc6-i386 (<= 2.9-18) Description: Multiprecision arithmetic library (C++ bindings, 32bit) GNU MP is a programmer's library for arbitrary precision @@ -87,7 +88,7 @@ Section: libdevel Priority: optional Architecture: amd64 ppc64 kfreebsd-amd64 -Depends: libgmp3-dev (= ${binary:Version}), lib32gmp3 (= ${binary:Version}), lib32gmpxx4 (= ${binary:Version}) +Depends: libgmp3-dev (= ${binary:Version}), lib32gmp3 (= ${binary:Version}), lib32gmpxx4 (= ${binary:Version}), ${misc:Depends} Suggests: libgmp3-doc, libmpfr-dev Conflicts: libc6-i386 (<= 2.9-18) Description: Multiprecision arithmetic library developers tools (32bit) @@ -106,7 +107,7 @@ Section: libs Priority: optional Architecture: powerpc -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Description: Multiprecision arithmetic library (64bit library) GNU MP is a programmer's library for arbitrary precision arithmetic (ie, a bignum package). It can operate on signed @@ -120,7 +121,7 @@ Section: libs Priority: optional Architecture: powerpc -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Description: Multiprecision arithmetic library (C++ bindings, 64bit) GNU MP is a programmer's library for arbitrary precision arithmetic (ie, a bignum package). It can operate on signed @@ -131,7 +132,7 @@ Section: libdevel Priority: optional Architecture: powerpc -Depends: libgmp3-dev (= ${binary:Version}), lib64gmp3 (= ${binary:Version}), lib64gmpxx4 (= ${binary:Version}) +Depends: libgmp3-dev (= ${binary:Version}), lib64gmp3 (= ${binary:Version}), lib64gmpxx4 (= ${binary:Version}), ${misc:Depends} Suggests: libgmp3-doc, libmpfr-dev Description: Multiprecision arithmetic library developers tools (64bit) This development package provides the header files and the symbolic @@ -148,6 +149,7 @@ Package: libgmp3-doc Section: doc Priority: optional +Depends: ${misc:Depends} Architecture: all Replaces: libgmp3 (<< 3.1.1-8) Description: Multiprecision arithmetic library example code diff -u gmp-4.3.2+dfsg/debian/rules gmp-4.3.2+dfsg/debian/rules --- gmp-4.3.2+dfsg/debian/rules +++ gmp-4.3.2+dfsg/debian/rules @@ -61,6 +61,10 @@ confflags32 = ABI=32 $(confflags) $(confflags_build) --libdir=/${lib32dir} endif +ifneq (,$(findstring $(DEB_HOST_ARCH), armel)) + CFLAGS += -Wa,--defsym,USES_THUMB=1 +endif + ifneq (,$(findstring $(DEB_HOST_ARCH), powerpc)) EXTRA_INSTALL=install64 m64=-m64 @@ -81,7 +85,6 @@ confflags += $(confflags_build) - get-orig-source: gmp-$(ORIG_SRC_VERSION).tar.gz tar xzf gmp-$(ORIG_SRC_VERSION).tar.gz mv gmp-$(ORIG_SRC_VERSION) gmp-$(ORIG_SRC_VERSION)+dfsg diff -u gmp-4.3.2+dfsg/debian/changelog gmp-4.3.2+dfsg/debian/changelog --- gmp-4.3.2+dfsg/debian/changelog +++ gmp-4.3.2+dfsg/debian/changelog @@ -1,3 +1,9 @@ +gmp (2:4.3.2+dfsg-1ubuntu1) lucid; urgency=low + + * Support for thumb2 instructions in arm assembler (LP: #51372) + + -- David Sugar Thu, 25 Feb 2010 07:07:18 -0500 + gmp (2:4.3.2+dfsg-1) unstable; urgency=low * New upstream version. only in patch2: unchanged: --- gmp-4.3.2+dfsg.orig/debian/patches/series +++ gmp-4.3.2+dfsg/debian/patches/series @@ -0,0 +1 @@ +arm-thumb2-support.patch only in patch2: unchanged: --- gmp-4.3.2+dfsg.orig/debian/patches/arm-thumb2-support.patch +++ gmp-4.3.2+dfsg/debian/patches/arm-thumb2-support.patch @@ -0,0 +1,44 @@ +Index: gmp-4.3.2+dfsg/mpn/arm/copyd.asm +=================================================================== +--- gmp-4.3.2+dfsg.orig/mpn/arm/copyd.asm 2010-02-25 14:23:55.829104622 -0500 ++++ gmp-4.3.2+dfsg/mpn/arm/copyd.asm 2010-02-25 14:26:13.079104237 -0500 +@@ -54,5 +54,9 @@ + bne L(loop) + ldmfd sp!, { r7, r8, r9 } C restore regs from stack + L(return): ++.ifdef USES_THUMB ++ bx lr ++.else + mov pc, lr ++.endif + EPILOGUE(mpn_copyd) +Index: gmp-4.3.2+dfsg/mpn/arm/copyi.asm +=================================================================== +--- gmp-4.3.2+dfsg.orig/mpn/arm/copyi.asm 2010-02-25 14:23:55.909105745 -0500 ++++ gmp-4.3.2+dfsg/mpn/arm/copyi.asm 2010-02-25 14:26:13.079104237 -0500 +@@ -49,5 +49,9 @@ + bne L(loop) + ldmfd sp!, { r7, r8, r9 } C restore regs from stack + L(return): ++.ifdef USES_THUMB ++ bx lr ++.else + mov pc, lr ++.endif + EPILOGUE(mpn_copyi) +Index: gmp-4.3.2+dfsg/mpn/arm/udiv.asm +=================================================================== +--- gmp-4.3.2+dfsg.orig/mpn/arm/udiv.asm 2010-02-25 14:23:55.769136246 -0500 ++++ gmp-4.3.2+dfsg/mpn/arm/udiv.asm 2010-02-25 14:26:13.079104237 -0500 +@@ -50,7 +50,11 @@ + + str n1, [ rem_ptr ] C store remainder + adc r0, n0, n0 C quotient: add last carry from divstep ++.ifdef USES_THUMB ++ bx lr ++.else + mov pc, lr ++.endif + + L(_large_divisor): + stmfd sp!, { r8, lr }