diff -urN h/gcc-4.2-4.2.3/debian/changelog gcc-4.2-4.2.4/debian/changelog --- h/gcc-4.2-4.2.3/debian/changelog 2008-09-09 15:05:00.000000000 +0000 +++ gcc-4.2-4.2.4/debian/changelog 2008-09-09 15:23:02.000000000 +0000 @@ -1,3 +1,125 @@ +gcc-4.2 (4.2.4-1ubuntu1~ppa3) hardy; urgency=low + + * Fix PR libgomp/28432. LP: #235070 (updated patch). + + -- Matthias Klose Tue, 09 Sep 2008 17:25:33 +0200 + +gcc-4.2 (4.2.4-1ubuntu1~ppa1) hardy; urgency=low + + * Upload to hardy-proposed. LP: #264515. + * Fixes included in the 4.2.4 upstream release (compared to 4.2.3-3ubuntu7): + - Fix LP: #256797, wrong-code on ia32, taken from the gcc-4_2-branch. + - Fix PR middle-end/36093, wrong-code, taken from the gcc-4_2-branch. + - Fix PR bootstrap/35169, PR c/35744, PR c/35436, PR c++/35578. + * Fix PR target/36634, wrong-code on powerpc, taken from the gcc-4_2 branch. + * Fix PR middle-end/35432, ice-on-valid-code, taken from the gcc-4_2-branch. + * Fix PR target/37101, wrong-code, taken from the gcc-4_2-branch. + * gij/gcj: Don't remove alternatives on upgrade. Addresses: #479950. + * Update patch for PR other/28322, that unknown -Wno-* options do not + cause errors, but warnings instead. + * Suggest the correct libmudflap0-dbg package. + * Fix PR libgcj/36252, taken from the gcc-4_3-branch. + * Fix PR libjava/35020, taken from the trunk. + * Fix cross builds targeting powerpc and i486 biarch (Hector Oron). + Closes: #483906. + * Include library symlinks in gobjc and gfortran multilib packages, when + not building the library packages. + * Fix PR libgomp/28432. LP: #235070. + + -- Matthias Klose Thu, 04 Sep 2008 14:02:27 +0200 + +gcc-4.2 (4.2.4-1) unstable; urgency=low + + [Arthur Loiret] + * Update gdc to upstream SVN 20080427. + - Don't use svn-gdc-updates this time, new orig tarball. + + [Matthias Klose] + * Update to SVN 20080520 from the ubuntu/gcc-4_2-branch, corresponding + to the GCC-4.2.4 release. + - Addresses CERT Vulnerability Note VU#162289. + - Gets rid of the large diff confusing some people. + * Don't build Obj-C++ on armel. + * Use iceape-dev as a build dependency for Java enabled builds. + + -- Matthias Klose Wed, 21 May 2008 09:56:32 +0200 + +gcc-4.2 (4.2.4-0ubuntu2) intrepid; urgency=low + + * Don't build packages now built by gcc-4.3. + + -- Matthias Klose Wed, 21 May 2008 02:25:34 +0200 + +gcc-4.2 (4.2.4-0ubuntu1) intrepid; urgency=low + + * Update to SVN 20080520 from the ubuntu/gcc-4_2-branch, corresponding + to the GCC-4.2.4 release. + + -- Matthias Klose Tue, 20 May 2008 14:00:29 +0200 + +gcc-4.2 (4.2.3-5) unstable; urgency=low + + [Matthias Klose] + * Fix a build failure on alpha, arm and hppa. + + [Arthur Loiret] + * Support sh4 targets: + - sh4-multilib.dpatch: Add, fix multilib (m4/m4-nofpu) for sh4-linux + - multiarch-include.dpatch: Don't apply on sh4. + + -- Matthias Klose Thu, 01 May 2008 08:21:01 +0200 + +gcc-4.2 (4.2.3-4ubuntu1) intrepid; urgency=low + + * Merge with Debian; remaining changes: + - Built from upstram tarball, regenerate control file. + + -- Matthias Klose Tue, 29 Apr 2008 07:45:26 +0200 + +gcc-4.2 (4.2.3-4) unstable; urgency=low + + * Update to SVN 20080420 from the ubuntu/gcc-4_2-branch. + - Fix PR middle-end/35163, wrong code, folding comparison loses cast. + - Remove pr34688.dpatch, applied upstream. + * Add gcc-multilib64dir patch, remove ppc64-biarch patch; gcc + -print-multi-os-directory prints `../lib' again. + * Add four more symbols to libgcj_bc, patch taken from the trunk. + * Fix alternative names for amd64 cross builds. Closes: #466422. + * debian/copyright: Update to GPLv3, remove the text of the GFDL + and reference the copy in common-licenses. Closes: #454487. + * Generate the locale data for the testsuite, if the locales package + is installed (not a dependency on all archs). + * Stop building gij/gcj on alpha, arm and hppa. + + -- Matthias Klose Sat, 26 Apr 2008 01:12:20 +0200 + +gcc-4.2 (4.2.3-3) unstable; urgency=low + + [Matthias Klose] + * Update to SVN 20080322 from the ubuntu/gcc-4_2-branch. + - Fix PR target/26149, testsuite failures in libgomp with -m32. + - libjava/link.cc: Remove broken code that attempts to enforce + linker constraints. Addresses: #432541. + - debian/patches/amd64-biarch.dpatch: Remove. + - debian/patches/{powerpc,ppc64}-biarch.dpatch: Update. + * libgnatprj4.2-dev: Depend on libgnatvsn4.2-dev instead of libgnatvsn-dev. + * Include the biarch libobjc_gc library in the packages. + * Link libobjc_gc with libgcjgc_convenience.la. + * Update PR other/28322, ignore only unknown -W* options. + * debian/rules.unpack: Avoid make warnings. + * gcj-4.2: Hardcode libgcj-bc dependency, don't run dh_shlibdeps on ecj1. + * debian/rules2: The build is not yet prepared to take variables from + the environment; unexport and unset those. + * Stop building treelang (removed upstream). + + [Aurelien Jarno] + * debian/rules.patch: don't apply amd64-biarch.dpatch on kfreebsd-amd64. + + [Arthur Loiret] + * Update gdc to upstream SVN 20080312. + + -- Matthias Klose Sun, 23 Mar 2008 19:18:51 +0100 + gcc-4.2 (4.2.3-2ubuntu7) hardy; urgency=low * Update to SVN 20080329 from the ubuntu/gcc-4_2-branch. diff -urN h/gcc-4.2-4.2.3/debian/control gcc-4.2-4.2.4/debian/control --- h/gcc-4.2-4.2.3/debian/control 2008-09-09 15:05:00.000000000 +0000 +++ gcc-4.2-4.2.4/debian/control 2008-09-04 08:41:36.000000000 +0000 @@ -4,8 +4,8 @@ Maintainer: Ubuntu Core developers XSBC-Original-Maintainer: Debian GCC Maintainers Uploaders: Matthias Klose -Standards-Version: 3.7.2 -Build-Depends: dpkg-dev (>= 1.14.15), debhelper (>= 5.0.62), gcc-multilib [amd64 i386 powerpc ppc64 s390 sparc kfreebsd-amd64], libc6.1-dev (>= 2.5) [alpha ia64] | libc0.3-dev (>= 2.5) [hurd-i386] | libc0.1-dev (>= 2.5) [kfreebsd-i386 kfreebsd-amd64 knetbsd-gnu] | libc12-dev (>= 2.5) [netbsd-elf-gnu] | libc6-dev (>= 2.5), libc6-dev-amd64 [i386], libc6-dev-sparc64 [sparc], 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], lib64gcc1 [i386 powerpc sparc s390], libunwind7-dev (>= 0.98.5-6) [ia64], libatomic-ops-dev [ia64], m4, autoconf, autoconf2.13, automake1.9, libtool, autogen, gawk, dejagnu [!none !hurd-i386], lzma, binutils (>= 2.17cvs20070426) | binutils-multiarch (>= 2.17cvs20070426), binutils-hppa64 (>= 2.17cvs20070426) [hppa], gperf (>= 3.0.1), bison (>= 1:2.3), flex, gettext, texinfo (>= 4.3), libmpfr-dev (>= 2.3.0~rc1.dfsg.1) [!avr], locales [!hurd-i386 !knetbsd-i386 !netbsd-i386 !m68k], procps [!hurd-i386], sharutils, realpath (>= 1.9.12), chrpath, lsb-release, make (>= 3.81) +Standards-Version: 3.7.3 +Build-Depends: dpkg-dev (>= 1.14.15), debhelper (>= 5.0.62), gcc-multilib [amd64 i386 powerpc ppc64 s390 sparc kfreebsd-amd64], libc6.1-dev (>= 2.5) [alpha ia64] | libc0.3-dev (>= 2.5) [hurd-i386] | libc0.1-dev (>= 2.5) [kfreebsd-i386 kfreebsd-amd64] | libc6-dev (>= 2.5), libc6-dev-amd64 [i386], libc6-dev-sparc64 [sparc], 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], lib64gcc1 [i386 powerpc sparc s390], libunwind7-dev (>= 0.98.5-6) [ia64], libatomic-ops-dev [ia64], m4, autoconf, autoconf2.13, automake1.9, libtool, autogen, gawk, dejagnu [!hurd-i386], lzma, binutils (>= 2.17cvs20070426) | binutils-multiarch (>= 2.17cvs20070426), binutils-hppa64 (>= 2.17cvs20070426) [hppa], gperf (>= 3.0.1), bison (>= 1:2.3), flex, gettext, texinfo (>= 4.3), libmpfr-dev (>= 2.3.0~rc1.dfsg.1) [!avr], locales [!hurd-i386 !m68k], procps [!hurd-i386], sharutils, realpath (>= 1.9.12), chrpath, lsb-release, make (>= 3.81) Build-Depends-Indep: doxygen (>= 1.4.2), graphviz (>= 2.2), gsfonts-x11, texlive-latex-base, Package: gcc-4.2-base @@ -114,7 +114,7 @@ Priority: optional Depends: gcc-4.2-base (= ${gcc:Version}), cpp-4.2 (= ${gcc:Version}), binutils (>= ${binutils:Version}), ${dep:libgcc}, ${dep:libssp}, ${dep:libgomp}, ${dep:libunwinddev}, ${shlibs:Depends} Recommends: ${dep:libcdev} -Suggests: ${gcc:multilib}, libmudflap0-4.2-dev (>= ${gcc:Version}), gcc-4.2-doc (>= ${gcc:SoftVersion}), gcc-4.2-locales (>= ${gcc:SoftVersion}), libgcc1-dbg, libgomp1-dbg, libmudflap0-4.2-dbg +Suggests: ${gcc:multilib}, libmudflap0-4.2-dev (>= ${gcc:Version}), gcc-4.2-doc (>= ${gcc:SoftVersion}), gcc-4.2-locales (>= ${gcc:SoftVersion}), libgcc1-dbg, libgomp1-dbg, libmudflap0-dbg Replaces: gcc-4.2-base (<< 4.2.1-5) Provides: c-compiler Description: The GNU C compiler @@ -660,7 +660,7 @@ Architecture: any Section: libdevel Priority: extra -Depends: gcc-4.2-base (= ${gcc:Version}), libstdc++6 (>= ${gcc:Version}), libgcc1-dbg +Depends: gcc-4.2-base (= ${gcc:Version}), libstdc++6 (>= ${gcc:Version}), libgcc1-dbg, ${shlibs:Depends} Recommends: libstdc++6-4.2-dev (= ${gcc:Version}) Conflicts: libstdc++5-dbg, libstdc++5-3.3-dbg, libstdc++6-dbg, libstdc++6-4.0-dbg, libstdc++6-4.1-dbg Description: The GNU Standard C++ Library v3 (debugging files) @@ -671,7 +671,7 @@ Architecture: amd64 ppc64 kfreebsd-amd64 Section: libdevel Priority: extra -Depends: gcc-4.2-base (= ${gcc:Version}), lib32stdc++6 (>= ${gcc:Version}), libstdc++6-4.2-dev (= ${gcc:Version}), lib32gcc1-dbg +Depends: gcc-4.2-base (= ${gcc:Version}), lib32stdc++6 (>= ${gcc:Version}), libstdc++6-4.2-dev (= ${gcc:Version}), lib32gcc1-dbg, ${shlibs:Depends} Conflicts: lib32stdc++6-dbg, lib32stdc++6-4.0-dbg, lib32stdc++6-4.1-dbg Description: The GNU Standard C++ Library v3 (debugging files) This package contains the shared library of libstdc++ compiled with @@ -681,7 +681,7 @@ Architecture: i386 powerpc sparc s390 Section: libdevel Priority: extra -Depends: gcc-4.2-base (= ${gcc:Version}), lib64stdc++6 (>= ${gcc:Version}), libstdc++6-4.2-dev (= ${gcc:Version}), lib64gcc1-dbg +Depends: gcc-4.2-base (= ${gcc:Version}), lib64stdc++6 (>= ${gcc:Version}), libstdc++6-4.2-dev (= ${gcc:Version}), lib64gcc1-dbg, ${shlibs:Depends} Conflicts: lib64stdc++6-dbg, lib64stdc++6-4.0-dbg, lib64stdc++6-4.1-dbg Description: The GNU Standard C++ Library v3 (debugging files) This package contains the shared library of libstdc++ compiled with diff -urN h/gcc-4.2-4.2.3/debian/control.m4 gcc-4.2-4.2.4/debian/control.m4 --- h/gcc-4.2-4.2.3/debian/control.m4 2008-09-09 15:05:00.000000000 +0000 +++ gcc-4.2-4.2.4/debian/control.m4 2008-09-04 08:50:52.000000000 +0000 @@ -44,7 +44,7 @@ ', `dnl Uploaders: Matthias Klose ')dnl SRCNAME -Standards-Version: 3.7.2 +Standards-Version: 3.7.3 ifdef(`TARGET',`dnl cross Build-Depends: dpkg-dev (>= 1.13.9), dpkg-cross (>= 1.25.99), LIBC_BUILD_DEP, LIBC_BIARCH_BUILD_DEP LIBUNWIND_BUILD_DEP LIBATOMIC_OPS_BUILD_DEP m4, autoconf, autoconf2.13, automake1.9, libtool, autogen, gawk, lzma, BINUTILS_BUILD_DEP, debhelper (>= 5.0), bison (>= 1:2.3), flex, realpath (>= 1.9.12), lsb-release, make (>= 3.81) ',`dnl native @@ -329,7 +329,7 @@ Priority: ifdef(`TARGET',`extra',`PRI(optional)') Depends: BASEDEP, cpp`'PV`'TS (= ${gcc:Version}), binutils`'TS (>= ${binutils:Version}), ${dep:libgcc}, ${dep:libssp}, ${dep:libgomp}, ${dep:libunwinddev}, ${shlibs:Depends} Recommends: ${dep:libcdev} -Suggests: ${gcc:multilib}, libmudflap`'MF_SO`'PV-dev`'LS (>= ${gcc:Version}), gcc`'PV-doc (>= ${gcc:SoftVersion}), gcc`'PV-locales (>= ${gcc:SoftVersion}), libgcc`'GCC_SO-dbg`'LS, libgomp`'GOMP_SO-dbg`'LS, libmudflap`'MF_SO`'PV-dbg`'LS +Suggests: ${gcc:multilib}, libmudflap`'MF_SO`'PV-dev`'LS (>= ${gcc:Version}), gcc`'PV-doc (>= ${gcc:SoftVersion}), gcc`'PV-locales (>= ${gcc:SoftVersion}), libgcc`'GCC_SO-dbg`'LS, libgomp`'GOMP_SO-dbg`'LS, libmudflap`'MF_SO-dbg`'LS Replaces: gcc`'PV`'TS-base (<< 4.2.1-5) Provides: c-compiler`'TS Description: The GNU C compiler`'ifdef(`TARGET)',` (cross compiler for TARGET architecture)', `') @@ -450,6 +450,7 @@ ifdef(`TARGET', `', ` ifenabled(`mudflap',` +ifenabled(`libmudf',` Package: libmudflap`'MF_SO Architecture: any Section: libs @@ -505,6 +506,7 @@ Description: GCC mudflap shared support libraries (64 bit debug symbols) The libmudflap libraries are used by GCC for instrumenting pointer and array dereferencing operations. +')`'dnl Package: libmudflap`'MF_SO`'PV-dev Architecture: any @@ -1219,7 +1221,7 @@ Architecture: ifdef(`TARGET',`all',`any') Section: ifdef(`TARGET',`devel',`libdevel') Priority: extra -Depends: BASEDEP, libstdc++CXX_SO`'LS (>= ${gcc:Version}), libgcc`'GCC_SO-dbg`'LS +Depends: BASEDEP, libstdc++CXX_SO`'LS (>= ${gcc:Version}), libgcc`'GCC_SO-dbg`'LS, ${shlibs:Depends} ifdef(`TARGET',`Provides: libstdc++CXX_SO-dbg-TARGET-dcv1 ',`')`'dnl Recommends: libstdc++CXX_SO`'PV-dev`'LS (= ${gcc:Version}) @@ -1237,7 +1239,7 @@ Architecture: ifdef(`TARGET',`all',`biarch32_archs') Section: ifdef(`TARGET',`devel',`libdevel') Priority: extra -Depends: BASEDEP, lib32stdc++CXX_SO`'LS (>= ${gcc:Version}), libstdc++CXX_SO`'PV-dev`'LS (= ${gcc:Version}), lib32gcc`'GCC_SO-dbg`'LS +Depends: BASEDEP, lib32stdc++CXX_SO`'LS (>= ${gcc:Version}), libstdc++CXX_SO`'PV-dev`'LS (= ${gcc:Version}), lib32gcc`'GCC_SO-dbg`'LS, ${shlibs:Depends} ifdef(`TARGET',`Provides: lib32stdc++CXX_SO-dbg-TARGET-dcv1 ',`')`'dnl Conflicts: lib32stdc++6-dbg`'LS, lib32stdc++6-4.0-dbg`'LS, lib32stdc++6-4.1-dbg`'LS @@ -1254,7 +1256,7 @@ Architecture: ifdef(`TARGET',`all',`biarch64_archs') Section: ifdef(`TARGET',`devel',`libdevel') Priority: extra -Depends: BASEDEP, lib64stdc++CXX_SO`'LS (>= ${gcc:Version}), libstdc++CXX_SO`'PV-dev`'LS (= ${gcc:Version}), lib64gcc`'GCC_SO-dbg`'LS +Depends: BASEDEP, lib64stdc++CXX_SO`'LS (>= ${gcc:Version}), libstdc++CXX_SO`'PV-dev`'LS (= ${gcc:Version}), lib64gcc`'GCC_SO-dbg`'LS, ${shlibs:Depends} ifdef(`TARGET',`Provides: lib64stdc++CXX_SO-dbg-TARGET-dcv1 ',`')`'dnl Conflicts: lib64stdc++6-dbg`'LS, lib64stdc++6-4.0-dbg`'LS, lib64stdc++6-4.1-dbg`'LS diff -urN h/gcc-4.2-4.2.3/debian/copyright gcc-4.2-4.2.4/debian/copyright --- h/gcc-4.2-4.2.3/debian/copyright 2008-09-09 15:05:00.000000000 +0000 +++ gcc-4.2-4.2.4/debian/copyright 2008-09-02 19:23:29.000000000 +0000 @@ -8,13 +8,7 @@ ftp://gcc.gnu.org/pub/gcc/releases/ (for full releases) svn://gcc.gnu.org/svn/gcc/ (for prereleases) http://gnu-pascal.de/alpha/ (for GNU Pascal) - --- ! -- ! -- ! -- ! -- ! -- ! -- ! -- ! -- ! -- ! -- ! -- ! -- ! -- ! -- ! -- ! - The GCC source are currently moved to the GPLv3 /LGPLv3 license; this is - still ongoing; this copyright file still references the GPLv2/LGPLv2 - licenses. On Debian GNU/Linux systems, the complete text of the v3 licenses - can be found in `/usr/share/common-licenses/{LGPL,GPL}3'. --- ! -- ! -- ! -- ! -- ! -- ! -- ! -- ! -- ! -- ! -- ! -- ! -- ! -- ! -- ! -- ! + http://dgcc.sourceforge.net/ (for D) The current gcc-4.2 source package is taken from the ubuntu/gcc-4_2-branch; the branch is an unmodified gcc-4_2-branch, with the Java stuff (gcc/java, @@ -91,25 +85,26 @@ GCC is Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, -1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 -Free Software Foundation, Inc. +1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, +2008 Free Software Foundation, Inc. -This program is free software; you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the -Free Software Foundation; either version 2, or (at your option) any -later version. +GCC is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; either version 3, or (at your option) any later +version. + +GCC is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. +Files that have exception clauses are licensed under the terms of the +GNU General Public License; either version 2, or (at your option) any +later version. On Debian GNU/Linux systems, the complete text of the GNU General -Public License is in `/usr/share/common-licenses/GPL'. +Public License is in `/usr/share/common-licenses/GPL', version 2 of this +license in `/usr/share/common-licenses/GPL-2'. The libstdc++-v3 library is licensed under the terms of the GNU General Public License, with this special exception: @@ -276,434 +271,6 @@ OTHER DEALINGS IN THE SOFTWARE. -The documentation is licensed under the GNU Free Documentation License -(v1.2), appended at the end of this file. - - -GNU Free Documentation License -****************************** - - Version 1.2, November 2002 - Copyright (C) 2000,2001,2002 Free Software Foundation, Inc. - 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. - - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - 0. PREAMBLE - - The purpose of this License is to make a manual, textbook, or other - functional and useful document "free" in the sense of freedom: to - assure everyone the effective freedom to copy and redistribute it, - with or without modifying it, either commercially or - noncommercially. Secondarily, this License preserves for the - author and publisher a way to get credit for their work, while not - being considered responsible for modifications made by others. - - This License is a kind of "copyleft", which means that derivative - works of the document must themselves be free in the same sense. - It complements the GNU General Public License, which is a copyleft - license designed for free software. - - We have designed this License in order to use it for manuals for - free software, because free software needs free documentation: a - free program should come with manuals providing the same freedoms - that the software does. But this License is not limited to - software manuals; it can be used for any textual work, regardless - of subject matter or whether it is published as a printed book. - We recommend this License principally for works whose purpose is - instruction or reference. - - 1. APPLICABILITY AND DEFINITIONS - - This License applies to any manual or other work, in any medium, - that contains a notice placed by the copyright holder saying it - can be distributed under the terms of this License. Such a notice - grants a world-wide, royalty-free license, unlimited in duration, - to use that work under the conditions stated herein. The - "Document", below, refers to any such manual or work. Any member - of the public is a licensee, and is addressed as "you". You - accept the license if you copy, modify or distribute the work in a - way requiring permission under copyright law. - - A "Modified Version" of the Document means any work containing the - Document or a portion of it, either copied verbatim, or with - modifications and/or translated into another language. - - A "Secondary Section" is a named appendix or a front-matter section - of the Document that deals exclusively with the relationship of the - publishers or authors of the Document to the Document's overall - subject (or to related matters) and contains nothing that could - fall directly within that overall subject. (Thus, if the Document - is in part a textbook of mathematics, a Secondary Section may not - explain any mathematics.) The relationship could be a matter of - historical connection with the subject or with related matters, or - of legal, commercial, philosophical, ethical or political position - regarding them. - - The "Invariant Sections" are certain Secondary Sections whose - titles are designated, as being those of Invariant Sections, in - the notice that says that the Document is released under this - License. If a section does not fit the above definition of - Secondary then it is not allowed to be designated as Invariant. - The Document may contain zero Invariant Sections. If the Document - does not identify any Invariant Sections then there are none. - - The "Cover Texts" are certain short passages of text that are - listed, as Front-Cover Texts or Back-Cover Texts, in the notice - that says that the Document is released under this License. A - Front-Cover Text may be at most 5 words, and a Back-Cover Text may - be at most 25 words. - - A "Transparent" copy of the Document means a machine-readable copy, - represented in a format whose specification is available to the - general public, that is suitable for revising the document - straightforwardly with generic text editors or (for images - composed of pixels) generic paint programs or (for drawings) some - widely available drawing editor, and that is suitable for input to - text formatters or for automatic translation to a variety of - formats suitable for input to text formatters. A copy made in an - otherwise Transparent file format whose markup, or absence of - markup, has been arranged to thwart or discourage subsequent - modification by readers is not Transparent. An image format is - not Transparent if used for any substantial amount of text. A - copy that is not "Transparent" is called "Opaque". - - Examples of suitable formats for Transparent copies include plain - ASCII without markup, Texinfo input format, LaTeX input format, - SGML or XML using a publicly available DTD, and - standard-conforming simple HTML, PostScript or PDF designed for - human modification. Examples of transparent image formats include - PNG, XCF and JPG. Opaque formats include proprietary formats that - can be read and edited only by proprietary word processors, SGML or - XML for which the DTD and/or processing tools are not generally - available, and the machine-generated HTML, PostScript or PDF - produced by some word processors for output purposes only. - - The "Title Page" means, for a printed book, the title page itself, - plus such following pages as are needed to hold, legibly, the - material this License requires to appear in the title page. For - works in formats which do not have any title page as such, "Title - Page" means the text near the most prominent appearance of the - work's title, preceding the beginning of the body of the text. - - A section "Entitled XYZ" means a named subunit of the Document - whose title either is precisely XYZ or contains XYZ in parentheses - following text that translates XYZ in another language. (Here XYZ - stands for a specific section name mentioned below, such as - "Acknowledgements", "Dedications", "Endorsements", or "History".) - To "Preserve the Title" of such a section when you modify the - Document means that it remains a section "Entitled XYZ" according - to this definition. - - The Document may include Warranty Disclaimers next to the notice - which states that this License applies to the Document. These - Warranty Disclaimers are considered to be included by reference in - this License, but only as regards disclaiming warranties: any other - implication that these Warranty Disclaimers may have is void and - has no effect on the meaning of this License. - - 2. VERBATIM COPYING - - You may copy and distribute the Document in any medium, either - commercially or noncommercially, provided that this License, the - copyright notices, and the license notice saying this License - applies to the Document are reproduced in all copies, and that you - add no other conditions whatsoever to those of this License. You - may not use technical measures to obstruct or control the reading - or further copying of the copies you make or distribute. However, - you may accept compensation in exchange for copies. If you - distribute a large enough number of copies you must also follow - the conditions in section 3. - - You may also lend copies, under the same conditions stated above, - and you may publicly display copies. - - 3. COPYING IN QUANTITY - - If you publish printed copies (or copies in media that commonly - have printed covers) of the Document, numbering more than 100, and - the Document's license notice requires Cover Texts, you must - enclose the copies in covers that carry, clearly and legibly, all - these Cover Texts: Front-Cover Texts on the front cover, and - Back-Cover Texts on the back cover. Both covers must also clearly - and legibly identify you as the publisher of these copies. The - front cover must present the full title with all words of the - title equally prominent and visible. You may add other material - on the covers in addition. Copying with changes limited to the - covers, as long as they preserve the title of the Document and - satisfy these conditions, can be treated as verbatim copying in - other respects. - - If the required texts for either cover are too voluminous to fit - legibly, you should put the first ones listed (as many as fit - reasonably) on the actual cover, and continue the rest onto - adjacent pages. - - If you publish or distribute Opaque copies of the Document - numbering more than 100, you must either include a - machine-readable Transparent copy along with each Opaque copy, or - state in or with each Opaque copy a computer-network location from - which the general network-using public has access to download - using public-standard network protocols a complete Transparent - copy of the Document, free of added material. If you use the - latter option, you must take reasonably prudent steps, when you - begin distribution of Opaque copies in quantity, to ensure that - this Transparent copy will remain thus accessible at the stated - location until at least one year after the last time you - distribute an Opaque copy (directly or through your agents or - retailers) of that edition to the public. - - It is requested, but not required, that you contact the authors of - the Document well before redistributing any large number of - copies, to give them a chance to provide you with an updated - version of the Document. - - 4. MODIFICATIONS - - You may copy and distribute a Modified Version of the Document - under the conditions of sections 2 and 3 above, provided that you - release the Modified Version under precisely this License, with - the Modified Version filling the role of the Document, thus - licensing distribution and modification of the Modified Version to - whoever possesses a copy of it. In addition, you must do these - things in the Modified Version: - - A. Use in the Title Page (and on the covers, if any) a title - distinct from that of the Document, and from those of - previous versions (which should, if there were any, be listed - in the History section of the Document). You may use the - same title as a previous version if the original publisher of - that version gives permission. - - B. List on the Title Page, as authors, one or more persons or - entities responsible for authorship of the modifications in - the Modified Version, together with at least five of the - principal authors of the Document (all of its principal - authors, if it has fewer than five), unless they release you - from this requirement. - - C. State on the Title page the name of the publisher of the - Modified Version, as the publisher. - - D. Preserve all the copyright notices of the Document. - - E. Add an appropriate copyright notice for your modifications - adjacent to the other copyright notices. - - F. Include, immediately after the copyright notices, a license - notice giving the public permission to use the Modified - Version under the terms of this License, in the form shown in - the Addendum below. - - G. Preserve in that license notice the full lists of Invariant - Sections and required Cover Texts given in the Document's - license notice. - - H. Include an unaltered copy of this License. - - I. Preserve the section Entitled "History", Preserve its Title, - and add to it an item stating at least the title, year, new - authors, and publisher of the Modified Version as given on - the Title Page. If there is no section Entitled "History" in - the Document, create one stating the title, year, authors, - and publisher of the Document as given on its Title Page, - then add an item describing the Modified Version as stated in - the previous sentence. - - J. Preserve the network location, if any, given in the Document - for public access to a Transparent copy of the Document, and - likewise the network locations given in the Document for - previous versions it was based on. These may be placed in - the "History" section. You may omit a network location for a - work that was published at least four years before the - Document itself, or if the original publisher of the version - it refers to gives permission. - - K. For any section Entitled "Acknowledgements" or "Dedications", - Preserve the Title of the section, and preserve in the - section all the substance and tone of each of the contributor - acknowledgements and/or dedications given therein. - - L. Preserve all the Invariant Sections of the Document, - unaltered in their text and in their titles. Section numbers - or the equivalent are not considered part of the section - titles. - - M. Delete any section Entitled "Endorsements". Such a section - may not be included in the Modified Version. - - N. Do not retitle any existing section to be Entitled - "Endorsements" or to conflict in title with any Invariant - Section. - - O. Preserve any Warranty Disclaimers. - - If the Modified Version includes new front-matter sections or - appendices that qualify as Secondary Sections and contain no - material copied from the Document, you may at your option - designate some or all of these sections as invariant. To do this, - add their titles to the list of Invariant Sections in the Modified - Version's license notice. These titles must be distinct from any - other section titles. - - You may add a section Entitled "Endorsements", provided it contains - nothing but endorsements of your Modified Version by various - parties--for example, statements of peer review or that the text - has been approved by an organization as the authoritative - definition of a standard. - - You may add a passage of up to five words as a Front-Cover Text, - and a passage of up to 25 words as a Back-Cover Text, to the end - of the list of Cover Texts in the Modified Version. Only one - passage of Front-Cover Text and one of Back-Cover Text may be - added by (or through arrangements made by) any one entity. If the - Document already includes a cover text for the same cover, - previously added by you or by arrangement made by the same entity - you are acting on behalf of, you may not add another; but you may - replace the old one, on explicit permission from the previous - publisher that added the old one. - - The author(s) and publisher(s) of the Document do not by this - License give permission to use their names for publicity for or to - assert or imply endorsement of any Modified Version. - - 5. COMBINING DOCUMENTS - - You may combine the Document with other documents released under - this License, under the terms defined in section 4 above for - modified versions, provided that you include in the combination - all of the Invariant Sections of all of the original documents, - unmodified, and list them all as Invariant Sections of your - combined work in its license notice, and that you preserve all - their Warranty Disclaimers. - - The combined work need only contain one copy of this License, and - multiple identical Invariant Sections may be replaced with a single - copy. If there are multiple Invariant Sections with the same name - but different contents, make the title of each such section unique - by adding at the end of it, in parentheses, the name of the - original author or publisher of that section if known, or else a - unique number. Make the same adjustment to the section titles in - the list of Invariant Sections in the license notice of the - combined work. - - In the combination, you must combine any sections Entitled - "History" in the various original documents, forming one section - Entitled "History"; likewise combine any sections Entitled - "Acknowledgements", and any sections Entitled "Dedications". You - must delete all sections Entitled "Endorsements." - - 6. COLLECTIONS OF DOCUMENTS - - You may make a collection consisting of the Document and other - documents released under this License, and replace the individual - copies of this License in the various documents with a single copy - that is included in the collection, provided that you follow the - rules of this License for verbatim copying of each of the - documents in all other respects. - - You may extract a single document from such a collection, and - distribute it individually under this License, provided you insert - a copy of this License into the extracted document, and follow - this License in all other respects regarding verbatim copying of - that document. - - 7. AGGREGATION WITH INDEPENDENT WORKS - - A compilation of the Document or its derivatives with other - separate and independent documents or works, in or on a volume of - a storage or distribution medium, is called an "aggregate" if the - copyright resulting from the compilation is not used to limit the - legal rights of the compilation's users beyond what the individual - works permit. When the Document is included an aggregate, this - License does not apply to the other works in the aggregate which - are not themselves derivative works of the Document. - - If the Cover Text requirement of section 3 is applicable to these - copies of the Document, then if the Document is less than one half - of the entire aggregate, the Document's Cover Texts may be placed - on covers that bracket the Document within the aggregate, or the - electronic equivalent of covers if the Document is in electronic - form. Otherwise they must appear on printed covers that bracket - the whole aggregate. - - 8. TRANSLATION - - Translation is considered a kind of modification, so you may - distribute translations of the Document under the terms of section - 4. Replacing Invariant Sections with translations requires special - permission from their copyright holders, but you may include - translations of some or all Invariant Sections in addition to the - original versions of these Invariant Sections. You may include a - translation of this License, and all the license notices in the - Document, and any Warrany Disclaimers, provided that you also - include the original English version of this License and the - original versions of those notices and disclaimers. In case of a - disagreement between the translation and the original version of - this License or a notice or disclaimer, the original version will - prevail. - - If a section in the Document is Entitled "Acknowledgements", - "Dedications", or "History", the requirement (section 4) to - Preserve its Title (section 1) will typically require changing the - actual title. - - 9. TERMINATION - - You may not copy, modify, sublicense, or distribute the Document - except as expressly provided for under this License. Any other - attempt to copy, modify, sublicense or distribute the Document is - void, and will automatically terminate your rights under this - License. However, parties who have received copies, or rights, - from you under this License will not have their licenses - terminated so long as such parties remain in full compliance. - - 10. FUTURE REVISIONS OF THIS LICENSE - - The Free Software Foundation may publish new, revised versions of - the GNU Free Documentation License from time to time. Such new - versions will be similar in spirit to the present version, but may - differ in detail to address new problems or concerns. See - `http://www.gnu.org/copyleft/'. - - Each version of the License is given a distinguishing version - number. If the Document specifies that a particular numbered - version of this License "or any later version" applies to it, you - have the option of following the terms and conditions either of - that specified version or of any later version that has been - published (not as a draft) by the Free Software Foundation. If - the Document does not specify a version number of this License, - you may choose any version ever published (not as a draft) by the - Free Software Foundation. - -ADDENDUM: How to use this License for your documents -==================================================== - - To use this License in a document you have written, include a copy of -the License in the document and put the following copyright and license -notices just after the title page: - - Copyright (C) YEAR YOUR NAME. - Permission is granted to copy, distribute and/or modify this document - under the terms of the GNU Free Documentation License, Version 1.2 - or any later version published by the Free Software Foundation; - with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. - A copy of the license is included in the section entitled ``GNU - Free Documentation License''. - - If you have Invariant Sections, Front-Cover Texts and Back-Cover -Texts, replace the "with...Texts." line with this: - - with the Invariant Sections being LIST THEIR TITLES, with - the Front-Cover Texts being LIST, and with the Back-Cover Texts - being LIST. - - If you have Invariant Sections without Cover Texts, or some other -combination of the three, merge those two alternatives to suit the -situation. - - If your document contains nontrivial examples of program code, we -recommend releasing these examples in parallel under your choice of -free software license, such as the GNU General Public License, to -permit their use in free software. +The documentation is licensed under the GNU Free Documentation License (v1.2). +On Debian GNU/Linux systems, the complete text of this license is in +`/usr/share/common-licenses/GFDL-1.2'. diff -urN h/gcc-4.2-4.2.3/debian/gcj-BV.prerm gcc-4.2-4.2.4/debian/gcj-BV.prerm --- h/gcc-4.2-4.2.3/debian/gcj-BV.prerm 2008-09-09 15:05:00.000000000 +0000 +++ gcc-4.2-4.2.4/debian/gcj-BV.prerm 2008-09-02 19:23:29.000000000 +0000 @@ -1,12 +1,14 @@ #! /bin/sh -e -update-alternatives --quiet --remove javac /usr/bin/gcj-wrapper-@BV@ -update-alternatives --quiet --remove jar /usr/bin/gjar-@BV@ -update-alternatives --quiet --remove jarsigner /usr/bin/gjarsigner-@BV@ -update-alternatives --quiet --remove javah /usr/bin/gjavah-@BV@ -update-alternatives --quiet --remove native2ascii /usr/bin/gnative2ascii-@BV@ -update-alternatives --quiet --remove rmic /usr/bin/grmic-@BV@ -update-alternatives --quiet --remove tnameserv /usr/bin/gtnameserv-@BV@ +if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then + update-alternatives --quiet --remove javac /usr/bin/gcj-wrapper-@BV@ + update-alternatives --quiet --remove jar /usr/bin/gjar-@BV@ + update-alternatives --quiet --remove jarsigner /usr/bin/gjarsigner-@BV@ + update-alternatives --quiet --remove javah /usr/bin/gjavah-@BV@ + update-alternatives --quiet --remove native2ascii /usr/bin/gnative2ascii-@BV@ + update-alternatives --quiet --remove rmic /usr/bin/grmic-@BV@ + update-alternatives --quiet --remove tnameserv /usr/bin/gtnameserv-@BV@ +fi if [ -f /usr/share/info/gcj-@BV@.info.gz ]; then install-info --quiet --remove gcj-@BV@ diff -urN h/gcc-4.2-4.2.3/debian/gij-BV.prerm gcc-4.2-4.2.4/debian/gij-BV.prerm --- h/gcc-4.2-4.2.3/debian/gij-BV.prerm 2008-09-09 15:05:00.000000000 +0000 +++ gcc-4.2-4.2.4/debian/gij-BV.prerm 2008-09-02 19:23:29.000000000 +0000 @@ -1,11 +1,13 @@ #! /bin/sh -e -update-alternatives --quiet --remove java /usr/bin/gij-@BV@ -update-alternatives --quiet --remove rmiregistry /usr/bin/grmiregistry-@BV@ -update-alternatives --quiet --remove keytool /usr/bin/gkeytool-@BV@ -update-alternatives --quiet --remove orbd /usr/bin/gorbd-@BV@ -update-alternatives --quiet --remove rmid /usr/bin/grmid-@BV@ -update-alternatives --quiet --remove serialver /usr/bin/gserialver-@BV@ +if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then + update-alternatives --quiet --remove java /usr/bin/gij-@BV@ + update-alternatives --quiet --remove rmiregistry /usr/bin/grmiregistry-@BV@ + update-alternatives --quiet --remove keytool /usr/bin/gkeytool-@BV@ + update-alternatives --quiet --remove orbd /usr/bin/gorbd-@BV@ + update-alternatives --quiet --remove rmid /usr/bin/grmid-@BV@ + update-alternatives --quiet --remove serialver /usr/bin/gserialver-@BV@ +fi #DEBHELPER# diff -urN h/gcc-4.2-4.2.3/debian/libstdc++CXX-BV-doc.doc-base gcc-4.2-4.2.4/debian/libstdc++CXX-BV-doc.doc-base --- h/gcc-4.2-4.2.3/debian/libstdc++CXX-BV-doc.doc-base 2008-09-09 15:05:00.000000000 +0000 +++ gcc-4.2-4.2.4/debian/libstdc++CXX-BV-doc.doc-base 2008-09-02 19:23:29.000000000 +0000 @@ -6,7 +6,7 @@ source documentation including a namespace list, class hierarchy, alphabetical list, compound list, file list, namespace members, compound members and file members. -Section: Apps/Programming +Section: Programming/C++ Format: html Index: /usr/share/doc/libstdc++@CXX@-@BV@-doc/libstdc++/html_user/index.html diff -urN h/gcc-4.2-4.2.3/debian/libstdc++CXX-BV-doc.overrides gcc-4.2-4.2.4/debian/libstdc++CXX-BV-doc.overrides --- h/gcc-4.2-4.2.3/debian/libstdc++CXX-BV-doc.overrides 2008-09-09 15:05:00.000000000 +0000 +++ gcc-4.2-4.2.4/debian/libstdc++CXX-BV-doc.overrides 2008-09-02 19:23:29.000000000 +0000 @@ -1,2 +1,3 @@ libstdc++@CXX@-@BV@-doc: extra-license-file -libstdc++@CXX@-@BV@-doc: manpage-has-errors-from-man usr/share/man/man3/__gnu_internal.3.gz +libstdc++@CXX@-@BV@-doc: manpage-has-bad-whatis-entry +libstdc++@CXX@-@BV@-doc: hyphen-used-as-minus-sign diff -urN h/gcc-4.2-4.2.3/debian/patches/gcc-ssp-default.dpatch gcc-4.2-4.2.4/debian/patches/gcc-ssp-default.dpatch --- h/gcc-4.2-4.2.3/debian/patches/gcc-ssp-default.dpatch 2008-09-09 15:05:00.000000000 +0000 +++ gcc-4.2-4.2.4/debian/patches/gcc-ssp-default.dpatch 2008-09-02 19:23:29.000000000 +0000 @@ -31,7 +31,7 @@ If a guard check fails, an error message is printed and the program exits. +NOTE: In Ubuntu 6.10 and later versions this option is enabled by default -+for C, C++, ObjC, ObjC++, if neither @option{-no-fstack-protector} ++for C, C++, ObjC, ObjC++, if neither @option{-fno-stack-protector} +nor @option{-nostdlib} are found. + @item -fstack-protector-all diff -urN h/gcc-4.2-4.2.3/debian/patches/gdc-4.2.dpatch gcc-4.2-4.2.4/debian/patches/gdc-4.2.dpatch --- h/gcc-4.2-4.2.3/debian/patches/gdc-4.2.dpatch 2008-09-09 15:05:00.000000000 +0000 +++ gcc-4.2-4.2.4/debian/patches/gdc-4.2.dpatch 2008-09-02 19:23:29.000000000 +0000 @@ -30,7 +30,7 @@ --- gcc/DEV-PHASE 2008-02-03 20:06:28.000000000 +0000 +++ gcc/DEV-PHASE 2008-02-03 19:59:11.000000000 +0000 @@ -0,0 +1 @@ -+prerelease gdc 0.25 20071215, using dmd 1.022 ++prerelease gdc 0.25 20080312, using dmd 1.024 --- gcc/cgraph.c 2008-02-03 19:56:05.000000000 +0000 +++ gcc/cgraph.c 2008-02-03 19:57:27.000000000 +0000 @@ -198,6 +198,7 @@ diff -urN h/gcc-4.2-4.2.3/debian/patches/libgcj-bc.dpatch gcc-4.2-4.2.4/debian/patches/libgcj-bc.dpatch --- h/gcc-4.2-4.2.3/debian/patches/libgcj-bc.dpatch 1970-01-01 00:00:00.000000000 +0000 +++ gcc-4.2-4.2.4/debian/patches/libgcj-bc.dpatch 2008-09-02 19:23:29.000000000 +0000 @@ -0,0 +1,58 @@ +#! /bin/sh -e + +# DP: libgcj_bc + +dir= +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" + dir="$3/" +elif [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) + patch $pdir -f --no-backup-if-mismatch -p0 < $0 + ;; + -unpatch) + patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 + ;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + +2008-04-16 Andrew Haley + + * libgcj_bc.c: (_Jv_LookupInterfaceMethod, _Jv_MonitorExit, + _Jv_RegisterResource, _Jv_JNI_PopSystemFrame): Add. + +--- libjava/libgcj_bc.c~ 2008-04-18 09:50:42.194121373 +0200 ++++ libjava/libgcj_bc.c 2008-04-18 09:53:17.936470710 +0200 +@@ -33,7 +33,9 @@ + void _Jv_ResolvePoolEntry () {} + void _Jv_Throw () {} + void _Jv_MonitorEnter () {} ++void _Jv_MonitorExit () {} + void _Jv_NewPrimArray () {} ++void _Jv_RegisterResource () {} + void _Jv_NewObjectArray () {} + void _Jv_NewMultiArray () {} + void _Jv_ThrowBadArrayIndex () {} +@@ -43,6 +45,7 @@ + void _Jv_CheckCast () {} + void _Jv_IsInstanceOf () {} + void _Jv_CheckArrayStore () {} ++void _Jv_LookupInterfaceMethod () {} + void _Jv_LookupInterfaceMethodIdx () {} + + void _Jv_RegisterClasses () +@@ -66,6 +69,7 @@ + void _Jv_LookupJNIMethod () {} + void _Jv_GetJNIEnvNewFrame () {} + void _Jv_UnwrapJNIweakReference () {} ++void _Jv_JNI_PopSystemFrame () {} + + + /* Checked divide (-fuse-divide-subroutine). */ diff -urN h/gcc-4.2-4.2.3/debian/patches/libjava-extra-cflags.dpatch gcc-4.2-4.2.4/debian/patches/libjava-extra-cflags.dpatch --- h/gcc-4.2-4.2.3/debian/patches/libjava-extra-cflags.dpatch 1970-01-01 00:00:00.000000000 +0000 +++ gcc-4.2-4.2.4/debian/patches/libjava-extra-cflags.dpatch 2008-09-02 19:23:29.000000000 +0000 @@ -0,0 +1,817 @@ +#! /bin/sh -e + +# DP: libjava/classpath: Set and use EXTRA_CFLAGS. + +dir= +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" + dir="$3/" +elif [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) + patch $pdir -f --no-backup-if-mismatch -p0 < $0 + cd ${dir}libjava/classpath && aclocal -I m4 -I ../.. -I ../../config && autoconf -I m4 + ;; + -unpatch) + patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 + rm -f ${dir}libjava/classpath/configure + ;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + +2008-06-11 Andrew Haley + + * native/jawt/Makefile.am, + native/fdlibm/Makefile.am, + native/jni/java-util/Makefile.am, + native/jni/gstreamer-peer/Makefile.am, + native/jni/native-lib/Makefile.am, + native/jni/gconf-peer/Makefile.am, + native/jni/gtk-peer/Makefile.am, + native/jni/xmlj/Makefile.am, + native/jni/midi-alsa/Makefile.am, + native/jni/java-nio/Makefile.am, + native/jni/midi-dssi/Makefile.am, + native/jni/classpath/Makefile.am, + native/jni/java-io/Makefile.am, + native/jni/java-lang/Makefile.am, + native/jni/java-net/Makefile.am (AM_CFLAGS): Add @EXTRA_CFLAGS@. + * configure.ac (EXTRA_CFLAGS): New macro. + + * lib/Makefile.am (resources): Add .svn. + +Index: libjava/classpath/Makefile.in +=================================================================== +--- libjava/classpath/Makefile.in (revision 137051) ++++ libjava/classpath/Makefile.in (working copy) +@@ -178,6 +178,7 @@ + ERROR_CFLAGS = @ERROR_CFLAGS@ + EXAMPLESDIR = @EXAMPLESDIR@ + EXEEXT = @EXEEXT@ ++EXTRA_CFLAGS = @EXTRA_CFLAGS@ + FASTJAR = @FASTJAR@ + FIND = @FIND@ + FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@ +Index: libjava/classpath/native/jni/gstreamer-peer/Makefile.in +=================================================================== +--- libjava/classpath/native/jni/gstreamer-peer/Makefile.in (revision 137051) ++++ libjava/classpath/native/jni/gstreamer-peer/Makefile.in (working copy) +@@ -157,6 +157,7 @@ + ERROR_CFLAGS = @ERROR_CFLAGS@ + EXAMPLESDIR = @EXAMPLESDIR@ + EXEEXT = @EXEEXT@ ++EXTRA_CFLAGS = @EXTRA_CFLAGS@ + FASTJAR = @FASTJAR@ + FIND = @FIND@ + FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@ +@@ -345,7 +346,8 @@ + # gstreamer contain broken prototypes (by design). + AM_CFLAGS = @WARNING_CFLAGS@ -Wno-write-strings -Wno-missing-field-initializers \ + @ERROR_CFLAGS@ -Wno-unused-parameter @GSTREAMER_BASE_CFLAGS@ \ +- @GDK_CFLAGS@ @GSTREAMER_CFLAGS@ @GSTREAMER_PLUGINS_BASE_CFLAGS@ ++ @GDK_CFLAGS@ @GSTREAMER_CFLAGS@ @GSTREAMER_PLUGINS_BASE_CFLAGS@ \ ++ @EXTRA_CFLAGS@ + + all: all-am + +Index: libjava/classpath/native/jni/gstreamer-peer/Makefile.am +=================================================================== +--- libjava/classpath/native/jni/gstreamer-peer/Makefile.am (revision 137051) ++++ libjava/classpath/native/jni/gstreamer-peer/Makefile.am (working copy) +@@ -19,4 +19,5 @@ + # gstreamer contain broken prototypes (by design). + AM_CFLAGS = @WARNING_CFLAGS@ -Wno-write-strings -Wno-missing-field-initializers \ + @ERROR_CFLAGS@ -Wno-unused-parameter @GSTREAMER_BASE_CFLAGS@ \ +- @GDK_CFLAGS@ @GSTREAMER_CFLAGS@ @GSTREAMER_PLUGINS_BASE_CFLAGS@ ++ @GDK_CFLAGS@ @GSTREAMER_CFLAGS@ @GSTREAMER_PLUGINS_BASE_CFLAGS@ \ ++ @EXTRA_CFLAGS@ +Index: libjava/classpath/native/jni/Makefile.in +=================================================================== +--- libjava/classpath/native/jni/Makefile.in (revision 137051) ++++ libjava/classpath/native/jni/Makefile.in (working copy) +@@ -137,6 +137,7 @@ + ERROR_CFLAGS = @ERROR_CFLAGS@ + EXAMPLESDIR = @EXAMPLESDIR@ + EXEEXT = @EXEEXT@ ++EXTRA_CFLAGS = @EXTRA_CFLAGS@ + FASTJAR = @FASTJAR@ + FIND = @FIND@ + FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@ +Index: libjava/classpath/native/jni/classpath/Makefile.in +=================================================================== +--- libjava/classpath/native/jni/classpath/Makefile.in (revision 137051) ++++ libjava/classpath/native/jni/classpath/Makefile.in (working copy) +@@ -147,6 +147,7 @@ + ERROR_CFLAGS = @ERROR_CFLAGS@ + EXAMPLESDIR = @EXAMPLESDIR@ + EXEEXT = @EXEEXT@ ++EXTRA_CFLAGS = @EXTRA_CFLAGS@ + FASTJAR = @FASTJAR@ + FIND = @FIND@ + FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@ +@@ -326,7 +327,9 @@ + + AM_LDFLAGS = @CLASSPATH_CONVENIENCE@ + AM_CPPFLAGS = @CLASSPATH_INCLUDES@ +-AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@ ++AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@ \ ++ @EXTRA_CFLAGS@ ++ + all: all-am + + .SUFFIXES: +Index: libjava/classpath/native/jni/classpath/Makefile.am +=================================================================== +--- libjava/classpath/native/jni/classpath/Makefile.am (revision 137051) ++++ libjava/classpath/native/jni/classpath/Makefile.am (working copy) +@@ -8,4 +8,5 @@ + + AM_LDFLAGS = @CLASSPATH_CONVENIENCE@ + AM_CPPFLAGS = @CLASSPATH_INCLUDES@ +-AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@ ++AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@ \ ++ @EXTRA_CFLAGS@ +Index: libjava/classpath/native/jni/midi-dssi/Makefile.in +=================================================================== +--- libjava/classpath/native/jni/midi-dssi/Makefile.in (revision 137051) ++++ libjava/classpath/native/jni/midi-dssi/Makefile.in (working copy) +@@ -158,6 +158,7 @@ + ERROR_CFLAGS = @ERROR_CFLAGS@ + EXAMPLESDIR = @EXAMPLESDIR@ + EXEEXT = @EXEEXT@ ++EXTRA_CFLAGS = @EXTRA_CFLAGS@ + FASTJAR = @FASTJAR@ + FIND = @FIND@ + FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@ +@@ -340,7 +341,7 @@ + # No STRICT_WARNING_CFLAGS here as we use dlsym to load the address of + # a function,and ISO C prohibits casting void pointers, like those returned + # by dlsym, to function pointers. +-AM_CFLAGS = @WARNING_CFLAGS@ @ERROR_CFLAGS@ ++AM_CFLAGS = @WARNING_CFLAGS@ @ERROR_CFLAGS@ @EXTRA_CFLAGS@ + all: all-am + + .SUFFIXES: +Index: libjava/classpath/native/jni/midi-dssi/Makefile.am +=================================================================== +--- libjava/classpath/native/jni/midi-dssi/Makefile.am (revision 137051) ++++ libjava/classpath/native/jni/midi-dssi/Makefile.am (working copy) +@@ -12,4 +12,4 @@ + # No STRICT_WARNING_CFLAGS here as we use dlsym to load the address of + # a function,and ISO C prohibits casting void pointers, like those returned + # by dlsym, to function pointers. +-AM_CFLAGS = @WARNING_CFLAGS@ @ERROR_CFLAGS@ ++AM_CFLAGS = @WARNING_CFLAGS@ @ERROR_CFLAGS@ @EXTRA_CFLAGS@ +Index: libjava/classpath/native/jni/gconf-peer/Makefile.in +=================================================================== +--- libjava/classpath/native/jni/gconf-peer/Makefile.in (revision 137051) ++++ libjava/classpath/native/jni/gconf-peer/Makefile.in (working copy) +@@ -156,6 +156,7 @@ + ERROR_CFLAGS = @ERROR_CFLAGS@ + EXAMPLESDIR = @EXAMPLESDIR@ + EXEEXT = @EXEEXT@ ++EXTRA_CFLAGS = @EXTRA_CFLAGS@ + FASTJAR = @FASTJAR@ + FIND = @FIND@ + FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@ +@@ -332,7 +333,9 @@ + libgconfpeer_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version + AM_LDFLAGS = @CLASSPATH_MODULE@ @GCONF_LIBS@ @GDK_LIBS@ + AM_CPPFLAGS = @CLASSPATH_INCLUDES@ +-AM_CFLAGS = @WARNING_CFLAGS@ @ERROR_CFLAGS@ @GCONF_CFLAGS@ @GDK_CFLAGS@ ++AM_CFLAGS = @WARNING_CFLAGS@ @ERROR_CFLAGS@ @GCONF_CFLAGS@ @GDK_CFLAGS@ \ ++ @EXTRA_CFLAGS@ ++ + all: all-am + + .SUFFIXES: +Index: libjava/classpath/native/jni/gconf-peer/Makefile.am +=================================================================== +--- libjava/classpath/native/jni/gconf-peer/Makefile.am (revision 137051) ++++ libjava/classpath/native/jni/gconf-peer/Makefile.am (working copy) +@@ -10,4 +10,5 @@ + + AM_CPPFLAGS = @CLASSPATH_INCLUDES@ + +-AM_CFLAGS = @WARNING_CFLAGS@ @ERROR_CFLAGS@ @GCONF_CFLAGS@ @GDK_CFLAGS@ ++AM_CFLAGS = @WARNING_CFLAGS@ @ERROR_CFLAGS@ @GCONF_CFLAGS@ @GDK_CFLAGS@ \ ++ @EXTRA_CFLAGS@ +Index: libjava/classpath/native/jni/java-io/Makefile.in +=================================================================== +--- libjava/classpath/native/jni/java-io/Makefile.in (revision 137051) ++++ libjava/classpath/native/jni/java-io/Makefile.in (working copy) +@@ -158,6 +158,7 @@ + ERROR_CFLAGS = @ERROR_CFLAGS@ + EXAMPLESDIR = @EXAMPLESDIR@ + EXEEXT = @EXEEXT@ ++EXTRA_CFLAGS = @EXTRA_CFLAGS@ + FASTJAR = @FASTJAR@ + FIND = @FIND@ + FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@ +@@ -338,7 +339,9 @@ + + AM_LDFLAGS = @CLASSPATH_MODULE@ + AM_CPPFLAGS = @CLASSPATH_INCLUDES@ +-AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@ ++AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@ \ ++ @EXTRA_CFLAGS@ ++ + all: all-am + + .SUFFIXES: +Index: libjava/classpath/native/jni/java-io/Makefile.am +=================================================================== +--- libjava/classpath/native/jni/java-io/Makefile.am (revision 137051) ++++ libjava/classpath/native/jni/java-io/Makefile.am (working copy) +@@ -9,4 +9,5 @@ + + AM_LDFLAGS = @CLASSPATH_MODULE@ + AM_CPPFLAGS = @CLASSPATH_INCLUDES@ +-AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@ ++AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@ \ ++ @EXTRA_CFLAGS@ +Index: libjava/classpath/native/jni/native-lib/Makefile.in +=================================================================== +--- libjava/classpath/native/jni/native-lib/Makefile.in (revision 137051) ++++ libjava/classpath/native/jni/native-lib/Makefile.in (working copy) +@@ -147,6 +147,7 @@ + ERROR_CFLAGS = @ERROR_CFLAGS@ + EXAMPLESDIR = @EXAMPLESDIR@ + EXEEXT = @EXEEXT@ ++EXTRA_CFLAGS = @EXTRA_CFLAGS@ + FASTJAR = @FASTJAR@ + FIND = @FIND@ + FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@ +@@ -328,7 +329,9 @@ + + AM_LDFLAGS = @CLASSPATH_MODULE@ + AM_CPPFLAGS = @CLASSPATH_INCLUDES@ +-AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@ ++AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@ \ ++ @EXTRA_CFLAGS@ ++ + all: all-am + + .SUFFIXES: +Index: libjava/classpath/native/jni/native-lib/Makefile.am +=================================================================== +--- libjava/classpath/native/jni/native-lib/Makefile.am (revision 137051) ++++ libjava/classpath/native/jni/native-lib/Makefile.am (working copy) +@@ -9,4 +9,5 @@ + + AM_LDFLAGS = @CLASSPATH_MODULE@ + AM_CPPFLAGS = @CLASSPATH_INCLUDES@ +-AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@ ++AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@ \ ++ @EXTRA_CFLAGS@ +Index: libjava/classpath/native/jni/java-util/Makefile.in +=================================================================== +--- libjava/classpath/native/jni/java-util/Makefile.in (revision 137051) ++++ libjava/classpath/native/jni/java-util/Makefile.in (working copy) +@@ -155,6 +155,7 @@ + ERROR_CFLAGS = @ERROR_CFLAGS@ + EXAMPLESDIR = @EXAMPLESDIR@ + EXEEXT = @EXEEXT@ ++EXTRA_CFLAGS = @EXTRA_CFLAGS@ + FASTJAR = @FASTJAR@ + FIND = @FIND@ + FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@ +@@ -329,7 +330,9 @@ + libjavautil_la_SOURCES = java_util_VMTimeZone.c + AM_LDFLAGS = @CLASSPATH_MODULE@ + AM_CPPFLAGS = @CLASSPATH_INCLUDES@ +-AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@ ++AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@ \ ++ @EXTRA_CFLAGS@ ++ + all: all-am + + .SUFFIXES: +Index: libjava/classpath/native/jni/java-util/Makefile.am +=================================================================== +--- libjava/classpath/native/jni/java-util/Makefile.am (revision 137051) ++++ libjava/classpath/native/jni/java-util/Makefile.am (working copy) +@@ -4,4 +4,6 @@ + + AM_LDFLAGS = @CLASSPATH_MODULE@ + AM_CPPFLAGS = @CLASSPATH_INCLUDES@ +-AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@ ++AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@ \ ++ @EXTRA_CFLAGS@ ++ +Index: libjava/classpath/native/jni/java-lang/Makefile.in +=================================================================== +--- libjava/classpath/native/jni/java-lang/Makefile.in (revision 137051) ++++ libjava/classpath/native/jni/java-lang/Makefile.in (working copy) +@@ -172,6 +172,7 @@ + ERROR_CFLAGS = @ERROR_CFLAGS@ + EXAMPLESDIR = @EXAMPLESDIR@ + EXEEXT = @EXEEXT@ ++EXTRA_CFLAGS = @EXTRA_CFLAGS@ + FASTJAR = @FASTJAR@ + FIND = @FIND@ + FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@ +@@ -357,7 +358,9 @@ + libjavalangmanagement_la_SOURCES = gnu_java_lang_management_VMOperatingSystemMXBeanImpl.c + AM_LDFLAGS = @CLASSPATH_MODULE@ + AM_CPPFLAGS = @CLASSPATH_INCLUDES@ -I$(top_srcdir)/native/fdlibm +-AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@ ++AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@ \ ++ @EXTRA_CFLAGS@ ++ + all: all-am + + .SUFFIXES: +Index: libjava/classpath/native/jni/java-lang/Makefile.am +=================================================================== +--- libjava/classpath/native/jni/java-lang/Makefile.am (revision 137051) ++++ libjava/classpath/native/jni/java-lang/Makefile.am (working copy) +@@ -16,4 +16,5 @@ + + AM_LDFLAGS = @CLASSPATH_MODULE@ + AM_CPPFLAGS = @CLASSPATH_INCLUDES@ -I$(top_srcdir)/native/fdlibm +-AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@ ++AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@ \ ++ @EXTRA_CFLAGS@ +Index: libjava/classpath/native/jni/midi-alsa/Makefile.in +=================================================================== +--- libjava/classpath/native/jni/midi-alsa/Makefile.in (revision 137051) ++++ libjava/classpath/native/jni/midi-alsa/Makefile.in (working copy) +@@ -158,6 +158,7 @@ + ERROR_CFLAGS = @ERROR_CFLAGS@ + EXAMPLESDIR = @EXAMPLESDIR@ + EXEEXT = @EXEEXT@ ++EXTRA_CFLAGS = @EXTRA_CFLAGS@ + FASTJAR = @FASTJAR@ + FIND = @FIND@ + FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@ +@@ -337,7 +338,9 @@ + libgjsmalsa_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version + AM_LDFLAGS = @CLASSPATH_MODULE@ + AM_CPPFLAGS = @CLASSPATH_INCLUDES@ `pkg-config --cflags-only-I alsa` +-AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@ `pkg-config --cflags-only-other alsa` ++AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@ `pkg-config --cflags-only-other alsa` \ ++ @EXTRA_CFLAGS@ ++ + all: all-am + + .SUFFIXES: +Index: libjava/classpath/native/jni/midi-alsa/Makefile.am +=================================================================== +--- libjava/classpath/native/jni/midi-alsa/Makefile.am (revision 137051) ++++ libjava/classpath/native/jni/midi-alsa/Makefile.am (working copy) +@@ -9,4 +9,5 @@ + + AM_LDFLAGS = @CLASSPATH_MODULE@ + AM_CPPFLAGS = @CLASSPATH_INCLUDES@ `pkg-config --cflags-only-I alsa` +-AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@ `pkg-config --cflags-only-other alsa` ++AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@ `pkg-config --cflags-only-other alsa` \ ++ @EXTRA_CFLAGS@ +Index: libjava/classpath/native/jni/java-nio/Makefile.in +=================================================================== +--- libjava/classpath/native/jni/java-nio/Makefile.in (revision 137051) ++++ libjava/classpath/native/jni/java-nio/Makefile.in (working copy) +@@ -166,6 +166,7 @@ + ERROR_CFLAGS = @ERROR_CFLAGS@ + EXAMPLESDIR = @EXAMPLESDIR@ + EXEEXT = @EXEEXT@ ++EXTRA_CFLAGS = @EXTRA_CFLAGS@ + FASTJAR = @FASTJAR@ + FIND = @FIND@ + FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@ +@@ -357,7 +358,9 @@ + EXTRA_DIST = javanio.c + AM_LDFLAGS = @CLASSPATH_MODULE@ + AM_CPPFLAGS = @CLASSPATH_INCLUDES@ +-AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@ ++AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@ \ ++ @EXTRA_CFLAGS@ ++ + all: all-am + + .SUFFIXES: +Index: libjava/classpath/native/jni/java-nio/Makefile.am +=================================================================== +--- libjava/classpath/native/jni/java-nio/Makefile.am (revision 137051) ++++ libjava/classpath/native/jni/java-nio/Makefile.am (working copy) +@@ -20,4 +20,5 @@ + + AM_LDFLAGS = @CLASSPATH_MODULE@ + AM_CPPFLAGS = @CLASSPATH_INCLUDES@ +-AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@ ++AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@ \ ++ @EXTRA_CFLAGS@ +Index: libjava/classpath/native/jni/java-net/Makefile.in +=================================================================== +--- libjava/classpath/native/jni/java-net/Makefile.in (revision 137051) ++++ libjava/classpath/native/jni/java-net/Makefile.in (working copy) +@@ -168,6 +168,7 @@ + ERROR_CFLAGS = @ERROR_CFLAGS@ + EXAMPLESDIR = @EXAMPLESDIR@ + EXEEXT = @EXEEXT@ ++EXTRA_CFLAGS = @EXTRA_CFLAGS@ + FASTJAR = @FASTJAR@ + FIND = @FIND@ + FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@ +@@ -358,7 +359,9 @@ + + AM_LDFLAGS = @CLASSPATH_MODULE@ + AM_CPPFLAGS = @CLASSPATH_INCLUDES@ +-AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@ ++AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@ \ ++ @EXTRA_CFLAGS@ ++ + all: all-am + + .SUFFIXES: +Index: libjava/classpath/native/jni/java-net/Makefile.am +=================================================================== +--- libjava/classpath/native/jni/java-net/Makefile.am (revision 137051) ++++ libjava/classpath/native/jni/java-net/Makefile.am (working copy) +@@ -22,4 +22,5 @@ + + AM_LDFLAGS = @CLASSPATH_MODULE@ + AM_CPPFLAGS = @CLASSPATH_INCLUDES@ +-AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@ ++AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @ERROR_CFLAGS@ \ ++ @EXTRA_CFLAGS@ +Index: libjava/classpath/native/jni/xmlj/Makefile.in +=================================================================== +--- libjava/classpath/native/jni/xmlj/Makefile.in (revision 137051) ++++ libjava/classpath/native/jni/xmlj/Makefile.in (working copy) +@@ -157,6 +157,7 @@ + ERROR_CFLAGS = @ERROR_CFLAGS@ + EXAMPLESDIR = @EXAMPLESDIR@ + EXEEXT = @EXEEXT@ ++EXTRA_CFLAGS = @EXTRA_CFLAGS@ + FASTJAR = @FASTJAR@ + FIND = @FIND@ + FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@ +@@ -349,7 +350,9 @@ + AM_CPPFLAGS = @CLASSPATH_INCLUDES@ + + # Don't enable ERROR flags. Code isn't warning free yet. +-AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @XML_CFLAGS@ @XSLT_CFLAGS@ ++AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @XML_CFLAGS@ \ ++ @XSLT_CFLAGS@ @EXTRA_CFLAGS@ ++ + EXTRA_DIST = BUGS + all: all-am + +Index: libjava/classpath/native/jni/xmlj/Makefile.am +=================================================================== +--- libjava/classpath/native/jni/xmlj/Makefile.am (revision 137051) ++++ libjava/classpath/native/jni/xmlj/Makefile.am (working copy) +@@ -22,6 +22,7 @@ + AM_CPPFLAGS = @CLASSPATH_INCLUDES@ + + # Don't enable ERROR flags. Code isn't warning free yet. +-AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @XML_CFLAGS@ @XSLT_CFLAGS@ ++AM_CFLAGS = @WARNING_CFLAGS@ @STRICT_WARNING_CFLAGS@ @XML_CFLAGS@ \ ++ @XSLT_CFLAGS@ @EXTRA_CFLAGS@ + + EXTRA_DIST = BUGS +Index: libjava/classpath/native/jni/qt-peer/Makefile.in +=================================================================== +--- libjava/classpath/native/jni/qt-peer/Makefile.in (revision 137051) ++++ libjava/classpath/native/jni/qt-peer/Makefile.in (working copy) +@@ -173,6 +173,7 @@ + ERROR_CFLAGS = @ERROR_CFLAGS@ + EXAMPLESDIR = @EXAMPLESDIR@ + EXEEXT = @EXEEXT@ ++EXTRA_CFLAGS = @EXTRA_CFLAGS@ + FASTJAR = @FASTJAR@ + FIND = @FIND@ + FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@ +Index: libjava/classpath/native/jni/gtk-peer/Makefile.in +=================================================================== +--- libjava/classpath/native/jni/gtk-peer/Makefile.in (revision 137051) ++++ libjava/classpath/native/jni/gtk-peer/Makefile.in (working copy) +@@ -194,6 +194,7 @@ + ERROR_CFLAGS = @ERROR_CFLAGS@ + EXAMPLESDIR = @EXAMPLESDIR@ + EXEEXT = @EXEEXT@ ++EXTRA_CFLAGS = @EXTRA_CFLAGS@ + FASTJAR = @FASTJAR@ + FIND = @FIND@ + FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@ +@@ -424,7 +425,7 @@ + # headers contain broken prototypes (by design, see gtkitemfactory.h). + AM_CFLAGS = @WARNING_CFLAGS@ @ERROR_CFLAGS@ \ + @GTK_CFLAGS@ @FREETYPE2_CFLAGS@ @PANGOFT2_CFLAGS@ \ +- @X_CFLAGS@ ++ @X_CFLAGS@ @EXTRA_CFLAGS@ + + all: all-am + +Index: libjava/classpath/native/jni/gtk-peer/Makefile.am +=================================================================== +--- libjava/classpath/native/jni/gtk-peer/Makefile.am (revision 137051) ++++ libjava/classpath/native/jni/gtk-peer/Makefile.am (working copy) +@@ -58,4 +58,4 @@ + # headers contain broken prototypes (by design, see gtkitemfactory.h). + AM_CFLAGS = @WARNING_CFLAGS@ @ERROR_CFLAGS@ \ + @GTK_CFLAGS@ @FREETYPE2_CFLAGS@ @PANGOFT2_CFLAGS@ \ +- @X_CFLAGS@ ++ @X_CFLAGS@ @EXTRA_CFLAGS@ +Index: libjava/classpath/native/Makefile.in +=================================================================== +--- libjava/classpath/native/Makefile.in (revision 137051) ++++ libjava/classpath/native/Makefile.in (working copy) +@@ -137,6 +137,7 @@ + ERROR_CFLAGS = @ERROR_CFLAGS@ + EXAMPLESDIR = @EXAMPLESDIR@ + EXEEXT = @EXEEXT@ ++EXTRA_CFLAGS = @EXTRA_CFLAGS@ + FASTJAR = @FASTJAR@ + FIND = @FIND@ + FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@ +Index: libjava/classpath/native/jawt/Makefile.in +=================================================================== +--- libjava/classpath/native/jawt/Makefile.in (revision 137051) ++++ libjava/classpath/native/jawt/Makefile.in (working copy) +@@ -156,6 +156,7 @@ + ERROR_CFLAGS = @ERROR_CFLAGS@ + EXAMPLESDIR = @EXAMPLESDIR@ + EXEEXT = @EXEEXT@ ++EXTRA_CFLAGS = @EXTRA_CFLAGS@ + FASTJAR = @FASTJAR@ + FIND = @FIND@ + FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@ +@@ -336,7 +337,7 @@ + # Just the WARNING_CFLAGS. We cannot use the strict flags since the gtk + # headers contain broken prototypes (by design, see gtkitemfactory.h). + AM_CFLAGS = @WARNING_CFLAGS@ @ERROR_CFLAGS@ \ +- @GTK_CFLAGS@ @PANGOFT2_CFLAGS@ ++ @GTK_CFLAGS@ @PANGOFT2_CFLAGS@ @EXTRA_CFLAGS@ + + all: all-am + +Index: libjava/classpath/native/jawt/Makefile.am +=================================================================== +--- libjava/classpath/native/jawt/Makefile.am (revision 137051) ++++ libjava/classpath/native/jawt/Makefile.am (working copy) +@@ -10,4 +10,4 @@ + # Just the WARNING_CFLAGS. We cannot use the strict flags since the gtk + # headers contain broken prototypes (by design, see gtkitemfactory.h). + AM_CFLAGS = @WARNING_CFLAGS@ @ERROR_CFLAGS@ \ +- @GTK_CFLAGS@ @PANGOFT2_CFLAGS@ ++ @GTK_CFLAGS@ @PANGOFT2_CFLAGS@ @EXTRA_CFLAGS@ +Index: libjava/classpath/native/fdlibm/Makefile.in +=================================================================== +--- libjava/classpath/native/fdlibm/Makefile.in (revision 137051) ++++ libjava/classpath/native/fdlibm/Makefile.in (working copy) +@@ -156,6 +156,7 @@ + ERROR_CFLAGS = @ERROR_CFLAGS@ + EXAMPLESDIR = @EXAMPLESDIR@ + EXEEXT = @EXEEXT@ ++EXTRA_CFLAGS = @EXTRA_CFLAGS@ + FASTJAR = @FASTJAR@ + FIND = @FIND@ + FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@ +@@ -386,6 +387,7 @@ + namespace.h + + AM_LDFLAGS = @CLASSPATH_CONVENIENCE@ ++AM_CFLAGS = @EXTRA_CFLAGS@ + all: all-am + + .SUFFIXES: +@@ -688,9 +690,7 @@ + uninstall-info-am + + +-# We just want the standard flags for fdlibm since it is an upstream lib +-# and our normal -pedantic -Wall -Werror breaks this lib. So no AM_CFLAGS. +-# We also don't need extra includes, so no AM_CPPFLAGS either. ++# We don't need extra includes, so no AM_CPPFLAGS. + # 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: +Index: libjava/classpath/native/fdlibm/Makefile.am +=================================================================== +--- libjava/classpath/native/fdlibm/Makefile.am (revision 137051) ++++ libjava/classpath/native/fdlibm/Makefile.am (working copy) +@@ -60,6 +60,6 @@ + + AM_LDFLAGS = @CLASSPATH_CONVENIENCE@ + +-# We just want the standard flags for fdlibm since it is an upstream lib +-# and our normal -pedantic -Wall -Werror breaks this lib. So no AM_CFLAGS. +-# We also don't need extra includes, so no AM_CPPFLAGS either. ++AM_CFLAGS = @EXTRA_CFLAGS@ ++ ++# We don't need extra includes, so no AM_CPPFLAGS. +Index: libjava/classpath/native/plugin/Makefile.in +=================================================================== +--- libjava/classpath/native/plugin/Makefile.in (revision 137051) ++++ libjava/classpath/native/plugin/Makefile.in (working copy) +@@ -155,6 +155,7 @@ + ERROR_CFLAGS = @ERROR_CFLAGS@ + EXAMPLESDIR = @EXAMPLESDIR@ + EXEEXT = @EXEEXT@ ++EXTRA_CFLAGS = @EXTRA_CFLAGS@ + FASTJAR = @FASTJAR@ + FIND = @FIND@ + FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@ +Index: libjava/classpath/resource/Makefile.in +=================================================================== +--- libjava/classpath/resource/Makefile.in (revision 137051) ++++ libjava/classpath/resource/Makefile.in (working copy) +@@ -140,6 +140,7 @@ + ERROR_CFLAGS = @ERROR_CFLAGS@ + EXAMPLESDIR = @EXAMPLESDIR@ + EXEEXT = @EXEEXT@ ++EXTRA_CFLAGS = @EXTRA_CFLAGS@ + FASTJAR = @FASTJAR@ + FIND = @FIND@ + FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@ +Index: libjava/classpath/scripts/Makefile.in +=================================================================== +--- libjava/classpath/scripts/Makefile.in (revision 137051) ++++ libjava/classpath/scripts/Makefile.in (working copy) +@@ -130,6 +130,7 @@ + ERROR_CFLAGS = @ERROR_CFLAGS@ + EXAMPLESDIR = @EXAMPLESDIR@ + EXEEXT = @EXEEXT@ ++EXTRA_CFLAGS = @EXTRA_CFLAGS@ + FASTJAR = @FASTJAR@ + FIND = @FIND@ + FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@ +Index: libjava/classpath/tools/Makefile.in +=================================================================== +--- libjava/classpath/tools/Makefile.in (revision 137051) ++++ libjava/classpath/tools/Makefile.in (working copy) +@@ -232,6 +232,7 @@ + ERROR_CFLAGS = @ERROR_CFLAGS@ + EXAMPLESDIR = @EXAMPLESDIR@ + EXEEXT = @EXEEXT@ ++EXTRA_CFLAGS = @EXTRA_CFLAGS@ + FASTJAR = @FASTJAR@ + FIND = @FIND@ + FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@ +Index: libjava/classpath/configure.ac +=================================================================== +--- libjava/classpath/configure.ac (revision 137051) ++++ libjava/classpath/configure.ac (working copy) +@@ -503,6 +503,12 @@ + WARNING_CFLAGS='-W -Wall -Wmissing-declarations -Wwrite-strings -Wmissing-prototypes -Wno-long-long' + AC_SUBST(WARNING_CFLAGS) + ++ dnl CFLAGS that are used for all native code. We want to compile ++ dnl everything with unwinder data so that backtrace() will always ++ dnl work. ++ EXTRA_CFLAGS='-fexceptions -fasynchronous-unwind-tables' ++ AC_SUBST(EXTRA_CFLAGS) ++ + dnl Strict warning flags which not every module uses. + dnl Should probably be configurable. + STRICT_WARNING_CFLAGS='-Wstrict-prototypes -pedantic' +Index: libjava/classpath/doc/Makefile.in +=================================================================== +--- libjava/classpath/doc/Makefile.in (revision 137051) ++++ libjava/classpath/doc/Makefile.in (working copy) +@@ -154,6 +154,7 @@ + ERROR_CFLAGS = @ERROR_CFLAGS@ + EXAMPLESDIR = @EXAMPLESDIR@ + EXEEXT = @EXEEXT@ ++EXTRA_CFLAGS = @EXTRA_CFLAGS@ + FASTJAR = @FASTJAR@ + FIND = @FIND@ + FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@ +Index: libjava/classpath/doc/api/Makefile.in +=================================================================== +--- libjava/classpath/doc/api/Makefile.in (revision 137051) ++++ libjava/classpath/doc/api/Makefile.in (working copy) +@@ -131,6 +131,7 @@ + ERROR_CFLAGS = @ERROR_CFLAGS@ + EXAMPLESDIR = @EXAMPLESDIR@ + EXEEXT = @EXEEXT@ ++EXTRA_CFLAGS = @EXTRA_CFLAGS@ + FASTJAR = @FASTJAR@ + FIND = @FIND@ + FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@ +Index: libjava/classpath/lib/Makefile.in +=================================================================== +--- libjava/classpath/lib/Makefile.in (revision 137051) ++++ libjava/classpath/lib/Makefile.in (working copy) +@@ -134,6 +134,7 @@ + ERROR_CFLAGS = @ERROR_CFLAGS@ + EXAMPLESDIR = @EXAMPLESDIR@ + EXEEXT = @EXEEXT@ ++EXTRA_CFLAGS = @EXTRA_CFLAGS@ + FASTJAR = @FASTJAR@ + FIND = @FIND@ + FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@ +@@ -541,7 +542,7 @@ + if ! test -d "$$dirname"; then mkdir -p "$$dirname"; fi; \ + cp $(top_srcdir)/resource/$$p $$p; \ + done +- @list=`cd $(top_srcdir)/resource && $(FIND) META-INF -name CVS -prune -o -name \*\.in -prune -o -type f -print`; for p in $$list; do \ ++ @list=`cd $(top_srcdir)/resource && $(FIND) META-INF -name CVS -prune -o -name .svn -prune -o -name \*\.in -prune -o -type f -print`; for p in $$list; do \ + dirname=`dirname $$p`; \ + if ! test -d "$$dirname"; then mkdir -p "$$dirname"; fi; \ + cp $(top_srcdir)/resource/$$p $$p; \ +Index: libjava/classpath/lib/Makefile.am +=================================================================== +--- libjava/classpath/lib/Makefile.am (revision 137051) ++++ libjava/classpath/lib/Makefile.am (working copy) +@@ -96,7 +96,7 @@ + if ! test -d "$$dirname"; then mkdir -p "$$dirname"; fi; \ + cp $(top_srcdir)/resource/$$p $$p; \ + done +- @list=`cd $(top_srcdir)/resource && $(FIND) META-INF -name CVS -prune -o -name \*\.in -prune -o -type f -print`; for p in $$list; do \ ++ @list=`cd $(top_srcdir)/resource && $(FIND) META-INF -name CVS -prune -o -name .svn -prune -o -name \*\.in -prune -o -type f -print`; for p in $$list; do \ + dirname=`dirname $$p`; \ + if ! test -d "$$dirname"; then mkdir -p "$$dirname"; fi; \ + cp $(top_srcdir)/resource/$$p $$p; \ +Index: libjava/classpath/external/Makefile.in +=================================================================== +--- libjava/classpath/external/Makefile.in (revision 137051) ++++ libjava/classpath/external/Makefile.in (working copy) +@@ -138,6 +138,7 @@ + ERROR_CFLAGS = @ERROR_CFLAGS@ + EXAMPLESDIR = @EXAMPLESDIR@ + EXEEXT = @EXEEXT@ ++EXTRA_CFLAGS = @EXTRA_CFLAGS@ + FASTJAR = @FASTJAR@ + FIND = @FIND@ + FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@ +Index: libjava/classpath/external/jsr166/Makefile.in +=================================================================== +--- libjava/classpath/external/jsr166/Makefile.in (revision 137051) ++++ libjava/classpath/external/jsr166/Makefile.in (working copy) +@@ -129,6 +129,7 @@ + ERROR_CFLAGS = @ERROR_CFLAGS@ + EXAMPLESDIR = @EXAMPLESDIR@ + EXEEXT = @EXEEXT@ ++EXTRA_CFLAGS = @EXTRA_CFLAGS@ + FASTJAR = @FASTJAR@ + FIND = @FIND@ + FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@ +Index: libjava/classpath/external/sax/Makefile.in +=================================================================== +--- libjava/classpath/external/sax/Makefile.in (revision 137051) ++++ libjava/classpath/external/sax/Makefile.in (working copy) +@@ -129,6 +129,7 @@ + ERROR_CFLAGS = @ERROR_CFLAGS@ + EXAMPLESDIR = @EXAMPLESDIR@ + EXEEXT = @EXEEXT@ ++EXTRA_CFLAGS = @EXTRA_CFLAGS@ + FASTJAR = @FASTJAR@ + FIND = @FIND@ + FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@ +Index: libjava/classpath/external/w3c_dom/Makefile.in +=================================================================== +--- libjava/classpath/external/w3c_dom/Makefile.in (revision 137051) ++++ libjava/classpath/external/w3c_dom/Makefile.in (working copy) +@@ -129,6 +129,7 @@ + ERROR_CFLAGS = @ERROR_CFLAGS@ + EXAMPLESDIR = @EXAMPLESDIR@ + EXEEXT = @EXEEXT@ ++EXTRA_CFLAGS = @EXTRA_CFLAGS@ + FASTJAR = @FASTJAR@ + FIND = @FIND@ + FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@ +Index: libjava/classpath/external/relaxngDatatype/Makefile.in +=================================================================== +--- libjava/classpath/external/relaxngDatatype/Makefile.in (revision 137051) ++++ libjava/classpath/external/relaxngDatatype/Makefile.in (working copy) +@@ -129,6 +129,7 @@ + ERROR_CFLAGS = @ERROR_CFLAGS@ + EXAMPLESDIR = @EXAMPLESDIR@ + EXEEXT = @EXEEXT@ ++EXTRA_CFLAGS = @EXTRA_CFLAGS@ + FASTJAR = @FASTJAR@ + FIND = @FIND@ + FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@ +Index: libjava/classpath/include/Makefile.in +=================================================================== +--- libjava/classpath/include/Makefile.in (revision 137051) ++++ libjava/classpath/include/Makefile.in (working copy) +@@ -130,6 +130,7 @@ + ERROR_CFLAGS = @ERROR_CFLAGS@ + EXAMPLESDIR = @EXAMPLESDIR@ + EXEEXT = @EXEEXT@ ++EXTRA_CFLAGS = @EXTRA_CFLAGS@ + FASTJAR = @FASTJAR@ + FIND = @FIND@ + FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@ +Index: libjava/classpath/examples/Makefile.in +=================================================================== +--- libjava/classpath/examples/Makefile.in (revision 137051) ++++ libjava/classpath/examples/Makefile.in (working copy) +@@ -140,6 +140,7 @@ + ERROR_CFLAGS = @ERROR_CFLAGS@ + EXAMPLESDIR = @EXAMPLESDIR@ + EXEEXT = @EXEEXT@ ++EXTRA_CFLAGS = @EXTRA_CFLAGS@ + FASTJAR = @FASTJAR@ + FIND = @FIND@ + FOUND_ECJ_FALSE = @FOUND_ECJ_FALSE@ diff -urN h/gcc-4.2-4.2.3/debian/patches/libjava-nobiarch-check.dpatch gcc-4.2-4.2.4/debian/patches/libjava-nobiarch-check.dpatch --- h/gcc-4.2-4.2.3/debian/patches/libjava-nobiarch-check.dpatch 2008-09-09 15:05:00.000000000 +0000 +++ gcc-4.2-4.2.4/debian/patches/libjava-nobiarch-check.dpatch 2008-09-02 19:23:29.000000000 +0000 @@ -30,7 +30,7 @@ check-DEJAGNU: site.exp -+ runtestflags="`echo '$(RUNTESTFLAGS)' | sed 's/,-m[36][24]//'`"; \ ++ runtestflags="`echo '$(RUNTESTFLAGS)' | sed 's/,-m[36][24]///,-mabi=n32//`"; \ + case "$$runtestflags" in *\\{\\}) runtestflags=; esac; \ srcdir=`$(am__cd) $(srcdir) && pwd`; export srcdir; \ EXPECT=$(EXPECT); export EXPECT; \ diff -urN h/gcc-4.2-4.2.3/debian/patches/libssp-gnu.dpatch gcc-4.2-4.2.4/debian/patches/libssp-gnu.dpatch --- h/gcc-4.2-4.2.3/debian/patches/libssp-gnu.dpatch 2008-09-09 15:05:00.000000000 +0000 +++ gcc-4.2-4.2.4/debian/patches/libssp-gnu.dpatch 2008-09-02 19:23:29.000000000 +0000 @@ -34,7 +34,7 @@ # Test for stack protector support in target C library. case "$target" in - *-*-linux*) -+ *-*-*-gnu*) ++ *-*-gnu*|*-*-*-gnu*) echo "$as_me:$LINENO: checking __stack_chk_fail in target GNU C library" >&5 echo $ECHO_N "checking __stack_chk_fail in target GNU C library... $ECHO_C" >&6 if test "${gcc_cv_libc_provides_ssp+set}" = set; then @@ -45,7 +45,7 @@ # Test for stack protector support in target C library. case "$target" in - *-*-linux*) -+ *-*-*-gnu*) ++ *-*-gnu*|*-*-*-gnu*) AC_CACHE_CHECK(__stack_chk_fail in target GNU C library, gcc_cv_libc_provides_ssp, [gcc_cv_libc_provides_ssp=no diff -urN h/gcc-4.2-4.2.3/debian/patches/m68k-allow-gnu99.dpatch gcc-4.2-4.2.4/debian/patches/m68k-allow-gnu99.dpatch --- h/gcc-4.2-4.2.3/debian/patches/m68k-allow-gnu99.dpatch 1970-01-01 00:00:00.000000000 +0000 +++ gcc-4.2-4.2.4/debian/patches/m68k-allow-gnu99.dpatch 2008-09-02 19:23:29.000000000 +0000 @@ -0,0 +1,51 @@ +#! /bin/sh -e + +# DP: patch to allow gnu99 mode on m68k + +dir= +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" + dir="$3/" +elif [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) + patch $pdir -f --no-backup-if-mismatch -p0 < $0 + ;; + -unpatch) + patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 + ;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + +On m68k, gnu99 mode doesn't work correctly out of the box due to our +woefully outdated glibc (we're currently stuck at 2.5-1). This is +because the inline schematics changed between glibc 2.5 and 2.7, and +gcc 4.2 to 4.3. This patch configures the built in spec file to pass +-fgnu89-inline, and thus allowing proper compilation and linking with +the older glibc on m68k. This patch should not be merged upstream, and +it should be removed once a newer glibc is available for our +architecture. + +Index: gcc/config/m68k/linux.h +=================================================================== +--- gcc/config/m68k/linux.h (revision 137501) ++++ gcc/config/m68k/linux.h (working copy) +@@ -37,6 +37,12 @@ + #undef M68K_HONOR_TARGET_STRICT_ALIGNMENT + #define M68K_HONOR_TARGET_STRICT_ALIGNMENT 0 + ++/* on m68k, we always need to use gnu89 inlining because we're ++ still limited to glibc 2.5. This should be removed after ++ a newer glibc is available */ ++#undef CC1_SPEC ++#define CC1_SPEC "%{profile:-p} %{std=gnu99:-fgnu89-inline}" ++ + /* Here are four prefixes that are used by asm_fprintf to + facilitate customization for alternate assembler syntaxes. + Machines with no likelihood of an alternate syntax need not diff -urN h/gcc-4.2-4.2.3/debian/patches/mips-warnings.dpatch gcc-4.2-4.2.4/debian/patches/mips-warnings.dpatch --- h/gcc-4.2-4.2.3/debian/patches/mips-warnings.dpatch 1970-01-01 00:00:00.000000000 +0000 +++ gcc-4.2-4.2.4/debian/patches/mips-warnings.dpatch 2008-09-02 19:23:29.000000000 +0000 @@ -0,0 +1,39 @@ +#! /bin/sh -e + +# mips-warning.dpatch by Arthur Loiret +# DP: Add missing #undef ASM_OUTPUT_EXTERNAL to fix warnings during build. + +dir= +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" + dir="$3/" +elif [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) + patch $pdir -f --no-backup-if-mismatch -p0 < $0 + #cd ${dir}gcc && autoconf + ;; + -unpatch) + patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 + #rm ${dir}gcc/configure + ;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + + +--- gcc/config/mips/mips.h 2008-06-14 09:59:31.239353222 +0200 ++++ gcc/config/mips/mips.h 2008-06-14 09:59:49.231379042 +0200 +@@ -2534,6 +2534,7 @@ + the assembler uses length information on externals to allocate in + data/sdata bss/sbss, thereby saving exec time. */ + ++#undef ASM_OUTPUT_EXTERNAL + #define ASM_OUTPUT_EXTERNAL(STREAM,DECL,NAME) \ + mips_output_external(STREAM,DECL,NAME) + diff -urN h/gcc-4.2-4.2.3/debian/patches/multiarch-lib.dpatch gcc-4.2-4.2.4/debian/patches/multiarch-lib.dpatch --- h/gcc-4.2-4.2.3/debian/patches/multiarch-lib.dpatch 2008-09-09 15:05:00.000000000 +0000 +++ gcc-4.2-4.2.4/debian/patches/multiarch-lib.dpatch 1970-01-01 00:00:00.000000000 +0000 @@ -1,52 +0,0 @@ -#! /bin/sh -e - -# multiarch-lib.dpatch by Stephen Frost - -dir= -if [ $# -eq 3 -a "$2" = '-d' ]; then - pdir="-d $3" - dir="$3/" -elif [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) - patch $pdir -f --no-backup-if-mismatch -p0 < $0 - ;; - -unpatch) - patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 - ;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -esac -exit 0 - -diff -urN gcc.old/config/i386/t-linux64 gcc/config/i386/t-linux64 ---- gcc.old/config/i386/t-linux64 2002-11-28 15:47:02.000000000 +0100 -+++ gcc/config/i386/t-linux64 2004-07-10 07:28:01.000000000 +0200 -@@ -6,7 +6,7 @@ - - MULTILIB_OPTIONS = m64/m32 - MULTILIB_DIRNAMES = 64 32 --MULTILIB_OSDIRNAMES = ../lib64 ../lib -+MULTILIB_OSDIRNAMES = x86_64-linux i486-linux - - LIBGCC = stmp-multilib - INSTALL_LIBGCC = install-multilib -diff -urN gcc.old/config/t-linux gcc/config/t-linux ---- gcc.old/config/t-linux 2004-05-04 18:09:38.000000000 +0200 -+++ gcc/config/t-linux 2004-07-10 07:28:01.000000000 +0200 -@@ -11,3 +11,11 @@ - LIB2ADDEH = $(srcdir)/unwind-dw2.c $(srcdir)/unwind-dw2-fde-glibc.c \ - $(srcdir)/unwind-sjlj.c $(srcdir)/gthr-gnat.c $(srcdir)/unwind-c.c - LIB2ADDEHDEP = unwind.inc unwind-dw2-fde.h unwind-dw2-fde.c -+ -+MULTILIB_OPTIONS = m32 -+MULTILIB_DIRNAMES = 32 -+MULTILIB_OSDIRNAMES = $TARGET_ARCH -+ -+LIBGCC = stmp-multilib -+INSTALL_LIBGCC = install-multilib -+ diff -urN h/gcc-4.2-4.2.3/debian/patches/pr28322.dpatch gcc-4.2-4.2.4/debian/patches/pr28322.dpatch --- h/gcc-4.2-4.2.3/debian/patches/pr28322.dpatch 2008-09-09 15:05:00.000000000 +0000 +++ gcc-4.2-4.2.4/debian/patches/pr28322.dpatch 2008-09-02 19:23:29.000000000 +0000 @@ -36,6 +36,14 @@ (handle_option): Postpone errors for unknown -Wno-* options. * opts.h (print_ignored_options): Declare. +2008-06-03 Peter Maydell + + PR other/28322 + * opts.c (print_ignored_options): report postponed diagnostics for + unknown -Wno-* options as warnings, not errors. + (postpone_unknown_option_error): renamed to + postpone_unknown_option_warning. + gcc/testsuite/ 2008-02-26 Manuel Lopez-Ibanez @@ -45,14 +53,19 @@ * gcc.dg/pr28322-2.c: New. * lib/prune.exp: Ignore "At top level" even if there is no ':' preceding it. + * gcc.dg/pr28322-3.c: New. + +2008-06-03 Peter Maydell + + * gcc.dg/pr28322-2.c: check that emitted diagnostic for -Wno-foobar + is a warning and not an error. + Index: gcc/toplev.c =================================================================== ---- gcc/toplev.c (revision 132662) +--- gcc/toplev.c (revision 134648) +++ gcc/toplev.c (working copy) -@@ -2034,10 +2034,13 @@ toplev_main (unsigned int argc, const ch - - /* Exit early if we can (e.g. -help). */ +@@ -2036,6 +2036,9 @@ if (!exit_after_options) do_compile (); @@ -62,77 +75,11 @@ if (errorcount || sorrycount) return (FATAL_EXIT_CODE); - return (SUCCESS_EXIT_CODE); - } -Index: gcc/testsuite/gcc.dg/pr28322-2.c -=================================================================== ---- gcc/testsuite/gcc.dg/pr28322-2.c (revision 0) -+++ gcc/testsuite/gcc.dg/pr28322-2.c (revision 0) -@@ -0,0 +1,12 @@ -+/* PR28322: ignore unknown -Wno-* if no warning is emitted. */ -+/* { dg-do compile } */ -+/* { dg-options "-Wall -Wextra -Wno-foobar" } */ -+ -+int foo (void) -+{ -+ int i = 1/0; /* { dg-warning "division by zero" } */ -+ return i; -+} -+ -+/* { dg-warning "unrecognized command line option .-Wno-foobar." "" { target *-*-* } 0 } */ -+ -Index: gcc/testsuite/gcc.dg/pr28322.c -=================================================================== ---- gcc/testsuite/gcc.dg/pr28322.c (revision 0) -+++ gcc/testsuite/gcc.dg/pr28322.c (revision 0) -@@ -0,0 +1,8 @@ -+/* PR28322: ignore unknown -Wno-* if no warning is emitted. */ -+/* { dg-do compile } */ -+/* { dg-options " -Wno-foobar -Wno-div-by-zero" } */ -+ -+void foo(void) -+{ -+ int i = 1/0; -+} -Index: gcc/testsuite/gcc.dg/pr28322-3.c -=================================================================== ---- gcc/testsuite/gcc.dg/pr28322-3.c (revision 0) -+++ gcc/testsuite/gcc.dg/pr28322-3.c (revision 0) -@@ -0,0 +1,10 @@ -+/* PR28322: ignore unknown -Wno-* if no warning is emitted. */ -+/* { dg-do compile } */ -+/* { dg-options " -fno-foobar -mno-foobar" } */ -+ -+void foo(void) -+{ -+ int i = 1; -+} -+/* { dg-warning "unrecognized command line option .-fno-foobar." "" { target *-*-* } 0 } */ -+/* { dg-warning "unrecognized command line option .-mno-foobar." "" { target *-*-* } 0 } */ -Index: gcc/testsuite/lib/prune.exp -=================================================================== ---- gcc/testsuite/lib/prune.exp (revision 132662) -+++ gcc/testsuite/lib/prune.exp (working copy) -@@ -19,11 +19,11 @@ - - proc prune_gcc_output { text } { - #send_user "Before:$text\n" - - regsub -all "(^|\n)\[^\n\]*: In ((static member )?function|member|method|(copy )?constructor|destructor|instantiation|program|subroutine|block-data) \[^\n\]*" $text "" text -- regsub -all "(^|\n)\[^\n\]*: At (top level|global scope):\[^\n\]*" $text "" text -+ regsub -all "(^|\n)\[^\n\]*(: )?At (top level|global scope):\[^\n\]*" $text "" text - regsub -all "(^|\n)\[^\n\]*: instantiated from \[^\n\]*" $text "" text - regsub -all "(^|\n)collect2: ld returned \[^\n\]*" $text "" text - regsub -all "(^|\n)collect: re(compiling|linking)\[^\n\]*" $text "" text - regsub -all "(^|\n)Please submit.*instructions\[^\n\]*" $text "" text - regsub -all "(^|\n)\[0-9\]\[0-9\]* errors\." $text "" text Index: gcc/opts.c =================================================================== ---- gcc/opts.c (revision 132662) +--- gcc/opts.c (revision 134648) +++ gcc/opts.c (working copy) -@@ -95,10 +95,16 @@ static const char undocumented_msg[] = N - static bool profile_arc_flag_set, flag_profile_values_set; - static bool flag_unroll_loops_set, flag_tracer_set; +@@ -97,6 +97,12 @@ static bool flag_value_profile_transformations_set; static bool flag_peel_loops_set, flag_branch_probabilities_set; @@ -145,11 +92,7 @@ /* Input file names. */ const char **in_fnames; unsigned num_in_fnames; - - static int common_handle_option (size_t scode, const char *arg, int value, -@@ -179,10 +185,37 @@ complain_wrong_lang (const char *text, c - - free (ok_langs); +@@ -181,6 +187,33 @@ free (bad_lang); } @@ -183,11 +126,7 @@ /* Handle the switch beginning at ARGV for the language indicated by LANG_MASK. Returns the number of switches consumed. */ static unsigned int - handle_option (const char **argv, unsigned int lang_mask) - { -@@ -208,10 +241,18 @@ handle_option (const char **argv, unsign - dup[1] = opt[1]; - memcpy (dup + 2, opt + 5, len - 2 + 1); +@@ -210,6 +243,14 @@ opt = dup; value = 0; opt_index = find_opt (opt + 1, lang_mask | CL_COMMON | CL_TARGET); @@ -202,17 +141,101 @@ } if (opt_index == cl_options_count) - goto done; - Index: gcc/opts.h =================================================================== ---- gcc/opts.h (revision 132662) +--- gcc/opts.h (revision 134648) +++ gcc/opts.h (working copy) -@@ -89,6 +89,7 @@ size_t find_opt (const char *input, int - extern void prune_options (int *argcp, char ***argvp); - extern void decode_options (unsigned int argc, const char **argv); +@@ -91,4 +91,5 @@ extern int option_enabled (int opt_idx); extern bool get_option_state (int, struct cl_option_state *); +extern void print_ignored_options (void); #endif +Index: gcc/testsuite/gcc.dg/pr28322-2.c +=================================================================== +--- gcc/testsuite/gcc.dg/pr28322-2.c (revision 0) ++++ gcc/testsuite/gcc.dg/pr28322-2.c (revision 0) +@@ -0,0 +1,24 @@ ++/* PR28322: ignore unknown -Wno-* if no warning is emitted. */ ++/* { dg-do compile } */ ++/* { dg-options "-Wall -Wextra -Wno-foobar" } */ ++ ++int foo (void) ++{ ++ int i = 1/0; /* { dg-warning "division by zero" } */ ++ return i; ++} ++ ++/* { dg-message "unrecognized command line option .-Wno-foobar." "" { target *-*-* } 0 } */ ++ ++/* PR28322: ignore unknown -Wno-* if no warning is emitted. */ ++/* { dg-do compile } */ ++/* { dg-options "-Wall -Wextra -Wno-foobar" } */ ++ ++int foo (void) ++{ ++ int i = 1/0; /* { dg-warning "division by zero" } */ ++ return i; ++} ++ ++/* { dg-warning "unrecognized command line option .-Wno-foobar." "" { target *-*-* } 0 } */ ++ +Index: gcc/testsuite/gcc.dg/pr28322.c +=================================================================== +--- gcc/testsuite/gcc.dg/pr28322.c (revision 0) ++++ gcc/testsuite/gcc.dg/pr28322.c (revision 0) +@@ -0,0 +1,16 @@ ++/* PR28322: ignore unknown -Wno-* if no warning is emitted. */ ++/* { dg-do compile } */ ++/* { dg-options " -Wno-foobar -Wno-div-by-zero" } */ ++ ++void foo(void) ++{ ++ int i = 1/0; ++} ++/* PR28322: ignore unknown -Wno-* if no warning is emitted. */ ++/* { dg-do compile } */ ++/* { dg-options " -Wno-foobar -Wno-div-by-zero" } */ ++ ++void foo(void) ++{ ++ int i = 1/0; ++} +Index: gcc/testsuite/gcc.dg/pr28322-3.c +=================================================================== +--- gcc/testsuite/gcc.dg/pr28322-3.c (revision 0) ++++ gcc/testsuite/gcc.dg/pr28322-3.c (revision 0) +@@ -0,0 +1,20 @@ ++/* PR28322: ignore unknown -Wno-* if no warning is emitted. */ ++/* { dg-do compile } */ ++/* { dg-options " -fno-foobar -mno-foobar" } */ ++ ++void foo(void) ++{ ++ int i = 1; ++} ++/* { dg-message "unrecognized command line option .-fno-foobar." "" { target *-*-* } 0 } */ ++/* { dg-message "unrecognized command line option .-mno-foobar." "" { target *-*-* } 0 } */ ++/* PR28322: ignore unknown -Wno-* if no warning is emitted. */ ++/* { dg-do compile } */ ++/* { dg-options " -fno-foobar -mno-foobar" } */ ++ ++void foo(void) ++{ ++ int i = 1; ++} ++/* { dg-warning "unrecognized command line option .-fno-foobar." "" { target *-*-* } 0 } */ ++/* { dg-warning "unrecognized command line option .-mno-foobar." "" { target *-*-* } 0 } */ +Index: gcc/testsuite/lib/prune.exp +=================================================================== +--- gcc/testsuite/lib/prune.exp (revision 134648) ++++ gcc/testsuite/lib/prune.exp (working copy) +@@ -21,7 +21,7 @@ + #send_user "Before:$text\n" + + regsub -all "(^|\n)\[^\n\]*: In ((static member )?function|member|method|(copy )?constructor|destructor|instantiation|program|subroutine|block-data) \[^\n\]*" $text "" text +- regsub -all "(^|\n)\[^\n\]*: At (top level|global scope):\[^\n\]*" $text "" text ++ regsub -all "(^|\n)\[^\n\]*(: )?At (top level|global scope):\[^\n\]*" $text "" text + regsub -all "(^|\n)\[^\n\]*: instantiated from \[^\n\]*" $text "" text + regsub -all "(^|\n)collect2: ld returned \[^\n\]*" $text "" text + regsub -all "(^|\n)collect: re(compiling|linking)\[^\n\]*" $text "" text diff -urN h/gcc-4.2-4.2.3/debian/patches/pr28482.dpatch gcc-4.2-4.2.4/debian/patches/pr28482.dpatch --- h/gcc-4.2-4.2.3/debian/patches/pr28482.dpatch 1970-01-01 00:00:00.000000000 +0000 +++ gcc-4.2-4.2.4/debian/patches/pr28482.dpatch 2008-09-09 15:21:14.000000000 +0000 @@ -0,0 +1,46 @@ +#! /bin/sh -e + +# DP: Fix PR libgomp/28482, don't link with -Wl,-z,nodlopen even on Linux. + +dir= +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" + dir="$3/" +elif [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) + patch $pdir -f --no-backup-if-mismatch -p0 < $0 + ;; + -unpatch) + patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 + ;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + + PR libgomp/28482 + * configure.tgt: Don't link with -Wl,-z,nodlopen even on Linux. + +@DPATCH@ +--- libgomp/configure.tgt 2007/05/04 19:20:28 124444 ++++ libgomp/configure.tgt 2007/05/04 19:21:18 124445 +@@ -11,14 +11,11 @@ + # XLDFLAGS Add extra link flags to use. + + # Optimize TLS usage by avoiding the overhead of dynamic allocation. +-# This does require that the library be present during process +-# startup, so mark the library as not to be dlopened. + if test $have_tls = yes ; then + case "${target}" in + + *-*-linux*) + XCFLAGS="${XCFLAGS} -ftls-model=initial-exec" +- XLDFLAGS="${XLDFLAGS} -Wl,-z,nodlopen" + ;; + esac + fi diff -urN h/gcc-4.2-4.2.3/debian/patches/pr30961.dpatch gcc-4.2-4.2.4/debian/patches/pr30961.dpatch --- h/gcc-4.2-4.2.3/debian/patches/pr30961.dpatch 2008-09-09 15:05:00.000000000 +0000 +++ gcc-4.2-4.2.4/debian/patches/pr30961.dpatch 2008-09-03 21:47:51.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh -e -# DP: +# DP: Fix PR target/30961. dir= if [ $# -eq 3 -a "$2" = '-d' ]; then diff -urN h/gcc-4.2-4.2.3/debian/patches/pr35020.dpatch gcc-4.2-4.2.4/debian/patches/pr35020.dpatch --- h/gcc-4.2-4.2.3/debian/patches/pr35020.dpatch 1970-01-01 00:00:00.000000000 +0000 +++ gcc-4.2-4.2.4/debian/patches/pr35020.dpatch 2008-09-02 19:23:29.000000000 +0000 @@ -0,0 +1,320 @@ +#! /bin/sh -e + +# DP: Fix PR libjava/35020, taken from the trunk. + +dir= +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" + dir="$3/" +elif [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) + patch $pdir -f --no-backup-if-mismatch -p0 < $0 + uudecode $0 + tar -xv -f pr35020-classes.tgz -C ${dir} + rm -f pr35020-classes.tgz + ;; + -unpatch) + patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 + ;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + +2008-05-22 Andrew Haley + + PR libgcj/35020 + * java/lang/Class.java (getSimpleName): Replace incorrect use of + String.lastIndexOf(String, int) with String.substring. + * testsuite/libjava.lang/PR35020.java: New file. + * testsuite/libjava.lang/PR35020.out: New file. + +2008-05-22 Andrew Haley + + PR libgcj/35020 + * java/lang/Class.java (getSimpleName): Import from GNU Classpath. + +Index: libjava/testsuite/libjava.lang/PR35020.java +=================================================================== +--- libjava/testsuite/libjava.lang/PR35020.java (revision 0) ++++ libjava/testsuite/libjava.lang/PR35020.java (revision 135801) +@@ -0,0 +1,21 @@ ++public class PR35020 ++{ ++ class inner ++ { ++ } ++ public static void main(String[] args) ++ { ++ System.out.println(inner.class.getSimpleName()); ++ System.out.println(PR35020.class.getSimpleName()); ++ System.out.println(Class.class.getSimpleName()); ++ System.out.println((new int[7]).getClass().getSimpleName()); ++ System.out.println((new Object[1][1][1][1][1][1][1][1]).getClass().getSimpleName()); ++ System.out.println((new java.security.PrivilegedAction() ++ { ++ public Object run() { ++ return null; ++ } ++ }).getClass().getSimpleName()); ++ } ++} ++ +Index: libjava/testsuite/libjava.lang/PR35020.out +=================================================================== +--- libjava/testsuite/libjava.lang/PR35020.out (revision 0) ++++ libjava/testsuite/libjava.lang/PR35020.out (revision 135801) +@@ -0,0 +1,6 @@ ++inner ++PR35020 ++Class ++int[] ++Object[][][][][][][][] ++ +Index: libjava/java/lang/Class.java +=================================================================== +--- libjava/java/lang/Class.java (revision 135770) ++++ libjava/java/lang/Class.java (revision 135801) +@@ -1075,22 +1075,29 @@ + */ + public String getSimpleName() + { +- StringBuffer sb = new StringBuffer(); +- Class klass = this; +- int arrayCount = 0; +- while (klass.isArray()) ++ if (isAnonymousClass()) ++ return ""; ++ if (isArray()) + { +- klass = klass.getComponentType(); +- ++arrayCount; ++ return getComponentType().getSimpleName() + "[]"; + } +- if (! klass.isAnonymousClass()) ++ String fullName = getName(); ++ int pos = fullName.lastIndexOf("$"); ++ if (pos == -1) ++ pos = 0; ++ else + { +- String fullName = klass.getName(); +- sb.append(fullName, fullName.lastIndexOf(".") + 1, fullName.length()); ++ ++pos; ++ while (Character.isDigit(fullName.charAt(pos))) ++ ++pos; ++ fullName = fullName.substring(pos); + } +- while (arrayCount-- > 0) +- sb.append("[]"); +- return sb.toString(); ++ ++ int packagePos = fullName.lastIndexOf("."); ++ if (packagePos == -1) ++ return fullName; ++ else ++ return fullName.substring(packagePos + 1); + } + + /** + +begin-base64 644 pr35020-classes.tgz +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 +5CnXQoGyDwqV/TBHuc7CcXmS43J4RXKcRzM/oZFCaa8QXiULWTkuT3rIa/D6 +9By9ITn6aSZHdxBHdxJHdxFHdxNH9/w/cKTwh3WToyNEhdPIdrL0z+6GLR7K ++28X1d4DDaa/dlbLBc8x+NWu6qJVRbXj8M4kvDcBv+fh+7Ttg3HEjoOQ78kZ +x5wOT6Y3PAAO5etQrByCBcqD5BHfgM3KI3Cu8qgliW1PSrLdlGQBVFJFr05L +YtsTPo/5yNEOWIBC2r4rlYxxFq3PxkIJV4TFyfkSei8lC/D8HHN9rvmch2Vm +qs4jyPkUPcaeRajwFzq2Ii6lp6GzTxOsTL2T6OYwd3mO4IpxrKqawDrO5I4j +uPpwdYYe1DWQozaAU10Lheo6mKOuh/nqBlikNtsk8xwox0ZcR/TmgAvPxrX2 +yZy/lJs8xWk/r9VXjeP628DJ1jvMNqP3ptsgvxTPOQh5pbjRsB0vG5ZLsTmb +WVDPBYfqBaFut+T9+qy8X59koZVUKFmgsFdktXIY6Y/0MImbH/I8hu2nwOPZ +1fU0D5nwUfQqwF3rrOojeP449tU881DNMwdhac0zJ47gzjSQAhOE8ew6BRrj +MT1zQ04pXrwgR2aoYl5GY9dBOIvfFuQYrwty0mBvB0f1qQ9fy6beRdRNzF0E +XCPxFh3BjyfRuumlxnipsUAZGH+awaz2EPnSfFgD62W1aZTP9dAkn5dRjZmQ +0feYfE6QHSeShthP3gDqpZCrapCvDsAslaqNOkj+MgQr1GGoUkeggd6b1QB4 +1SB0qiHoU8fgYvUKuEyNgl+NQUyNw351L3xBvQq+on4CHlA/CYfUa+AIwTyu +7oen1evgBfV6+JF6AN5Qb4SfqZ+F36qfg/fVz6Oi3iyN38KHBeqtzSpEsTAo +q9AKakN0HCJze+G4OfLTmDNPDjwNm+TIknkkjjLZLjyRzDwXmie1sqqiVeM4 +3LxQuRccpNLDVerCcRxNHdtkkVRJy+od5Jd3QpF6l6VIlkliQCFWhCEq10iz +DbDWJHKLWdjcFKrsTuV/aufaw2rK2vha++zd6X45xyndG1OpTvd0JLppijqd +RGEiNGgMkkuFeTDkTgkRXzERCZEpdIpQRIwZlBmXSZRqyHW+oSm30ay1zz6n +cxLffDPfN3/t3/PU3vvstdd617vW+3vfd6+9t6MDqnwmMopEHF1oOTpJYbIU +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 +cVUEf5/RzIkN9jZJDc0BVsTRgOYNLa1LjHl1604Q0eOupiU9beFcX5AhfVCa +cZinHbrlwuHRQTc/yer3telY+9NTQzd8NnN6ku+aqLdWHvbuqdOaZuwOrqvU +nTt7Q9vY4prXlOpgDEj48SIXDQSyZxQHdA3GVBy8fGBARkZIxFX+vbZvzRvH +jzR91HEpUG/k6epvNjXtsVIPCNrTIYlJEmf7Z7yqGLS68bRl43peg3PAhvOX +L2/r/9i0/fX951qVBnNJs8G/PH3b4uibvuq4XZRNo8GurIWZzTGGV5pvJeUf +XlkzY3yST5rGV1dfXYk+UbMiwVnjbuuw29t4J0Je5i3U3xKYVKPTuMtocOyK +xvS03B2tg2873ttfYBGXLTxjZe+RNSxuj6RhbU70tPrOPs+aGnNjorKOX60W +SH8I3JR9a/qk7JbDh0Y6FQXpF6bUFOvFbt197A3VK8h2x2cLyS0v2rO+PnOX +WPr7snkr9ZbPrB/Q6jG38EbQ2d5jLGIFnIETjpSl6xzg3bCVpkyIEEPCiPM+ +4tZh9vTBkwC8VaJxSqbSkfMx9eM63kfgsjpwAJaXMki5DhU6/0B1qsSsoxAv +L+UI9juqNP2BelTNVrme2wR414g/UJPqnFOuaRoJep6BKrVR+Dk/FElTACUK +oJT6qz6XBQsWLFiwYMGCBQsWLFiwYMGCBQsWLFiwYMGCBQsWLFiwYMGCBQsW +LFiwYMHi7+APRvHkTwB4AAA= +==== diff -urN h/gcc-4.2-4.2.3/debian/patches/pr35432.dpatch gcc-4.2-4.2.4/debian/patches/pr35432.dpatch --- h/gcc-4.2-4.2.3/debian/patches/pr35432.dpatch 1970-01-01 00:00:00.000000000 +0000 +++ gcc-4.2-4.2.4/debian/patches/pr35432.dpatch 2008-09-03 21:47:51.000000000 +0000 @@ -0,0 +1,69 @@ +#! /bin/sh -e + +# DP: Fix PR middle-end/35432, taken from the gcc-4_2-branch. + +dir= +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" + dir="$3/" +elif [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) + patch $pdir -f --no-backup-if-mismatch -p0 < $0 + ;; + -unpatch) + patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 + ;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + +gcc/ + +2008-08-06 Aldy Hernandez + + PR middle-end/35432 + * gimplify.c (gimplify_modify_expr): Do not optimize + zero-sized types if want_value. + +gcc/testsuite/ + +2008-08-06 Aldy Hernandez + + PR middle-end/35432 + * gcc.c-torture/compile/pr35432.c: New file. + +Index: gcc/testsuite/gcc.c-torture/compile/pr35432.c +=================================================================== +--- gcc/testsuite/gcc.c-torture/compile/pr35432.c (Revision 0) ++++ gcc/testsuite/gcc.c-torture/compile/pr35432.c (Revision 138796) +@@ -0,0 +1,11 @@ ++/* PR middle-end/35432 */ ++ ++struct A ++{ ++ char c[0]; ++}; ++ ++void foo(struct A a) ++{ ++ (a = a).c; ++} +Index: gcc/gimplify.c +=================================================================== +--- gcc/gimplify.c (Revision 138795) ++++ gcc/gimplify.c (Revision 138796) +@@ -3540,7 +3540,7 @@ + side as statements and throw away the assignment. Do this after + gimplify_modify_expr_rhs so we handle TARGET_EXPRs of addressable + types properly. */ +- if (zero_sized_type (TREE_TYPE (*from_p))) ++ if (zero_sized_type (TREE_TYPE (*from_p)) && !want_value) + { + gimplify_stmt (from_p); + gimplify_stmt (to_p); diff -urN h/gcc-4.2-4.2.3/debian/patches/pr36634.dpatch gcc-4.2-4.2.4/debian/patches/pr36634.dpatch --- h/gcc-4.2-4.2.3/debian/patches/pr36634.dpatch 1970-01-01 00:00:00.000000000 +0000 +++ gcc-4.2-4.2.4/debian/patches/pr36634.dpatch 2008-09-03 21:47:52.000000000 +0000 @@ -0,0 +1,263 @@ +#! /bin/sh -e + +# DP: Fix PR target/36634. + +dir= +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" + dir="$3/" +elif [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) + patch $pdir -f --no-backup-if-mismatch -p0 < $0 + ;; + -unpatch) + patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 + ;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + +gcc/ + +2008-07-04 Alan Modra + + PR target/36634 + * config/rs6000/rs6000.md (call, call_value): Don't arrange for + pic_offset_table_rtx to be marked as used here. + (call_nonlocal_sysv, call_value_nonlocal_sysv): Add split for + TARGET_SECURE_PLT to "use" pic_offset_table_rtx. + (call_nonlocal_sysv_secure, call_value_nonlocal_sysv_secure): New insn. + (sibcall_nonlocal_sysv, sibcall_value_nonlocal_sysv): Assert + !TARGET_SECURE_PLT. + +Index: gcc/config/rs6000/rs6000.md +=================================================================== +--- gcc/config/rs6000/rs6000.md (Revision 137448) ++++ gcc/config/rs6000/rs6000.md (Revision 137449) +@@ -10379,25 +10379,6 @@ + + operands[0] = XEXP (operands[0], 0); + +- if (DEFAULT_ABI == ABI_V4 && TARGET_SECURE_PLT +- && flag_pic +- && GET_CODE (operands[0]) == SYMBOL_REF +- && !SYMBOL_REF_LOCAL_P (operands[0])) +- { +- rtx call; +- rtvec tmp; +- +- tmp = gen_rtvec (3, +- gen_rtx_CALL (VOIDmode, +- gen_rtx_MEM (SImode, operands[0]), +- operands[1]), +- gen_rtx_USE (VOIDmode, operands[2]), +- gen_rtx_CLOBBER (VOIDmode, gen_rtx_SCRATCH (SImode))); +- call = emit_call_insn (gen_rtx_PARALLEL (VOIDmode, tmp)); +- use_reg (&CALL_INSN_FUNCTION_USAGE (call), pic_offset_table_rtx); +- DONE; +- } +- + if (GET_CODE (operands[0]) != SYMBOL_REF + || (DEFAULT_ABI == ABI_AIX && !SYMBOL_REF_FUNCTION_P (operands[0])) + || (DEFAULT_ABI != ABI_DARWIN && (INTVAL (operands[2]) & CALL_LONG) != 0)) +@@ -10449,28 +10430,6 @@ + + operands[1] = XEXP (operands[1], 0); + +- if (DEFAULT_ABI == ABI_V4 && TARGET_SECURE_PLT +- && flag_pic +- && GET_CODE (operands[1]) == SYMBOL_REF +- && !SYMBOL_REF_LOCAL_P (operands[1])) +- { +- rtx call; +- rtvec tmp; +- +- tmp = gen_rtvec (3, +- gen_rtx_SET (VOIDmode, +- operands[0], +- gen_rtx_CALL (VOIDmode, +- gen_rtx_MEM (SImode, +- operands[1]), +- operands[2])), +- gen_rtx_USE (VOIDmode, operands[3]), +- gen_rtx_CLOBBER (VOIDmode, gen_rtx_SCRATCH (SImode))); +- call = emit_call_insn (gen_rtx_PARALLEL (VOIDmode, tmp)); +- use_reg (&CALL_INSN_FUNCTION_USAGE (call), pic_offset_table_rtx); +- DONE; +- } +- + if (GET_CODE (operands[1]) != SYMBOL_REF + || (DEFAULT_ABI == ABI_AIX && !SYMBOL_REF_FUNCTION_P (operands[1])) + || (DEFAULT_ABI != ABI_DARWIN && (INTVAL (operands[3]) & CALL_LONG) != 0)) +@@ -10726,7 +10685,7 @@ + [(set_attr "type" "jmpreg,jmpreg,jmpreg,jmpreg") + (set_attr "length" "4,4,8,8")]) + +-(define_insn "*call_nonlocal_sysv" ++(define_insn_and_split "*call_nonlocal_sysv" + [(call (mem:SI (match_operand:P 0 "symbol_ref_operand" "s,s")) + (match_operand 1 "" "g,g")) + (use (match_operand:SI 2 "immediate_operand" "O,n")) +@@ -10746,21 +10705,55 @@ + #else + if (DEFAULT_ABI == ABI_V4 && flag_pic) + { +- if (TARGET_SECURE_PLT && flag_pic == 2) +- /* The magic 32768 offset here and in the other sysv call insns +- corresponds to the offset of r30 in .got2, as given by LCTOC1. +- See sysv4.h:toc_section. */ +- return "bl %z0+32768@plt"; +- else +- return "bl %z0@plt"; ++ gcc_assert (!TARGET_SECURE_PLT); ++ return "bl %z0@plt"; + } + else + return "bl %z0"; + #endif + } ++ "DEFAULT_ABI == ABI_V4 ++ && TARGET_SECURE_PLT && flag_pic && !SYMBOL_REF_LOCAL_P (operands[0]) ++ && (INTVAL (operands[2]) & CALL_LONG) == 0" ++ [(parallel [(call (mem:SI (match_dup 0)) ++ (match_dup 1)) ++ (use (match_dup 2)) ++ (use (match_dup 3)) ++ (clobber (match_dup 4))])] ++{ ++ operands[4] = operands[3]; ++ operands[3] = pic_offset_table_rtx; ++} + [(set_attr "type" "branch,branch") + (set_attr "length" "4,8")]) + ++(define_insn "*call_nonlocal_sysv_secure" ++ [(call (mem:SI (match_operand:P 0 "symbol_ref_operand" "s,s")) ++ (match_operand 1 "" "g,g")) ++ (use (match_operand:SI 2 "immediate_operand" "O,n")) ++ (use (match_operand:SI 3 "register_operand" "r,r")) ++ (clobber (match_scratch:SI 4 "=l,l"))] ++ "(DEFAULT_ABI == ABI_V4 ++ && TARGET_SECURE_PLT && flag_pic && !SYMBOL_REF_LOCAL_P (operands[0]) ++ && (INTVAL (operands[2]) & CALL_LONG) == 0)" ++{ ++ if (INTVAL (operands[2]) & CALL_V4_SET_FP_ARGS) ++ output_asm_insn ("crxor 6,6,6", operands); ++ ++ else if (INTVAL (operands[2]) & CALL_V4_CLEAR_FP_ARGS) ++ output_asm_insn ("creqv 6,6,6", operands); ++ ++ if (flag_pic == 2) ++ /* The magic 32768 offset here and in the other sysv call insns ++ corresponds to the offset of r30 in .got2, as given by LCTOC1. ++ See sysv4.h:toc_section. */ ++ return "bl %z0+32768@plt"; ++ else ++ return "bl %z0@plt"; ++} ++ [(set_attr "type" "branch,branch") ++ (set_attr "length" "4,8")]) ++ + (define_insn "*call_value_indirect_nonlocal_sysv" + [(set (match_operand 0 "" "") + (call (mem:SI (match_operand:P 1 "register_operand" "c,*l,c,*l")) +@@ -10781,7 +10774,7 @@ + [(set_attr "type" "jmpreg,jmpreg,jmpreg,jmpreg") + (set_attr "length" "4,4,8,8")]) + +-(define_insn "*call_value_nonlocal_sysv" ++(define_insn_and_split "*call_value_nonlocal_sysv" + [(set (match_operand 0 "" "") + (call (mem:SI (match_operand:P 1 "symbol_ref_operand" "s,s")) + (match_operand 2 "" "g,g"))) +@@ -10802,18 +10795,54 @@ + #else + if (DEFAULT_ABI == ABI_V4 && flag_pic) + { +- if (TARGET_SECURE_PLT && flag_pic == 2) +- return "bl %z1+32768@plt"; +- else +- return "bl %z1@plt"; ++ gcc_assert (!TARGET_SECURE_PLT); ++ return "bl %z1@plt"; + } + else + return "bl %z1"; + #endif + } ++ "DEFAULT_ABI == ABI_V4 ++ && TARGET_SECURE_PLT && flag_pic && !SYMBOL_REF_LOCAL_P (operands[1]) ++ && (INTVAL (operands[3]) & CALL_LONG) == 0" ++ [(parallel [(set (match_dup 0) ++ (call (mem:SI (match_dup 1)) ++ (match_dup 2))) ++ (use (match_dup 3)) ++ (use (match_dup 4)) ++ (clobber (match_dup 5))])] ++{ ++ operands[5] = operands[4]; ++ operands[4] = pic_offset_table_rtx; ++} + [(set_attr "type" "branch,branch") + (set_attr "length" "4,8")]) + ++(define_insn "*call_value_nonlocal_sysv_secure" ++ [(set (match_operand 0 "" "") ++ (call (mem:SI (match_operand:P 1 "symbol_ref_operand" "s,s")) ++ (match_operand 2 "" "g,g"))) ++ (use (match_operand:SI 3 "immediate_operand" "O,n")) ++ (use (match_operand:SI 4 "register_operand" "r,r")) ++ (clobber (match_scratch:SI 5 "=l,l"))] ++ "(DEFAULT_ABI == ABI_V4 ++ && TARGET_SECURE_PLT && flag_pic && !SYMBOL_REF_LOCAL_P (operands[1]) ++ && (INTVAL (operands[3]) & CALL_LONG) == 0)" ++{ ++ if (INTVAL (operands[3]) & CALL_V4_SET_FP_ARGS) ++ output_asm_insn ("crxor 6,6,6", operands); ++ ++ else if (INTVAL (operands[3]) & CALL_V4_CLEAR_FP_ARGS) ++ output_asm_insn ("creqv 6,6,6", operands); ++ ++ if (flag_pic == 2) ++ return "bl %z1+32768@plt"; ++ else ++ return "bl %z1@plt"; ++} ++ [(set_attr "type" "branch,branch") ++ (set_attr "length" "4,8")]) ++ + ;; Call subroutine returning any type. + (define_expand "untyped_call" + [(parallel [(call (match_operand 0 "" "") +@@ -11025,10 +11054,8 @@ + + if (DEFAULT_ABI == ABI_V4 && flag_pic) + { +- if (TARGET_SECURE_PLT && flag_pic == 2) +- return \"b %z0+32768@plt\"; +- else +- return \"b %z0@plt\"; ++ gcc_assert (!TARGET_SECURE_PLT); ++ return \"b %z0@plt\"; + } + else + return \"b %z0\"; +@@ -11079,10 +11106,8 @@ + + if (DEFAULT_ABI == ABI_V4 && flag_pic) + { +- if (TARGET_SECURE_PLT && flag_pic == 2) +- return \"b %z1+32768@plt\"; +- else +- return \"b %z1@plt\"; ++ gcc_assert (!TARGET_SECURE_PLT); ++ return \"b %z1@plt\"; + } + else + return \"b %z1\"; diff -urN h/gcc-4.2-4.2.3/debian/patches/pr37101.dpatch gcc-4.2-4.2.4/debian/patches/pr37101.dpatch --- h/gcc-4.2-4.2.3/debian/patches/pr37101.dpatch 1970-01-01 00:00:00.000000000 +0000 +++ gcc-4.2-4.2.4/debian/patches/pr37101.dpatch 2008-09-03 21:47:52.000000000 +0000 @@ -0,0 +1,146 @@ +#! /bin/sh -e + +# DP: Fix PR target/37101, taken from the gcc-4_2-branch. + +dir= +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" + dir="$3/" +elif [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) + patch $pdir -f --no-backup-if-mismatch -p0 < $0 + ;; + -unpatch) + patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 + ;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + +gcc/ + +2008-08-29 Uros Bizjak + + Backport from mainline: + 2008-08-14 Christophe Saout + Uros Bizjak + + PR target/37101 + * config/i386/sse.md (vec_concatv2di): Remove movlps alternative. + +gcc/testsuite/ + +2008-08-29 Uros Bizjak + + Backport from mainline: + 2008-08-14 Uros Bizjak + + PR target/37101 + * gcc.target/i386/pr37101.c: New test. + +Index: gcc/testsuite/gcc.target/i386/pr37101.c +=================================================================== +--- gcc/testsuite/gcc.target/i386/pr37101.c (Revision 0) ++++ gcc/testsuite/gcc.target/i386/pr37101.c (Revision 139758) +@@ -0,0 +1,64 @@ ++/* { dg-do compile } */ ++/* { dg-options "-O2 -msse2 -ftree-vectorize -march=nocona" } */ ++ ++typedef __SIZE_TYPE__ size_t; ++extern void *malloc (size_t); ++extern void free (void *); ++ ++typedef struct _Resource ++{ ++ struct _Resource *next; ++ unsigned int id; ++} ResourceRec, *ResourcePtr; ++ ++typedef struct _ClientResource ++{ ++ ResourcePtr *resources; ++ int elements; ++ int buckets; ++ int hashsize; ++} ClientResourceRec; ++ ++static ClientResourceRec clientTable[256]; ++ ++void ++RebuildTable (int client) ++{ ++ int j; ++ ResourcePtr res, next; ++ ResourcePtr **tails, *resources; ++ ResourcePtr **tptr, *rptr; ++ ++ j = 2 * clientTable[client].buckets; ++ ++ tails = ++ (ResourcePtr **) malloc ((unsigned long) (j * sizeof (ResourcePtr *))); ++ resources = ++ (ResourcePtr *) malloc ((unsigned long) (j * sizeof (ResourcePtr))); ++ ++ for (rptr = resources, tptr = tails; --j >= 0; rptr++, tptr++) ++ { ++ *rptr = ((ResourcePtr) ((void *) 0)); ++ *tptr = rptr; ++ } ++ ++ clientTable[client].hashsize++; ++ for (j = clientTable[client].buckets, ++ rptr = clientTable[client].resources; --j >= 0; rptr++) ++ { ++ for (res = *rptr; res; res = next) ++ { ++ next = res->next; ++ res->next = ((ResourcePtr) ((void *) 0)); ++ tptr = &tails[Hash (client, res->id)]; ++ **tptr = res; ++ *tptr = &res->next; ++ } ++ } ++ free ((void *) tails); ++ clientTable[client].buckets *= 2; ++ free ((void *) clientTable[client].resources); ++ clientTable[client].resources = resources; ++} ++ ++/* { dg-final { scan-assembler-not "movlps" } } */ +Index: gcc/config/i386/sse.md +=================================================================== +--- gcc/config/i386/sse.md (Revision 139757) ++++ gcc/config/i386/sse.md (Revision 139758) +@@ -3576,20 +3576,19 @@ + (set_attr "mode" "TI,V4SF,V2SF")]) + + (define_insn "*vec_concatv2di" +- [(set (match_operand:V2DI 0 "register_operand" "=Y,?Y,Y,x,x,x") ++ [(set (match_operand:V2DI 0 "register_operand" "=Y,?Y,Y,x,x") + (vec_concat:V2DI +- (match_operand:DI 1 "nonimmediate_operand" " m,*y,0,0,0,m") +- (match_operand:DI 2 "vector_move_operand" " C, C,Y,x,m,0")))] ++ (match_operand:DI 1 "nonimmediate_operand" " m,*y,0,0,0") ++ (match_operand:DI 2 "vector_move_operand" " C, C,Y,x,m")))] + "TARGET_SSE" + "@ + movq\t{%1, %0|%0, %1} + movq2dq\t{%1, %0|%0, %1} + punpcklqdq\t{%2, %0|%0, %2} + movlhps\t{%2, %0|%0, %2} +- movhps\t{%2, %0|%0, %2} +- movlps\t{%1, %0|%0, %1}" +- [(set_attr "type" "ssemov,ssemov,sselog,ssemov,ssemov,ssemov") +- (set_attr "mode" "TI,TI,TI,V4SF,V2SF,V2SF")]) ++ movhps\t{%2, %0|%0, %2}" ++ [(set_attr "type" "ssemov,ssemov,sselog,ssemov,ssemov") ++ (set_attr "mode" "TI,TI,TI,V4SF,V2SF")]) + + (define_expand "vec_setv2di" + [(match_operand:V2DI 0 "register_operand" "") diff -urN h/gcc-4.2-4.2.3/debian/patches/sh4-multilib.dpatch gcc-4.2-4.2.4/debian/patches/sh4-multilib.dpatch --- h/gcc-4.2-4.2.3/debian/patches/sh4-multilib.dpatch 1970-01-01 00:00:00.000000000 +0000 +++ gcc-4.2-4.2.4/debian/patches/sh4-multilib.dpatch 2008-09-02 19:23:29.000000000 +0000 @@ -0,0 +1,45 @@ +#! /bin/sh -e + +# sh4-multilib.dpatch from Arthur Loiret +# DP: Fix multilib (m4/m4-nofpu) for sh4-linux + +dir= +if [ $# -eq 3 -a "$2" = '-d' ]; then + pdir="-d $3" + dir="$3/" +elif [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) + patch $pdir -f --no-backup-if-mismatch -p0 < $0 + #cd ${dir}gcc && autoconf + ;; + -unpatch) + patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 + #rm ${dir}gcc/configure + ;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +esac +exit 0 + +--- gcc/config.gcc 2008-04-24 09:00:54.000000000 +0000 ++++ gcc/config.gcc 2008-04-24 09:05:10.000000000 +0000 +@@ -2271,11 +2271,12 @@ + if test x${sh_multilibs} = x ; then + case ${target} in + sh64-superh-linux* | \ +- sh[1234]*) sh_multilibs=${sh_cpu_target} ;; + sh64* | sh5*) sh_multilibs=m5-32media,m5-32media-nofpu,m5-compact,m5-compact-nofpu,m5-64media,m5-64media-nofpu ;; +- sh-superh-*) sh_multilibs=m4,m4-single,m4-single-only,m4-nofpu ;; ++ sh-superh-* | \ ++ sh4-*-linux*) sh_multilibs=m4,m4-nofpu ;; + sh*-*-linux*) sh_multilibs=m1,m3e,m4 ;; + sh*-*-netbsd*) sh_multilibs=m3,m3e,m4 ;; ++ sh-superh-*) sh_multilibs=m4,m4-single,m4-single-only,m4-nofpu ;; + *) sh_multilibs=m1,m2,m2e,m4,m4-single,m4-single-only,m2a,m2a-single ;; + esac + if test x$with_fp = xno; then diff -urN h/gcc-4.2-4.2.3/debian/rules.conf gcc-4.2-4.2.4/debian/rules.conf --- h/gcc-4.2-4.2.3/debian/rules.conf 2008-09-09 15:05:00.000000000 +0000 +++ gcc-4.2-4.2.4/debian/rules.conf 2008-09-04 09:02:58.000000000 +0000 @@ -54,14 +54,6 @@ LIBC_DEP = libc0.1 LIBC_DEV_DEP = libc0.1-dev endif - ifeq ($(DEB_TARGET_ARCH_OS),knetbsd) - LIBC_DEP = libc0.1 - LIBC_DEV_DEP = libc0.1-dev$(LS) - endif - ifeq ($(DEB_TARGET_ARCH_OS),netbsd) - LIBC_DEP = libc12 - LIBC_DEV_DEP = libc12-dev$(LS) - endif endif LIBC_BIARCH_DEP := @@ -109,7 +101,7 @@ LIBUNWIND_DEV_DEP := libunwind7-dev$(LS) (>= 0.98.5-6) endif -SOURCE_BUILD_DEP += gcc-$(BASE_VERSION)-source (>= $(BASE_VERSION).3), gcc-$(BASE_VERSION)-source (<< $(BASE_VERSION).4), +SOURCE_BUILD_DEP += gcc-$(BASE_VERSION)-source (>= $(BASE_VERSION).4), gcc-$(BASE_VERSION)-source (<< $(BASE_VERSION).5), CHECK_BUILD_DEP := expect-tcl8.3 [hppa], dejagnu [check_no_archs] ifeq ($(distribution),Ubuntu) @@ -119,7 +111,7 @@ endif ifndef DEB_CROSS -LIBC_BUILD_DEP := libc6.1-dev (>= $(libc_ver)) [alpha ia64] | libc0.3-dev (>= $(libc_ver)) [hurd-i386] | libc0.1-dev (>= $(libc_ver)) [kfreebsd-i386 kfreebsd-amd64 knetbsd-gnu] | libc12-dev (>= $(libc_ver)) [netbsd-elf-gnu] | libc6-dev (>= $(libc_ver)) +LIBC_BUILD_DEP := libc6.1-dev (>= $(libc_ver)) [alpha ia64] | libc0.3-dev (>= $(libc_ver)) [hurd-i386] | libc0.1-dev (>= $(libc_ver)) [kfreebsd-i386 kfreebsd-amd64] | libc6-dev (>= $(libc_ver)) JAVA_BUILD_DEP := libz-dev, ifneq (,$(java_awt_peers)) @@ -461,8 +453,11 @@ ifeq ($(with_libcxx),yes) addons += libcxx lib32cxx lib64cxx endif - ifeq ($(with_libmudflap),yes) + ifeq ($(with_mudflap),yes) addons += mudflap + ifeq ($(with_libmudflap),yes) + addons += libmudf + endif endif ifeq ($(with_libffi),yes) addons += libffi lib32ffi lib64ffi @@ -586,23 +581,23 @@ else # avoid it ... ada_no_archs := $(strip $(foreach cpu,$(ada_no_cpus),!$(cpu)) \ - !kfreebsd-amd64 !knetbsd-i386 !netbsd-i386 !hurd-i386) + !kfreebsd-amd64 !kfreebsd-i386 !hurd-i386) java_no_archs := $(strip $(foreach cpu,$(java_no_cpus),!$(cpu)) \ - !knetbsd-i386 !netbsd-i386) + ) java_plugin_no_archs := $(strip $(foreach cpu,$(java_plugin_no_cpus),!$(cpu)) \ - !knetbsd-i386 !netbsd-i386 !hurd-i386) + !hurd-i386) pascal_no_archs := $(strip $(foreach cpu,$(pascal_no_cpus),!$(cpu)) \ - !netbsd-i386) + ) fortran_no_archs:= $(strip $(foreach cpu,$(fortran_no_cpus),!$(cpu)) \ !avr) libphobos_no_archs := $(strip $(foreach cpu,$(libphobos_no_cpus),!$(cpu)) \ !hurd-i386) libgc_no_archs := $(strip $(foreach cpu,$(libgc_no_cpus),!$(cpu)) \ - !knetbsd-i386) + ) check_no_archs := $(strip $(foreach cpu,$(check_no_cpus),!$(cpu)) \ !hurd-i386) locale_no_archs := $(strip $(foreach cpu,$(locale_no_cpus),!$(cpu)) \ - !hurd-i386 !knetbsd-i386 !netbsd-i386) + !hurd-i386) linux_gnu_archs := !hurd-i386 endif diff -urN h/gcc-4.2-4.2.3/debian/rules.d/binary-cpp-cross.mk gcc-4.2-4.2.4/debian/rules.d/binary-cpp-cross.mk --- h/gcc-4.2-4.2.3/debian/rules.d/binary-cpp-cross.mk 2008-09-09 15:05:00.000000000 +0000 +++ gcc-4.2-4.2.4/debian/rules.d/binary-cpp-cross.mk 2008-09-02 19:23:29.000000000 +0000 @@ -30,8 +30,8 @@ dh_shlibdeps -p$(p_cpp) dh_gencontrol -p$(p_cpp) -- -v$(DEB_VERSION) $(common_substvars) dh_installdeb -p$(p_cpp) - sed 's/cross-/$(TP)/g;s/-ver/$(pkg_ver)/g;s/gcc/cpp/g' < debian/gcc-cross.postinst > debian/$(p_cpp)/DEBIAN/postinst - sed 's/cross-/$(TP)/g;s/-ver/$(pkg_ver)/g;s/gcc/cpp/g' < debian/gcc-cross.prerm > debian/$(p_cpp)/DEBIAN/prerm + sed 's/cross-/$(DEB_TARGET_GNU_TYPE)-/g;s/-ver/$(pkg_ver)/g;s/gcc/cpp/g' < debian/gcc-cross.postinst > debian/$(p_cpp)/DEBIAN/postinst + sed 's/cross-/$(DEB_TARGET_GNU_TYPE)-/g;s/-ver/$(pkg_ver)/g;s/gcc/cpp/g' < debian/gcc-cross.prerm > debian/$(p_cpp)/DEBIAN/prerm chmod 755 debian/$(p_cpp)/DEBIAN/{postinst,prerm} dh_md5sums -p$(p_cpp) dh_builddeb -p$(p_cpp) diff -urN h/gcc-4.2-4.2.3/debian/rules.d/binary-cpp.mk gcc-4.2-4.2.4/debian/rules.d/binary-cpp.mk --- h/gcc-4.2-4.2.3/debian/rules.d/binary-cpp.mk 2008-09-09 15:05:00.000000000 +0000 +++ gcc-4.2-4.2.4/debian/rules.d/binary-cpp.mk 2008-09-03 22:02:15.000000000 +0000 @@ -37,14 +37,10 @@ endif ln -sf $(BASE_VERSION) \ - $(d_cpp)/$(subst /$(BASE_VERSION),/4.2.1,$(gcc_lib_dir)) - ln -sf $(BASE_VERSION) \ - $(d_cpp)/$(subst /$(BASE_VERSION),/4.2.2,$(gcc_lib_dir)) + $(d_cpp)/$(subst /$(BASE_VERSION),/4.2.3,$(gcc_lib_dir)) ifneq ($(gcc_lib_dir),$(gcc_lexec_dir)) ln -sf $(BASE_VERSION) \ - $(d_cpp)/$(subst /$(BASE_VERSION),/4.2.1,$(gcc_lexec_dir)) - ln -sf $(BASE_VERSION) \ - $(d_cpp)/$(subst /$(BASE_VERSION),/4.2.2,$(gcc_lexec_dir)) + $(d_cpp)/$(subst /$(BASE_VERSION),/4.2.3,$(gcc_lexec_dir)) endif endif diff -urN h/gcc-4.2-4.2.3/debian/rules.d/binary-cxx-cross.mk gcc-4.2-4.2.4/debian/rules.d/binary-cxx-cross.mk --- h/gcc-4.2-4.2.3/debian/rules.d/binary-cxx-cross.mk 2008-09-09 15:05:00.000000000 +0000 +++ gcc-4.2-4.2.4/debian/rules.d/binary-cxx-cross.mk 2008-09-02 19:23:29.000000000 +0000 @@ -33,8 +33,8 @@ dh_shlibdeps -p$(p_cxx) dh_gencontrol -p$(p_cxx) -- -v$(DEB_VERSION) $(common_substvars) dh_installdeb -p$(p_cxx) - sed 's/cross-/$(TP)/g;s/-ver/$(pkg_ver)/g;s/gcc/g++/g' < debian/gcc-cross.postinst > debian/$(p_cxx)/DEBIAN/postinst - sed 's/cross-/$(TP)/g;s/-ver/$(pkg_ver)/g;s/gcc/g++/g' < debian/gcc-cross.prerm > debian/$(p_cxx)/DEBIAN/prerm + sed 's/cross-/$(DEB_TARGET_GNU_TYPE)-/g;s/-ver/$(pkg_ver)/g;s/gcc/g++/g' < debian/gcc-cross.postinst > debian/$(p_cxx)/DEBIAN/postinst + sed 's/cross-/$(DEB_TARGET_GNU_TYPE)-/g;s/-ver/$(pkg_ver)/g;s/gcc/g++/g' < debian/gcc-cross.prerm > debian/$(p_cxx)/DEBIAN/prerm chmod 755 debian/$(p_cxx)/DEBIAN/{postinst,prerm} dh_md5sums -p$(p_cxx) dh_builddeb -p$(p_cxx) diff -urN h/gcc-4.2-4.2.3/debian/rules.d/binary-fortran.mk gcc-4.2-4.2.4/debian/rules.d/binary-fortran.mk --- h/gcc-4.2-4.2.3/debian/rules.d/binary-fortran.mk 2008-09-09 15:05:00.000000000 +0000 +++ gcc-4.2-4.2.4/debian/rules.d/binary-fortran.mk 2008-09-02 19:23:29.000000000 +0000 @@ -57,7 +57,7 @@ endif dirs_flib = \ - $(docdir)/$(p_base)/fortran \ + $(docdir) \ $(PF)/$(libdir) \ files_flib = \ @@ -205,14 +205,14 @@ DH_COMPAT=2 dh_movefiles -p$(p_g95_m) \ $(gcc_lib_dir)/$(biarchsubdir)/libgfortranbegin.a -ifeq ($(with_lib64fortran),yes) +ifeq ($(biarch),yes) rm -f $(d)/$(PF)/lib64/libgfortran*.{la,so} mkdir -p $(d_g95_m)/$(gcc_lib_dir)/$(biarchsubdir) mv $(d)/$(PF)/lib64/libgfortran*.a $(d_g95_m)/$(gcc_lib_dir)/$(biarchsubdir)/ dh_link -p$(p_g95_m) \ /$(PF)/lib64/libgfortran.so.$(FORTRAN_SONAME) /$(gcc_lib_dir)/$(biarchsubdir)/libgfortran.so endif -ifeq ($(with_lib32fortran),yes) +ifeq ($(biarch32),yes) rm -f $(d)/$(lib32)/libgfortran*.{la,so} mkdir -p $(d_g95_m)/$(gcc_lib_dir)/$(biarchsubdir) mv $(d)/$(lib32)/libgfortran*.a $(d_g95_m)/$(gcc_lib_dir)/$(biarchsubdir)/ diff -urN h/gcc-4.2-4.2.3/debian/rules.d/binary-gcc-cross.mk gcc-4.2-4.2.4/debian/rules.d/binary-gcc-cross.mk --- h/gcc-4.2-4.2.3/debian/rules.d/binary-gcc-cross.mk 2008-09-09 15:05:00.000000000 +0000 +++ gcc-4.2-4.2.4/debian/rules.d/binary-gcc-cross.mk 2008-09-02 19:23:29.000000000 +0000 @@ -90,8 +90,8 @@ dh_fixperms -p$(p_gcc) dh_shlibdeps -p$(p_gcc) dh_gencontrol -p$(p_gcc) -- -v$(DEB_VERSION) $(common_substvars) - sed 's/cross-/$(TP)/g;s/-ver/$(pkg_ver)/g' < debian/gcc-cross.postinst > debian/$(p_gcc)/DEBIAN/postinst - sed 's/cross-/$(TP)/g;s/-ver/$(pkg_ver)/g' < debian/gcc-cross.prerm > debian/$(p_gcc)/DEBIAN/prerm + sed 's/cross-/$(DEB_TARGET_GNU_TYPE)-/g;s/-ver/$(pkg_ver)/g' < debian/gcc-cross.postinst > debian/$(p_gcc)/DEBIAN/postinst + sed 's/cross-/$(DEB_TARGET_GNU_TYPE)-/g;s/-ver/$(pkg_ver)/g' < debian/gcc-cross.prerm > debian/$(p_gcc)/DEBIAN/prerm chmod 755 debian/$(p_gcc)/DEBIAN/{postinst,prerm} dh_installdeb -p$(p_gcc) dh_md5sums -p$(p_gcc) diff -urN h/gcc-4.2-4.2.3/debian/rules.d/binary-java.mk gcc-4.2-4.2.4/debian/rules.d/binary-java.mk --- h/gcc-4.2-4.2.3/debian/rules.d/binary-java.mk 2008-09-09 15:05:00.000000000 +0000 +++ gcc-4.2-4.2.4/debian/rules.d/binary-java.mk 2008-09-04 08:50:52.000000000 +0000 @@ -1,3 +1,6 @@ +ifeq ($(with_gcj_base_only),yes) + arch_binaries := $(arch_binaries) jbase +else ifeq ($(with_separate_libgcj),yes) ifeq ($(PKGSOURCE),gcj-$(BASE_VERSION)) arch_binaries := $(arch_binaries) jbase @@ -24,6 +27,7 @@ ifeq ($(with_gcj),yes) arch_binaries := $(arch_binaries) gcj endif +endif p_jbase = gcj$(pkg_ver)-base p_gcj = gcj$(pkg_ver) @@ -516,6 +520,8 @@ ln -sf libgcj-$(BASE_VERSION).pc \ $(d_jdev)/$(PF)/$(libdir)/pkgconfig/libgcj$(PKG_GCJ_EXT).pc + sed -i -e 's,-[IL][^ ]* *,,' \ + $(d_jdev)/$(PF)/$(libdir)/pkgconfig/libgcj-$(BASE_VERSION).pc mv $(d_jdev)/$(PF)/$(libdir)/libgcj.spec $(d_jdev)/$(gcc_lib_dir)/ diff -urN h/gcc-4.2-4.2.3/debian/rules.d/binary-libstdcxx-cross.mk gcc-4.2-4.2.4/debian/rules.d/binary-libstdcxx-cross.mk --- h/gcc-4.2-4.2.3/debian/rules.d/binary-libstdcxx-cross.mk 2008-09-09 15:05:00.000000000 +0000 +++ gcc-4.2-4.2.4/debian/rules.d/binary-libstdcxx-cross.mk 2008-09-02 19:23:29.000000000 +0000 @@ -12,6 +12,17 @@ arch_binaries := $(arch_binaries) libstdcxx-dev endif +# see #483906 +ifeq ($(biarch),yes) + AUX_DEB_TARGET_GNU_TYPE := $(DEB_TARGET_GNU_TYPE) + ifeq ($(DEB_TARGET_GNU_TYPE),powerpc-linux-gnu) + AUX_DEB_TARGET_GNU_TYPE := powerpc64-linux-gnu + endif + ifeq ($(DEB_TARGET_GNU_TYPE),i486-linux-gnu) + AUX_DEB_TARGET_GNU_TYPE := x86_64-linux-gnu + endif +endif + libstdc_ext = -$(BASE_VERSION) p_lib = libstdc++$(CXX_SONAME)$(cross_lib_arch) @@ -280,7 +291,7 @@ -find $(d) -type d -name '*.gch' | xargs rm -rf ifeq ($(biarch),yes) - mv $(d)/$(PF)/$(DEB_TARGET_GNU_TYPE)/lib64/lib*c++*.a $(d)/$(gcc_lib_dir)/$(biarchsubdir)/. + mv $(d)/$(PF)/$(AUX_DEB_TARGET_GNU_TYPE)/lib64/lib*c++*.a $(d)/$(gcc_lib_dir)/$(biarchsubdir)/. ln -sf ../../../../../lib64/libstdc++.so.$(CXX_SONAME) \ $(d)/$(gcc_lib_dir)/$(biarchsubdir)/libstdc++.so endif diff -urN h/gcc-4.2-4.2.3/debian/rules.d/binary-objc.mk gcc-4.2-4.2.4/debian/rules.d/binary-objc.mk --- h/gcc-4.2-4.2.3/debian/rules.d/binary-objc.mk 2008-09-09 15:05:00.000000000 +0000 +++ gcc-4.2-4.2.4/debian/rules.d/binary-objc.mk 2008-09-02 19:23:29.000000000 +0000 @@ -70,7 +70,7 @@ $(docdir) \ $(gcc_lib_dir)/$(biarchsubdir) -ifeq ($(with_lib64objc),yes) +ifeq ($(biarch),yes) rm -f $(d)/$(PF)/lib64/libobjc*.{la,so} mkdir -p $(d_objc_m)/$(gcc_lib_dir)/$(biarchsubdir) mv $(d)/$(PF)/lib64/libobjc*.a $(d_objc_m)/$(gcc_lib_dir)/$(biarchsubdir)/ @@ -81,7 +81,7 @@ /$(PF)/lib64/libobjc_gc.so.$(OBJC_SONAME) /$(gcc_lib_dir)/$(biarchsubdir)/libobjc_gc.so endif endif -ifeq ($(with_lib32objc),yes) +ifeq ($(biarch32),yes) rm -f $(d)/$(lib32)/libobjc*.{la,so} mkdir -p $(d_objc_m)/$(gcc_lib_dir)/$(biarchsubdir) mv $(d)/$(lib32)/libobjc*.a $(d_objc_m)/$(gcc_lib_dir)/$(biarchsubdir)/ diff -urN h/gcc-4.2-4.2.3/debian/rules.d/binary-source.mk gcc-4.2-4.2.4/debian/rules.d/binary-source.mk --- h/gcc-4.2-4.2.3/debian/rules.d/binary-source.mk 2008-09-09 15:05:00.000000000 +0000 +++ gcc-4.2-4.2.4/debian/rules.d/binary-source.mk 2008-09-02 19:23:29.000000000 +0000 @@ -10,7 +10,7 @@ dh_install -p$(p_source) $(gcc_tarball) usr/src/gcc$(pkg_ver) # dh_install -p$(p_source) $(gcj_tarball) usr/src/gcc$(pkg_ver) dh_install -p$(p_source) debian/patches usr/src/gcc$(pkg_ver) - chmod 755 debian/$(p_source)/usr/src/gcc$(pkg_ver)/patches/* + chmod 755 debian/$(p_source)/usr/src/gcc$(pkg_ver)/patches/*.dpatch rm -rf debian/$(p_source)/usr/src/gcc$(pkg_ver)/patches/.svn dh_install -p$(p_source) \ debian/rules.source \ diff -urN h/gcc-4.2-4.2.3/debian/rules.defs gcc-4.2-4.2.4/debian/rules.defs --- h/gcc-4.2-4.2.3/debian/rules.defs 2008-09-09 15:05:00.000000000 +0000 +++ gcc-4.2-4.2.4/debian/rules.defs 2008-09-04 09:00:35.000000000 +0000 @@ -322,7 +322,7 @@ java_no_cpus := #mips mipsel java_no_arches := -java_no_systems := knetbsd-gnu netbsdelf-gnu +java_no_systems := gcj_native_archs = alpha amd64 i386 ia64 m68k mips mipsel powerpc s390 sparc ifneq (, $(filter $(DEB_TARGET_ARCH_CPU),$(java_no_cpus))) @@ -401,15 +401,18 @@ endif # libmudflap ------------------- -with_libmudflap := yes -with_libmudflap := $(call envfilt, mudflap, , , $(with_libmudflap)) +with_mudflap := yes +with_mudflap := $(call envfilt, mudflap, , , $(with_mudflap)) +ifeq ($(with_mudflap),yes) + with_libmudflap := yes +endif ifneq ($(with_common_libs),yes) with_libmudflap := no endif # libssp ------------------- with_ssp := yes -ssp_no_archs = arm armel alpha hppa ia64 m68k mips mipsel hurd-i386 +ssp_no_archs = arm armel alpha hppa ia64 m68k mips mipsel ifneq (, $(filter $(DEB_TARGET_ARCH),$(ssp_no_archs))) with_ssp := not available on $(DEB_TARGET_ARCH) endif @@ -516,7 +519,7 @@ with_pascal := no endif -#pascal_no_systems := netbsdelf-gnu +pascal_no_systems := #ifneq (, $(filter $(DEB_TARGET_GNU_SYSTEM),$(pascal_no_systems))) # with_pascal := disabled for $(DEB_TARGET_GNU_SYSTEM) #endif @@ -554,7 +557,7 @@ # disable ObjC garbage collection library (needs libgc) libgc_no_cpus := avr #alpha amd64 arm armel hppa i386 ia64 m68k mips mipsel powerpc s390 sparc -libgc_no_systems := knetbsd-gnu +libgc_no_systems := ifneq (, $(filter $(DEB_TARGET_ARCH_CPU),$(libgc_no_cpus))) with_objc_gc := disabled for architecture $(DEB_TARGET_ARCH_CPU) endif @@ -594,6 +597,9 @@ # ObjC++ -------------------- with_objcxx := yes with_objcxx := $(call envfilt, obj-c++, , c++ objc, $(with_objcxx)) +ifeq ($(DEB_TARGET_ARCH),armel) + with_objcxx := disabled for armel +endif ifeq ($(with_objcxx),yes) enabled_languages += obj-c++ @@ -607,7 +613,7 @@ endif ada_no_cpus := alpha arm armel m32r m68k sh3 sh3eb sh4 sh4eb -ada_no_systems := hurd-i386 knetbsd-gnu netbsdelf-gnu +ada_no_systems := hurd-i386 ifneq (, $(filter $(DEB_TARGET_ARCH_CPU),$(ada_no_cpus))) with_ada := disabled for architecure $(DEB_TARGET_ARCH_CPU) endif @@ -764,7 +770,7 @@ ifneq (, $(filter $(DEB_TARGET_GNU_SYSTEM),$(check_no_systems))) with_check := disabled for $(DEB_TARGET_GNU_SYSTEM) endif -check_no_cpus := none +check_no_cpus := ifeq ($(DEB_TARGET_ARCH_CPU), $(findstring $(DEB_TARGET_ARCH_CPU),$(check_no_cpus))) with_check := disabled for architecure $(DEB_TARGET_ARCH_CPU) endif @@ -787,7 +793,10 @@ with_check := disabled for gdc endif -locale_data = generate +# not a dependency on all archs, but if available, use it for the testsuite +ifneq (,$(wildcard /usr/bin/localedef)) + locale_data = generate +endif # powerpc nof libraries -------------------- with_libnof := no @@ -821,6 +830,7 @@ with_proto := no with_fixincl := no with_pascal := no + with_mudflap := no with_libmudflap := no with_libffi := no with_libssp := no @@ -866,6 +876,7 @@ with_proto := no with_fixincl := no with_pascal := no + with_mudflap := no with_libmudflap := no with_libffi := no with_libssp := no @@ -1180,7 +1191,7 @@ # GNU locales force_gnu_locales := yes -locale_no_systems := gnu knetbsd-gnu netbsdelf-gnu +locale_no_systems := gnu ifneq (, $(filter $(DEB_TARGET_GNU_SYSTEM),$(locale_no_systems))) force_gnu_locales := disabled for $(DEB_TARGET_GNU_SYSTEM) endif @@ -1258,6 +1269,14 @@ endif endif +ifneq (,$(findstring gcj-, $(PKGSOURCE))) + ifeq ($(with_gcj_base_only),yes) + configure_dependencies = $(configure_dummy_stamp) + build_dependencies = $(build_dummy_stamp) + install_dependencies = $(install_dummy_stamp) + endif +endif + ifeq ($(with_hppa64),yes) build_dependencies += $(build_hppa64_stamp) ifneq ($(PKGSOURCE),gcc-snapshot) diff -urN h/gcc-4.2-4.2.3/debian/rules.patch gcc-4.2-4.2.4/debian/rules.patch --- h/gcc-4.2-4.2.3/debian/rules.patch 2008-09-09 15:05:00.000000000 +0000 +++ gcc-4.2-4.2.4/debian/rules.patch 2008-09-05 21:47:52.000000000 +0000 @@ -11,17 +11,17 @@ # which patches should be applied? -debian_patches = \ - svn-updates +#debian_patches = \ +# svn-updates ifneq ($(GFDL_INVARIANT_FREE),yes) - debian_patches += svn-doc-updates +# debian_patches += svn-doc-updates endif -ifeq ($(with_java),yes) - debian_patches += \ - svn-class-updates -endif +#ifeq ($(with_java),yes) +# debian_patches += \ +# svn-class-updates +#endif ifneq ($(GFDL_INVARIANT_FREE),yes) debian_patches += \ @@ -49,6 +49,8 @@ libjava-nojavac \ libjava-armel-ldflags \ libjava-xulrunner1.9 \ + libjava-extra-cflags \ + libgcj-bc \ libffi-configure \ pr20218 \ pr20218-mips \ @@ -89,6 +91,12 @@ pr32889 \ pr28322 \ libobjc-gc-link \ + pr35020 \ + m68k-allow-gnu99 \ + pr36634 \ + pr35432 \ + pr37101 \ + pr28482 \ # svn-updates \ # classmap-path \ @@ -107,10 +115,6 @@ endif endif -ifeq ($(with_multiarch_lib),yes) - debian_patches += multiarch-lib -endif - ifeq ($(with_java),yes) ifeq ($(with_native_ecj),yes) debian_patches += native-ecj @@ -147,7 +151,7 @@ endif ifeq ($(with_d),yes) -# debian_patches += svn-gdc-updates +# debian_patches += svn-gdc-updates debian_patches += gdc-4.2 gdc-4.2-build debian_patches += gdc-driver-zlib debian_patches += gdc-driver-defaultlib @@ -208,7 +212,10 @@ debian_patches += cpu-default-i486 endif -debian_patches += reporting multiarch-include +debian_patches += reporting +ifneq ($(DEB_TARGET_ARCH),sh4) + debian_patches += multiarch-include +endif debian_patches += gcc-ice-hack libjava-disable-static debian_patches += gcc-ice-apport diff -urN h/gcc-4.2-4.2.3/debian/rules2 gcc-4.2-4.2.4/debian/rules2 --- h/gcc-4.2-4.2.3/debian/rules2 2008-09-09 15:05:00.000000000 +0000 +++ gcc-4.2-4.2.4/debian/rules2 2008-09-04 08:41:36.000000000 +0000 @@ -233,7 +233,7 @@ CONFARGS += --enable-mpfr endif -ifneq ($(with_libmudflap),yes) +ifneq ($(with_mudflap),yes) CONFARGS += --disable-libmudflap endif @@ -290,6 +290,10 @@ endif endif +ifeq ($(findstring sh4-linux,$(DEB_TARGET_GNU_TYPE)),sh4-linux) + CONFARGS += --with-multilib-list=m4,m4-nofpu --with-cpu=sh4 +endif + # lpia ifeq ($(DEB_TARGET_ARCH),lpia) CONFARGS += --with-arch=i686 --with-tune=i586 @@ -1164,7 +1168,7 @@ include debian/rules.d/binary-fixincl.mk endif -ifeq ($(with_libmudflap),yes) +ifeq ($(with_mudflap),yes) include debian/rules.d/binary-libmudflap.mk endif diff -urN h/gcc-4.2-4.2.3/debian/source.lintian-overrides gcc-4.2-4.2.4/debian/source.lintian-overrides --- h/gcc-4.2-4.2.3/debian/source.lintian-overrides 2008-09-09 15:05:00.000000000 +0000 +++ gcc-4.2-4.2.4/debian/source.lintian-overrides 2008-09-02 19:23:29.000000000 +0000 @@ -1 +1 @@ -gcc-4.0: invalid-arch-string-in-source-relation +gcc-4.2: invalid-arch-string-in-source-relation