diff -Nru gcc-snapshot-20120107/debian/changelog gcc-snapshot-20120228/debian/changelog --- gcc-snapshot-20120107/debian/changelog 2012-02-29 02:13:52.000000000 +0000 +++ gcc-snapshot-20120228/debian/changelog 2012-02-29 02:13:56.000000000 +0000 @@ -1,8 +1,14 @@ -gcc-snapshot (20120107-0ubuntu1) precise; urgency=low +gcc-snapshot (20120228-1) unstable; urgency=low - * Update to SVN 20120107 from the trunk. + * Update to SVN 20120228 from the trunk. - -- Matthias Klose Sat, 07 Jan 2012 08:30:53 +0100 + -- Matthias Klose Tue, 28 Feb 2012 21:46:18 +0100 + +gcc-snapshot (20120128-1) unstable; urgency=low + + * Update to SVN 20120128 from the trunk. + + -- Matthias Klose Sat, 28 Jan 2012 10:34:21 +0100 gcc-snapshot (20120105-1) unstable; urgency=low diff -Nru gcc-snapshot-20120107/debian/control gcc-snapshot-20120228/debian/control --- gcc-snapshot-20120107/debian/control 2012-02-29 02:13:52.000000000 +0000 +++ gcc-snapshot-20120228/debian/control 2012-02-29 02:13:56.000000000 +0000 @@ -3,8 +3,8 @@ Priority: optional Maintainer: Ubuntu Core developers XSBC-Original-Maintainer: Debian GCC Maintainers -Uploaders: Matthias Klose , Arthur Loiret -Standards-Version: 3.9.2 +Uploaders: Matthias Klose +Standards-Version: 3.9.3 Build-Depends: dpkg-dev (>= 1.16.0~ubuntu4), debhelper (>= 5.0.62), g++-multilib [amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc], libc6.1-dev (>= 2.13-0ubuntu6) [alpha ia64] | libc0.3-dev (>= 2.13-0ubuntu6) [hurd-i386] | libc0.1-dev (>= 2.13-0ubuntu6) [kfreebsd-i386 kfreebsd-amd64] | libc6-dev (>= 2.13-0ubuntu6), libc6-dev-amd64 [i386], libc6-dev-sparc64 [sparc], libc6-dev-s390 [s390x], libc6-dev-s390x [s390], libc6-dev-i386 [amd64], libc6-dev-powerpc [ppc64], libc6-dev-ppc64 [powerpc], libc0.1-dev-i386 [kfreebsd-amd64], lib32gcc1 [amd64 ppc64 kfreebsd-amd64 s390x], lib64gcc1 [i386 powerpc sparc s390], libc6-dev-mips64 [mips mipsel], libc6-dev-mipsn32 [mips mipsel], m4, libtool, autoconf2.64, automake (>= 1:1.11), automake (<< 1:1.12), libunwind7-dev (>= 0.98.5-6) [ia64], libatomic-ops-dev [ia64], zlib1g-dev, gawk, lzma, xz-utils, patchutils, binutils (>= 2.22) | binutils-multiarch (>= 2.22), binutils-hppa64 (>= 2.22) [hppa], gperf (>= 3.0.1), bison (>= 1:2.3), flex, gettext, texinfo (>= 4.3), locales [!knetbsd-i386 !knetbsd-alpha], procps, sharutils, libc6.1-dbg [alpha ia64] | libc0.3-dbg [hurd-i386] | libc0.1-dbg [kfreebsd-i386 kfreebsd-amd64] | libc6-dbg, zlib1g-dev, libantlr-java, python, libffi-dev, fastjar, libmagic-dev, libecj-java (>= 3.3.0-2), zip, libasound2-dev [!knetbsd-i386 !knetbsd-alpha !hurd-i386 !hurd-alpha !kfreebsd-i386 !kfreebsd-amd64 !knetbsd-i386 !knetbsd-alpha], libxtst-dev, libxt-dev, libgtk2.0-dev (>= 2.4.4-2), libart-2.0-dev, libcairo2-dev, gnat (>= 4.1) [!arm !armhf !m68k !powerpcspe !sh4 !sparc64 !hurd-i386], binutils-spu (>= 2.22) [powerpc ppc64], newlib-spu (>= 1.16.0) [powerpc ppc64], libcloog-ppl-dev (>= 0.15.9-2~), libmpc-dev, libmpfr-dev (>= 3.0.0-9~), libgmp-dev (>= 2:5.0.1~), libelfg0-dev (>= 0.8.12), dejagnu [!m68k !hurd-i386 !hurd-alpha], autogen, realpath (>= 1.9.12), chrpath, lsb-release, make (>= 3.81), quilt Build-Depends-Indep: doxygen (>= 1.7.2), graphviz (>= 2.2), gsfonts-x11, texlive-latex-base Build-Conflicts: binutils-gold diff -Nru gcc-snapshot-20120107/debian/control.m4 gcc-snapshot-20120228/debian/control.m4 --- gcc-snapshot-20120107/debian/control.m4 2012-02-29 02:13:52.000000000 +0000 +++ gcc-snapshot-20120228/debian/control.m4 2012-02-29 02:13:56.000000000 +0000 @@ -38,11 +38,11 @@ ifelse(regexp(SRCNAME, `gnat'),0,`dnl Uploaders: Ludovic Brenta ', regexp(SRCNAME, `gdc'),0,`dnl -Uploaders: Iain Buclaw , Arthur Loiret +Uploaders: Iain Buclaw , Matthias Klose ', `dnl -Uploaders: Matthias Klose , Arthur Loiret +Uploaders: Matthias Klose ')dnl SRCNAME -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 ifdef(`TARGET',`dnl cross Build-Depends: DPKG_BUILD_DEP debhelper (>= 5.0.62), LIBC_BUILD_DEP, LIBC_BIARCH_BUILD_DEP LIBUNWIND_BUILD_DEP LIBATOMIC_OPS_BUILD_DEP AUTOGEN_BUILD_DEP AUTO_BUILD_DEP SOURCE_BUILD_DEP CROSS_BUILD_DEP CLOOG_BUILD_DEP MPC_BUILD_DEP MPFR_BUILD_DEP GMP_BUILD_DEP ELF_BUILD_DEP, zlib1g-dev, gawk, lzma, xz-utils, patchutils, BINUTILS_BUILD_DEP, bison (>= 1:2.3), flex, realpath (>= 1.9.12), lsb-release, make (>= 3.81), quilt ',`dnl native @@ -167,8 +167,8 @@ Section: ifdef(`TARGET',`devel',`libs') Priority: ifdef(`TARGET',`extra',required) Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends} -ifdef(`TARGET',`Provides: libgcc1-TARGET-dcv1 -',ifdef(`MULTIARCH', `Multi-Arch: same +ifdef(`TARGET',`Provides: libgcc1-TARGET-dcv1', +ifdef(`MULTIARCH', `Multi-Arch: same Pre-Depends: multiarch-support Breaks: ${multiarch:breaks} ')`Provides: libgcc1-armel [armel], libgcc1-armhf [armhf]') @@ -187,8 +187,8 @@ Section: debug Priority: extra Depends: BASEDEP, libgcc1`'LS (= ${gcc:EpochVersion}), ${misc:Depends} -ifdef(`TARGET',`',ifdef(`MULTIARCH', `Multi-Arch: same -')`Provides: libgcc1-dbg-armel [armel], libgcc1-dbg-armhf [armhf]') +ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same')) +ifdef(`TARGET',`dnl',`Provides: libgcc1-dbg-armel [armel], libgcc1-dbg-armhf [armhf]') Description: GCC support library (debug symbols)`'ifdef(`TARGET)',` (TARGET)', `') Debug symbols for the GCC support library. ifdef(`TARGET', `dnl @@ -650,8 +650,9 @@ ifenabled(`libmudf',` Package: libmudflap`'MF_SO`'LS Architecture: ifdef(`TARGET',`all',`any') -ifdef(`TARGET',`',ifdef(`MULTIARCH', `Multi-Arch: same +ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same Pre-Depends: multiarch-support +Breaks: ${multiarch:breaks} ')`Provides: libmudflap'MF_SO`-armel [armel], libmudflap'MF_SO`-armhf [armhf]') Section: ifdef(`TARGET',`devel',`libs') Priority: ifdef(`TARGET',`extra',`PRI(optional)') @@ -662,7 +663,7 @@ Package: libmudflap`'MF_SO-dbg`'LS Architecture: ifdef(`TARGET',`all',`any') -ifdef(`TARGET',`',ifdef(`MULTIARCH', `Multi-Arch: same +ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same ')`Provides: libmudflap'MF_SO`-dbg-armel [armel], libmudflap'MF_SO`-dbg-armhf [armhf]') Section: debug Priority: extra @@ -863,8 +864,9 @@ Package: libgomp`'GOMP_SO`'LS Section: ifdef(`TARGET',`devel',`libs') Architecture: ifdef(`TARGET',`all',`any') -ifdef(`TARGET',`',ifdef(`MULTIARCH', `Multi-Arch: same +ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same Pre-Depends: multiarch-support +Breaks: ${multiarch:breaks} ')`Provides: libgomp'GOMP_SO`-armel [armel], libgomp'GOMP_SO`-armhf [armhf]') Priority: ifdef(`TARGET',`extra',`PRI(optional)') Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends} @@ -877,7 +879,7 @@ Section: debug Priority: extra Depends: BASEDEP, libgomp`'GOMP_SO`'LS (= ${gcc:Version}), ${misc:Depends} -ifdef(`TARGET',`',ifdef(`MULTIARCH', `Multi-Arch: same +ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same ')`Provides: libgomp'GOMP_SO`-dbg-armel [armel], libgomp'GOMP_SO`-dbg-armhf [armhf]') Description: GCC OpenMP (GOMP) support library (debug symbols) GOMP is an implementation of OpenMP for the C, C++, and Fortran compilers @@ -998,9 +1000,9 @@ Package: libitm`'ITM_SO`'LS Section: ifdef(`TARGET',`devel',`libs') Architecture: ifdef(`TARGET',`all',`any') -ifdef(`TARGET',`',ifdef(`MULTIARCH', `Multi-Arch: same +ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same Pre-Depends: multiarch-support -')`Provides: libitm'ITM_SO`-armel [armel], libitm'ITM_SO`-armhf [armhf]')`'dnl +')`Provides: libitm'ITM_SO`-armel [armel], libitm'ITM_SO`-armhf [armhf]') Priority: ifdef(`TARGET',`extra',`PRI(optional)') Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends} Description: GNU Transactional Memory Library @@ -1013,7 +1015,7 @@ Section: debug Priority: extra Depends: BASEDEP, libitm`'ITM_SO`'LS (= ${gcc:Version}), ${misc:Depends} -ifdef(`TARGET',`',ifdef(`MULTIARCH', `Multi-Arch: same +ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same ')`Provides: libitm'ITM_SO`-dbg-armel [armel], libitm'ITM_SO`-dbg-armhf [armhf]') Description: GNU Transactional Memory Library (debug symbols) This manual documents the usage and internals of libitm. It provides @@ -1147,7 +1149,7 @@ Package: libquadmath`'QMATH_SO`'LS Section: ifdef(`TARGET',`devel',`libs') Architecture: ifdef(`TARGET',`all',`any') -ifdef(`TARGET',`',ifdef(`MULTIARCH', `Multi-Arch: same +ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same Pre-Depends: multiarch-support '))`'dnl Priority: ifdef(`TARGET',`extra',`PRI(optional)') @@ -1162,7 +1164,7 @@ Section: debug Priority: extra Depends: BASEDEP, libquadmath`'QMATH_SO`'LS (= ${gcc:Version}), ${misc:Depends} -ifdef(`TARGET',`',ifdef(`MULTIARCH', `Multi-Arch: same +ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same '))`'dnl Description: GCC Quad-Precision Math Library (debug symbols) A library, which provides quad-precision mathematical functions on targets @@ -1331,9 +1333,10 @@ Package: libobjc`'OBJC_SO`'LS Section: ifdef(`TARGET',`devel',`libs') Architecture: ifdef(`TARGET',`all',`any') -ifdef(`TARGET',`',ifdef(`MULTIARCH', `Multi-Arch: same +ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same Pre-Depends: multiarch-support -')`Provides: libobjc'OBJC_SO`-armel [armel], libobjc'OBJC_SO`-armhf [armhf]') +ifelse(OBJC_SO,`2',`Breaks: ${multiarch:breaks} +',`')')`Provides: libobjc'OBJC_SO`-armel [armel], libobjc'OBJC_SO`-armhf [armhf]') Priority: ifdef(`TARGET',`extra',`PRI(optional)') Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends} Description: Runtime library for GNU Objective-C applications @@ -1342,7 +1345,7 @@ Package: libobjc`'OBJC_SO-dbg`'LS Section: debug Architecture: ifdef(`TARGET',`all',`any') -ifdef(`TARGET',`',ifdef(`MULTIARCH', `Multi-Arch: same +ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same ')`Provides: libobjc'OBJC_SO`-dbg-armel [armel], libobjc'OBJC_SO`-dbg-armhf [armhf]') Priority: extra Depends: BASEDEP, libobjc`'OBJC_SO`'LS (= ${gcc:Version}), libgcc`'GCC_SO-dbg`'LS, ${misc:Depends} @@ -1502,8 +1505,9 @@ Package: libgfortran`'FORTRAN_SO`'LS Section: ifdef(`TARGET',`devel',`libs') Architecture: ifdef(`TARGET',`all',`any') -ifdef(`TARGET',`',ifdef(`MULTIARCH', `Multi-Arch: same +ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same Pre-Depends: multiarch-support +Breaks: ${multiarch:breaks} ')`Provides: libgfortran'FORTRAN_SO`-armel [armel], libgfortran'FORTRAN_SO`-armhf [armhf]') Priority: ifdef(`TARGET',`extra',PRI(optional)) Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends} @@ -1514,7 +1518,7 @@ Package: libgfortran`'FORTRAN_SO-dbg`'LS Section: debug Architecture: ifdef(`TARGET',`all',`any') -ifdef(`TARGET',`',ifdef(`MULTIARCH', `Multi-Arch: same +ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same ')`Provides: libgfortran'FORTRAN_SO`-dbg-armel [armel], libgfortran'FORTRAN_SO`-dbg-armhf [armhf]') Priority: extra Depends: BASEDEP, libgfortran`'FORTRAN_SO`'LS (= ${gcc:Version}), ${misc:Depends} @@ -1634,6 +1638,7 @@ Architecture: NEON_ARCHS ifdef(`MULTIARCH', `Multi-Arch: same Pre-Depends: multiarch-support +Breaks: ${multiarch:breaks} ')`'dnl Priority: extra Depends: BASEDEP, libgcc1-neon`'LS, ${shlibs:Depends}, ${misc:Depends} @@ -1688,7 +1693,7 @@ Package: libgo`'GO_SO`'LS Section: ifdef(`TARGET',`devel',`libs') Architecture: ifdef(`TARGET',`all',`any') -ifdef(`TARGET',`',ifdef(`MULTIARCH', `Multi-Arch: same +ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same Pre-Depends: multiarch-support ')`Provides: libgo'GO_SO`-armel [armel], libgo'GO_SO`-armhf [armhf]') Priority: ifdef(`TARGET',`extra',PRI(optional)) @@ -1700,7 +1705,7 @@ Package: libgo`'GO_SO-dbg`'LS Section: debug Architecture: ifdef(`TARGET',`all',`any') -ifdef(`TARGET',`',ifdef(`MULTIARCH', `Multi-Arch: same +ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same ')`Provides: libgo'GO_SO`-dbg-armel [armel], libgo'GO_SO`-dbg-armhf [armhf]') Priority: extra Depends: BASEDEP, libgo`'GO_SO`'LS (= ${gcc:Version}), ${misc:Depends} @@ -1975,11 +1980,12 @@ Package: libstdc++CXX_SO`'LS Architecture: ifdef(`TARGET',`all',`any') Section: ifdef(`TARGET',`devel',`libs') -Priority: ifdef(`TARGET',`extra',PRI(required)) -Depends: BASEDEP, ${shlibs:Depends}, ${misc:Depends} -ifdef(`TARGET',`Provides: libstdc++CXX_SO-TARGET-dcv1 -',ifdef(`MULTIARCH', `Multi-Arch: same +Priority: ifdef(`TARGET',`extra',PRI(important)) +Depends: BASEDEP, ${dep:libc}, ${shlibs:Depends}, ${misc:Depends} +ifdef(`TARGET',`Provides: libstdc++CXX_SO-TARGET-dcv1', +ifdef(`MULTIARCH', `Multi-Arch: same Pre-Depends: multiarch-support +Breaks: ${multiarch:breaks} ')`Provides: libstdc++'CXX_SO`-armel [armel], libstdc++'CXX_SO`-armhf [armhf]') Conflicts: scim (<< 1.4.2-1) Description: GNU Standard C++ Library v3`'ifdef(`TARGET)',` (TARGET)', `') @@ -2129,9 +2135,7 @@ Conflicts: libg++27-dev, libg++272-dev (<< 2.7.2.8-1), libstdc++2.8-dev, libg++2.8-dev, libstdc++2.9-dev, libstdc++2.9-glibc2.1-dev, libstdc++2.10-dev (<< 1:2.95.3-2), libstdc++3.0-dev Suggests: libstdc++CXX_SO`'PV-doc ')`'dnl native -Provides: libstdc++-dev`'LS -ifdef(`TARGET',`, libstdc++-dev-TARGET-dcv1, libstdc++CXX_SO-dev-TARGET-dcv1 -')`'dnl +Provides: libstdc++-dev`'LS`'ifdef(`TARGET',`, libstdc++-dev-TARGET-dcv1, libstdc++CXX_SO-dev-TARGET-dcv1') Description: GNU Standard C++ Library v3 (development files)`'ifdef(`TARGET)',` (TARGET)', `') This package contains the headers and static library files necessary for building C++ programs which use libstdc++. @@ -2168,9 +2172,10 @@ Section: debug Priority: extra Depends: BASEDEP, libstdc++CXX_SO`'LS (>= ${gcc:Version}), libgcc`'GCC_SO-dbg`'LS, ${shlibs:Depends}, ${misc:Depends} -ifdef(`TARGET',`Provides: libstdc++CXX_SO-dbg-TARGET-dcv1 -',ifdef(`MULTIARCH', `Multi-Arch: same -')`Provides: libstdc++'CXX_SO`'PV`-dbg-armel [armel], libstdc++'CXX_SO`'PV`-dbg-armhf [armhf]') +ifdef(`TARGET',`Provides: libstdc++CXX_SO-dbg-TARGET-dcv1',`dnl +ifdef(`MULTIARCH', `Multi-Arch: same',`dnl') +Provides: libstdc++'CXX_SO`'PV`-dbg-armel [armel], libstdc++'CXX_SO`'PV`-dbg-armhf [armhf]dnl +') Recommends: libstdc++CXX_SO`'PV-dev`'LS (= ${gcc:Version}) Conflicts: libstdc++5-dbg`'LS, libstdc++5-3.3-dbg`'LS, libstdc++6-dbg`'LS, libstdc++6-4.0-dbg`'LS, libstdc++6-4.1-dbg`'LS, libstdc++6-4.2-dbg`'LS, libstdc++6-4.3-dbg`'LS, libstdc++6-4.4-dbg`'LS, libstdc++6-4.5-dbg`'LS, libstdc++6-4.6-dbg`'LS Description: GNU Standard C++ Library v3 (debugging files)`'ifdef(`TARGET)',` (TARGET)', `') @@ -2324,7 +2329,7 @@ Package: libgnat`'-GNAT_V Section: libs Architecture: any -ifdef(`TARGET',`',ifdef(`MULTIARCH', `Multi-Arch: same +ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same Pre-Depends: multiarch-support '))`'dnl Priority: PRI(optional) @@ -2341,7 +2346,7 @@ Package: libgnat`'-GNAT_V-dbg Section: debug Architecture: any -ifdef(`TARGET',`',ifdef(`MULTIARCH', `Multi-Arch: same +ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same Pre-Depends: multiarch-support '))`'dnl Priority: extra @@ -2374,7 +2379,7 @@ Package: libgnatvsn`'GNAT_V Architecture: any -ifdef(`TARGET',`',ifdef(`MULTIARCH', `Multi-Arch: same +ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same Pre-Depends: multiarch-support '))`'dnl Priority: PRI(optional) @@ -2392,7 +2397,7 @@ Package: libgnatvsn`'GNAT_V-dbg Architecture: any -ifdef(`TARGET',`',ifdef(`MULTIARCH', `Multi-Arch: same +ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same Pre-Depends: multiarch-support '))`'dnl Priority: extra @@ -2431,7 +2436,7 @@ Package: libgnatprj`'GNAT_V Architecture: any -ifdef(`TARGET',`',ifdef(`MULTIARCH', `Multi-Arch: same +ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same Pre-Depends: multiarch-support '))`'dnl Priority: PRI(optional) @@ -2452,7 +2457,7 @@ Package: libgnatprj`'GNAT_V-dbg Architecture: any -ifdef(`TARGET',`',ifdef(`MULTIARCH', `Multi-Arch: same +ifdef(`TARGET',`dnl',ifdef(`MULTIARCH', `Multi-Arch: same Pre-Depends: multiarch-support '))`'dnl Priority: extra diff -Nru gcc-snapshot-20120107/debian/lib64gcc1.symbols.powerpc gcc-snapshot-20120228/debian/lib64gcc1.symbols.powerpc --- gcc-snapshot-20120107/debian/lib64gcc1.symbols.powerpc 2012-02-29 02:13:52.000000000 +0000 +++ gcc-snapshot-20120228/debian/lib64gcc1.symbols.powerpc 2012-02-29 02:13:56.000000000 +0000 @@ -2,7 +2,6 @@ GCC_3.0@GCC_3.0 1:4.1.1 GCC_3.3.1@GCC_3.3.1 1:4.1.1 GCC_3.3@GCC_3.3 1:4.1.1 - GCC_3.3.4@GCC_3.3.4 1:4.1.1 GCC_3.4.2@GCC_3.4.2 1:4.1.1 GCC_3.4.4@GCC_3.4.4 1:4.1.1 GCC_3.4@GCC_3.4 1:4.1.1 @@ -32,8 +31,6 @@ __absvdi2@GCC_3.0 1:4.1.1 __absvsi2@GCC_3.0 1:4.1.1 __absvti2@GCC_3.4.4 1:4.1.1 - __adddf3@GCC_3.0 1:4.1.1 - __addsf3@GCC_3.0 1:4.1.1 __addvdi3@GCC_3.0 1:4.1.1 __addvsi3@GCC_3.0 1:4.1.1 __addvti3@GCC_3.4.4 1:4.1.1 @@ -53,24 +50,17 @@ __deregister_frame_info@GLIBC_2.0 1:4.1.1 __deregister_frame_info_bases@GCC_3.0 1:4.1.1 __divdc3@GCC_4.0.0 1:4.1.1 - __divdf3@GCC_3.0 1:4.1.1 - __divsc3@GCC_4.0.0 1:4.1.1 - __divsf3@GCC_3.0 1:4.1.1 + __divsc3@GCC_4.0.0 1:4.1.1 __divtc3@GCC_4.0.0 1:4.1.1 __divti3@GCC_3.0 1:4.1.1 __emutls_get_address@GCC_4.3.0 1:4.3 __emutls_register_common@GCC_4.3.0 1:4.3 __enable_execute_stack@GCC_3.4.2 1:4.1.1 - __eqdf2@GCC_3.0 1:4.1.1 - __eqsf2@GCC_3.0 1:4.1.1 - __extendsfdf2@GCC_3.0 1:4.1.1 __ffsdi2@GCC_3.0 1:4.1.1 __ffsti2@GCC_3.0 1:4.1.1 __fixdfdi@GCC_3.0 1:4.1.1 - __fixdfsi@GCC_3.0 1:4.1.1 __fixdfti@GCC_3.0 1:4.1.1 __fixsfdi@GCC_3.0 1:4.1.1 - __fixsfsi@GCC_3.0 1:4.1.1 __fixsfti@GCC_3.0 1:4.1.1 __fixtfdi@GCC_3.0 1:4.1.1 __fixtfti@GCC_3.0 1:4.1.1 @@ -85,16 +75,12 @@ __floatdidf@GCC_3.0 1:4.1.1 __floatdisf@GCC_3.0 1:4.1.1 __floatditf@GCC_3.0 1:4.1.1 - __floatsidf@GCC_3.0 1:4.1.1 - __floatsisf@GCC_3.0 1:4.1.1 __floattidf@GCC_3.0 1:4.1.1 __floattisf@GCC_3.0 1:4.1.1 __floattitf@GCC_3.0 1:4.1.1 __floatundidf@GCC_4.2.0 1:4.2.1 __floatundisf@GCC_4.2.0 1:4.2.1 __floatunditf@GCC_4.2.0 1:4.2.1 - __floatunsidf@GCC_4.2.0 1:4.1.1 - __floatunsisf@GCC_4.2.0 1:4.1.1 __floatuntidf@GCC_4.2.0 1:4.2.1 __floatuntisf@GCC_4.2.0 1:4.2.1 __floatuntitf@GCC_4.2.0 1:4.2.1 @@ -104,33 +90,19 @@ __gcc_qdiv@GCC_3.4.4 1:4.1.1 __gcc_qmul@GCC_3.4.4 1:4.1.1 __gcc_qsub@GCC_3.4.4 1:4.1.1 - __gedf2@GCC_3.0 1:4.1.1 - __gesf2@GCC_3.0 1:4.1.1 - __gtdf2@GCC_3.0 1:4.1.1 - __gtsf2@GCC_3.0 1:4.1.1 - __ledf2@GCC_3.0 1:4.1.1 - __lesf2@GCC_3.0 1:4.1.1 __lshrti3@GCC_3.0 1:4.1.1 - __ltdf2@GCC_3.0 1:4.1.1 - __ltsf2@GCC_3.0 1:4.1.1 __modti3@GCC_3.0 1:4.1.1 __muldc3@GCC_4.0.0 1:4.1.1 - __muldf3@GCC_3.0 1:4.1.1 __mulsc3@GCC_4.0.0 1:4.1.1 - __mulsf3@GCC_3.0 1:4.1.1 __multc3@GCC_4.0.0 1:4.1.1 __multi3@GCC_3.0 1:4.1.1 __mulvdi3@GCC_3.0 1:4.1.1 __mulvsi3@GCC_3.0 1:4.1.1 __mulvti3@GCC_3.4.4 1:4.1.1 - __nedf2@GCC_3.0 1:4.1.1 - __negdf2@GCC_3.0 1:4.1.1 - __negsf2@GCC_3.0 1:4.1.1 __negti2@GCC_3.0 1:4.1.1 __negvdi2@GCC_3.0 1:4.1.1 __negvsi2@GCC_3.0 1:4.1.1 __negvti2@GCC_3.4.4 1:4.1.1 - __nesf2@GCC_3.0 1:4.1.1 __paritydi2@GCC_3.4 1:4.1.1 __parityti2@GCC_3.4 1:4.1.1 __popcountdi2@GCC_3.4 1:4.1.1 @@ -144,18 +116,13 @@ __register_frame_info_table@GLIBC_2.0 1:4.1.1 __register_frame_info_table_bases@GCC_3.0 1:4.1.1 __register_frame_table@GLIBC_2.0 1:4.1.1 - __subdf3@GCC_3.0 1:4.1.1 - __subsf3@GCC_3.0 1:4.1.1 __subvdi3@GCC_3.0 1:4.1.1 __subvsi3@GCC_3.0 1:4.1.1 __subvti3@GCC_3.4.4 1:4.1.1 - __truncdfsf2@GCC_3.0 1:4.1.1 __ucmpti2@GCC_3.0 1:4.1.1 __udivmodti4@GCC_3.0 1:4.1.1 __udivti3@GCC_3.0 1:4.1.1 __umodti3@GCC_3.0 1:4.1.1 - __unorddf2@GCC_3.3.4 1:4.1.1 - __unordsf2@GCC_3.3.4 1:4.1.1 _xlqadd@GCC_3.4 1:4.1.1 _xlqdiv@GCC_3.4 1:4.1.1 _xlqmul@GCC_3.4 1:4.1.1 diff -Nru gcc-snapshot-20120107/debian/libgcc1.symbols.ppc64 gcc-snapshot-20120228/debian/libgcc1.symbols.ppc64 --- gcc-snapshot-20120107/debian/libgcc1.symbols.ppc64 2012-02-29 02:13:52.000000000 +0000 +++ gcc-snapshot-20120228/debian/libgcc1.symbols.ppc64 2012-02-29 02:13:56.000000000 +0000 @@ -2,7 +2,6 @@ GCC_3.0@GCC_3.0 1:4.1.1 GCC_3.3.1@GCC_3.3.1 1:4.1.1 GCC_3.3@GCC_3.3 1:4.1.1 - GCC_3.3.4@GCC_3.3.4 1:4.1.1 GCC_3.4.2@GCC_3.4.2 1:4.1.1 GCC_3.4.4@GCC_3.4.4 1:4.1.1 GCC_3.4@GCC_3.4 1:4.1.1 @@ -32,8 +31,6 @@ __absvdi2@GCC_3.0 1:4.1.1 __absvsi2@GCC_3.0 1:4.1.1 __absvti2@GCC_3.4.4 1:4.1.1 - __adddf3@GCC_3.0 1:4.1.1 - __addsf3@GCC_3.0 1:4.1.1 __addvdi3@GCC_3.0 1:4.1.1 __addvsi3@GCC_3.0 1:4.1.1 __addvti3@GCC_3.4.4 1:4.1.1 @@ -53,24 +50,17 @@ __deregister_frame_info@GLIBC_2.0 1:4.1.1 __deregister_frame_info_bases@GCC_3.0 1:4.1.1 __divdc3@GCC_4.0.0 1:4.1.1 - __divdf3@GCC_3.0 1:4.1.1 - __divsc3@GCC_4.0.0 1:4.1.1 - __divsf3@GCC_3.0 1:4.1.1 + __divsc3@GCC_4.0.0 1:4.1.1 __divtc3@GCC_4.0.0 1:4.1.1 __divti3@GCC_3.0 1:4.1.1 __emutls_get_address@GCC_4.3.0 1:4.3 __emutls_register_common@GCC_4.3.0 1:4.3 __enable_execute_stack@GCC_3.4.2 1:4.1.1 - __eqdf2@GCC_3.0 1:4.1.1 - __eqsf2@GCC_3.0 1:4.1.1 - __extendsfdf2@GCC_3.0 1:4.1.1 __ffsdi2@GCC_3.0 1:4.1.1 __ffsti2@GCC_3.0 1:4.1.1 __fixdfdi@GCC_3.0 1:4.1.1 - __fixdfsi@GCC_3.0 1:4.1.1 __fixdfti@GCC_3.0 1:4.1.1 __fixsfdi@GCC_3.0 1:4.1.1 - __fixsfsi@GCC_3.0 1:4.1.1 __fixsfti@GCC_3.0 1:4.1.1 __fixtfdi@GCC_3.0 1:4.1.1 __fixtfti@GCC_3.0 1:4.1.1 @@ -85,16 +75,12 @@ __floatdidf@GCC_3.0 1:4.1.1 __floatdisf@GCC_3.0 1:4.1.1 __floatditf@GCC_3.0 1:4.1.1 - __floatsidf@GCC_3.0 1:4.1.1 - __floatsisf@GCC_3.0 1:4.1.1 __floattidf@GCC_3.0 1:4.1.1 __floattisf@GCC_3.0 1:4.1.1 __floattitf@GCC_3.0 1:4.1.1 __floatundidf@GCC_4.2.0 1:4.2.1 __floatundisf@GCC_4.2.0 1:4.2.1 __floatunditf@GCC_4.2.0 1:4.2.1 - __floatunsidf@GCC_4.2.0 1:4.1.1 - __floatunsisf@GCC_4.2.0 1:4.1.1 __floatuntidf@GCC_4.2.0 1:4.2.1 __floatuntisf@GCC_4.2.0 1:4.2.1 __floatuntitf@GCC_4.2.0 1:4.2.1 @@ -104,33 +90,19 @@ __gcc_qdiv@GCC_3.4.4 1:4.1.1 __gcc_qmul@GCC_3.4.4 1:4.1.1 __gcc_qsub@GCC_3.4.4 1:4.1.1 - __gedf2@GCC_3.0 1:4.1.1 - __gesf2@GCC_3.0 1:4.1.1 - __gtdf2@GCC_3.0 1:4.1.1 - __gtsf2@GCC_3.0 1:4.1.1 - __ledf2@GCC_3.0 1:4.1.1 - __lesf2@GCC_3.0 1:4.1.1 __lshrti3@GCC_3.0 1:4.1.1 - __ltdf2@GCC_3.0 1:4.1.1 - __ltsf2@GCC_3.0 1:4.1.1 __modti3@GCC_3.0 1:4.1.1 __muldc3@GCC_4.0.0 1:4.1.1 - __muldf3@GCC_3.0 1:4.1.1 __mulsc3@GCC_4.0.0 1:4.1.1 - __mulsf3@GCC_3.0 1:4.1.1 __multc3@GCC_4.0.0 1:4.1.1 __multi3@GCC_3.0 1:4.1.1 __mulvdi3@GCC_3.0 1:4.1.1 __mulvsi3@GCC_3.0 1:4.1.1 __mulvti3@GCC_3.4.4 1:4.1.1 - __nedf2@GCC_3.0 1:4.1.1 - __negdf2@GCC_3.0 1:4.1.1 - __negsf2@GCC_3.0 1:4.1.1 __negti2@GCC_3.0 1:4.1.1 __negvdi2@GCC_3.0 1:4.1.1 __negvsi2@GCC_3.0 1:4.1.1 __negvti2@GCC_3.4.4 1:4.1.1 - __nesf2@GCC_3.0 1:4.1.1 __paritydi2@GCC_3.4 1:4.1.1 __parityti2@GCC_3.4 1:4.1.1 __popcountdi2@GCC_3.4 1:4.1.1 @@ -144,18 +116,13 @@ __register_frame_info_table@GLIBC_2.0 1:4.1.1 __register_frame_info_table_bases@GCC_3.0 1:4.1.1 __register_frame_table@GLIBC_2.0 1:4.1.1 - __subdf3@GCC_3.0 1:4.1.1 - __subsf3@GCC_3.0 1:4.1.1 __subvdi3@GCC_3.0 1:4.1.1 __subvsi3@GCC_3.0 1:4.1.1 __subvti3@GCC_3.4.4 1:4.1.1 - __truncdfsf2@GCC_3.0 1:4.1.1 __ucmpti2@GCC_3.0 1:4.1.1 __udivmodti4@GCC_3.0 1:4.1.1 __udivti3@GCC_3.0 1:4.1.1 __umodti3@GCC_3.0 1:4.1.1 - __unorddf2@GCC_3.3.4 1:4.1.1 - __unordsf2@GCC_3.3.4 1:4.1.1 _xlqadd@GCC_3.4 1:4.1.1 _xlqdiv@GCC_3.4 1:4.1.1 _xlqmul@GCC_3.4 1:4.1.1 diff -Nru gcc-snapshot-20120107/debian/patches/gcc-base-version.diff gcc-snapshot-20120228/debian/patches/gcc-base-version.diff --- gcc-snapshot-20120107/debian/patches/gcc-base-version.diff 2012-02-29 02:13:52.000000000 +0000 +++ gcc-snapshot-20120228/debian/patches/gcc-base-version.diff 2012-02-29 02:13:56.000000000 +0000 @@ -176,3 +176,14 @@ ifeq ($(decimal_float),yes) ifeq ($(enable_decimal_float),bid) +--- a/src/libjava/testsuite/lib/libjava.exp ++++ b/src/libjava/testsuite/lib/libjava.exp +@@ -177,7 +177,7 @@ + + set text [eval exec "$GCJ_UNDER_TEST -B$specdir -v 2>@ stdout"] + regexp " version \[^\n\r\]*" $text version +- set libjava_version [lindex $version 1] ++ set libjava_version 4.7 + + verbose "version: $libjava_version" + diff -Nru gcc-snapshot-20120107/debian/patches/gccgo-version.diff gcc-snapshot-20120228/debian/patches/gccgo-version.diff --- gcc-snapshot-20120107/debian/patches/gccgo-version.diff 2012-02-29 02:13:52.000000000 +0000 +++ gcc-snapshot-20120228/debian/patches/gccgo-version.diff 2012-02-29 02:13:56.000000000 +0000 @@ -4,7 +4,7 @@ =================================================================== --- a/src/gcc/go/Make-lang.in +++ b/src/gcc/go/Make-lang.in -@@ -234,7 +234,9 @@ +@@ -243,7 +243,9 @@ $(TM_H) $(RTL_H) $(TREE_H) $(TM_P_H) output.h $(TARGET_H) \ $(COMMON_TARGET_H) @@ -19,7 +19,7 @@ =================================================================== --- a/src/libgo/Makefile.in +++ b/src/libgo/Makefile.in -@@ -496,7 +496,7 @@ +@@ -494,14 +494,14 @@ SUFFIXES = .c .go .gox .o .obj .lo .a @LIBGO_IS_RTEMS_TRUE@subdirs = testsuite SUBDIRS = ${subdirs} @@ -28,15 +28,14 @@ MAINT_CHARSET = latin1 mkinstalldirs = $(SHELL) $(toplevel_srcdir)/mkinstalldirs PWD_COMMAND = $${PWDCMD-pwd} -@@ -566,7 +566,7 @@ - FLAGS_TO_PASS = $(AM_MAKEFLAGS) - toolexeclib_LTLIBRARIES = libgo.la - toolexeclib_LIBRARIES = libgobegin.a --toolexeclibgodir = $(toolexeclibdir)/go/$(gcc_version)/$(target_alias) -+toolexeclibgodir = $(toolexeclibdir)/go/$(short_version) - toolexeclibgo_DATA = \ - bufio.gox \ - bytes.gox \ + STAMP = echo timestamp > + toolexecdir = $(glibgo_toolexecdir) + toolexeclibdir = $(glibgo_toolexeclibdir) +-toolexeclibgodir = $(nover_glibgo_toolexeclibdir)/go/$(gcc_version)/$(target_alias) ++toolexeclibgodir = $(nover_glibgo_toolexeclibdir)/go/$(short_version) + WARN_CFLAGS = $(WARN_FLAGS) $(WERROR) + + # -I/-D flags to pass when compiling. Index: b/src/libgo/Makefile.am =================================================================== --- a/src/libgo/Makefile.am @@ -50,12 +49,12 @@ MAINT_CHARSET = latin1 -@@ -97,7 +97,7 @@ - toolexeclib_LTLIBRARIES = libgo.la - toolexeclib_LIBRARIES = libgobegin.a +@@ -25,7 +25,7 @@ --toolexeclibgodir = $(toolexeclibdir)/go/$(gcc_version)/$(target_alias) -+toolexeclibgodir = $(toolexeclibdir)/go/$(short_version) + toolexecdir = $(glibgo_toolexecdir) + toolexeclibdir = $(glibgo_toolexeclibdir) +-toolexeclibgodir = $(nover_glibgo_toolexeclibdir)/go/$(gcc_version)/$(target_alias) ++toolexeclibgodir = $(nover_glibgo_toolexeclibdir)/go/$(short_version) - toolexeclibgo_DATA = \ - bufio.gox \ + LIBFFI = @LIBFFI@ + LIBFFIINCS = @LIBFFIINCS@ diff -Nru gcc-snapshot-20120107/debian/patches/gcc-multiarch.diff gcc-snapshot-20120228/debian/patches/gcc-multiarch.diff --- gcc-snapshot-20120107/debian/patches/gcc-multiarch.diff 2012-02-29 02:13:52.000000000 +0000 +++ gcc-snapshot-20120228/debian/patches/gcc-multiarch.diff 2012-02-29 02:13:56.000000000 +0000 @@ -376,6 +376,15 @@ Driver JoinedOrMissing Var(print_prog_name) --- a/src/gcc/config.gcc (revision 182390) +++ b/src/gcc/config.gcc (working copy) +@@ -1508,7 +1508,7 @@ + ;; + ia64*-*-linux*) + tm_file="${tm_file} dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h ia64/sysv4.h ia64/linux.h" +- tmake_file="${tmake_file} ia64/t-ia64 t-libunwind" ++ tmake_file="${tmake_file} ia64/t-ia64 ia64/t-glibc t-libunwind" + target_cpu_default="MASK_GNU_AS|MASK_GNU_LD" + ;; + ia64*-*-hpux*) @@ -2012,6 +2012,7 @@ ;; *) @@ -544,7 +553,7 @@ +MULTIARCH_DIRNAME = $(call if_multiarch,hppa-linux-gnu) --- a/src/gcc/config/mips/t-linux64 (revision 182390) +++ b/src/gcc/config/mips/t-linux64 (working copy) -@@ -18,4 +18,9 @@ +@@ -18,4 +18,23 @@ MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64 MULTILIB_DIRNAMES = n32 32 64 @@ -555,3 +564,17 @@ + ../lib32$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \ + ../lib$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \ + ../lib64$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT)) ++--- a/src/libstdc++-v3/python/hook.in +++++ b/src/libstdc++-v3/python/hook.in ++@@ -47,7 +47,10 @@ ++ libdir = libdir[len (prefix):] ++ ++ # Compute the ".."s needed to get from libdir to the prefix. ++- dotdots = ('..' + os.sep) * len (libdir.split (os.sep)) +++ backdirs = len (libdir.split (os.sep)) +++ if not os.path.basename(os.path.dirname(__file__)).startswith('lib'): +++ backdirs += 1 # multiarch subdir +++ dotdots = ('..' + os.sep) * backdirs ++ ++ objfile = gdb.current_objfile ().filename ++ dir_ = os.path.join (os.path.dirname (objfile), dotdots, pythondir) diff -Nru gcc-snapshot-20120107/debian/patches/gcc-sysroot.diff gcc-snapshot-20120228/debian/patches/gcc-sysroot.diff --- gcc-snapshot-20120107/debian/patches/gcc-sysroot.diff 1970-01-01 00:00:00.000000000 +0000 +++ gcc-snapshot-20120228/debian/patches/gcc-sysroot.diff 2012-02-29 02:13:56.000000000 +0000 @@ -0,0 +1,155 @@ +--- a/src/gcc/configure.ac ++++ b/src/gcc/configure.ac +@@ -118,6 +118,72 @@ + local_prefix=/usr/local + fi + ++AC_ARG_WITH([native-system-header-dir], ++ [ --with-native-system-header-dir=dir ++ use dir as the directory to look for standard ++ system header files in. Defaults to /usr/include.], ++[ ++ case ${with_native_system_header_dir} in ++ yes|no) AC_MSG_ERROR([bad value ${withval} given for --with-native-system-header-dir]) ;; ++ /* | [[A-Za-z]]:[[\\/]]*) ;; ++ *) AC_MSG_ERROR([--with-native-system-header-dir argument ${withval} must be an absolute directory]) ;; ++ esac ++ configured_native_system_header_dir="${withval}" ++], [configured_native_system_header_dir=]) ++ ++AC_ARG_WITH(build-sysroot, ++ [AS_HELP_STRING([--with-build-sysroot=sysroot], ++ [use sysroot as the system root during the build])], ++ [if test x"$withval" != x ; then ++ SYSROOT_CFLAGS_FOR_TARGET="--sysroot=$withval" ++ fi], ++ [SYSROOT_CFLAGS_FOR_TARGET=]) ++AC_SUBST(SYSROOT_CFLAGS_FOR_TARGET) ++ ++AC_ARG_WITH(sysroot, ++[AS_HELP_STRING([[--with-sysroot[=DIR]]], ++ [search for usr/lib, usr/include, et al, within DIR])], ++[ ++ case ${with_sysroot} in ++ /) ;; ++ */) with_sysroot=`echo $with_sysroot | sed 's,/$,,'` ;; ++ esac ++ case ${with_sysroot} in ++ yes) TARGET_SYSTEM_ROOT='${exec_prefix}/${target_noncanonical}/sys-root' ;; ++ *) TARGET_SYSTEM_ROOT=$with_sysroot ;; ++ esac ++ ++ TARGET_SYSTEM_ROOT_DEFINE='-DTARGET_SYSTEM_ROOT=\"$(TARGET_SYSTEM_ROOT)\"' ++ CROSS_SYSTEM_HEADER_DIR='$(TARGET_SYSTEM_ROOT)$${sysroot_headers_suffix}$(NATIVE_SYSTEM_HEADER_DIR)' ++ ++ if test "x$prefix" = xNONE; then ++ test_prefix=/usr/local ++ else ++ test_prefix=$prefix ++ fi ++ if test "x$exec_prefix" = xNONE; then ++ test_exec_prefix=$test_prefix ++ else ++ test_exec_prefix=$exec_prefix ++ fi ++ case ${TARGET_SYSTEM_ROOT} in ++ "${test_prefix}"|"${test_prefix}/"*|\ ++ "${test_exec_prefix}"|"${test_exec_prefix}/"*|\ ++ '${prefix}'|'${prefix}/'*|\ ++ '${exec_prefix}'|'${exec_prefix}/'*) ++ t="$TARGET_SYSTEM_ROOT_DEFINE -DTARGET_SYSTEM_ROOT_RELOCATABLE" ++ TARGET_SYSTEM_ROOT_DEFINE="$t" ++ ;; ++ esac ++], [ ++ TARGET_SYSTEM_ROOT= ++ TARGET_SYSTEM_ROOT_DEFINE= ++ CROSS_SYSTEM_HEADER_DIR='$(gcc_tooldir)/sys-include' ++]) ++AC_SUBST(TARGET_SYSTEM_ROOT) ++AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) ++AC_SUBST(CROSS_SYSTEM_HEADER_DIR) ++ + # Don't set gcc_gxx_include_dir to gxx_include_dir since that's only + # passed in by the toplevel make and thus we'd get different behavior + # depending on where we built the sources. +@@ -149,7 +215,9 @@ + if test "${with_sysroot+set}" = set; then + gcc_gxx_without_sysroot=`expr "${gcc_gxx_include_dir}" : "${with_sysroot}"'\(.*\)'` + if test "${gcc_gxx_without_sysroot}"; then +- gcc_gxx_include_dir="${gcc_gxx_without_sysroot}" ++ if test x${with_sysroot} != x/; then ++ gcc_gxx_include_dir="${gcc_gxx_without_sysroot}" ++ fi + gcc_gxx_include_dir_add_sysroot=1 + fi + fi +@@ -739,68 +807,6 @@ + ], [enable_shared=yes]) + AC_SUBST(enable_shared) + +-AC_ARG_WITH([native-system-header-dir], +- [ --with-native-system-header-dir=dir +- use dir as the directory to look for standard +- system header files in. Defaults to /usr/include.], +-[ +- case ${with_native_system_header_dir} in +- yes|no) AC_MSG_ERROR([bad value ${withval} given for --with-native-system-header-dir]) ;; +- /* | [[A-Za-z]]:[[\\/]]*) ;; +- *) AC_MSG_ERROR([--with-native-system-header-dir argument ${withval} must be an absolute directory]) ;; +- esac +- configured_native_system_header_dir="${withval}" +-], [configured_native_system_header_dir=]) +- +-AC_ARG_WITH(build-sysroot, +- [AS_HELP_STRING([--with-build-sysroot=sysroot], +- [use sysroot as the system root during the build])], +- [if test x"$withval" != x ; then +- SYSROOT_CFLAGS_FOR_TARGET="--sysroot=$withval" +- fi], +- [SYSROOT_CFLAGS_FOR_TARGET=]) +-AC_SUBST(SYSROOT_CFLAGS_FOR_TARGET) +- +-AC_ARG_WITH(sysroot, +-[AS_HELP_STRING([[--with-sysroot[=DIR]]], +- [search for usr/lib, usr/include, et al, within DIR])], +-[ +- case ${with_sysroot} in +- yes) TARGET_SYSTEM_ROOT='${exec_prefix}/${target_noncanonical}/sys-root' ;; +- *) TARGET_SYSTEM_ROOT=$with_sysroot ;; +- esac +- +- TARGET_SYSTEM_ROOT_DEFINE='-DTARGET_SYSTEM_ROOT=\"$(TARGET_SYSTEM_ROOT)\"' +- CROSS_SYSTEM_HEADER_DIR='$(TARGET_SYSTEM_ROOT)$${sysroot_headers_suffix}$(NATIVE_SYSTEM_HEADER_DIR)' +- +- if test "x$prefix" = xNONE; then +- test_prefix=/usr/local +- else +- test_prefix=$prefix +- fi +- if test "x$exec_prefix" = xNONE; then +- test_exec_prefix=$test_prefix +- else +- test_exec_prefix=$exec_prefix +- fi +- case ${TARGET_SYSTEM_ROOT} in +- "${test_prefix}"|"${test_prefix}/"*|\ +- "${test_exec_prefix}"|"${test_exec_prefix}/"*|\ +- '${prefix}'|'${prefix}/'*|\ +- '${exec_prefix}'|'${exec_prefix}/'*) +- t="$TARGET_SYSTEM_ROOT_DEFINE -DTARGET_SYSTEM_ROOT_RELOCATABLE" +- TARGET_SYSTEM_ROOT_DEFINE="$t" +- ;; +- esac +-], [ +- TARGET_SYSTEM_ROOT= +- TARGET_SYSTEM_ROOT_DEFINE= +- CROSS_SYSTEM_HEADER_DIR='$(gcc_tooldir)/sys-include' +-]) +-AC_SUBST(TARGET_SYSTEM_ROOT) +-AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) +-AC_SUBST(CROSS_SYSTEM_HEADER_DIR) +- + AC_ARG_WITH(specs, + [AS_HELP_STRING([--with-specs=SPECS], + [add SPECS to driver command-line processing])], diff -Nru gcc-snapshot-20120107/debian/patches/gcc-system-root.diff gcc-snapshot-20120228/debian/patches/gcc-system-root.diff --- gcc-snapshot-20120107/debian/patches/gcc-system-root.diff 2012-02-29 02:13:52.000000000 +0000 +++ gcc-snapshot-20120228/debian/patches/gcc-system-root.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -# DP: Avoid include paths starting with a double slash - ---- a/src/gcc/configure.ac -+++ b/src/gcc/configure.ac -@@ -733,8 +733,10 @@ - yes) TARGET_SYSTEM_ROOT='${exec_prefix}/${target_noncanonical}/sys-root' ;; - *) TARGET_SYSTEM_ROOT=$with_sysroot ;; - esac -- -- TARGET_SYSTEM_ROOT_DEFINE='-DTARGET_SYSTEM_ROOT=\"$(TARGET_SYSTEM_ROOT)\"' -+ -+ if test "x$TARGET_SYSTEM_ROOT" != x/; then -+ TARGET_SYSTEM_ROOT_DEFINE='-DTARGET_SYSTEM_ROOT=\"$(TARGET_SYSTEM_ROOT)\"' -+ fi - CROSS_SYSTEM_HEADER_DIR='$(TARGET_SYSTEM_ROOT)$${sysroot_headers_suffix}$(NATIVE_SYSTEM_HEADER_DIR)' - - if test "x$prefix" = xNONE; then diff -Nru gcc-snapshot-20120107/debian/patches/kbsd-gnu.diff gcc-snapshot-20120228/debian/patches/kbsd-gnu.diff --- gcc-snapshot-20120107/debian/patches/kbsd-gnu.diff 2012-02-29 02:13:52.000000000 +0000 +++ gcc-snapshot-20120228/debian/patches/kbsd-gnu.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -2011-12-19 Robert Millan - - Fix build regression on GNU/kFreeBSD. - - * config/kfreebsd-gnu.h (GNU_USER_DYNAMIC_LINKERX32): New macro. - ---- a/src/gcc/config/kfreebsd-gnu.h~ 2011-07-21 17:31:44.000000000 +0200 -+++ b/src/gcc/config/kfreebsd-gnu.h 2011-12-19 20:20:26.961301396 +0100 -@@ -33,3 +33,4 @@ - #define GNU_USER_DYNAMIC_LINKER GLIBC_DYNAMIC_LINKER - #define GNU_USER_DYNAMIC_LINKER32 GLIBC_DYNAMIC_LINKER32 - #define GNU_USER_DYNAMIC_LINKER64 GLIBC_DYNAMIC_LINKER64 -+#define GNU_USER_DYNAMIC_LINKERX32 GLIBC_DYNAMIC_LINKERX32 diff -Nru gcc-snapshot-20120107/debian/patches/libffi-m68k.diff gcc-snapshot-20120228/debian/patches/libffi-m68k.diff --- gcc-snapshot-20120107/debian/patches/libffi-m68k.diff 1970-01-01 00:00:00.000000000 +0000 +++ gcc-snapshot-20120228/debian/patches/libffi-m68k.diff 2012-02-29 02:13:56.000000000 +0000 @@ -0,0 +1,12 @@ +--- a/src/libffi/src/m68k/ffi.c ++++ b/src/libffi/src/m68k/ffi.c +@@ -261,7 +261,8 @@ + void *user_data, + void *codeloc) + { +- FFI_ASSERT (cif->abi == FFI_SYSV); ++ if (cif->abi != FFI_SYSV) ++ return FFI_BAD_ABI; + + *(unsigned short *)closure->tramp = 0x207c; + *(void **)(closure->tramp + 2) = codeloc; diff -Nru gcc-snapshot-20120107/debian/patches/libgo-mksysinfo.diff gcc-snapshot-20120228/debian/patches/libgo-mksysinfo.diff --- gcc-snapshot-20120107/debian/patches/libgo-mksysinfo.diff 1970-01-01 00:00:00.000000000 +0000 +++ gcc-snapshot-20120228/debian/patches/libgo-mksysinfo.diff 2012-02-29 02:13:56.000000000 +0000 @@ -0,0 +1,34 @@ +# DP: libgo: Fix TIOCNOTTY and TIOCSCTTY definitions + +--- a/src/libgo/mksysinfo.sh ++++ b/src/libgo/mksysinfo.sh +@@ -101,6 +101,12 @@ + #ifdef TIOCGWINSZ + TIOCGWINSZ_val = TIOCGWINSZ, + #endif ++#ifdef TIOCNOTTY ++ TIOCNOTTY_val = TIOCNOTTY, ++#endif ++#ifdef TIOCSCTTY ++ TIOCSCTTY_val = TIOCSCTTY, ++#endif + }; + EOF + +@@ -616,6 +622,16 @@ + echo 'const TIOCGWINSZ = _TIOCGWINSZ_val' >> ${OUT} + fi + fi ++if ! grep '^const TIOCNOTTY' ${OUT} >/dev/null 2>&1; then ++ if grep '^const _TIOCNOTTY_val' ${OUT} >/dev/null 2>&1; then ++ echo 'const TIOCNOTTY = _TIOCNOTTY_val' >> ${OUT} ++ fi ++fi ++if ! grep '^const TIOCSCTTY' ${OUT} >/dev/null 2>&1; then ++ if grep '^const _TIOCSCTTY_val' ${OUT} >/dev/null 2>&1; then ++ echo 'const TIOCSCTTY = _TIOCSCTTY_val' >> ${OUT} ++ fi ++fi + + # The ioctl flags for terminal control + grep '^const _TC[GS]ET' gen-sysinfo.go | \ diff -Nru gcc-snapshot-20120107/debian/patches/libstdc++-pic.diff gcc-snapshot-20120228/debian/patches/libstdc++-pic.diff --- gcc-snapshot-20120107/debian/patches/libstdc++-pic.diff 2012-02-29 02:13:52.000000000 +0000 +++ gcc-snapshot-20120228/debian/patches/libstdc++-pic.diff 2012-02-29 02:13:56.000000000 +0000 @@ -1,53 +1,95 @@ # DP: Build and install libstdc++_pic.a library. ---- - libstdc++-v3/src/Makefile.am | 4 ++++ - libstdc++-v3/src/Makefile.in | 8 +++++++- - 2 files changed, 11 insertions(+), 1 deletions(-) - ---- a/src/libstdc++-v3/src/Makefile.am -+++ b/src/libstdc++-v3/src/Makefile.am -@@ -422,6 +422,11 @@ - $(CXX) $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LTLDFLAGS) -o $@ - - -+install-exec-local: -+ $(AR) cru libstdc++_pic.a .libs/*.o $(top_builddir)/libsupc++/*.o || touch libstdc++_pic.a -+ $(MKDIR_P) $(DESTDIR)$(toolexeclibdir) -+ $(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir) +Index: libstdc++-v3/src/Makefile.am +=================================================================== +--- a/src/libstdc++-v3/src/Makefile.am (revision 183664) ++++ b/src/libstdc++-v3/src/Makefile.am (working copy) +@@ -195,10 +195,12 @@ + STAMP_DEBUG = build-debug + STAMP_INSTALL_DEBUG = install-debug + CLEAN_DEBUG = debug ++STAMP_INSTALL_PIC = install-pic + else + STAMP_DEBUG = + STAMP_INSTALL_DEBUG = + CLEAN_DEBUG = ++STAMP_INSTALL_PIC = + endif + + # Build a debug variant. +@@ -233,6 +235,7 @@ + mv Makefile Makefile.tmp; \ + sed -e 's,all-local: all-once,all-local:,' \ + -e 's,install-data-local: install-data-once,install-data-local:,' \ ++ -e 's,install-exec-local:.*,install-exec-local:,' \ + -e 's,src/c,src/debug/c,' \ + < Makefile.tmp > Makefile ; \ + $(MAKE) CXXFLAGS='$(DEBUG_FLAGS)' \ +@@ -242,3 +245,8 @@ + install-debug: build-debug + (cd ${debugdir} && $(MAKE) CXXFLAGS='$(DEBUG_FLAGS)' \ + toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install) ; + - # Added bits to build debug library. - if GLIBCXX_BUILD_DEBUG - all-local: build_debug ---- a/src/libstdc++-v3/src/Makefile.in -+++ b/src/libstdc++-v3/src/Makefile.in -@@ -710,7 +710,7 @@ ++install-exec-local: $(STAMP_INSTALL_PIC) ++$(STAMP_INSTALL_PIC): ++ $(MKDIR_P) $(DESTDIR)$(toolexeclibdir) ++ $(INSTALL_DATA) .libs/libstdc++convenience.a $(DESTDIR)$(toolexeclibdir)/libstdc++_pic.a +Index: libstdc++-v3/src/Makefile.in +=================================================================== +--- a/src/libstdc++-v3/src/Makefile.in (revision 183664) ++++ b/src/libstdc++-v3/src/Makefile.in (working copy) +@@ -415,6 +415,8 @@ + @GLIBCXX_BUILD_DEBUG_TRUE@STAMP_INSTALL_DEBUG = install-debug + @GLIBCXX_BUILD_DEBUG_FALSE@CLEAN_DEBUG = + @GLIBCXX_BUILD_DEBUG_TRUE@CLEAN_DEBUG = debug ++@GLIBCXX_BUILD_DEBUG_FALSE@STAMP_INSTALL_PIC = ++@GLIBCXX_BUILD_DEBUG_TRUE@STAMP_INSTALL_PIC = install-pic + + # Build a debug variant. + # Take care to fix all possibly-relative paths. +@@ -694,7 +696,7 @@ install-dvi-am: -install-exec-am: install-toolexeclibLTLIBRARIES +install-exec-am: install-exec-local install-toolexeclibLTLIBRARIES - install-html: install-html-am + install-html: install-html-recursive -@@ -759,7 +759,7 @@ +@@ -745,11 +747,11 @@ distclean-libtool distclean-tags dvi dvi-am html html-am info \ info-am install install-am install-data install-data-am \ install-data-local install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ -+ install-exec-am install-exec-local install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip \ - install-toolexeclibLTLIBRARIES installcheck installcheck-am \ -@@ -964,6 +964,11 @@ - @GLIBCXX_LDBL_COMPAT_TRUE@compatibility-ldbl.o: compatibility-ldbl.cc - @GLIBCXX_LDBL_COMPAT_TRUE@ $(CXXCOMPILE) -mlong-double-64 -c $< +- install-info-am install-man install-pdf install-pdf-am \ +- install-ps install-ps-am install-strip \ +- install-toolexeclibLTLIBRARIES installcheck installcheck-am \ +- installdirs installdirs-am maintainer-clean \ ++ install-exec-am install-exec-local install-html \ ++ install-html-am install-info install-info-am install-man \ ++ install-pdf install-pdf-am install-ps install-ps-am \ ++ install-strip install-toolexeclibLTLIBRARIES installcheck \ ++ installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-recursive uninstall uninstall-am \ +@@ -845,6 +847,7 @@ + mv Makefile Makefile.tmp; \ + sed -e 's,all-local: all-once,all-local:,' \ + -e 's,install-data-local: install-data-once,install-data-local:,' \ ++ -e 's,install-exec-local:.*,install-exec-local:,' \ + -e 's,src/c,src/debug/c,' \ + < Makefile.tmp > Makefile ; \ + $(MAKE) CXXFLAGS='$(DEBUG_FLAGS)' \ +@@ -855,6 +858,11 @@ + (cd ${debugdir} && $(MAKE) CXXFLAGS='$(DEBUG_FLAGS)' \ + toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install) ; -+install-exec-local: -+ $(AR) cru libstdc++_pic.a .libs/*.o $(top_builddir)/libsupc++/*.o || touch libstdc++_pic.a ++install-exec-local: $(STAMP_INSTALL_PIC) ++$(STAMP_INSTALL_PIC): + $(MKDIR_P) $(DESTDIR)$(toolexeclibdir) -+ $(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir) ++ $(INSTALL_DATA) .libs/libstdc++convenience.a $(DESTDIR)$(toolexeclibdir)/libstdc++_pic.a + - # Added bits to build debug library. - @GLIBCXX_BUILD_DEBUG_TRUE@all-local: build_debug - @GLIBCXX_BUILD_DEBUG_TRUE@install-data-local: install_debug + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: diff -Nru gcc-snapshot-20120107/debian/rules2 gcc-snapshot-20120228/debian/rules2 --- gcc-snapshot-20120107/debian/rules2 2012-02-29 02:13:52.000000000 +0000 +++ gcc-snapshot-20120228/debian/rules2 2012-02-29 02:13:56.000000000 +0000 @@ -487,7 +487,14 @@ --with-headers=/$(PFL)/include \ --with-libs=/$(PFL)/lib endif + # FIXME: dpkg-shlibdeps doesn't work without this SET_CROSS_LIB_PATH = LD_LIBRARY_PATH=/lib:/usr/lib:$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}/$(PF)/$(DEB_TARGET_GNU_TYPE)/lib$${DIRNAME} + ifeq ($(DEB_TARGET_ARCH),armel) + SET_CROSS_LIB_PATH = LD_LIBRARY_PATH=/lib:/usr/lib:$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}/$(PF)/$(DEB_TARGET_GNU_TYPE)/lib$${DIRNAME}:/$(PF)/arm-linux-gnueabihf/lib + endif + ifeq ($(DEB_TARGET_ARCH),armhf) + SET_CROSS_LIB_PATH = LD_LIBRARY_PATH=/lib:/usr/lib:$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}/$(PF)/$(DEB_TARGET_GNU_TYPE)/lib$${DIRNAME}:/$(PF)/arm-linux-gnueabi/lib + endif endif ifeq ($(with_bootstrap),off) diff -Nru gcc-snapshot-20120107/debian/rules.conf gcc-snapshot-20120228/debian/rules.conf --- gcc-snapshot-20120107/debian/rules.conf 2012-02-29 02:13:52.000000000 +0000 +++ gcc-snapshot-20120228/debian/rules.conf 2012-02-29 02:13:56.000000000 +0000 @@ -145,11 +145,8 @@ #BINUTILS_BUILD_DEP += , binutils-gold (>= $(BINUTILSV)) [$(gold_archs)] # libc-dev dependencies -libc_ver := 2.5 +libc_ver := 2.11 libc_dev_ver := $(libc_ver) -ifneq (,$(findstring gnat,$(PKGSOURCE))) - libc_ver := 2.9-21 -endif ifeq ($(with_multiarch_lib),yes) ifeq ($(distribution),Debian) libc_dev_ver := 2.13-5 @@ -788,6 +785,7 @@ echo 'binutils:Version=$(BINUTILSV)'; \ echo 'dep:libgcc=$(LIBGCC_DEP)'; \ echo 'dep:libgccbiarch=$(LIBGCC_BIARCH_DEP)'; \ + echo 'dep:libc=$(LIBC_DEP) (>= $(libc_ver))'; \ echo 'dep:libcdev=$(LIBC_DEV_DEP)'; \ echo 'dep:libcbiarch=$(LIBC_BIARCH_DEP)'; \ echo 'dep:libcbiarchdev=$(LIBC_BIARCH_DEV_DEP)'; \ diff -Nru gcc-snapshot-20120107/debian/rules.d/binary-libstdcxx.mk gcc-snapshot-20120228/debian/rules.d/binary-libstdcxx.mk --- gcc-snapshot-20120107/debian/rules.d/binary-libstdcxx.mk 2012-02-29 02:13:52.000000000 +0000 +++ gcc-snapshot-20120228/debian/rules.d/binary-libstdcxx.mk 2012-02-29 02:13:56.000000000 +0000 @@ -86,6 +86,7 @@ dirs_dbg = \ $(docdir) \ + $(PF)/lib/debug/$(usr_lib) \ $(usr_lib)/debug \ $(gcc_lib_dir) files_dbg = \ @@ -183,12 +184,13 @@ rm -rf $(d_d) dh_installdirs -p$(p_d) \ + $(PF)/lib/debug/$(usr_lib$(2)) \ $(usr_lib$(2)) cp -p $(d)/$(usr_lib$(2))/libstdc++.so.*.py \ - $(d_d)/$(usr_lib$(2))/.; + $(d_d)/$(PF)/lib/debug/$(usr_lib$(2))/.; $(if $(filter yes,$(with_lib$(2)cxx)), - cp -p $(d)/$(usr_lib$(2))/libstdc++.so.*[0-9] \ + cp -a $(d)/$(usr_lib$(2))/libstdc++.so.*[0-9] \ $(d_d)/$(usr_lib$(2))/.; dh_strip -p$(p_d) --keep-debug; $(if $(filter yes,$(with_common_libs)),, # if !with_common_libs @@ -324,9 +326,9 @@ $(d_pic)/$(gcc_lib_dir)/libstdc++_pic.map cp -p $(d)/$(usr_lib)/libstdc++.so.*.py \ - $(d_dbg)/$(usr_lib)/ + $(d_dbg)/$(PF)/lib/debug/$(usr_lib)/ ifeq ($(with_libcxx),yes) - cp -p $(d)/$(usr_lib)/libstdc++.so.*[0-9] \ + cp -a $(d)/$(usr_lib)/libstdc++.so.*[0-9] \ $(d_dbg)/$(usr_lib)/ dh_strip -p$(p_dbg) --keep-debug rm -f $(d_dbg)/$(usr_lib)/libstdc++.so.*[0-9] diff -Nru gcc-snapshot-20120107/debian/rules.defs gcc-snapshot-20120228/debian/rules.defs --- gcc-snapshot-20120107/debian/rules.defs 2012-02-29 02:13:52.000000000 +0000 +++ gcc-snapshot-20120228/debian/rules.defs 2012-02-29 02:13:56.000000000 +0000 @@ -125,7 +125,7 @@ DEB_CROSS = yes else # first ones are squeeze+1 and maverick - ifeq (,$(filter $(distrelease),lenny etch squeeze sid dapper hardy jaunty karmic lucid)) + ifeq (,$(filter $(distrelease),lenny etch squeeze dapper hardy jaunty karmic lucid)) with_sysroot = / endif endif @@ -739,7 +739,8 @@ go_no_cross := yes go_no_cross := no -go_no_cpus := avr arm hppa ia64 m68k mips mipsel powerpc ppc64 s390 s390x sh4 sparc sparc64 +go_no_cpus := avr hppa ia64 m68k mips mipsel ppc64 s390 s390x sh4 sparc sparc64 +go_no_cpus := avr arm hppa m68k sh4 sparc sparc64 ifneq ($(trunk_build),yes) go_no_cpus := := $(go_no_cpus) alpha endif @@ -839,7 +840,6 @@ ifeq ($(distribution),Ubuntu) GFDL_INVARIANT_FREE := no endif -GFDL_INVARIANT_FREE := no # ------------------------------------------------------------------- # non-extra config @@ -858,8 +858,7 @@ # libssp ------------------ ifeq ($(with_ssp)-$(with_common_libs),yes-yes) #ifneq ($(DEB_CROSS),yes) - with_libssp := $(if $(wildcard $(builddir)/gcc/auto-host.h), \ - $(shell if grep -qs '^\#define TARGET_LIBC_PROVIDES_SSP 1' $(builddir)/gcc/auto-host.h; then echo 'libc provides ssp'; else echo 'yes'; fi)) + with_libssp := $(if $(wildcard $(builddir)/gcc/auto-host.h),$(shell if grep -qs '^\#define TARGET_LIBC_PROVIDES_SSP 1' $(builddir)/gcc/auto-host.h; then echo 'libc provides ssp'; else echo 'yes'; fi)) #endif endif diff -Nru gcc-snapshot-20120107/debian/rules.parameters gcc-snapshot-20120228/debian/rules.parameters --- gcc-snapshot-20120107/debian/rules.parameters 2012-02-29 02:13:52.000000000 +0000 +++ gcc-snapshot-20120228/debian/rules.parameters 2012-02-29 02:13:56.000000000 +0000 @@ -2,15 +2,15 @@ GCC_VERSION := 4.7.0 NEXT_GCC_VERSION := 4.7.1 BASE_VERSION := 4.7 -SOURCE_VERSION := 20120107-0ubuntu1 -DEB_VERSION := 20120107-0ubuntu1 -DEB_EVERSION := 1:20120107-0ubuntu1 +SOURCE_VERSION := 20120228-1 +DEB_VERSION := 20120228-1 +DEB_EVERSION := 1:20120228-1 GDC_BASE_VERSION := DEB_GDC_VERSION := DEB_SOVERSION := 4.7 DEB_SOEVERSION := 1:4.7 DEB_LIBGCC_SOVERSION := 1:4.7 -DEB_LIBGCC_VERSION := 1:20120107-0ubuntu1 +DEB_LIBGCC_VERSION := 1:20120228-1 DEB_STDCXX_SOVERSION := 4.7 DEB_GCJ_SOVERSION := 4.7 PKG_GCJ_EXT := 13 diff -Nru gcc-snapshot-20120107/debian/rules.patch gcc-snapshot-20120228/debian/rules.patch --- gcc-snapshot-20120107/debian/rules.patch 2012-02-29 02:13:52.000000000 +0000 +++ gcc-snapshot-20120228/debian/rules.patch 2012-02-29 02:13:56.000000000 +0000 @@ -76,6 +76,7 @@ libffi-powerpc-sf \ libffi-powerpc-sysv-without-string-ops \ mudflapth-link \ + libffi-m68k \ # gcc-cloog-dl \ # $(if $(filter yes, $(DEB_CROSS)),,gcc-print-file-name) \ @@ -173,10 +174,6 @@ debian_patches += powerpc_remove_many endif -ifeq ($(DEB_TARGET_ARCH_OS),kfreebsd) - debian_patches += kbsd-gnu -endif - ifeq ($(DEB_TARGET_ARCH),ppc64) ifeq ($(distribution),Ubuntu) #debian_patches += ibm-branch @@ -197,6 +194,8 @@ debian_patches = endif +debian_patches += gcc-sysroot +debian_patches += libgo-mksysinfo debian_patches += arm-dynamic-linker ifeq ($(with_softfloat),yes) debian_patches += arm-multilib-soft-float @@ -264,7 +263,6 @@ debian_patches += gcc-ppc64-O3 endif endif -debian_patches += gcc-system-root debian_patches += libgomp-kfreebsd-testsuite debian_patches += armhf-triplet Binary files /tmp/hRG0io4Krp/gcc-snapshot-20120107/gcc-20120107.tar.xz and /tmp/ErKIrAg6xI/gcc-snapshot-20120228/gcc-20120107.tar.xz differ Binary files /tmp/hRG0io4Krp/gcc-snapshot-20120107/gcc-20120228.tar.xz and /tmp/ErKIrAg6xI/gcc-snapshot-20120228/gcc-20120228.tar.xz differ