--- gcj-4.2-4.2-20070707.orig/debian/README
+++ gcj-4.2-4.2-20070707/debian/README
@@ -0,0 +1,32 @@
+		The Debian GNU Compiler Collection setup
+		========================================
+
+Please see the README.Debian in /usr/share/doc/gcc, contained in the
+gcc package for a description of the setup of the different compiler
+versions.
+
+For general discussion about the Debian toolchain (GCC, glibc, binutils)
+please use the mailing list debian-toolchain@lists.debian.org; for GCC
+specific things, please use debian-gcc@lists.debian.org.  When in doubt
+use the debian-toolchain ML.
+
+
+Maintainers of these packages
+-----------------------------
+
+Matthias Klose <doko@debian.org>
+Ray Dassen <jdassen@debian.org>
+Jeff Bailey <jbailey@nisa.net>			(hurd-i386)
+Joel Baker <fenton@debian.org>			(netbsd-i386)
+Philip Blundell <pb@debian.org>			(arm-linux)
+Ben Collins <bcollins@debian.org>		(sparc-linux)
+Randolph Chung <tausq@debian.org>		(ia64-linux)
+Falk Hueffner <falk@debian.org>			(alpha-linux)
+Dan Jacobowitz <dan@debian.org>			(powerpc-linux)
+Thiemo Seufer <ths@networkno.de>		(mips*-linux)
+Matt Taggart <taggart@carmen.fc.hp.com>		(hppa-linux)
+Gerhard Tonn <GerhardTonn@swol.de>		(s390-linux)
+Roman Zippel <zippel@linux-m68k.org>		(m68k-linux)
+Ludovic Brenta <ludovic@ludovic-brenta.org>	(gnat)
+
+===============================================================================
--- gcj-4.2-4.2-20070707.orig/debian/gcc-BV-doc.doc-base.gccint
+++ gcj-4.2-4.2-20070707/debian/gcc-BV-doc.doc-base.gccint
@@ -0,0 +1,17 @@
+Document: gccint-@BV@
+Title: Internals of the GNU C and C++ compiler
+Author: Various
+Abstract: This manual documents the internals of the GNU compilers,
+ including how to port them to new targets and some information about
+ how to write front ends for new languages.  It corresponds to GCC
+ version @BV@.x.  The use of the GNU compilers is documented in a
+ separate manual.
+Section: Apps/Programming
+
+Format: html
+Index: /usr/share/doc/gcc-@BV@-base/gccint.html
+Files: /usr/share/doc/gcc-@BV@-base/gccint.html
+
+Format: info
+Index: /usr/share/info/gccint-@BV@.info.gz
+Files: /usr/share/info/gccint-@BV@*
--- gcj-4.2-4.2-20070707.orig/debian/gcc-BV-hppa64.prerm
+++ gcj-4.2-4.2-20070707/debian/gcc-BV-hppa64.prerm
@@ -0,0 +1,10 @@
+#! /bin/sh -e
+
+if [ "$1" != "upgrade" ]; then
+  update-alternatives --quiet \
+    --remove hppa64-linux-gcc /usr/bin/hppa64-linux-gnu-gcc-@BV@
+fi
+
+#DEBHELPER#
+
+exit 0
--- gcj-4.2-4.2-20070707.orig/debian/README.patches
+++ gcj-4.2-4.2-20070707/debian/README.patches
@@ -0,0 +1,30 @@
+Patches applied to the Debian version of egcs
+---------------------------------------------
+
+Debian specific patches can be found in the debian/patches directory.
+Each patch is accompanied by a shell script to apply and unapply the
+patch:
+
+- The script can be found in the debian/patches directory and is called
+  <patchname>.dpatch.
+- The shell script is called by the debian/rules file with the option
+  '-patch' to apply the patch and and with '-unpatch' to unapply
+  the patch. The working directory is the source directory.
+- The shell script returns 0 on success and 1 on failure when
+  (un)applying the patch. The patch program itself should be called with
+  --force to prevent questions.
+- debian/rules creates a file patched-<patchname> in the source
+  directory when applying the patch and removes this file when
+  unapplying the patch.
+
+Besides the patches, the following add-ons were included:
+
+- gpc (unpacked from gpc-19990118.tar.gz)
+  ftp://agnes.dida.physik.uni-essen.de/gnu-pascal/beta/gpc-19990118.tar.gz
+
+If these package(s) aren't found in the gcc source directory, it's
+assumed that the tarball(s) can be found in the parent directory. See
+debian/rules for more details.
+
+Before making a source package, these packages need to be unpacked.
+You can use "debian/rules unpack-addons".
--- gcj-4.2-4.2-20070707.orig/debian/README.maintainers
+++ gcj-4.2-4.2-20070707/debian/README.maintainers
@@ -0,0 +1,139 @@
+-*- Outline -*-
+
+Read this file if you are a Debian Developer or would like to become
+one, or if you would like to create your own binary packages of GCC.
+
+* Overview
+
+From the GCC sources, Debian currently builds 3 source packages and
+almost 100 binary packages, using a single set of build scripts.  The
+3 source packages are:
+
+gcc-4.2: C, C++, Fortran, Objective-C and Objective-C++, plus many
+         common libraries like libssp, libmudflap, and libgcc.
+gcj-4.2: Java.
+gnat-4.2: Ada.
+
+The way we do this is quite peculiar, so listen up :)
+
+When we build from the gcc-4.2 source package, we produce, among many
+others, a gcc-4.2-source binary package that contains the pristine
+upstream tarball and some Debian-specific patches.  Any user can then
+install this package on their Debian system, and will have the full
+souces in /usr/src/gcc-4.2/gcc-<timestamp>.tar.bz2, along with the
+Makefile snippets that unpack and patch them.
+
+The intended use for this package is twofold: (a) allow users to build
+their own cross-compilers, and (b) build the other two packages,
+gcj-4.2 and gnat-4.2.
+
+For gcj-4.2 and gnat-4.2, the "source tarball" just contains an empty
+directory; e.g.:
+
+$ tar tzf gnat-4.2_4.2-20070609.orig.tar.gz
+gnat-4.2-4.2-20070609.orig/
+
+The build scripts for all three source packages are the same, and they
+are included, as usual, in the .diff.gz file.
+
+* The build sequence
+
+As for all other Debian packages, you build GCC by calling
+debian/rules.
+
+The first thing debian/rules does it to look at the top-most entry in
+debian/changelog: this tells it which source package it is building.
+For example, if the first entry in debian/changelog reads:
+
+gcj-4.2 (4.2-20070609-1) unstable; urgency=low
+
+  * Upload as gcj-4.2.
+
+ -- Ludovic Brenta <lbrenta@debian.org>  Tue, 26 Jun 2007 00:26:42 +0200
+
+then, debian/rules will build only the Java binary packages.
+
+The second step is to unpack the GCC source tarball.  This tarball is
+either in the build directory (when building gcc-4.2), or in
+/usr/src/gcc-4.2/gcc-<timestamp>.tar.bz2 (when building the other
+source packages).
+
+The third step is to build debian/control from debian/control.m4 and a
+complex set of rules specified in debian/rules.conf.  The resulting
+control file contains only the binary packages to be built.
+
+The fourth step is to select which patches to apply (this is done in
+debian/rules.defs), and then to apply the selected patches (see
+debian/rules.patch).
+
+The fifth step is to create a "build" directory, cd into it, call
+../src/configure, and bootstrap the compiler and libraries selected.
+This is in debian/rules2.
+
+The sixth step is to run the GCC test suite (this actually takes at
+least as much time as bootstrapping, and you can disable it by setting
+WITHOUT_CHECK to "yes" in the environment).
+
+The seventh step is to build the binary packages, i.e. the .debs.
+This is done by a set of language- and architecture-dependent Makefile
+snippets in the debian/rules.d/ directory.
+
+* Making your own packages
+
+In this example, we will build our own gnat-4.2 package.
+
+1) Create a .orig.tar.gz tarball containing a single, empty directory.
+
+$ mkdir gnat-4.2-4.2-20070609.orig
+$ tar czf gnat-4.2_4.2-20070609.orig.tar.gz gnat-4.2-4.2-20070609.orig
+
+2) Install gcc-4.2-source, which contains the real sources:
+
+# apt-get install gcc-4.2-source
+
+3) Create a build directory:
+
+$ mkdir gnat-4.2-4.2-20070609; cd gnat-4.2-4.2-20070609
+
+4) Checkout from Subversion:
+
+$ svn checkout svn://svn.debian.org/gcccvs/branches/sid/gcc-4.2/debian
+
+5) Edit the debian/changelog file, adding a new entry at the top that
+   starts with "gnat-4.2" instead of "gcc-4.2".  !! The version number
+   in this new entry must be exactly the same as the version number of
+   the gcc-4.2-source package !!
+
+6) Generate the debian/control file, adjusted for gnat:
+
+$ debian/rules control
+
+7) Build:
+
+$ dpkg-buildpackage -rfakeroot
+
+* Hints
+
+You need a powerful machine to build GCC.  The larger, the better.
+The build scripts take advantage of as many CPU cores as are available
+in your box.  If you have 2 GB or more of physical RAM, you can
+achieve maximum performance by building in a tmpfs, like this:
+
+1) as root, create the new tmpfs:
+
+# mount -t tmpfs none /home/lbrenta/src/debian/ram
+
+By default, the tmpfs will be limited to half your physical RAM.  The
+beauty of it is that it only consumes as much physical RAM as
+necessary to hold the files in it; deleting files frees up RAM.
+
+2) As your regular user, create the working directory in the tmpfs
+
+$ cp --archive ~/src/debian/gcc-4.2-4.2-20070609 ~/src/debian/ram
+
+3) Build in there.  On my dual-core, 2 GHz amd64, it takes 61 minutes
+   to build gnat and run the tests, and the tmpfs takes 795 MB of
+   physical RAM.
+
+-- 
+Ludovic Brenta, 2007-06-26.
--- gcj-4.2-4.2-20070707.orig/debian/gcc-dummy.texi
+++ gcj-4.2-4.2-20070707/debian/gcc-dummy.texi
@@ -0,0 +1,41 @@
+\input texinfo  @c -*-texinfo-*-
+@c %**start of header
+
+@settitle The GNU Compiler Collection (GCC)
+
+@c Create a separate index for command line options.
+@defcodeindex op
+@c Merge the standard indexes into a single one.
+@syncodeindex fn cp
+@syncodeindex vr cp
+@syncodeindex ky cp
+@syncodeindex pg cp
+@syncodeindex tp cp
+
+@paragraphindent 1
+
+@c %**end of header
+
+@copying
+The current documentation is licensed under the same terms as the Debian packaging.
+@end copying
+@ifnottex
+@dircategory Programming
+@direntry
+* @name@: (@name@).                  The GNU Compiler Collection (@name@).
+@end direntry
+@sp 1
+@end ifnottex
+
+@summarycontents
+@contents
+@page
+
+@node Top
+@top Introduction
+@cindex introduction
+The official GNU compilers' documentation is released under the terms
+of the GNU Free Documentation License with cover texts. This has been
+considered non free by the Debian Project. Thus you will find it in the
+non-free section of the Debian archive.
+@bye
--- gcj-4.2-4.2-20070707.orig/debian/locale-gen
+++ gcj-4.2-4.2-20070707/debian/locale-gen
@@ -0,0 +1,43 @@
+#!/bin/sh
+
+LOCPATH=`pwd`/locales
+export LOCPATH
+
+[ -d $LOCPATH ] || mkdir -p $LOCPATH
+
+umask 022
+
+echo "Generating locales..."
+while read locale charset; do
+	case $locale in \#*) continue;; esac
+	[ -n "$locale" -a -n "$charset" ] || continue
+	echo -n "  `echo $locale | sed 's/\([^.\@]*\).*/\1/'`"
+	echo -n ".$charset"
+	echo -n `echo $locale | sed 's/\([^\@]*\)\(\@.*\)*/\2/'`
+	echo -n '...'
+        if [ -f $LOCPATH/$locale ]; then
+	    input=$locale
+	else
+            input=`echo $locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`
+	fi
+	localedef -i $input -c -f $charset $LOCPATH/$locale #-A /etc/locale.alias
+	echo ' done'; \
+done <<EOF
+# This file lists locales that the libstdc++ testsuite depends on
+de_DE			ISO-8859-1
+de_DE@euro		ISO-8859-15
+en_HK			ISO-8859-1
+en_PH			ISO-8859-1
+en_US			ISO-8859-1
+en_US.ISO-8859-1	ISO-8859-1
+en_US.ISO-8859-15	ISO-8859-15
+en_US.UTF-8		UTF-8
+es_MX			ISO-8859-1
+fr_FR			ISO-8859-1
+fr_FR@euro		ISO-8859-15
+it_IT			ISO-8859-1
+ja_JP.eucjp		EUC-JP
+se_NO.UTF-8		UTF-8
+EOF
+
+echo "Generation complete."
--- gcj-4.2-4.2-20070707.orig/debian/README.C++
+++ gcj-4.2-4.2-20070707/debian/README.C++
@@ -0,0 +1,43 @@
+libstdc++ is an implementation of the Standard C++ Library, including the
+Standard Template Library (i.e. as specified by ANSI and ISO).
+
+Some notes on porting applications from libstdc++-2.90 (or earlier versions)    
+to libstdc++-v3 can be found in the libstdc++6-4.2-doc package. After the
+installation of the package, look at:
+
+  file:///usr/share/doc/gcc-4.2-base/libstdc++/html/17_intro/porting-howto.html
+
+On Debian GNU/Linux you find additional documentation in the
+libstdc++6-4.2-doc package. After installing these packages,
+point your browser to
+
+  file:///usr/share/doc/libstdc++6-4.2-doc/libstdc++/html/index.html
+
+Other documentation can be found:
+
+    http://www.cs.rpi.edu/~musser/stl.html
+    http://www.sgi.com/tech/stl/
+    http://www.dinkumware.com/htm_cpl/
+
+with a good, recent, book on C++.
+
+A great deal of useful C++ documentation can be found in the C++ FAQ-Lite,
+maintained by Marshall Cline <cline@parashift.com>.  It can be found at the
+following locations (this list was last updated on 2000/11/19):
+
+USA: http://www.cerfnet.com/~mpcline/c++-faq-lite/
+
+Canada: http://new-brunswick.net/workshop/c++/faq
+
+Finland: http://www.utu.fi/~sisasa/oasis/cppfaq/
+
+France: http://caor.ensmp.fr/FAQ/c++-faq-lite/
+
+Spain: http://geneura.ugr.es/~jmerelo/c++-faq/
+
+Taiwan: http://www.cis.nctu.edu.tw/c++/C++FAQ-English/
+
+U.K.: http://www.cs.bham.ac.uk/~jdm/CPP/index.html
+
+
+Please send updates to this list as bug report for the g++ package.
--- gcj-4.2-4.2-20070707.orig/debian/gcjh-wrapper-BV
+++ gcj-4.2-4.2-20070707/debian/gcjh-wrapper-BV
@@ -0,0 +1,86 @@
+#!/usr/bin/perl -w
+#
+# Starts the GNU Java header generator.
+#
+# Command-line arguments should be in the style of Sun's javah command;
+# these will be converted to gcjh arguments before being passed to the
+# gcjh itself.
+#
+# Copyright (C) 2003 by Peter Hawkins <peterh@debian.org>
+# Haphazardly hacked up based on the gcj-wrapper perl script.
+# Copyright (C) 2002-2003 by Ben Burton <bab@debian.org>
+# Based on the original gcj-wrapper-3.2 shell script.
+
+use strict;
+
+# The real Java header generator:
+my $javaHeaderGen = '/usr/bin/gcjh-@BV@';
+
+# The command-line arguments to pass to the real Java compiler:
+my @commandLine;
+
+# Build the command-line from the arguments given.
+my $parsingOptions = 1;
+my $copyNextArg = 0;
+my $ignoreNextArg = 0;
+my $appendNextArg = '';
+foreach my $arg (@ARGV) {
+    # See if we already know what to do with this argument.
+    if ($ignoreNextArg) {
+        # Throw it away.
+        $ignoreNextArg = 0;
+        next;
+    } elsif ($copyNextArg or not $parsingOptions) {
+        # Copy it directly.
+        push @commandLine, $arg;
+        $copyNextArg = 0;
+        next;
+    } elsif ($appendNextArg) {
+        # Append it to $appendNextArg and then copy directly.
+        push @commandLine, ($appendNextArg . $arg);
+        $appendNextArg = '';
+        next;
+    }
+
+    # Try to interpret Sun-style options.
+    if ($arg eq '-version') {
+        push @commandLine, '--version';
+    } elsif ($arg eq '-h' or $arg eq '-help') {
+        push @commandLine, '--help';
+    } elsif ($arg eq '-verbose') {
+        push @commandLine, '--verbose';
+    } elsif ($arg eq '-classpath' or $arg eq '--classpath' or $arg eq '--cp') {
+        $appendNextArg = '--classpath=';
+    } elsif ($arg eq '-encoding' or $arg eq '-bootclasspath' or
+             $arg eq '-extdirs') {
+        $appendNextArg = "-".$arg . '=';
+    } elsif ($arg eq '-d') {
+        push @commandLine, '-d';
+        $copyNextArg = 1;
+    } elsif ($arg eq '-o') {
+        push @commandLine, '-o';
+        $copyNextArg = 1;
+    } elsif ($arg eq '-stubs') {
+        push @commandLine, '-stubs';
+    } elsif ($arg eq '-jni') {
+        push @commandLine, '-jni';
+    } elsif ($arg =~ /^-old/) {
+        # An extended Sun option (which we don't support).
+        push @commandLine, '--help' if ($arg eq '-old');
+    } elsif ($arg =~ /^-/) {
+        # An unsupported standalone option.
+    } else {
+        # Some non-option argument has been given.
+        # Stop parsing options at this point.
+        push @commandLine, $arg;
+        $parsingOptions = 0;
+    }
+}
+
+# Was there a partial argument that was never completed?
+push @commandLine, $appendNextArg if ($appendNextArg);
+
+# Call the real Java header generator.
+my @fullCommandLine = ( $javaHeaderGen );
+push @fullCommandLine, @commandLine;
+exec @fullCommandLine or exit(1);
--- gcj-4.2-4.2-20070707.orig/debian/libmudflap.copyright
+++ gcj-4.2-4.2-20070707/debian/libmudflap.copyright
@@ -0,0 +1,30 @@
+This package was debianized by Matthias Klose <doko@debian.org> on
+Mon,  5 Jul 2004 21:29:57 +0200
+
+Mudflap is part of GCC.
+
+Authors: Frank Ch. Eigler <fche@redhat.com>, Graydon Hoare <graydon@redhat.com>
+
+Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+
+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 2, or (at your option) any later
+version.
+
+In addition to the permissions in the GNU General Public License, the
+Free Software Foundation gives you unlimited permission to link the
+compiled version of this file into combinations with other programs,
+and to distribute those combinations without any restriction coming
+from the use of this file.  (The General Public License restrictions
+do apply in other respects; for example, they cover modification of
+the file, and distribution when not linked into a combine
+executable.)
+
+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.
+
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
--- gcj-4.2-4.2-20070707.orig/debian/gnat-BV-doc.prerm
+++ gcj-4.2-4.2-20070707/debian/gnat-BV-doc.prerm
@@ -0,0 +1,7 @@
+#! /bin/sh -e
+
+install-info --quiet --remove gnat_ugn_unw-@BV@
+install-info --quiet --remove gnat_rm-@BV@
+install-info --quiet --remove gnat-style-@BV@
+
+#DEBHELPER#
--- gcj-4.2-4.2-20070707.orig/debian/patches/ada-gcc-name.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/ada-gcc-name.dpatch
@@ -0,0 +1,106 @@
+#! /bin/sh -e
+
+# DP: use gcc-4.2 instead of gcc as the command name.
+
+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 -ur gcc/ada.old/ali.adb gcc/ada/ali.adb
+--- gcc/ada.old/ali.adb	2004-02-21 15:23:32.000000000 +0100
++++ gcc/ada/ali.adb	2004-02-21 15:23:57.000000000 +0100
+@@ -260,7 +260,7 @@
+          Write_Str (" is incorrectly formatted");
+          Write_Eol;
+          Write_Str
+-           ("make sure you are using consistent versions of gcc/gnatbind");
++           ("make sure you are using consistent versions of gcc-4.2/gnatbind");
+          Write_Eol;
+ 
+          --  Find start of line
+diff -ur gcc/ada.old/comperr.adb gcc/ada/comperr.adb
+--- gcc/ada.old/comperr.adb	2004-02-21 15:23:32.000000000 +0100
++++ gcc/ada/comperr.adb	2004-02-21 15:23:57.000000000 +0100
+@@ -292,7 +292,7 @@
+                End_Line;
+ 
+                Write_Str
+-                 ("| Include the exact gcc or gnatmake command " &
++                 ("| Include the exact gcc-4.2 or gnatmake command " &
+                   "that you entered.");
+                End_Line;
+ 
+diff -ur gcc/ada.old/gnatlink.adb gcc/ada/gnatlink.adb
+--- gcc/ada.old/gnatlink.adb	2004-02-21 15:23:32.000000000 +0100
++++ gcc/ada/gnatlink.adb	2004-02-21 15:23:57.000000000 +0100
+@@ -123,7 +123,7 @@
+ 
+    subtype chars_ptr is System.Address;
+ 
+-   Gcc : String_Access := Program_Name ("gcc");
++   Gcc : String_Access := Program_Name ("gcc-4.2");
+ 
+    Read_Mode  : constant String := "r" & ASCII.Nul;
+ 
+@@ -1287,7 +1287,8 @@
+       Write_Line ("  -b target  Compile the binder source to run on target");
+       Write_Line ("  -Bdir      Load compiler executables from dir");
+       Write_Line ("  --GCC=comp Use comp as the compiler");
+-      Write_Line ("  --LINK=nam Use 'nam' for the linking rather than 'gcc'");
++      Write_Line ("  --LINK=nam Use 'nam' for the linking rather " &
++                  "than 'gcc-4.2'");
+       Write_Eol;
+       Write_Line ("  [non-Ada-objects]  list of non Ada object files");
+       Write_Line ("  [linker-options]   other options for the linker");
+diff -ur gcc/ada.old/make.adb gcc/ada/make.adb
+--- gcc/ada.old/make.adb	2004-02-21 15:23:32.000000000 +0100
++++ gcc/ada/make.adb	2004-02-21 15:23:57.000000000 +0100
+@@ -650,7 +650,7 @@
+    -- Compiler, Binder & Linker Data and Subprograms --
+    ----------------------------------------------------
+ 
+-   Gcc             : String_Access := Program_Name ("gcc");
++   Gcc             : String_Access := Program_Name ("gcc-4.2");
+    Gnatbind        : String_Access := Program_Name ("gnatbind");
+    Gnatlink        : String_Access := Program_Name ("gnatlink");
+    --  Default compiler, binder, linker programs
+diff -ur gcc/ada.old/par-ch10.adb gcc/ada/par-ch10.adb
+--- gcc/ada.old/par-ch10.adb	2004-02-21 15:23:32.000000000 +0100
++++ gcc/ada/par-ch10.adb	2004-02-21 15:23:57.000000000 +0100
+@@ -224,7 +224,7 @@
+             else
+                Item := First (Config_Pragmas);
+                Error_Msg_N
+-                 ("cannot compile configuration pragmas with gcc", Item);
++                 ("cannot compile configuration pragmas with gcc-4.2", Item);
+                Error_Msg_N
+                  ("use gnatchop -c to process configuration pragmas!", Item);
+                raise Unrecoverable_Error;
+--- gcc/ada/gnatchop.adb~	2004-01-05 16:20:44.000000000 +0100
++++ gcc/ada/gnatchop.adb	2004-04-25 09:33:51.000000000 +0200
+@@ -43,7 +43,7 @@
+    Config_File_Name : constant String_Access := new String'("gnat.adc");
+    --  The name of the file holding the GNAT configuration pragmas
+ 
+-   Gcc : String_Access := new String'("gcc");
++   Gcc : String_Access := new String'("gcc-4.2");
+    --  May be modified by switch --GCC=
+ 
+    Gcc_Set : Boolean := False;
--- gcj-4.2-4.2-20070707.orig/debian/patches/libffi-configure.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/libffi-configure.dpatch
@@ -0,0 +1,76 @@
+#! /bin/sh -e
+
+# DP: Add --enable-libffi option to toplevel configure script
+
+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
+
+--- ./configure.in.orig	2006-12-11 11:53:58.776229000 +0100
++++ ./configure.in	2006-12-11 11:54:18.956229000 +0100
+@@ -312,6 +312,16 @@
+ ENABLE_LIBSSP=$enableval,
+ ENABLE_LIBSSP=yes)
+ 
++AC_ARG_ENABLE(libffi,
++[  --enable-libffi        Builds libffi directory],
++ENABLE_LIBFFI=$enableval,
++ENABLE_LIBFFI=yes)
++if test "${ENABLE_LIBFFI}" != "yes" ; then
++  noconfigdirs="$noconfigdirs target-libffi"
++else
++  libgcj="`echo $libgcj | sed 's/target-libffi *//'`"
++fi
++
+ # Save it here so that, even in case of --enable-libgcj, if the Java
+ # front-end isn't enabled, we still get libgcj disabled.
+ libgcj_saved=$libgcj
+--- ./configure.orig	2006-12-11 11:53:58.776229000 +0100
++++ ./configure	2006-12-11 11:55:27.416229000 +0100
+@@ -18,6 +18,8 @@
+ ac_help="$ac_help
+   --enable-libssp        Builds libssp directory"
+ ac_help="$ac_help
++  --enable-libffi        Builds libffi directory"
++ac_help="$ac_help
+   --with-mpfr-dir=PATH    This option has been REMOVED"
+ ac_help="$ac_help
+   --with-mpfr=PATH        Specify prefix directory for installed MPFR package
+@@ -1149,6 +1151,20 @@
+ fi
+ 
+ 
++# Check whether --enable-libffi or --disable-libffi was given.
++if test "${enable_libffi+set}" = set; then
++  enableval="$enable_libffi"
++  ENABLE_LIBFFI=$enableval
++else
++  ENABLE_LIBFFI=yes
++fi
++
++if test "${ENABLE_LIBFFI}" != "yes" ; then
++  noconfigdirs="$noconfigdirs target-libffi"
++else
++  libgcj="`echo $libgcj | sed 's/target-libffi *//'`"
++fi
++
+ # Save it here so that, even in case of --enable-libgcj, if the Java
+ # front-end isn't enabled, we still get libgcj disabled.
+ libgcj_saved=$libgcj
--- gcj-4.2-4.2-20070707.orig/debian/patches/ignore-comp-fail.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/ignore-comp-fail.dpatch
@@ -0,0 +1,38 @@
+#! /bin/sh -e
+
+# DP: Ignore the bootstrap comparision failure
+
+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/Makefile.in~	2004-02-06 08:03:12.000000000 +0100
++++ gcc/Makefile.in	2004-02-14 10:27:19.000000000 +0100
+@@ -3567,7 +3567,9 @@
+ 	if [ -f .bad_compare ]; then \
+ 	  echo "Bootstrap comparison failure!"; \
+ 	  cat .bad_compare; \
+-	  exit 1; \
++	  echo ""; \
++	  echo "Ignore the comparision failure!"; \
++	  true; \
+ 	else \
+ 	  case "$@" in \
+ 	    *-lean ) rm -rf stage$$stage ;; \
--- gcj-4.2-4.2-20070707.orig/debian/patches/gpc-names.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/gpc-names.dpatch
@@ -0,0 +1,117 @@
+#! /bin/sh -e
+
+# DP: versioned gpc names
+
+if [ $# -eq 3 -a "$2" = '-d' ]; then
+    pdir="-d $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 -p1 < $0;;
+    -unpatch) patch $pdir -f --no-backup-if-mismatch -R -p1 < $0;;
+    *)
+	echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+	exit 1
+esac
+exit 0
+
+--- src-old/gcc/p/doc/en/gpc.texi	Mon Oct  9 09:32:26 2000
++++ src-native/gcc/p/doc/en/gpc.texi	Tue Dec 19 21:04:21 2000
+@@ -28,11 +28,11 @@
+ 
+ @dircategory GNU programming tools
+ @direntry
+-* GPC: (gpc).                   The GNU Pascal Compiler.
++* GPC-2.1-3.3: (gpc-2.1-3.3).           The GNU Pascal Compiler.
+ @end direntry
+ @dircategory Individual utilities
+ @direntry
+-* GPC: (gpc)Invoking GPC.       The GNU Pascal Compiler.
++* GPC-2.1-3.3: (gpc-2.1-3.3)Invoking GPC. The GNU Pascal Compiler.
+ @end direntry
+ 
+ @c Version numbers appear twice: in lowercase and capitalized for headlines.
+
+--- src/gcc/p/Make-lang.in~	2003-08-31 10:13:01.000000000 +0200
++++ src/gcc/p/Make-lang.in	2003-08-31 10:20:51.000000000 +0200
+@@ -711,42 +711,42 @@
+ pascal.start.encap:
+ pascal.rest.encap:
+ 
+-pascal.info: $(srcdir)/p/doc/info/gpc.info \
+-             $(srcdir)/p/doc/info/gpcs.info \
+-             $(srcdir)/p/doc/info/gpcs-de.info \
+-             $(srcdir)/p/doc/info/gpc-hr.info \
+-             $(srcdir)/p/doc/info/gpcs-hr.info \
+-             $(srcdir)/p/doc/info/gpc-es.info \
+-             $(srcdir)/p/doc/info/gpcs-es.info
++pascal.info: $(srcdir)/p/doc/info/gpc-2.1$(iv).info \
++             $(srcdir)/p/doc/info/gpcs-2.1$(iv).info \
++             $(srcdir)/p/doc/info/gpcs-de-2.1$(iv).info \
++             $(srcdir)/p/doc/info/gpc-hr-2.1$(iv).info \
++             $(srcdir)/p/doc/info/gpcs-hr-2.1$(iv).info \
++             $(srcdir)/p/doc/info/gpc-es-2.1$(iv).info \
++             $(srcdir)/p/doc/info/gpcs-es-2.1$(iv).info
+ pascal.dvi: gpc.dvi
+ 
+-$(srcdir)/p/doc/info/gpc.info: $(GPC_TEXI_EN)
++$(srcdir)/p/doc/info/gpc-2.1$(iv).info: $(GPC_TEXI_EN)
+ 	[ -d "$(srcdir)/p/doc/info" ] || $(srcdir)/p/script/mkdir-p "$(srcdir)/p/doc/info"
+-	$(MAKEINFO_EN) -o $(srcdir)/p/doc/info/gpc.info gpc.texi
++	$(MAKEINFO_EN) -o $(srcdir)/p/doc/info/gpc-2.1$(iv).info gpc.texi
+ 
+-$(srcdir)/p/doc/info/gpcs.info: $(GPC_TEXI_EN)
++$(srcdir)/p/doc/info/gpcs-2.1$(iv).info: $(GPC_TEXI_EN)
+ 	[ -d "$(srcdir)/p/doc/info" ] || $(srcdir)/p/script/mkdir-p "$(srcdir)/p/doc/info"
+-	$(MAKEINFO_EN) --no-split -o $(srcdir)/p/doc/info/gpcs.info gpcs.texi
++	$(MAKEINFO_EN) --no-split -o $(srcdir)/p/doc/info/gpcs-2.1$(iv).info gpcs.texi
+ 
+-$(srcdir)/p/doc/info/gpcs-de.info: $(GPC_TEXI_DE)
++$(srcdir)/p/doc/info/gpcs-de-2.1$(iv).info: $(GPC_TEXI_DE)
+ 	[ -d "$(srcdir)/p/doc/info" ] || $(srcdir)/p/script/mkdir-p "$(srcdir)/p/doc/info"
+-	$(MAKEINFO_DE) --no-split -o $(srcdir)/p/doc/info/gpcs-de.info gpcs.texi
++	$(MAKEINFO_DE) --no-split -o $(srcdir)/p/doc/info/gpcs-de-2.1$(iv).info gpcs.texi
+ 
+-$(srcdir)/p/doc/info/gpc-hr.info: $(GPC_TEXI_HR)
++$(srcdir)/p/doc/info/gpc-hr-2.1$(iv).info: $(GPC_TEXI_HR)
+ 	[ -d "$(srcdir)/p/doc/info" ] || $(srcdir)/p/script/mkdir-p "$(srcdir)/p/doc/info"
+-	$(MAKEINFO_HR) -o $(srcdir)/p/doc/info/gpc-hr.info gpc.texi
++	$(MAKEINFO_HR) -o $(srcdir)/p/doc/info/gpc-hr-2.1$(iv).info gpc.texi
+ 
+-$(srcdir)/p/doc/info/gpcs-hr.info: $(GPC_TEXI_HR)
++$(srcdir)/p/doc/info/gpcs-hr-2.1$(iv).info: $(GPC_TEXI_HR)
+ 	[ -d "$(srcdir)/p/doc/info" ] || $(srcdir)/p/script/mkdir-p "$(srcdir)/p/doc/info"
+-	$(MAKEINFO_HR) --no-split -o $(srcdir)/p/doc/info/gpcs-hr.info gpcs.texi
++	$(MAKEINFO_HR) --no-split -o $(srcdir)/p/doc/info/gpcs-hr-2.1$(iv).info gpcs.texi
+ 
+-$(srcdir)/p/doc/info/gpc-es.info: $(GPC_TEXI_ES)
++$(srcdir)/p/doc/info/gpc-es-2.1$(iv).info: $(GPC_TEXI_ES)
+ 	[ -d "$(srcdir)/p/doc/info" ] || $(srcdir)/p/script/mkdir-p "$(srcdir)/p/doc/info"
+-	$(MAKEINFO_ES) -o $(srcdir)/p/doc/info/gpc-es.info gpc.texi
++	$(MAKEINFO_ES) -o $(srcdir)/p/doc/info/gpc-es-2.1$(iv).info gpc.texi
+ 
+-$(srcdir)/p/doc/info/gpcs-es.info: $(GPC_TEXI_ES)
++$(srcdir)/p/doc/info/gpcs-es-2.1$(iv).info: $(GPC_TEXI_ES)
+ 	[ -d "$(srcdir)/p/doc/info" ] || $(srcdir)/p/script/mkdir-p "$(srcdir)/p/doc/info"
+-	$(MAKEINFO_ES) --no-split -o $(srcdir)/p/doc/info/gpcs-es.info gpcs.texi
++	$(MAKEINFO_ES) --no-split -o $(srcdir)/p/doc/info/gpcs-es-2.1$(iv).info gpcs.texi
+ 
+ gpc.dvi: $(GPC_TEXI_EN)
+ 	TEXINPUTS=$(srcdir)/p/doc:$(srcdir)/p/doc/images:$$TEXINPUTS \
+@@ -942,11 +942,11 @@
+ 	fi
+ 
+ pascal.install-info: pascal.install-info-man-dirs pascal.info
+-	rm -f $(DESTDIR)$(infodir)/gpc.info* $(DESTDIR)$(infodir)/gpcs.info* $(DESTDIR)$(infodir)/gpcs-de.info* $(DESTDIR)$(infodir)/gpcs-hr.info* $(DESTDIR)$(infodir)/gpcs-es.info*
+-	for f in `cd $(srcdir)/p/doc/info && echo gpc.info* gpcs*.info*`; do \
++	rm -f $(DESTDIR)$(infodir)/gpc*.info* $(DESTDIR)$(infodir)/gpcs*.info* $(DESTDIR)$(infodir)/gpcs-de*.info* $(DESTDIR)$(infodir)/gpcs-hr*.info* $(DESTDIR)$(infodir)/gpcs-es*.info*
++	for f in `cd $(srcdir)/p/doc/info && echo gpc-2.1$(iv).info* gpcs*.info*`; do \
+ 	  $(INSTALL_DATA) $(srcdir)/p/doc/info/$$f $(DESTDIR)$(infodir)/$$f || exit 1; \
+ 	done
+-	chmod a-x $(DESTDIR)$(infodir)/gpc.info* $(DESTDIR)$(infodir)/gpcs.info* $(DESTDIR)$(infodir)/gpcs-de.info* $(DESTDIR)$(infodir)/gpcs-hr.info* $(DESTDIR)$(infodir)/gpcs-es.info*
++	chmod a-x $(DESTDIR)$(infodir)/gpc*.info* $(DESTDIR)$(infodir)/gpcs*.info* $(DESTDIR)$(infodir)/gpcs-de*.info* $(DESTDIR)$(infodir)/gpcs-hr*.info* $(DESTDIR)$(infodir)/gpcs-es*.info*
+ 
+ pascal.install-man: pascal.install-info-man-dirs $(srcdir)/p/doc/en/gpc.1 $(srcdir)/p/doc/generated/gpc-run.1
+ 	-if [ -f gpc1$(exeext) ]; then \
--- gcj-4.2-4.2-20070707.orig/debian/patches/template.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/template.dpatch
@@ -0,0 +1,33 @@
+#! /bin/sh -e
+
+# All lines beginning with `# DPATCH:' are a description of the patch.
+# DP: <your description>
+
+# remove the next line
+exit 0
+
+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
+
+# append the patch here and adjust the -p? flag in the patch calls.
+
--- gcj-4.2-4.2-20070707.orig/debian/patches/config-ml-trunk.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/config-ml-trunk.dpatch
@@ -0,0 +1,198 @@
+#! /bin/sh -e
+
+# DP: disable some biarch libraries for biarch builds
+
+if [ $# -eq 3 ] && [ "$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
+
+--- config-ml.in.orig	2005-11-22 14:42:01.208516952 +0100
++++ config-ml.in	2005-11-22 14:46:39.072275240 +0100
+@@ -215,6 +215,13 @@
+   fi
+ done
+ 
++if [ -z "$biarch_multidir_names" ]; then
++  biarch_multidir_names="libiberty libstdc++-v3 libgfortran libmudflap libssp libffi libobjc"
++  echo "WARNING: biarch_multidir_names is unset. Use default value:"
++  echo "  $biarch_multidir_names"
++fi
++ml_srcbase=`basename $ml_realsrcdir`
++
+ # Target libraries are configured for the host they run on, so we check
+ # $host here, not $target.
+ 
+@@ -301,6 +308,26 @@
+ 	  done
+ 	fi
+ 	;;
++i[34567]86-*-*)
++	case " $multidirs " in
++	*" 64 "*)
++	  ac_configure_args="${ac_configure_args} --host=x86_64-linux-gnu"
++	  # Setting $host this late is a hack.  Some directories can't
++	  # handle it, so disable them for now.
++	  old_multidirs="${multidirs}"
++	  multidirs=""
++	  for x in ${old_multidirs}; do
++	    case "$x" in
++	    *64* ) case "$biarch_multidir_names" in
++		     *"$ml_srcbase"*) multidirs="${multidirs} ${x}" ;;
++		   esac
++		   ;;
++	    *) multidirs="${multidirs} ${x}" ;;
++	  esac
++	  done
++	  ;;
++	esac
++	;;
+ m68*-*-*)
+ 	if [ x$enable_softfloat = xno ]
+ 	then
+@@ -494,16 +521,56 @@
+ 	    esac
+ 	  done
+ 	fi
++	case " $multidirs " in
++	*" 64 "*)
++	  # We will not be able to create libraries with -m64 if
++	  # we cannot even link a trivial program.  It usually
++	  # indicates the 64bit libraries are missing.
++	  if echo 'main() {}' > conftest.c &&
++	     ${CC-gcc} -m64 conftest.c -o conftest; then
++           old_multidirs="${multidirs}"
++           multidirs=""
++           for x in ${old_multidirs}; do
++             case "$x" in
++	     *64* ) case "$biarch_multidir_names" in
++		       *"$ml_srcbase"*) multidirs="${multidirs} ${x}" ;;
++		    esac ;;
++             *) multidirs="${multidirs} ${x}" ;;
++             esac
++           done
++	  else
++	    echo Could not link program with -m64, disabling it.
++	    old_multidirs="${multidirs}"
++	    multidirs=""
++	    for x in ${old_multidirs}; do
++	      case "$x" in
++	      *m64* ) : ;;
++	      *) multidirs="${multidirs} ${x}" ;;
++	      esac
++	    done
++	  fi
++	  rm -f conftest.c conftest
++	  ;;
++	esac
+ 	;;
+ sparc*-*-*)
+ 	case " $multidirs " in
+-	*" m64 "*)
++	*" 64 "*)
+ 	  # We will not be able to create libraries with -m64 if
+ 	  # we cannot even link a trivial program.  It usually
+ 	  # indicates the 64bit libraries are missing.
+ 	  if echo 'main() {}' > conftest.c &&
+ 	     ${CC-gcc} -m64 conftest.c -o conftest; then
+-	    :
++           old_multidirs="${multidirs}"
++           multidirs=""
++           for x in ${old_multidirs}; do
++             case "$x" in
++	     *64* ) case "$biarch_multidir_names" in
++		       *"$ml_srcbase"*) multidirs="${multidirs} ${x}" ;;
++		    esac ;;
++             *) multidirs="${multidirs} ${x}" ;;
++             esac
++           done
+ 	  else
+ 	    echo Could not link program with -m64, disabling it.
+ 	    old_multidirs="${multidirs}"
+@@ -519,6 +586,74 @@
+ 	  ;;
+ 	esac
+ 	;;
++x86_64*-*-*)
++	case " $multidirs " in
++	*" 32 "*)
++	  # We will not be able to create libraries with -m32 if
++	  # we cannot even link a trivial program.  It usually
++	  # indicates the 32bit libraries are missing.
++	  if echo 'main() {}' > conftest.c &&
++	     ${CC-gcc} -m32 conftest.c -o conftest; then
++	   old_multidirs="${multidirs}"
++	   multidirs=""
++	   for x in ${old_multidirs}; do
++	     case "$x" in
++	     *32* ) case "$biarch_multidir_names" in
++		       *"$ml_srcbase"*) multidirs="${multidirs} ${x}" ;;
++		    esac ;;
++	     *) multidirs="${multidirs} ${x}" ;;
++	     esac
++	   done
++	  else
++	    echo Could not link program with -m32, disabling it.
++	    old_multidirs="${multidirs}"
++	    multidirs=""
++	    for x in ${old_multidirs}; do
++	      case "$x" in
++	      *m32* ) : ;;
++	      *) multidirs="${multidirs} ${x}" ;;
++	      esac
++	    done
++	  fi
++	  rm -f conftest.c conftest
++	  ;;
++	esac
++	;;
++s390-*-*)
++	ac_configure_args="${ac_configure_args} --host=s390x-linux-gnu"
++
++	case " $multidirs " in
++	*" 64 "*)
++	  # We will not be able to create libraries with -m64 if
++	  # we cannot even link a trivial program.  It usually
++	  # indicates the 64bit libraries are missing.
++	  if echo 'main() {}' > conftest.c &&
++	     ${CC-gcc} -m64 conftest.c -o conftest; then
++	    old_multidirs="${multidirs}"
++	    multidirs=""
++	    for x in ${old_multidirs}; do
++	      case "$x" in
++	      *64* ) case "$biarch_multidir_names" in
++		        *"$ml_srcbase"*) multidirs="${multidirs} ${x}" ;;
++		     esac ;;
++	      *) multidirs="${multidirs} ${x}" ;;
++	      esac
++	    done
++	  else
++	    echo Could not link program with -m64, disabling it.
++	    old_multidirs="${multidirs}"
++	    multidirs=""
++	    for x in ${old_multidirs}; do
++	      case "$x" in
++	      *64* ) : ;;
++	      *) multidirs="${multidirs} ${x}" ;;
++	      esac
++	    done
++	  fi
++	  rm -f conftest.c conftest
++	  ;;
++	esac
++	;;
+ esac
+ 
+ # Remove extraneous blanks from multidirs.
--- gcj-4.2-4.2-20070707.orig/debian/patches/ada-driver.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/ada-driver.dpatch
@@ -0,0 +1,41 @@
+#! /bin/sh -e
+
+# DP: Look for gcc-3.4, gcc-4.0 and gcc-4.1 as gcc with Ada support.
+
+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/aclocal.m4~	Sat Mar  2 00:37:42 2002
++++ gcc/aclocal.m4	Sat Apr  6 13:01:36 2002
+@@ -312,6 +312,10 @@
+ 	    ${ac_tool_prefix}$user_cc	$user_cc	\
+ 	    ${ac_tool_prefix}gcc	gcc		\
+ 	    ${ac_tool_prefix}cc		cc		\
++	    ${ac_tool_prefix}gcc-4.2	gcc-4.2		\
++	    ${ac_tool_prefix}gcc-4.1	gcc-4.1		\
++	    ${ac_tool_prefix}gcc-4.0	gcc-4.0		\
++	    ${ac_tool_prefix}gcc-3.4	gcc-3.4		\
+ 	    ${ac_tool_prefix}gnatgcc	gnatgcc		\
+ 	    ${ac_tool_prefix}gnatcc	gnatcc		\
+ 	    ${ac_tool_prefix}adagcc	adagcc		\
--- gcj-4.2-4.2-20070707.orig/debian/patches/powerpc-biarch.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/powerpc-biarch.dpatch
@@ -0,0 +1,47 @@
+#! /bin/sh -e
+ 
+# DP: enable biarch for 32 bit compiler
+ 
+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/config/rs6000/t-linux64.orig	2004-03-17 16:15:32.000000000 +0100
++++ gcc/config/rs6000/t-linux64	2005-10-01 00:40:20.279274880 +0200
+@@ -8,13 +8,13 @@
+ 
+ SHLIB_MAPFILES += $(srcdir)/config/rs6000/libgcc-ppc64.ver
+ 
+-MULTILIB_OPTIONS        = m64/m32 msoft-float
+-MULTILIB_DIRNAMES       = 64 32 nof
++MULTILIB_OPTIONS        = m64/m32
++MULTILIB_DIRNAMES       = 64 32
+ MULTILIB_EXTRA_OPTS     = fPIC mstrict-align
+-MULTILIB_EXCEPTIONS     = m64/msoft-float
+-MULTILIB_EXCLUSIONS     = m64/!m32/msoft-float
+-MULTILIB_OSDIRNAMES	= ../lib64 ../lib nof
+-MULTILIB_MATCHES        = $(MULTILIB_MATCHES_FLOAT)
++MULTILIB_EXCEPTIONS     =
++MULTILIB_EXCLUSIONS     =
++MULTILIB_OSDIRNAMES	= ../lib64 ../lib
++MULTILIB_MATCHES        =
+ 
+ # We want fine grained libraries, so use the new code to build the
+ # floating point emulation libraries.
--- gcj-4.2-4.2-20070707.orig/debian/patches/alpha-no-ev4-directive.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/alpha-no-ev4-directive.dpatch
@@ -0,0 +1,49 @@
+#! /bin/sh -e
+
+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
+
+Index: gcc/config/alpha/alpha.c
+===================================================================
+--- gcc/config/alpha/alpha.c	(revision 115263)
++++ gcc/config/alpha/alpha.c	(working copy)
+@@ -9372,7 +9372,7 @@
+     fputs ("\t.set nomacro\n", asm_out_file);
+   if (TARGET_SUPPORT_ARCH | TARGET_BWX | TARGET_MAX | TARGET_FIX | TARGET_CIX)
+     {
+-      const char *arch;
++      const char *arch = NULL;
+ 
+       if (alpha_cpu == PROCESSOR_EV6 || TARGET_FIX || TARGET_CIX)
+ 	arch = "ev6";
+@@ -9382,10 +9382,9 @@
+ 	arch = "ev56";
+       else if (alpha_cpu == PROCESSOR_EV5)
+ 	arch = "ev5";
+-      else
+-	arch = "ev4";
+ 
+-      fprintf (asm_out_file, "\t.arch %s\n", arch);
++      if (arch)
++        fprintf (asm_out_file, "\t.arch %s\n", arch);
+     }
+ }
+ #endif
--- gcj-4.2-4.2-20070707.orig/debian/patches/arm-libffi.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/arm-libffi.dpatch
@@ -0,0 +1,1232 @@
+#! /bin/sh -e
+
+# DP: Enable the libffi invocation interface, needed for the gcj interpreter.
+
+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
+
+2007-05-18  Aurelien Jarno  <aurelien@aurel32.net>
+
+	* src/arm/ffi.c (ffi_prep_closure_loc): Renamed and ajusted
+	from (ffi_prep_closure): ... this.
+	(FFI_INIT_TRAMPOLINE): Adjust.
+
+2005-12-31  Phil Blundell  <pb@reciva.com>
+
+	* src/arm/ffi.c (ffi_prep_incoming_args_SYSV, 
+        ffi_closure_SYSV_inner, ffi_prep_closure): New, add closure support.
+	* src/arm/sysv.S(ffi_closure_SYSV): Likewise.
+	* src/arm/ffitarget.h (FFI_TRAMPOLINE_SIZE): Likewise.
+	(FFI_CLOSURES): Enable closure support.
+
+2007-07-03  Andrew Haley  <aph@hedges.billgatliff.com>
+
+        * testsuite/libffi.call/cls_multi_ushort.c,
+        testsuite/libffi.call/cls_align_uint16.c,
+        testsuite/libffi.call/nested_struct1.c,
+        testsuite/libffi.call/nested_struct3.c,
+        testsuite/libffi.call/cls_7_1_byte.c,
+        testsuite/libffi.call/cls_double.c,
+        testsuite/libffi.call/nested_struct5.c,
+        testsuite/libffi.call/nested_struct7.c,
+        testsuite/libffi.call/cls_sint.c,
+        testsuite/libffi.call/nested_struct9.c,
+        testsuite/libffi.call/cls_20byte1.c,
+        testsuite/libffi.call/cls_multi_sshortchar.c,
+        testsuite/libffi.call/cls_align_sint64.c,
+        testsuite/libffi.call/cls_3byte2.c,
+        testsuite/libffi.call/cls_multi_schar.c,
+        testsuite/libffi.call/cls_multi_uchar.c,
+        testsuite/libffi.call/cls_19byte.c,
+        testsuite/libffi.call/cls_9byte1.c,
+        testsuite/libffi.call/cls_align_float.c,
+        testsuite/libffi.call/closure_fn1.c,
+        testsuite/libffi.call/problem1.c,
+        testsuite/libffi.call/closure_fn3.c,
+        testsuite/libffi.call/cls_sshort.c,
+        testsuite/libffi.call/closure_fn5.c,
+        testsuite/libffi.call/cls_align_double.c,
+        testsuite/libffi.call/cls_2byte.c,
+        testsuite/libffi.call/nested_struct.c,
+        testsuite/libffi.call/nested_struct10.c,
+        testsuite/libffi.call/cls_4byte.c,
+        testsuite/libffi.call/cls_6byte.c,
+        testsuite/libffi.call/cls_8byte.c,
+        testsuite/libffi.call/cls_multi_sshort.c,
+        testsuite/libffi.call/cls_align_uint32.c,
+        testsuite/libffi.call/cls_align_sint16.c,
+        testsuite/libffi.call/cls_float.c,
+        testsuite/libffi.call/cls_20byte.c,
+        testsuite/libffi.call/cls_5_1_byte.c,
+        testsuite/libffi.call/nested_struct2.c,
+        testsuite/libffi.call/cls_24byte.c,
+        testsuite/libffi.call/nested_struct4.c,
+        testsuite/libffi.call/nested_struct6.c,
+        testsuite/libffi.call/cls_64byte.c,
+        testsuite/libffi.call/nested_struct8.c,
+        testsuite/libffi.call/cls_uint.c,
+        testsuite/libffi.call/cls_multi_ushortchar.c,
+        testsuite/libffi.call/cls_schar.c,
+        testsuite/libffi.call/cls_uchar.c,
+        testsuite/libffi.call/cls_align_uint64.c,
+        testsuite/libffi.call/cls_ulonglong.c,
+        testsuite/libffi.call/cls_align_longdouble.c,
+        testsuite/libffi.call/cls_1_1byte.c,
+        testsuite/libffi.call/cls_12byte.c,
+        testsuite/libffi.call/cls_3_1byte.c,
+        testsuite/libffi.call/cls_3byte1.c,
+        testsuite/libffi.call/cls_4_1byte.c,
+        testsuite/libffi.call/cls_6_1_byte.c,
+        testsuite/libffi.call/cls_16byte.c,
+        testsuite/libffi.call/cls_18byte.c,
+        testsuite/libffi.call/closure_fn0.c,
+        testsuite/libffi.call/cls_9byte2.c,
+        testsuite/libffi.call/closure_fn2.c,
+        testsuite/libffi.call/closure_fn4.c,
+        testsuite/libffi.call/cls_ushort.c,
+        testsuite/libffi.call/closure_fn6.c,
+        testsuite/libffi.call/cls_5byte.c,
+        testsuite/libffi.call/cls_align_pointer.c,
+        testsuite/libffi.call/cls_7byte.c,
+        testsuite/libffi.call/cls_align_sint32.c,
+        testsuite/libffi.special/unwindtest_ffi_call.cc,
+        testsuite/libffi.special/unwindtest.cc: Enable for ARM.
+
+Index: libffi/src/arm/ffitarget.h
+===================================================================
+--- libffi/src/arm/ffitarget.h	(revision 126194)
++++ libffi/src/arm/ffitarget.h	(working copy)
+@@ -40,7 +40,8 @@
+ 
+ /* ---- Definitions for closures ----------------------------------------- */
+ 
+-#define FFI_CLOSURES 0
++#define FFI_CLOSURES 1
++#define FFI_TRAMPOLINE_SIZE 20
+ #define FFI_NATIVE_RAW_API 0
+ 
+ #endif
+Index: libffi/src/arm/ffi.c
+===================================================================
+--- libffi/src/arm/ffi.c	(revision 126194)
++++ libffi/src/arm/ffi.c	(working copy)
+@@ -168,3 +168,122 @@
+       break;
+     }
+ }
++
++/** private members **/
++
++static void ffi_prep_incoming_args_SYSV (char *stack, void **ret,
++					 void** args, ffi_cif* cif);
++
++void ffi_closure_SYSV (ffi_closure *);
++
++/* This function is jumped to by the trampoline */
++
++unsigned int
++ffi_closure_SYSV_inner (closure, respp, args)
++     ffi_closure *closure;
++     void **respp;
++     void *args;
++{
++  // our various things...
++  ffi_cif       *cif;
++  void         **arg_area;
++
++  cif         = closure->cif;
++  arg_area    = (void**) alloca (cif->nargs * sizeof (void*));  
++
++  /* this call will initialize ARG_AREA, such that each
++   * element in that array points to the corresponding 
++   * value on the stack; and if the function returns
++   * a structure, it will re-set RESP to point to the
++   * structure return address.  */
++
++  ffi_prep_incoming_args_SYSV(args, respp, arg_area, cif);
++
++  (closure->fun) (cif, *respp, arg_area, closure->user_data);
++
++  return cif->flags;
++}
++
++/*@-exportheader@*/
++static void 
++ffi_prep_incoming_args_SYSV(char *stack, void **rvalue,
++			    void **avalue, ffi_cif *cif)
++/*@=exportheader@*/
++{
++  register unsigned int i;
++  register void **p_argv;
++  register char *argp;
++  register ffi_type **p_arg;
++
++  argp = stack;
++
++  if ( cif->flags == FFI_TYPE_STRUCT ) {
++    *rvalue = *(void **) argp;
++    argp += 4;
++  }
++
++  p_argv = avalue;
++
++  for (i = cif->nargs, p_arg = cif->arg_types; (i != 0); i--, p_arg++)
++    {
++      size_t z;
++
++      /* Align if necessary */
++      if ((sizeof(int) - 1) & (unsigned) argp) {
++	argp = (char *) ALIGN(argp, sizeof(int));
++      }
++
++      z = (*p_arg)->size;
++
++      /* because we're little endian, this is what it turns into.   */
++
++      *p_argv = (void*) argp;
++
++      p_argv++;
++      argp += z;
++    }
++  
++  return;
++}
++
++/* How to make a trampoline.  */
++
++#define FFI_INIT_TRAMPOLINE(TRAMP,FUN,CTX) \
++({ unsigned char *__tramp = (unsigned char*)(TRAMP); \
++   unsigned int  __fun = (unsigned int)(FUN); \
++   unsigned int  __ctx = (unsigned int)(CTX); \
++   *(unsigned int*) &__tramp[0] = 0xe92d000f; /* stmfd sp!, {r0-r3} */	\
++   *(unsigned int*) &__tramp[4] = 0xe59f0000; /* ldr r0, [pc] */ \
++   *(unsigned int*) &__tramp[8] = 0xe59ff000; /* ldr pc, [pc] */ \
++   *(unsigned int*) &__tramp[12] = __ctx; \
++   *(unsigned int*) &__tramp[16] = __fun; \
++   register unsigned long _beg __asm ("a1") = (unsigned long) (&__tramp[0]);	\
++   register unsigned long _end __asm ("a2") = (unsigned long) (&__tramp[19]);	\
++   register unsigned long _flg __asm ("a3") = 0;			\
++   __asm __volatile ("swi 0x9f0002		@ sys_cacheflush"	\
++	   		    : "=r" (_beg)				\
++	   		    : "0" (_beg), "r" (_end), "r" (_flg));	\
++ })
++
++
++/* the cif must already be prep'ed */
++
++ffi_status
++ffi_prep_closure_loc (ffi_closure* closure,
++		      ffi_cif* cif,
++		      void (*fun)(ffi_cif*,void*,void**,void*),
++		      void *user_data,
++		      void *codeloc)
++{
++  FFI_ASSERT (cif->abi == FFI_SYSV);
++
++  FFI_INIT_TRAMPOLINE (&closure->tramp[0], \
++		       &ffi_closure_SYSV,  \
++		       codeloc);
++    
++  closure->cif  = cif;
++  closure->user_data = user_data;
++  closure->fun  = fun;
++
++  return FFI_OK;
++}
+Index: libffi/src/arm/sysv.S
+===================================================================
+--- libffi/src/arm/sysv.S	(revision 126194)
++++ libffi/src/arm/sysv.S	(working copy)
+@@ -207,3 +207,51 @@
+ .ffi_call_SYSV_end:
+         .size    CNAME(ffi_call_SYSV),.ffi_call_SYSV_end-CNAME(ffi_call_SYSV)
+ 
++/*
++	unsigned int FFI_HIDDEN
++	ffi_closure_SYSV_inner (closure, respp, args)
++	     ffi_closure *closure;
++	     void **respp;
++  	     void *args;
++*/
++
++ARM_FUNC_START ffi_closure_SYSV
++	add	ip, sp, #16
++	stmfd	sp!, {ip, lr}
++	add	r2, sp, #8
++	sub	sp, sp, #16
++	str	sp, [sp, #8]
++	add	r1, sp, #8
++	bl	ffi_closure_SYSV_inner
++	cmp	r0, #FFI_TYPE_INT
++	beq	.Lretint
++	cmp	r0, #FFI_TYPE_FLOAT
++	beq	.Lretfloat
++	cmp	r0, #FFI_TYPE_DOUBLE
++	beq	.Lretdouble
++	cmp	r0, #FFI_TYPE_LONGDOUBLE
++	beq	.Lretlongdouble
++	cmp	r0, #FFI_TYPE_SINT64
++	beq	.Lretlonglong
++.Lclosure_epilogue:
++	add	sp, sp, #16
++	ldmfd	sp, {sp, pc}
++.Lretint:
++	ldr	r0, [sp]
++	b	.Lclosure_epilogue
++.Lretlonglong:
++	ldr	r0, [sp]
++	ldr	r1, [sp, #4]
++	b	.Lclosure_epilogue
++.Lretfloat:
++	ldfs	f0, [sp]
++	b	.Lclosure_epilogue
++.Lretdouble:
++	ldfd	f0, [sp]
++	b	.Lclosure_epilogue
++.Lretlongdouble:
++	ldfd	f0, [sp]
++	b	.Lclosure_epilogue
++.ffi_closure_SYSV_end:
++        .size    CNAME(ffi_closure_SYSV),.ffi_closure_SYSV_end-CNAME(ffi_closure_SYSV)
++
+Index: libffi/testsuite/libffi.call/cls_multi_ushort.c
+===================================================================
+--- libffi/testsuite/libffi.call/cls_multi_ushort.c	(revision 126194)
++++ libffi/testsuite/libffi.call/cls_multi_ushort.c	(working copy)
+@@ -4,7 +4,7 @@
+    PR:		PR13221.
+    Originator:	<andreast@gcc.gnu.org> 20031129  */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ unsigned short test_func_fn(unsigned short a1, unsigned short a2)
+Index: libffi/testsuite/libffi.call/cls_align_uint16.c
+===================================================================
+--- libffi/testsuite/libffi.call/cls_align_uint16.c	(revision 126194)
++++ libffi/testsuite/libffi.call/cls_align_uint16.c	(working copy)
+@@ -4,7 +4,7 @@
+    PR:		none.
+    Originator:	<hos@tamanegi.org> 20031203	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ typedef struct cls_struct_align {
+Index: libffi/testsuite/libffi.call/nested_struct1.c
+===================================================================
+--- libffi/testsuite/libffi.call/nested_struct1.c	(revision 126194)
++++ libffi/testsuite/libffi.call/nested_struct1.c	(working copy)
+@@ -5,7 +5,7 @@
+    PR:		none.
+    Originator:	<andreast@gcc.gnu.org> 20030828	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ typedef struct cls_struct_16byte1 {
+Index: libffi/testsuite/libffi.call/nested_struct3.c
+===================================================================
+--- libffi/testsuite/libffi.call/nested_struct3.c	(revision 126194)
++++ libffi/testsuite/libffi.call/nested_struct3.c	(working copy)
+@@ -6,7 +6,7 @@
+    PR:		none.
+    Originator:	<andreast@gcc.gnu.org> 20030911	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ typedef struct A {
+Index: libffi/testsuite/libffi.call/cls_7_1_byte.c
+===================================================================
+--- libffi/testsuite/libffi.call/cls_7_1_byte.c	(revision 126194)
++++ libffi/testsuite/libffi.call/cls_7_1_byte.c	(working copy)
+@@ -5,7 +5,7 @@
+    PR:		none.
+    Originator:	<andreast@gcc.gnu.org> 20050708	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ typedef struct cls_struct_7byte {
+Index: libffi/testsuite/libffi.call/cls_double.c
+===================================================================
+--- libffi/testsuite/libffi.call/cls_double.c	(revision 126194)
++++ libffi/testsuite/libffi.call/cls_double.c	(working copy)
+@@ -4,7 +4,7 @@
+    PR:		none.
+    Originator:	<andreast@gcc.gnu.org> 20030828	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ static void cls_ret_double_fn(ffi_cif* cif __UNUSED__, void* resp, void** args,
+Index: libffi/testsuite/libffi.call/nested_struct5.c
+===================================================================
+--- libffi/testsuite/libffi.call/nested_struct5.c	(revision 126194)
++++ libffi/testsuite/libffi.call/nested_struct5.c	(working copy)
+@@ -6,7 +6,7 @@
+    PR:		none.
+    Originator:	<andreast@gcc.gnu.org> 20051010	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ typedef struct A {
+Index: libffi/testsuite/libffi.call/nested_struct7.c
+===================================================================
+--- libffi/testsuite/libffi.call/nested_struct7.c	(revision 126194)
++++ libffi/testsuite/libffi.call/nested_struct7.c	(working copy)
+@@ -6,7 +6,7 @@
+    PR:		none.
+    Originator:	<andreast@gcc.gnu.org> 20051010	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ typedef struct A {
+Index: libffi/testsuite/libffi.call/cls_sint.c
+===================================================================
+--- libffi/testsuite/libffi.call/cls_sint.c	(revision 126194)
++++ libffi/testsuite/libffi.call/cls_sint.c	(working copy)
+@@ -4,7 +4,7 @@
+    PR:		none.
+    Originator:	<andreast@gcc.gnu.org> 20031108	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ static void cls_ret_sint_fn(ffi_cif* cif __UNUSED__, void* resp, void** args,
+Index: libffi/testsuite/libffi.call/nested_struct9.c
+===================================================================
+--- libffi/testsuite/libffi.call/nested_struct9.c	(revision 126194)
++++ libffi/testsuite/libffi.call/nested_struct9.c	(working copy)
+@@ -6,7 +6,7 @@
+    PR:		none.
+    Originator:	<andreast@gcc.gnu.org> 20051010	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ typedef struct A {
+Index: libffi/testsuite/libffi.call/cls_20byte1.c
+===================================================================
+--- libffi/testsuite/libffi.call/cls_20byte1.c	(revision 126194)
++++ libffi/testsuite/libffi.call/cls_20byte1.c	(working copy)
+@@ -5,7 +5,9 @@
+    PR:		none.
+    Originator:	<andreast@gcc.gnu.org> 20030828	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++
++
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ typedef struct cls_struct_20byte {
+Index: libffi/testsuite/libffi.call/cls_multi_sshortchar.c
+===================================================================
+--- libffi/testsuite/libffi.call/cls_multi_sshortchar.c	(revision 126194)
++++ libffi/testsuite/libffi.call/cls_multi_sshortchar.c	(working copy)
+@@ -4,7 +4,7 @@
+    PR:		PR13221.
+    Originator:	<andreast@gcc.gnu.org> 20031129  */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ signed short test_func_fn(signed char a1, signed short a2,
+Index: libffi/testsuite/libffi.call/cls_align_sint64.c
+===================================================================
+--- libffi/testsuite/libffi.call/cls_align_sint64.c	(revision 126194)
++++ libffi/testsuite/libffi.call/cls_align_sint64.c	(working copy)
+@@ -4,7 +4,7 @@
+    PR:		none.
+    Originator:	<hos@tamanegi.org> 20031203	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ typedef struct cls_struct_align {
+Index: libffi/testsuite/libffi.call/cls_3byte2.c
+===================================================================
+--- libffi/testsuite/libffi.call/cls_3byte2.c	(revision 126194)
++++ libffi/testsuite/libffi.call/cls_3byte2.c	(working copy)
+@@ -6,7 +6,7 @@
+    PR:		none.
+    Originator:	<andreast@gcc.gnu.org> 20030828	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ typedef struct cls_struct_3byte_1 {
+Index: libffi/testsuite/libffi.call/cls_multi_schar.c
+===================================================================
+--- libffi/testsuite/libffi.call/cls_multi_schar.c	(revision 126194)
++++ libffi/testsuite/libffi.call/cls_multi_schar.c	(working copy)
+@@ -4,7 +4,7 @@
+    PR:		PR13221.
+    Originator:	<hos@tamanegi.org> 20031129  */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ signed char test_func_fn(signed char a1, signed char a2)
+Index: libffi/testsuite/libffi.call/cls_multi_uchar.c
+===================================================================
+--- libffi/testsuite/libffi.call/cls_multi_uchar.c	(revision 126194)
++++ libffi/testsuite/libffi.call/cls_multi_uchar.c	(working copy)
+@@ -4,7 +4,7 @@
+    PR:		PR13221.
+    Originator:	<andreast@gcc.gnu.org> 20031129  */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ unsigned char test_func_fn(unsigned char a1, unsigned char a2,
+Index: libffi/testsuite/libffi.call/cls_19byte.c
+===================================================================
+--- libffi/testsuite/libffi.call/cls_19byte.c	(revision 126194)
++++ libffi/testsuite/libffi.call/cls_19byte.c	(working copy)
+@@ -5,7 +5,7 @@
+    PR:		none.
+    Originator:	<andreast@gcc.gnu.org> 20030915	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ typedef struct cls_struct_19byte {
+Index: libffi/testsuite/libffi.call/cls_9byte1.c
+===================================================================
+--- libffi/testsuite/libffi.call/cls_9byte1.c	(revision 126194)
++++ libffi/testsuite/libffi.call/cls_9byte1.c	(working copy)
+@@ -7,7 +7,7 @@
+    PR:		none.
+    Originator:	<andreast@gcc.gnu.org> 20030914	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ typedef struct cls_struct_9byte {
+Index: libffi/testsuite/libffi.call/cls_align_float.c
+===================================================================
+--- libffi/testsuite/libffi.call/cls_align_float.c	(revision 126194)
++++ libffi/testsuite/libffi.call/cls_align_float.c	(working copy)
+@@ -4,7 +4,7 @@
+    PR:		none.
+    Originator:	<hos@tamanegi.org> 20031203	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ typedef struct cls_struct_align {
+Index: libffi/testsuite/libffi.call/closure_fn1.c
+===================================================================
+--- libffi/testsuite/libffi.call/closure_fn1.c	(revision 126194)
++++ libffi/testsuite/libffi.call/closure_fn1.c	(working copy)
+@@ -6,7 +6,7 @@
+    PR:		none.
+    Originator:	<andreast@gcc.gnu.org> 20030828	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ 
+Index: libffi/testsuite/libffi.call/problem1.c
+===================================================================
+--- libffi/testsuite/libffi.call/problem1.c	(revision 126194)
++++ libffi/testsuite/libffi.call/problem1.c	(working copy)
+@@ -4,7 +4,7 @@
+    PR:		none.
+    Originator:	<andreast@gcc.gnu.org> 20030828	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ typedef struct my_ffi_struct {
+Index: libffi/testsuite/libffi.call/closure_fn3.c
+===================================================================
+--- libffi/testsuite/libffi.call/closure_fn3.c	(revision 126194)
++++ libffi/testsuite/libffi.call/closure_fn3.c	(working copy)
+@@ -6,7 +6,7 @@
+    PR:		none.
+    Originator:	<andreast@gcc.gnu.org> 20030828	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ static void closure_test_fn3(ffi_cif* cif __UNUSED__, void* resp, void** args,
+Index: libffi/testsuite/libffi.call/cls_sshort.c
+===================================================================
+--- libffi/testsuite/libffi.call/cls_sshort.c	(revision 126194)
++++ libffi/testsuite/libffi.call/cls_sshort.c	(working copy)
+@@ -4,7 +4,7 @@
+    PR:		none.
+    Originator:	<andreast@gcc.gnu.org> 20031108	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ static void cls_ret_sshort_fn(ffi_cif* cif __UNUSED__, void* resp, void** args,
+Index: libffi/testsuite/libffi.call/closure_fn5.c
+===================================================================
+--- libffi/testsuite/libffi.call/closure_fn5.c	(revision 126194)
++++ libffi/testsuite/libffi.call/closure_fn5.c	(working copy)
+@@ -6,7 +6,7 @@
+    PR:		none.
+    Originator:	<andreast@gcc.gnu.org> 20031026	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ static void
+Index: libffi/testsuite/libffi.call/cls_align_double.c
+===================================================================
+--- libffi/testsuite/libffi.call/cls_align_double.c	(revision 126194)
++++ libffi/testsuite/libffi.call/cls_align_double.c	(working copy)
+@@ -4,7 +4,9 @@
+    PR:		none.
+    Originator:	<hos@tamanegi.org> 20031203	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++
++
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ typedef struct cls_struct_align {
+Index: libffi/testsuite/libffi.call/cls_2byte.c
+===================================================================
+--- libffi/testsuite/libffi.call/cls_2byte.c	(revision 126194)
++++ libffi/testsuite/libffi.call/cls_2byte.c	(working copy)
+@@ -6,7 +6,7 @@
+    PR:		none.
+    Originator:	<andreast@gcc.gnu.org> 20030828	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ typedef struct cls_struct_2byte {
+Index: libffi/testsuite/libffi.call/nested_struct.c
+===================================================================
+--- libffi/testsuite/libffi.call/nested_struct.c	(revision 126194)
++++ libffi/testsuite/libffi.call/nested_struct.c	(working copy)
+@@ -5,7 +5,7 @@
+    PR:		none.
+    Originator:	<andreast@gcc.gnu.org> 20030828	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ typedef struct cls_struct_16byte1 {
+Index: libffi/testsuite/libffi.call/nested_struct10.c
+===================================================================
+--- libffi/testsuite/libffi.call/nested_struct10.c	(revision 126194)
++++ libffi/testsuite/libffi.call/nested_struct10.c	(working copy)
+@@ -6,7 +6,7 @@
+    PR:		none.
+    Originator:	<andreast@gcc.gnu.org> 20051010	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ typedef struct A {
+Index: libffi/testsuite/libffi.call/cls_4byte.c
+===================================================================
+--- libffi/testsuite/libffi.call/cls_4byte.c	(revision 126194)
++++ libffi/testsuite/libffi.call/cls_4byte.c	(working copy)
+@@ -5,7 +5,7 @@
+    PR:		none.
+    Originator:	<andreast@gcc.gnu.org> 20030828	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ 
+ #include "ffitest.h"
+ 
+Index: libffi/testsuite/libffi.call/cls_6byte.c
+===================================================================
+--- libffi/testsuite/libffi.call/cls_6byte.c	(revision 126194)
++++ libffi/testsuite/libffi.call/cls_6byte.c	(working copy)
+@@ -5,7 +5,8 @@
+    PR:		none.
+    Originator:	<andreast@gcc.gnu.org> 20030828	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ typedef struct cls_struct_6byte {
+Index: libffi/testsuite/libffi.call/cls_8byte.c
+===================================================================
+--- libffi/testsuite/libffi.call/cls_8byte.c	(revision 126194)
++++ libffi/testsuite/libffi.call/cls_8byte.c	(working copy)
+@@ -5,7 +5,7 @@
+    PR:		none.
+    Originator:	<andreast@gcc.gnu.org> 20030828	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ typedef struct cls_struct_8byte {
+Index: libffi/testsuite/libffi.call/cls_multi_sshort.c
+===================================================================
+--- libffi/testsuite/libffi.call/cls_multi_sshort.c	(revision 126194)
++++ libffi/testsuite/libffi.call/cls_multi_sshort.c	(working copy)
+@@ -4,7 +4,7 @@
+    PR:		PR13221.
+    Originator:	<andreast@gcc.gnu.org> 20031129  */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ signed short test_func_fn(signed short a1, signed short a2)
+Index: libffi/testsuite/libffi.call/cls_align_uint32.c
+===================================================================
+--- libffi/testsuite/libffi.call/cls_align_uint32.c	(revision 126194)
++++ libffi/testsuite/libffi.call/cls_align_uint32.c	(working copy)
+@@ -4,7 +4,7 @@
+    PR:		none.
+    Originator:	<hos@tamanegi.org> 20031203	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ typedef struct cls_struct_align {
+Index: libffi/testsuite/libffi.call/cls_align_sint16.c
+===================================================================
+--- libffi/testsuite/libffi.call/cls_align_sint16.c	(revision 126194)
++++ libffi/testsuite/libffi.call/cls_align_sint16.c	(working copy)
+@@ -4,7 +4,7 @@
+    PR:		none.
+    Originator:	<hos@tamanegi.org> 20031203	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ typedef struct cls_struct_align {
+Index: libffi/testsuite/libffi.call/cls_float.c
+===================================================================
+--- libffi/testsuite/libffi.call/cls_float.c	(revision 126194)
++++ libffi/testsuite/libffi.call/cls_float.c	(working copy)
+@@ -4,7 +4,7 @@
+    PR:		none.
+    Originator:	<andreast@gcc.gnu.org> 20030828	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ static void cls_ret_float_fn(ffi_cif* cif __UNUSED__, void* resp, void** args,
+Index: libffi/testsuite/libffi.call/cls_20byte.c
+===================================================================
+--- libffi/testsuite/libffi.call/cls_20byte.c	(revision 126194)
++++ libffi/testsuite/libffi.call/cls_20byte.c	(working copy)
+@@ -5,7 +5,7 @@
+    PR:		none.
+    Originator:	<andreast@gcc.gnu.org> 20030828	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ typedef struct cls_struct_20byte {
+Index: libffi/testsuite/libffi.call/cls_5_1_byte.c
+===================================================================
+--- libffi/testsuite/libffi.call/cls_5_1_byte.c	(revision 126194)
++++ libffi/testsuite/libffi.call/cls_5_1_byte.c	(working copy)
+@@ -5,7 +5,7 @@
+    PR:		none.
+    Originator:	<andreast@gcc.gnu.org> 20050708	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ typedef struct cls_struct_5byte {
+Index: libffi/testsuite/libffi.call/nested_struct2.c
+===================================================================
+--- libffi/testsuite/libffi.call/nested_struct2.c	(revision 126194)
++++ libffi/testsuite/libffi.call/nested_struct2.c	(working copy)
+@@ -6,7 +6,7 @@
+    PR:		none.
+    Originator:	<andreast@gcc.gnu.org> 20030911	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ typedef struct A {
+Index: libffi/testsuite/libffi.call/cls_24byte.c
+===================================================================
+--- libffi/testsuite/libffi.call/cls_24byte.c	(revision 126194)
++++ libffi/testsuite/libffi.call/cls_24byte.c	(working copy)
+@@ -5,7 +5,7 @@
+    PR:		none.
+    Originator:	<andreast@gcc.gnu.org> 20030828	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ typedef struct cls_struct_24byte {
+Index: libffi/testsuite/libffi.call/nested_struct4.c
+===================================================================
+--- libffi/testsuite/libffi.call/nested_struct4.c	(revision 126194)
++++ libffi/testsuite/libffi.call/nested_struct4.c	(working copy)
+@@ -6,7 +6,7 @@
+    PR:		PR 25630.
+    Originator:	<andreast@gcc.gnu.org> 20051010	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ typedef struct A {
+Index: libffi/testsuite/libffi.call/nested_struct6.c
+===================================================================
+--- libffi/testsuite/libffi.call/nested_struct6.c	(revision 126194)
++++ libffi/testsuite/libffi.call/nested_struct6.c	(working copy)
+@@ -6,7 +6,7 @@
+    PR:		PR 25630.
+    Originator:	<andreast@gcc.gnu.org> 20051010	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ typedef struct A {
+Index: libffi/testsuite/libffi.call/cls_64byte.c
+===================================================================
+--- libffi/testsuite/libffi.call/cls_64byte.c	(revision 126194)
++++ libffi/testsuite/libffi.call/cls_64byte.c	(working copy)
+@@ -6,7 +6,7 @@
+    PR:		none.
+    Originator:	<andreast@gcc.gnu.org> 20030828	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ typedef struct cls_struct_64byte {
+Index: libffi/testsuite/libffi.call/nested_struct8.c
+===================================================================
+--- libffi/testsuite/libffi.call/nested_struct8.c	(revision 126194)
++++ libffi/testsuite/libffi.call/nested_struct8.c	(working copy)
+@@ -6,7 +6,7 @@
+    PR:		none.
+    Originator:	<andreast@gcc.gnu.org> 20051010	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ typedef struct A {
+Index: libffi/testsuite/libffi.call/cls_uint.c
+===================================================================
+--- libffi/testsuite/libffi.call/cls_uint.c	(revision 126194)
++++ libffi/testsuite/libffi.call/cls_uint.c	(working copy)
+@@ -4,7 +4,7 @@
+    PR:		none.
+    Originator:	<andreast@gcc.gnu.org> 20030828	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ static void cls_ret_uint_fn(ffi_cif* cif __UNUSED__, void* resp, void** args,
+Index: libffi/testsuite/libffi.call/cls_multi_ushortchar.c
+===================================================================
+--- libffi/testsuite/libffi.call/cls_multi_ushortchar.c	(revision 126194)
++++ libffi/testsuite/libffi.call/cls_multi_ushortchar.c	(working copy)
+@@ -4,7 +4,7 @@
+    PR:		PR13221.
+    Originator:	<andreast@gcc.gnu.org> 20031129  */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ unsigned short test_func_fn(unsigned char a1, unsigned short a2,
+Index: libffi/testsuite/libffi.call/cls_schar.c
+===================================================================
+--- libffi/testsuite/libffi.call/cls_schar.c	(revision 126194)
++++ libffi/testsuite/libffi.call/cls_schar.c	(working copy)
+@@ -4,7 +4,9 @@
+    PR:		none.
+    Originator:	<andreast@gcc.gnu.org> 20031108	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++
++
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ static void cls_ret_schar_fn(ffi_cif* cif __UNUSED__, void* resp, void** args,
+Index: libffi/testsuite/libffi.call/cls_uchar.c
+===================================================================
+--- libffi/testsuite/libffi.call/cls_uchar.c	(revision 126194)
++++ libffi/testsuite/libffi.call/cls_uchar.c	(working copy)
+@@ -4,7 +4,7 @@
+    PR:		none.
+    Originator:	<andreast@gcc.gnu.org> 20030828	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ static void cls_ret_uchar_fn(ffi_cif* cif __UNUSED__, void* resp, void** args,
+Index: libffi/testsuite/libffi.call/cls_align_uint64.c
+===================================================================
+--- libffi/testsuite/libffi.call/cls_align_uint64.c	(revision 126194)
++++ libffi/testsuite/libffi.call/cls_align_uint64.c	(working copy)
+@@ -4,7 +4,8 @@
+    PR:		none.
+    Originator:	<hos@tamanegi.org> 20031203	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ typedef struct cls_struct_align {
+Index: libffi/testsuite/libffi.call/cls_ulonglong.c
+===================================================================
+--- libffi/testsuite/libffi.call/cls_ulonglong.c	(revision 126194)
++++ libffi/testsuite/libffi.call/cls_ulonglong.c	(working copy)
+@@ -4,7 +4,7 @@
+    PR:		none.
+    Originator:	<andreast@gcc.gnu.org> 20030828	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ static void cls_ret_ulonglong_fn(ffi_cif* cif __UNUSED__, void* resp,
+Index: libffi/testsuite/libffi.call/cls_align_longdouble.c
+===================================================================
+--- libffi/testsuite/libffi.call/cls_align_longdouble.c	(revision 126194)
++++ libffi/testsuite/libffi.call/cls_align_longdouble.c	(working copy)
+@@ -4,7 +4,7 @@
+    PR:		none.
+    Originator:	<hos@tamanegi.org> 20031203	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ 
+ #include "ffitest.h"
+ 
+Index: libffi/testsuite/libffi.call/cls_1_1byte.c
+===================================================================
+--- libffi/testsuite/libffi.call/cls_1_1byte.c	(revision 126194)
++++ libffi/testsuite/libffi.call/cls_1_1byte.c	(working copy)
+@@ -6,7 +6,9 @@
+    PR:		none.
+    Originator:	<andreast@gcc.gnu.org> 20030902	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++
++
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ typedef struct cls_struct_1_1byte {
+Index: libffi/testsuite/libffi.call/cls_12byte.c
+===================================================================
+--- libffi/testsuite/libffi.call/cls_12byte.c	(revision 126194)
++++ libffi/testsuite/libffi.call/cls_12byte.c	(working copy)
+@@ -4,7 +4,7 @@
+    PR:		none.
+    Originator:	<andreast@gcc.gnu.org> 20030828	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ typedef struct cls_struct_12byte {
+Index: libffi/testsuite/libffi.call/cls_3_1byte.c
+===================================================================
+--- libffi/testsuite/libffi.call/cls_3_1byte.c	(revision 126194)
++++ libffi/testsuite/libffi.call/cls_3_1byte.c	(working copy)
+@@ -6,7 +6,7 @@
+    PR:		none.
+    Originator:	<andreast@gcc.gnu.org> 20030902	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ typedef struct cls_struct_3_1byte {
+Index: libffi/testsuite/libffi.call/cls_3byte1.c
+===================================================================
+--- libffi/testsuite/libffi.call/cls_3byte1.c	(revision 126194)
++++ libffi/testsuite/libffi.call/cls_3byte1.c	(working copy)
+@@ -6,7 +6,7 @@
+    PR:		none.
+    Originator:	<andreast@gcc.gnu.org> 20030828	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ typedef struct cls_struct_3byte {
+Index: libffi/testsuite/libffi.call/cls_4_1byte.c
+===================================================================
+--- libffi/testsuite/libffi.call/cls_4_1byte.c	(revision 126194)
++++ libffi/testsuite/libffi.call/cls_4_1byte.c	(working copy)
+@@ -6,7 +6,7 @@
+    PR:		none.
+    Originator:	<andreast@gcc.gnu.org> 20030902	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ typedef struct cls_struct_4_1byte {
+Index: libffi/testsuite/libffi.call/cls_6_1_byte.c
+===================================================================
+--- libffi/testsuite/libffi.call/cls_6_1_byte.c	(revision 126194)
++++ libffi/testsuite/libffi.call/cls_6_1_byte.c	(working copy)
+@@ -5,7 +5,7 @@
+    PR:		none.
+    Originator:	<andreast@gcc.gnu.org> 20050708	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ typedef struct cls_struct_6byte {
+Index: libffi/testsuite/libffi.call/cls_16byte.c
+===================================================================
+--- libffi/testsuite/libffi.call/cls_16byte.c	(revision 126194)
++++ libffi/testsuite/libffi.call/cls_16byte.c	(working copy)
+@@ -5,7 +5,7 @@
+    PR:		none.
+    Originator:	<andreast@gcc.gnu.org> 20030828	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ typedef struct cls_struct_16byte {
+Index: libffi/testsuite/libffi.call/cls_18byte.c
+===================================================================
+--- libffi/testsuite/libffi.call/cls_18byte.c	(revision 126194)
++++ libffi/testsuite/libffi.call/cls_18byte.c	(working copy)
+@@ -5,7 +5,7 @@
+    PR:		none.
+    Originator:	<andreast@gcc.gnu.org> 20030915	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ typedef struct cls_struct_18byte {
+Index: libffi/testsuite/libffi.call/closure_fn0.c
+===================================================================
+--- libffi/testsuite/libffi.call/closure_fn0.c	(revision 126194)
++++ libffi/testsuite/libffi.call/closure_fn0.c	(working copy)
+@@ -6,7 +6,10 @@
+    PR:		none.
+    Originator:	<andreast@gcc.gnu.org> 20030828	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++
++
++
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ static void
+Index: libffi/testsuite/libffi.call/cls_9byte2.c
+===================================================================
+--- libffi/testsuite/libffi.call/cls_9byte2.c	(revision 126194)
++++ libffi/testsuite/libffi.call/cls_9byte2.c	(working copy)
+@@ -7,7 +7,7 @@
+    PR:		none.
+    Originator:	<andreast@gcc.gnu.org> 20030914	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ typedef struct cls_struct_9byte {
+Index: libffi/testsuite/libffi.call/closure_fn2.c
+===================================================================
+--- libffi/testsuite/libffi.call/closure_fn2.c	(revision 126194)
++++ libffi/testsuite/libffi.call/closure_fn2.c	(working copy)
+@@ -6,7 +6,7 @@
+    PR:		none.
+    Originator:	<andreast@gcc.gnu.org> 20030828	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ static void closure_test_fn2(ffi_cif* cif __UNUSED__, void* resp, void** args,
+Index: libffi/testsuite/libffi.call/closure_fn4.c
+===================================================================
+--- libffi/testsuite/libffi.call/closure_fn4.c	(revision 126194)
++++ libffi/testsuite/libffi.call/closure_fn4.c	(working copy)
+@@ -6,7 +6,7 @@
+    PR:		none.
+    Originator:	<andreast@gcc.gnu.org> 20031026	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ 
+ #include "ffitest.h"
+ 
+Index: libffi/testsuite/libffi.call/cls_ushort.c
+===================================================================
+--- libffi/testsuite/libffi.call/cls_ushort.c	(revision 126194)
++++ libffi/testsuite/libffi.call/cls_ushort.c	(working copy)
+@@ -4,7 +4,7 @@
+    PR:		none.
+    Originator:	<andreast@gcc.gnu.org> 20030828	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ static void cls_ret_ushort_fn(ffi_cif* cif __UNUSED__, void* resp, void** args,
+Index: libffi/testsuite/libffi.call/closure_fn6.c
+===================================================================
+--- libffi/testsuite/libffi.call/closure_fn6.c	(revision 126194)
++++ libffi/testsuite/libffi.call/closure_fn6.c	(working copy)
+@@ -5,7 +5,7 @@
+    PR:		PR23404
+    Originator:	<andreast@gcc.gnu.org> 20050830	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ static void
+Index: libffi/testsuite/libffi.call/cls_5byte.c
+===================================================================
+--- libffi/testsuite/libffi.call/cls_5byte.c	(revision 126194)
++++ libffi/testsuite/libffi.call/cls_5byte.c	(working copy)
+@@ -5,7 +5,7 @@
+    PR:		none.
+    Originator:	<andreast@gcc.gnu.org> 20030828	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ typedef struct cls_struct_5byte {
+Index: libffi/testsuite/libffi.call/cls_align_pointer.c
+===================================================================
+--- libffi/testsuite/libffi.call/cls_align_pointer.c	(revision 126194)
++++ libffi/testsuite/libffi.call/cls_align_pointer.c	(working copy)
+@@ -4,7 +4,7 @@
+    PR:		none.
+    Originator:	<hos@tamanegi.org> 20031203	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ typedef struct cls_struct_align {
+Index: libffi/testsuite/libffi.call/cls_7byte.c
+===================================================================
+--- libffi/testsuite/libffi.call/cls_7byte.c	(revision 126194)
++++ libffi/testsuite/libffi.call/cls_7byte.c	(working copy)
+@@ -5,7 +5,7 @@
+    PR:		none.
+    Originator:	<andreast@gcc.gnu.org> 20030828	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ typedef struct cls_struct_7byte {
+Index: libffi/testsuite/libffi.call/cls_align_sint32.c
+===================================================================
+--- libffi/testsuite/libffi.call/cls_align_sint32.c	(revision 126194)
++++ libffi/testsuite/libffi.call/cls_align_sint32.c	(working copy)
+@@ -4,7 +4,7 @@
+    PR:		none.
+    Originator:	<hos@tamanegi.org> 20031203	 */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitest.h"
+ 
+ typedef struct cls_struct_align {
+Index: libffi/testsuite/libffi.special/unwindtest_ffi_call.cc
+===================================================================
+--- libffi/testsuite/libffi.special/unwindtest_ffi_call.cc	(revision 126194)
++++ libffi/testsuite/libffi.special/unwindtest_ffi_call.cc	(working copy)
+@@ -4,7 +4,7 @@
+    PR:		none.
+    Originator:	Andreas Tobler <andreast@gcc.gnu.org> 20061213  */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitestcxx.h"
+ 
+ static int checking(int a __UNUSED__, short b __UNUSED__,
+Index: libffi/testsuite/libffi.special/unwindtest.cc
+===================================================================
+--- libffi/testsuite/libffi.special/unwindtest.cc	(revision 126194)
++++ libffi/testsuite/libffi.special/unwindtest.cc	(working copy)
+@@ -4,7 +4,7 @@
+    PR:		none.
+    Originator:	Jeff Sturm <jsturm@one-point.com>  */
+ 
+-/* { dg-do run { xfail mips64*-*-* arm*-*-* strongarm*-*-* xscale*-*-* } } */
++/* { dg-do run { xfail mips64*-*-* } } */
+ #include "ffitestcxx.h"
+ 
+ void
--- gcj-4.2-4.2-20070707.orig/debian/patches/libjava-sjlj.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/libjava-sjlj.dpatch
@@ -0,0 +1,65 @@
+#! /bin/sh -e
+
+# DP: Don't try to use _Unwind_Backtrace on SJLJ targets.
+# DP: See bug #387875, #388505, GCC PR 29206.
+
+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 -p1 < $0
+        #cd ${dir}gcc && autoconf
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p1 < $0
+        #rm ${dir}gcc/configure
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+---
+ libjava/sysdep/generic/backtrace.h |   17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
+
+Index: src/libjava/sysdep/generic/backtrace.h
+===================================================================
+--- src.orig/libjava/sysdep/generic/backtrace.h	2006-11-06 14:00:32.000000000 -0500
++++ src/libjava/sysdep/generic/backtrace.h	2006-11-06 14:04:38.000000000 -0500
+@@ -13,6 +13,20 @@ details.  */
+ 
+ #include <java-stack.h>
+ 
++#ifdef SJLJ_EXCEPTIONS
++
++#undef _Unwind_GetIPInfo
++#define _Unwind_GetIPInfo(ctx,ip_before_insn) \
++  (abort (), (void) (ctx), *ip_before_insn = 1, 0)
++
++#undef _Unwind_GetRegionStart
++#define _Unwind_GetRegionStart(ctx) \
++  (abort (), (void) (ctx), 0)
++
++#undef _Unwind_Backtrace
++#define _Unwind_Backtrace(trace_fn,state_ptr) \
++  (fallback_backtrace (trace_fn, state_ptr))
++
+ /* Unwind through the call stack calling TRACE_FN with STATE for every stack
+    frame.  Returns the reason why the unwinding was stopped.  */
+ _Unwind_Reason_Code
+@@ -20,4 +34,7 @@ fallback_backtrace (_Unwind_Trace_Fn, _J
+ {
+   return _URC_NO_REASON;
+ }
++
++#endif /* SJLJ_EXCEPTIONS */
++
+ #endif
--- gcj-4.2-4.2-20070707.orig/debian/patches/mudflap-nocheck.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/mudflap-nocheck.dpatch
@@ -0,0 +1,36 @@
+#! /bin/sh -e
+
+# DP: Disable running the libmudflap testsuite. Getting killed on alpha.
+
+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
+
+--- libmudflap/testsuite/Makefile.in~	2005-09-23 18:33:47.000000000 +0200
++++ libmudflap/testsuite/Makefile.in	2006-03-25 20:31:45.044903808 +0100
+@@ -218,6 +218,8 @@
+ 
+ 
+ check-DEJAGNU: site.exp
++	@echo target $@ disabled for Debian build.
++check-DEJAGNU-disabled: site.exp
+ 	srcdir=`$(am__cd) $(srcdir) && pwd`; export srcdir; \
+ 	EXPECT=$(EXPECT); export EXPECT; \
+ 	runtest=$(RUNTEST); \
--- gcj-4.2-4.2-20070707.orig/debian/patches/m68k-secondary-addr-reload.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/m68k-secondary-addr-reload.dpatch
@@ -0,0 +1,96 @@
+#! /bin/sh -e
+
+# All lines beginning with `# DPATCH:' are a description of the patch.
+# DP: add secondary reloads to allow reload to get byte values into addr regs
+
+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 -p1 < $0
+        #cd ${dir}gcc && autoconf
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p1 < $0
+        #rm ${dir}gcc/configure
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+---
+ gcc/config/m68k/m68k.c  |    5 +----
+ gcc/config/m68k/m68k.h  |    6 ++++++
+ gcc/config/m68k/m68k.md |   16 ++++++++++++++++
+ 3 files changed, 23 insertions(+), 4 deletions(-)
+
+Index: gcc-4.1/gcc/config/m68k/m68k.c
+===================================================================
+--- gcc-4.1.orig/gcc/config/m68k/m68k.c
++++ gcc-4.1/gcc/config/m68k/m68k.c
+@@ -3625,10 +3625,7 @@ m68k_regno_mode_ok (int regno, enum mach
+     }
+   else if (regno < 16)
+     {
+-      /* Address Registers, can't hold bytes, can hold aggregate if
+-	 fits in.  */
+-      if (GET_MODE_SIZE (mode) == 1)
+-	return false;
++      /* Address Registers, can hold aggregate if fits in.  */
+       if (regno + GET_MODE_SIZE (mode) / 4 <= 16)
+ 	return true;
+     }
+Index: gcc-4.1/gcc/config/m68k/m68k.h
+===================================================================
+--- gcc-4.1.orig/gcc/config/m68k/m68k.h
++++ gcc-4.1/gcc/config/m68k/m68k.h
+@@ -437,6 +437,12 @@ extern enum reg_class regno_reg_class[];
+    ? DATA_REGS					\
+    : (CLASS))
+ 
++/* Reloads of QImode memory subregs into address regs require a
++   secondary reload via a data reg.  */
++#define SECONDARY_RELOAD_CLASS(CLASS, MODE, X) \
++  (((CLASS) == ADDR_REGS && (MODE) == QImode && true_regnum(X) == -1) \
++   ? DATA_REGS : NO_REGS)
++
+ /* On the m68k, this is the size of MODE in words,
+    except in the FP regs, where a single reg is always enough.  */
+ #define CLASS_MAX_NREGS(CLASS, MODE)	\
+Index: gcc-4.1/gcc/config/m68k/m68k.md
+===================================================================
+--- gcc-4.1.orig/gcc/config/m68k/m68k.md
++++ gcc-4.1/gcc/config/m68k/m68k.md
+@@ -762,6 +762,22 @@
+   "!TARGET_COLDFIRE"
+   "")
+ 
++(define_expand "reload_inqi"
++  [(set (match_operand:QI 2 "register_operand" "=&d")
++	(match_operand:QI 1 "general_operand" "g"))
++   (set (match_operand:QI 0 "register_operand" "=a")
++	(match_dup 2))]
++  ""
++  "")
++
++(define_expand "reload_outqi"
++  [(set (match_operand:QI 2 "register_operand" "=&d")
++	(match_operand:QI 1 "register_operand" "=a"))
++   (set (match_operand:QI 0 "general_operand" "g")
++	(match_dup 2))]
++  ""
++  "")
++
+ (define_expand "movsf"
+   [(set (match_operand:SF 0 "nonimmediate_operand" "")
+ 	(match_operand:SF 1 "general_operand" ""))]
+--- gcc/config/m68k/m68k.c~	2007-05-19 08:23:35.000000000 +0200
++++ gcc/config/m68k/m68k.c	2007-05-19 08:30:58.000000000 +0200
--- gcj-4.2-4.2-20070707.orig/debian/patches/gcc-hash-style-both.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/gcc-hash-style-both.dpatch
@@ -0,0 +1,163 @@
+#! /bin/sh -e
+
+# DP: Link using --hash-style=both (alpha, amd64, ia64, i386, powerpc, ppc64, s390, sparc)
+
+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
+
+2006-07-11  Jakub Jelinek  <jakub@redhat.com>
+
+	* config/i386/linux.h (LINK_SPEC): Add --hash-style=both.
+	* config/i386/linux64.h (LINK_SPEC): Likewise.
+	* config/rs6000/sysv4.h (LINK_OS_LINUX_SPEC): Likewise.
+	* config/rs6000/linux64.h (LINK_OS_LINUX_SPEC32,
+	LINK_OS_LINUX_SPEC64): Likewise.
+	* config/s390/linux.h (LINK_SPEC): Likewise.
+	* config/ia64/linux.h (LINK_SPEC): Likewise.
+	* config/sparc/linux.h (LINK_SPEC): Likewise.
+	* config/sparc/linux64.h (LINK_SPEC, LINK_ARCH32_SPEC,
+	LINK_ARCH64_SPEC): Likewise.
+	* config/alpha/linux-elf.h (LINK_SPEC): Likewise.
+
+--- gcc/config/alpha/linux-elf.h.orig	2006-12-11 13:02:43.396229000 +0100
++++ gcc/config/alpha/linux-elf.h	2006-12-11 13:03:10.336229000 +0100
+@@ -40,7 +40,7 @@
+ 
+ #define ELF_DYNAMIC_LINKER	LINUX_DYNAMIC_LINKER
+ 
+-#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax}		\
++#define LINK_SPEC "-m elf64alpha --hash-style=both %{G*} %{relax:-relax}	\
+   %{O*:-O3} %{!O*:-O1}						\
+   %{shared:-shared}						\
+   %{!shared:							\
+--- gcc/config/s390/linux.h.orig	2006-12-11 13:02:43.396229000 +0100
++++ gcc/config/s390/linux.h	2006-12-11 13:03:10.336229000 +0100
+@@ -78,7 +78,7 @@
+ 
+ #undef  LINK_SPEC
+ #define LINK_SPEC \
+-  "%{m31:-m elf_s390}%{m64:-m elf64_s390} \
++  "%{m31:-m elf_s390}%{m64:-m elf64_s390} --hash-style=both \
+    %{shared:-shared} \
+    %{!shared: \
+       %{static:-static} \
+--- gcc/config/sparc/linux.h.orig	2006-12-11 13:02:43.396229000 +0100
++++ gcc/config/sparc/linux.h	2006-12-11 13:03:10.336229000 +0100
+@@ -133,7 +133,7 @@
+ 
+ 
+ #undef  LINK_SPEC
+-#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
++#define LINK_SPEC "-m elf32_sparc --hash-style=both -Y P,/usr/lib %{shared:-shared} \
+   %{!mno-relax:%{!r:-relax}} \
+   %{!shared: \
+     %{!ibcs: \
+--- gcc/config/sparc/linux64.h.orig	2006-12-11 13:02:43.396229000 +0100
++++ gcc/config/sparc/linux64.h	2006-12-11 13:03:10.336229000 +0100
+@@ -167,7 +167,7 @@
+   { "link_arch_default", LINK_ARCH_DEFAULT_SPEC },	  \
+   { "link_arch",	 LINK_ARCH_SPEC },
+ 
+-#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
++#define LINK_ARCH32_SPEC "-m elf32_sparc --hash-style=both -Y P,/usr/lib %{shared:-shared} \
+   %{!shared: \
+     %{!ibcs: \
+       %{!static: \
+@@ -176,7 +176,7 @@
+         %{static:-static}}} \
+ "
+ 
+-#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,/usr/lib64 %{shared:-shared} \
++#define LINK_ARCH64_SPEC "-m elf64_sparc --hash-style=both -Y P,/usr/lib64 %{shared:-shared} \
+   %{!shared: \
+     %{!ibcs: \
+       %{!static: \
+@@ -257,7 +257,7 @@
+ #else /* !SPARC_BI_ARCH */
+ 
+ #undef LINK_SPEC
+-#define LINK_SPEC "-m elf64_sparc -Y P,/usr/lib64 %{shared:-shared} \
++#define LINK_SPEC "-m elf64_sparc --hash-style=both -Y P,/usr/lib64 %{shared:-shared} \
+   %{!shared: \
+     %{!ibcs: \
+       %{!static: \
+--- gcc/config/i386/linux.h.orig	2006-12-11 13:02:43.396229000 +0100
++++ gcc/config/i386/linux.h	2006-12-11 13:03:10.336229000 +0100
+@@ -109,7 +109,7 @@
+   { "dynamic_linker", LINUX_DYNAMIC_LINKER }
+ 
+ #undef	LINK_SPEC
+-#define LINK_SPEC "-m %(link_emulation) %{shared:-shared} \
++#define LINK_SPEC "-m %(link_emulation) --hash-style=both %{shared:-shared} \
+   %{!shared: \
+     %{!ibcs: \
+       %{!static: \
+--- gcc/config/i386/linux64.h.orig	2006-12-11 13:02:43.396229000 +0100
++++ gcc/config/i386/linux64.h	2006-12-11 13:03:51.046229000 +0100
+@@ -53,7 +53,7 @@
+ #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
+ 
+ #undef	LINK_SPEC
+-#define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \
++#define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} --hash-style=both \
+   %{shared:-shared} \
+   %{!shared: \
+     %{!static: \
+--- gcc/config/ia64/linux.h.orig	2006-12-11 13:02:43.406229000 +0100
++++ gcc/config/ia64/linux.h	2006-12-11 13:03:10.346229000 +0100
+@@ -40,7 +40,7 @@
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
+ 
+ #undef LINK_SPEC
+-#define LINK_SPEC "\
++#define LINK_SPEC "--hash-style=both \
+   %{shared:-shared} \
+   %{!shared: \
+     %{!static: \
+--- gcc/config/rs6000/sysv4.h.orig	2006-12-11 13:02:43.406229000 +0100
++++ gcc/config/rs6000/sysv4.h	2006-12-11 13:03:10.346229000 +0100
+@@ -908,7 +908,7 @@
+ #define LINUX_DYNAMIC_LINKER \
+   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
+ 
+-#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
++#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \
+   %{rdynamic:-export-dynamic} \
+   %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER "}}}"
+ 
+--- gcc/config/rs6000/linux64.h.orig	2006-12-11 13:02:43.406229000 +0100
++++ gcc/config/rs6000/linux64.h	2006-12-11 13:03:10.346229000 +0100
+@@ -351,11 +351,11 @@
+   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64)
+ 
+ 
+-#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \
++#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \
+   %{rdynamic:-export-dynamic} \
+   %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER32 "}}}"
+ 
+-#define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \
++#define LINK_OS_LINUX_SPEC64 "-m elf64ppc --hash-style=both %{!shared: %{!static: \
+   %{rdynamic:-export-dynamic} \
+   %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER64 "}}}"
+ 
--- gcj-4.2-4.2-20070707.orig/debian/patches/ada-gnatvsn.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/ada-gnatvsn.dpatch
@@ -0,0 +1,57 @@
+#! /bin/sh -e
+
+# DP: proposed patch for PR ada/27194.
+
+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
+
+--- orig/gnatvsn.ads	2005-11-15 14:59:02.000000000 +0100
++++ gcc/ada/gnatvsn.ads	2006-04-18 10:00:37.010002000 +0200
+@@ -67,7 +67,7 @@
+    --    GAP
+    --       GNAT Academic Program, similar to Public.
+ 
+-   Ver_Len_Max : constant := 32;
++   Ver_Len_Max : constant := 64;
+    --  Longest possible length for Gnat_Version_String in this or any
+    --  other version of GNAT. This is used by the binder to establish
+    --  space to store any possible version string value for checks. This
+--- orig/gnatvsn.adb	2005-07-01 03:29:17.000000000 +0200
++++ gcc/ada/gnatvsn.adb	2006-04-18 10:00:05.100002000 +0200
+@@ -54,12 +54,13 @@
+    -------------------------
+ 
+    function Gnat_Version_String return String is
+-      NUL_Pos : Positive := 1;
++      NUL_Pos : Positive := Version_String'Last;
+    begin
+-      loop
+-         exit when Version_String (NUL_Pos) = ASCII.NUL;
+-
+-         NUL_Pos := NUL_Pos + 1;
++      for J in Version_String'Range loop
++         if Version_String (J) = ASCII.NUL then
++            NUL_Pos := J;
++            exit;
++         end if;
+       end loop;
+ 
+       return Version_String (1 .. NUL_Pos - 1);
--- gcj-4.2-4.2-20070707.orig/debian/patches/gcc-ssp-default.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/gcc-ssp-default.dpatch
@@ -0,0 +1,208 @@
+#! /bin/sh -e
+
+# DP: Turn on -fstack-protector by default for C, C++, ObjC, ObjC++.
+# DP: Build libgcc using -fno-stack-protector.
+
+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/doc/invoke.texi.orig	2006-12-11 13:38:29.266229000 +0100
++++ gcc/doc/invoke.texi	2006-12-11 13:38:54.066229000 +0100
+@@ -5829,6 +5829,9 @@
+ when a function is entered and then checked when the function exits.
+ If a guard check fails, an error message is printed and the program exits.
+ 
++NOTE: In Ubuntu 6.10 and 7.04 this option is enabled by default
++for C, C++, ObjC, ObjC++.
++
+ @item -fstack-protector-all
+ Like @option{-fstack-protector} except that all functions are protected.
+ 
+--- gcc/objc/lang-specs.h.orig	2006-12-11 13:38:28.986229000 +0100
++++ gcc/objc/lang-specs.h	2006-12-11 13:38:54.046229000 +0100
+@@ -30,13 +30,13 @@
+ 	%{traditional|ftraditional|traditional-cpp:\
+ %eGNU Objective C no longer supports traditional compilation}\
+ 	%{save-temps|no-integrated-cpp:cc1obj -E %(cpp_options) -o %{save-temps:%b.mi} %{!save-temps:%g.mi} \n\
+-	    cc1obj -fpreprocessed %{save-temps:%b.mi} %{!save-temps:%g.mi} %(cc1_options) %{print-objc-runtime-info} %{gen-decls}}\
++	    cc1obj -fpreprocessed %{save-temps:%b.mi} %{!save-temps:%g.mi} %(cc1_options) %(ssp_default) %{print-objc-runtime-info} %{gen-decls}}\
+ 	%{!save-temps:%{!no-integrated-cpp:\
+-	    cc1obj %(cpp_unique_options) %(cc1_options) %{print-objc-runtime-info} %{gen-decls}}}\
++	    cc1obj %(cpp_unique_options) %(cc1_options) %(ssp_default) %{print-objc-runtime-info} %{gen-decls}}}\
+         %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
+   {".mi", "@objc-cpp-output", 0, 0, 0},
+   {"@objc-cpp-output",
+-     "%{!M:%{!MM:%{!E:cc1obj -fpreprocessed %i %(cc1_options) %{print-objc-runtime-info} %{gen-decls}\
++     "%{!M:%{!MM:%{!E:cc1obj -fpreprocessed %i %(cc1_options) %(ssp_default) %{print-objc-runtime-info} %{gen-decls}\
+ 			     %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
+   {"@objective-c-header",
+      "%{E|M|MM:cc1obj -E %{traditional|ftraditional|traditional-cpp:-traditional-cpp}\
+@@ -45,10 +45,10 @@
+ 	%{traditional|ftraditional|traditional-cpp:\
+ %eGNU Objective C no longer supports traditional compilation}\
+ 	%{save-temps|no-integrated-cpp:cc1obj -E %(cpp_options) -o %{save-temps:%b.mi} %{!save-temps:%g.mi} \n\
+-	    cc1obj -fpreprocessed %b.mi %(cc1_options) %{print-objc-runtime-info} %{gen-decls}\
++	    cc1obj -fpreprocessed %b.mi %(cc1_options) %(ssp_default) %{print-objc-runtime-info} %{gen-decls}\
+                         -o %g.s %{!o*:--output-pch=%i.gch}\
+                         %W{o*:--output-pch=%*}%V}\
+ 	%{!save-temps:%{!no-integrated-cpp:\
+-	    cc1obj %(cpp_unique_options) %(cc1_options) %{print-objc-runtime-info} %{gen-decls}\
++	    cc1obj %(cpp_unique_options) %(cc1_options) %(ssp_default) %{print-objc-runtime-info} %{gen-decls}\
+                         -o %g.s %{!o*:--output-pch=%i.gch}\
+                         %W{o*:--output-pch=%*}%V}}}}}", 0, 0, 0},
+--- gcc/objcp/lang-specs.h.orig	2006-12-11 13:38:29.046229000 +0100
++++ gcc/objcp/lang-specs.h	2006-12-11 13:38:54.046229000 +0100
+@@ -36,7 +36,7 @@
+ 		%(cpp_options) %2 -o %{save-temps:%b.mii} %{!save-temps:%g.mii} \n}\
+       cc1objplus %{save-temps|no-integrated-cpp:-fpreprocessed %{save-temps:%b.mii} %{!save-temps:%g.mii}}\
+ 	      %{!save-temps:%{!no-integrated-cpp:%(cpp_unique_options)}}\
+-	%(cc1_options) %2 %{+e1*}\
++	%(cc1_options) %(ssp_default) %2 %{+e1*}\
+         -o %g.s %{!o*:--output-pch=%i.gch} %W{o*:--output-pch=%*}%V}}}",
+      CPLUSPLUS_CPP_SPEC, 0, 0},
+   {"@objective-c++",
+@@ -46,15 +46,15 @@
+ 		%(cpp_options) %2 -o %{save-temps:%b.mii} %{!save-temps:%g.mii} \n}\
+       cc1objplus %{save-temps|no-integrated-cpp:-fpreprocessed %{save-temps:%b.mii} %{!save-temps:%g.mii}}\
+ 	      %{!save-temps:%{!no-integrated-cpp:%(cpp_unique_options)}}\
+-	%(cc1_options) %2 %{+e1*}\
++	%(cc1_options) %(ssp_default) %2 %{+e1*}\
+        %{!fsyntax-only:%(invoke_as)}}}}",
+      CPLUSPLUS_CPP_SPEC, 0, 0},
+   {".mii", "@objective-c++-cpp-output", 0, 0, 0},
+   {"@objective-c++-cpp-output",
+    "%{!M:%{!MM:%{!E:\
+-    cc1objplus -fpreprocessed %i %(cc1_options) %2 %{+e*}\
++    cc1objplus -fpreprocessed %i %(cc1_options) %(ssp_default) %2 %{+e*}\
+     %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
+   {"@objc++-cpp-output",
+    "%{!M:%{!MM:%{!E:\
+-    cc1objplus -fpreprocessed %i %(cc1_options) %2 %{+e*}\
++    cc1objplus -fpreprocessed %i %(cc1_options) %(ssp_default) %2 %{+e*}\
+     %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
+--- gcc/cp/lang-specs.h.orig	2006-12-11 13:38:28.986229000 +0100
++++ gcc/cp/lang-specs.h	2006-12-11 13:39:40.806229000 +0100
+@@ -42,7 +42,7 @@
+ 		%(cpp_options) %2 -o %{save-temps:%b.ii} %{!save-temps:%g.ii} \n}\
+       cc1plus %{save-temps|no-integrated-cpp:-fpreprocessed %{save-temps:%b.ii} %{!save-temps:%g.ii}}\
+ 	      %{!save-temps:%{!no-integrated-cpp:%(cpp_unique_options)}}\
+-	%(cc1_options) %2 %{+e1*}\
++	%(cc1_options) %(ssp_default) %2 %{+e1*}\
+ 	%{!fsyntax-only:-o %g.s %{!o*:--output-pch=%i.gch} %W{o*:--output-pch=%*}%V}}}}",
+      CPLUSPLUS_CPP_SPEC, 0, 0},
+   {"@c++",
+@@ -52,11 +52,11 @@
+ 		%(cpp_options) %2 -o %{save-temps:%b.ii} %{!save-temps:%g.ii} \n}\
+       cc1plus %{save-temps|no-integrated-cpp:-fpreprocessed %{save-temps:%b.ii} %{!save-temps:%g.ii}}\
+ 	      %{!save-temps:%{!no-integrated-cpp:%(cpp_unique_options)}}\
+-	%(cc1_options) %2 %{+e1*}\
++	%(cc1_options) %(ssp_default) %2 %{+e1*}\
+        %{!fsyntax-only:%(invoke_as)}}}}",
+      CPLUSPLUS_CPP_SPEC, 0, 0},
+   {".ii", "@c++-cpp-output", 0, 0, 0},
+   {"@c++-cpp-output",
+    "%{!M:%{!MM:%{!E:\
+-    cc1plus -fpreprocessed %i %(cc1_options) %2 %{+e*}\
++    cc1plus -fpreprocessed %i %(cc1_options) %(ssp_default) %2 %{+e*}\
+     %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
+--- gcc/Makefile.in.orig	2006-12-11 13:38:29.076229000 +0100
++++ gcc/Makefile.in	2006-12-11 13:40:11.316229000 +0100
+@@ -555,6 +555,7 @@
+ LIBGCC2_CFLAGS = -O2 $(LIBGCC2_INCLUDES) $(GCC_CFLAGS) $(TARGET_LIBGCC2_CFLAGS) \
+ 		 $(LIBGCC2_DEBUG_CFLAGS) $(GTHREAD_FLAGS) \
+ 		 -DIN_LIBGCC2 -D__GCC_FLOAT_NOT_NEEDED \
++		 -fno-stack-protector \
+ 		 $(INHIBIT_LIBC_CFLAGS)
+ 
+ # Additional options to use when compiling libgcc2.a.
+@@ -568,6 +569,7 @@
+ CRTSTUFF_CFLAGS = -O2 $(GCC_CFLAGS) $(INCLUDES) $(MULTILIB_CFLAGS) -g0 \
+   -finhibit-size-directive -fno-inline-functions -fno-exceptions \
+   -fno-zero-initialized-in-bss -fno-toplevel-reorder \
++  -fno-stack-protector \
+   $(INHIBIT_LIBC_CFLAGS)
+ 
+ # Additional sources to handle exceptions; overridden by targets as needed.
+--- gcc/gcc.c.orig	2006-12-11 13:38:29.166229000 +0100
++++ gcc/gcc.c	2006-12-11 13:38:54.056229000 +0100
+@@ -682,6 +682,10 @@
+ #endif
+ #endif
+ 
++#ifndef SSP_DEFAULT_SPEC
++#define SSP_DEFAULT_SPEC "%{!fno-stack-protector:-fstack-protector}"
++#endif
++
+ #ifndef LINK_PIE_SPEC
+ #ifdef HAVE_LD_PIE
+ #define LINK_PIE_SPEC "%{pie:-pie} "
+@@ -735,6 +739,7 @@
+ static const char *cc1plus_spec = CC1PLUS_SPEC;
+ static const char *link_gcc_c_sequence_spec = LINK_GCC_C_SEQUENCE_SPEC;
+ static const char *link_ssp_spec = LINK_SSP_SPEC;
++static const char *ssp_default_spec = SSP_DEFAULT_SPEC;
+ static const char *asm_spec = ASM_SPEC;
+ static const char *asm_final_spec = ASM_FINAL_SPEC;
+ static const char *link_spec = LINK_SPEC;
+@@ -806,6 +811,7 @@
+  %{--target-help:--target-help}\
+  %{!fsyntax-only:%{S:%W{o*}%{!o*:-o %b.s}}}\
+  %{fsyntax-only:-o %j} %{-param*}\
++ %(ssp_default)\
+  %{fmudflap|fmudflapth:-fno-builtin -fno-merge-constants}\
+  %{coverage:-fprofile-arcs -ftest-coverage}";
+ 
+@@ -961,15 +967,15 @@
+ 	  %{save-temps|traditional-cpp|no-integrated-cpp:%(trad_capable_cpp) \
+ 		%(cpp_options) -o %{save-temps:%b.i} %{!save-temps:%g.i} \n\
+ 		    cc1 -fpreprocessed %{save-temps:%b.i} %{!save-temps:%g.i} \
+-			%(cc1_options)}\
++			%(cc1_options) %(ssp_default)}\
+ 	  %{!save-temps:%{!traditional-cpp:%{!no-integrated-cpp:\
+-		cc1 %(cpp_unique_options) %(cc1_options)}}}\
++		cc1 %(cpp_unique_options) %(cc1_options) %(ssp_default)}}}\
+           %{!fsyntax-only:%(invoke_as)}} \
+       %{combine:\
+ 	  %{save-temps|traditional-cpp|no-integrated-cpp:%(trad_capable_cpp) \
+ 		%(cpp_options) -o %{save-temps:%b.i} %{!save-temps:%g.i}}\
+ 	  %{!save-temps:%{!traditional-cpp:%{!no-integrated-cpp:\
+-		cc1 %(cpp_unique_options) %(cc1_options)}}\
++		cc1 %(cpp_unique_options) %(cc1_options) %(ssp_default)}}\
+                 %{!fsyntax-only:%(invoke_as)}}}}}}", 0, 1, 1},
+   {"-",
+    "%{!E:%e-E or -x required when input is from standard input}\
+@@ -992,7 +998,7 @@
+                     %W{o*:--output-pch=%*}%V}}}}}}", 0, 0, 0},
+   {".i", "@cpp-output", 0, 1, 0},
+   {"@cpp-output",
+-   "%{!M:%{!MM:%{!E:cc1 -fpreprocessed %i %(cc1_options) %{!fsyntax-only:%(invoke_as)}}}}", 0, 1, 0},
++   "%{!M:%{!MM:%{!E:cc1 -fpreprocessed %i %(cc1_options) %(ssp_default) %{!fsyntax-only:%(invoke_as)}}}}", 0, 1, 0},
+   {".s", "@assembler", 0, 1, 0},
+   {"@assembler",
+    "%{!M:%{!MM:%{!E:%{!S:as %(asm_debug) %(asm_options) %i %A }}}}", 0, 1, 0},
+@@ -1542,6 +1548,7 @@
+   INIT_STATIC_SPEC ("cc1plus",			&cc1plus_spec),
+   INIT_STATIC_SPEC ("link_gcc_c_sequence",	&link_gcc_c_sequence_spec),
+   INIT_STATIC_SPEC ("link_ssp",			&link_ssp_spec),
++  INIT_STATIC_SPEC ("ssp_default",		&ssp_default_spec),
+   INIT_STATIC_SPEC ("endfile",			&endfile_spec),
+   INIT_STATIC_SPEC ("link",			&link_spec),
+   INIT_STATIC_SPEC ("lib",			&lib_spec),
--- gcj-4.2-4.2-20070707.orig/debian/patches/ppc64-biarch.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/ppc64-biarch.dpatch
@@ -0,0 +1,118 @@
+#! /bin/sh -e
+ 
+# DP: biarch patches for ppc64
+ 
+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 -p1 < $0
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p1 < $0
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+
+diff -urN tmp/gcc/config/rs6000/t-linux64 src/gcc/config/rs6000/t-linux64
+--- tmp/gcc/config/rs6000/t-linux64	2004-12-04 08:05:46.000000000 +0000
++++ src/gcc/config/rs6000/t-linux64	2004-12-04 08:07:52.180889736 +0000
+@@ -8,13 +8,10 @@
+ 
+ SHLIB_MAPFILES += $(srcdir)/config/rs6000/libgcc-ppc64.ver
+ 
+-MULTILIB_OPTIONS        = m64/m32 msoft-float
+-MULTILIB_DIRNAMES       = 64 32 nof
++MULTILIB_OPTIONS        = m64/m32
++MULTILIB_DIRNAMES       = 64 32
+ MULTILIB_EXTRA_OPTS     = fPIC mstrict-align
+-MULTILIB_EXCEPTIONS     = m64/msoft-float
+-MULTILIB_EXCLUSIONS     = m64/!m32/msoft-float
+-MULTILIB_OSDIRNAMES	= ../lib64 ../lib nof
++MULTILIB_OSDIRNAMES	= ../lib ../lib32
+-MULTILIB_MATCHES        = $(MULTILIB_MATCHES_FLOAT)
+ 
+ # We want fine grained libraries, so use the new code to build the
+ # floating point emulation libraries.
+diff -urN tmp/libjava/configure.host src/libjava/configure.host
+--- tmp/libjava/configure.host	25 Nov 2004 03:46:56 -0000
++++ src/libjava/configure.host	15 Dec 2004 15:45:22 -0000
+@@ -123,10 +123,13 @@
+   powerpc64*-*)
+ 	sysdeps_dir=powerpc
+ 	libgcj_interpreter=yes
+-	if [ x`$CC -print-multi-os-directory` = x../lib64 ]; then
++	touch f-test.c
++	$CC -c f-test.c -o f-test.o
++	if [ "x`file f-test.o | grep 32-bit`" = "x" ]; then
+ 	    libgcj_flags="${libgcj_flags} -mminimal-toc"
+	fi
+ 	enable_hash_synchronization_default=yes
+ 	slow_pthread_self=yes
++	rm f-test.c f-test.o
+ 	;;
+   powerpc*-*)
+diff -urN tmp/config-ml.in src/config-ml.in
+--- tmp/config-ml.in	2004-11-09 08:07:29.000000000 +0000
++++ src/config-ml.in	2004-12-12 07:12:44.631147816 +0000
+@@ -400,7 +400,49 @@
+ 	  ;;
+ 	esac
+ 	;;
+-powerpc*-*-* | rs6000*-*-*)
++powerpc64-*-*)
++ 	case " $multidirs " in
++ 	*" 32 "*)
++ 	  # We will not be able to create libraries with -m32 if
++ 	  # we cannot even link a trivial program.  It usually
++ 	  # indicates the 32bit libraries are missing.
++ 	  if echo 'main() {}' > conftest.c &&
++ 	     ${CC-gcc} -m32 conftest.c -o conftest; then
++ 	   echo Enable only libstdc++.
++ 	   old_multidirs="${multidirs}"
++ 	   multidirs=""
++ 	   for x in ${old_multidirs}; do
++ 	     case "$x" in
++ 	     *32* ) case ${ml_realsrcdir} in
++ 	               *"libstdc++-v3" ) multidirs="${multidirs} ${x}" ;;
++ 	               *"libgfortran" ) multidirs="${multidirs} ${x}" ;;
++ 	               *"libffi" ) multidirs="${multidirs} ${x}" ;;
++ 	               *"libssp" ) multidirs="${multidirs} ${x}" ;;
++ 	               *"libobjc" ) multidirs="${multidirs} ${x}" ;;
++ 	               *"libiberty" ) multidirs="${multidirs} ${x}" ;;
++ 	               *"zlib" ) multidirs="${multidirs} ${x}" ;;
++ 	               *) : ;;
++ 	            esac 
++ 	            ;;
++ 	     *) multidirs="${multidirs} ${x}" ;;
++ 	     esac
++ 	   done
++ 	  else
++ 	    echo Could not link program with -m32, disabling it.
++ 	    old_multidirs="${multidirs}"
++ 	    multidirs=""
++ 	    for x in ${old_multidirs}; do
++ 	      case "$x" in
++ 	      *m32* ) : ;;
++ 	      *) multidirs="${multidirs} ${x}" ;;
++ 	      esac
++ 	    done
++ 	  fi
++ 	  rm -f conftest.c conftest
++ 	  ;;
++ 	esac
++ 	;;
++powerpc-*-* | rs6000*-*-*)
+ 	if [ x$enable_aix64 = xno ]
+ 	then
+ 	  old_multidirs="${multidirs}"
--- gcj-4.2-4.2-20070707.orig/debian/patches/m68k-prevent-swap.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/m68k-prevent-swap.dpatch
@@ -0,0 +1,45 @@
+#! /bin/sh -e
+
+# All lines beginning with `# DPATCH:' are a description of the patch.
+# DP: don't swap operands during reloads
+
+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 -p1 < $0
+        #cd ${dir}gcc && autoconf
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p1 < $0
+        #rm ${dir}gcc/configure
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+---
+
+ gcc/recog.c             |    1 +
+ 1 files changed, 1 insertions(+)
+
+Index: gcc-4.1/gcc/recog.c
+===================================================================
+--- gcc-4.1.orig/gcc/recog.c
++++ gcc-4.1/gcc/recog.c
+@@ -569,6 +569,7 @@ validate_replace_rtx_1 (rtx *loc, rtx fr
+      simplifications, as it is not our job.  */
+ 
+   if (SWAPPABLE_OPERANDS_P (x)
++      && !reload_in_progress
+       && swap_commutative_operands_p (XEXP (x, 0), XEXP (x, 1)))
+     {
+       validate_change (object, loc,
--- gcj-4.2-4.2-20070707.orig/debian/patches/gpc-4.1.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/gpc-4.1.dpatch
@@ -0,0 +1,3369 @@
+#! /bin/sh -e
+
+# DP: GPC updates for GCC 4.1 (4.1-4)
+
+dir=gcc/
+if [ $# -eq 3 -a "$2" = '-d' ]; then
+    pdir="-d $3/gcc"
+    dir="$3/gcc/"
+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 -p1 < $0
+        #cd ${dir}gcc && autoconf
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p1 < $0
+        #rm ${dir}gcc/configure
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+Only in gpc/p: .#Make-lang.in.1.7
+Only in gpc/p: .#declarations.c.1.14
+Only in gpc/p: .#expressions.c.1.10
+Only in gpc/p: .#gbe.h.1.4
+Only in gpc/p: .#gpc-lex.c.1.9
+Only in gpc/p: .#gpc.h.1.13
+Only in gpc/p: .#gpcpp.c.1.8
+Only in gpc/p: .#lang.c.1.15
+Only in gpc/p: .#module.c.1.10
+Only in gpc/p: .#objects.c.1.12
+Only in gpc/p: .#options.c.1.9
+Only in gpc/p: .#p-tree.def.1.6
+Only in gpc/p: .#parse.y.1.14
+Only in gpc/p: .#predef.c.1.15
+Only in gpc/p: .#statements.c.1.9
+Only in gpc/p: .#typecheck.c.1.10
+Only in gpc/p: .#types.c.1.17
+Common subdirectories: /pom/kompi/gcc/tst45/pom/gpc-20060325/p/CVS and gpc/p/CVS
+diff -u /pom/kompi/gcc/tst45/pom/gpc-20060325/p/ChangeLog gpc/p/ChangeLog
+--- /pom/kompi/gcc/tst45/pom/gpc-20060325/p/ChangeLog	2006-03-24 02:47:15.000000000 +0100
++++ gpc/p/ChangeLog	2006-04-06 02:11:56.000000000 +0200
+@@ -1,5 +1,16 @@
+ ChangeLog -- Edit History for GPC, the GNU Pascal Compiler, since version 2.1
+ =============================================================================
++2006-03-24  Waldek Hebisch  <hebisch@math.uni.wroc.pl>
++
++        * Make-lang.in, config-lang.in, declarations.c, expressions.c,
++          gbe.h, gpc-lex.c, gpc.c, gpc.h, lang.c, module.c, objects.c,
++          options.c, opts.sum, p-tree.def, parse.y, pascal-lex.l,
++          predef.c, statements.c, typecheck.c, types.c, utils/Makefile
++          utils/gpidump.pas, utils/mk-t-inc: adapted to gcc-4.0,
++          schema changed to use placeholders
++          plant.c, plant.h, diffs/gcc-4.0.2.diff, diffs/gcc-4.0.3.diff:
++          new files
++ 
+ 2006-03-09  Waldek Hebisch  <hebisch@math.uni.wroc.pl>
+ 
+         * predef.c: build_predef_call (): handle named exit from a method
+diff -u /pom/kompi/gcc/tst45/pom/gpc-20060325/p/FAQ gpc/p/FAQ
+--- /pom/kompi/gcc/tst45/pom/gpc-20060325/p/FAQ	2006-02-18 14:37:53.000000000 +0100
++++ gpc/p/FAQ	2006-04-04 19:39:50.000000000 +0200
+@@ -62,7 +62,7 @@
+ What is the current version?
+ ============================
+ 
+-The current version is 20060215.
++The current version is 20060325.
+ 
+    Releases are available as a source archive and precompiled binaries
+ for several common platforms from the GPC web site,
+diff -u /pom/kompi/gcc/tst45/pom/gpc-20060325/p/Make-lang.in gpc/p/Make-lang.in
+--- /pom/kompi/gcc/tst45/pom/gpc-20060325/p/Make-lang.in	2006-03-25 04:33:50.000000000 +0100
++++ gpc/p/Make-lang.in	2006-04-06 02:11:56.000000000 +0200
+@@ -56,6 +56,7 @@
+ # `40' for gcc-4.x
+ GPC_GCC_2_=2
+ GPC_GCC_28_=8
++GPC_GCC_28_PPQ=$(GPC_GCC_28_$(gcc_version)$(BACKEND)
+ GPC_GCC_34_PPQ_=foo
+ GPC_GCC_34_PPP=$(GPC_GCC_34_PPQ_$(target_noncanonical))
+ GPC_GCC_34_PP_=34
+@@ -65,7 +66,7 @@
+ GPC_GCC_40_PP_=40
+ GPC_GCC_40_PP_fallback_to_34=$(GPC_GCC_34_)
+ GPC_GCC_40_=$(GPC_GCC_40_PP_$(GPC_GCC_40_PPP))
+-GCC_VERSION_FOR_GPC=$(GPC_GCC_2_$(BACKEND))$(GPC_GCC_28_$(gcc_version))
++GCC_VERSION_FOR_GPC=$(GPC_GCC_2_$(BACKEND))$(GPC_GCC_28_PPQ)
+ GCC_VERSION_FOR_GPC34=$(GCC_VERSION_FOR_GPC)$(GPC_GCC_34_)
+ GCC_VERSION_FOR_GPC40=$(GCC_VERSION_FOR_GPC)$(GPC_GCC_40_)
+ GPC_GCC_VERSION_28=$(version)
+@@ -733,7 +734,9 @@
+ 	$(CC) -o $@ -c $(ALL_GPC_GBE_FLAGS) $<
+ 
+ p/version.o: version.c $(GPC_BE_H)
+-	$(CC) -o $@ -c $(ALL_GPC_GBE_FLAGS) $<
++	$(CC) -o $@ -c $(ALL_GPC_GBE_FLAGS) \
++	 -DBASEVER=$(BASEVER_s) -DDATESTAMP=$(DATESTAMP_s) \
++	 -DDEVPHASE=$(DEVPHASE_s) $<
+ 
+ $(srcdir)/p/pascal-lex.c: $(srcdir)/p/pascal-lex.l
+ 	if $(GPC_LEX) --version | grep -q '2\.5\.4'; then \
+diff -u /pom/kompi/gcc/tst45/pom/gpc-20060325/p/Make-lang.in~ gpc/p/Make-lang.in~
+--- /pom/kompi/gcc/tst45/pom/gpc-20060325/p/Make-lang.in~	2006-03-25 01:43:44.000000000 +0100
++++ gpc/p/Make-lang.in~	2006-04-04 18:40:42.000000000 +0200
+@@ -631,7 +631,7 @@
+ 	 s: version.o::g;' "$<" > "$@" || { rm -f "$@"; false; }
+ 
+ gpc1$(exeext): $(P) $(GPC_GCC_VERSION_DEPS) $(GPC_OBJS) $(LIBDEPS)
+-	@grep "@@ PATCHED FOR GPC 20051114 @@" $(srcdir)/stor-layout.c > /dev/null || \
++	@grep "@@ PATCHED FOR GPC 20060322 @@" $(srcdir)/stor-layout.c > /dev/null || \
+ 	 { echo "*** There have been changes in the patch for GCC. Please start with a fresh"; \
+ 	   echo "*** copy of the GCC sources and do a new build, including configure."; \
+ 	   exit 1; } >&2
+@@ -733,7 +733,9 @@
+ 	$(CC) -o $@ -c $(ALL_GPC_GBE_FLAGS) $<
+ 
+ p/version.o: version.c $(GPC_BE_H)
+-	$(CC) -o $@ -c $(ALL_GPC_GBE_FLAGS) $<
++	$(CC) -o $@ -c $(ALL_GPC_GBE_FLAGS) \
++	 -DBASEVER=$(BASEVER_s) -DDATESTAMP=$(DATESTAMP_s) \
++	 -DDEVPHASE=$(DEVPHASE_s) $<
+ 
+ $(srcdir)/p/pascal-lex.c: $(srcdir)/p/pascal-lex.l
+ 	if $(GPC_LEX) --version | grep -q '2\.5\.4'; then \
+diff -u /pom/kompi/gcc/tst45/pom/gpc-20060325/p/config-lang.in gpc/p/config-lang.in
+--- /pom/kompi/gcc/tst45/pom/gpc-20060325/p/config-lang.in	2006-03-25 03:50:32.000000000 +0100
++++ gpc/p/config-lang.in	2006-04-04 18:44:47.000000000 +0200
+@@ -93,7 +93,7 @@
+           echo "***" >&2
+           echo "*** Press ENTER to continue, Ctrl-C to abort." >&2
+           echo "***" >&2
+-          read junk
++#          read junk
+         fi
+       fi
+     fi
+diff -u /pom/kompi/gcc/tst45/pom/gpc-20060325/p/config-lang.in~ gpc/p/config-lang.in~
+--- /pom/kompi/gcc/tst45/pom/gpc-20060325/p/config-lang.in~	2006-03-25 03:02:46.000000000 +0100
++++ gpc/p/config-lang.in~	2006-04-04 18:25:25.000000000 +0200
+@@ -129,8 +129,11 @@
+ if [ ! -r "$srcdir/p/diffs/gcc-3.4.5.diff" ]; then
+     (cd "$srcdir/p/diffs"; ln -s "gcc-3.4.4.diff" "gcc-3.4.5.diff")
+ fi
++if [ ! -r "$srcdir/p/diffs/gcc-3.4.6.diff" ]; then
++    (cd "$srcdir/p/diffs"; ln -s "gcc-3.4.4.diff" "gcc-3.4.6.diff")
++fi
+ 
+-if grep "@@ PATCHED FOR GPC 20051114 @@" "$srcdir/stor-layout.c" > /dev/null; then
++if grep "@@ PATCHED FOR GPC 20060322 @@" "$srcdir/stor-layout.c" > /dev/null; then
+   :
+ elif grep "@@ PATCHED FOR GPC" "$srcdir/stor-layout.c" > /dev/null; then
+   echo "" >&2
+diff -u /pom/kompi/gcc/tst45/pom/gpc-20060325/p/declarations.c gpc/p/declarations.c
+--- /pom/kompi/gcc/tst45/pom/gpc-20060325/p/declarations.c	2006-03-13 01:33:16.000000000 +0100
++++ gpc/p/declarations.c	2006-04-09 21:55:21.000000000 +0200
+@@ -437,7 +437,11 @@
+   /* Clear out the local identifier meanings of this level. */
+   for (t = decls; t; t = TREE_CHAIN (t))
+     if (DECL_NAME (t))
+-      IDENTIFIER_VALUE (DECL_NAME (t)) = NULL_TREE;
++      {
++        if (DECL_EXTERNAL (t) && TREE_ADDRESSABLE (t))
++          TREE_ADDRESSABLE (DECL_ASSEMBLER_NAME (t)) = 1;
++        IDENTIFIER_VALUE (DECL_NAME (t)) = NULL_TREE;
++      }
+   restore_identifiers (level->shadowed);
+ 
+   /* Not sure if this is a fix or work-around: Remove local external
+@@ -527,7 +531,7 @@
+       if (co->pascal_dialect & C_E_O_PASCAL)
+         error (msg2, IDENTIFIER_NAME (name));
+       else
+-        warning (msg2, IDENTIFIER_NAME (name));
++        gpc_warning (msg2, IDENTIFIER_NAME (name));
+     }
+   check_id_redeclaration (name, msg1);
+ }
+@@ -903,7 +907,7 @@
+             if (TYPE_LANG_CODE_TEST (inner_type, PASCAL_LANG_ABSTRACT_OBJECT))
+               error ("abstract object type declared as value parameter");
+             else if (co->warn_object_assignment)
+-              warning ("object type declared as value parameter");
++              gpc_warning ("object type declared as value parameter");
+           }
+       }
+   for (decl = parms; decl; decl = TREE_CHAIN (decl))
+@@ -988,10 +992,11 @@
+       && TREE_STRING_LENGTH (x) == TREE_STRING_LENGTH (y)
+       && !memcmp (TREE_STRING_POINTER (x), TREE_STRING_POINTER (y), TREE_STRING_LENGTH (x)))
+     return 1;
+-  if (TREE_CODE (x) == CONSTRUCTOR
++  if (TREE_CODE (x) == PASCAL_SET_CONSTRUCTOR
+       && TREE_CODE (TREE_TYPE (x)) == SET_TYPE && TREE_CODE (TREE_TYPE (x)) == SET_TYPE
+       && comptypes (TREE_TYPE (x), TREE_TYPE (y))
+-      && const_set_constructor_binary_op (EQ_EXPR, CONSTRUCTOR_ELTS (x), CONSTRUCTOR_ELTS (y)) == boolean_true_node)
++      && const_set_constructor_binary_op (EQ_EXPR, SET_CONSTRUCTOR_ELTS (x),
++                SET_CONSTRUCTOR_ELTS (y)) == boolean_true_node)
+     return 1;
+ 
+   return 0;
+@@ -1055,7 +1060,7 @@
+     DECL_CONTEXT (x) = NULL_TREE;
+ 
+   if (co->warn_local_external && DECL_EXTERNAL (x) && !DECL_ARTIFICIAL (x) && !pascal_global_bindings_p ())
+-    warning ("local external declaration of `%s'", IDENTIFIER_NAME (name));
++    gpc_warning ("local external declaration of `%s'", IDENTIFIER_NAME (name));
+ 
+   t = lookup_name_current_level (name);
+   /* Overloading an operator is ok. The decl is a dummy placeholder.
+@@ -1126,10 +1131,18 @@
+         }
+ 
+       DECL_UID (x) = DECL_UID (t);
++      gcc_assert (TREE_CODE (x) == FUNCTION_DECL &&
++                  TREE_CODE (t) == FUNCTION_DECL);
++#ifndef GCC_4_1
+       /* Copy decl-specific fields of x into t. */
+       memcpy ((char *) t + sizeof (struct tree_common),
+               (char *) x + sizeof (struct tree_common),
+               sizeof (struct tree_decl) - sizeof (struct tree_common));
++#else
++      memcpy ((char *) t + sizeof (struct tree_common),
++              (char *) x + sizeof (struct tree_common),
++              tree_size (t) - sizeof (struct tree_common));
++#endif
+       return t;
+     }
+ 
+@@ -1173,7 +1186,7 @@
+ 
+   /* Maybe warn if shadowing something else (not for vars made for inlining). */
+   if (!weak && t && warn_shadow && !DECL_FROM_INLINE (x))
+-    warning ("declaration of `%s' shadows an outer declaration", IDENTIFIER_NAME (name));
++    gpc_warning ("declaration of `%s' shadows an outer declaration", IDENTIFIER_NAME (name));
+ 
+   /* Record a shadowed declaration for later restoration. */
+   if (!weak && t)
+@@ -1384,6 +1397,7 @@
+       expand_expr_stmt (build_routine_call (longjmp_routine_node,
+         tree_cons (NULL_TREE, build_unary_op (ADDR_EXPR, DECL_LANG_LABEL_JMPBUF (decl), 0),
+           build_tree_list (NULL_TREE, integer_one_node))));
++      TREE_USED (DECL_LANG_LABEL_JMPBUF (decl)) = 1;
+ #ifndef GCC_3_3
+       /* @@ Work-around: `function_cannot_inline_p' should check `current_function_calls_longjmp'. */
+       current_function_has_nonlocal_goto = 1;
+@@ -1433,9 +1447,9 @@
+ #endif
+         /* Avoid calling `setjmp' for labels that are only used locally */
+         if (DECL_LANG_LABEL_JMPBUF (d) 
+-#ifndef GCC_4_0
++// #ifndef GCC_4_0
+             && TREE_USED (DECL_LANG_LABEL_JMPBUF (d))
+-#endif
++// #endif
+            )
+           {
+             expand_start_cond (build_routine_call (setjmp_routine_node,
+@@ -1580,10 +1594,10 @@
+           location_t loc_aux;
+           loc_aux.file = filename;
+           loc_aux.line = line;
+-          warning ("%Hcapitalisation of identifier `%s' doesn't match", &loc_aux, spelling);
++          gpc_warning ("%Hcapitalisation of identifier `%s' doesn't match", &loc_aux, spelling);
+           loc_aux.file = IDENTIFIER_SPELLING_FILE (id);
+           loc_aux.line = IDENTIFIER_SPELLING_LINENO (id);
+-          warning ("%H previous capitalisation `%s'", &loc_aux, IDENTIFIER_SPELLING (id));
++          gpc_warning ("%H previous capitalisation `%s'", &loc_aux, IDENTIFIER_SPELLING (id));
+ #endif
+         }
+     }
+@@ -2306,7 +2320,7 @@
+       if (co->pascal_dialect & C_E_O_PASCAL)
+         error (msg, IDENTIFIER_NAME (name));
+       else
+-        warning (msg, IDENTIFIER_NAME (name));
++        gpc_warning (msg, IDENTIFIER_NAME (name));
+     }
+ }
+ 
+@@ -2562,7 +2576,7 @@
+         if (TREE_VALUE (*tt))
+           error ("spurious argument to `%s' attribute", IDENTIFIER_NAME (TREE_PURPOSE (*tt)));
+         if (TREE_CODE (TREE_TYPE (t)) == VOID_TYPE)
+-          warning ("`%s' is meaningless for a procedure", IDENTIFIER_NAME (TREE_PURPOSE (*tt)));
++          gpc_warning ("`%s' is meaningless for a procedure", IDENTIFIER_NAME (TREE_PURPOSE (*tt)));
+         else
+           PASCAL_TREE_IGNORABLE (t) = 1;
+         *tt = TREE_CHAIN (*tt);
+@@ -2576,7 +2590,7 @@
+         if (TREE_VALUE (*tt))
+           error ("spurious argument to `%s' attribute", IDENTIFIER_NAME (TREE_PURPOSE (*tt)));
+         if (!last || TREE_CODE (TREE_VALUE (last)) != VOID_TYPE)
+-          warning ("inline declaration ignored for routine with `...'");
++          gpc_warning ("inline declaration ignored for routine with `...'");
+         else if (!flag_no_inline && optimize > 0)
+           /* Assume that otherwise the function can be inlined. */
+           DECL_INLINE (*d) = 1;
+@@ -2646,7 +2660,7 @@
+       }
+     else if (IDENTIFIER_IS_BUILT_IN (TREE_VALUE (dir), p_asmname))
+       {
+-        warning ("`%s' is deprecated; use `external name' or `attribute (name = ...)' instead",
++        gpc_warning ("`%s' is deprecated; use `external name' or `attribute (name = ...)' instead",
+                  IDENTIFIER_NAME (TREE_VALUE (dir)));
+         assembler_name = TREE_PURPOSE (dir);
+         any_dir = 1;
+@@ -2654,7 +2668,7 @@
+     else if (IDENTIFIER_IS_BUILT_IN (TREE_VALUE (dir), p_c)
+              || IDENTIFIER_IS_BUILT_IN (TREE_VALUE (dir), p_c_language))
+       {
+-        warning ("`%s' is deprecated; use `external' instead",
++        gpc_warning ("`%s' is deprecated; use `external' instead",
+                  IDENTIFIER_NAME (TREE_VALUE (dir)));
+         any_dir = c_dir = is_public = 1;
+       }
+@@ -2662,7 +2676,7 @@
+       {
+         is_external = is_public = 1;
+         if (TREE_PURPOSE (dir))
+-          warning ("library name in `external' is ignored");
++          gpc_warning ("library name in `external' is ignored");
+       }
+     else if (IDENTIFIER_IS_BUILT_IN (TREE_VALUE (dir), p_forward))
+       any_dir = is_forward = 1;
+@@ -2675,15 +2689,15 @@
+              || IDENTIFIER_IS_BUILT_IN (TREE_VALUE (dir), p_far))
+       {
+         if (co->warn_near_far)
+-          warning ("`%s' directive ignored because of flat memory model", IDENTIFIER_NAME (TREE_VALUE (dir)));
++          gpc_warning ("`%s' directive ignored because of flat memory model", IDENTIFIER_NAME (TREE_VALUE (dir)));
+       }
+     else
+       error ("unknown directive `%s'", IDENTIFIER_NAME (TREE_VALUE (dir)));
+ 
+   if (is_external && !assembler_name)
+     {
+-      warning ("`external' without `name' has a different default now");
+-      warning (" (This warning will disappear in a future version)");
++      gpc_warning ("`external' without `name' has a different default now");
++      gpc_warning (" (This gpc_warning will disappear in a future version)");
+     }
+ 
+   is_external |= c_dir;
+@@ -3016,7 +3030,7 @@
+         || IDENTIFIER_IS_BUILT_IN (TREE_VALUE (dir), p_far))
+       {
+         if (co->warn_near_far)
+-          warning ("`%s' directive ignored because of flat memory model", IDENTIFIER_NAME (TREE_VALUE (dir)));
++          gpc_warning ("`%s' directive ignored because of flat memory model", IDENTIFIER_NAME (TREE_VALUE (dir)));
+       }
+     else
+       {
+@@ -3301,14 +3315,18 @@
+ #ifndef EGCS97
+   /* So we can tell if jump_optimize sets it to 1. */
+   can_reach_end = 0;
+-#else
+-  ggc_push_context ();
+ #endif
+ 
+-
+-  /* Run the optimizers and output the assembler code for this function. */
+ #ifndef GCC_4_0
++#ifdef EGCS97
++  ggc_push_context ();
++#endif
++  /* Run the optimizers and output the assembler code for this function. */
+   rest_of_compilation (fndecl);
++
++#ifdef EGCS97
++  ggc_pop_context ();
++#endif
+ #endif
+ 
+   if (DECL_LANG_RESULT_VARIABLE (fndecl))
+@@ -3316,11 +3334,9 @@
+ 
+ #ifndef EGCS97
+   if (TREE_THIS_VOLATILE (fndecl) && can_reach_end)
+-    warning ("routine declared `noreturn' returns");
++    gpc_warning ("routine declared `noreturn' returns");
+   if (!outer_function_chain)
+     permanent_allocation (1);
+-#else
+-  ggc_pop_context ();
+ #endif
+ 
+ #ifndef GCC_4_0
+@@ -3581,7 +3597,8 @@
+   if (!EM (TREE_TYPE (element))
+       && TREE_CODE (element) != VAR_DECL
+       && TREE_CODE (element) != PARM_DECL
+-      && TREE_CODE (element) != CONSTRUCTOR)
++      && TREE_CODE (element) != CONSTRUCTOR
++/*      && TREE_CODE (element) != PASCAL_SET_CONSTRUCTOR */)
+     {
+       tree elem_type = TREE_TYPE (element), rec_addr;
+       if (TREE_READONLY (element))
+@@ -3700,13 +3717,13 @@
+         {
+           qualifiers |= VQ_EXTERNAL;
+           if (arg)
+-            warning ("library name in `external' is ignored");
++            gpc_warning ("library name in `external' is ignored");
+         }
+       else if (arg && IDENTIFIER_IS_BUILT_IN (id, p_name))
+         assembler_name = arg;
+       else if (arg && IDENTIFIER_IS_BUILT_IN (id, p_asmname))
+         {
+-          warning ("`%s' is deprecated; use `external name' or `attribute (name = ...)' instead",
++          gpc_warning ("`%s' is deprecated; use `external name' or `attribute (name = ...)' instead",
+                    IDENTIFIER_NAME (id));
+           assembler_name = arg;
+         }
+@@ -3720,8 +3737,8 @@
+ 
+   if ((qualifiers & VQ_EXTERNAL) && !(qualifiers & VQ_IMPLICIT) && !assembler_name)
+     {
+-      warning ("`external' without `name' has a different default now");
+-      warning (" (This warning will disappear in a future version.)");
++      gpc_warning ("`external' without `name' has a different default now");
++      gpc_warning (" (This gpc_warning will disappear in a future version.)");
+     }
+ 
+   if (init && PASCAL_ABSOLUTE_CLAUSE (init))
+@@ -3744,7 +3761,7 @@
+               return NULL_TREE;
+             }
+           if (co->warn_absolute)
+-            warning ("variables at absolute adresses may cause problems");
++            gpc_warning ("variables at absolute adresses may cause problems");
+         }
+       else
+         {
+@@ -3756,7 +3773,7 @@
+               && TREE_CODE (TREE_TYPE (init)) != VOID_TYPE
+               && TREE_CODE (TREE_TYPE (init)) != FUNCTION_TYPE
+               && TYPE_ALIGN (type) > TYPE_ALIGN (TREE_TYPE (init)))
+-            warning ("`absolute' declaration increases required alignment");
++            gpc_warning ("`absolute' declaration increases required alignment");
+           while (TREE_CODE (init) == NOP_EXPR
+                  || TREE_CODE (init) == NON_LVALUE_EXPR
+                  || TREE_CODE (init) == CONVERT_EXPR
+@@ -3770,7 +3787,7 @@
+                    || (indirect == 0 && TREE_CODE (init) == PARM_DECL)
+                    || (indirect == 1 && TREE_CODE (init) == PARM_DECL
+                        && TREE_CODE (TREE_TYPE (init)) == REFERENCE_TYPE)))
+-            warning ("`absolute' variable has non-constant address");
++            gpc_warning ("`absolute' variable has non-constant address");
+           TREE_USED (init) = 1;
+           init = address;
+         }
+@@ -3982,7 +3999,15 @@
+         DECL_CONTEXT (d) = NULL_TREE;  /* for deferred initializers */
+ 
+       /* Output the assembler code and/or RTL code. */
+-#ifndef GCC_4_0
++#ifdef GCC_4_0
++      if (pascal_global_bindings_p () && current_module
++          && current_module->implementation)
++        {
++          if (!DECL_INITIAL (d))
++            DECL_DEFER_OUTPUT (d) = 1;
++          rest_of_decl_compilation (d, true, 0);
++        }
++#else
+       rest_of_decl_compilation (d, NULL, !DECL_CONTEXT (d), 1 /* for GPC */);
+ #endif
+ 
+Only in gpc/p: declarations.c~
+Common subdirectories: /pom/kompi/gcc/tst45/pom/gpc-20060325/p/demos and gpc/p/demos
+Common subdirectories: /pom/kompi/gcc/tst45/pom/gpc-20060325/p/diffs and gpc/p/diffs
+Common subdirectories: /pom/kompi/gcc/tst45/pom/gpc-20060325/p/doc and gpc/p/doc
+diff -u /pom/kompi/gcc/tst45/pom/gpc-20060325/p/expressions.c gpc/p/expressions.c
+--- /pom/kompi/gcc/tst45/pom/gpc-20060325/p/expressions.c	2006-03-24 02:47:15.000000000 +0100
++++ gpc/p/expressions.c	2006-04-09 02:28:59.000000000 +0200
+@@ -36,7 +36,7 @@
+ static int implicit_comparison = 0;
+ int operators_defined = 0;
+ 
+-static void set_string_length (tree, int, int);
++// static void set_string_length (tree, int, int);
+ static void warn_operands (enum tree_code, tree, int);
+ static tree shorten_compare (tree *, tree *, tree *, enum tree_code *);
+ static const char *get_op_name (enum tree_code);
+@@ -56,7 +56,7 @@
+    Note: TREE_STRING_LENGTH includes a trailing #0 (to output C-compatible
+    strings and to avoid changing the backend's output code), but the domain
+    doesn't (so the #0 doesn't appear in Pascal string usage). */
+-static void
++void
+ set_string_length (tree value, int wide_flag, int length)
+ {
+   gcc_assert (length >= 0);
+@@ -282,7 +282,7 @@
+ {
+   if (co->pascal_dialect & C_E_O_PASCAL)
+     {
+-      warning(msg);
++      gpc_warning (msg);
+       return build (COMPOUND_EXPR, TREE_TYPE (min), 
+                build_predef_call (p_RangeCheckError, NULL_TREE), min);
+     }
+@@ -653,7 +653,7 @@
+       enum tree_code inner = EXP_ORIGINAL_CODE (exp_inner);
+       if ((AND_OP (inner) && OR_OP (outer))
+           || ((OR_OP (inner) || AND_OP (inner) || (!rhs && inner == TRUTH_NOT_EXPR)) && REL_OP (outer)))
+-        warning ("suggest parentheses around `%s' in operand of `%s'",
++        gpc_warning ("suggest parentheses around `%s' in operand of `%s'",
+                  get_op_name (inner), get_op_name (outer));
+     }
+ }
+@@ -783,7 +783,6 @@
+          and are already no lvalues (WRT ISO parentheses). */
+       gcc_assert (TREE_CODE (t) != STRING_CST);
+       gcc_assert (TREE_CODE (t) != CONSTRUCTOR);
+-      gcc_assert (code == NOP_EXPR || !lvalue_p (t));
+       t = build1 (NON_LVALUE_EXPR, TREE_TYPE (old), old);
+       TREE_CONSTANT (t) = TREE_CONSTANT (old);
+       TREE_OVERFLOW (t) = TREE_OVERFLOW (old);
+@@ -1124,9 +1123,11 @@
+     }
+ 
+   /* Convert set constructors to sets. */
+-  if (t1 == CONSTRUCTOR && TREE_CODE (TREE_TYPE (exp1)) == SET_TYPE)
++  if (t1 == PASCAL_SET_CONSTRUCTOR
++      && TREE_CODE (TREE_TYPE (exp1)) == SET_TYPE)
+     exp1 = construct_set (exp1, NULL_TREE, 1);
+-  if (t2 == CONSTRUCTOR && TREE_CODE (TREE_TYPE (exp2)) == SET_TYPE && code != IN_EXPR)
++  if (t2 == PASCAL_SET_CONSTRUCTOR
++      && TREE_CODE (TREE_TYPE (exp2)) == SET_TYPE && code != IN_EXPR)
+     exp2 = construct_set (exp2, NULL_TREE, 1);
+ 
+   CHK_EM (TREE_TYPE (exp1));
+@@ -1249,17 +1250,18 @@
+           return error_mark_node;
+         }
+ 
+-      if (TREE_CODE (exp2) == CONSTRUCTOR)
++      if (TREE_CODE (exp2) == PASCAL_SET_CONSTRUCTOR)
+         {
+           /* Optimize `foo in [a, b .. c]' to become
+              `(foo = a) or ((foo >= b) and (foo <= c))'
+              (where foo is evaluated only once). */
+-          tree elem = CONSTRUCTOR_ELTS (exp2), result = NULL_TREE, exp = save_expr (exp1);
++          tree elem = SET_CONSTRUCTOR_ELTS (exp2),
++               result = NULL_TREE, exp = save_expr (exp1);
+           if (!elem)
+             {
+-              warning ("`... in []' (empty set) is always `False'.");
++              gpc_warning ("`... in []' (empty set) is always `False'.");
+               if (TREE_SIDE_EFFECTS (exp1))
+-                warning (" Operand with side-effects is not evaluated.");
++                gpc_warning (" Operand with side-effects is not evaluated.");
+               return boolean_false_node;
+             }
+           for (; elem; elem = TREE_CHAIN (elem))
+@@ -1333,12 +1335,18 @@
+       if (code == SYMDIFF_EXPR)
+         chk_dialect ("symmetric set difference is", E_O_PASCAL);
+ 
+-      if (TREE_CODE (exp1) == CONSTRUCTOR && TREE_CODE (exp2) == CONSTRUCTOR)
++      if (TREE_CODE (exp1) == PASCAL_SET_CONSTRUCTOR 
++          && TREE_CODE (exp2) == PASCAL_SET_CONSTRUCTOR)
+         {
+           if (code == PLUS_EXPR)
+-            return build_set_constructor (chainon (copy_list (CONSTRUCTOR_ELTS (exp1)), copy_list (CONSTRUCTOR_ELTS (exp2))));
+-          else if (PASCAL_CONSTRUCTOR_INT_CST (exp1) && PASCAL_CONSTRUCTOR_INT_CST (exp2))
+-            return const_set_constructor_binary_op (code, CONSTRUCTOR_ELTS (exp1), CONSTRUCTOR_ELTS (exp2));
++            return build_set_constructor (chainon (
++                     copy_list (SET_CONSTRUCTOR_ELTS (exp1)),
++                     copy_list (SET_CONSTRUCTOR_ELTS (exp2))));
++          else if (PASCAL_CONSTRUCTOR_INT_CST (exp1)
++                   && PASCAL_CONSTRUCTOR_INT_CST (exp2))
++            return const_set_constructor_binary_op (code, 
++                     SET_CONSTRUCTOR_ELTS (exp1),
++                     SET_CONSTRUCTOR_ELTS (exp2));
+         }
+ 
+       result = NULL_TREE;
+@@ -1351,19 +1359,19 @@
+         {
+           case PLUS_EXPR:
+           case SYMDIFF_EXPR:
+-            warning ("Set operation has no effect.");
++            gpc_warning ("Set operation has no effect.");
+             return exp2;
+           case MINUS_EXPR:
+           case MULT_EXPR:
+-            warning ("Set operation always yields the empty set.");
++            gpc_warning ("Set operation always yields the empty set.");
+             result = build_set_constructor (NULL_TREE);
+             break;
+           case GT_EXPR:
+-            warning ("`>' comparison of the empty set is always false.");
++            gpc_warning ("`>' comparison of the empty set is always false.");
+             result = boolean_false_node;
+             break;
+           case LE_EXPR:
+-            warning ("`<=' comparison of the empty set is always true.");
++            gpc_warning ("`<=' comparison of the empty set is always true.");
+             result = boolean_true_node;
+             break;
+           case EQ_EXPR:
+@@ -1389,18 +1397,18 @@
+           case PLUS_EXPR:
+           case MINUS_EXPR:
+           case SYMDIFF_EXPR:
+-            warning ("Set operation has no effect.");
++            gpc_warning ("Set operation has no effect.");
+             return exp1;
+           case MULT_EXPR:
+-            warning ("Set operation always yields the empty set.");
++            gpc_warning ("Set operation always yields the empty set.");
+             result = build_set_constructor (NULL_TREE);
+             break;
+           case LT_EXPR:
+-            warning ("`<' comparison against the empty set is always false.");
++            gpc_warning ("`<' comparison against the empty set is always false.");
+             result = boolean_false_node;
+             break;
+           case GE_EXPR:
+-            warning ("`>=' comparison against the empty set is always true.");
++            gpc_warning ("`>=' comparison against the empty set is always true.");
+             result = boolean_true_node;
+             break;
+           case EQ_EXPR:
+@@ -1417,7 +1425,7 @@
+       if (result)
+         {
+           if (TREE_SIDE_EFFECTS (empty1 ? exp2 : exp1))
+-            warning (" Operand with side-effects is not evaluated.");
++            gpc_warning (" Operand with side-effects is not evaluated.");
+           return result;
+         }
+       if (!r_num)
+@@ -1827,7 +1835,8 @@
+   /* build_unary_op accepts CONSTRUCTORs (for parameters), but the backend
+      would later crash. Maybe it should be checked elsewhere, but it
+      seems to work here. -- Frank */
+-  if (TREE_CODE (factor) == CONSTRUCTOR)
++  if (TREE_CODE (factor) == CONSTRUCTOR
++      || TREE_CODE (factor) == PASCAL_SET_CONSTRUCTOR)
+     {
+       error ("reference expected, value given");
+       return error_mark_node;
+@@ -1841,6 +1850,7 @@
+   else
+     {
+       tree t;
++      tree string_cst_type = NULL_TREE;
+ 
+       if (TREE_CODE (factor) == STRING_CST)
+         {
+@@ -1850,13 +1860,25 @@
+           tree capf = TYPE_FIELDS (st);
+           tree lenf = TREE_CHAIN (capf);
+           tree schf = TREE_CHAIN (lenf);
++#ifndef GCC_4_1
++          tree inilist = tree_cons (capf, length, 
++                           tree_cons (lenf, length,
++                           build_tree_list (schf, factor)));
++#else
++          VEC(constructor_elt,gc) * inilist = 0;
++          CONSTRUCTOR_APPEND_ELT (inilist, capf, length);
++          CONSTRUCTOR_APPEND_ELT (inilist, lenf, length);
++          CONSTRUCTOR_APPEND_ELT (inilist, schf, factor);
++#endif
+           factor = build_constructor (build_pascal_string_schema (length),
+-                     tree_cons (capf, length,
+-                     tree_cons (lenf, length,
+-                     build_tree_list (schf, factor))));
++                                      inilist);
+           /* Make this a valid lvalue for taking addresses. */
+           TREE_CONSTANT (factor) = 1;
+           TREE_STATIC (factor) = 1;
++          string_cst_type = TREE_TYPE (factor);
++          factor = declare_variable (get_unique_identifier ("const_string"),
++                     TREE_TYPE (factor), build_tree_list (NULL_TREE, factor),
++                     VQ_IMPLICIT | VQ_CONST | VQ_STATIC);
+         }
+ 
+       t = factor;
+@@ -1883,6 +1905,12 @@
+           && (!DECL_CONTEXT (factor)
+               || (TREE_CODE (factor) == FUNCTION_DECL && DECL_NO_STATIC_CHAIN (factor))))
+         TREE_CONSTANT (result) = 1;
++#if 0
++      if (string_cst_type)
++        {
++          result = convert (build_pointer_type (string_cst_type), result);
++        }
++#endif
+     }
+ 
+   if (untyped)
+@@ -2119,22 +2147,22 @@
+       if (!implicit_comparison && !max_gt && !unsignedp0 && TREE_CODE (primop0) != INTEGER_CST)
+         {
+           if (val == boolean_false_node)
+-            warning ("Comparison always yields `False' due to limited range of data type.");
++            gpc_warning ("Comparison always yields `False' due to limited range of data type.");
+           if (val == boolean_true_node)
+-            warning ("Comparison always yields `True' due to limited range of data type.");
++            gpc_warning ("Comparison always yields `True' due to limited range of data type.");
+         }
+       if (!implicit_comparison && !min_lt && unsignedp0 && TREE_CODE (primop0) != INTEGER_CST)
+         {
+           if (val == boolean_false_node)
+-            warning ("Comparison always yields `False' due to limited range of data type.");
++            gpc_warning ("Comparison always yields `False' due to limited range of data type.");
+           if (val == boolean_true_node)
+-            warning ("Comparison always yields `True' due to limited range of data type.");
++            gpc_warning ("Comparison always yields `True' due to limited range of data type.");
+         }
+ 
+       if (val)
+         {
+           if (TREE_SIDE_EFFECTS (primop0))
+-            warning (" Operand with side-effects is not evaluated.");
++            gpc_warning (" Operand with side-effects is not evaluated.");
+           return val;
+         }
+ 
+@@ -2184,13 +2212,13 @@
+                  the signedness of the comparison isn't an issue, so suppress
+                  the warning. */
+               if (!implicit_comparison && TREE_CODE (primop0) != INTEGER_CST)
+-                warning ("Comparison `unsigned value >= 0' always yields `True'.");
++                gpc_warning ("Comparison `unsigned value >= 0' always yields `True'.");
+               value = boolean_true_node;
+               break;
+ 
+             case LT_EXPR:
+               if (!implicit_comparison && TREE_CODE (primop0) != INTEGER_CST)
+-                warning ("Comparison `unsigned value < 0' always yields `False'.");
++                gpc_warning ("Comparison `unsigned value < 0' always yields `False'.");
+               value = boolean_false_node;
+               break;
+ 
+@@ -2201,7 +2229,7 @@
+           if (value)
+             {
+               if (TREE_SIDE_EFFECTS (primop0))
+-                warning (" Operand with side-effects is not evaluated.");
++                gpc_warning (" Operand with side-effects is not evaluated.");
+               return value;
+             }
+         }
+@@ -2564,14 +2592,14 @@
+           if (TREE_CODE (op1) == INTEGER_CST)
+             {
+               if (tree_int_cst_sgn (op1) < 0)
+-                warning ("right shift count is negative");
++                gpc_warning ("right shift count is negative");
+               else
+                 {
+                   if (TREE_INT_CST_LOW (op1) | TREE_INT_CST_HIGH (op1))
+                     short_shift = 1;
+                   if (TREE_INT_CST_HIGH (op1) != 0
+                       || ((unsigned HOST_WIDE_INT) TREE_INT_CST_LOW (op1) >= TYPE_PRECISION (type0)))
+-                    warning ("right shift count >= width of type");
++                    gpc_warning ("right shift count >= width of type");
+                 }
+             }
+           /* Use the type of the value to be shifted for the result. */
+@@ -2591,10 +2619,10 @@
+           if (TREE_CODE (op1) == INTEGER_CST)
+             {
+               if (tree_int_cst_sgn (op1) < 0)
+-                warning ("left shift count is negative");
++                gpc_warning ("left shift count is negative");
+               else if (TREE_INT_CST_HIGH (op1) != 0
+                        || ((unsigned HOST_WIDE_INT) TREE_INT_CST_LOW (op1) >= TYPE_PRECISION (result_type)))
+-                warning ("left shift count >= width of type");
++                gpc_warning ("left shift count >= width of type");
+             }
+           if (TYPE_MAIN_VARIANT (TREE_TYPE (op1)) != pascal_integer_type_node)
+             op1 = convert (pascal_integer_type_node, op1);
+@@ -2606,7 +2634,7 @@
+     case EQ_EXPR:
+     case NE_EXPR:
+       if (co->warn_float_equal && (code0 == REAL_TYPE || code1 == REAL_TYPE))
+-        warning ("comparing real numbers with `=' or `<>' is unsafe");
++        gpc_warning ("comparing real numbers with `=' or `<>' is unsafe");
+       /* Result of comparison is always Boolean, but don't convert the args to Boolean. */
+       build_type = boolean_type_node;
+       if (ORDINAL_REAL_OR_COMPLEX_TYPE (code0) && compatible_relop_p (type0, type1))
+@@ -2658,7 +2686,7 @@
+             {
+               result_type = common_type (type0, type1);
+               if (TREE_CODE (TREE_TYPE (type0)) == FUNCTION_TYPE)
+-                warning ("ordered comparisons of pointers to routines");
++                gpc_warning ("ordered comparisons of pointers to routines");
+             }
+           else if (!comp_object_or_schema_pointer_types (TREE_TYPE (type0), TREE_TYPE (type1), 0)
+                    && !comp_object_or_schema_pointer_types (TREE_TYPE (type1), TREE_TYPE (type0), 0))
+@@ -2688,7 +2716,7 @@
+                   != COMPLETE_OR_VOID_TYPE_P (TREE_TYPE (type1)))
+                 pedwarn ("comparison of complete and incomplete pointers");
+               else if (pedantic && TREE_CODE (TREE_TYPE (type0)) == FUNCTION_TYPE)
+-                warning ("ordered comparision of pointers to routines");
++                gpc_warning ("ordered comparision of pointers to routines");
+             }
+           else
+             {
+@@ -2895,13 +2923,13 @@
+                     {
+                       mask = (~0L) << bits;
+                       if ((mask & constant) != mask)
+-                        warning ("comparison of promoted `not' unsigned with constant");
++                        gpc_warning ("comparison of promoted `not' unsigned with constant");
+                     }
+                 }
+               else if (unsignedp0 && unsignedp1
+                        && (TYPE_PRECISION (TREE_TYPE (primop0)) < TYPE_PRECISION (result_type))
+                        && (TYPE_PRECISION (TREE_TYPE (primop1)) < TYPE_PRECISION (result_type)))
+-                warning ("comparison of promoted `not' unsigned with unsigned");
++                gpc_warning ("comparison of promoted `not' unsigned with unsigned");
+             }
+         }
+     }
+@@ -2986,9 +3014,9 @@
+   /* The result is a pointer of the same type that is being added. */
+   tree result_type = TREE_TYPE (ptrop), size_exp = integer_one_node, result, folded;
+   if (TREE_CODE (TREE_TYPE (result_type)) == VOID_TYPE)
+-    warning ("untyped pointer used in arithmetic");
++    gpc_warning ("untyped pointer used in arithmetic");
+   else if (TREE_CODE (TREE_TYPE (result_type)) == FUNCTION_TYPE)
+-    warning ("pointer to a routine used in arithmetic");
++    gpc_warning ("pointer to a routine used in arithmetic");
+   else
+     size_exp = c_size_in_bytes (TREE_TYPE (result_type));
+   /* Replace the integer argument with a suitable product by the object size. */
+@@ -3010,9 +3038,9 @@
+   tree result, folded, restype = ptrdiff_type_node;
+   tree target_type = TREE_TYPE (TREE_TYPE (op0));
+   if (TREE_CODE (target_type) == VOID_TYPE)
+-    warning ("untyped pointer used in pointer difference");
++    gpc_warning ("untyped pointer used in pointer difference");
+   if (TREE_CODE (target_type) == FUNCTION_TYPE)
+-    warning ("pointer to a routine used in pointer difference");
++    gpc_warning ("pointer to a routine used in pointer difference");
+   /* First do the subtraction as integers, then divide. */
+   op0 = build_pascal_binary_op (MINUS_EXPR, convert (restype, op0), convert (restype, op1));
+   /* This generates an error if op1 is pointer to incomplete type. */
+@@ -3170,7 +3198,8 @@
+         }
+ 
+       /* Addresses of constructors are needed for parameters. */
+-      if (TREE_CODE (arg) == CONSTRUCTOR)
++      if (TREE_CODE (arg) == CONSTRUCTOR 
++          || TREE_CODE (arg) == PASCAL_SET_CONSTRUCTOR)
+         {
+           if (!TREE_CONSTANT (arg))
+             {
+@@ -3321,15 +3350,15 @@
+       && TREE_CODE (TREE_TYPE (otype)) != VOID_TYPE
+       && TREE_CODE (TREE_TYPE (otype)) != FUNCTION_TYPE
+       && TYPE_ALIGN (TREE_TYPE (type)) > TYPE_ALIGN (TREE_TYPE (otype)))
+-    warning ("cast increases required alignment of target type");
++    gpc_warning ("cast increases required alignment of target type");
+ 
+   if (TYPE_PRECISION (type) != TYPE_PRECISION (otype) && !TREE_CONSTANT (value))
+     {
+       if (TREE_CODE (type) == INTEGER_TYPE && TREE_CODE (otype) == POINTER_TYPE)
+-        warning ("cast from pointer to integer of different size");
++        gpc_warning ("cast from pointer to integer of different size");
+       if (TREE_CODE (type) == POINTER_TYPE && TREE_CODE (otype) == INTEGER_TYPE
+           && TREE_CODE (value) != PLUS_EXPR && TREE_CODE (value) != MINUS_EXPR)
+-        warning ("cast to pointer from integer of different size");
++        gpc_warning ("cast to pointer from integer of different size");
+     }
+ 
+   ovalue = value;
+@@ -3372,7 +3401,7 @@
+       if (TREE_CODE (otype) != VOID_TYPE
+           && TREE_CODE (type) != VOID_TYPE
+           && !tree_int_cst_equal (TYPE_SIZE (otype), TYPE_SIZE (type)))
+-        warning ("cast to type of different size");
++        gpc_warning ("cast to type of different size");
+       /* @@ GPC allows `@'...'' as an extension, but we don't want that here. */
+       if (TREE_CODE (value) == STRING_CST)
+         error ("reference expected, value given");
+@@ -3784,7 +3813,7 @@
+           return error_mark_node;
+         }
+       if (co->warn_object_assignment)
+-        warning ("assignment between objects");
++        gpc_warning ("assignment between objects");
+ 
+       while (TREE_CODE (l) == NOP_EXPR
+              || TREE_CODE (l) == CONVERT_EXPR
+@@ -3794,7 +3823,7 @@
+           && TREE_CODE (l) != PARM_DECL
+           && TREE_CODE (l) != COMPONENT_REF
+           && TREE_CODE (l) != ARRAY_REF)
+-        warning ("left-hand side of object assignment is polymorphic");
++        gpc_warning ("left-hand side of object assignment is polymorphic");
+ 
+       /* The following code assumes that the VMT pointer is the first field.
+          This is always the case in GPC. If this ever changes, the code must
+@@ -3811,7 +3840,7 @@
+       if (!field)
+         {
+           if (!is_init)
+-            warning ("assignment of object with no fields has no effect");
++            gpc_warning ("assignment of object with no fields has no effect");
+           return error_mark_node;
+         }
+       lastfield = tree_last (field);
+@@ -3940,7 +3969,7 @@
+           && TREE_CODE (TREE_TYPE (TREE_TYPE (lhs))) != VOID_TYPE
+           && TREE_CODE (TREE_TYPE (TREE_TYPE (lhs))) != FUNCTION_TYPE
+           && TYPE_ALIGN (TREE_TYPE (TREE_TYPE (inner_lhs))) > TYPE_ALIGN (TREE_TYPE (TREE_TYPE (lhs))))
+-        warning ("lhs cast decreases required alignment of target type");
++        gpc_warning ("lhs cast decreases required alignment of target type");
+ 
+       return build_modify_expr (inner_lhs, NOP_EXPR, convert (TREE_TYPE (inner_lhs), newrhs));
+     }
+Only in gpc/p: expressions.c~
+diff -u /pom/kompi/gcc/tst45/pom/gpc-20060325/p/gbe.h gpc/p/gbe.h
+--- /pom/kompi/gcc/tst45/pom/gpc-20060325/p/gbe.h	2006-03-03 20:14:31.000000000 +0100
++++ gpc/p/gbe.h	2006-04-06 03:35:49.000000000 +0200
+@@ -119,7 +119,7 @@
+ #define CONCAT2(a,b) a##b
+ #define STRINGX(s) #s
+ #define lineno input_line
+-#define warning_with_decl(x, y) (warning ("%H" y, &DECL_SOURCE_LOCATION (x), \
++#define warning_with_decl(x, y) (gpc_warning ("%H" y, &DECL_SOURCE_LOCATION (x), \
+         DECL_NAME (x) ? IDENTIFIER_POINTER (DECL_NAME (x)) : NULL))
+ #define error_with_decl(x, y) (error ("%H" y, &DECL_SOURCE_LOCATION (x), \
+         DECL_NAME (x) ? IDENTIFIER_POINTER (DECL_NAME (x)) : NULL))
+diff -u /pom/kompi/gcc/tst45/pom/gpc-20060325/p/gpc-lex.c gpc/p/gpc-lex.c
+--- /pom/kompi/gcc/tst45/pom/gpc-20060325/p/gpc-lex.c	2006-03-03 20:14:31.000000000 +0100
++++ gpc/p/gpc-lex.c	2006-04-06 03:35:49.000000000 +0200
+@@ -172,19 +172,19 @@
+         return 0;
+       else if (Message && co->warn_mixed_comments)
+         {
+-          warning ("comments starting with `(*' and ending with `}' or starting with");
+-          warning (" `{' and ending with `*)' are an obscure ISO Pascal feature");
++          gpc_warning ("comments starting with `(*' and ending with `}' or starting with");
++          gpc_warning (" `{' and ending with `*)' are an obscure ISO Pascal feature");
+         }
+       break;
+     case NestedComments:
+       if (!co->nested_comments)
+         {
+           if (co->warn_nested_comments)
+-            warning ("comment opener found within a comment");
++            gpc_warning ("comment opener found within a comment");
+           return 0;
+         }
+       else if (Message && co->warn_nested_comments)
+-        warning ("nested comments are a GPC extension");
++        gpc_warning ("nested comments are a GPC extension");
+       break;
+     case DelphiComments:
+       if (!co->delphi_comments)
+@@ -268,7 +268,7 @@
+         }
+     }
+   if (in_string)
+-    warning ("unterminated string in compiler directive");
++    gpc_warning ("unterminated string in compiler directive");
+   *q = 0;
+   process_pascal_directive (s, q - s);
+ }
+@@ -673,9 +673,9 @@
+   if (value == ';' && co->warn_semicolon)
+     switch (last_token)
+     {
+-      case p_then: warning ("`;' after `then'"); break;
+-      case p_else: warning ("`;' after `else'"); break;
+-      case p_do:   warning ("`;' after `do'");   break;
++      case p_then: gpc_warning ("`;' after `then'"); break;
++      case p_else: gpc_warning ("`;' after `else'"); break;
++      case p_do:   gpc_warning ("`;' after `do'");   break;
+     }
+   last_token = value;
+ 
+diff -u /pom/kompi/gcc/tst45/pom/gpc-20060325/p/gpc.h gpc/p/gpc.h
+--- /pom/kompi/gcc/tst45/pom/gpc-20060325/p/gpc.h	2006-03-11 00:40:51.000000000 +0100
++++ gpc/p/gpc.h	2006-04-09 03:21:18.000000000 +0200
+@@ -43,11 +43,24 @@
+ 
+ #undef USE_CPPLIB          /* Not suitable for Pascal */
+ 
++#include "gbe.h"
++
+ #ifndef GCC_3_3
+ #define GTY(x)
+ #endif
+ 
+-#include "gbe.h"
++#ifdef GCC_4_1
++#define gpc_warning warning0
++#define SET_CONSTRUCTOR_ELTS(t) TREE_OPERAND (t, 0)
++#else
++#define gpc_warning warning
++#define PASCAL_SET_CONSTRUCTOR CONSTRUCTOR
++#define SET_CONSTRUCTOR_ELTS(t) CONSTRUCTOR_ELTS (t)
++#define CONSTRUCTOR_APPEND_ELT(C, I, V) do \
++  {\
++    (C) = tree_cons ((I), (V), (C));\
++  } while (0)
++#endif
+ 
+ #ifdef GCC_4_0
+ extern tree xnon_lvalue (tree x);
+@@ -382,7 +395,9 @@
+ /* IS_EXPR_CODE_CLASS ought to work, but for CONSTRUCTORS the backend overwrites
+    this field via TREE_CST_RTL. @@@@@@@@@@ Severe backend bug! This is no fix. */
+ #define HAS_EXP_ORIGINAL_CODE_FIELD(exp) \
+-  (IS_EXPR_CODE_CLASS (TREE_CODE_CLASS (TREE_CODE (exp))) && TREE_CODE (exp) != CONSTRUCTOR)
++  (IS_EXPR_CODE_CLASS (TREE_CODE_CLASS (TREE_CODE (exp))) \
++   && TREE_CODE (exp) != CONSTRUCTOR \
++   && TREE_CODE (exp) != PASCAL_SET_CONSTRUCTOR)
+ 
+ #define IS_EXPR_OR_REF_CODE_CLASS(c) (IS_EXPR_CODE_CLASS (c) || \
+                                       c == tcc_reference)
+@@ -1374,6 +1389,7 @@
+ extern void un_initialize_block (tree, int, int);
+ extern void expand_call_statement (tree);
+ extern void expand_pascal_assignment (tree, tree);
++extern void expand_pascal_assignment2 (tree, tree, int);
+ extern tree assign_set (tree, tree);
+ extern tree assign_string (tree, const tree);
+ extern void start_main_program (void);
+Only in gpc/p: gpc.h~
+diff -u /pom/kompi/gcc/tst45/pom/gpc-20060325/p/gpcpp.c gpc/p/gpcpp.c
+--- /pom/kompi/gcc/tst45/pom/gpc-20060325/p/gpcpp.c	2006-02-18 14:22:58.000000000 +0100
++++ gpc/p/gpcpp.c	2006-04-06 03:35:49.000000000 +0200
+@@ -566,7 +566,7 @@
+ static U_CHAR *macarg1 (U_CHAR *, U_CHAR *, int *, int *, int *, int);
+ static int discard_comments (U_CHAR *, int, int);
+ static int change_newlines (U_CHAR *, int);
+-static void warning (const char *, ...) ATTRIBUTE_PRINTF_1;
++static void gpc_warning (const char *, ...) ATTRIBUTE_PRINTF_1;
+ static void error (const char *, ...) ATTRIBUTE_PRINTF_1;
+ static void verror (const char *, va_list);
+ static void error_from_errno (const char *);
+@@ -1348,8 +1348,8 @@
+ {
+   if (warn_mixed_comments && !inhibit_warnings)
+     {
+-      warning ("comments starting with `(*' and ending with `}' or starting with");
+-      warning (" `{' and ending with `*)' are an obscure ISO Pascal feature");
++      gpc_warning ("comments starting with `(*' and ending with `}' or starting with");
++      gpc_warning (" `{' and ending with `*)' are an obscure ISO Pascal feature");
+     }
+ }
+ 
+@@ -1357,7 +1357,7 @@
+ warn_nested_comment (void)
+ {
+   if (warn_nested_comments && !inhibit_warnings)
+-    warning (nested_comments ? "nested comments are a GPC extension" : "comment opener found within comment");
++    gpc_warning (nested_comments ? "nested comments are a GPC extension" : "comment opener found within comment");
+ }
+ 
+ /* Skip the (non-`//') comment starting at bp, handling C, Pascal,
+@@ -1550,7 +1550,7 @@
+       if (!ip->fname) {
+             /* note BP character constants */
+         if (ip->buf != beg_of_line && ((*ibp < '0' || *ibp > '9') && *ibp != '$'))
+-          warning ("preprocessing directive not recognized within macro arg");
++          gpc_warning ("preprocessing directive not recognized within macro arg");
+         goto randomchar;
+       }
+       if (ident_length)
+@@ -2438,14 +2438,14 @@
+       bp++;
+     } else if (*bp == '{') {
+       if (bp[1] == '$')
+-        warning ("ignoring Pascal style directive within C style directive");
++        gpc_warning ("ignoring Pascal style directive within C style directive");
+       ip->bufp = bp + 1;
+       skip_to_end_of_comment (ip, &ip->lineno, '}');
+       bp = ip->bufp;
+     } else if ((*bp == '\\') && bp[1] == '\n') {
+     } else if (IS_COMMENT_START (bp)) {
+       if (bp[1] == '*' && bp[2] == '$')
+-        warning ("ignoring Pascal style directive within C style directive");
++        gpc_warning ("ignoring Pascal style directive within C style directive");
+       ip->bufp = bp + 2;
+       skip_to_end_of_comment (ip, &ip->lineno, 0);
+       bp = ip->bufp;
+@@ -2567,7 +2567,7 @@
+             U_CHAR *obp = bp - 1;
+             if (*bp == '$')
+               {
+-                warning ("ignoring Pascal style directive within C style directive");
++                gpc_warning ("ignoring Pascal style directive within C style directive");
+                 *bp = ' ';
+               }
+             ip->bufp = bp;
+@@ -2591,7 +2591,7 @@
+             U_CHAR *obp = bp - 1;
+             if (*bp == '*' && bp[1] == '$')
+               {
+-                warning ("ignoring Pascal style directive within C style directive");
++                gpc_warning ("ignoring Pascal style directive within C style directive");
+                 bp[1] = ' ';
+               }
+             ip->bufp = bp + 1;
+@@ -2751,12 +2751,12 @@
+          conditionals. So, just don't allow such things ... */
+       if (*p == '{' && p[1] == '$')
+         {
+-          warning ("ignoring compiler directive within another directive");
++          gpc_warning ("ignoring compiler directive within another directive");
+           p[1] = ' ';
+         }
+       if (*p == '(' && p[1] == '*' && p[2] == '$')
+         {
+-          warning ("ignoring compiler directive within another directive");
++          gpc_warning ("ignoring compiler directive within another directive");
+           p[2] = ' ';
+         }
+       if (IS_COMMENT_START2 (p))
+@@ -3353,7 +3353,7 @@
+       f = open (fname, O_RDONLY, 0666);
+ #ifdef EACCES
+       if (f == -1 && errno == EACCES)
+-        warning ("header file %s exists, but is not readable", fname);
++        gpc_warning ("header file %s exists, but is not readable", fname);
+ #endif
+       if (f >= 0)
+         break;
+@@ -3540,7 +3540,7 @@
+           bp++;
+           SKIP_WHITE_SPACE (bp);
+         } else
+-          warning ("missing white space after `$define %.*s'",
++          gpc_warning ("missing white space after `$define %.*s'",
+                    sym_length, symname);
+       }
+     /* Now everything from bp before limit is the definition. */
+@@ -3992,7 +3992,7 @@
+     /* If we are generating additional info for debugging (with -g) we
+        need to pass through all effective #undef directives. */
+     if (hp->type != T_MACRO)
+-      warning ("undefining `%s'", hp->name);
++      gpc_warning ("undefining `%s'", hp->name);
+     delete_macro (hp);
+   }
+   if (pedantic) {
+@@ -4030,7 +4030,7 @@
+   memcpy ((char *) copy, (char *) buf, length);
+   copy[length] = 0;
+   SKIP_WHITE_SPACE (copy);
+-  warning ("#warning %s", copy);
++  gpc_warning ("#gpc_warning %s", copy);
+   return 0;
+ }
+ 
+@@ -5711,7 +5711,7 @@
+ 
+ /* Print warning. */
+ static void
+-warning (const char *msg, ...)
++gpc_warning (const char *msg, ...)
+ {
+   va_list args;
+   va_start (args, msg);
+diff -u /pom/kompi/gcc/tst45/pom/gpc-20060325/p/lang.c gpc/p/lang.c
+--- /pom/kompi/gcc/tst45/pom/gpc-20060325/p/lang.c	2006-03-24 02:47:15.000000000 +0100
++++ gpc/p/lang.c	2006-04-06 03:35:49.000000000 +0200
+@@ -178,7 +178,7 @@
+         res = build (COMPOUND_EXPR, TREE_TYPE (res),
+                        current_statement_list, res);
+         current_statement_list = save_statement_list;
+-        unshare_all_trees (res);
++        res = unshare_expr (res);
+       }
+       break;
+ 
+@@ -200,15 +200,16 @@
+           DECL_INITIAL (new_var) = TREE_OPERAND (t, 0);
+ 
+           TREE_OPERAND (t, 0) = new_var;
++          recompute_tree_invarant_for_addr_expr (t);
+           return GS_ALL_DONE;
+         }
+       return GS_UNHANDLED;
+ 
+-    case CONSTRUCTOR:
++    case PASCAL_SET_CONSTRUCTOR:
+       if (TREE_CODE (TREE_TYPE (t)) == SET_TYPE)
+         {
+           tree type = TREE_TYPE (t);
+-          tree elt = CONSTRUCTOR_ELTS (t);
++          tree elt = SET_CONSTRUCTOR_ELTS (t);
+           tree domain = TYPE_DOMAIN (type);
+           tree domain_min = convert (sbitsizetype, TYPE_MIN_VALUE (domain));
+           tree domain_max = convert (sbitsizetype, TYPE_MAX_VALUE (domain));
+@@ -690,6 +691,7 @@
+ #define flag_objc 0
+ #define flag_isoc99 0
+ #define rs6000_cpu_cpp_builtins(foo)
++#define darwin_cpp_builtins(foo)
+ #endif
+ 
+ #ifdef GCC_3_4
+@@ -1204,7 +1206,7 @@
+     DECL_COMMON (*node) = 0;
+   else
+     {
+-      warning ("`%s' attribute ignored", IDENTIFIER_POINTER (name));
++      gpc_warning ("`%s' attribute ignored", IDENTIFIER_POINTER (name));
+       *no_add_attrs = true;
+     }
+ 
+@@ -1221,7 +1223,7 @@
+     DECL_COMMON (*node) = 1;
+   else
+     {
+-      warning ("`%s' attribute ignored", IDENTIFIER_POINTER (name));
++      gpc_warning ("`%s' attribute ignored", IDENTIFIER_POINTER (name));
+       *no_add_attrs = true;
+     }
+ 
+@@ -1247,7 +1249,7 @@
+                              TREE_READONLY (TREE_TYPE (type)), 1));
+   else
+     {
+-      warning ("`%s' attribute ignored", IDENTIFIER_POINTER (name));
++      gpc_warning ("`%s' attribute ignored", IDENTIFIER_POINTER (name));
+       *no_add_attrs = true;
+     }
+ 
+@@ -1272,7 +1274,7 @@
+         TREE_USED (decl) = 1;
+       else
+         {
+-          warning ("`%s' attribute ignored", IDENTIFIER_POINTER (name));
++          gpc_warning ("`%s' attribute ignored", IDENTIFIER_POINTER (name));
+           *no_add_attrs = true;
+         }
+     }
+@@ -1305,7 +1307,7 @@
+                              TREE_THIS_VOLATILE (TREE_TYPE (type))));
+   else
+     {
+-      warning ("`%s' attribute ignored", IDENTIFIER_POINTER (name));
++      gpc_warning ("`%s' attribute ignored", IDENTIFIER_POINTER (name));
+       *no_add_attrs = true;
+     }
+ 
+@@ -1491,7 +1493,7 @@
+     }
+   else
+     {
+-      warning ("`%s' attribute ignored", IDENTIFIER_POINTER (name));
++      gpc_warning ("`%s' attribute ignored", IDENTIFIER_POINTER (name));
+       *no_add_attrs = true;
+     }
+ 
+@@ -1563,7 +1565,10 @@
+ #define LANG_HOOKS_TYPE_FOR_MODE type_for_mode
+ 
+ #define LANG_HOOKS_MARK_ADDRESSABLE pascal_mark_addressable
++
++#ifndef GCC_4_1
+ #define LANG_HOOKS_TRUTHVALUE_CONVERSION truthvalue_conversion
++#endif
+ 
+ #undef LANG_HOOKS_DUP_LANG_SPECIFIC_DECL
+ #define LANG_HOOKS_DUP_LANG_SPECIFIC_DECL copy_decl_lang_specific
+@@ -1588,6 +1593,44 @@
+ #undef LANG_HOOKS_TYPES_COMPATIBLE_P
+ #define LANG_HOOKS_TYPES_COMPATIBLE_P pascal_types_compatible_p
+ 
++#ifdef GCC_4_1
++#undef LANG_HOOKS_INIT_TS
++#define LANG_HOOKS_INIT_TS pascal_init_ts
++#undef LANG_HOOKS_EXPAND_CONSTANT
++#define LANG_HOOKS_EXPAND_CONSTANT pascal_expand_constant
++
++static tree
++pascal_expand_constant (tree t)
++{
++  tree nt;
++  if (TREE_CODE (t) == PASCAL_SET_CONSTRUCTOR)
++    {
++      HOST_WIDE_INT len = int_size_in_bytes (TREE_TYPE (t));
++      char *tmp = xmalloc (len);
++      if (!get_set_constructor_bytes (t, (unsigned char *) tmp, len))
++        {
++          nt = build_string (len, tmp);
++          gcc_assert (TREE_INT_CST_LOW (TYPE_SIZE (char_type_node)) == 8);
++          TREE_TYPE (nt) = build_simple_array_type (char_type_node,
++                              build_index_type (build_int_2 (len, 0)));
++          t = build1 (VIEW_CONVERT_EXPR, TREE_TYPE (t), nt);
++        }
++    }
++  return t;
++}
++
++static void
++pascal_init_ts (void)
++{
++  tree_contains_struct[NAMESPACE_DECL][TS_DECL_COMMON] = 1;
++  tree_contains_struct[OPERATOR_DECL][TS_DECL_COMMON] = 1;
++  tree_contains_struct[NAMESPACE_DECL][TS_DECL_MINIMAL] = 1;
++  tree_contains_struct[OPERATOR_DECL][TS_DECL_MINIMAL] = 1;
++}
++
++#endif
++
++
+ int 
+ pascal_types_compatible_p (tree t1, tree t2)
+ {
+@@ -1763,14 +1806,14 @@
+           if (TYPE_P (node))
+             *anode = type = build_type_copy (type);
+           if (!valid_machine_attribute (name, args, decl, type))
+-            warning ("`%s' attribute directive ignored", IDENTIFIER_NAME (name));
++            gpc_warning ("`%s' attribute directive ignored", IDENTIFIER_NAME (name));
+           else if (decl)
+             type = TREE_TYPE (decl);
+           continue;
+         }
+       else if (attrtab[i].decl_req && !decl)
+         {
+-          warning ("`%s' attribute does not apply to types", IDENTIFIER_NAME (name));
++          gpc_warning ("`%s' attribute does not apply to types", IDENTIFIER_NAME (name));
+           continue;
+         }
+       else if (list_length (args) < attrtab[i].min || list_length (args) > attrtab[i].max)
+@@ -1787,14 +1830,14 @@
+           if (TREE_CODE (decl) == VAR_DECL)
+             DECL_COMMON (decl) = 0;
+           else
+-            warning ("`%s' attribute ignored", IDENTIFIER_NAME (name));
++            gpc_warning ("`%s' attribute ignored", IDENTIFIER_NAME (name));
+           break;
+ 
+         case A_COMMON:
+           if (TREE_CODE (decl) == VAR_DECL)
+             DECL_COMMON (decl) = 1;
+           else
+-            warning ("`%s' attribute ignored", IDENTIFIER_NAME (name));
++            gpc_warning ("`%s' attribute ignored", IDENTIFIER_NAME (name));
+           break;
+ 
+         case A_NORETURN:
+@@ -1804,7 +1847,7 @@
+             TREE_TYPE (decl) = type = build_pointer_type (p_build_type_variant (TREE_TYPE (type),
+               TREE_READONLY (TREE_TYPE (type)), 1));
+           else
+-            warning ("`%s' attribute ignored", IDENTIFIER_NAME (name));
++            gpc_warning ("`%s' attribute ignored", IDENTIFIER_NAME (name));
+           break;
+ 
+         case A_UNUSED:
+@@ -1817,7 +1860,7 @@
+                    || TREE_CODE (decl) == FUNCTION_DECL)
+             TREE_USED (decl) = 1;
+           else
+-            warning ("`%s' attribute ignored", IDENTIFIER_NAME (name));
++            gpc_warning ("`%s' attribute ignored", IDENTIFIER_NAME (name));
+           break;
+ 
+         case A_CONST:
+@@ -1827,7 +1870,7 @@
+             TREE_TYPE (decl) = type = build_pointer_type (p_build_type_variant (TREE_TYPE (type),
+               1, TREE_THIS_VOLATILE (TREE_TYPE (type))));
+           else
+-            warning ("`%s' attribute ignored", IDENTIFIER_NAME (name));
++            gpc_warning ("`%s' attribute ignored", IDENTIFIER_NAME (name));
+           break;
+ 
+         case A_SECTION:
+@@ -1905,7 +1948,7 @@
+               assemble_alias (decl, id);
+             }
+           else
+-            warning ("`%s' attribute ignored", IDENTIFIER_NAME (name));
++            gpc_warning ("`%s' attribute ignored", IDENTIFIER_NAME (name));
+           break;
+       }
+     }
+Only in gpc/p: lang.c~
+diff -u /pom/kompi/gcc/tst45/pom/gpc-20060325/p/module.c gpc/p/module.c
+--- /pom/kompi/gcc/tst45/pom/gpc-20060325/p/module.c	2006-03-24 20:09:49.000000000 +0100
++++ gpc/p/module.c	2006-04-11 01:27:35.459338992 +0200
+@@ -38,6 +38,12 @@
+ #define HOST_PTR_PRINTF_CAST_TYPE HOST_WIDE_INT
+ #endif
+ 
++#ifdef GCC_4_1
++#define GPC_HOST_PTR_PRINTF "%p"
++#else
++#define GPC_HOST_PTR_PRINTF HOST_PTR_PRINTF
++#endif
++
+ #ifdef EGCS97
+ 
+ /* By default there is no special suffix for target executables.  */
+@@ -92,7 +98,7 @@
+ 
+ #endif
+ 
+-typedef struct
++typedef struct MEMFILE
+ {
+   char *filename;
+   size_t size, curpos;
+@@ -283,6 +289,8 @@
+ /* Options to pass to child gpc processes in automake. */
+ static char *automake_gpc_options = NULL;
+ 
++enum itab_state { ITAB_LOADING, ITAB_COMPLETE };
++
+ /* A table holding the nodes imported from all GPI files
+    together with their UIDs, so duplicates can be identified. */
+ struct interface_table_t GTY(())
+@@ -294,6 +302,9 @@
+   tree initializers;  /* Same as in module_t. Predefined interfaces
+                          (StandardInput etc.) have no initializer. */
+   int count;
++  struct MEMFILE * GTY((skip(""))) infile; /* Input file during reading */
++  gpi_int * GTY((skip(""))) offsets; /* Offsets of node data during reading */
++  enum itab_state state;
+   tree * GTY((length ("%h.count"))) nodes;
+   int * GTY((length ("%h.count"))) hashlist_next;
+   int hash_table[MAX_HASH_TABLE];
+@@ -393,7 +404,7 @@
+                        IDENTIFIER_NAME (id),
+                        current_module->main_program ? "program" : "module");
+             else
+-              warning (
++              gpc_warning (
+                 "identifier `%s' in %s heading is not a variable of file type",
+                 IDENTIFIER_NAME (id),
+                 current_module->main_program ? "program" : "module");
+@@ -467,7 +478,7 @@
+   if (!id)
+     {
+       if (!co->pascal_dialect)
+-        warning ("missing program header");
++        gpc_warning ("missing program header");
+       else  /* BP does not even warn */
+         chk_dialect ("programs without program header are", B_D_PASCAL);
+       id = get_identifier ("noname");
+@@ -544,8 +555,8 @@
+     create_gpi_files ();
+   if (co->interface_only)
+     exit_compilation ();
+-  if (co->implementation_only)
+-    {
++//  if (co->implementation_only)
++//    {
+       /* Make sure that interface nodes keep their identity by reloading the
+          GPI files previously created (presumably) with `--interface_only'. This
+          is the same as with separate interface and implementation modules. */
+@@ -555,7 +566,7 @@
+       current_module = m;
+       pushlevel (0);
+       load_own_interface (0);
+-    }
++//    }
+   current_module->implementation = 1;
+ }
+ 
+@@ -563,7 +574,7 @@
+ finalize_module (int implementation_follows)
+ {
+   if (co->implementation_only && co->automake_level)
+-    warning ("`--automake' together with `--implementation-only' can cause problems");
++    gpc_warning ("`--automake' together with `--implementation-only' can cause problems");
+   if (errorcount || sorrycount)
+     exit_compilation ();
+   if (!implementation_follows /* && !co->implementation_only */)
+@@ -742,7 +753,7 @@
+           if (*p == ')')
+             p++;
+           else
+-            warning ("missing `)' in `--uses' parameter");
++            gpc_warning ("missing `)' in `--uses' parameter");
+           file_name = build_string_constant (buffer, q - buffer, 0);
+         }
+       else
+@@ -755,7 +766,7 @@
+                   || (*p == '_')))
+         {
+           if (*p != ',')
+-            warning ("missing `,' in `--uses' parameter");
++            gpc_warning ("missing `,' in `--uses' parameter");
+           p++;
+         }
+     }
+@@ -1862,9 +1873,11 @@
+     {
+       tree t = rb.nodes[n];
+       if (t && (TREE_CODE (t) == FUNCTION_DECL || (TREE_CODE (t) == VAR_DECL))
+-/* #ifndef GCC_4_0 */
++#ifndef GCC_4_0 
+           && !DECL_RTL_SET_P (t)
+-/* #endif */
++#else
++          && !PASCAL_DECL_IMPORTED (t)
++#endif
+           )
+         {
+           if (!module_interface)
+@@ -1878,26 +1891,19 @@
+                 DECL_INITIAL (t) = NULL_TREE;
+ #endif
+             }
+-#if 0
++#ifdef GCC_4_0
+           else
+             {
+-              mark_decl_referenced (t);
++              if (TREE_CODE (t) == VAR_DECL)
++                rest_of_decl_compilation (t, 1, 0);
++//              mark_decl_referenced (t);
+             }
+ #endif
+           PASCAL_DECL_WEAK (t) = 0;
+           PASCAL_DECL_IMPORTED (t) = 1;
+-          if (module_interface && TREE_CODE (t) == VAR_DECL
+-              && DECL_INITIAL (t))
+-            {
+-#if 0
+-              fprintf (stderr, "DECL_INITIAL (%p)\n", t);
+-              debug_tree (t);
+-              debug_tree (DECL_INITIAL (t));
+-#endif
+-            }
+ #ifdef GCC_4_0
+           /* @@@@@@@ Otherwise we have problems with vmt */
+-          rest_of_decl_compilation (t, 1, 0);
++//          rest_of_decl_compilation (t, 1, 0);
+ #else
+           rest_of_decl_compilation (t, NULL, 1, 1);
+ #endif
+@@ -1968,8 +1974,12 @@
+ #else
+ #define DECL_FLAGS_SIZE 6
+ #endif
++#ifndef GCC_4_1
+ #define DECL_EXTRA_STORED(t) (t->decl.u1.i)
+ #else
++#define DECL_EXTRA_STORED(t) (t->decl_common.u1.i)
++#endif
++#else
+ #ifdef EGCS
+ #define DECL_FLAGS_SIZE 5
+ #else
+@@ -2049,7 +2059,7 @@
+       if (code == INTERFACE_NAME_NODE)
+         {
+           fprintf (stderr, " <interface_name_node ");
+-          fprintf (stderr, HOST_PTR_PRINTF, (HOST_PTR_PRINTF_CAST_TYPE) t);
++          fprintf (stderr, GPC_HOST_PTR_PRINTF, (HOST_PTR_PRINTF_CAST_TYPE) t);
+           fprintf (stderr, " %s module %s checksum %lu>\n",
+                    IDENTIFIER_NAME (INTERFACE_TABLE (t)->interface_name),
+                    IDENTIFIER_NAME (INTERFACE_TABLE (t)->module_name),
+@@ -2078,7 +2088,10 @@
+         gpi_int n;
+         store_length ((&DECL_SIZE (t)) + 1, DECL_FLAGS_SIZE);
+         STORE_ANY (DECL_EXTRA_STORED (t));
+-        store_node (DECL_NAME (t));
++#ifdef  GCC_4_1
++        if (CODE_CONTAINS_STRUCT (code, TS_DECL_MINIMAL))
++#endif
++          store_node (DECL_NAME (t));
+         store_string (DECL_SOURCE_FILE (t));
+         n = DECL_SOURCE_LINE (t);
+         STORE_ANY (n);
+@@ -2088,8 +2101,13 @@
+ #ifdef EGCS97
+         store_node (DECL_SIZE_UNIT (t));
+ #endif
+-        n = DECL_ALIGN (t);
+-        STORE_ANY (n);
++#ifdef GCC_4_1
++        if (code != FUNCTION_DECL)
++#endif
++          {
++            n = DECL_ALIGN (t);
++            STORE_ANY (n);
++          }
+         break;
+       }
+     case tcc_constant:
+@@ -2343,6 +2361,24 @@
+       store_node (TREE_TYPE (t));
+       break;
+ 
++#ifdef GCC_4_1
++    case CONSTRUCTOR:
++      {
++        VEC(constructor_elt,gc) *elts = CONSTRUCTOR_ELTS (t);
++        tree index, value;
++        unsigned HOST_WIDE_INT ix;
++        store_node (TREE_TYPE (t));
++        ix = VEC_length (constructor_elt, elts);
++        STORE_ANY (ix);
++        FOR_EACH_CONSTRUCTOR_ELT (elts, ix, index, value)
++          {
++            store_node (index);
++            store_node (value);
++          }
++      }
++      break;
++#endif
++      
+     default:
+ #ifdef GCC_4_0
+       gcc_assert (class_done);
+@@ -2590,7 +2626,10 @@
+         char *s;
+         LOAD_LENGTH ((&DECL_SIZE (t)) + 1, DECL_FLAGS_SIZE);
+         LOAD_ANY (DECL_EXTRA_STORED (t));
+-        DECL_NAME (t) = load_node ();
++#ifdef  GCC_4_1
++        if (CODE_CONTAINS_STRUCT (code, TS_DECL_MINIMAL))
++#endif
++          DECL_NAME (t) = load_node ();
+         s = load_string (rb.infile);
+         DECL_SOURCE_FILE (t) = PERMANENT_STRING (s);
+         free (s);
+@@ -2602,9 +2641,17 @@
+ #ifdef EGCS97
+         DECL_SIZE_UNIT (t) = load_node ();
+ #endif
+-        LOAD_ANY (n);
+-        DECL_ALIGN (t) = n;
+-        DECL_IN_SYSTEM_HEADER (t) = 1;
++#ifdef GCC_4_1
++        if (code != FUNCTION_DECL)
++#endif
++          {
++            LOAD_ANY (n);
++            DECL_ALIGN (t) = n;
++          }
++#ifdef GCC_4_1
++        if (CODE_CONTAINS_STRUCT (code, TS_DECL_WITH_VIS))
++#endif
++          DECL_IN_SYSTEM_HEADER (t) = 1;
+         break;
+       }
+     case tcc_constant:
+@@ -2649,7 +2696,7 @@
+         if (co->debug_gpi)
+           {
+             fprintf (stderr, "GPI loaded <%i>:\n <interface_name_node ", (int) uid);
+-            fprintf (stderr, HOST_PTR_PRINTF, (HOST_PTR_PRINTF_CAST_TYPE) t);
++            fprintf (stderr, GPC_HOST_PTR_PRINTF, (HOST_PTR_PRINTF_CAST_TYPE) t);
+             fprintf (stderr, " %s module %s checksum %lu>\n",
+                      IDENTIFIER_NAME (i),
+                      IDENTIFIER_NAME (m),
+@@ -2832,7 +2879,9 @@
+       TREE_TYPE (t) = load_node ();
+       DECL_ARG_TYPE (t) = load_node ();
+       DECL_CONTEXT (t) = load_node ();
++#ifndef GCC_4_1
+       SET_DECL_ASSEMBLER_NAME (t, DECL_NAME (t));
++#endif
+       break;
+ 
+     case FIELD_DECL:
+@@ -2895,6 +2944,27 @@
+       TREE_TYPE (t) = load_node ();
+       break;
+ 
++#ifdef GCC_4_1
++    case CONSTRUCTOR:
++      {
++        VEC(constructor_elt,gc) *elts = 0;
++        tree index, value;
++        unsigned HOST_WIDE_INT ix;
++        TREE_TYPE (t) = load_node ();
++        LOAD_ANY (ix);
++        while (ix > 0)
++          {
++            index = load_node ();
++            value = load_node ();
++            CONSTRUCTOR_APPEND_ELT (elts, index, value);
++            ix--;
++          }
++        CONSTRUCTOR_ELTS (t) = elts;
++      }
++      break;
++#endif
++
++
+     default:
+       break;
+   }
+@@ -2962,7 +3032,7 @@
+           for (q = n; *q; q++)
+             *q = TOLOWER (*q);
+           if (strcmp (f, n) && strcmp (n + strlen (n) - 4, "-all"))
+-            warning ("interface `%s' in file name `%s'", IDENTIFIER_NAME (name), plain_input_filename);
++            gpc_warning ("interface `%s' in file name `%s'", IDENTIFIER_NAME (name), plain_input_filename);
+         }
+ 
+       /* Store names of interfaces imported by this module */
+@@ -3207,7 +3277,7 @@
+                     if (!itab_check_gpi_checksum (interface, checksum, 0))
+                       {
+                         if (co->debug_automake)
+-                          warning ("`%s' must be recompiled because of checksum mismatch in %s", name, str);
++                          gpc_warning ("`%s' must be recompiled because of checksum mismatch in %s", name, str);
+                         must_recompile = 1;
+                       }
+                     for (imported = current_module->imports; imported; imported = TREE_CHAIN (imported))
+@@ -3278,7 +3348,7 @@
+                     }
+ #if 0
+                   else if (implementation_flag)
+-                    warning ("duplicate implementation flag in GPI file `%s'", name);
++                    gpc_warning ("duplicate implementation flag in GPI file `%s'", name);
+ #endif
+                   implementation_flag = 1;
+                   break;
+@@ -3335,7 +3405,7 @@
+         }
+       if (errstr)
+         {
+-          warning (errstr, name);
++          gpc_warning (errstr, name);
+           module_filename = NULL;
+           must_recompile = 1;
+         }
+Only in gpc/p: module.c~
+diff -u /pom/kompi/gcc/tst45/pom/gpc-20060325/p/objects.c gpc/p/objects.c
+--- /pom/kompi/gcc/tst45/pom/gpc-20060325/p/objects.c	2006-03-24 06:03:26.000000000 +0100
++++ gpc/p/objects.c	2006-04-09 21:28:12.000000000 +0200
+@@ -455,7 +455,7 @@
+             if (IDENTIFIER_IS_BUILT_IN (TREE_VALUE (cp), p_virtual))
+               {
+                 if (co->methods_always_virtual)
+-                  warning ("explicit `virtual' given with `--methods-always-virtual'");
++                  gpc_warning ("explicit `virtual' given with `--methods-always-virtual'");
+                 virtual = 1;
+                 nv++;
+                 if (TREE_PURPOSE (cp))
+@@ -568,7 +568,7 @@
+             if (PEDANTIC (B_D_PASCAL))  /* forbidden by OOE */
+               error ("%s `%s' conflicts with ancestor type name", i ? "method" : "field", IDENTIFIER_NAME (DECL_NAME (field)));
+             else
+-              warning ("%s `%s' conflicts with ancestor type name", i ? "method" : "field", IDENTIFIER_NAME (DECL_NAME (field)));
++              gpc_warning ("%s `%s' conflicts with ancestor type name", i ? "method" : "field", IDENTIFIER_NAME (DECL_NAME (field)));
+           }
+       }
+ 
+@@ -637,7 +637,7 @@
+                       if (pedantic || !(co->pascal_dialect & B_D_PASCAL))
+                         error ("%s method `%s', overrides %s method", descr[p2], IDENTIFIER_NAME (DECL_NAME (*dm)), descr[p1]);
+                       else
+-                        warning ("%s method `%s', overrides %s method", descr[p2], IDENTIFIER_NAME (DECL_NAME (*dm)), descr[p1]);
++                        gpc_warning ("%s method `%s', overrides %s method", descr[p2], IDENTIFIER_NAME (DECL_NAME (*dm)), descr[p1]);
+                     }
+                   if (PASCAL_VIRTUAL_METHOD (*pm))
+                     {
+@@ -648,12 +648,12 @@
+                         }
+                       if (PASCAL_TYPE_IOCRITICAL (TREE_TYPE (*dm))
+                           && !PASCAL_TYPE_IOCRITICAL (TREE_TYPE (*pm)))
+-                        warning ("iocritical virtual method overrides non-iocritical one");
++                        gpc_warning ("iocritical virtual method overrides non-iocritical one");
+                     }
+                   if (PASCAL_VIRTUAL_METHOD (*pm) && !PASCAL_VIRTUAL_METHOD (*dm))
+                     {
+                       /* Overridden virtual methods must be virtual. */
+-                      warning ("method `%s' is virtual", IDENTIFIER_NAME (DECL_NAME (*dm)));
++                      gpc_warning ("method `%s' is virtual", IDENTIFIER_NAME (DECL_NAME (*dm)));
+                       PASCAL_VIRTUAL_METHOD (*dm) = 1;
+                     }
+                   /* If a virtual method overrides a non-virtual one, we must
+@@ -662,7 +662,7 @@
+                   if (!PASCAL_VIRTUAL_METHOD (*pm) && PASCAL_VIRTUAL_METHOD (*dm))
+                     {
+                       if (PEDANTIC (B_D_PASCAL) || co->pascal_dialect == 0)
+-                        warning ("virtual method overrides non-virtual one");
++                        gpc_warning ("virtual method overrides non-virtual one");
+                       *pm = TREE_CHAIN (*pm);
+                       continue;
+                     }
+@@ -782,8 +782,8 @@
+                   TYPE_LANG_CODE (type) = PASCAL_LANG_ABSTRACT_OBJECT;
+                   if (co->warn_implicit_abstract)
+                     {
+-                      warning ("object type `%s' is implicitly abstract because", object_name);
+-                      warning (" it contains abstract method `%s'", IDENTIFIER_NAME (DECL_NAME (field)));
++                      gpc_warning ("object type `%s' is implicitly abstract because", object_name);
++                      gpc_warning (" it contains abstract method `%s'", IDENTIFIER_NAME (DECL_NAME (field)));
+                     }
+                 }
+               method = convert (ptr_type_node, integer_zero_node);
+@@ -800,12 +800,12 @@
+       /* Set `Size' and `NegatedSize' to 0 for abstract objects */
+       TREE_VALUE (vmt_entry) = TREE_VALUE (TREE_CHAIN (vmt_entry)) = size_zero_node;
+       if (co->warn_inherited_abstract && parent && TYPE_LANG_CODE (parent) != PASCAL_LANG_ABSTRACT_OBJECT)
+-        warning ("abstract object type `%s' inherits from non-abstract type `%s'",
++        gpc_warning ("abstract object type `%s' inherits from non-abstract type `%s'",
+                  object_name, IDENTIFIER_NAME (DECL_NAME (TYPE_NAME (parent))));
+     }
+   else if (has_virtual_method && !has_constructor && !is_class
+            /* && (co->pascal_dialect & B_D_PASCAL) */)
+-    warning ("object type has virtual method, but no constructor");
++    gpc_warning ("object type has virtual method, but no constructor");
+ 
+   /* Now create a global var declaration (also for abstract types,
+      for `is', `as' and explicit parent type access via VMT).
+@@ -816,13 +816,14 @@
+     build_tree_list (NULL_TREE, vmt_entry), VQ_IMPLICIT | VQ_CONST |
+       (current_module->implementation ? VQ_STATIC : 0));
+ 
+-#ifdef GCC_4_0
++#if 0 /* def GCC_4_0 */
+   if (current_module->implementation || !(co->interface_only))
+     {
+       mark_decl_referenced (TYPE_LANG_VMT_VAR (type));
+       make_decl_rtl (TYPE_LANG_VMT_VAR (type));
+     }
+ #endif
++
+   /* Attach VMT_TYPE to the implicit VMT field of the object.
+      (Until here it still has the inherited type or ^void type.)
+      We also need this for abstract types because their methods
+@@ -977,16 +978,16 @@
+         {
+           if (op == p_is)
+             {
+-              warning ("`is' always yields `True' if the right operand");
+-              warning (" is the declared type of the left operand.");
++              gpc_warning ("`is' always yields `True' if the right operand");
++              gpc_warning (" is the declared type of the left operand.");
+               if (TREE_SIDE_EFFECTS (left))
+-                warning (" Operand with side-effects is not evaluated.");
++                gpc_warning (" Operand with side-effects is not evaluated.");
+               return boolean_true_node;
+             }
+           else
+             {
+-              warning ("`as' has no effect if the right operand is");
+-              warning (" the declared type of the left operand");
++              gpc_warning ("`as' has no effect if the right operand is");
++              gpc_warning (" the declared type of the left operand");
+               return oleft;
+             }
+         }
+@@ -999,10 +1000,10 @@
+         {
+           if (op == p_is)
+             {
+-              warning ("`is' always yields `False' if the left operand is not");
+-              warning (" polymorphic and the right operand is not its type");
++              gpc_warning ("`is' always yields `False' if the left operand is not");
++              gpc_warning (" polymorphic and the right operand is not its type");
+               if (TREE_SIDE_EFFECTS (left))
+-                warning (" Operand with side-effects is not evaluated.");
++                gpc_warning (" Operand with side-effects is not evaluated.");
+               return boolean_false_node;
+             }
+           else
+Only in gpc/p: objects.c~
+diff -u /pom/kompi/gcc/tst45/pom/gpc-20060325/p/options.c gpc/p/options.c
+--- /pom/kompi/gcc/tst45/pom/gpc-20060325/p/options.c	2006-03-03 20:14:31.000000000 +0100
++++ gpc/p/options.c	2006-04-06 06:58:40.000000000 +0200
+@@ -308,7 +308,7 @@
+     }
+   else if (OPT ("-fdisable-debug-info"))
+     {
+-      warning ("`--disable-debug-info' is a temporary work-around; it may disappear in the future");
++      gpc_warning ("`--disable-debug-info' is a temporary work-around; it may disappear in the future");
+       if (write_symbols == SDB_DEBUG)  /* Not all debug formats like to be reset */
+         write_symbols = NO_DEBUG;
+       debug_info_level = DINFO_LEVEL_NONE;
+@@ -454,7 +454,7 @@
+     {
+       int limit = strtoint (arg, strlen (arg));
+       if (limit <= 0)
+-        warning ("invalid specified set limit %s.", arg);
++        gpc_warning ("invalid specified set limit %s.", arg);
+       else
+         co->set_limit = limit;
+     }
+@@ -682,7 +682,7 @@
+     name[--length] = 0;
+   if (length == 0)
+     {
+-      warning ("empty Pascal compiler directive");
++      gpc_warning ("empty Pascal compiler directive");
+       return 1;
+     }
+   if (length == 2 && (name[1] == '+' || name[1] == '-'))
+@@ -700,12 +700,12 @@
+           else
+             long_name = short_option->inverted_long_name;
+           if (long_name[1] == '#')
+-            warning ("directive `{$%s}' not yet implemented", name);
++            gpc_warning ("directive `{$%s}' not yet implemented", name);
+           else if (long_name[1] == '!')
+             {
+               /* BP-style directive. In BP mode, ignore it for compatibility. */
+               if (pedantic || !(co->pascal_dialect & U_B_D_PASCAL))
+-                warning ("ignoring BP directive `{$%s}' which is unnecessary in GPC", name);
++                gpc_warning ("ignoring BP directive `{$%s}' which is unnecessary in GPC", name);
+             }
+           else if (!pascal_decode_option (1, &long_name))
+             error ("internal problem: unknown short option expansion `%s'", long_name);
+@@ -808,7 +808,7 @@
+       case 'o':
+       case 's':
+         if (pedantic || !(co->pascal_dialect & U_B_D_PASCAL))
+-          warning ("ignoring BP directive `{$%s}' which is unnecessary in GPC", name);
++          gpc_warning ("ignoring BP directive `{$%s}' which is unnecessary in GPC", name);
+         return 1;
+       /* One-letter directive already handled by the preprocessor */
+       case 'i':
+@@ -929,7 +929,7 @@
+           }
+         return 1;
+     }
+-  warning ("unknown compiler directive `%s'", name);
++  gpc_warning ("unknown compiler directive `%s'", name);
+   return 1;
+ }
+ 
+@@ -1026,14 +1026,14 @@
+       if (error_flag)
+         error ("%s", buf);
+       else
+-        warning ("%s", buf);
++        gpc_warning ("%s", buf);
+       *p = ' ';
+       buf = p;  /* including the leading space */
+     }
+   if (error_flag)
+     error ("%s", buf);
+   else
+-    warning ("%s", buf);
++    gpc_warning ("%s", buf);
+ }
+ 
+ void
+diff -u /pom/kompi/gcc/tst45/pom/gpc-20060325/p/p-tree.def gpc/p/p-tree.def
+--- /pom/kompi/gcc/tst45/pom/gpc-20060325/p/p-tree.def	2006-03-03 20:14:31.000000000 +0100
++++ gpc/p/p-tree.def	2006-04-06 06:58:40.000000000 +0200
+@@ -36,6 +36,9 @@
+ DEFTREECODE (RANGE_CHECK_EXPR, "range_check_expr", tcc_expression, 3)
+ DEFTREECODE (IO_RANGE_CHECK_EXPR, "io_range_check_expr", tcc_expression, 3)
+ DEFTREECODE (IN_EXPR, "in_expr", tcc_binary, 2)
++#ifdef GCC_4_1
++DEFTREECODE (PASCAL_SET_CONSTRUCTOR, "pascal_set_constructor", tcc_expression, 1)
++#endif
+ #else
+ #ifdef EGCS
+ DEFTREECODE (OPERATOR_DECL, "operator_decl", 'd', 0)
+Only in gpc/p: p-version.h~
+diff -u /pom/kompi/gcc/tst45/pom/gpc-20060325/p/parse.c gpc/p/parse.c
+--- /pom/kompi/gcc/tst45/pom/gpc-20060325/p/parse.c	2006-03-24 02:52:27.000000000 +0100
++++ gpc/p/parse.c	2006-04-06 05:37:44.000000000 +0200
+@@ -5214,7 +5214,7 @@
+ 
+   case 60:
+ #line 378 "parse.y"
+-    { warning ("missing semicolon"); yyerrok; ;}
++    { gpc_warning ("missing semicolon"); yyerrok; ;}
+     break;
+ 
+   case 61:
+@@ -5284,7 +5284,7 @@
+ 
+   case 81:
+ #line 436 "parse.y"
+-    { warning ("missing semicolon"); yyerrok; ;}
++    { gpc_warning ("missing semicolon"); yyerrok; ;}
+     break;
+ 
+   case 82:
+@@ -5419,7 +5419,7 @@
+ 
+   case 120:
+ #line 548 "parse.y"
+-    { warning ("missing comma"); yyerrok; ;}
++    { gpc_warning ("missing comma"); yyerrok; ;}
+     break;
+ 
+   case 121:
+@@ -5731,7 +5731,7 @@
+         tree t = build_pascal_pointer_type (make_node (LANG_TYPE));
+         PASCAL_TYPE_CLASS (t) = 1;
+         build_type_decl ((((yyGLRStackItem const *)yyvsp)[YYFILL (-4)].yystate.yysemantics.yysval.ttype), t, NULL_TREE);
+-        warning("ignored parent in Delphi forward class declaration");
++        gpc_warning ("ignored parent in Delphi forward class declaration");
+       ;}
+     break;
+ 
+@@ -6710,7 +6710,7 @@
+ #line 1528 "parse.y"
+     {
+         if (!(((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval.itype) && extra_warnings)
+-          warning ("empty statement after `else'");
++          gpc_warning ("empty statement after `else'");
+         expand_end_cond ();
+       ;}
+     break;
+@@ -6849,7 +6849,7 @@
+ #line 1608 "parse.y"
+     {
+         if (!(((yyGLRStackItem const *)yyvsp)[YYFILL (-1)].yystate.yysemantics.yysval.itype) && extra_warnings)
+-          warning ("empty statement after `then'");
++          gpc_warning ("empty statement after `then'");
+       ;}
+     break;
+ 
+@@ -7988,7 +7988,7 @@
+ 
+   case 795:
+ #line 2396 "parse.y"
+-    { warning ("missing `.' at the end of program/unit/module"); ;}
++    { gpc_warning ("missing `.' at the end of program/unit/module"); ;}
+     break;
+ 
+   case 796:
+@@ -9544,7 +9544,7 @@
+ #if YYDEBUG != 0
+   yydebug = value;
+ #else
+-  warning ("YYDEBUG not defined.");
++  gpc_warning ("YYDEBUG not defined.");
+ #endif
+ }
+ 
+diff -u /pom/kompi/gcc/tst45/pom/gpc-20060325/p/parse.y gpc/p/parse.y
+--- /pom/kompi/gcc/tst45/pom/gpc-20060325/p/parse.y	2006-03-24 02:47:15.000000000 +0100
++++ gpc/p/parse.y	2006-04-06 03:35:49.000000000 +0200
+@@ -375,7 +375,7 @@
+   | error
+       { error ("module specifications need an export part"); }
+   | export_part_list error export_part
+-      { warning ("missing semicolon"); yyerrok; }
++      { gpc_warning ("missing semicolon"); yyerrok; }
+   | export_part_list ';' error
+       { error ("extra semicolon"); }
+   ;
+@@ -433,7 +433,7 @@
+     import_specification
+   | import_specification_list ';' import_specification
+   | import_specification_list error import_specification
+-      { warning ("missing semicolon"); yyerrok; }
++      { gpc_warning ("missing semicolon"); yyerrok; }
+   ;
+ 
+ import_specification:
+@@ -545,7 +545,7 @@
+     uses_specification
+   | uses_list ',' uses_specification
+   | uses_list error uses_specification
+-      { warning ("missing comma"); yyerrok; }
++      { gpc_warning ("missing comma"); yyerrok; }
+   ;
+ 
+ uses_specification:
+@@ -786,7 +786,7 @@
+         tree t = build_pascal_pointer_type (make_node (LANG_TYPE));
+         PASCAL_TYPE_CLASS (t) = 1;
+         build_type_decl ($1, t, NULL_TREE);
+-        warning("ignored parent in Delphi forward class declaration");
++        gpc_warning ("ignored parent in Delphi forward class declaration");
+       }
+   | new_identifier enable_lce equals p_class LEX_RANGE p_end
+       {
+@@ -1527,7 +1527,7 @@
+     pushlevel optional_statement poplevel
+       {
+         if (!$5 && extra_warnings)
+-          warning ("empty statement after `else'");
++          gpc_warning ("empty statement after `else'");
+         expand_end_cond ();
+       }
+   | p_case expression p_of
+@@ -1607,7 +1607,7 @@
+     pushlevel optional_statement poplevel
+       {
+         if (!$6 && extra_warnings)
+-          warning ("empty statement after `then'");
++          gpc_warning ("empty statement after `then'");
+       }
+   ;
+ 
+@@ -2393,7 +2393,7 @@
+ dot_or_error:
+     '.'
+   | error
+-      { warning ("missing `.' at the end of program/unit/module"); }
++      { gpc_warning ("missing `.' at the end of program/unit/module"); }
+   ;
+ 
+ null:
+@@ -2487,7 +2487,7 @@
+ #if YYDEBUG != 0
+   yydebug = value;
+ #else
+-  warning ("YYDEBUG not defined.");
++  gpc_warning ("YYDEBUG not defined.");
+ #endif
+ }
+ 
+Only in gpc/p: parse.y~
+diff -u /pom/kompi/gcc/tst45/pom/gpc-20060325/p/plant.c gpc/p/plant.c
+--- /pom/kompi/gcc/tst45/pom/gpc-20060325/p/plant.c	2006-03-24 00:51:09.000000000 +0100
++++ gpc/p/plant.c	2006-04-08 05:42:12.000000000 +0200
+@@ -285,7 +285,9 @@
+   current_function_decl = DECL_CONTEXT (the_fun);
+   cfun = NULL;
+ 
+-  if (!DECL_CONTEXT (the_fun) || PASCAL_METHOD (the_fun))
++  if (!DECL_CONTEXT (the_fun)
++      || TREE_CODE (DECL_CONTEXT (the_fun)) != FUNCTION_DECL
++         /* PASCAL_METHOD (the_fun) */)
+     {
+ //      current_function_decl = NULL_TREE;
+       current_function_decl = the_fun;
+Only in gpc/p: plant.c~
+diff -u /pom/kompi/gcc/tst45/pom/gpc-20060325/p/predef.c gpc/p/predef.c
+--- /pom/kompi/gcc/tst45/pom/gpc-20060325/p/predef.c	2006-03-24 02:47:15.000000000 +0100
++++ gpc/p/predef.c	2006-04-07 02:01:03.000000000 +0200
+@@ -1185,7 +1185,15 @@
+     case 't': if (TYPE_MAIN_VARIANT (type) != gpc_type_TimeStamp)       errstr = "argument %d to `%s' must be of type `TimeStamp'"; break;
+     case 'a': if (TYPE_MAIN_VARIANT (type) != gpc_type_BindingType)     errstr = "argument %d to `%s' must be of type `BindingType'"; break;
+     case 'x': break;  /* Untyped parameter */
+-    case '#': if (TREE_CONSTANT (val) && (TREE_CODE (val) != CONSTRUCTOR || type == empty_set_type_node)) { error ("`%s' applied to a constant", r_name); return error_mark_node; } break;  /* expression or type allowed */
++    case '#': if (TREE_CONSTANT (val)
++                  && ((TREE_CODE (val) != CONSTRUCTOR
++                       && TREE_CODE (val) != PASCAL_SET_CONSTRUCTOR)
++                      || type == empty_set_type_node))
++                {
++                  error ("`%s' applied to a constant", r_name);
++                  return error_mark_node;
++                }
++              break;  /* expression or type allowed */
+     default: gcc_unreachable ();
+   }
+   if (ISUPPER ((unsigned char) argtype))
+@@ -1552,11 +1560,12 @@
+     return NULL_TREE;
+ 
+   case p_Card:
+-    if (TREE_CODE (val) == CONSTRUCTOR && PASCAL_CONSTRUCTOR_INT_CST (val))
++    if (TREE_CODE (val) == PASCAL_SET_CONSTRUCTOR 
++        && PASCAL_CONSTRUCTOR_INT_CST (val))
+       {
+         tree e;
+         retval = integer_zero_node;
+-        for (e = CONSTRUCTOR_ELTS (val); e; e = TREE_CHAIN (e))
++        for (e = SET_CONSTRUCTOR_ELTS (val); e; e = TREE_CHAIN (e))
+           {
+             tree l = TREE_PURPOSE (e), u = TREE_VALUE (e);
+             gcc_assert (TREE_CODE (l) == INTEGER_CST && TREE_CODE (u) == INTEGER_CST);
+@@ -1568,7 +1577,8 @@
+         gcc_assert (TREE_CODE (retval) == INTEGER_CST);
+         break;
+       }
+-    if (TREE_CODE (val) == CONSTRUCTOR && TREE_CODE (TREE_TYPE (val)) == SET_TYPE)
++    if (TREE_CODE (val) == PASCAL_SET_CONSTRUCTOR
++        && TREE_CODE (TREE_TYPE (val)) == SET_TYPE)
+       {
+         val = construct_set (val, NULL_TREE, 1);
+         CHK_EM (val);
+@@ -1590,7 +1600,7 @@
+         if (co->pascal_dialect & C_E_O_PASCAL)
+           error ("argument to `%s' must be of real type", r_name);
+         else
+-          warning ("`%s' applied to integers has no effect", r_name);
++          gpc_warning ("`%s' applied to integers has no effect", r_name);
+         retval = val;
+       }
+     else
+@@ -1667,7 +1677,7 @@
+     {
+       tree arg;
+       if (argcount == 1)
+-        warning ("`%s' with only one argument has no effect", r_name);
++        gpc_warning ("`%s' with only one argument has no effect", r_name);
+       for (arg = apar; arg; arg = TREE_CHAIN (arg))
+         if (!is_string_compatible_type (TREE_VALUE (arg), 1))
+           errstr = "arguments to `%s' must be strings or chars";
+@@ -1706,7 +1716,7 @@
+   case p_Ord:
+     if (code == INTEGER_TYPE)
+       {
+-        warning ("`%s' applied to integers has no effect", r_name);
++        gpc_warning ("`%s' applied to integers has no effect", r_name);
+         retval = val;
+       }
+     else
+@@ -1739,9 +1749,9 @@
+       else if (pedantic && !contains_auto_initialized_part (type, r_num == p_Finalize))
+         {
+           if (r_num == p_Finalize)
+-            warning ("variable does not need any finalization");
++            gpc_warning ("variable does not need any finalization");
+           else
+-            warning ("variable does not need any initialization");
++            gpc_warning ("variable does not need any initialization");
+         }
+       init_any (val, r_num == p_Finalize, 0);
+       retval = error_mark_node;  /* nothing to expand anymore -- init_any does it already */
+@@ -1823,9 +1833,12 @@
+ 
+         /* (val = nil) ? 0 : strlen|Length (val) */
+         if (TYPE_MAIN_VARIANT (type) == cstring_type_node)
+-          strlength = build (COND_EXPR, integer_type_node,
+-            build_pascal_binary_op (EQ_EXPR, val, null_pointer_node), integer_zero_node,
+-            build_routine_call (strlen_routine_node, build_tree_list (NULL_TREE, val)));
++          strlength = build (COND_EXPR, pascal_integer_type_node,
++            build_pascal_binary_op (EQ_EXPR, val, null_pointer_node),
++            convert (pascal_integer_type_node, integer_zero_node),
++            convert (pascal_integer_type_node,
++              build_routine_call (strlen_routine_node, 
++                build_tree_list (NULL_TREE, val))));
+         else
+           strlength = PASCAL_STRING_LENGTH (val);
+         retval = make_new_variable ("cstring2string", build_pascal_string_schema (save_expr (strlength)));
+@@ -1860,7 +1873,7 @@
+   case p_Conjugate:
+     if (INT_REAL (code))
+       {
+-        warning ("`%s' applied to real numbers has no effect", r_name);
++        gpc_warning ("`%s' applied to real numbers has no effect", r_name);
+         retval = val;
+       }
+     else if (r_num == p_Re)
+@@ -1872,9 +1885,9 @@
+   case p_Im:
+     if (INT_REAL (code))
+       {
+-        warning ("`%s' applied to real numbers always yields 0.", r_name);
++        gpc_warning ("`%s' applied to real numbers always yields 0.", r_name);
+         if (TREE_SIDE_EFFECTS (val))
+-          warning (" Argument with side-effects is not evaluated.");
++          gpc_warning (" Argument with side-effects is not evaluated.");
+         retval = real_zero_node;
+       }
+     else
+@@ -1923,7 +1936,8 @@
+     }
+ 
+   case p_Assigned:
+-    retval = build (NE_EXPR, boolean_type_node, val, integer_zero_node);
++    retval = build (NE_EXPR, boolean_type_node, val,
++                      convert (TREE_TYPE (val), integer_zero_node));
+     break;
+ 
+   case p_GetMem:
+@@ -1956,7 +1970,7 @@
+       CHK_EM (ptype);
+ 
+       if (TREE_CODE (ptype) == VOID_TYPE && !(co->pascal_dialect & B_D_PASCAL))
+-        warning ("argument to `%s' should not be an untyped pointer", r_name);
++        gpc_warning ("argument to `%s' should not be an untyped pointer", r_name);
+       if (PASCAL_TYPE_ANYFILE (ptype))
+         error ("`AnyFile' pointers cannot be allocated with `%s'", r_name);
+ 
+@@ -2064,8 +2078,12 @@
+           int save_warn_object_assignment = co->warn_object_assignment;
+           co->warn_object_assignment = 0;
+ #endif
++
++
+           expand_expr_stmt (build_modify_expr (res_deref, NOP_EXPR,
+             build_pascal_initializer (TREE_TYPE (type), init, "type in `New'", 0)));
++
++
+ #if 0
+           co->warn_object_assignment = save_warn_object_assignment;
+ #endif
+@@ -2125,7 +2143,8 @@
+         argcount = 1;
+         TREE_CHAIN (apar) = NULL_TREE;
+       }
+-    expand_start_cond (build (NE_EXPR, boolean_type_node, val, integer_zero_node), 0);
++    expand_start_cond (build (NE_EXPR, boolean_type_node, val, 
++                        convert (TREE_TYPE (val), integer_zero_node)), 0);
+     init_any (build_indirect_ref (val, NULL), 1, 1);
+     if (co->pascal_dialect & C_E_O_PASCAL)
+       {
+@@ -2140,12 +2159,12 @@
+         if (co->pascal_dialect & C_E_O_PASCAL)
+           error ("standard Pascal forbids `%s (nil)'", r_name);
+         else
+-          warning ("`%s (nil)' has no effect", r_name);
++          gpc_warning ("`%s (nil)' has no effect", r_name);
+       }
+     if (argcount > 1)
+       {
+         if (PEDANTIC (GNU_PASCAL))
+-          warning (r_num == p_Dispose
++          gpc_warning (r_num == p_Dispose
+                    ? "tag fields ignored in `%s'"
+                    : "second parameter ignored in `%s'", r_name);
+         /* @@ Perhaps we should do a run-time check ? */
+@@ -2222,7 +2241,7 @@
+   case p_Int:
+     if (code == INTEGER_TYPE)
+       {
+-        warning ("`%s' applied to integers has no effect", r_name);
++        gpc_warning ("`%s' applied to integers has no effect", r_name);
+         retval = val;
+       }
+     break;
+@@ -2230,9 +2249,9 @@
+   case p_Frac:
+     if (code == INTEGER_TYPE)
+       {
+-        warning ("`%s' applied to integers always yields 0.", r_name);
++        gpc_warning ("`%s' applied to integers always yields 0.", r_name);
+         if (TREE_SIDE_EFFECTS (val))
+-          warning (" Argument with side-effects is not evaluated.");
++          gpc_warning (" Argument with side-effects is not evaluated.");
+         retval = integer_zero_node;
+       }
+     break;
+@@ -2294,7 +2313,7 @@
+             }
+           else if (co->pascal_dialect & U_B_D_M_PASCAL)
+             {
+-              warning ("unspecified buffer size for untyped file defaults to 128 in `%s'", r_name);
++              gpc_warning ("unspecified buffer size for untyped file defaults to 128 in `%s'", r_name);
+               buffer_size = build_int_2 (128, 0);
+             }
+           else
+@@ -2544,7 +2563,7 @@
+                 errstr = "left argument of `pow' is 0 while right argument is <= 0";
+                 if (!pedantic && (co->pascal_dialect & C_E_O_PASCAL))
+                   {
+-                    warning (errstr);
++                    gpc_warning (errstr);
+                     errstr = NULL;
+                   }
+               }
+@@ -2653,11 +2672,11 @@
+               if (r_num == p_LT)  /* s < '' is impossible */
+                 {
+                   if (invert_result)
+-                    warning ("`>=' comparison against the empty string is always `True'.");
++                    gpc_warning ("`>=' comparison against the empty string is always `True'.");
+                   else
+-                    warning ("`<' comparison against the empty string is always `False'.");
++                    gpc_warning ("`<' comparison against the empty string is always `False'.");
+                   if (TREE_SIDE_EFFECTS (val))
+-                    warning (" Operand with side-effects is not evaluated.");
++                    gpc_warning (" Operand with side-effects is not evaluated.");
+                   return invert_result ? boolean_true_node : boolean_false_node;
+                 }
+               comp_empty = val;
+@@ -2996,7 +3015,7 @@
+ get_standard_input (void)
+ {
+   if (co->warn_implicit_io)
+-    warning ("implicit use of `Input'");
++    gpc_warning ("implicit use of `Input'");
+   if (!current_module->input_available)
+     {
+       current_module->input_available = 1;
+@@ -3009,7 +3028,7 @@
+ get_standard_output (void)
+ {
+   if (co->warn_implicit_io)
+-    warning ("implicit use of `Output'");
++    gpc_warning ("implicit use of `Output'");
+   if (!current_module->output_available)
+     {
+       current_module->output_available = 1;
+Common subdirectories: /pom/kompi/gcc/tst45/pom/gpc-20060325/p/rts and gpc/p/rts
+Common subdirectories: /pom/kompi/gcc/tst45/pom/gpc-20060325/p/script and gpc/p/script
+diff -u /pom/kompi/gcc/tst45/pom/gpc-20060325/p/statements.c gpc/p/statements.c
+--- /pom/kompi/gcc/tst45/pom/gpc-20060325/p/statements.c	2006-03-24 03:47:15.000000000 +0100
++++ gpc/p/statements.c	2006-04-07 19:28:45.000000000 +0200
+@@ -73,7 +73,7 @@
+   if (PEDANTIC (GNU_PASCAL))
+     {
+       if (co->pascal_dialect & B_D_M_PASCAL)
+-        warning ("GPC and Borland Pascal have different `asm' syntax");
++        gpc_warning ("GPC and Borland Pascal have different `asm' syntax");
+       else
+         chk_dialect ("`asm' is", B_D_M_PASCAL);
+     }
+@@ -203,7 +203,7 @@
+   else if (TREE_CODE (t) == VAR_DECL && PASCAL_FOR_LOOP_COUNTER (t))
+     {
+       if (co->pascal_dialect & B_D_M_PASCAL)
+-        warning ("%s of `for' loop counter", description);
++        gpc_warning ("%s of `for' loop counter", description);
+       else
+         {
+           error ("%s of `for' loop counter", description);
+@@ -245,11 +245,11 @@
+               return 0;
+             }
+           else
+-            warning ("%s: typed const misused as initialized variable", description);
++            gpc_warning ("%s: typed const misused as initialized variable", description);
+           if (!informed)
+             {
+-              warning (" (Better use ISO 10206 Extended Pascal initialized");
+-              warning (" types and variables: `var foo: integer value 7'.)");
++              gpc_warning (" (Better use ISO 10206 Extended Pascal initialized");
++              gpc_warning (" types and variables: `var foo: integer value 7'.)");
+               informed = 1;
+             }
+         }
+@@ -284,7 +284,7 @@
+ {
+   tree valtype = TREE_TYPE (TREE_TYPE (current_function_decl));
+   if (TREE_THIS_VOLATILE (current_function_decl))
+-    warning ("routine declared `noreturn' returns");
++    gpc_warning ("routine declared `noreturn' returns");
+   /* This must be done before returning, otherwise it would jump over it. */
+   cleanup_routine ();
+   if (!retval)
+@@ -396,9 +396,9 @@
+                       if (const_lt (chi, hi))
+                         nlo = fold (build (PLUS_EXPR, TREE_TYPE (chi), (ehi = chi), convert (TREE_TYPE (chi), integer_one_node)));
+                       if (tree_int_cst_equal (elo, ehi))
+-                        warning ("duplicate `case' element %ld", (long) TREE_INT_CST_LOW (elo));
++                        gpc_warning ("duplicate `case' element %ld", (long) TREE_INT_CST_LOW (elo));
+                       else
+-                        warning ("duplicate `case' range %ld .. %ld", (long) TREE_INT_CST_LOW (elo), (long) TREE_INT_CST_LOW (ehi));
++                        gpc_warning ("duplicate `case' range %ld .. %ld", (long) TREE_INT_CST_LOW (elo), (long) TREE_INT_CST_LOW (ehi));
+                       if (!nlo && !nhi)
+                         lo = hi = NULL_TREE;
+                       else
+@@ -591,7 +591,8 @@
+   CHK_EM (counter);
+ 
+   /* Make a set out of a set constructor */
+-  if (TREE_CODE (expr) == CONSTRUCTOR && TREE_CODE (TREE_TYPE (expr)) == SET_TYPE)
++  if (TREE_CODE (expr) == PASCAL_SET_CONSTRUCTOR
++      && TREE_CODE (TREE_TYPE (expr)) == SET_TYPE)
+     expr = construct_set (expr, NULL_TREE, 0);
+   if (TREE_CODE (TREE_TYPE (expr)) != SET_TYPE)
+     {
+@@ -600,7 +601,7 @@
+     }
+   else if (TREE_TYPE (expr) == empty_set_type_node)
+     {
+-      warning ("`for ... in []' (empty set) has no effect");
++      gpc_warning ("`for ... in []' (empty set) has no effect");
+       /* Be as silent as possible to give the optimizer a chance to remove the whole loop. */
+       empty_set = 1;
+     }
+@@ -916,7 +917,7 @@
+               || TREE_READONLY (t)
+               || TYPE_READONLY (TREE_TYPE (t))
+               || (TREE_CODE (t) == VAR_DECL && PASCAL_DECL_TYPED_CONST (t)))
+-            warning ("constant file variables are pointless");
++            gpc_warning ("constant file variables are pointless");
+ 
+           /* Always pass the internal name to the RTS, not only for external files. */
+           if (TREE_CODE (thing) == VAR_DECL)
+@@ -929,7 +930,7 @@
+           fname = build_string_constant (temp, strlen (temp), 0);
+ 
+           if (pedantic && PASCAL_TYPE_PACKED (type))
+-            warning ("`packed' has no effect on the external file format");
++            gpc_warning ("`packed' has no effect on the external file format");
+ 
+           /* Pass the size of the file buffer. */
+           file_size = (TREE_CODE (component_type) == VOID_TYPE) ? size_one_node : size_in_bytes (component_type);
+@@ -1053,10 +1054,16 @@
+       {
+         if (!TREE_VALUE (decl))
+           expand_expr_stmt (TREE_PURPOSE (decl));
+-        else if (!TREE_PURPOSE (decl))
+-          init_any (TREE_VALUE (decl), the_end, 1);
+         else
++          {
++            init_any (TREE_VALUE (decl), the_end, 1);
++            if (TREE_PURPOSE (decl))
++              expand_pascal_assignment2 (TREE_VALUE (decl),
++                                         TREE_PURPOSE (decl), 1);
++#if 0
+           expand_expr_stmt (build_modify_expr (TREE_VALUE (decl), INIT_EXPR, TREE_PURPOSE (decl)));
++#endif
++          }
+       }
+   for (decl = names; decl; decl = TREE_CHAIN (decl))
+     {
+@@ -1146,10 +1153,10 @@
+ }
+ 
+ void
+-expand_pascal_assignment (tree target, tree source)
++expand_pascal_assignment2 (tree target, tree source, int is_init)
+ {
+   tree stmt, schema_source, schema_target;
+-  int allow_restricted_target = 0, allow_restricted_source = 0;
++  int allow_restricted_target = is_init, allow_restricted_source = is_init;
+   if (EM (TREE_TYPE (source)) || EM (TREE_TYPE (target)))
+     return;
+ 
+@@ -1206,7 +1213,7 @@
+       allow_restricted_target = 1;
+     }
+ 
+-  if (!mark_lvalue (target, "assignment", 1))
++  if (!mark_lvalue (target, is_init? "initialization" : "assignment", !is_init))
+     return;
+ 
+   schema_source = undo_schema_dereference (source);
+@@ -1250,7 +1257,9 @@
+       tree schema_check = check_discriminants (schema_target, schema_source);
+       if (!EM (schema_check))
+         {
+-          if (!lvalue_or_else (schema_target, "assignment") || !mark_lvalue (schema_target, "assignment", 1))
++          if (!lvalue_or_else (schema_target, "assignment")
++              || !mark_lvalue (schema_target, is_init ? "initialization" 
++                                                : "assignment", is_init))
+             return;
+           stmt = build (MODIFY_EXPR, TREE_TYPE (schema_target),
+                           schema_target, schema_source);
+@@ -1259,12 +1268,19 @@
+             stmt = build (COMPOUND_EXPR, TREE_TYPE (stmt), schema_check, stmt);
+         }
+       else
+-        stmt = build_modify_expr (target, NOP_EXPR, source);
++        stmt = build_modify_expr (target,
++                 is_init ? INIT_EXPR : NOP_EXPR, source);
+     }
+   if (stmt && !EM (stmt))
+     expand_expr_stmt (stmt);
+ }
+ 
++void
++expand_pascal_assignment (tree target, tree source)
++{
++  expand_pascal_assignment2 (target, source, 0);
++}
++
+ tree
+ assign_set (tree target, tree source)
+ {
+@@ -1273,7 +1289,8 @@
+     return error_mark_node;
+   /* @@ Test new constructor code without this.
+         Construct a set directly to the set variable. */
+-  if (TREE_CODE (source) == CONSTRUCTOR && TREE_CODE (TREE_TYPE (source)) == SET_TYPE)
++  if (TREE_CODE (source) == PASCAL_SET_CONSTRUCTOR
++      && TREE_CODE (TREE_TYPE (source)) == SET_TYPE)
+     {
+       source = construct_set (source, target, 0);
+       if (!source)
+@@ -1310,7 +1327,7 @@
+    Each string may be either a fixed or variable length string.
+    @@@ No sophisticated checks are made for capacity violations. */
+ tree
+-assign_string (tree target, tree source)
++assign_string2 (tree target, tree source, int is_init)
+ {
+   tree length = NULL_TREE;
+   tree t_type = base_type (TREE_TYPE (target));
+@@ -1334,7 +1351,7 @@
+           if (TREE_CODE (t_type) == CHAR_TYPE)
+             {
+               if (pedantic || !(co->pascal_dialect & E_O_PASCAL))
+-                warning ("assignment of string value to char variable");
++                gpc_warning ("assignment of string value to char variable");
+               expr1 = PASCAL_STRING_VALUE (source);
+               expr1 = build_modify_expr (target, NOP_EXPR, build_array_ref (expr1,
+                 TYPE_MIN_VALUE (TYPE_DOMAIN (TREE_TYPE (expr1)))));
+@@ -1431,6 +1448,12 @@
+   return expr;
+ }
+ 
++tree
++assign_string (tree target, tree source)
++{
++  return assign_string2 (target, source, 0);
++}
++
+ /* Main program, module initializers/finalizers. */
+ 
+ static void
+Only in gpc/p: statements.c~
+Common subdirectories: /pom/kompi/gcc/tst45/pom/gpc-20060325/p/test and gpc/p/test
+diff -u /pom/kompi/gcc/tst45/pom/gpc-20060325/p/typecheck.c gpc/p/typecheck.c
+--- /pom/kompi/gcc/tst45/pom/gpc-20060325/p/typecheck.c	2006-03-24 03:47:15.000000000 +0100
++++ gpc/p/typecheck.c	2006-04-09 03:31:39.000000000 +0200
+@@ -28,6 +28,9 @@
+ 
+ #include "gpc.h"
+ 
++extern void
++set_string_length (tree value, int wide_flag, int length);
++
+ static int compatible_assignment_p (tree, tree);
+ static int check_simple_pascal_initializer (tree, tree);
+ static tree decl_constant_value (tree);
+@@ -47,7 +50,11 @@
+ static void really_start_incremental_init (tree);
+ static void push_init_level (void);
+ static tree build_bitfields_type (tree, int);
++#ifndef GCC_4_1
+ static tree do_build_constructor_rev (tree, tree);
++#else
++static tree do_build_constructor_rev (tree, VEC(constructor_elt,gc) *);
++#endif
+ static tree fill_one_record (tree *, tree, tree, tree *, HOST_WIDE_INT, HOST_WIDE_INT *);
+ static tree fake_packed_array_constructor (void);
+ static tree pop_init_level (void);
+@@ -569,6 +576,7 @@
+       && TREE_CONSTANT (DECL_INITIAL (decl))
+       /* Check for cases where this is sub-optimal, even though valid. */
+       && TREE_CODE (DECL_INITIAL (decl)) != CONSTRUCTOR
++      && TREE_CODE (DECL_INITIAL (decl)) != PASCAL_SET_CONSTRUCTOR
+       && DECL_MODE (decl) != BLKmode)
+     return DECL_INITIAL (decl);
+   return decl;
+@@ -645,7 +653,8 @@
+       return build (COMPOUND_EXPR, TREE_TYPE (op1), TREE_OPERAND (exp, 0), op1);
+     }
+ 
+-  if (!lvalue_p (exp) && !(TREE_CODE (exp) == CONSTRUCTOR && TREE_STATIC (exp))
++  if (!lvalue_p (exp) 
++      && !(TREE_CODE (exp) == CONSTRUCTOR && TREE_STATIC (exp))
+       && !((TREE_CODE (exp) == NOP_EXPR
+ #ifdef EGCS97
+             || TREE_CODE (exp) == VIEW_CONVERT_EXPR
+@@ -921,7 +930,7 @@
+            }
+          else
+         {
+-          if (TREE_CODE (val) == CONSTRUCTOR)
++          if (TREE_CODE (val) == PASCAL_SET_CONSTRUCTOR)
+             /* Convert the set constructor to the corresponding set type */
+ #if 0
+             val = construct_set (val, type, 2);
+@@ -929,7 +938,7 @@
+             /* fjf880.pas */
+             {
+               tree temp = make_new_variable ("set_parameter", partype);
+-              if (!CONSTRUCTOR_ELTS (val))
++              if (!SET_CONSTRUCTOR_ELTS (val))
+                 {
+                   construct_set (val, temp, 0);
+                   val = temp;
+@@ -1058,6 +1067,7 @@
+           && ((TYPE_READONLY (TREE_TYPE (type))
+                && (TREE_CODE (val) == STRING_CST
+                    || TREE_CODE (val) == CONSTRUCTOR
++                   || TREE_CODE (val) == PASCAL_SET_CONSTRUCTOR
+                    || !lvalue_p (val)
+                    || ((PASCAL_TYPE_STRING (TREE_TYPE (type)) || TREE_CODE (TREE_TYPE (type)) == VOID_TYPE)
+                        && (TREE_CODE (TREE_TYPE (val)) == CHAR_TYPE
+@@ -1076,7 +1086,8 @@
+                        TYPE_READONLY (TREE_TYPE (type)),
+                        TYPE_VOLATILE (TREE_TYPE (type))));
+             }
+-          else if (TREE_CODE (val) == CONSTRUCTOR && TREE_CODE (TREE_TYPE (val)) == SET_TYPE)
++          else if (TREE_CODE (val) == PASCAL_SET_CONSTRUCTOR
++                   && TREE_CODE (TREE_TYPE (val)) == SET_TYPE)
+             val = construct_set (val, NULL_TREE, 0);
+           else if (TREE_CODE (val) == FUNCTION_DECL)
+             val = build_routine_call (val, NULL_TREE);
+@@ -1927,8 +1938,11 @@
+           if (integer_zerop (capacity))
+             TREE_VALUE (init) = empty_string_node;
+           else if (TREE_CODE (TREE_VALUE (init)) == STRING_CST)
++            {
+             TREE_VALUE (init) = build_string_constant (TREE_STRING_POINTER (TREE_VALUE (init)),
+               TREE_INT_CST_LOW (capacity), PASCAL_CST_FRESH (TREE_VALUE (init)));
++              set_string_length (TREE_VALUE (init), 0, TREE_INT_CST_LOW (capacity) + 1);
++            }
+           else
+             {
+               /* We can't get here with char constants! */
+@@ -1938,6 +1952,10 @@
+             }
+           string_length = capacity;
+         }
++      else if (TREE_CODE (TREE_VALUE (init)) == STRING_CST)
++        {
++          set_string_length (TREE_VALUE (init), 0, TREE_INT_CST_LOW (capacity) + 1);
++        }
+       else if (TREE_CODE (TREE_TYPE (TREE_VALUE (init))) == CHAR_TYPE)
+         /* convert char to string: [1: char-value; 2 .. Capacity + 1: Chr (0)] */
+         TREE_VALUE (init) = tree_cons (build_tree_list (integer_one_node, NULL_TREE), TREE_VALUE (init),
+@@ -2021,17 +2039,51 @@
+           return 0;
+         }
+       /* Pointers to strings used as CStrings. */
++#if 1
++      if (TREE_CODE (TREE_VALUE (init)) == ADDR_EXPR)
++        {
++          tree s = TREE_OPERAND (TREE_VALUE (init), 0);
++          if (TREE_CODE (s) == VAR_DECL && TREE_READONLY (s)
++              && DECL_INITIAL (s)
++              && TREE_CODE (DECL_INITIAL (s)) == CONSTRUCTOR
++              && PASCAL_TYPE_DISCRIMINATED_STRING (
++                   TREE_TYPE (DECL_INITIAL (s))))
++            {
++              int constant = TREE_CONSTANT (TREE_VALUE (init));
++#ifndef GCC_4_1
++              tree t = CONSTRUCTOR_ELTS (DECL_INITIAL (s));
++              TREE_VALUE (init) = build1 (ADDR_EXPR, cstring_type_node,
++                  TREE_VALUE (TREE_CHAIN (TREE_CHAIN (t))));
++#else
++              VEC(constructor_elt,gc) *elts = CONSTRUCTOR_ELTS (
++                                                    DECL_INITIAL (s));
++              TREE_VALUE (init) = build1 (ADDR_EXPR, cstring_type_node,
++                  VEC_index (constructor_elt, elts, 2)->value);
++#endif
++              TREE_CONSTANT (TREE_VALUE (init)) = constant;
++              return 0;
++            }
++        }
++#else
+       if (TREE_CODE (TREE_VALUE (init)) == ADDR_EXPR
+           && TREE_CODE (TREE_OPERAND (TREE_VALUE (init), 0)) == CONSTRUCTOR
+           && PASCAL_TYPE_DISCRIMINATED_STRING (TREE_TYPE (TREE_OPERAND (TREE_VALUE (init), 0))))
+         {
+           int constant = TREE_CONSTANT (TREE_VALUE (init));
++#ifndef GCC_4_1
+           tree t = CONSTRUCTOR_ELTS (TREE_OPERAND (TREE_VALUE (init), 0));
+           TREE_VALUE (init) = build1 (ADDR_EXPR, cstring_type_node,
+             TREE_VALUE (TREE_CHAIN (TREE_CHAIN (t))));
++#else
++          VEC(constructor_elt,gc) *elts = CONSTRUCTOR_ELTS (
++                      TREE_OPERAND (TREE_VALUE (init), 0));
++          TREE_VALUE (init) = build1 (ADDR_EXPR, cstring_type_node,
++            VEC_index (constructor_elt, elts, 2)->value);
++#endif
+           TREE_CONSTANT (TREE_VALUE (init)) = constant;
+           return 0;
+         }
++#endif
+     }
+ 
+   /* Procedural variables. (Pointers to routines should cause no problems.) */
+@@ -2049,14 +2101,14 @@
+     }
+ 
+   /* Sets. */
+-  if (TREE_CODE (TREE_VALUE (init)) == CONSTRUCTOR
++  if (TREE_CODE (TREE_VALUE (init)) == PASCAL_SET_CONSTRUCTOR
+       && TREE_CODE (TREE_TYPE (TREE_VALUE (init))) == SET_TYPE
+       && TREE_CODE (type) == SET_TYPE
+       && TREE_TYPE (TREE_VALUE (init)) == empty_set_type_node)
+     {
+       /* The type of the set constructor was not known to the parser.
+          Specify it now, but check it first. */
+-      tree elements = CONSTRUCTOR_ELTS (TREE_VALUE (init));
++      tree elements = SET_CONSTRUCTOR_ELTS (TREE_VALUE (init));
+       if (elements && !comptypes (TYPE_MAIN_VARIANT (TREE_TYPE (TREE_PURPOSE (elements))),
+                                   TYPE_MAIN_VARIANT (TREE_TYPE (type))))
+         return 1;
+@@ -2784,6 +2836,9 @@
+         break;
+ 
+       case CONSTRUCTOR:
++#ifdef GCC_4_1
++      case PASCAL_SET_CONSTRUCTOR:
++#endif
+         TREE_ADDRESSABLE (x) = 1;
+         return 1;
+ 
+@@ -2932,10 +2987,13 @@
+              so the usual warnings are not appropriate. */
+           if (TREE_CODE (ttr) != FUNCTION_TYPE && TREE_CODE (ttl) != FUNCTION_TYPE)
+             {
++#if 0
+               if (!TYPE_READONLY (ttl) && TYPE_READONLY (ttr))
+                 assignment_error_or_warning ("%s discards `const' from pointer target type",
+                                              errtype, fundecl, parmnum, 0);
+-              else if (!TYPE_VOLATILE (ttl) && TYPE_VOLATILE (ttr))
++              else 
++#endif
++              if (!TYPE_VOLATILE (ttl) && TYPE_VOLATILE (ttr))
+                 assignment_error_or_warning ("%s discards `volatile' from pointer target type",
+                                              errtype, fundecl, parmnum, 0);
+               else if (TREE_CODE (ttl) == INTEGER_TYPE && TREE_CODE (ttr) == INTEGER_TYPE)
+@@ -3090,7 +3148,7 @@
+     }
+   else
+     {
+-      warning (msg, opname);
++      gpc_warning (msg, opname);
+       if (name)
+         warning_with_decl (fundecl, " routine declaration");
+     }
+@@ -3516,7 +3574,11 @@
+ /* If we are saving up the elements rather than allocating them,
+    this is the list of elements so far (in reverse order,
+    most recent first). */
++#ifndef GCC_4_1
+ static tree constructor_elements;
++#else
++static VEC(constructor_elt,gc) *constructor_elements;
++#endif
+ 
+ /* 1 if so far this constructor's elements are all compile-time constants. */
+ static int constructor_constant;
+@@ -3550,7 +3612,11 @@
+   tree max_index;
+   tree unfilled_index;
+   tree unfilled_fields;
++#ifndef GCC_4_1
+   tree elements;
++#else
++  VEC(constructor_elt,gc) *elements;
++#endif
+   int offset;
+   tree pending_elts;
+   int depth;
+@@ -3762,7 +3828,11 @@
+     return NULL_TREE;  /* avoid further error messages */
+   gcc_assert (TREE_CODE (init) == TREE_LIST);
+ 
++#ifndef GCC_4_1
+   constructor_elements = NULL_TREE;
++#else
++  constructor_elements = NULL;
++#endif
+   constructor_stack = 0;
+   spelling_base = 0;
+   spelling_size = 0;
+@@ -3881,7 +3951,11 @@
+   constructor_constant = 1;
+   constructor_simple = 1;
+   constructor_depth = SPELLING_DEPTH ();
++#ifndef GCC_4_1
+   constructor_elements = NULL_TREE;
++#else
++  constructor_elements = NULL;
++#endif
+   constructor_pending_elts = NULL_TREE;
+ 
+   /* Don't die if an entire brace-pair level is superfluous in the containing level. */
+@@ -3963,10 +4037,19 @@
+   return type;
+ }
+ 
++#ifndef GCC_4_1
+ static tree
+ do_build_constructor_rev (tree type, tree el)
++#else
++static tree
++do_build_constructor_rev (tree type, VEC(constructor_elt,gc) *el)
++#endif
+ {
++#ifndef GCC_4_1
+   tree constructor = build_constructor (type, nreverse (el));
++#else
++  tree constructor = build_constructor (type, el);
++#endif
+   if (constructor_constant)
+     {
+       TREE_CONSTANT (constructor) = 1;
+@@ -3982,7 +4065,11 @@
+ static tree
+ fill_one_record (tree *pel, tree min, tree ptype, tree *fields, HOST_WIDE_INT maxnr, HOST_WIDE_INT *pnr)
+ {
++#ifndef GCC_4_1
+   tree prl = NULL_TREE;
++#else
++  VEC(constructor_elt,gc) * prl = NULL;
++#endif
+   tree el = *pel;
+   HOST_WIDE_INT oanr = 0;
+   int first = 1;
+@@ -4003,7 +4090,8 @@
+         }
+       if (anr != oanr)
+         break;
+-      prl = tree_cons (fields[nr], TREE_VALUE (el), prl);
++
++      CONSTRUCTOR_APPEND_ELT (prl, fields[nr], TREE_VALUE (el));
+       el = TREE_CHAIN (el);
+       *pel = el;
+     }
+@@ -4013,11 +4101,35 @@
+ static tree
+ fake_packed_array_constructor (void)
+ {
+-  tree rtype = NULL_TREE, rfields = NULL_TREE, rl = NULL_TREE;
+-  tree type = constructor_type, el = nreverse (constructor_elements);
+-  tree tsize = pascal_array_type_nelts (type), orig_el = el;
++  tree rtype = NULL_TREE, rfields = NULL_TREE;
++  tree type = constructor_type;
++#ifndef GCC_4_1
++  tree rl = NULL_TREE;
++  tree el = nreverse (constructor_elements);
++#else
++  VEC(constructor_elt,gc) * rl = NULL;
++  tree el = NULL_TREE;
++#endif
++  tree tsize = pascal_array_type_nelts (type), orig_el;
+   HOST_WIDE_INT size = TREE_INT_CST_LOW (tsize), asize = size / BITS_PER_UNIT;
+   int psize = size % BITS_PER_UNIT;
++
++#ifdef GCC_4_1
++  {
++    VEC(constructor_elt,gc) *elts = constructor_elements;
++    unsigned HOST_WIDE_INT ix;
++    ix = VEC_length (constructor_elt, elts);
++    while (ix > 0)
++      {
++        ix--;
++        el = tree_cons (VEC_index (constructor_elt, elts, ix)->index,
++                VEC_index (constructor_elt, elts, ix)->value, el);
++      }
++  }
++#endif
++
++  orig_el = el;
++
+   if (size <= 0 || TREE_INT_CST_HIGH (tsize))
+     {
+       error ("array too large");
+@@ -4027,7 +4139,12 @@
+     {
+       tree ptype = build_bitfields_type (TREE_TYPE (type), BITS_PER_UNIT);
+       tree fields[BITS_PER_UNIT];
+-      tree atype, arfield, al = NULL_TREE, t;
++      tree atype, arfield, t;
++#ifndef GCC_4_1
++      tree al = NULL_TREE;
++#else
++      VEC(constructor_elt,gc) * al = NULL;
++#endif
+       int i;
+       for (i = 0, t = TYPE_FIELDS (ptype); i < BITS_PER_UNIT; i++, t = TREE_CHAIN (t))
+         fields[i] = t;
+@@ -4040,10 +4157,12 @@
+           tree br = fill_one_record (&el, TYPE_MIN_VALUE (TYPE_DOMAIN (type)), ptype, fields, asize, &anr);
+           if (!br)
+             break;
+-          al = tree_cons (build_int_2 (anr, 0), br, al);
++
++          CONSTRUCTOR_APPEND_ELT (al, build_int_2 (anr, 0), br);
+         }
+       if (al)
+-        rl = build_tree_list (arfield, do_build_constructor_rev (atype, al));
++        CONSTRUCTOR_APPEND_ELT (rl, arfield,
++           do_build_constructor_rev (atype, al));
+     }
+   if (psize)
+     {
+@@ -4063,7 +4182,7 @@
+           HOST_WIDE_INT anr;
+           tree pr1 = fill_one_record (&el, TYPE_MIN_VALUE (TYPE_DOMAIN (type)), ptype1, fields1, asize + 1, &anr);
+           if (pr1)
+-            rl = tree_cons (prfield, pr1, rl);
++            CONSTRUCTOR_APPEND_ELT (rl, prfield, pr1);
+         }
+     }
+   gcc_assert (!el);
+@@ -4116,8 +4235,12 @@
+     {
+       /* A scalar initializer -- just return the element, after
+          verifying there is just one. */
++#ifndef GCC_4_1
+       gcc_assert (constructor_elements && !TREE_CHAIN (constructor_elements));
+       constructor = TREE_VALUE (constructor_elements);
++#else
++      gcc_unreachable ();
++#endif
+     }
+   else
+     {
+@@ -4139,7 +4262,12 @@
+                && count_bits (TREE_TYPE (constructor_type), NULL))
+             constructor = fake_packed_array_constructor ();
+           else
++#ifndef GCC_4_1
+             constructor = build_constructor (constructor_type, nreverse (constructor_elements));
++#else
++            constructor = build_constructor (constructor_type,
++                                               constructor_elements);
++#endif
+           if (constructor_constant)
+             {
+               TREE_CONSTANT (constructor) = 1;
+@@ -4379,8 +4507,10 @@
+     {
+       /* Otherwise, output this element to constructor_elements. */
+       if (!duplicate)
+-        constructor_elements = tree_cons (field,
+-          digest_init (type, value, require_constant_value), constructor_elements);
++        {
++          value = digest_init (type, value, require_constant_value);
++          CONSTRUCTOR_APPEND_ELT (constructor_elements, field, value);
++        }
+ 
+       /* Advance the variable that indicates sequential elements output. */
+       if (TREE_CODE (constructor_type) == ARRAY_TYPE)
+Only in gpc/p: typecheck.c~
+diff -u /pom/kompi/gcc/tst45/pom/gpc-20060325/p/types.c gpc/p/types.c
+--- /pom/kompi/gcc/tst45/pom/gpc-20060325/p/types.c	2006-03-24 03:47:15.000000000 +0100
++++ gpc/p/types.c	2006-04-06 05:35:47.000000000 +0200
+@@ -82,7 +82,7 @@
+           if (TYPE_LANG_CODE_TEST (type, PASCAL_LANG_ABSTRACT_OBJECT))
+             error ("abstract object type declared as function result type");
+           else if (co->warn_object_assignment)
+-            warning ("object type declared as function result type");
++            gpc_warning ("object type declared as function result type");
+         }
+       if (!SCALAR_TYPE (TREE_CODE (type)))
+         chk_dialect ("structured function result types are", NOT_CLASSIC_PASCAL);
+@@ -281,7 +281,7 @@
+           && TREE_CODE (upper) == INTEGER_CST
+           && tree_int_cst_lt (upper, lower))
+         {
+-          warning ("set constructor range is empty");
++          gpc_warning ("set constructor range is empty");
+           *pres = TREE_CHAIN (m);
+           continue;
+         }
+@@ -307,8 +307,8 @@
+   /* A single element/range with side-effects should be safe. */
+   if (side_effects && TREE_CHAIN (elements))
+     {
+-      warning ("expressions with side-effects in set constructors are");
+-      warning (" problematic since evaluation is implementation-dependent");
++      gpc_warning ("expressions with side-effects in set constructors are");
++      gpc_warning (" problematic since evaluation is implementation-dependent");
+     }
+   /* Sort and merge constant constructor elements */
+   if (is_intcst && n)
+@@ -338,9 +338,9 @@
+           i = j;
+         }
+     }
+-  t = make_node (CONSTRUCTOR);
++  t = make_node (PASCAL_SET_CONSTRUCTOR);
+   TREE_TYPE (t) = empty_set_type_node;  /* real type not yet known */
+-  CONSTRUCTOR_ELTS (t) = elements;
++  SET_CONSTRUCTOR_ELTS (t) = elements;
+   TREE_CONSTANT (t) = TREE_STATIC (t) = is_constant;
+ #ifdef GCC_4_0
+   TREE_INVARIANT (t) = is_constant;
+@@ -355,10 +355,10 @@
+ limited_set (tree lo)
+ {
+   tree hi = fold (build_pascal_binary_op (PLUS_EXPR, lo, size_int (co->set_limit - 1)));
+-  warning ("constructing limited integer set `%li .. %li';",
++  gpc_warning ("constructing limited integer set `%li .. %li';",
+            (long int) TREE_INT_CST_LOW (lo),
+            (long int) TREE_INT_CST_LOW (hi));
+-  warning (" use `--setlimit=NUMBER' to change the size limit at compile time.");
++  gpc_warning (" use `--setlimit=NUMBER' to change the size limit at compile time.");
+   return hi;
+ }
+ 
+@@ -384,7 +384,7 @@
+   tree elements, elem, set_low, set_high, setsize, this_set_type;
+   tree nelem;
+   CHK_EM (constructor);
+-  elements = CONSTRUCTOR_ELTS (constructor);
++  elements = SET_CONSTRUCTOR_ELTS (constructor);
+   if (!elements && (arg_type == 0 || (arg_type == 1 && !target_or_type)))
+     {
+       if (arg_type == 0 && target_or_type)
+@@ -511,7 +511,7 @@
+       nelem = tree_cons (lo2, hi2, nelem);
+     }
+   nelem = nreverse (nelem);
+-  CONSTRUCTOR_ELTS (constructor) = nelem;
++  SET_CONSTRUCTOR_ELTS (constructor) = nelem;
+   return constructor;
+ }
+ 
+@@ -1485,6 +1485,7 @@
+              are handled differently above, anyway.) */
+           TYPE_PRECISION (type) = ((TREE_INT_CST_LOW (bits) + BITS_PER_UNIT - 1)
+                                    / BITS_PER_UNIT) * BITS_PER_UNIT;
++          TYPE_ALIGN (type) = 0;
+           layout_type (type);
+         }
+     }
+@@ -1800,7 +1801,7 @@
+       if (TREE_CODE (l) != INTEGER_CST || TREE_CODE (h) != INTEGER_CST || const_lt (h, l))
+         {
+           if (co->warn_dynamic_arrays)
+-            warning ("dynamic array");
++            gpc_warning ("dynamic array");
+           if (current_function_decl)  /* @@ otherwise do it in module constructor */
+             expand_expr_stmt (build (COND_EXPR, pascal_integer_type_node,
+               build_implicit_pascal_binary_op (LT_EXPR, hi, lo),
+@@ -1819,7 +1820,7 @@
+   enum tree_code code = TREE_CODE (expr);
+   if (code == VAR_DECL && !PASCAL_INITIALIZED (expr) && !PASCAL_VALUE_ASSIGNED (expr)
+       && !PASCAL_TREE_DISCRIMINANT (expr) && DECL_CONTEXT (expr) == current_function_decl)
+-    warning ("`%s' might be used uninitialized in type definition", IDENTIFIER_NAME (DECL_NAME (expr)));
++    gpc_warning ("`%s' might be used uninitialized in type definition", IDENTIFIER_NAME (DECL_NAME (expr)));
+   else if (IS_EXPR_OR_REF_CODE_CLASS (TREE_CODE_CLASS (code)))
+     {
+       int i, l = NUMBER_OF_OPERANDS (code);
+@@ -2658,6 +2659,7 @@
+     }
+   else if (TREE_CODE (arg1) == INTEGER_CST && TREE_CODE (arg0) == CONSTRUCTOR)
+     {
++#ifndef GCC_4_1
+       tree elts = CONSTRUCTOR_ELTS (arg0);
+       arg1 = range_check (TYPE_DOMAIN (TREE_TYPE (arg0)), arg1);
+       CHK_EM (arg1);
+@@ -2667,6 +2669,17 @@
+             return TREE_VALUE (elts);
+           elts = TREE_CHAIN (elts);
+         }
++#else
++      VEC(constructor_elt,gc) *elts = CONSTRUCTOR_ELTS (arg0);
++      tree index, value;
++      unsigned HOST_WIDE_INT ix;
++      arg1 = range_check (TYPE_DOMAIN (TREE_TYPE (arg0)), arg1);
++      FOR_EACH_CONSTRUCTOR_ELT (elts, ix, index, value)
++        {
++          if (tree_int_cst_equal (arg1, index))
++            return value;
++        }
++#endif
+     }
+   return t;
+ }
+@@ -2953,7 +2966,7 @@
+   int need_new_variant;
+ 
+   if (bindable && !PASCAL_TYPE_FILE (type))
+-    warning ("GPC supports `bindable' only for files");
++    gpc_warning ("GPC supports `bindable' only for files");
+ 
+   CHK_EM (type);
+ 
+Common subdirectories: /pom/kompi/gcc/tst45/pom/gpc-20060325/p/units and gpc/p/units
+Common subdirectories: /pom/kompi/gcc/tst45/pom/gpc-20060325/p/utils and gpc/p/utils
+Common subdirectories: /pom/kompi/gcc/tst45/pom/gpc-20060325/p/test/CVS and gpc/p/test/CVS
+diff -u /pom/kompi/gcc/tst45/pom/gpc-20060325/p/test/README gpc/p/test/README
+--- /pom/kompi/gcc/tst45/pom/gpc-20060325/p/test/README	2006-02-18 14:37:53.000000000 +0100
++++ gpc/p/test/README	2006-04-04 19:39:50.000000000 +0200
+@@ -4,7 +4,7 @@
+ Note: This file is the `README' file of the `test' directory in the GPC
+ source distribution, _and_ the file `BUGS' in GPC binary distributions.
+ 
+-GPC 2.1, 20060215
++GPC 2.1, 20060325
+ 
+ 1 The GPC Test Suite
+ ********************
+diff -u /pom/kompi/gcc/tst45/pom/gpc-20060325/p/test/c_gpc.pas gpc/p/test/c_gpc.pas
+--- /pom/kompi/gcc/tst45/pom/gpc-20060325/p/test/c_gpc.pas	2006-02-18 14:23:00.000000000 +0100
++++ gpc/p/test/c_gpc.pas	2006-04-06 05:35:48.000000000 +0200
+@@ -33,14 +33,14 @@
+ { External declarations we use from the C code }
+ 
+ var
+-  CVariable: Integer; external name 'c_variable';
++  CVariable: CInteger; external name 'c_variable';
+ 
+ procedure CRoutine; external name 'c_routine';
+ 
+ { Pascal code }
+ 
+ var
+-  PascalProgramVariable: Integer = 17; attribute (name = 'pascal_program_variable');
++  PascalProgramVariable: CInteger = 17; attribute (name = 'pascal_program_variable');
+ 
+ procedure PascalProgramRoutine; attribute (name = 'pascal_program_routine');
+ begin
+diff -u /pom/kompi/gcc/tst45/pom/gpc-20060325/p/test/chief40.pas gpc/p/test/chief40.pas
+--- /pom/kompi/gcc/tst45/pom/gpc-20060325/p/test/chief40.pas	2002-09-23 09:39:12.000000000 +0200
++++ gpc/p/test/chief40.pas	2006-04-06 05:35:48.000000000 +0200
+@@ -4,12 +4,15 @@
+   a : LongInt;
+   b : Byte;
+ 
++const
++  MaxCInt = High (CInteger);
++
+ begin
+-  a := 2 * MaxInt;
++  a := 2 * MaxCInt;
+   b := 10;
+   a := 2 * a + b;
+-  if (a = 4 * MaxInt + 10) and (a > MaxInt) then
++  if (a = 4 * MaxCInt + 10) and (a > MaxCInt) then
+     WriteLn ('OK')
+   else
+-    WriteLn ('failed ', a, ' ', 4 * MaxInt + 10, ' ', a > MaxInt)
++    WriteLn ('failed ', a, ' ', 4 * MaxCInt + 10, ' ', a > MaxCInt)
+ end.
+Only in gpc/p/test: fjf1102.pas
+Only in gpc/p/test: fjf1103.pas
+Only in gpc/p/test: fjf1104.pas
+diff -u /pom/kompi/gcc/tst45/pom/gpc-20060325/p/test/fjf186.pas gpc/p/test/fjf186.pas
+--- /pom/kompi/gcc/tst45/pom/gpc-20060325/p/test/fjf186.pas	2005-01-19 15:23:19.000000000 +0100
++++ gpc/p/test/fjf186.pas	2006-04-06 06:24:30.000000000 +0200
+@@ -2,7 +2,7 @@
+ var
+   f:text;
+   s:string(100);
+-  n:string(20)=ParamStr (1);  { Idea how to solve this: let init_any() }
++  n:string(520)=ParamStr (1);  { Idea how to solve this: let init_any() }
+ begin                         { generate code to do the initialization }
+   if n = '' then
+     begin
+Only in gpc/p/test: fjf186.pas~
+diff -u /pom/kompi/gcc/tst45/pom/gpc-20060325/p/test/fjf327.pas gpc/p/test/fjf327.pas
+--- /pom/kompi/gcc/tst45/pom/gpc-20060325/p/test/fjf327.pas	2005-02-23 07:09:05.000000000 +0100
++++ gpc/p/test/fjf327.pas	2006-04-06 05:35:48.000000000 +0200
+@@ -1,10 +1,10 @@
+ program fjf327;
+ 
+ var
+-  a : Cardinal = High (Cardinal) - 2;
++  a : CCardinal = High (CCardinal) - 2;
+   c : LongInt;
+ 
+ begin
+   c := - a;
+-  if c = 2 - LongInt (High (Cardinal)) then writeln ('OK') else writeln ('failed ', c)
++  if c = 2 - LongInt (High (CCardinal)) then writeln ('OK') else writeln ('failed ', c)
+ end.
+diff -u /pom/kompi/gcc/tst45/pom/gpc-20060325/p/test/fjf526a.pas gpc/p/test/fjf526a.pas
+--- /pom/kompi/gcc/tst45/pom/gpc-20060325/p/test/fjf526a.pas	2005-01-05 01:56:39.000000000 +0100
++++ gpc/p/test/fjf526a.pas	2006-04-06 05:35:48.000000000 +0200
+@@ -5,7 +5,7 @@
+   a, b: LongInt;
+ 
+ begin
+-  b := 1 shl BitSizeOf (Integer) + 1;
++  b := 1 shl BitSizeOf (CInteger) + 1;
+   Rewrite (f, 1);
+   BlockWrite (f, a, SizeOf (a));
+   Reset (f, 1);
+diff -u /pom/kompi/gcc/tst45/pom/gpc-20060325/p/test/fjf526b.pas gpc/p/test/fjf526b.pas
+--- /pom/kompi/gcc/tst45/pom/gpc-20060325/p/test/fjf526b.pas	2005-01-05 01:56:47.000000000 +0100
++++ gpc/p/test/fjf526b.pas	2006-04-06 05:35:48.000000000 +0200
+@@ -5,7 +5,7 @@
+   a, b: LongInt;
+ 
+ begin
+-  b := 1 shl BitSizeOf (Integer) + 1;
++  b := 1 shl BitSizeOf (CInteger) + 1;
+   Rewrite (f, 1);
+   BlockWrite (f, a, b and $ffffffff);
+   WriteLn ('OK')
+diff -u /pom/kompi/gcc/tst45/pom/gpc-20060325/p/test/gpc_c_p.pas gpc/p/test/gpc_c_p.pas
+--- /pom/kompi/gcc/tst45/pom/gpc-20060325/p/test/gpc_c_p.pas	2006-02-18 14:23:04.000000000 +0100
++++ gpc/p/test/gpc_c_p.pas	2006-04-06 05:35:48.000000000 +0200
+@@ -42,14 +42,14 @@
+ { External declarations we use from the C code }
+ 
+ var
+-  CVariable: Integer; external name 'c_variable';
++  CVariable: CInteger; external name 'c_variable';
+ 
+ procedure CRoutine; external name 'c_routine';
+ 
+ { Pascal code }
+ 
+ var
+-  PascalProgramVariable: Integer = 17; attribute (name = 'pascal_program_variable');
++  PascalProgramVariable: CInteger = 17; attribute (name = 'pascal_program_variable');
+ 
+ procedure PascalProgramRoutine; attribute (name = 'pascal_program_routine');
+ begin
+diff -u /pom/kompi/gcc/tst45/pom/gpc-20060325/p/test/gpc_c_u.pas gpc/p/test/gpc_c_u.pas
+--- /pom/kompi/gcc/tst45/pom/gpc-20060325/p/test/gpc_c_u.pas	2006-02-18 14:23:04.000000000 +0100
++++ gpc/p/test/gpc_c_u.pas	2006-04-06 05:35:48.000000000 +0200
+@@ -30,7 +30,7 @@
+ interface
+ 
+ var
+-  PascalUnitVariable: Integer = 42; attribute (name = 'pascal_unit_variable');
++  PascalUnitVariable: CInteger = 42; attribute (name = 'pascal_unit_variable');
+ 
+ procedure PascalUnitRoutine; attribute (name = 'pascal_unit_routine');
+ 
+diff -u /pom/kompi/gcc/tst45/pom/gpc-20060325/p/test/shl.pas gpc/p/test/shl.pas
+--- /pom/kompi/gcc/tst45/pom/gpc-20060325/p/test/shl.pas	2002-09-23 09:39:12.000000000 +0200
++++ gpc/p/test/shl.pas	2006-04-06 05:35:48.000000000 +0200
+@@ -1,14 +1,14 @@
+ program ShlTest;
+ 
+ var
+-  a: Integer = 1;
++  a: CInteger = 1;
+   i: LongestInt;
+ 
+ begin
+ 
+-  i := 1 shl (BitSizeOf (Integer) + 3);
++  i := 1 shl (BitSizeOf (CInteger) + 3);
+   if i <= 0 then begin WriteLn ('failed a1'); Halt end;
+-  if i shr (BitSizeOf (Integer) + 3) <> 1 then begin WriteLn ('failed a2'); Halt end;
++  if i shr (BitSizeOf (CInteger) + 3) <> 1 then begin WriteLn ('failed a2'); Halt end;
+ 
+   i := 1 shl (BitSizeOf (MedInt) - 2);
+   if i <= 0 then begin WriteLn ('failed a3'); Halt end;
+@@ -18,9 +18,9 @@
+   if i <= 0 then begin WriteLn ('failed a5'); Halt end;
+   if i <> $10000000000 then begin WriteLn ('failed a6'); Halt end;
+ 
+-  i := a shl (BitSizeOf (Integer) + 3);
++  i := a shl (BitSizeOf (CInteger) + 3);
+   if i <= 0 then begin WriteLn ('failed b1'); Halt end;
+-  if i shr (BitSizeOf (Integer) + 3) <> 1 then begin WriteLn ('failed b2'); Halt end;
++  if i shr (BitSizeOf (CInteger) + 3) <> 1 then begin WriteLn ('failed b2'); Halt end;
+ 
+   i := a shl (BitSizeOf (MedInt) - 2);
+   if i <= 0 then begin WriteLn ('failed b3'); Halt end;
+Common subdirectories: /pom/kompi/gcc/tst45/pom/gpc-20060325/p/test/todo and gpc/p/test/todo
+Only in /pom/kompi/gcc/tst45/pom/gpc-20060325/p/utils/: .#gpidump.pas.1.10
+Only in /pom/kompi/gcc/tst45/pom/gpc-20060325/p/utils/: .#gpidump.pas.1.8
+Only in /pom/kompi/gcc/tst45/pom/gpc-20060325/p/utils/: .#mk-t-inc.1.3
+Common subdirectories: /pom/kompi/gcc/tst45/pom/gpc-20060325/p/utils/CVS and gpc/p/utils/CVS
+diff -u /pom/kompi/gcc/tst45/pom/gpc-20060325/p/utils/gpidump.pas gpc/p/utils/gpidump.pas
+--- /pom/kompi/gcc/tst45/pom/gpc-20060325/p/utils/gpidump.pas	2006-03-24 03:47:16.000000000 +0100
++++ gpc/p/utils/gpidump.pas	2006-04-10 03:51:11.000000000 +0200
+@@ -902,6 +902,9 @@
+              {$ifdef EGCS97}
+              Ref ('size_unit');
+              {$endif}
++{$ifdef GCC_4_1}
++             if TreeCode <> FUNCTION_DECL then
++{$endif}
+              Write (', align ', Number (GetNumber (Pos1), 0))
+            end;
+       'c': Ref ('type');
+@@ -1166,6 +1169,18 @@
+       OPERATOR_DECL:    ;
+       PLACEHOLDER_EXPR: Ref ('type');
+       NON_LVALUE_EXPR:  if IsPackedAccess then Ref ('packed_info');
++{$ifdef GCC_4_1}
++      CONSTRUCTOR:    begin
++                          var j, k : GPIInt;
++                          Ref ('type');
++                          k := GetNumber (Pos1);
++                          for j := 1 to k do begin
++                            Ref('index');
++                            Ref('value')
++                          end;
++                        end;
++
++{$endif}
+       else              if not ClassDone 
+                            {$ifndef GCC_4_0} or (TreeCode = RTL_EXPR) {$endif}
+                           then Error ('unknown tree code')
+@@ -1232,7 +1247,7 @@
+         GPI_CHUNK_VERSION:        begin
+                                     WriteLn;
+                                     DumpChars (' ', 0, ChunkLength - 1);
+-                                    if (ChunkLength = 0) or not IsSuffix (GCC_VERSION, Buf^.Chars[0 .. ChunkLength - 1]) then
++                                    if (ChunkLength = 0)  { or not IsSuffix (GCC_VERSION, Buf^.Chars[0 .. ChunkLength - 1]) } then
+                                       begin
+                                         WriteLn;
+                                         Error ('backend version in GPI file does not match (rebuild GPIDump for your compiler version)')
+Only in gpc/p/utils/: gpidump.pas~
--- gcj-4.2-4.2-20070707.orig/debian/patches/mips-libjava-interp.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/mips-libjava-interp.dpatch
@@ -0,0 +1,39 @@
+#! /bin/sh -e
+
+# DP: Enable the libjava interpreter on mips/mipsel.
+
+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
+
+--- libjava/configure.host~	2006-04-22 01:59:20.293222320 +0200
++++ libjava/configure.host	2006-04-22 02:02:17.173332456 +0200
+@@ -90,6 +90,9 @@
+  	enable_java_net_default=no
+  	enable_getenv_properties_default=no
+ 	;;
++  mips*-linux*)
++	libgcj_interpreter=yes
++	;;
+   i686-*|i586-*|i486-*|i386-*)
+ 	sysdeps_dir=i386
+ 	# With -fomit-frame-pointer -maccumulate-outgoing-args (implied),
--- gcj-4.2-4.2-20070707.orig/debian/patches/pr32522.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/pr32522.dpatch
@@ -0,0 +1,51 @@
+#! /bin/sh -e
+
+# DP: Proposed patch for PR target/32522.
+
+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/alpha/alpha.c~	2007-06-11 20:16:33.000000000 +0200
++++ gcc/config/alpha/alpha.c	2007-06-30 12:12:08.000000000 +0200
+@@ -6111,8 +6111,8 @@
+ 			     valist, offset_field, NULL_TREE);
+ 
+       t = make_tree (ptr_type_node, virtual_incoming_args_rtx);
+-      t = build2 (PLUS_EXPR, ptr_type_node, t,
+-		  build_int_cst (NULL_TREE, offset));
++      t = build2 (POINTER_PLUS_EXPR, ptr_type_node, t,
++		  size_int (offset));
+       t = build2 (GIMPLE_MODIFY_STMT, TREE_TYPE (base_field), base_field, t);
+       TREE_SIDE_EFFECTS (t) = 1;
+       expand_expr (t, const0_rtx, VOIDmode, EXPAND_NORMAL);
+@@ -6172,8 +6172,8 @@
+     }
+ 
+   /* Build the final address and force that value into a temporary.  */
+-  addr = build2 (PLUS_EXPR, ptr_type, fold_convert (ptr_type, base),
+-	         fold_convert (ptr_type, addend));
++  addr = build2 (POINTER_PLUS_EXPR, ptr_type, fold_convert (ptr_type, base),
++		 fold_convert (sizetype, addend));
+   internal_post = NULL;
+   gimplify_expr (&addr, pre_p, &internal_post, is_gimple_val, fb_rvalue);
+   append_to_statement_list (internal_post, pre_p);
--- gcj-4.2-4.2-20070707.orig/debian/patches/netbsd-archs-gcc.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/netbsd-archs-gcc.dpatch
@@ -0,0 +1,38 @@
+#! /bin/sh -e
+
+# DP: Arch-specific changes to gcc.config
+
+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/config.gcc src/gcc/config.gcc
+--- gcc/config.gcc	2003-03-02 07:39:03.000000000 +0000
++++ gcc/config.gcc	2003-04-24 06:02:55.000000000 +0000
+@@ -1127,6 +1127,9 @@
+ x86_64-*-freebsd*)
+ 	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ${fbsd_tm_file} i386/x86-64.h i386/freebsd.h i386/freebsd64.h"
+ 	;;
++i[34567]86-*-netbsdelf*-gnu*)
++	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h netbsd-gnu.h netbsd-elf-gnu.h i386/netbsd-elf.h"
++	;;
+ i[34567]86-*-netbsdelf*)
+ 	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h netbsd.h netbsd-elf.h i386/netbsd-elf.h"
+ 	;;
--- gcj-4.2-4.2-20070707.orig/debian/patches/arm-gij.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/arm-gij.dpatch
@@ -0,0 +1,37 @@
+#! /bin/sh -e
+
+# DP: Enable gij interpreter on arm
+
+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 -p1 < $0
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p1 < $0
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+--- src/libjava/configure.host.old	2005-12-31 16:06:00.900551776 +0000
++++ src/libjava/configure.host	2005-12-31 16:06:25.879754360 +0000
+@@ -98,6 +98,9 @@
+ 	enable_hash_synchronization_default=yes
+ 	slow_pthread_self=yes
+ 	;;
++  arm*-*)
++	libgcj_interpreter=yes
++	;;
+   x86_64-*)
+ 	sysdeps_dir=x86-64
+ 	libgcj_flags="${libgcj_flags} -ffloat-store -fno-omit-frame-pointer"
--- gcj-4.2-4.2-20070707.orig/debian/patches/m68k-dwarf2.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/m68k-dwarf2.dpatch
@@ -0,0 +1,144 @@
+#! /bin/sh -e
+
+# All lines beginning with `# DPATCH:' are a description of the patch.
+# DP: Recognize stack adjustments also in the src of an instruction.
+
+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 -p1 < $0
+        #cd ${dir}gcc && autoconf
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p1 < $0
+        #rm ${dir}gcc/configure
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+---
+
+ gcc/dwarf2out.c |   83 +++++++++++++++++++++++++++++++-------------------------
+ 1 file changed, 47 insertions(+), 36 deletions(-)
+
+Index: gcc-4.1/gcc/dwarf2out.c
+===================================================================
+--- gcc-4.1.orig/gcc/dwarf2out.c
++++ gcc-4.1/gcc/dwarf2out.c
+@@ -1045,6 +1045,7 @@ stack_adjust_offset (rtx pattern)
+   rtx src = SET_SRC (pattern);
+   rtx dest = SET_DEST (pattern);
+   HOST_WIDE_INT offset = 0;
++  enum machine_mode mode;
+   enum rtx_code code;
+ 
+   if (dest == stack_pointer_rtx)
+@@ -1059,52 +1060,62 @@ stack_adjust_offset (rtx pattern)
+       offset = INTVAL (XEXP (src, 1));
+       if (code == PLUS)
+ 	offset = -offset;
++      return offset;
+     }
+-  else if (MEM_P (dest))
++  if (MEM_P (dest)
++      && GET_RTX_CLASS (GET_CODE (XEXP (dest, 0))))
+     {
+       /* (set (mem (pre_dec (reg sp))) (foo)) */
++      mode = GET_MODE (dest);
+       src = XEXP (dest, 0);
+-      code = GET_CODE (src);
++    }
++  else if (MEM_P (src)
++	   && GET_RTX_CLASS (GET_CODE (XEXP (src, 0))))
++    {
++      /* (set (foo) (mem (post_inc (reg sp)))) */
++      mode = GET_MODE (src);
++      src = XEXP (src, 0);
++    }
++  else
++    return 0;
+ 
+-      switch (code)
++  code = GET_CODE (src);
++  switch (code)
++    {
++    case PRE_MODIFY:
++    case POST_MODIFY:
++      if (XEXP (src, 0) == stack_pointer_rtx)
+ 	{
+-	case PRE_MODIFY:
+-	case POST_MODIFY:
+-	  if (XEXP (src, 0) == stack_pointer_rtx)
+-	    {
+-	      rtx val = XEXP (XEXP (src, 1), 1);
+-	      /* We handle only adjustments by constant amount.  */
+-	      gcc_assert (GET_CODE (XEXP (src, 1)) == PLUS
+-			  && GET_CODE (val) == CONST_INT);
+-	      offset = -INTVAL (val);
+-	      break;
+-	    }
+-	  return 0;
+-
+-	case PRE_DEC:
+-	case POST_DEC:
+-	  if (XEXP (src, 0) == stack_pointer_rtx)
+-	    {
+-	      offset = GET_MODE_SIZE (GET_MODE (dest));
+-	      break;
+-	    }
+-	  return 0;
++	  rtx val = XEXP (XEXP (src, 1), 1);
++	  /* We handle only adjustments by constant amount.  */
++	  gcc_assert (GET_CODE (XEXP (src, 1)) == PLUS
++		      && GET_CODE (val) == CONST_INT);
++	  offset = -INTVAL (val);
++	  break;
++	}
++      return 0;
+ 
+-	case PRE_INC:
+-	case POST_INC:
+-	  if (XEXP (src, 0) == stack_pointer_rtx)
+-	    {
+-	      offset = -GET_MODE_SIZE (GET_MODE (dest));
+-	      break;
+-	    }
+-	  return 0;
++    case PRE_DEC:
++    case POST_DEC:
++      if (XEXP (src, 0) == stack_pointer_rtx)
++	{
++	  offset = GET_MODE_SIZE (mode);
++	  break;
++	}
++      return 0;
+ 
+-	default:
+-	  return 0;
++    case PRE_INC:
++    case POST_INC:
++      if (XEXP (src, 0) == stack_pointer_rtx)
++	{
++	  offset = -GET_MODE_SIZE (mode);
++	  break;
+ 	}
++      return 0;
++
++    default:
++      return 0;
+     }
+-  else
+-    return 0;
+ 
+   return offset;
+ }
--- gcj-4.2-4.2-20070707.orig/debian/patches/ada-acats.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/ada-acats.dpatch
@@ -0,0 +1,78 @@
+#! /bin/sh -e
+
+# DP: - When running the ACATS, look for the gnat tools in their new
+# DP:   directory (build/gnattools), and for the shared libraries in
+# DP:   build/gcc/ada/rts, build/libgnatvsn and build/libgnatprj.
+
+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/testsuite/ada/acats/run_acats~
++++ gcc/testsuite/ada/acats/run_acats	2006-04-22 08:57:50.933824704 +0200
+@@ -11,23 +11,42 @@
+ host_gnatmake=`type gnatmake | awk '{print $3}'`
+ ROOT=`${PWDCMD-pwd}`
+ BASE=`cd $ROOT/../../..; ${PWDCMD-pwd}`
+-
+-PATH=$BASE:$ROOT:$PATH
+-ADA_INCLUDE_PATH=$BASE/ada/rts
++GNATTOOLS=`cd $BASE/../gnattools; ${PWDCMD-pwd}`
++LIBGNATVSN=`cd $BASE/../libgnatvsn; ${PWDCMD-pwd}`
++LIBGNATPRJ=`cd $BASE/../libgnatprj; ${PWDCMD-pwd}`
++
++PATH=$GNATTOOLS:$BASE:$ROOT:$PATH
++ADA_INCLUDE_DIR=$BASE/ada/rts
++ADA_INCLUDE_PATH=$ADA_INCLUDE_DIR:$LIBGNATVSN:$LIBGNATPRJ
+ LD_LIBRARY_PATH=$ADA_INCLUDE_PATH:$BASE:$LD_LIBRARY_PATH
+ ADA_OBJECTS_PATH=$ADA_INCLUDE_PATH
+ 
+-if [ ! -d $ADA_INCLUDE_PATH ]; then
++if [ ! -d $ADA_INCLUDE_DIR ]; then
+    echo gnatlib missing, exiting.
+    exit 1
+ fi
+ 
+-if [ ! -f $BASE/gnatchop ]; then
++if [ ! -d $GNATTOOLS ]; then
++   echo gnattools missing, exiting.
++   exit 1
++fi
++
++if [ ! -d $LIBGNATVSN ]; then
++   echo libgnatvsn missing, exiting.
++   exit 1
++fi
++
++if [ ! -d $LIBGNATPRJ ]; then
++   echo libgnatprj missing, exiting.
++   exit 1
++fi
++
++if [ ! -f $GNATTOOLS/gnatchop ]; then
+    echo gnattools missing, exiting.
+    exit 1
+ fi
+ 
+-if [ ! -f $BASE/gnatmake ]; then
++if [ ! -f $GNATTOOLS/gnatmake ]; then
+    echo gnattools missing, exiting.
+    exit 1
+ fi
--- gcj-4.2-4.2-20070707.orig/debian/patches/configure-updates-trunk.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/configure-updates-trunk.dpatch
@@ -0,0 +1,46 @@
+#! /bin/sh -e
+
+# DP: libgcc and libdecnumber configure updates
+
+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}libecnumber && autoconf
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
+        rm -f ${dir}libecnumber/configure
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+libdecnumber/
+
+2007-03-26  Martin Michlmayr  <tbm@cyrius.com>
+	    H.J. Lu  <hongjiu.lu@intel.com>
+
+	* configure.ac: Add AC_CANONICAL_TARGET.
+	* configure: Regenerated.
+
+--- libdecnumber/configure.ac.can	2007-03-24 12:05:55.000000000 -0700
++++ libdecnumber/configure.ac	2007-03-26 09:03:48.000000000 -0700
+@@ -71,6 +71,8 @@ else
+ fi
+ AC_SUBST(MAINT)
+ 
++AC_CANONICAL_TARGET
++
+ # Default decimal format
+ # If you change the defaults here, be sure to change them in the GCC directory also
+ AC_MSG_CHECKING([for decimal floating point])
--- gcj-4.2-4.2-20070707.orig/debian/patches/native-ecj.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/native-ecj.dpatch
@@ -0,0 +1,124 @@
+#! /bin/sh -e
+
+# DP: Build ecj as a native binary
+
+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
+
+--- libjava/Makefile.am.old	2007-05-06 15:33:47.000000000 +0200
++++ libjava/Makefile.am	2007-05-07 13:05:56.000000000 +0200
+@@ -669,7 +669,7 @@
+ ## Hopefully the user has compiled it into his system .db.
+ ## However, even if not it will run reasonably quickly.
+ 
+-ECJX_BASE_FLAGS = -findirect-dispatch \
++ECJX_BASE_FLAGS = \
+ 	--main=org.eclipse.jdt.internal.compiler.batch.GCCMain
+ 
+ if NATIVE
+@@ -678,7 +678,7 @@
+ 
+ if ENABLE_SHARED
+ ## Use ecj.jar at runtime.
+-ecjx_LDFLAGS = $(ECJX_BASE_FLAGS) -Djava.class.path=$(ECJ_JAR)
++ecjx_LDFLAGS = $(ECJX_BASE_FLAGS) $(ECJ_BUILD_JAR)
+ else !ENABLE_SHARED
+ ## Use ecj.jar at compile time.
+ ecjx_LDFLAGS = $(ECJX_BASE_FLAGS) $(ECJ_BUILD_JAR)
+--- libjava/Makefile.in.old	2007-05-16 08:33:34.000000000 +0200
++++ libjava/Makefile.in	2007-05-16 08:40:46.000000000 +0200
+@@ -580,7 +580,7 @@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+-ECJ_BUILD_JAR = @ECJ_BUILD_JAR@
++ECJ_BUILD_JAR = $(top_srcdir)/../ecj-standalone.jar
+ ECJ_JAR = @ECJ_JAR@
+ EGREP = @EGREP@
+ ENABLE_SHARED_FALSE = @ENABLE_SHARED_FALSE@
+@@ -7861,13 +7861,13 @@
+ gij_LDADD = -L$(here)/.libs libgij.la
+ gij_DEPENDENCIES = libgij.la
+ ecjx_SOURCES = 
+-ECJX_BASE_FLAGS = -findirect-dispatch \
++ECJX_BASE_FLAGS = \
+ 	--main=org.eclipse.jdt.internal.compiler.batch.GCCMain
+ 
+ @NATIVE_FALSE@ecjx_LINK = $(GCJ_FOR_ECJX_LINK)
+ @NATIVE_TRUE@ecjx_LINK = $(GCJLINK)
+ @ENABLE_SHARED_FALSE@@NATIVE_TRUE@ecjx_LDFLAGS = $(ECJX_BASE_FLAGS) $(ECJ_BUILD_JAR) -fbootclasspath=$(BOOTCLASSPATH)
+-@ENABLE_SHARED_TRUE@@NATIVE_TRUE@ecjx_LDFLAGS = $(ECJX_BASE_FLAGS) -Djava.class.path=$(ECJ_JAR)
++@ENABLE_SHARED_TRUE@@NATIVE_TRUE@ecjx_LDFLAGS = $(ECJX_BASE_FLAGS) $(ECJ_BUILD_JAR)
+ @NATIVE_FALSE@ecjx_LDFLAGS = $(ECJX_BASE_FLAGS) $(ECJ_BUILD_JAR)
+ @NATIVE_FALSE@ecjx_LDADD = 
+ @NATIVE_TRUE@ecjx_LDADD = -L$(here)/.libs libgcj.la -rpath $(dbexecdir)
+--- libjava/testsuite/Makefile.am~	2007-05-06 10:44:26.000000000 +0200
++++ libjava/testsuite/Makefile.am	2007-05-09 09:36:45.000000000 +0200
+@@ -61,11 +61,11 @@
+ 	  if test -n "$$testdep"; then \
+ 	    $(GCJ) -C -g -w --encoding=UTF-8 -bootclasspath \
+ 	      $(top_builddir)/libgcj-$(gcc_short_version).jar::$$testtmpdir \
+-	      -d $$testtmpdir $(srcdir)/$$testdep || exit; \
++	      -d $$testtmpdir $(srcdir)/$$testdep || echo "ERROR building $$testdep"; \
+ 	  fi; \
+ 	  $(GCJ) -C -g -w --encoding=UTF-8 -bootclasspath \
+ 	    $(top_builddir)/libgcj-$(gcc_short_version).jar:$$testtmpdir \
+-	    -d $$testtmpdir $(srcdir)/$$test || exit; \
++	    -d $$testtmpdir $(srcdir)/$$test || echo "ERROR building $$test"; \
+ 	  case "$$test" in \
+ 	    libjava.loader/dummy.java) \
+ 	      cp $$testtmpdir/dummy.class $$testjar;; \
+@@ -77,7 +77,7 @@
+ 	  if test -n "$$genheader"; then \
+ 	    $(MYGCJH) $$genheader $$testtmpdir/*.class \
+ 	      -bootclasspath $(top_builddir)/libgcj-$(gcc_short_version).jar \
+-	      -d $$testtmpdir/ || exit; \
++	      -d $$testtmpdir/ || echo "ERROR generating header files"; \
+ 	    mv $$testtmpdir/*.h $(srcdir)/`dirname $$test`/ 2>/dev/null; \
+ 	  fi; \
+ 	  rm -rf $$testtmpdir; \
+--- libjava/testsuite/Makefile.in~	2007-05-06 10:44:33.000000000 +0200
++++ libjava/testsuite/Makefile.in	2007-05-09 09:38:38.000000000 +0200
+@@ -559,11 +559,11 @@
+ @JAVA_MAINTAINER_MODE_TRUE@	  if test -n "$$testdep"; then \
+ @JAVA_MAINTAINER_MODE_TRUE@	    $(GCJ) -C -g -w --encoding=UTF-8 -bootclasspath \
+ @JAVA_MAINTAINER_MODE_TRUE@	      $(top_builddir)/libgcj-$(gcc_short_version).jar::$$testtmpdir \
+-@JAVA_MAINTAINER_MODE_TRUE@	      -d $$testtmpdir $(srcdir)/$$testdep || exit; \
++@JAVA_MAINTAINER_MODE_TRUE@	      -d $$testtmpdir $(srcdir)/$$testdep || echo "ERROR building $$testdep"; \
+ @JAVA_MAINTAINER_MODE_TRUE@	  fi; \
+ @JAVA_MAINTAINER_MODE_TRUE@	  $(GCJ) -C -g -w --encoding=UTF-8 -bootclasspath \
+ @JAVA_MAINTAINER_MODE_TRUE@	    $(top_builddir)/libgcj-$(gcc_short_version).jar:$$testtmpdir \
+-@JAVA_MAINTAINER_MODE_TRUE@	    -d $$testtmpdir $(srcdir)/$$test || exit; \
++@JAVA_MAINTAINER_MODE_TRUE@	    -d $$testtmpdir $(srcdir)/$$test || echo "ERROR building $$test"; \
+ @JAVA_MAINTAINER_MODE_TRUE@	  case "$$test" in \
+ @JAVA_MAINTAINER_MODE_TRUE@	    libjava.loader/dummy.java) \
+ @JAVA_MAINTAINER_MODE_TRUE@	      cp $$testtmpdir/dummy.class $$testjar;; \
+@@ -575,7 +575,7 @@
+ @JAVA_MAINTAINER_MODE_TRUE@	  if test -n "$$genheader"; then \
+ @JAVA_MAINTAINER_MODE_TRUE@	    $(MYGCJH) $$genheader $$testtmpdir/*.class \
+ @JAVA_MAINTAINER_MODE_TRUE@	      -bootclasspath $(top_builddir)/libgcj-$(gcc_short_version).jar \
+-@JAVA_MAINTAINER_MODE_TRUE@	      -d $$testtmpdir/ || exit; \
++@JAVA_MAINTAINER_MODE_TRUE@	      -d $$testtmpdir/ || echo "ERROR generating header files"; \
+ @JAVA_MAINTAINER_MODE_TRUE@	    mv $$testtmpdir/*.h $(srcdir)/`dirname $$test`/ 2>/dev/null; \
+ @JAVA_MAINTAINER_MODE_TRUE@	  fi; \
+ @JAVA_MAINTAINER_MODE_TRUE@	  rm -rf $$testtmpdir; \
--- gcj-4.2-4.2-20070707.orig/debian/patches/gpc-gcc-4.1.diff
+++ gcj-4.2-4.2-20070707/debian/patches/gpc-gcc-4.1.diff
@@ -0,0 +1,1487 @@
+diff -ru ../gcc-4.1.0.orig/gcc/config/i386/i386.c gcc-4.1.0/gcc/config/i386/i386.c
+--- ../gcc-4.1.0.orig/gcc/config/i386/i386.c	2006-01-11 14:32:44.000000000 +0100
++++ gcc-4.1.0/gcc/config/i386/i386.c	2006-04-04 21:31:03.000000000 +0200
+@@ -2733,6 +2733,30 @@
+ 	    }
+ 	  break;
+ 
++	case SET_TYPE:
++          if (bytes <= 4)
++            {
++              classes[0] = X86_64_INTEGERSI_CLASS;
++              return 1;
++            }
++          else if (bytes <= 8)
++            {
++              classes[0] = X86_64_INTEGER_CLASS;
++              return 1;
++            }
++          else if (bytes <= 12)
++            {
++              classes[0] = X86_64_INTEGER_CLASS;
++              classes[1] = X86_64_INTEGERSI_CLASS;
++              return 2;
++            }
++          else
++            {
++              classes[0] = X86_64_INTEGER_CLASS;
++              classes[1] = X86_64_INTEGER_CLASS;
++              return 2;
++            }
++
+ 	default:
+ 	  gcc_unreachable ();
+ 	}
+Only in gcc-4.1.0/gcc/config/i386: i386.c.orig
+Only in gcc-4.1.0/gcc/config/i386: i386.c~
+diff -ru ../gcc-4.1.0.orig/gcc/config/ia64/ia64.c gcc-4.1.0/gcc/config/ia64/ia64.c
+--- ../gcc-4.1.0.orig/gcc/config/ia64/ia64.c	2006-02-04 23:13:20.000000000 +0100
++++ gcc-4.1.0/gcc/config/ia64/ia64.c	2006-04-05 02:08:45.000000000 +0200
+@@ -3819,6 +3819,7 @@
+     case BOOLEAN_TYPE:	case CHAR_TYPE:		case POINTER_TYPE:
+     case OFFSET_TYPE:	case REFERENCE_TYPE:	case METHOD_TYPE:
+     case LANG_TYPE:		case FUNCTION_TYPE:
++    case SET_TYPE:
+       return VOIDmode;
+ 
+       /* Fortran complex types are supposed to be HFAs, so we need to handle
+Only in gcc-4.1.0/gcc/config/ia64: ia64.c.orig
+Only in gcc-4.1.0/gcc/config/ia64: ia64.c.rej
+Only in gcc-4.1.0/gcc/config/ia64: ia64.c~
+diff -ru ../gcc-4.1.0.orig/gcc/config/sparc/sparc.c gcc-4.1.0/gcc/config/sparc/sparc.c
+--- ../gcc-4.1.0.orig/gcc/config/sparc/sparc.c	2006-02-11 09:38:51.000000000 +0100
++++ gcc-4.1.0/gcc/config/sparc/sparc.c	2006-04-05 02:10:26.000000000 +0200
+@@ -7019,6 +7019,7 @@
+ 	case VECTOR_TYPE:
+ 	case CHAR_TYPE:		/* GNU Pascal CHAR type.  Not used in C.  */
+ 	case BOOLEAN_TYPE:	/* GNU Fortran BOOLEAN type.  */
++        case SET_TYPE:          /* GNU Pascal SET type.  */
+ 	case LANG_TYPE:		/* ? */
+ 	  return qualifiers;
+   
+Only in gcc-4.1.0/gcc/config/sparc: sparc.c.orig
+Only in gcc-4.1.0/gcc/config/sparc: sparc.c.rej
+Only in gcc-4.1.0/gcc/config/sparc: sparc.c~
+diff -ru ../gcc-4.1.0.orig/gcc/dbxout.c gcc-4.1.0/gcc/dbxout.c
+--- ../gcc-4.1.0.orig/gcc/dbxout.c	2005-10-06 02:47:21.000000000 +0200
++++ gcc-4.1.0/gcc/dbxout.c	2006-04-08 02:50:05.000000000 +0200
+@@ -1916,7 +1916,7 @@
+ 	{
+ 	  stabstr_S ("@s");
+ 	  stabstr_D (BITS_PER_UNIT * int_size_in_bytes (type));
+-	  stabstr_S (";-20;");
++	  stabstr_S (";-20");
+ 	}
+       else
+ 	{
+@@ -1933,7 +1933,7 @@
+ 	{
+ 	  stabstr_S ("@s");
+ 	  stabstr_D (BITS_PER_UNIT * int_size_in_bytes (type));
+-	  stabstr_S (";-16;");
++	  stabstr_S (";-16");
+ 	}
+       else /* Define as enumeral type (False, True) */
+ 	stabstr_S ("eFalse:0,True:1,;");
+@@ -1972,6 +1972,22 @@
+ 	}
+       break;
+ 
++    case SET_TYPE:
++      if (use_gnu_debug_info_extensions)
++	{
++	  stabstr_S ("@s");
++          stabstr_D (BITS_PER_UNIT * int_size_in_bytes (type));
++          stabstr_C (';');
++
++	  /* Check if a bitstring type, which in Chill is
++	     different from a [power]set.  */
++	  if (TYPE_STRING_FLAG (type))
++	    stabstr_S ("@S;");
++	}
++      stabstr_C ('S');
++      dbxout_type (TYPE_DOMAIN (type), 0);
++      break;
++
+     case ARRAY_TYPE:
+       /* Make arrays of packed bits look like bitstrings for chill.  */
+       if (TYPE_PACKED (type) && use_gnu_debug_info_extensions)
+@@ -2435,7 +2451,7 @@
+          we see following the TREE_TYPE chain.  */
+ 
+       t = type;
+-      while (POINTER_TYPE_P (t))
++      while (POINTER_TYPE_P (t) && !TYPE_NAME (t))
+         t = TREE_TYPE (t);
+ 
+       /* RECORD_TYPE, UNION_TYPE, QUAL_UNION_TYPE, and ENUMERAL_TYPE
+Only in gcc-4.1.0/gcc: dbxout.c~
+diff -ru ../gcc-4.1.0.orig/gcc/dwarf2out.c gcc-4.1.0/gcc/dwarf2out.c
+--- ../gcc-4.1.0.orig/gcc/dwarf2out.c	2006-02-04 23:13:20.000000000 +0100
++++ gcc-4.1.0/gcc/dwarf2out.c	2006-04-04 21:16:16.000000000 +0200
+@@ -8218,6 +8218,7 @@
+     case OFFSET_TYPE:
+     case LANG_TYPE:
+     case VECTOR_TYPE:
++    case SET_TYPE:
+       return 0;
+ 
+     default:
+@@ -9014,9 +9015,12 @@
+ {
+   dw_loc_descr_ref ret, ret1;
+   int have_address = 0;
+-  int unsignedp = TYPE_UNSIGNED (TREE_TYPE (loc));
++  int unsignedp /* = TYPE_UNSIGNED (TREE_TYPE (loc)) */;
+   enum dwarf_location_atom op;
+ 
++  gcc_assert (TREE_TYPE (loc));
++  unsignedp = TYPE_UNSIGNED (TREE_TYPE (loc));
++
+   /* ??? Most of the time we do not take proper care for sign/zero
+      extending the values properly.  Hopefully this won't be a real
+      problem...  */
+@@ -9390,6 +9394,19 @@
+       }
+       break;
+ 
++#ifdef GPC
++    case REAL_CST:
++    case FLOAT_EXPR:
++    case RDIV_EXPR:
++    case STRING_CST:
++      /* In Pascal it's possible for array bounds to contain floating point
++         expressions (e.g., p/test/emil11c.pas). I don't know if it's
++         possible to represent them in dwarf2, but it doesn't seem terribly
++         important since this occurs quite rarely. -- Frank */
++      return 0;
++#endif
++
++
+     case FIX_TRUNC_EXPR:
+     case FIX_CEIL_EXPR:
+     case FIX_FLOOR_EXPR:
+@@ -11142,6 +11159,16 @@
+   add_type_attribute (array_die, element_type, 0, 0, context_die);
+ }
+ 
++static void
++gen_set_type_die (tree type, dw_die_ref context_die)
++{
++  dw_die_ref type_die
++    = new_die (DW_TAG_set_type, scope_die_for (type, context_die), type);
++
++  equate_type_number_to_die (type, type_die);
++  add_type_attribute (type_die, TREE_TYPE (type), 0, 0, context_die);
++}
++
+ #if 0
+ static void
+ gen_entry_point_die (tree decl, dw_die_ref context_die)
+@@ -12499,6 +12526,11 @@
+       gen_ptr_to_mbr_type_die (type, context_die);
+       break;
+ 
++    case SET_TYPE:
++      gen_type_die (TYPE_DOMAIN (type), context_die);
++      gen_set_type_die (type, context_die);
++      break;
++
+     case FUNCTION_TYPE:
+       /* Force out return type (in case it wasn't forced out already).  */
+       gen_type_die (TREE_TYPE (type), context_die);
+diff -ru ../gcc-4.1.0.orig/gcc/expr.c gcc-4.1.0/gcc/expr.c
+--- ../gcc-4.1.0.orig/gcc/expr.c	2006-02-03 19:31:14.000000000 +0100
++++ gcc-4.1.0/gcc/expr.c	2006-04-04 21:16:16.000000000 +0200
+@@ -4635,6 +4635,10 @@
+     case REFERENCE_TYPE:
+       return 1;
+ 
++    case SET_TYPE:
++      /* @@@@@@ return something more accurate ... */
++      return -1;
++
+     case VOID_TYPE:
+     case METHOD_TYPE:
+     case FUNCTION_TYPE:
+@@ -4655,6 +4659,10 @@
+       HOST_WIDE_INT nz_elts, nc_elts, count, elts;
+       bool must_clear;
+ 
++      if (TREE_TYPE (exp) && TREE_CODE (TREE_TYPE (exp)) == SET_TYPE)
++      /* If there are no ranges of true bits, it is all zero.  */
++        return CONSTRUCTOR_ELTS (exp) == NULL_TREE;
++
+       categorize_ctor_elements (exp, &nz_elts, &nc_elts, &count, &must_clear);
+       if (must_clear)
+ 	return 1;
+@@ -5289,6 +5297,229 @@
+ 		      gen_rtx_PARALLEL (GET_MODE (target), vector)));
+ 	break;
+       }
++
++    case SET_TYPE:
++    {
++      tree elt = CONSTRUCTOR_ELTS (exp);
++      unsigned HOST_WIDE_INT nbytes = int_size_in_bytes (type), nbits;
++      tree domain = TYPE_DOMAIN (type);
++      tree domain_min, domain_max, bitlength;
++
++      /* The default implementation strategy is to extract the constant
++         parts of the constructor, use that to initialize the target,
++         and then "or" in whatever non-constant ranges we need in addition.
++
++         If a large set is all zero or all ones, it is
++         probably better to set it using memset (if available) or bzero.
++         Also, if a large set has just a single range, it may also be
++         better to first clear all the first clear the set (using
++         bzero/memset), and set the bits we want.  */
++
++      /* Check for all zeros.  */
++      if (elt == NULL_TREE && size > 0)
++        {
++          if (!cleared)
++            clear_storage (target, GEN_INT (size), BLOCK_OP_NORMAL);
++          return;
++        }
++
++#ifndef GPC
++      domain_min = convert (sizetype, TYPE_MIN_VALUE (domain));
++      domain_max = convert (sizetype, TYPE_MAX_VALUE (domain));
++#else /* GPC */
++      domain_min = convert (sbitsizetype, TYPE_MIN_VALUE (domain));
++      domain_max = convert (sbitsizetype, TYPE_MAX_VALUE (domain));
++
++      /* Align the set.  */
++      if (set_alignment)
++        domain_min = size_binop (BIT_AND_EXPR, domain_min, sbitsize_int (-(int)
++set_alignment));
++
++#endif /* GPC */
++      bitlength = size_binop (PLUS_EXPR,
++                              size_binop (MINUS_EXPR, domain_max, domain_min),
++#ifndef GPC
++                              ssize_int (1));
++#else /* GPC */
++                              sbitsize_int (1));
++#endif /* GPC */
++
++#ifdef GPC
++      if (TREE_INT_CST_HIGH (bitlength)) {
++        error ("set size too big for host integers");
++        return;
++      }
++#endif /* GPC */
++      nbits = tree_low_cst (bitlength, 1);
++#ifdef GPC
++      bitlength = convert (sizetype, bitlength);
++#endif /* GPC */
++
++      /* For "small" sets, or "medium-sized" (up to 32 bytes) sets that
++         are "complicated" (more than one range), initialize (the
++         constant parts) by copying from a constant.  */
++      if (GET_MODE (target) != BLKmode || nbits <= 2 * BITS_PER_WORD
++          || (nbytes <= 32 && TREE_CHAIN (elt) != NULL_TREE))
++        {
++#ifndef GPC
++          unsigned int set_word_size = TYPE_ALIGN (TREE_TYPE (exp));
++#endif /* not GPC */
++          enum machine_mode mode = mode_for_size (set_word_size, MODE_INT, 1);
++          char *bit_buffer = alloca (nbits);
++          HOST_WIDE_INT word = 0;
++          unsigned int bit_pos = 0;
++          unsigned int ibit = 0;
++          unsigned int offset = 0;  /* In bytes from beginning of set.  */
++
++          elt = get_set_constructor_bits (exp, bit_buffer, nbits);
++          for (;;)
++            {
++              if (bit_buffer[ibit])
++                {
++#ifndef GPC
++                  if (BYTES_BIG_ENDIAN)
++#else /* GPC */
++                  if (set_words_big_endian)
++#endif /* GPC */
++                    word |= (((HOST_WIDE_INT)1) << (set_word_size - 1 - bit_pos));
++                  else
++                    word |= ((HOST_WIDE_INT)1) << bit_pos;
++                }
++
++              bit_pos++;  ibit++;
++              if (bit_pos >= set_word_size || ibit == nbits)
++                {
++                  if (word != 0 || ! cleared)
++                    {
++                      rtx datum = gen_int_mode (word, mode);
++                      rtx to_rtx;
++
++                      /* The assumption here is that it is safe to use
++                         XEXP if the set is multi-word, but not if
++                         it's single-word.  */
++                      if (GET_CODE (target) == MEM)
++                        to_rtx = adjust_address (target, mode, offset);
++                      else if (offset == 0)
++                        to_rtx = target;
++                      else
++                        abort ();
++                      emit_move_insn (to_rtx, datum);
++                    }
++
++                  if (ibit == nbits)
++                    break;
++                  word = 0;
++                  bit_pos = 0;
++                  offset += set_word_size / BITS_PER_UNIT;
++                }
++            }
++        }
++      else if (!cleared)
++   /* GPC expects bits outside the range to be cleared. (fjf1010.pas)
++      Though this check might be "dead" in this GCC version since it only
++      applies to single ranges with constant bounds, and those are apparently
++      always stored as constants anyway, not initialized via `__setbits'. */
++#ifndef GPC
++        /* Don't bother clearing storage if the set is all ones.  */
++        if (TREE_CHAIN (elt) != NULL_TREE
++            || (TREE_PURPOSE (elt) == NULL_TREE
++                ? nbits != 1
++                : ( ! host_integerp (TREE_VALUE (elt), 0)
++                   || ! host_integerp (TREE_PURPOSE (elt), 0)
++                   || (tree_low_cst (TREE_VALUE (elt), 0)
++                       - tree_low_cst (TREE_PURPOSE (elt), 0) + 1
++                       != (HOST_WIDE_INT) nbits))))
++#endif
++          clear_storage (target, expr_size (exp), BLOCK_OP_NORMAL);
++
++      for (; elt != NULL_TREE; elt = TREE_CHAIN (elt))
++        {
++          /* Start of range of element or NULL.  */
++          tree startbit = TREE_PURPOSE (elt);
++          /* End of range of element, or element value.  */
++          tree endbit   = TREE_VALUE (elt);
++          HOST_WIDE_INT startb, endb;
++          rtx bitlength_rtx, startbit_rtx, endbit_rtx, targetx;
++
++          bitlength_rtx = expand_expr (bitlength,
++                                       NULL_RTX, MEM, EXPAND_CONST_ADDRESS);
++
++          /* Handle non-range tuple element like [ expr ].  */
++          if (startbit == NULL_TREE)
++            {
++              startbit = save_expr (endbit);
++              endbit = startbit;
++            }
++
++#ifndef GPC
++          startbit = convert (sizetype, startbit);
++          endbit = convert (sizetype, endbit);
++#endif /* not GPC */
++          if (! integer_zerop (domain_min))
++            {
++#ifdef GPC
++              startbit = convert (sbitsizetype, startbit);
++              endbit = convert (sbitsizetype, endbit);
++#endif /* GPC */
++              startbit = size_binop (MINUS_EXPR, startbit, domain_min);
++              endbit = size_binop (MINUS_EXPR, endbit, domain_min);
++            }
++#ifdef GPC
++          startbit = convert (sizetype, startbit);
++          endbit = convert (sizetype, endbit);
++#endif /* GPC */
++          startbit_rtx = expand_expr (startbit, NULL_RTX, MEM,
++                                      EXPAND_CONST_ADDRESS);
++          endbit_rtx = expand_expr (endbit, NULL_RTX, MEM,
++                                    EXPAND_CONST_ADDRESS);
++
++          if (REG_P (target))
++            {
++              targetx
++                = assign_temp
++                  ((build_qualified_type ((*lang_hooks.types.type_for_mode)
++                                          (GET_MODE (target), 0),
++                                          TYPE_QUAL_CONST)),
++                   0, 1, 1);
++              emit_move_insn (targetx, target);
++            }
++
++          else if (GET_CODE (target) == MEM)
++            targetx = target;
++          else
++            abort ();
++
++          /* Optimization:  If startbit and endbit are constants divisible
++             by BITS_PER_UNIT, call memset instead.  */
++          if (
++              TREE_CODE (startbit) == INTEGER_CST
++              && TREE_CODE (endbit) == INTEGER_CST
++              && (startb = TREE_INT_CST_LOW (startbit)) % BITS_PER_UNIT == 0
++              && (endb = TREE_INT_CST_LOW (endbit) + 1) % BITS_PER_UNIT == 0)
++            {
++              emit_library_call (memset_libfunc, LCT_NORMAL,
++                                 VOIDmode, 3,
++                                 plus_constant (XEXP (targetx, 0),
++                                                startb / BITS_PER_UNIT),
++                                 Pmode,
++                                 constm1_rtx, TYPE_MODE (integer_type_node),
++                                 GEN_INT ((endb - startb) / BITS_PER_UNIT),
++                                 TYPE_MODE (sizetype));
++            }
++          else
++            emit_library_call (setbits_libfunc, LCT_NORMAL,
++                               VOIDmode, 4, XEXP (targetx, 0),
++                               Pmode, bitlength_rtx, TYPE_MODE (sizetype),
++                               startbit_rtx, TYPE_MODE (sizetype),
++                               endbit_rtx, TYPE_MODE (sizetype));
++
++          if (REG_P (target))
++          if (REG_P (target))
++            emit_move_insn (target, targetx);
++        }
++
++        break;
++    }
+       
+     default:
+       gcc_unreachable ();
+@@ -5588,9 +5819,19 @@
+ 	       index, then convert to sizetype and multiply by the size of
+ 	       the array element.  */
+ 	    if (! integer_zerop (low_bound))
++#ifdef GPC
++            /* I think that address arithmetic should always be done on
++               sizetype or its variants -- for Pascal signed seems to be the
++               correct choice (and generates slightly better code). -- Waldek */
++              index = convert (sizetype, convert (bitsizetype,
++                      size_binop (MINUS_EXPR,
++                        convert (sbitsizetype, index),
++                        convert (sbitsizetype, low_bound))));
++#else
++
+ 	      index = fold_build2 (MINUS_EXPR, TREE_TYPE (index),
+ 				   index, low_bound);
+-
++#endif
+ 	    offset = size_binop (PLUS_EXPR, offset,
+ 			         size_binop (MULT_EXPR,
+ 					     convert (sizetype, index),
+@@ -6687,11 +6928,18 @@
+       /* Variables inherited from containing functions should have
+ 	 been lowered by this point.  */
+       context = decl_function_context (exp);
+-      gcc_assert (!context
++//      gcc_assert 
++      if (!context
+ 		  || context == current_function_decl
+ 		  || TREE_STATIC (exp)
+ 		  /* ??? C++ creates functions that are not TREE_STATIC.  */
+-		  || TREE_CODE (exp) == FUNCTION_DECL);
++		  || TREE_CODE (exp) == FUNCTION_DECL)
++        ;
++      else
++        {
++          debug_tree (exp);
++          gcc_unreachable ();
++        }
+ 
+       /* This is the case of an array whose size is to be determined
+ 	 from its initializer, while the initializer is still being parsed.
+@@ -8624,7 +8872,7 @@
+ tree
+ string_constant (tree arg, tree *ptr_offset)
+ {
+-  tree array, offset;
++  tree array, offset, lb = size_zero_node;
+   STRIP_NOPS (arg);
+ 
+   if (TREE_CODE (arg) == ADDR_EXPR)
+@@ -8638,6 +8886,7 @@
+ 	{
+ 	  array = TREE_OPERAND (arg, 0);
+ 	  offset = size_zero_node;
++          goto do_lb;
+ 	}
+       else if (TREE_CODE (TREE_OPERAND (arg, 0)) == ARRAY_REF)
+ 	{
+@@ -8646,6 +8895,7 @@
+ 	  if (TREE_CODE (array) != STRING_CST
+ 	      && TREE_CODE (array) != VAR_DECL)
+ 	    return 0;
++          lb = array_ref_low_bound (TREE_OPERAND (arg, 0));
+ 	}
+       else
+ 	return 0;
+@@ -8674,10 +8924,26 @@
+ 	}
+       else
+ 	return 0;
++  do_lb:    
++      if (TREE_TYPE (array) && TREE_CODE (TREE_TYPE (array)) == ARRAY_TYPE)
++        {
++          tree domain_type = TYPE_DOMAIN (TREE_TYPE (array));
++          if (domain_type && TYPE_MIN_VALUE (domain_type))
++#if 0
++            lb = SUBSTITUTE_PLACEHOLDER_IN_EXPR (
++                   TYPE_MIN_VALUE (domain_type), array);
++#else
++          lb = TYPE_MIN_VALUE (domain_type);
++#endif
++        }
+     }
+   else
+     return 0;
+ 
++  if (! integer_zerop (lb))
++    offset = size_diffop (fold_convert (sizetype, offset),
++                          fold_convert (sizetype, lb));
++
+   if (TREE_CODE (array) == STRING_CST)
+     {
+       *ptr_offset = convert (sizetype, offset);
+diff -ru ../gcc-4.1.0.orig/gcc/fold-const.c gcc-4.1.0/gcc/fold-const.c
+--- ../gcc-4.1.0.orig/gcc/fold-const.c	2006-02-03 19:02:04.000000000 +0100
++++ gcc-4.1.0/gcc/fold-const.c	2006-04-04 21:16:16.000000000 +0200
+@@ -5956,6 +5956,10 @@
+   HOST_WIDE_INT hpart;
+   int overflow;
+ 
++  /* Overflow check does not work for unsigned numbers */
++  if (TYPE_UNSIGNED (TREE_TYPE (arg0)))
++    return NULL_TREE;
++
+   /* We have to do this the hard way to detect unsigned overflow.
+      prod = int_const_binop (MULT_EXPR, arg01, arg1, 0);  */
+   overflow = mul_double (TREE_INT_CST_LOW (arg01),
+diff -ru ../gcc-4.1.0.orig/gcc/function.c gcc-4.1.0/gcc/function.c
+--- ../gcc-4.1.0.orig/gcc/function.c	2006-01-04 10:13:56.000000000 +0100
++++ gcc-4.1.0/gcc/function.c	2006-04-04 22:51:00.000000000 +0200
+@@ -3111,7 +3111,11 @@
+   if (TYPE_P (t))
+     {
+       if (POINTER_TYPE_P (t))
++#ifndef GPC
+ 	*walk_subtrees = 1;
++#else
++        *walk_subtrees = 0;
++#endif
+       else if (TYPE_SIZE (t) && !TREE_CONSTANT (TYPE_SIZE (t))
+ 	       && !TYPE_SIZES_GIMPLIFIED (t))
+ 	{
+Only in gcc-4.1.0/gcc: function.c~
+diff -ru ../gcc-4.1.0.orig/gcc/gcc.c gcc-4.1.0/gcc/gcc.c
+--- ../gcc-4.1.0.orig/gcc/gcc.c	2006-01-21 19:29:08.000000000 +0100
++++ gcc-4.1.0/gcc/gcc.c	2006-04-04 22:38:05.000000000 +0200
+@@ -794,8 +794,8 @@
+ "%{pg:%{fomit-frame-pointer:%e-pg and -fomit-frame-pointer are incompatible}}\
+  %1 %{!Q:-quiet} -dumpbase %B %{d*} %{m*} %{a*}\
+  %{c|S:%{o*:-auxbase-strip %*}%{!o*:-auxbase %b}}%{!c:%{!S:-auxbase %b}}\
+- %{g*} %{O*} %{W*&pedantic*} %{w} %{std*&ansi&trigraphs}\
+- %{v:-version} %{pg:-p} %{p} %{f*} %{undef}\
++ %{g*} %{O*} %{f*&W*&pedantic*&w} %{std*&ansi&trigraphs}\
++ %{v:-version} %{pg:-p} %{p} %{undef}\
+  %{Qn:-fno-ident} %{--help:--help}\
+  %{--target-help:--target-help}\
+  %{!fsyntax-only:%{S:%W{o*}%{!o*:-o %b.s}}}\
+diff -ru ../gcc-4.1.0.orig/gcc/gimplify.c gcc-4.1.0/gcc/gimplify.c
+--- ../gcc-4.1.0.orig/gcc/gimplify.c	2006-02-13 22:29:13.000000000 +0100
++++ gcc-4.1.0/gcc/gimplify.c	2006-04-04 22:38:45.000000000 +0200
+@@ -342,7 +342,7 @@
+ 
+ /* Create a new temporary name with PREFIX.  Returns an identifier.  */
+ 
+-static GTY(()) unsigned int tmp_var_id_num;
++static GTY(()) unsigned int tmp_var_id_num = 155419;
+ 
+ tree
+ create_tmp_var_name (const char *prefix)
+@@ -2704,15 +2704,35 @@
+ 	  cref = build (ARRAY_REF, array_elt_type, unshare_expr (object),
+ 			purpose, NULL_TREE, NULL_TREE);
+ 	}
++#if 0
++      else if (DECL_BIT_FIELD (purpose))
++        {
++          tree bioff = size_binop (PLUS_EXPR, 
++            DECL_FIELD_BIT_OFFSET (purpose),
++            size_binop (MULT_EXPR, 
++              bitsize_int (BITS_PER_UNIT),
++              convert (bitsizetype, DECL_FIELD_OFFSET (purpose))));
++          cref = build3 (BIT_FIELD_REF, TREE_TYPE (purpose),
++                      unshare_expr (object), bioff, 
++                      DECL_SIZE (purpose));
++          BIT_FIELD_REF_UNSIGNED (cref) = TYPE_UNSIGNED (TREE_TYPE (purpose));
++        }
++#endif
+       else
+ 	{
+-	  gcc_assert (TREE_CODE (purpose) == FIELD_DECL);
++//	  gcc_assert (TREE_CODE (purpose) == FIELD_DECL);
++          if (TREE_CODE (purpose) != FIELD_DECL)
++            {
++              debug_tree (purpose);
++              gcc_unreachable ();
++            }
+ 	  cref = build (COMPONENT_REF, TREE_TYPE (purpose),
+ 			unshare_expr (object), purpose, NULL_TREE);
+ 	}
+ 
+       if (TREE_CODE (value) == CONSTRUCTOR
+-	  && TREE_CODE (TREE_TYPE (value)) != VECTOR_TYPE)
++	  && TREE_CODE (TREE_TYPE (value)) != VECTOR_TYPE
++          && TREE_CODE (TREE_TYPE (value)) != SET_TYPE)
+ 	gimplify_init_ctor_eval (cref, CONSTRUCTOR_ELTS (value),
+ 				 pre_p, cleared);
+       else
+@@ -2743,6 +2763,10 @@
+   if (TREE_CODE (ctor) != CONSTRUCTOR)
+     return GS_UNHANDLED;
+ 
++  ret = lang_hooks.gimplify_expr (&TREE_OPERAND (*expr_p, 1), pre_p, post_p);
++  if (ret != GS_UNHANDLED)
++    return ret;
++  
+   ret = gimplify_expr (&TREE_OPERAND (*expr_p, 0), pre_p, post_p,
+ 		       is_gimple_lvalue, fb_lvalue);
+   if (ret == GS_ERROR)
+@@ -2784,7 +2808,7 @@
+ 	    DECL_INITIAL (object) = ctor;
+ 	    TREE_STATIC (object) = 1;
+ 	    if (!DECL_NAME (object))
+-	      DECL_NAME (object) = create_tmp_var_name ("C");
++	      DECL_NAME (object) = create_tmp_var_name ("c_C");
+ 	    walk_tree (&DECL_INITIAL (object), force_labels_r, NULL, NULL);
+ 
+ 	    /* ??? C++ doesn't automatically append a .<number> to the
+@@ -2857,7 +2881,7 @@
+ 
+ 	    if (size > 0 && !can_move_by_pieces (size, align))
+ 	      {
+-		tree new = create_tmp_var_raw (type, "C");
++		tree new = create_tmp_var_raw (type, "r_C");
+ 
+ 		gimple_add_tmp_var (new);
+ 		TREE_STATIC (new) = 1;
+@@ -4507,6 +4531,10 @@
+ 	      goto dont_recalculate;
+ 
+ 	    default:
++              if (!(TREE_CODE (*expr_p) == TRUTH_AND_EXPR
++                          || TREE_CODE (*expr_p) == TRUTH_OR_EXPR
++                          || TREE_CODE (*expr_p) == TRUTH_XOR_EXPR))
++                debug_tree (*expr_p);
+ 	      gcc_assert (TREE_CODE (*expr_p) == TRUTH_AND_EXPR
+ 			  || TREE_CODE (*expr_p) == TRUTH_OR_EXPR
+ 			  || TREE_CODE (*expr_p) == TRUTH_XOR_EXPR);
+@@ -4692,6 +4720,10 @@
+   return ret;
+ }
+ 
++extern void (*lang_remember_gimplified_type)(tree);
++
++void (*lang_remember_gimplified_type)(tree) = 0;
++
+ /* Look through TYPE for variable-sized objects and gimplify each such
+    size that we find.  Add to LIST_P any statements generated.  */
+ 
+@@ -4712,6 +4744,12 @@
+ 
+   TYPE_SIZES_GIMPLIFIED (type) = 1;
+ 
++  if (lang_remember_gimplified_type)
++    lang_remember_gimplified_type (type);
++  
++  gimplify_one_sizepos (&TYPE_SIZE (type), list_p);
++  gimplify_one_sizepos (&TYPE_SIZE_UNIT (type), list_p);
++
+   switch (TREE_CODE (type))
+     {
+     case INTEGER_TYPE:
+@@ -4742,12 +4780,16 @@
+ 	if (TREE_CODE (field) == FIELD_DECL)
+ 	  {
+ 	    gimplify_one_sizepos (&DECL_FIELD_OFFSET (field), list_p);
+-	    gimplify_type_sizes (TREE_TYPE (field), list_p);
+ 	  }
++      for (field = TYPE_FIELDS (type); field; field = TREE_CHAIN (field))
++        if (TREE_CODE (field) == FIELD_DECL)
++          gimplify_type_sizes (TREE_TYPE (field), list_p);
+       break;
+ 
+     case POINTER_TYPE:
+     case REFERENCE_TYPE:
++      break;
++
+       gimplify_type_sizes (TREE_TYPE (type), list_p);
+       break;
+ 
+@@ -4755,9 +4797,6 @@
+       break;
+     }
+ 
+-  gimplify_one_sizepos (&TYPE_SIZE (type), list_p);
+-  gimplify_one_sizepos (&TYPE_SIZE_UNIT (type), list_p);
+-
+   for (t = TYPE_NEXT_VARIANT (type); t; t = TYPE_NEXT_VARIANT (t))
+     {
+       TYPE_SIZE (t) = TYPE_SIZE (type);
+@@ -4766,6 +4805,11 @@
+     }
+ }
+ 
++
++extern void (*lang_remember_gimplified_sizepos)(tree *);
++
++void (*lang_remember_gimplified_sizepos)(tree *) = 0;
++
+ /* A subroutine of gimplify_type_sizes to make sure that *EXPR_P,
+    a size or position, has had all of its SAVE_EXPRs evaluated.
+    We add any required statements to STMT_P.  */
+@@ -4775,6 +4819,12 @@
+ {
+   tree type, expr = *expr_p;
+ 
++  if (expr == NULL_TREE || TREE_CODE (expr) == INTEGER_CST)
++    return;
++
++  if (lang_remember_gimplified_sizepos)
++    lang_remember_gimplified_sizepos(expr_p);
++
+   /* We don't do anything if the value isn't there, is constant, or contains
+      A PLACEHOLDER_EXPR.  We also don't want to do anything if it's already
+      a VAR_DECL.  If it's a VAR_DECL from another function, the gimplifier
+@@ -4878,9 +4928,18 @@
+ 	     a pointer to the array type.  We must allow this in order to
+ 	     properly represent assigning the address of an array in C into
+ 	     pointer to the element type.  */
++/*
+ 	  gcc_assert (TREE_CODE (otype) == ARRAY_TYPE
+ 		      && POINTER_TYPE_P (ptype)
+ 		      && cpt_same_type (TREE_TYPE (otype), dtype));
++*/
++          if (!(TREE_CODE (otype) == ARRAY_TYPE
++                      && POINTER_TYPE_P (ptype)
++                      && cpt_same_type (TREE_TYPE (otype), dtype)))
++            {
++              debug_tree (t);
++              gcc_unreachable ();
++            }
+ 	  break;
+ 	}
+       break;
+diff -ru ../gcc-4.1.0.orig/gcc/ipa-type-escape.c gcc-4.1.0/gcc/ipa-type-escape.c
+--- ../gcc-4.1.0.orig/gcc/ipa-type-escape.c	2005-09-25 07:28:01.000000000 +0200
++++ gcc-4.1.0/gcc/ipa-type-escape.c	2006-04-04 21:16:16.000000000 +0200
+@@ -260,9 +260,23 @@
+ type_to_consider (tree type)
+ {
+   /* Strip the *'s off.  */
++  tree otype = type;
++  long cnt = 0;
++  long ocnt = 0;
+   type = TYPE_MAIN_VARIANT (type);
+   while (POINTER_TYPE_P (type) || TREE_CODE (type) == ARRAY_TYPE)
+-    type = TYPE_MAIN_VARIANT (TREE_TYPE (type));
++    {
++      type = TYPE_MAIN_VARIANT (TREE_TYPE (type));
++      if (type == otype)
++        return false;
++      if (cnt > ocnt)
++        {
++          ocnt += cnt;
++          otype = type;
++        }
++      else
++        cnt ++;
++    }
+ 
+   switch (TREE_CODE (type))
+     {
+Only in gcc-4.1.0/gcc: p
+diff -ru ../gcc-4.1.0.orig/gcc/print-tree.c gcc-4.1.0/gcc/print-tree.c
+--- ../gcc-4.1.0.orig/gcc/print-tree.c	2005-10-13 01:34:09.000000000 +0200
++++ gcc-4.1.0/gcc/print-tree.c	2006-04-04 21:16:16.000000000 +0200
+@@ -580,7 +580,7 @@
+ 
+       if (TREE_CODE (node) == ENUMERAL_TYPE)
+ 	print_node (file, "values", TYPE_VALUES (node), indent + 4);
+-      else if (TREE_CODE (node) == ARRAY_TYPE)
++      else if (TREE_CODE (node) == ARRAY_TYPE || TREE_CODE (node) == SET_TYPE)
+ 	print_node (file, "domain", TYPE_DOMAIN (node), indent + 4);
+       else if (TREE_CODE (node) == VECTOR_TYPE)
+ 	fprintf (file, " nunits %d", (int) TYPE_VECTOR_SUBPARTS (node));
+diff -ru ../gcc-4.1.0.orig/gcc/reload1.c gcc-4.1.0/gcc/reload1.c
+--- ../gcc-4.1.0.orig/gcc/reload1.c	2006-02-24 02:18:27.000000000 +0100
++++ gcc-4.1.0/gcc/reload1.c	2006-04-04 21:16:16.000000000 +0200
+@@ -1252,7 +1252,10 @@
+   reg_equiv_memory_loc = 0;
+ 
+   if (offsets_known_at)
+-    free (offsets_known_at);
++    {
++//      free (offsets_known_at);
++      offsets_known_at = 0;
++    }
+   if (offsets_at)
+     free (offsets_at);
+ 
+diff -ru ../gcc-4.1.0.orig/gcc/stor-layout.c gcc-4.1.0/gcc/stor-layout.c
+--- ../gcc-4.1.0.orig/gcc/stor-layout.c	2006-02-14 17:12:56.000000000 +0100
++++ gcc-4.1.0/gcc/stor-layout.c	2006-04-04 21:17:03.000000000 +0200
+@@ -19,6 +19,7 @@
+ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
+ 02110-1301, USA.  */
+ 
++/* @@ PATCHED FOR GPC 20060322 @@ */
+ 
+ #include "config.h"
+ #include "system.h"
+@@ -53,6 +54,21 @@
+    called only by a front end.  */
+ static int reference_types_internal = 0;
+ 
++/* If nonzero, the alignment of a bitstring or (power-)set value, in bits.
++   May be overridden by front-ends.  */
++unsigned int set_alignment = 0;
++
++/* The word size of a bitstring or (power-)set value, in bits.
++   Must be non-zero.
++   May be overridden by front-ends.  */
++unsigned int set_word_size = BITS_PER_UNIT;
++
++/* If non-zero, bits in (power-)sets start with the highest bit.
++   May be overridden by front-ends.
++   In order to be backward-compatible, the Chill frontend should
++   initialize this to BYTES_BIG_ENDIAN.  */
++unsigned int set_words_big_endian = 0;
++
+ static void finalize_record_size (record_layout_info);
+ static void finalize_type_size (tree);
+ static void place_union_field (record_layout_info, tree);
+@@ -1881,6 +1897,50 @@
+       }
+       break;
+ 
++    case SET_TYPE:  /* Used by Chill and Pascal.  */
++      if (TREE_CODE (TYPE_MAX_VALUE (TYPE_DOMAIN (type))) != INTEGER_CST
++          || TREE_CODE (TYPE_MIN_VALUE (TYPE_DOMAIN (type))) != INTEGER_CST)
++        abort ();
++      else
++        {
++          int alignment = set_alignment ? set_alignment : set_word_size;
++          tree lower_bound = convert (sbitsizetype,
++                        TYPE_MIN_VALUE (TYPE_DOMAIN (type)));
++          tree upper_bound = convert (sbitsizetype,
++                        TYPE_MAX_VALUE (TYPE_DOMAIN (type)));
++          tree size_in_bits, rounded_size;
++          if (set_alignment)
++            {
++              lower_bound = round_down (lower_bound, alignment);
++            }
++          size_in_bits = size_binop (PLUS_EXPR,
++                                size_binop (MINUS_EXPR,
++                                        upper_bound,
++                                        lower_bound),
++                                sbitsize_int(1));
++          rounded_size = round_up (size_in_bits, alignment);
++
++          if ( TREE_INT_CST_HIGH (rounded_size)
++                || TREE_INT_CST_LOW (rounded_size) > (unsigned) alignment)
++            {
++                TYPE_MODE (type) = BLKmode;
++            }
++          else
++            {
++                TYPE_MODE (type) = mode_for_size (alignment, MODE_INT, 1);
++            }
++
++          TYPE_SIZE (type) = convert (bitsizetype, rounded_size);
++          TYPE_SIZE_UNIT (type) = convert (sizetype,
++                                size_binop ( CEIL_DIV_EXPR,
++                                        rounded_size,
++                                        sbitsize_int (BITS_PER_UNIT)));
++          TYPE_ALIGN (type) = alignment;
++          TYPE_USER_ALIGN (type) = 0;
++          TYPE_PRECISION (type) = TREE_INT_CST_LOW (size_in_bits);
++        }
++      break;
++
+     default:
+       gcc_unreachable ();
+     }
+@@ -1977,9 +2037,9 @@
+   t = build_distinct_type_copy (type);
+   /* We do want to use sizetype's cache, as we will be replacing that
+      type.  */
+-  TYPE_CACHED_VALUES (t) = TYPE_CACHED_VALUES (sizetype);
+-  TYPE_CACHED_VALUES_P (t) = TYPE_CACHED_VALUES_P (sizetype);
+-  TREE_TYPE (TYPE_CACHED_VALUES (t)) = type;
++  TYPE_CACHED_VALUES (t) = NULL_TREE /* TYPE_CACHED_VALUES (sizetype) */;
++  TYPE_CACHED_VALUES_P (t) = 0 ; /* TYPE_CACHED_VALUES_P (sizetype);
++  TREE_TYPE (TYPE_CACHED_VALUES (t)) = type; */
+   TYPE_UID (t) = TYPE_UID (sizetype);
+   TYPE_IS_SIZETYPE (t) = 1;
+   
+@@ -1991,8 +2051,8 @@
+   TYPE_NAME (t) = get_identifier ("bit_size_type");
+   /* We do want to use bitsizetype's cache, as we will be replacing that
+      type.  */
+-  TYPE_CACHED_VALUES (t) = TYPE_CACHED_VALUES (bitsizetype);
+-  TYPE_CACHED_VALUES_P (t) = TYPE_CACHED_VALUES_P (bitsizetype);
++  TYPE_CACHED_VALUES (t) = NULL_TREE /* TYPE_CACHED_VALUES (bitsizetype) */;
++  TYPE_CACHED_VALUES_P (t) = 0 /* TYPE_CACHED_VALUES_P (bitsizetype) */;
+   TYPE_PRECISION (t) = precision;
+   TYPE_UID (t) = TYPE_UID (bitsizetype);
+   TYPE_IS_SIZETYPE (t) = 1;
+Only in gcc-4.1.0/gcc: stor-layout.c~
+diff -ru ../gcc-4.1.0.orig/gcc/toplev.c gcc-4.1.0/gcc/toplev.c
+--- ../gcc-4.1.0.orig/gcc/toplev.c	2006-02-04 23:13:20.000000000 +0100
++++ gcc-4.1.0/gcc/toplev.c	2006-04-09 17:33:48.000000000 +0200
+@@ -803,9 +803,13 @@
+ /* A subroutine of check_global_declarations.  Issue appropriate warnings
+    for the global declaration DECL.  */
+ 
++volatile int dump_global_decl_trees = 0;
+ void
+ check_global_declaration_1 (tree decl)
+ {
++  if (dump_global_decl_trees)
++    debug_tree (decl);
++
+   /* Warn about any function declared static but not defined.  We don't
+      warn about variables, because many programs have static variables
+      that exist only to get some text into the object file.  */
+@@ -1110,6 +1114,27 @@
+ void
+ print_version (FILE *file, const char *indent)
+ {
++#ifdef GPC
++  extern const char *lang_version_string;
++  static const char fmt1[] =
++#ifdef __GNUC__
++    N_("%s%s%s version %s%s (%s)\n%s\tcompiled by GNU C version %s.\n")
++#else
++    N_("%s%s%s version %s%s (%s) compiled by CC.\n")
++#endif
++    ;
++  static const char fmt2[] =
++    N_("%s%sGGC heuristics: --param ggc-min-expand=%d --param ggc-min-heapsize=%d\n");
++#ifndef __VERSION__
++#define __VERSION__ "[?]"
++#endif
++
++  fprintf (file,
++           file == stderr ? _(fmt1) : fmt1,
++           indent, *indent != 0 ? " " : "",
++           lang_hooks.name, lang_version_string, version_string, TARGET_NAME,
++           indent, __VERSION__);
++#else
+   static const char fmt1[] =
+ #ifdef __GNUC__
+     N_("%s%s%s version %s (%s)\n%s\tcompiled by GNU C version %s.\n")
+@@ -1122,11 +1147,13 @@
+ #ifndef __VERSION__
+ #define __VERSION__ "[?]"
+ #endif
++
+   fprintf (file,
+ 	   file == stderr ? _(fmt1) : fmt1,
+ 	   indent, *indent != 0 ? " " : "",
+ 	   lang_hooks.name, version_string, TARGET_NAME,
+ 	   indent, __VERSION__);
++#endif
+   fprintf (file,
+ 	   file == stderr ? _(fmt2) : fmt2,
+ 	   indent, *indent != 0 ? " " : "",
+Only in gcc-4.1.0/gcc: toplev.c~
+diff -ru ../gcc-4.1.0.orig/gcc/tree-cfg.c gcc-4.1.0/gcc/tree-cfg.c
+--- ../gcc-4.1.0.orig/gcc/tree-cfg.c	2006-02-16 16:23:24.000000000 +0100
++++ gcc-4.1.0/gcc/tree-cfg.c	2006-04-04 21:16:16.000000000 +0200
+@@ -3642,10 +3642,17 @@
+ 	  if (decl_function_context (LABEL_EXPR_LABEL (stmt))
+ 	      != current_function_decl)
+ 	    {
+-	      error ("label %s has incorrect context in bb %d",
+-		     IDENTIFIER_POINTER (DECL_NAME (LABEL_EXPR_LABEL (stmt))),
+-		     bb->index);
+-	      err = 1;
++              tree ldecl = DECL_NAME (LABEL_EXPR_LABEL (stmt));
++              const char * ln = ldecl ? IDENTIFIER_POINTER (ldecl): "????";
++#if 0
++              error ("label %s has incorrect context in bb %d\n",
++                     IDENTIFIER_POINTER (DECL_NAME (LABEL_EXPR_LABEL (stmt))),
++                     bb->index);
++#else
++              error ("label %s has incorrect context in bb %d\n", ln,
++                      bb->index);
++#endif
++              err = 1;
+ 	    }
+ 	}
+ 
+diff -ru ../gcc-4.1.0.orig/gcc/tree-flow-inline.h gcc-4.1.0/gcc/tree-flow-inline.h
+--- ../gcc-4.1.0.orig/gcc/tree-flow-inline.h	2006-02-09 15:00:59.000000000 +0100
++++ gcc-4.1.0/gcc/tree-flow-inline.h	2006-04-04 21:55:58.000000000 +0200
+@@ -1492,7 +1492,8 @@
+     return false;
+ 
+   return (AGGREGATE_TYPE_P (TREE_TYPE (v)) &&
+-	  TREE_CODE (TREE_TYPE (v)) != ARRAY_TYPE);
++	  TREE_CODE (TREE_TYPE (v)) != ARRAY_TYPE
++          && TREE_CODE (TREE_TYPE (v)) != SET_TYPE);
+ }
+ 
+   
+Only in gcc-4.1.0/gcc: tree-flow-inline.h~
+diff -ru ../gcc-4.1.0.orig/gcc/tree-nested.c gcc-4.1.0/gcc/tree-nested.c
+--- ../gcc-4.1.0.orig/gcc/tree-nested.c	2005-10-03 22:57:45.000000000 +0200
++++ gcc-4.1.0/gcc/tree-nested.c	2006-04-04 21:16:16.000000000 +0200
+@@ -1170,6 +1170,8 @@
+   if (!elt)
+     return NULL_TREE;
+   new_label = elt->new;
++  DECL_CONTEXT (new_label) = DECL_CONTEXT (label);
++//  mark_decl_referenced (new_label);
+ 
+   /* If there's any possibility that the previous statement falls through,
+      then we must branch around the new non-local label.  */
+diff -ru ../gcc-4.1.0.orig/gcc/tree-sra.c gcc-4.1.0/gcc/tree-sra.c
+--- ../gcc-4.1.0.orig/gcc/tree-sra.c	2005-11-21 01:55:57.000000000 +0100
++++ gcc-4.1.0/gcc/tree-sra.c	2006-04-04 21:16:16.000000000 +0200
+@@ -1368,6 +1368,9 @@
+ 	      && (!can_completely_scalarize_p (elt)
+ 		  || !type_can_instantiate_all_elements (elt->type)))
+ 	    use_block_copy = true;
++          if (TREE_TYPE (elt->type)
++              && full_size != full_count*TYPE_PRECISION (TREE_TYPE (elt->type)))
++            use_block_copy = true;
+ 	}
+       elt->use_block_copy = use_block_copy;
+ 
+diff -ru ../gcc-4.1.0.orig/gcc/tree-ssa-dom.c gcc-4.1.0/gcc/tree-ssa-dom.c
+--- ../gcc-4.1.0.orig/gcc/tree-ssa-dom.c	2005-11-18 14:32:05.000000000 +0100
++++ gcc-4.1.0/gcc/tree-ssa-dom.c	2006-04-04 21:16:16.000000000 +0200
+@@ -2802,12 +2802,26 @@
+       val_type = TREE_TYPE (val);
+ 
+       /* While both types are pointers, get the type of the object
+-	 pointed to.  */
+-      while (POINTER_TYPE_P (op_type) && POINTER_TYPE_P (val_type))
+-	{
+-	  op_type = TREE_TYPE (op_type);
+-	  val_type = TREE_TYPE (val_type);
+-	}
++	 pointed to. Do not get trapped in cycles.  */
++      {
++        long cnt = 0, maxcnt = 11;
++        tree op_type0 = op_type;
++        while (POINTER_TYPE_P (op_type) && POINTER_TYPE_P (val_type))
++	  {
++	    op_type = TREE_TYPE (op_type);
++	    val_type = TREE_TYPE (val_type);
++            if (op_type == op_type0)
++              return false;
++            cnt ++;
++            if (cnt > maxcnt)
++              {
++                op_type0 = op_type;
++                maxcnt += maxcnt;
++                if (maxcnt < 0)
++                  return false;
++              }
++	  }
++      }
+ 
+       /* Make sure underlying types match before propagating a constant by
+ 	 converting the constant to the proper type.  Note that convert may
+diff -ru ../gcc-4.1.0.orig/gcc/tree.c gcc-4.1.0/gcc/tree.c
+--- ../gcc-4.1.0.orig/gcc/tree.c	2006-01-29 23:24:10.000000000 +0100
++++ gcc-4.1.0/gcc/tree.c	2006-04-04 21:16:16.000000000 +0200
+@@ -801,9 +801,16 @@
+       if (t)
+ 	{
+ 	  /* Make sure no one is clobbering the shared constant.  */
++          if (!(TREE_TYPE (t) == type))
++            debug_tree (t);
+ 	  gcc_assert (TREE_TYPE (t) == type);
++          if (!(TREE_INT_CST_LOW (t) == low))
++            debug_tree (t);
+ 	  gcc_assert (TREE_INT_CST_LOW (t) == low);
++          if (!(TREE_INT_CST_HIGH (t) == hi))
++            debug_tree (t);
+ 	  gcc_assert (TREE_INT_CST_HIGH (t) == hi);
++
+ 	}
+       else
+ 	{
+@@ -2132,6 +2139,7 @@
+ 	      || CONTAINS_PLACEHOLDER_P (TYPE_MAX_VALUE (type)));
+ 
+     case ARRAY_TYPE:
++    case SET_TYPE:
+       /* We're already checked the component type (TREE_TYPE), so just check
+ 	 the index type.  */
+       return type_contains_placeholder_p (TYPE_DOMAIN (type));
+@@ -3143,7 +3151,8 @@
+   if (EXPR_LOCUS (node)
+       && EXPR_LINENO (node) == line
+       && (EXPR_FILENAME (node) == file
+-	  || !strcmp (EXPR_FILENAME (node), file)))
++         || (EXPR_FILENAME (node) &&  file
++                && ! strcmp (EXPR_FILENAME (node), file))))
+     {
+       last_annotated_node = EXPR_LOCUS (node);
+       return;
+@@ -3155,7 +3164,8 @@
+   if (last_annotated_node
+       && last_annotated_node->line == line
+       && (last_annotated_node->file == file
+-	  || !strcmp (last_annotated_node->file, file)))
++         || (last_annotated_node->file &&  file
++                && ! strcmp (last_annotated_node->file, file))))
+     {
+       SET_EXPR_LOCUS (node, last_annotated_node);
+       return;
+@@ -4996,6 +5006,7 @@
+   TYPE_SIZE_UNIT (itype) = TYPE_SIZE_UNIT (type);
+   TYPE_ALIGN (itype) = TYPE_ALIGN (type);
+   TYPE_USER_ALIGN (itype) = TYPE_USER_ALIGN (type);
++  TYPE_UNSIGNED (itype) = TYPE_UNSIGNED (type);
+ 
+   if (host_integerp (lowval, 0) && highval != 0 && host_integerp (highval, 0))
+     return type_hash_canon (tree_low_cst (highval, 0)
+@@ -5957,6 +5968,137 @@
+   return get_file_function_name_long (p);
+ }
+ 
++/* Expand (the constant part of) a SET_TYPE CONSTRUCTOR node.
++   The result is placed in BUFFER (which has length BIT_SIZE),
++   with one bit in each char ('\000' or '\001').
++
++   If the constructor is constant, NULL_TREE is returned.
++   Otherwise, a TREE_LIST of the non-constant elements is emitted.  */
++
++tree
++get_set_constructor_bits (tree init, char *buffer, int bit_size)
++{
++  int i;
++  tree vals;
++  HOST_WIDE_INT domain_min
++    = tree_low_cst (TYPE_MIN_VALUE (TYPE_DOMAIN (TREE_TYPE (init))), 0);
++  HOST_WIDE_INT low_limit = domain_min;
++  tree non_const_bits = NULL_TREE;
++
++  if (set_alignment)
++    /* Note: `domain_min -= domain_min % set_alignment' would be wrong for negative
++       numbers (rounding towards 0, while we have to round towards -inf). */
++    domain_min &= -(int) set_alignment;
++
++  low_limit -= domain_min;
++
++  for (i = 0; i < bit_size; i++)
++    buffer[i] = 0;
++
++  for (vals = TREE_OPERAND (init, 0) /* CONSTRUCTOR_ELTS (init) */;
++       vals != NULL_TREE; vals = TREE_CHAIN (vals))
++    {
++      if (!host_integerp (TREE_VALUE (vals), 0)
++	  || (TREE_PURPOSE (vals) != NULL_TREE
++	      && !host_integerp (TREE_PURPOSE (vals), 0)))
++	non_const_bits
++	  = tree_cons (TREE_PURPOSE (vals), TREE_VALUE (vals), non_const_bits);
++      else if (TREE_PURPOSE (vals) != NULL_TREE)
++	{
++	  /* Set a range of bits to ones.  */
++	  HOST_WIDE_INT lo_index
++	    = tree_low_cst (TREE_PURPOSE (vals), 0) - domain_min;
++	  HOST_WIDE_INT hi_index
++	    = tree_low_cst (TREE_VALUE (vals), 0) - domain_min;
++
++          if (lo_index < low_limit || hi_index >= bit_size)
++            {
++              error ("invalid initializer for set");
++              return NULL_TREE;
++            }
++
++	  gcc_assert (lo_index >= 0);
++	  gcc_assert (lo_index < bit_size);
++	  gcc_assert (hi_index >= 0);
++	  gcc_assert (hi_index < bit_size);
++	  for (; lo_index <= hi_index; lo_index++)
++	    buffer[lo_index] = 1;
++	}
++      else
++	{
++	  /* Set a single bit to one.  */
++	  HOST_WIDE_INT index
++	    = tree_low_cst (TREE_VALUE (vals), 0) - domain_min;
++	  if (index < 0 || index >= bit_size)
++	    {
++	      error ("invalid initializer for set");
++	      return NULL_TREE;
++	    }
++	  buffer[index] = 1;
++	}
++    }
++  return non_const_bits;
++}
++
++/* Expand (the constant part of) a SET_TYPE CONSTRUCTOR node.
++   The result is placed in BUFFER (which is an array of bytes).
++   If the constructor is constant, NULL_TREE is returned.
++   Otherwise, a TREE_LIST of the non-constant elements is emitted.  */
++
++tree
++get_set_constructor_bytes (tree init, unsigned char *buffer, int wd_size)
++{
++  int i;
++#ifdef GPC
++  int bit_size = wd_size * BITS_PER_UNIT;
++  unsigned int bit_pos = 0;
++#else /* not GPC */
++  int set_word_size = BITS_PER_UNIT;
++  int bit_size = wd_size * set_word_size;
++  int bit_pos = 0;
++#endif /* not GPC */
++  unsigned char *bytep = buffer;
++  char *bit_buffer = alloca (bit_size);
++  tree non_const_bits = get_set_constructor_bits (init, bit_buffer, bit_size);
++
++  for (i = 0; i < wd_size; i++)
++    buffer[i] = 0;
++
++  for (i = 0; i < bit_size; i++)
++    {
++#ifdef GPC
++      if (bit_buffer[i])
++      {
++          int k = bit_pos / BITS_PER_UNIT;
++          if (WORDS_BIG_ENDIAN)
++            k = set_word_size / BITS_PER_UNIT - 1 - k;
++        if (set_words_big_endian)
++          bytep[k] |= (1 << (BITS_PER_UNIT - 1 - bit_pos % BITS_PER_UNIT));
++        else
++          bytep[k] |= (1 << (bit_pos % BITS_PER_UNIT));
++      }
++      bit_pos++;
++      if (bit_pos >= set_word_size)
++        {
++          bit_pos = 0;
++          bytep += set_word_size / BITS_PER_UNIT;
++        }
++#else /* not GPC */
++      if (bit_buffer[i])
++	{
++	  if (BYTES_BIG_ENDIAN)
++	    *bytep |= (1 << (set_word_size - 1 - bit_pos));
++	  else
++	    *bytep |= 1 << bit_pos;
++	}
++      bit_pos++;
++      if (bit_pos >= set_word_size)
++	bit_pos = 0, bytep++;
++#endif
++    }
++  return non_const_bits;
++}
++
+ #if defined ENABLE_TREE_CHECKING && (GCC_VERSION >= 2007)
+ 
+ /* Complain that the tree code of NODE does not match the expected 0
+@@ -6627,6 +6769,15 @@
+       {
+ 	unsigned HOST_WIDE_INT idx;
+ 
++#if 0
++      /* Set is empty if it has no elements.  */
++      if (TREE_CODE (TREE_TYPE (init)) == SET_TYPE && elt)
++        return false;
++#else
++      if (TREE_CODE (TREE_TYPE (init)) == SET_TYPE)
++        gcc_unreachable ();
++#endif
++        
+ 	FOR_EACH_CONSTRUCTOR_VALUE (CONSTRUCTOR_ELTS (init), idx, elt)
+ 	  if (!initializer_zerop (elt))
+ 	    return false;
+diff -ru ../gcc-4.1.0.orig/gcc/tree.def gcc-4.1.0/gcc/tree.def
+--- ../gcc-4.1.0.orig/gcc/tree.def	2006-02-10 18:32:10.000000000 +0100
++++ gcc-4.1.0/gcc/tree.def	2006-04-04 21:16:16.000000000 +0200
+@@ -254,6 +254,12 @@
+    includes the hidden argument for "self".  */
+ DEFTREECODE (METHOD_TYPE, "method_type", tcc_type, 0)
+ 
++/* Types of sets for Pascal.  Special fields are the same as
++   in an array type.  The target type is always a boolean type.
++   Used for both bitstrings and powersets in Chill;
++   TYPE_STRING_FLAG indicates a bitstring.  */
++DEFTREECODE (SET_TYPE, "set_type", tcc_type, 0)
++
+ /* This is a language-specific kind of type.
+    Its meaning is defined by the language front end.
+    layout_type does not know how to lay this out,
+diff -ru ../gcc-4.1.0.orig/gcc/tree.h gcc-4.1.0/gcc/tree.h
+--- ../gcc-4.1.0.orig/gcc/tree.h	2006-02-14 15:36:15.000000000 +0100
++++ gcc-4.1.0/gcc/tree.h	2006-04-04 21:16:31.000000000 +0200
+@@ -704,6 +704,9 @@
+ #define NOT_RECORD_OR_UNION_CHECK(T) \
+   TREE_NOT_CHECK3 (T, RECORD_TYPE, UNION_TYPE, QUAL_UNION_TYPE)
+ 
++#define ARRAY_OR_SET_CHECK(T)            \
++  TREE_CHECK2 (T, ARRAY_TYPE, SET_TYPE)
++
+ #define NUMERICAL_TYPE_CHECK(T)					\
+   TREE_CHECK5 (T, INTEGER_TYPE, ENUMERAL_TYPE, BOOLEAN_TYPE,	\
+ 	       CHAR_TYPE, REAL_TYPE)
+@@ -817,7 +820,8 @@
+ 
+ #define AGGREGATE_TYPE_P(TYPE) \
+   (TREE_CODE (TYPE) == ARRAY_TYPE || TREE_CODE (TYPE) == RECORD_TYPE \
+-   || TREE_CODE (TYPE) == UNION_TYPE || TREE_CODE (TYPE) == QUAL_UNION_TYPE)
++   || TREE_CODE (TYPE) == UNION_TYPE || TREE_CODE (TYPE) == QUAL_UNION_TYPE \
++   || TREE_CODE (TYPE) == SET_TYPE)
+ 
+ /* Nonzero if TYPE represents a pointer or reference type.
+    (It should be renamed to INDIRECT_TYPE_P.)  Keep these checks in
+@@ -1618,7 +1622,7 @@
+ #define TYPE_SIZE_UNIT(NODE) (TYPE_CHECK (NODE)->type.size_unit)
+ #define TYPE_MODE(NODE) (TYPE_CHECK (NODE)->type.mode)
+ #define TYPE_VALUES(NODE) (ENUMERAL_TYPE_CHECK (NODE)->type.values)
+-#define TYPE_DOMAIN(NODE) (ARRAY_TYPE_CHECK (NODE)->type.values)
++#define TYPE_DOMAIN(NODE) (ARRAY_OR_SET_CHECK (NODE)->type.values)
+ #define TYPE_FIELDS(NODE) (RECORD_OR_UNION_CHECK (NODE)->type.values)
+ #define TYPE_CACHED_VALUES(NODE) (TYPE_CHECK(NODE)->type.values)
+ #define TYPE_ORIG_SIZE_TYPE(NODE)			\
+@@ -3535,6 +3539,15 @@
+ /* and its original value in bytes, specified via -fpack-struct=<value>.  */
+ extern unsigned int initial_max_fld_align;
+ 
++/* If nonzero, the alignment of a bitstring or (power-)set value, in bits.  */
++extern unsigned int set_alignment;
++
++/* The word size of a bitstring or (power-)set value, in bits.  */
++extern unsigned int set_word_size;
++
++/* If non-zero, bits in (power-)sets start with the highest bit.  */
++extern unsigned int set_words_big_endian;
++
+ /* Concatenate two lists (chains of TREE_LIST nodes) X and Y
+    by making the last node in X point to Y.
+    Returns X, except if X is 0 returns Y.  */
+Only in gcc-4.1.0/gcc: tree.h.orig
+diff -ru ../gcc-4.1.0.orig/gcc/varasm.c gcc-4.1.0/gcc/varasm.c
+--- ../gcc-4.1.0.orig/gcc/varasm.c	2005-12-24 09:56:10.000000000 +0100
++++ gcc-4.1.0/gcc/varasm.c	2006-04-04 21:16:16.000000000 +0200
+@@ -2446,6 +2446,18 @@
+ 	      + const_hash_1 (TREE_IMAGPART (exp)));
+ 
+     case CONSTRUCTOR:
++      if (TREE_CODE (TREE_TYPE (exp)) == SET_TYPE)
++        {
++          char *tmp;
++
++          len = int_size_in_bytes (TREE_TYPE (exp));
++          tmp = alloca (len);
++          gcc_unreachable ();
++          get_set_constructor_bytes (exp, (unsigned char *) tmp, len);
++          p = tmp;
++          break;
++        }
++      else
+       {
+ 	unsigned HOST_WIDE_INT idx;
+ 	tree value;
+@@ -2571,6 +2583,30 @@
+ 	typecode = TREE_CODE (TREE_TYPE (t1));
+ 	if (typecode != TREE_CODE (TREE_TYPE (t2)))
+ 	  return 0;
++      if (typecode == SET_TYPE)
++        {
++          int len = int_size_in_bytes (TREE_TYPE (t2));
++          unsigned char *tmp1, *tmp2;
++
++          if (TYPE_MAIN_VARIANT (TREE_TYPE (t1)) !=
++                TYPE_MAIN_VARIANT (TREE_TYPE (t2)))
++            return 0;
++
++          if (int_size_in_bytes (TREE_TYPE (t1)) != len)
++            return 0;
++
++          tmp1 = alloca (len);
++          tmp2 = alloca (len);
++
++          gcc_unreachable ();
++          if (get_set_constructor_bytes (t1, tmp1, len) != NULL_TREE)
++            return 0;
++          if (get_set_constructor_bytes (t2, tmp2, len) != NULL_TREE)
++            return 0;
++
++          return memcmp (tmp1, tmp2, len) == 0;
++        }
++
+ 
+ 	if (typecode == ARRAY_TYPE)
+ 	  {
+@@ -2703,6 +2739,24 @@
+ 	VEC(constructor_elt, gc) *v;
+ 	unsigned HOST_WIDE_INT idx;
+ 	tree purpose, value;
++
++#if 0
++        tree list = copy_list (CONSTRUCTOR_ELTS (exp));
++        tree tail;
++
++        CONSTRUCTOR_ELTS (copy) = list;
++        for (tail = list; tail; tail = TREE_CHAIN (tail))
++          TREE_VALUE (tail) = copy_constant (TREE_VALUE (tail));
++
++        if (TREE_CODE (TREE_TYPE (exp)) == SET_TYPE)
++          for (tail = list; tail; tail = TREE_CHAIN (tail))
++            TREE_PURPOSE (tail) = copy_constant (TREE_PURPOSE (tail));
++
++        return copy;
++#else
++        if (TREE_CODE (TREE_TYPE (exp)) == SET_TYPE)
++          gcc_unreachable ();
++#endif
+ 	
+ 	v = VEC_alloc(constructor_elt, gc, VEC_length(constructor_elt,
+ 						      CONSTRUCTOR_ELTS (exp)));
+@@ -3743,7 +3797,12 @@
+ 	/* Allow conversions to struct or union types if the value
+ 	   inside is okay.  */
+ 	if (TREE_CODE (dest_type) == RECORD_TYPE
+-	    || TREE_CODE (dest_type) == UNION_TYPE)
++	    || TREE_CODE (dest_type) == UNION_TYPE
++#ifdef GPC
++            || TREE_CODE (TREE_TYPE (value)) == ARRAY_TYPE
++#endif
++           )
++
+ 	  return initializer_constant_valid_p (src, endtype);
+       }
+       break;
+@@ -4032,6 +4091,23 @@
+       output_constructor (exp, size, align);
+       return;
+ 
++    case SET_TYPE:
++      if (TREE_CODE (exp) == INTEGER_CST)
++        assemble_integer (expand_expr (exp, NULL_RTX,
++                                       VOIDmode, EXPAND_INITIALIZER),
++                          thissize, align, 1);
++      else if (TREE_CODE (exp) == CONSTRUCTOR)
++        {
++          unsigned char *buffer = alloca (thissize);
++          gcc_unreachable ();
++          if (get_set_constructor_bytes (exp, buffer, thissize))
++            abort ();
++          assemble_string ((char *) buffer, thissize);
++        }
++      else
++        error ("unknown set constructor type");
++      return;
++
+     case ERROR_MARK:
+       return;
+ 
--- gcj-4.2-4.2-20070707.orig/debian/patches/gcc-version.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/gcc-version.dpatch
@@ -0,0 +1,35 @@
+#! /bin/sh -e
+
+# DP: Add package identification to the gcc version string
+
+pkgversion=
+if [ -n "$DEB_VERSION" ]; then
+    pkgversion=" $DEB_VERSION"
+fi
+
+dist=Debian
+dist=$(lsb_release -is)
+
+dir=gcc
+if [ $# -eq 3 -a "$2" = '-d' ]; then
+    dir=$3/gcc
+elif [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+case "$1" in
+    -patch)
+	sed -e "/#define VERSUFFIX/s/\".*/\" ($dist$pkgversion)\"/" \
+	  $dir/version.c > $dir/version.c.new \
+	    && mv -f $dir/version.c.new $dir/version.c
+	;;
+    -unpatch)
+	sed -e '/#define VERSUFFIX/s/".*/""/' \
+	  $dir/version.c > $dir/version.c.new \
+	    && mv -f $dir/version.c.new $dir/version.c
+	;;
+    *)
+	echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+	exit 1
+esac
+exit 0
--- gcj-4.2-4.2-20070707.orig/debian/patches/multiarch-lib.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/multiarch-lib.dpatch
@@ -0,0 +1,52 @@
+#! /bin/sh -e
+
+# multiarch-lib.dpatch by Stephen Frost <sfrost@debian.org>
+
+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
++
--- gcj-4.2-4.2-20070707.orig/debian/patches/kbsd-gnu-ada.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/kbsd-gnu-ada.dpatch
@@ -0,0 +1,590 @@
+#! /bin/sh -e
+
+# Description: Ada support for GNU/k*BSD 
+# Author: Aurelien Jarno <aurel32@debian.Org>
+# Status: not yet submitted upstream.
+
+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 -p1 < $0
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p1 < $0
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+# append the patch here and adjust the -p? flag in the patch calls.
+
+--- gcc-4.1.0.old/gcc/ada/Makefile.in	2005-04-07 22:03:50.000000000 +0200
++++ gcc-4.1.0/gcc/ada/Makefile.in	2005-11-28 21:14:23.000000000 +0100
+@@ -835,6 +835,34 @@
+   endif
+ endif
+ 
++ifeq ($(strip $(filter-out %86 kfreebsd%,$(arch) $(osys))),)
++  LIBGNAT_TARGET_PAIRS = \
++  a-intnam.ads<a-intnam-freebsd.ads \
++  a-numaux.adb<a-numaux-x86.adb \
++  a-numaux.ads<a-numaux-x86.ads \
++  s-inmaop.adb<s-inmaop-posix.adb \
++  s-intman.adb<s-intman-posix.adb \
++  g-soccon.ads<g-soccon-freebsd.ads \
++  s-osinte.adb<s-osinte-posix.adb \
++  s-osinte.ads<s-osinte-kfreebsd-gnu.ads \
++  s-osprim.adb<s-osprim-posix.adb \
++  s-taprop.adb<s-taprop-linux.adb \
++  s-taspri.ads<s-taspri-posix.ads \
++  s-tpopsp.adb<s-tpopsp-posix-foreign.adb \
++  system.ads<system-freebsd-x86.ads
++
++  TOOLS_TARGET_PAIRS =  \
++    mlib-tgt.adb<mlib-tgt-linux.adb \
++    indepsw.adb<indepsw-gnu.adb
++
++  SYMLIB = -laddr2line -lbfd -liberty $(LIBINTL)
++  THREADSLIB = -lpthread
++  GNATLIB_SHARED = gnatlib-shared-dual
++  GMEM_LIB = gmemlib
++  PREFIX_OBJS = $(PREFIX_REAL_OBJS)
++  LIBRARY_VERSION := $(LIB_VERSION)
++endif
++
+ ifeq ($(strip $(filter-out %86 freebsd%,$(arch) $(osys))),)
+   LIBGNAT_TARGET_PAIRS = \
+   a-intnam.ads<a-intnam-freebsd.ads \
+--- gcc-4.1.0.old/gcc/ada/s-osinte-kfreebsd-gnu.ads	2005-06-25 01:06:36.000000000 +0200
++++ gcc-4.1.0/gcc/ada/s-osinte-kfreebsd-gnu.ads	2005-06-25 01:06:03.000000000 +0200
+@@ -0,0 +1,521 @@
++------------------------------------------------------------------------------
++--                                                                          --
++--                GNU ADA RUN-TIME LIBRARY (GNARL) COMPONENTS               --
++--                                                                          --
++--                   S Y S T E M . O S _ I N T E R F A C E                  --
++--                                                                          --
++--                                  S p e c                                 --
++--                                                                          --
++--             Copyright (C) 1991-1994, Florida State University            --
++--             Copyright (C) 1995-2005, Free Software Foundation, Inc.      --
++--                                                                          --
++-- GNARL is free software; you can  redistribute it  and/or modify it under --
++-- terms of the  GNU General Public License as published  by the Free Soft- --
++-- ware  Foundation;  either version 2,  or (at your option) any later ver- --
++-- sion. GNARL is distributed in the hope that it will be useful, but WITH- --
++-- OUT 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  distributed with GNARL; see file COPYING.  If not, write --
++-- to  the  Free Software Foundation,  51  Franklin  Street,  Fifth  Floor, --
++-- Boston, MA 02110-1301, USA.                                              --
++--                                                                          --
++-- As a special exception,  if other files  instantiate  generics from this --
++-- unit, or you link  this unit with other files  to produce an executable, --
++-- this  unit  does not  by itself cause  the resulting  executable  to  be --
++-- covered  by the  GNU  General  Public  License.  This exception does not --
++-- however invalidate  any other reasons why  the executable file  might be --
++-- covered by the  GNU Public License.                                      --
++--                                                                          --
++-- GNARL was developed by the GNARL team at Florida State University.       --
++-- Extensive contributions were provided by Ada Core Technologies, Inc.     --
++--                                                                          --
++------------------------------------------------------------------------------
++
++--  This is the GNU/kFreeBSD (GNU/LinuxThreads) version of this package
++
++--  This package encapsulates all direct interfaces to OS services
++--  that are needed by children of System.
++
++--  PLEASE DO NOT add any with-clauses to this package or remove the pragma
++--  Preelaborate. This package is designed to be a bottom-level (leaf) package
++
++with Interfaces.C;
++with Unchecked_Conversion;
++
++package System.OS_Interface is
++   pragma Preelaborate;
++
++   pragma Linker_Options ("-lpthread");
++
++   subtype int            is Interfaces.C.int;
++   subtype char           is Interfaces.C.char;
++   subtype short          is Interfaces.C.short;
++   subtype long           is Interfaces.C.long;
++   subtype unsigned       is Interfaces.C.unsigned;
++   subtype unsigned_short is Interfaces.C.unsigned_short;
++   subtype unsigned_long  is Interfaces.C.unsigned_long;
++   subtype unsigned_char  is Interfaces.C.unsigned_char;
++   subtype plain_char     is Interfaces.C.plain_char;
++   subtype size_t         is Interfaces.C.size_t;
++
++   -----------
++   -- Errno --
++   -----------
++
++   function errno return int;
++   pragma Import (C, errno, "__get_errno");
++
++   EAGAIN   : constant := 35;
++   EINTR    : constant := 4;
++   EINVAL   : constant := 22;
++   ENOMEM   : constant := 12;
++   EPERM    : constant := 1;
++   ETIMEDOUT    : constant := 60;
++
++   -------------
++   -- Signals --
++   -------------
++
++   Max_Interrupt : constant := 128;
++   type Signal is new int range 0 .. Max_Interrupt;
++   for Signal'Size use int'Size;
++
++   SIGHUP     : constant := 1; --  hangup
++   SIGINT     : constant := 2; --  interrupt (rubout)
++   SIGQUIT    : constant := 3; --  quit (ASCD FS)
++   SIGILL     : constant := 4; --  illegal instruction (not reset)
++   SIGTRAP    : constant := 5; --  trace trap (not reset)
++   SIGIOT     : constant := 6; --  IOT instruction
++   SIGABRT    : constant := 6; --  used by abort, replace SIGIOT in the  future
++   SIGEMT     : constant := 7; --  EMT instruction
++   SIGFPE     : constant := 8; --  floating point exception
++   SIGKILL    : constant := 9; --  kill (cannot be caught or ignored)
++   SIGBUS     : constant := 10; --  bus error
++   SIGSEGV    : constant := 11; --  segmentation violation
++   SIGSYS     : constant := 12; --  bad argument to system call
++   SIGPIPE    : constant := 13; --  write on a pipe with no one to read it
++   SIGALRM    : constant := 14; --  alarm clock
++   SIGTERM    : constant := 15; --  software termination signal from kill
++   SIGURG     : constant := 16; --  urgent condition on IO channel
++   SIGSTOP    : constant := 17; --  stop (cannot be caught or ignored)
++   SIGTSTP    : constant := 18; --  user stop requested from tty
++   SIGCONT    : constant := 19; --  stopped process has been continued
++   SIGCLD     : constant := 20; --  alias for SIGCHLD
++   SIGCHLD    : constant := 20; --  child status change
++   SIGTTIN    : constant := 21; --  background tty read attempted
++   SIGTTOU    : constant := 22; --  background tty write attempted
++   SIGIO      : constant := 23; --  I/O possible (Solaris SIGPOLL alias)
++   SIGXCPU    : constant := 24; --  CPU time limit exceeded
++   SIGXFSZ    : constant := 25; --  filesize limit exceeded
++   SIGVTALRM  : constant := 26; --  virtual timer expired
++   SIGPROF    : constant := 27; --  profiling timer expired
++   SIGWINCH   : constant := 28; --  window size change
++   SIGINFO    : constant := 29; --  information request (NetBSD/FreeBSD)
++   SIGUSR1    : constant := 30; --  user defined signal 1
++   SIGUSR2    : constant := 31; --  user defined signal 2
++   SIGLTHRRES : constant := 32; --  GNU/LinuxThreads restart signal
++   SIGLTHRCAN : constant := 33; --  GNU/LinuxThreads cancel signal
++   SIGLTHRDBG : constant := 34; --  GNU/LinuxThreads debugger signal
++
++   SIGADAABORT : constant := SIGABRT;
++   --  Change this if you want to use another signal for task abort.
++   --  SIGTERM might be a good one.
++
++   type Signal_Set is array (Natural range <>) of Signal;
++
++   Unmasked    : constant Signal_Set := (
++      SIGTRAP,
++      --  To enable debugging on multithreaded applications, mark SIGTRAP to
++      --  be kept unmasked.
++
++      SIGBUS,
++
++      SIGTTIN, SIGTTOU, SIGTSTP,
++      --  Keep these three signals unmasked so that background processes
++      --  and IO behaves as normal "C" applications
++
++      SIGPROF,
++      --  To avoid confusing the profiler
++
++      SIGKILL, SIGSTOP,
++      --  These two signals actually cannot be masked;
++      --  POSIX simply won't allow it.
++
++      SIGLTHRRES, SIGLTHRCAN, SIGLTHRDBG);
++      --  These three signals are used by GNU/LinuxThreads starting from
++      --  glibc 2.1 (future 2.2).
++
++   Reserved    : constant Signal_Set :=
++   --  I am not sure why the following signal is reserved.
++   --  I guess they are not supported by this version of GNU/kFreeBSD.
++     (0 .. 0 => SIGVTALRM);
++
++   type sigset_t is private;
++
++   function sigaddset (set : access sigset_t; sig : Signal) return int;
++   pragma Import (C, sigaddset, "sigaddset");
++
++   function sigdelset (set : access sigset_t; sig : Signal) return int;
++   pragma Import (C, sigdelset, "sigdelset");
++
++   function sigfillset (set : access sigset_t) return int;
++   pragma Import (C, sigfillset, "sigfillset");
++
++   function sigismember (set : access sigset_t; sig : Signal) return int;
++   pragma Import (C, sigismember, "sigismember");
++
++   function sigemptyset (set : access sigset_t) return int;
++   pragma Import (C, sigemptyset, "sigemptyset");
++
++   --  sigcontext is architecture dependent, so define it private
++   type struct_sigcontext is private;
++
++   type struct_sigaction is record
++      sa_handler : System.Address;
++      sa_flags   : int;
++      sa_mask    : sigset_t;
++   end record;
++   pragma Convention (C, struct_sigaction);
++
++   type struct_sigaction_ptr is access all struct_sigaction;
++
++   SIG_BLOCK   : constant := 1;
++   SIG_UNBLOCK : constant := 2;
++   SIG_SETMASK : constant := 3;
++
++   SIG_DFL : constant := 0;
++   SIG_IGN : constant := 1;
++
++   SA_SIGINFO : constant := 16#0040#;
++
++   function sigaction
++     (sig  : Signal;
++      act  : struct_sigaction_ptr;
++      oact : struct_sigaction_ptr) return int;
++   pragma Import (C, sigaction, "sigaction");
++
++   ----------
++   -- Time --
++   ----------
++
++   type timespec is private;
++
++   function To_Duration (TS : timespec) return Duration;
++   pragma Inline (To_Duration);
++
++   function To_Timespec (D : Duration) return timespec;
++   pragma Inline (To_Timespec);
++
++   type struct_timeval is private;
++
++   function To_Duration (TV : struct_timeval) return Duration;
++   pragma Inline (To_Duration);
++
++   function To_Timeval (D : Duration) return struct_timeval;
++   pragma Inline (To_Timeval);
++
++   function gettimeofday
++     (tv : access struct_timeval;
++      tz : System.Address := System.Null_Address) return int;
++   pragma Import (C, gettimeofday, "gettimeofday");
++
++   function sysconf (name : int) return long;
++   pragma Import (C, sysconf);
++
++   SC_CLK_TCK : constant := 2;
++
++   -------------------------
++   -- Priority Scheduling --
++   -------------------------
++
++   SCHED_FIFO  : constant := 1;
++   SCHED_OTHER : constant := 2;
++   SCHED_RR    : constant := 3;
++
++   -------------
++   -- Process --
++   -------------
++
++   type pid_t is private;
++
++   function kill (pid : pid_t; sig : Signal) return int;
++   pragma Import (C, kill, "kill");
++
++   function getpid return pid_t;
++   pragma Import (C, getpid, "getpid");
++
++   -------------
++   -- Threads --
++   -------------
++
++   type Thread_Body is access
++     function (arg : System.Address) return System.Address;
++
++   function Thread_Body_Access is new
++     Unchecked_Conversion (System.Address, Thread_Body);
++
++   type pthread_t is new unsigned_long;
++   subtype Thread_Id        is pthread_t;
++
++   function To_pthread_t is new Unchecked_Conversion
++     (unsigned_long, pthread_t);
++
++   type pthread_mutex_t     is limited private;
++   type pthread_cond_t      is limited private;
++   type pthread_attr_t      is limited private;
++   type pthread_mutexattr_t is limited private;
++   type pthread_condattr_t  is limited private;
++   type pthread_key_t       is private;
++
++   PTHREAD_CREATE_DETACHED : constant := 1;
++
++   -----------
++   -- Stack --
++   -----------
++
++   function Get_Stack_Base (thread : pthread_t) return Address;
++   pragma Inline (Get_Stack_Base);
++   --  This is a dummy procedure to share some GNULLI files
++
++   ---------------------------------------
++   -- Nonstandard Thread Initialization --
++   ---------------------------------------
++
++   procedure pthread_init;
++   pragma Inline (pthread_init);
++   --  This is a dummy procedure to share some GNULLI files
++
++   -------------------------
++   -- POSIX.1c  Section 3 --
++   -------------------------
++
++   function sigwait (set : access sigset_t; sig : access Signal) return int;
++   pragma Import (C, sigwait, "sigwait");
++
++   function pthread_kill (thread : pthread_t; sig : Signal) return int;
++   pragma Import (C, pthread_kill, "pthread_kill");
++
++   type sigset_t_ptr is access all sigset_t;
++
++   function pthread_sigmask
++     (how  : int;
++      set  : sigset_t_ptr;
++      oset : sigset_t_ptr) return int;
++   pragma Import (C, pthread_sigmask, "pthread_sigmask");
++
++   --------------------------
++   -- POSIX.1c  Section 11 --
++   --------------------------
++
++   function pthread_mutexattr_init
++     (attr : access pthread_mutexattr_t) return int;
++   pragma Import (C, pthread_mutexattr_init, "pthread_mutexattr_init");
++
++   function pthread_mutexattr_destroy
++     (attr : access pthread_mutexattr_t) return int;
++   pragma Import (C, pthread_mutexattr_destroy, "pthread_mutexattr_destroy");
++
++   function pthread_mutex_init
++     (mutex : access pthread_mutex_t;
++      attr  : access pthread_mutexattr_t) return int;
++   pragma Import (C, pthread_mutex_init, "pthread_mutex_init");
++
++   function pthread_mutex_destroy (mutex : access pthread_mutex_t) return int;
++   pragma Import (C, pthread_mutex_destroy, "pthread_mutex_destroy");
++
++   function pthread_mutex_lock (mutex : access pthread_mutex_t) return int;
++   pragma Import (C, pthread_mutex_lock, "pthread_mutex_lock");
++
++   function pthread_mutex_unlock (mutex : access pthread_mutex_t) return int;
++   pragma Import (C, pthread_mutex_unlock, "pthread_mutex_unlock");
++
++   function pthread_condattr_init
++     (attr : access pthread_condattr_t) return int;
++   pragma Import (C, pthread_condattr_init, "pthread_condattr_init");
++
++   function pthread_condattr_destroy
++     (attr : access pthread_condattr_t) return int;
++   pragma Import (C, pthread_condattr_destroy, "pthread_condattr_destroy");
++
++   function pthread_cond_init
++     (cond : access pthread_cond_t;
++      attr : access pthread_condattr_t) return int;
++   pragma Import (C, pthread_cond_init, "pthread_cond_init");
++
++   function pthread_cond_destroy (cond : access pthread_cond_t) return int;
++   pragma Import (C, pthread_cond_destroy, "pthread_cond_destroy");
++
++   function pthread_cond_signal (cond : access pthread_cond_t) return int;
++   pragma Import (C, pthread_cond_signal, "pthread_cond_signal");
++
++   function pthread_cond_wait
++     (cond  : access pthread_cond_t;
++      mutex : access pthread_mutex_t) return int;
++   pragma Import (C, pthread_cond_wait, "pthread_cond_wait");
++
++   function pthread_cond_timedwait
++     (cond    : access pthread_cond_t;
++      mutex   : access pthread_mutex_t;
++      abstime : access timespec) return int;
++   pragma Import (C, pthread_cond_timedwait, "pthread_cond_timedwait");
++
++   Relative_Timed_Wait : constant Boolean := False;
++   --  pthread_cond_timedwait requires an absolute delay time
++
++   --------------------------
++   -- POSIX.1c  Section 13 --
++   --------------------------
++
++   type struct_sched_param is record
++      sched_priority : int;  --  scheduling priority
++   end record;
++   pragma Convention (C, struct_sched_param);
++
++   function pthread_setschedparam
++     (thread : pthread_t;
++      policy : int;
++      param  : access struct_sched_param) return int;
++   pragma Import (C, pthread_setschedparam, "pthread_setschedparam");
++
++   function pthread_attr_setschedpolicy
++     (attr   : access pthread_attr_t;
++      policy : int) return int;
++   pragma Import
++     (C, pthread_attr_setschedpolicy, "pthread_attr_setschedpolicy");
++
++   function sched_yield return int;
++   pragma Import (C, sched_yield, "sched_yield");
++
++   ---------------------------
++   -- P1003.1c - Section 16 --
++   ---------------------------
++
++   function pthread_attr_init
++     (attributes : access pthread_attr_t) return int;
++   pragma Import (C, pthread_attr_init, "pthread_attr_init");
++
++   function pthread_attr_destroy
++     (attributes : access pthread_attr_t) return int;
++   pragma Import (C, pthread_attr_destroy, "pthread_attr_destroy");
++
++   function pthread_attr_setdetachstate
++     (attr        : access pthread_attr_t;
++      detachstate : int) return int;
++   pragma Import
++     (C, pthread_attr_setdetachstate, "pthread_attr_setdetachstate");
++
++   function pthread_attr_setstacksize
++     (attr      : access pthread_attr_t;
++      stacksize : size_t) return int;
++   pragma Import (C, pthread_attr_setstacksize, "pthread_attr_setstacksize");
++
++   function pthread_create
++     (thread        : access pthread_t;
++      attributes    : access pthread_attr_t;
++      start_routine : Thread_Body;
++      arg           : System.Address) return int;
++   pragma Import (C, pthread_create, "pthread_create");
++
++   procedure pthread_exit (status : System.Address);
++   pragma Import (C, pthread_exit, "pthread_exit");
++
++   function pthread_self return pthread_t;
++   pragma Import (C, pthread_self, "pthread_self");
++
++   --------------------------
++   -- POSIX.1c  Section 17 --
++   --------------------------
++
++   function pthread_setspecific
++     (key   : pthread_key_t;
++      value : System.Address) return int;
++   pragma Import (C, pthread_setspecific, "pthread_setspecific");
++
++   function pthread_getspecific (key : pthread_key_t) return System.Address;
++   pragma Import (C, pthread_getspecific, "pthread_getspecific");
++
++   type destructor_pointer is access procedure (arg : System.Address);
++
++   function pthread_key_create
++     (key        : access pthread_key_t;
++      destructor : destructor_pointer) return int;
++   pragma Import (C, pthread_key_create, "pthread_key_create");
++
++private
++
++   type sigset_t is array (1 .. 4) of unsigned;
++
++   --  In FreeBSD the component sa_handler turns out to
++   --  be one a union type, and the selector is a macro:
++   --  #define sa_handler __sigaction_u._handler
++   --  #define sa_sigaction __sigaction_u._sigaction
++
++   --  Should we add a signal_context type here ?
++   --  How could it be done independent of the CPU architecture ?
++   --  sigcontext type is opaque, so it is architecturally neutral.
++   --  It is always passed as an access type, so define it as an empty record
++   --  since the contents are not used anywhere.
++   type struct_sigcontext is null record;
++   pragma Convention (C, struct_sigcontext);
++
++   type pid_t is new int;
++
++   type time_t is new long;
++
++   type timespec is record
++      tv_sec  : time_t;
++      tv_nsec : long;
++   end record;
++   pragma Convention (C, timespec);
++
++   type struct_timeval is record
++      tv_sec  : time_t;
++      tv_usec : time_t;
++   end record;
++   pragma Convention (C, struct_timeval);
++
++   type pthread_attr_t is record
++      detachstate   : int;
++      schedpolicy   : int;
++      schedparam    : struct_sched_param;
++      inheritsched  : int;
++      scope         : int;
++      guardsize     : size_t;
++      stackaddr_set : int;
++      stackaddr     : System.Address;
++      stacksize     : size_t;
++   end record;
++   pragma Convention (C, pthread_attr_t);
++
++   type pthread_condattr_t is record
++      dummy : int;
++   end record;
++   pragma Convention (C, pthread_condattr_t);
++
++   type pthread_mutexattr_t is record
++      mutexkind : int;
++   end record;
++   pragma Convention (C, pthread_mutexattr_t);
++
++   type struct_pthread_fast_lock is record
++      status   : long;
++      spinlock : int;
++   end record;
++   pragma Convention (C, struct_pthread_fast_lock);
++
++   type pthread_mutex_t is record
++      m_reserved : int;
++      m_count    : int;
++      m_owner    : System.Address;
++      m_kind     : int;
++      m_lock     : struct_pthread_fast_lock;
++   end record;
++   pragma Convention (C, pthread_mutex_t);
++
++   type pthread_cond_t is array (0 .. 47) of unsigned_char;
++   pragma Convention (C, pthread_cond_t);
++
++   type pthread_key_t is new unsigned;
++
++end System.OS_Interface;
--- gcj-4.2-4.2-20070707.orig/debian/patches/deb-protoize.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/deb-protoize.dpatch
@@ -0,0 +1,48 @@
+#! /bin/sh -e
+
+# DP: build protoize/unprotoize binaries
+
+if [ $# -eq 3 -a "$2" = '-d' ]; then
+    pdir="-d $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/Makefile.in.old	2006-04-02 00:12:07.360106584 +0200
++++ gcc/Makefile.in	2006-04-02 00:13:16.211639560 +0200
+@@ -131,7 +131,7 @@
+ 
+ # Selection of languages to be made.
+ CONFIG_LANGUAGES = @all_selected_languages@
+-LANGUAGES = c gcov$(exeext) gcov-dump$(exeext) $(CONFIG_LANGUAGES)
++LANGUAGES = c proto gcov$(exeext) gcov-dump$(exeext) $(CONFIG_LANGUAGES)
+ 
+ # Selection of languages to be made during stage1 build.
+ BOOT_LANGUAGES = c @all_boot_languages@
+@@ -3054,7 +3054,7 @@
+    coretypes.h $(TM_H) Makefile version.h cppdefault.h intl.h
+ 	(SHLIB_LINK='$(SHLIB_LINK)' \
+ 	SHLIB_MULTILIB='$(SHLIB_MULTILIB)'; \
+-	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) \
++	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) -Wno-error \
+ 	  $(DRIVER_DEFINES) \
+ 	  $(srcdir)/protoize.c $(OUTPUT_OPTION))
+ 
+@@ -3062,7 +3062,7 @@
+    $(CONFIG_H) $(SYSTEM_H) Makefile version.h
+ 	(SHLIB_LINK='$(SHLIB_LINK)' \
+ 	SHLIB_MULTILIB='$(SHLIB_MULTILIB)'; \
+-	$(CC) -c -DUNPROTOIZE $(ALL_CFLAGS) $(ALL_CPPFLAGS) \
++	$(CC) -c -DUNPROTOIZE $(ALL_CFLAGS) $(ALL_CPPFLAGS) -Wno-error \
+ 	  $(DRIVER_DEFINES) \
+ 	  $(srcdir)/protoize.c $(OUTPUT_OPTION))
+ 
--- gcj-4.2-4.2-20070707.orig/debian/patches/m68k-peephole.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/m68k-peephole.dpatch
@@ -0,0 +1,312 @@
+#! /bin/sh -e
+
+# All lines beginning with `# DPATCH:' are a description of the patch.
+# DP: Convert some text peepholes to rtl peepholes, so the correct
+# DP: DWARF2 information can be generated for stack manipulations.
+# DP: (Keep a few peepholes temporarily disabled.)
+
+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 -p1 < $0
+        #cd ${dir}gcc && autoconf
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p1 < $0
+        #rm ${dir}gcc/configure
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+---
+
+ gcc/config/m68k/m68k.h  |    2 
+ gcc/config/m68k/m68k.md |  227 +++++++++++++++++++-----------------------------
+ 2 files changed, 91 insertions(+), 138 deletions(-)
+
+Index: gcc-4.1/gcc/config/m68k/m68k.h
+===================================================================
+--- gcc-4.1.orig/gcc/config/m68k/m68k.h
++++ gcc-4.1/gcc/config/m68k/m68k.h
+@@ -631,7 +631,7 @@ __transfer_from_trampoline ()					\
+ #define DATA_REG_P(X) (REG_P (X) && REGNO_OK_FOR_DATA_P (REGNO (X)))
+ 
+ /* 1 if X is an fp register.  */
+-#define FP_REG_P(X) (REG_P (X) && REGNO_OK_FOR_FP_P (REGNO (X)))
++#define FP_REG_P(X)	(REG_P (X) && (REGNO (X) ^ 020) < 8)
+ 
+ /* 1 if X is an address register  */
+ #define ADDRESS_REG_P(X) (REG_P (X) && REGNO_OK_FOR_BASE_P (REGNO (X)))
+Index: gcc-4.1/gcc/config/m68k/m68k.md
+===================================================================
+--- gcc-4.1.orig/gcc/config/m68k/m68k.md
++++ gcc-4.1/gcc/config/m68k/m68k.md
+@@ -665,13 +665,23 @@
+     }
+ })
+ 
+-;; General case of fullword move.  The register constraints
+-;; force integer constants in range for a moveq to be reloaded
+-;; if they are headed for memory.
++;; General case of fullword move.
+ (define_insn ""
+   ;; Notes: make sure no alternative allows g vs g.
+   ;; We don't allow f-regs since fixed point cannot go in them.
+   [(set (match_operand:SI 0 "nonimmediate_operand" "=g,d,a<")
++        (match_operand:SI 1 "general_src_operand" "daymSnT,n,i"))]
++
++  "!TARGET_COLDFIRE && reload_completed"
++{
++  return output_move_simode (operands);
++})
++
++;; Before reload is completed the register constraints
++;; force integer constants in range for a moveq to be reloaded
++;; if they are headed for memory.
++(define_insn ""
++  [(set (match_operand:SI 0 "nonimmediate_operand" "=g,d,a<")
+         (match_operand:SI 1 "general_src_operand" "daymSKT,n,i"))]
+ 
+   "!TARGET_COLDFIRE"
+@@ -6594,154 +6604,97 @@
+ ;; and then is moved into an FP register.
+ ;; But it is mainly intended to test the support for these optimizations.
+ 
+-(define_peephole
++(define_peephole2
+   [(set (reg:SI SP_REG) (plus:SI (reg:SI SP_REG) (const_int 4)))
+-   (set (match_operand:DF 0 "register_operand" "=f")
+-	(match_operand:DF 1 "register_operand" "ad"))]
+-  "FP_REG_P (operands[0]) && ! FP_REG_P (operands[1])"
+-{
+-  rtx xoperands[2];
+-  xoperands[1] = gen_rtx_REG (SImode, REGNO (operands[1]) + 1);
+-  output_asm_insn ("move%.l %1,%@", xoperands);
+-  output_asm_insn ("move%.l %1,%-", operands);
+-  return "fmove%.d %+,%0";
+-})
++   (set (match_operand:DF 0 "register_operand" "")
++	(match_operand:DF 1 "register_operand" ""))]
++  "FP_REG_P (operands[0]) && !FP_REG_P (operands[1])"
++  [(set (mem:SI (reg:SI SP_REG)) (match_dup 1))
++   (set (mem:SI (pre_dec:SI (reg:SI SP_REG))) (match_dup 2))
++   (set (match_dup 0) (mem:DF (post_inc:SI (reg:SI SP_REG))))]
++  "split_di(operands + 1, 1, operands + 1, operands + 2);")
+ 
+ ;; Optimize a stack-adjust followed by a push of an argument.
+ ;; This is said to happen frequently with -msoft-float
+ ;; when there are consecutive library calls.
+ 
+-(define_peephole
++(define_peephole2
++  [(set (reg:SI SP_REG) (plus:SI (reg:SI SP_REG) (const_int 4)))
++   (set (mem:SF (pre_dec:SI (reg:SI SP_REG)))
++	(match_operand:SF 0 "general_operand" ""))]
++  "!reg_mentioned_p (stack_pointer_rtx, operands[0])"
++  [(set (mem:SF (reg:SI SP_REG)) (match_dup 0))]
++  "")
++
++(define_peephole2
+   [(set (reg:SI SP_REG) (plus:SI (reg:SI SP_REG)
+-				 (match_operand:SI 0 "const_int_operand" "n")))
+-   (set (match_operand:SF 1 "push_operand" "=m")
+-	(match_operand:SF 2 "general_operand" "rmfF"))]
+-  "INTVAL (operands[0]) >= 4
+-   && ! reg_mentioned_p (stack_pointer_rtx, operands[2])"
+-{
+-  if (INTVAL (operands[0]) > 4)
+-    {
+-      rtx xoperands[2];
+-      xoperands[0] = stack_pointer_rtx;
+-      xoperands[1] = GEN_INT (INTVAL (operands[0]) - 4);
+-      if (INTVAL (xoperands[1]) <= 8)
+-	{
+-	  if (!TARGET_COLDFIRE)
+-	    output_asm_insn ("addq%.w %1,%0", xoperands);
+-	  else
+-	    output_asm_insn ("addq%.l %1,%0", xoperands);
+-	}
+-      else if (TARGET_CPU32 && INTVAL (xoperands[1]) <= 16) 
+-	{
+-	  xoperands[1] = GEN_INT (INTVAL (xoperands[1]) - 8);
+-	  output_asm_insn ("addq%.w #8,%0\;addq%.w %1,%0", xoperands);
+-	}
+-      else if (INTVAL (xoperands[1]) <= 0x7FFF)
+-        {
+-	  if (TARGET_68040)
+-	    output_asm_insn ("add%.w %1,%0", xoperands);
+-	  else if (MOTOROLA)
+-	    output_asm_insn ("lea (%c1,%0),%0", xoperands);
+-	  else
+-	    output_asm_insn ("lea %0@(%c1),%0", xoperands);
+-        }
+-      else
+-        output_asm_insn ("add%.l %1,%0", xoperands);
+-    }
+-  if (FP_REG_P (operands[2]))
+-    return "fmove%.s %2,%@";
+-  return "move%.l %2,%@";
+-})
++				 (match_operand:SI 0 "const_int_operand" "")))
++   (set (mem:SF (pre_dec:SI (reg:SI SP_REG)))
++	(match_operand:SF 1 "general_operand" ""))]
++  "INTVAL (operands[0]) > 4
++   && !reg_mentioned_p (stack_pointer_rtx, operands[1])"
++  [(set (reg:SI SP_REG) (plus:SI (reg:SI SP_REG) (match_dup 0)))
++   (set (mem:SF (reg:SI SP_REG)) (match_dup 1))]
++  "operands[0] = GEN_INT (INTVAL (operands[0]) - 4);")
+ 
+ ;; Speed up stack adjust followed by a fullword fixedpoint push.
+ 
+-(define_peephole
++(define_peephole2
++  [(set (reg:SI SP_REG) (plus:SI (reg:SI SP_REG) (const_int 4)))
++   (set (mem:SI (pre_dec:SI (reg:SI SP_REG)))
++	(match_operand:SI 0 "general_operand" ""))]
++  "!reg_mentioned_p (stack_pointer_rtx, operands[0])"
++  [(set (mem:SI (reg:SI SP_REG)) (match_dup 0))]
++  "")
++
++(define_peephole2
+   [(set (reg:SI SP_REG) (plus:SI (reg:SI SP_REG)
+-				 (match_operand:SI 0 "const_int_operand" "n")))
+-   (set (match_operand:SI 1 "push_operand" "=m")
+-	(match_operand:SI 2 "general_operand" "g"))]
+-  "INTVAL (operands[0]) >= 4
+-   && ! reg_mentioned_p (stack_pointer_rtx, operands[2])"
+-{
+-  if (INTVAL (operands[0]) > 4)
+-    {
+-      rtx xoperands[2];
+-      xoperands[0] = stack_pointer_rtx;
+-      xoperands[1] = GEN_INT (INTVAL (operands[0]) - 4);
+-      if (INTVAL (xoperands[1]) <= 8)
+-	{
+-	  if (!TARGET_COLDFIRE)
+-	    output_asm_insn ("addq%.w %1,%0", xoperands);
+-	  else
+-	    output_asm_insn ("addq%.l %1,%0", xoperands);
+-	}
+-      else if (TARGET_CPU32 && INTVAL (xoperands[1]) <= 16)
+-	{
+-	  xoperands[1] = GEN_INT (INTVAL (xoperands[1]) - 8);
+-	  output_asm_insn ("addq%.w #8,%0\;addq%.w %1,%0", xoperands);
+-	}
+-      else if (INTVAL (xoperands[1]) <= 0x7FFF)
+-        {
+-	  if (TARGET_68040)
+-	    output_asm_insn ("add%.w %1,%0", xoperands);
+-	  else if (MOTOROLA)
+-	    output_asm_insn ("lea (%c1,%0),%0", xoperands);
+-	  else
+-	    output_asm_insn ("lea %0@(%c1),%0", xoperands);
+-        }
+-      else
+-        output_asm_insn ("add%.l %1,%0", xoperands);
+-    }
+-  if (operands[2] == const0_rtx)
+-    return "clr%.l %@";
+-  return "move%.l %2,%@";
+-})
++				 (match_operand:SI 0 "const_int_operand" "")))
++   (set (mem:SI (pre_dec:SI (reg:SI SP_REG)))
++	(match_operand:SI 1 "general_operand" ""))]
++  "INTVAL (operands[0]) > 4
++   && !reg_mentioned_p (stack_pointer_rtx, operands[1])"
++  [(set (reg:SI SP_REG) (plus:SI (reg:SI SP_REG) (match_dup 0)))
++   (set (mem:SI (reg:SI SP_REG)) (match_dup 1))]
++  "operands[0] = GEN_INT (INTVAL (operands[0]) - 4);")
+ 
+ ;; Speed up pushing a single byte but leaving four bytes of space.
+ 
+-(define_peephole
+-  [(set (mem:QI (pre_dec:SI (reg:SI SP_REG)))
+-	(match_operand:QI 1 "general_operand" "dami"))
+-   (set (reg:SI SP_REG) (minus:SI (reg:SI SP_REG) (const_int 2)))]
+-  "! reg_mentioned_p (stack_pointer_rtx, operands[1])"
+-{
+-  rtx xoperands[4];
+-
+-  if (GET_CODE (operands[1]) == REG)
+-    return "move%.l %1,%-";
+-
+-  xoperands[1] = operands[1];
+-  xoperands[2]
+-    = gen_rtx_MEM (QImode, plus_constant (stack_pointer_rtx, 3));
+-  xoperands[3] = stack_pointer_rtx;
+-  if (!TARGET_COLDFIRE)
+-    output_asm_insn ("subq%.w #4,%3\;move%.b %1,%2", xoperands);
+-  else
+-    output_asm_insn ("subq%.l #4,%3\;move%.b %1,%2", xoperands);
+-  return "";
+-})
+-
+-(define_peephole
+-  [(set (match_operand:SI 0 "register_operand" "=d")
+-	(const_int 0))
+-   (set (strict_low_part (subreg:HI (match_dup 0) 2))
+-	(match_operand:HI 1 "general_operand" "rmn"))]
+-  "strict_low_part_peephole_ok (HImode, prev_nonnote_insn (insn), operands[0])"
+-{
+-  if (GET_CODE (operands[1]) == CONST_INT)
+-    {
+-      if (operands[1] == const0_rtx
+-	  && (DATA_REG_P (operands[0])
+-	      || GET_CODE (operands[0]) == MEM)
+-	  /* clr insns on 68000 read before writing.
+-	     This isn't so on the 68010, but we have no TARGET_68010.  */
+-	  && ((TARGET_68020 || TARGET_COLDFIRE)
+-	      || !(GET_CODE (operands[0]) == MEM
+-		   && MEM_VOLATILE_P (operands[0]))))
+-	return "clr%.w %0";
+-    }
+-  return "move%.w %1,%0";
+-})
++(define_peephole2
++  [(set (reg:SI SP_REG) (plus:SI (reg:SI SP_REG) (const_int -4)))
++   (set (mem:QI (plus:SI (reg:SI SP_REG) (const_int 3)))
++	(match_operand:QI 0 "register_operand" ""))]
++  "!reg_mentioned_p (stack_pointer_rtx, operands[0])"
++  [(set (mem:SI (pre_dec:SI (reg:SI SP_REG))) (match_dup 0))]
++  "operands[0] = gen_rtx_REG (SImode, REGNO (operands[0]));")
++
++(define_peephole2
++  [(set (mem:HI (pre_dec:SI (reg:SI SP_REG)))
++	(match_operand:HI 0 "register_operand" ""))
++   (set (reg:SI SP_REG) (plus:SI (reg:SI SP_REG) (const_int -2)))]
++  "!reg_mentioned_p (stack_pointer_rtx, operands[0])"
++  [(set (mem:SI (pre_dec:SI (reg:SI SP_REG))) (match_dup 0))]
++  "operands[0] = gen_rtx_REG (SImode, REGNO (operands[0]));")
++
++;;(define_peephole2
++;;  [(set (match_operand:SI 0 "register_operand" "")
++;;	(const_int 0))
++;;   (set (strict_low_part (match_operand:HI 1 "register_operand" ""))
++;;	(match_operand:HI 2 "general_operand" ""))]
++;;  "REGNO (operands[0]) == REGNO (operands[1])
++;;   && strict_low_part_peephole_ok (HImode, insn, operands[0])"
++;;  [(set (strict_low_part (match_dup 1)) (match_dup 2))]
++;;  "")
++;;
++;;(define_peephole2
++;;  [(set (match_operand:SI 0 "register_operand" "")
++;;	(const_int 0))
++;;   (set (strict_low_part (match_operand:QI 1 "register_operand" ""))
++;;	(match_operand:QI 2 "general_operand" ""))]
++;;  "REGNO (operands[0]) == REGNO (operands[1])
++;;   && strict_low_part_peephole_ok (QImode, insn, operands[0])"
++;;  [(set (strict_low_part (match_dup 1)) (match_dup 2))]
++;;  "")
+ 
+ ;; dbCC peepholes
+ ;;
--- gcj-4.2-4.2-20070707.orig/debian/patches/m68k-noautoinc-setjmp.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/m68k-noautoinc-setjmp.dpatch
@@ -0,0 +1,47 @@
+#! /bin/sh -e
+
+# All lines beginning with `# DPATCH:' are a description of the patch.
+# DP: don't attempt autoinc in a function using setjmp
+# DP: (otherwise it might modify a variable expected to be unmodified)
+
+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 -p1 < $0
+        #cd ${dir}gcc && autoconf
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p1 < $0
+        #rm ${dir}gcc/configure
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+---
+
+ gcc/flow.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: gcc-4.1/gcc/flow.c
+===================================================================
+--- gcc-4.1.orig/gcc/flow.c
++++ gcc-4.1/gcc/flow.c
+@@ -3601,7 +3601,7 @@ find_auto_inc (struct propagate_block_in
+   int regno;
+   int size = GET_MODE_SIZE (GET_MODE (x));
+ 
+-  if (JUMP_P (insn))
++  if (JUMP_P (insn) || current_function_calls_setjmp)
+     return;
+ 
+   /* Here we detect use of an index register which might be good for
--- gcj-4.2-4.2-20070707.orig/debian/patches/libjava-biarch-awt.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/libjava-biarch-awt.dpatch
@@ -0,0 +1,105 @@
+#! /bin/sh -e
+
+# DP: 
+
+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 && aclocal -I ../config -I .. -I . && autoconf -I ../config -I .. -I .
+	#cd - >/dev/null
+	#cd ${dir}libjava/classpath && autoconf
+        ;;
+    -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
+
+--- libjava/configure.ac.orig	2006-08-19 21:29:33.603803000 +0200
++++ libjava/configure.ac	2006-08-19 21:36:07.803803000 +0200
+@@ -200,6 +200,23 @@
+ 
+ for peer in $peerlibs ; do
+   case $peer in
++    xlib-*|gtk-*|qt-*)
++      real=$(echo $peer | sed -e 's/^\(.*\)-.*$/\1/')
++      condition=$(echo $peer | sed -e 's/^.*-\(.*\)$/\1/')
++      if test -z "${with_multisubdir}" && test "$condition" = default; then
++	new_peerlibs="$new_peerlibs $real"
++      elif test "${with_multisubdir}" && test "$condition" = "${with_multisubdir}"; then
++	new_peerlibs="$new_peerlibs $real"
++      fi
++      ;;
++    *)
++      new_peerlibs="$new_peerlibs $peer"
++      ;;
++  esac
++done
++
++for peer in $new_peerlibs ; do
++  case $peer in
+     xlib)
+       if test "$no_x" = yes; then
+         echo "*** xlib peers requested but no X library available" 1>&2
+@@ -290,13 +307,21 @@
+ else
+   # We are being configured with a native or crossed-native compiler
+   if test -x "${built_gcc_dir}/gcj${ac_exeext}"; then
+-     if test x"$build" = x"$host"; then
++     if test x"$with_multisubdir" = x32; then
++        which_gcj=built
++     elif test x"$with_multisubdir" = x64; then
++        which_gcj=built
++     elif test x"$build" = x"$host"; then
+         # True native build (host=target and host=build)
+         which_gcj=built
+      else
+         # Crossed-native build (host=target and host!=build)
+         which_gcj=cross
+      fi
++     # Debian ...
++     case "$with_multisubdir" in
++       *-linux-gnu) which_gcj=built;;
++     esac
+   else
+      which_gcj=path
+   fi
+@@ -335,7 +360,12 @@
+ ac_configure_args="$ac_configure_args --enable-tool-wrappers"
+ ac_configure_args="$ac_configure_args --disable-load-library"
+ ac_configure_args="$ac_configure_args --${LIBGCJDEBUG}-debug"
+-ac_configure_args="$ac_configure_args --enable-default-toolkit=$TOOLKIT"
++if test -n "$with_multisubdir"; then
++  ac_configure_args="$ac_configure_args --enable-default-toolkit=$TOOLKIT --disable-gconf-peer"
++  use_gtk_awt=no
++  use_qt_awt=no
++  plugin_enabled=no
++fi
+ dir1=`cd $srcdir && pwd`
+ dir2=`pwd`
+ ac_configure_args="$ac_configure_args --with-vm-classes=$dir1:$dir2"
+@@ -1157,9 +1187,12 @@
+       AC_SUBST(LIBART_LIBS)
+ 
+       # We require the XTest Extension to support java.awt.Robot.
+-      AC_CHECK_LIB([Xtst], [XTestQueryExtension], [true],
++      if test -z "$with_multisubdir"; then
++	AC_CHECK_LIB([Xtst], [XTestQueryExtension], [true],
+ 		   [AC_MSG_ERROR([libXtst not found, required by java.awt.Robot])],
+ 		   [${X_LIBS}])
++      fi
++      # Debian: guaranteed by the libxtst-dev build dependency
+    fi
+ 
+    # On Solaris, and maybe other architectures, the Boehm collector
--- gcj-4.2-4.2-20070707.orig/debian/patches/arm-pr30486.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/arm-pr30486.dpatch
@@ -0,0 +1,44 @@
+#! /bin/sh -e
+
+# DP: Fix 30486 on ARM
+
+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 -p1 < $0
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p1 < $0
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+Index: trunk/gcc/fortran/trans-types.c
+===================================================================
+--- trunk/gcc/fortran/trans-types.c	(revision 170435)
++++ trunk/gcc/fortran/trans-types.c	(working copy)
+@@ -1800,6 +1800,13 @@ gfc_type_for_size (unsigned bits, int un
+ 	  if (type && bits == TYPE_PRECISION (type))
+ 	    return type;
+ 	}
++
++      /* Handle TImode as a special case because it is used by some backends
++         (eg. ARM) even though it is not available for normal use.  */
++#if HOST_BITS_PER_WIDE_INT >= 64
++      if (bits == TYPE_PRECISION (intTI_type_node))
++	return intTI_type_node;
++#endif
+     }
+   else
+     {
+
--- gcj-4.2-4.2-20070707.orig/debian/patches/pr20218.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/pr20218.dpatch
@@ -0,0 +1,346 @@
+#! /bin/sh -e
+
+# DP: Backport from mainline for PR middle-end/17982, PR middle-end/20218.
+
+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
+
+2006-12-07  H.J. Lu  <hongjiu.lu@intel.com>
+
+	Backport from mainline:
+	2006-12-11  H.J. Lu  <hongjiu.lu@intel.com>
+	PR middle-end/17982
+	PR middle-end/20218
+	* cgraphunit.c (cgraph_optimize): Remove call to
+	process_pending_assemble_externals.
+
+	* config/elfos.h (ASM_OUTPUT_EXTERNAL): New.
+
+	* config/ia64/hpux.h (TARGET_ASM_FILE_END): Removed.
+
+	* config/ia64/ia64.c (ia64_asm_output_external): Rewritten.
+	(ia64_hpux_add_extern_decl): Removed.
+	(ia64_hpux_file_end): Likewise.
+	(extern_func_list): Likewise.
+	(extern_func_head): Likewise.
+
+	* output.h (assemble_external): Update comments.
+	(default_elf_asm_output_external): New.
+	(maybe_assemble_visibility): New.
+
+	* toplev.c (compile_file): Update comment.
+
+	* varasm.c (assemble_external): Always put it on
+	pending_assemble_externals.
+	(maybe_assemble_visibility): Make it extern and return int.
+	(default_elf_asm_output_external): New.
+
+--- gcc/cgraphunit.c.global	2006-12-07 05:45:18.000000000 -0800
++++ gcc/cgraphunit.c	2006-12-07 05:47:22.000000000 -0800
+@@ -1536,8 +1536,6 @@ cgraph_optimize (void)
+       return;
+     }
+ 
+-  process_pending_assemble_externals ();
+-
+   /* Frontend may output common variables after the unit has been finalized.
+      It is safe to deal with them here as they are always zero initialized.  */
+   cgraph_varpool_analyze_pending_decls ();
+--- gcc/config/elfos.h.global	2006-11-30 12:45:20.000000000 -0800
++++ gcc/config/elfos.h	2006-12-07 05:47:22.000000000 -0800
+@@ -499,3 +499,13 @@ Boston, MA 02110-1301, USA.  */
+         fprintf ((FILE), "\"\n");					\
+     }									\
+   while (0)
++
++/* A C statement (sans semicolon) to output to the stdio stream STREAM
++   any text necessary for declaring the name of an external symbol
++   named NAME whch is referenced in this compilation but not defined.
++   It is needed to properly support non-default visibility.  */
++
++#ifndef ASM_OUTPUT_EXTERNAL
++#define ASM_OUTPUT_EXTERNAL(FILE, DECL, NAME) \
++  default_elf_asm_output_external (FILE, DECL, NAME)
++#endif
+--- gcc/config/ia64/hpux.h.global	2006-10-29 17:03:12.000000000 -0800
++++ gcc/config/ia64/hpux.h	2006-12-07 05:47:22.000000000 -0800
+@@ -144,10 +144,6 @@ do {								\
+    definitions, so do not use them in gthr-posix.h.  */
+ #define GTHREAD_USE_WEAK 0
+ 
+-/* Put out the needed function declarations at the end.  */
+-
+-#define TARGET_ASM_FILE_END ia64_hpux_file_end
+-
+ #undef CTORS_SECTION_ASM_OP
+ #define CTORS_SECTION_ASM_OP  "\t.section\t.init_array,\t\"aw\",\"init_array\""
+ 
+--- gcc/config/ia64/ia64.c.global	2006-12-07 05:45:17.000000000 -0800
++++ gcc/config/ia64/ia64.c	2006-12-07 05:47:22.000000000 -0800
+@@ -255,10 +255,6 @@ static section *ia64_rwreloc_select_rtx_
+ 						 unsigned HOST_WIDE_INT)
+      ATTRIBUTE_UNUSED;
+ static unsigned int ia64_section_type_flags (tree, const char *, int);
+-static void ia64_hpux_add_extern_decl (tree decl)
+-     ATTRIBUTE_UNUSED;
+-static void ia64_hpux_file_end (void)
+-     ATTRIBUTE_UNUSED;
+ static void ia64_init_libfuncs (void)
+      ATTRIBUTE_UNUSED;
+ static void ia64_hpux_init_libfuncs (void)
+@@ -5021,49 +5017,6 @@ ia64_secondary_reload_class (enum reg_cl
+ }
+ 
+ 
+-/* Emit text to declare externally defined variables and functions, because
+-   the Intel assembler does not support undefined externals.  */
+-
+-void
+-ia64_asm_output_external (FILE *file, tree decl, const char *name)
+-{
+-  int save_referenced;
+-
+-  /* GNU as does not need anything here, but the HP linker does need
+-     something for external functions.  */
+-
+-  if (TARGET_GNU_AS
+-      && (!TARGET_HPUX_LD
+-	  || TREE_CODE (decl) != FUNCTION_DECL
+-	  || strstr (name, "__builtin_") == name))
+-    return;
+-
+-  /* ??? The Intel assembler creates a reference that needs to be satisfied by
+-     the linker when we do this, so we need to be careful not to do this for
+-     builtin functions which have no library equivalent.  Unfortunately, we
+-     can't tell here whether or not a function will actually be called by
+-     expand_expr, so we pull in library functions even if we may not need
+-     them later.  */
+-  if (! strcmp (name, "__builtin_next_arg")
+-      || ! strcmp (name, "alloca")
+-      || ! strcmp (name, "__builtin_constant_p")
+-      || ! strcmp (name, "__builtin_args_info"))
+-    return;
+-
+-  if (TARGET_HPUX_LD)
+-    ia64_hpux_add_extern_decl (decl);
+-  else
+-    {
+-      /* assemble_name will set TREE_SYMBOL_REFERENCED, so we must save and
+-         restore it.  */
+-      save_referenced = TREE_SYMBOL_REFERENCED (DECL_ASSEMBLER_NAME (decl));
+-      if (TREE_CODE (decl) == FUNCTION_DECL)
+-        ASM_OUTPUT_TYPE_DIRECTIVE (file, name, "function");
+-      (*targetm.asm_out.globalize_label) (file, name);
+-      TREE_SYMBOL_REFERENCED (DECL_ASSEMBLER_NAME (decl)) = save_referenced;
+-    }
+-}
+-
+ /* Parse the -mfixed-range= option string.  */
+ 
+ static void
+@@ -9174,55 +9127,33 @@ ia64_hpux_function_arg_padding (enum mac
+    return DEFAULT_FUNCTION_ARG_PADDING (mode, type);
+ }
+ 
+-/* Linked list of all external functions that are to be emitted by GCC.
+-   We output the name if and only if TREE_SYMBOL_REFERENCED is set in
+-   order to avoid putting out names that are never really used.  */
+-
+-struct extern_func_list GTY(())
+-{
+-  struct extern_func_list *next;
+-  tree decl;
+-};
+-
+-static GTY(()) struct extern_func_list *extern_func_head;
+-
+-static void
+-ia64_hpux_add_extern_decl (tree decl)
+-{
+-  struct extern_func_list *p = ggc_alloc (sizeof (struct extern_func_list));
+-
+-  p->decl = decl;
+-  p->next = extern_func_head;
+-  extern_func_head = p;
+-}
+-
+-/* Print out the list of used global functions.  */
++/* Emit text to declare externally defined variables and functions, because
++   the Intel assembler does not support undefined externals.  */
+ 
+-static void
+-ia64_hpux_file_end (void)
++void
++ia64_asm_output_external (FILE *file, tree decl, const char *name)
+ {
+-  struct extern_func_list *p;
+-
+-  for (p = extern_func_head; p; p = p->next)
+-    {
+-      tree decl = p->decl;
+-      tree id = DECL_ASSEMBLER_NAME (decl);
+-
+-      gcc_assert (id);
+-
+-      if (!TREE_ASM_WRITTEN (decl) && TREE_SYMBOL_REFERENCED (id))
+-        {
+-	  const char *name = XSTR (XEXP (DECL_RTL (decl), 0), 0);
+-
+-	  TREE_ASM_WRITTEN (decl) = 1;
+-	  (*targetm.asm_out.globalize_label) (asm_out_file, name);
+-	  fputs (TYPE_ASM_OP, asm_out_file);
+-	  assemble_name (asm_out_file, name);
+-	  fprintf (asm_out_file, "," TYPE_OPERAND_FMT "\n", "function");
+-        }
++  /* We output the name if and only if TREE_SYMBOL_REFERENCED is
++     set in order to avoid putting out names that are never really
++     used. */
++  if (TREE_SYMBOL_REFERENCED (DECL_ASSEMBLER_NAME (decl)))
++    {
++      /* maybe_assemble_visibility will return 1 if the assembler
++	 visibility directive is outputed.  */
++      int need_visibility = ((*targetm.binds_local_p) (decl)
++			     && maybe_assemble_visibility (decl));
++
++      /* GNU as does not need anything here, but the HP linker does
++	 need something for external functions.  */
++      if ((TARGET_HPUX_LD || !TARGET_GNU_AS)
++	  && TREE_CODE (decl) == FUNCTION_DECL)
++	{
++	  ASM_OUTPUT_TYPE_DIRECTIVE (file, name, "function");
++	  (*targetm.asm_out.globalize_label) (file, name);
++	}
++      else if (need_visibility && !TARGET_GNU_AS)
++	(*targetm.asm_out.globalize_label) (file, name);
+     }
+-
+-  extern_func_head = 0;
+ }
+ 
+ /* Set SImode div/mod functions, init_integral_libfuncs only initializes
+--- gcc/output.h.global	2006-10-21 13:45:54.000000000 -0700
++++ gcc/output.h	2006-12-07 05:47:22.000000000 -0800
+@@ -204,9 +204,9 @@ extern void assemble_variable (tree, int
+    DONT_OUTPUT_DATA is from assemble_variable.  */
+ extern void align_variable (tree decl, bool dont_output_data);
+ 
+-/* Output something to declare an external symbol to the assembler.
+-   (Most assemblers don't need this, so we normally output nothing.)
+-   Do nothing if DECL is not external.  */
++/* Queue for outputing something to declare an external symbol to the
++   assembler.  (Most assemblers don't need this, so we normally output
++   nothing.)  Do nothing if DECL is not external.  */
+ extern void assemble_external (tree);
+ 
+ /* Assemble code to leave SIZE bytes of zeros.  */
+@@ -619,6 +619,10 @@ extern void default_file_start (void);
+ extern void file_end_indicate_exec_stack (void);
+ extern bool default_valid_pointer_mode (enum machine_mode);
+ 
++extern void default_elf_asm_output_external (FILE *file, tree,
++					     const char *);
++extern int maybe_assemble_visibility (tree);
++
+ extern int default_address_cost (rtx);
+ 
+ /* dbxout helper functions */
+--- gcc/toplev.c.global	2006-12-07 05:45:18.000000000 -0800
++++ gcc/toplev.c	2006-12-07 05:58:23.000000000 -0800
+@@ -1076,9 +1076,7 @@ compile_file (void)
+ 
+   dw2_output_indirect_constants ();
+ 
+-  /* Flush any pending external directives.  cgraph did this for
+-     assemble_external calls from the front end, but the RTL
+-     expander can also generate them.  */
++  /* Flush any pending external directives.  */
+   process_pending_assemble_externals ();
+ 
+   /* Attach a special .ident directive to the end of the file to identify
+--- gcc/varasm.c.global	2006-12-07 05:45:18.000000000 -0800
++++ gcc/varasm.c	2006-12-07 05:49:16.000000000 -0800
+@@ -126,7 +126,6 @@ static unsigned HOST_WIDE_INT array_size
+ static unsigned min_align (unsigned, unsigned);
+ static void output_constructor (tree, unsigned HOST_WIDE_INT, unsigned int);
+ static void globalize_decl (tree);
+-static void maybe_assemble_visibility (tree);
+ #ifdef BSS_SECTION_ASM_OP
+ #ifdef ASM_OUTPUT_BSS
+ static void asm_output_bss (FILE *, tree, const char *,
+@@ -1964,11 +1963,10 @@ assemble_external (tree decl ATTRIBUTE_U
+   if (!DECL_P (decl) || !DECL_EXTERNAL (decl) || !TREE_PUBLIC (decl))
+     return;
+ 
+-  if (flag_unit_at_a_time)
+-    pending_assemble_externals = tree_cons (0, decl,
+-					    pending_assemble_externals);
+-  else
+-    assemble_external_real (decl);
++  /* We want to output external symbols at very last to check if they
++     are references or not.  */
++  pending_assemble_externals = tree_cons (0, decl,
++					  pending_assemble_externals);
+ #endif
+ }
+ 
+@@ -5071,13 +5069,18 @@ default_assemble_visibility (tree decl, 
+ 
+ /* A helper function to call assemble_visibility when needed for a decl.  */
+ 
+-static void
++int
+ maybe_assemble_visibility (tree decl)
+ {
+   enum symbol_visibility vis = DECL_VISIBILITY (decl);
+ 
+   if (vis != VISIBILITY_DEFAULT)
+-    targetm.asm_out.visibility (decl, vis);
++    {
++      targetm.asm_out.visibility (decl, vis);
++      return 1;
++    }
++  else
++    return 0;
+ }
+ 
+ /* Returns 1 if the target configuration supports defining public symbols
+@@ -6327,4 +6330,19 @@ elf_record_gcc_switches (print_switch_ty
+   return 0;
+ }
+ 
++/* Emit text to declare externally defined symbols. It is needed to
++   properly support non-default visibility.  */
++void
++default_elf_asm_output_external (FILE *file ATTRIBUTE_UNUSED,
++				 tree decl,
++				 const char *name ATTRIBUTE_UNUSED)
++{
++  /* We output the name if and only if TREE_SYMBOL_REFERENCED is
++     set in order to avoid putting out names that are never really
++     used. */
++  if (TREE_SYMBOL_REFERENCED (DECL_ASSEMBLER_NAME (decl))
++      && targetm.binds_local_p (decl))
++    maybe_assemble_visibility (decl);
++}
++
+ #include "gt-varasm.h"
--- gcj-4.2-4.2-20070707.orig/debian/patches/cpu-default-i486.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/cpu-default-i486.dpatch
@@ -0,0 +1,37 @@
+#! /bin/sh -e
+ 
+# DP: set default 32bit ix86 architecture to i486
+ 
+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/config/i386/i386.c~	2006-04-02 00:14:35.841533976 +0200
++++ gcc/config/i386/i386.c	2006-04-02 00:17:40.338486176 +0200
+@@ -1602,7 +1602,7 @@
+ 	     "-mtune=generic instead as appropriate.");
+ 
+   if (!ix86_arch_string)
+-    ix86_arch_string = TARGET_64BIT ? "x86-64" : "i386";
++    ix86_arch_string = TARGET_64BIT ? "x86-64" : "i486";
+   if (!strcmp (ix86_arch_string, "generic"))
+     error ("generic CPU can be used only for -mtune= switch");
+   if (!strncmp (ix86_arch_string, "generic", 7))
--- gcj-4.2-4.2-20070707.orig/debian/patches/m68k-bitfield.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/m68k-bitfield.dpatch
@@ -0,0 +1,55 @@
+#! /bin/sh -e
+
+# All lines beginning with `# DPATCH:' are a description of the patch.
+# DP: Avoid propagation of mem expression past a zero_extract lvalue
+
+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 -p1 < $0
+        #cd ${dir}gcc && autoconf
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p1 < $0
+        #rm ${dir}gcc/configure
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+# append the patch here and adjust the -p? flag in the patch calls.
+
+---
+ gcc/gcse.c |   10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+Index: gcc-4.1/gcc/gcse.c
+===================================================================
+--- gcc-4.1.orig/gcc/gcse.c
++++ gcc-4.1/gcc/gcse.c
+@@ -5319,6 +5319,16 @@ compute_ld_motion_mems (void)
+ 		      else
+ 			ptr->invalid = 1;
+ 		    }
++		  else if (GET_CODE (dest) == ZERO_EXTRACT)
++		    {
++		      dest = XEXP (dest, 0);
++		      if (MEM_P (dest) && simple_mem (dest))
++			{
++			  ptr = ldst_entry (dest);
++			  ptr->invalid = 1;
++			}
++
++		    }
+ 		}
+ 	      else
+ 		invalidate_any_buried_refs (PATTERN (insn));
--- gcj-4.2-4.2-20070707.orig/debian/patches/gcc-driver-extra-langs.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/gcc-driver-extra-langs.dpatch
@@ -0,0 +1,40 @@
+#! /bin/sh -e
+
+# DP: Add options and specs for languages that are not built from a source
+# DP: (but built from separate sources).
+
+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/Makefile.in~	2006-07-11 14:03:25.865618000 +0200
++++ gcc/Makefile.in	2006-07-11 21:15:30.011548776 +0200
+@@ -424,8 +424,8 @@
+ xm_include_list=@xm_include_list@
+ xm_defines=@xm_defines@
+ lang_checks=check-gcc
+-lang_opt_files=@lang_opt_files@ $(srcdir)/c.opt $(srcdir)/common.opt
+-lang_specs_files=@lang_specs_files@
++lang_opt_files=$(sort @lang_opt_files@ $(foreach lang,$(debian_extra_langs),$(srcdir)/$(lang)/lang.opt)) $(srcdir)/c.opt $(srcdir)/common.opt
++lang_specs_files=$(sort @lang_specs_files@ $(foreach lang,$(debian_extra_langs),$(srcdir)/$(lang)/lang-specs.h))
+ lang_tree_files=@lang_tree_files@
+ target_cpu_default=@target_cpu_default@
+ GCC_THREAD_FILE=@thread_file@
--- gcj-4.2-4.2-20070707.orig/debian/patches/gccbug.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/gccbug.dpatch
@@ -0,0 +1,36 @@
+#! /bin/sh -e
+
+# DP: Use sensible-editor instead of vi as fallback editor
+
+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/gccbug.in~	2003-03-01 00:51:42.000000000 +0100
++++ gcc/gccbug.in	2003-03-02 12:08:36.000000000 +0100
+@@ -134,7 +134,7 @@
+ # If they don't have a preferred editor set, then use
+ if [ -z "$VISUAL" ]; then
+   if [ -z "$EDITOR" ]; then
+-    EDIT=vi
++    EDIT=/usr/bin/sensible-editor
+   else
+     EDIT="$EDITOR"
+   fi
--- gcj-4.2-4.2-20070707.orig/debian/patches/cross-fixes.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/cross-fixes.dpatch
@@ -0,0 +1,146 @@
+#! /bin/sh -e
+
+# DP: Fix the linker error when creating an xcc for ia64
+
+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 -p1 < $0
+        cd ${dir}gcc && autoconf
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p1 < $0
+        cd ${dir}gcc && autoconf
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+diff -NurpP -x '*.orig' -x '*.libc' gcc-4.0.0.orig/gcc/config/ia64/fde-glibc.c gcc-4.0.0.new/gcc/config/ia64/fde-glibc.c
+--- gcc-4.0.0.orig/gcc/config/ia64/fde-glibc.c	2003-11-02 18:35:20.000000000 +0100
++++ gcc-4.0.0.new/gcc/config/ia64/fde-glibc.c	2005-05-15 02:42:27.675247674 +0200
+@@ -31,6 +31,7 @@
+ #ifndef _GNU_SOURCE
+ #define _GNU_SOURCE 1
+ #endif
++#ifndef inhibit_libc
+ #include "config.h"
+ #include <stddef.h>
+ #include <stdlib.h>
+@@ -162,3 +163,5 @@ _Unwind_FindTableEntry (void *pc, unsign
+ 
+   return data.ret;
+ }
++
++#endif
+diff -NurpP -x '*.orig' -x '*.libc' gcc-4.0.0.orig/gcc/config/ia64/unwind-ia64.c gcc-4.0.0.new/gcc/config/ia64/unwind-ia64.c
+--- gcc-4.0.0.orig/gcc/config/ia64/unwind-ia64.c	2005-04-06 05:50:36.000000000 +0200
++++ gcc-4.0.0.new/gcc/config/ia64/unwind-ia64.c	2005-05-15 02:43:10.842199954 +0200
+@@ -30,7 +30,7 @@
+    This exception does not however invalidate any other reasons why
+    the executable file might be covered by the GNU General Public License.  */
+ 
+-
++#ifndef inhibit_libc
+ #include "tconfig.h"
+ #include "tsystem.h"
+ #include "coretypes.h"
+@@ -2404,3 +2404,4 @@ alias (_Unwind_SetIP);
+ #endif
+ 
+ #endif
++#endif
+diff -NurpP -x '*.orig' -x '*.libc' gcc-4.0.0.orig/gcc/config/pa/linux-unwind.h gcc-4.0.0.new/gcc/config/pa/linux-unwind.h
+--- gcc-4.0.0.orig/gcc/config/pa/linux-unwind.h	2005-02-11 02:46:20.000000000 +0100
++++ gcc-4.0.0.new/gcc/config/pa/linux-unwind.h	2005-05-15 02:37:02.000000000 +0200
+@@ -29,6 +29,7 @@ Boston, MA 02111-1307, USA.  */
+ /* Do code reading to identify a signal frame, and set the frame
+    state data appropriately.  See unwind-dw2.c for the structs.  */
+ 
++#ifndef inhibit_libc
+ #include <signal.h>
+ #include <sys/ucontext.h>
+ 
+@@ -136,3 +137,5 @@ pa32_fallback_frame_state (struct _Unwin
+   fs->retaddr_column = DWARF_ALT_FRAME_RETURN_COLUMN;
+   return _URC_NO_REASON;
+ }
++
++#endif
+diff -NurpP -x '*.orig' -x '*.libc' gcc-4.0.0.orig/gcc/config/sh/linux-unwind.h gcc-4.0.0.new/gcc/config/sh/linux-unwind.h
+--- gcc-4.0.0.orig/gcc/config/sh/linux-unwind.h	2005-02-11 02:12:57.000000000 +0100
++++ gcc-4.0.0.new/gcc/config/sh/linux-unwind.h	2005-05-15 02:44:31.000000000 +0200
+@@ -29,6 +29,7 @@ Boston, MA 02111-1307, USA.  */
+ /* Do code reading to identify a signal frame, and set the frame
+    state data appropriately.  See unwind-dw2.c for the structs.  */
+ 
++#ifndef inhibit_libc
+ #include <signal.h>
+ #include <sys/ucontext.h>
+ #include "insn-constants.h"
+@@ -169,3 +170,4 @@ sh_fallback_frame_state (struct _Unwind_
+   return _URC_NO_REASON;
+ }
+ #endif /* defined (__SH5__) */
++#endif
+diff -NurpP -x '*.orig' -x '*.libc' gcc-4.0.0.orig/gcc/unwind-compat.c gcc-4.0.0.new/gcc/unwind-compat.c
+--- gcc-4.0.0.orig/gcc/unwind-compat.c	2004-09-04 02:15:40.000000000 +0200
++++ gcc-4.0.0.new/gcc/unwind-compat.c	2005-05-15 02:41:17.000000000 +0200
+@@ -29,6 +29,7 @@
+    02110-1301, USA.  */
+ 
+ #if defined (USE_GAS_SYMVER) && defined (USE_LIBUNWIND_EXCEPTIONS)
++#ifndef inhibit_libc
+ #include "tconfig.h"
+ #include "tsystem.h"
+ #include "unwind.h"
+@@ -204,3 +205,4 @@ _Unwind_SetIP (struct _Unwind_Context *c
+ }
+ symver (_Unwind_SetIP, GCC_3.0);
+ #endif
++#endif
+diff -NurpP -x '*.orig' -x '*.libc' gcc-4.0.0.orig/gcc/unwind-generic.h gcc-4.0.0.new/gcc/unwind-generic.h
+--- gcc-4.0.0.orig/gcc/unwind-generic.h	2004-11-30 09:15:39.000000000 +0100
++++ gcc-4.0.0.new/gcc/unwind-generic.h	2005-05-15 02:38:33.000000000 +0200
+@@ -202,6 +202,7 @@ extern _Unwind_Reason_Code _Unwind_SjLj_
+    compatible with the standard ABI for IA-64, we inline these.  */
+ 
+ #ifdef __ia64__
++#ifndef inhibit_libc
+ #include <stdlib.h>
+ 
+ static inline _Unwind_Ptr
+@@ -220,6 +221,7 @@ _Unwind_GetTextRelBase (struct _Unwind_C
+ 
+ /* @@@ Retrieve the Backing Store Pointer of the given context.  */
+ extern _Unwind_Word _Unwind_GetBSP (struct _Unwind_Context *);
++#endif
+ #else
+ extern _Unwind_Ptr _Unwind_GetDataRelBase (struct _Unwind_Context *);
+ extern _Unwind_Ptr _Unwind_GetTextRelBase (struct _Unwind_Context *);
+diff -NurpP -x '*.orig' -x '*.libc' gcc-4.0.0.new/gcc/config/alpha/linux-unwind.h gcc-4.0.0.new2/gcc/config/alpha/linux-unwind.h
+--- gcc-4.0.0.new/gcc/config/alpha/linux-unwind.h	2005-02-11 02:12:54.000000000 +0100
++++ gcc-4.0.0.new2/gcc/config/alpha/linux-unwind.h	2005-05-15 05:09:16.000000000 +0200
+@@ -29,6 +29,7 @@ Boston, MA 02111-1307, USA.  */
+ /* Do code reading to identify a signal frame, and set the frame
+    state data appropriately.  See unwind-dw2.c for the structs.  */
+ 
++#ifndef inhibit_libc
+ #include <signal.h>
+ #include <sys/ucontext.h>
+ 
+@@ -80,3 +81,5 @@ alpha_fallback_frame_state (struct _Unwi
+   fs->retaddr_column = 64;
+   return _URC_NO_REASON;
+ }
++
++#endif
--- gcj-4.2-4.2-20070707.orig/debian/patches/gccbug-manpage.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/gccbug-manpage.dpatch
@@ -0,0 +1,182 @@
+#! /bin/sh -e
+
+# DP: add gccbug(1) manpage
+
+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
+
+2003-03-11  Matthias Klose  <doko@debian.org> 
+
+	* Makefile.in (generated-manpages): Add $(docdir)/gccbug.1.
+	($(docdir)/gccbug.1): Build from doc/bugreport.texi,
+	(maintainer-clean): Remove gccbug.1,
+	(install-man): Install gccbug.1.
+	* doc/bugreport.texi: Add manpage sections for gccbug(1).
+	(contributed by Omni Flux <josh at nebonet dot com>).
+	Do not document options possibly unsupported by a future BTS.
+	* doc/.cvsignore: Add gccbug.1.
+
+
+--- gcc/Makefile.in~	2003-03-02 13:49:32.000000000 +0100
++++ gcc/Makefile.in	2003-03-03 23:13:21.000000000 +0100
+@@ -2541,6 +2541,7 @@
+ 	$(TEXI2DVI) -I $(docdir) -I $(docdir)/include $(docdir)/cppinternals.texi
+ 
+ generated-manpages: $(docdir)/gcov.1 $(docdir)/cpp.1 $(docdir)/gcc.1 \
++	 $(docdir)/gccbug.1 \
+ 	 $(docdir)/gfdl.7 $(docdir)/gpl.7 $(docdir)/fsf-funding.7 \
+ 	 lang.generated-manpages
+ 
+@@ -2570,6 +2571,14 @@
+ 		(rm -f $(docdir)/gcc.1.T$$$$ && exit 1)
+ 	-rm -f gcc.pod
+ 
++$(docdir)/gccbug.1: $(docdir)/bugreport.texi
++	$(STAMP) $(docdir)/gccbug.1
++	-$(TEXI2POD) $(docdir)/bugreport.texi > gccbug.pod
++	-($(POD2MAN) --section=1 gccbug.pod > $(docdir)/gccbug.1.T$$$$ && \
++		mv -f $(docdir)/gccbug.1.T$$$$ $(docdir)/gccbug.1) || \
++		(rm -f $(docdir)/gccbug.1.T$$$$ && exit 1)
++	-rm -f gccbug.pod
++
+ $(docdir)/gfdl.7: $(docdir)/include/fdl.texi
+ 	$(STAMP) $(docdir)/gfdl.7
+ 	-$(TEXI2POD) $(docdir)/include/fdl.texi > gfdl.pod
+@@ -2736,6 +2745,7 @@
+ 	-rm -f $(docdir)/cpp.info* $(docdir)/gcc.info* $(docdir)/gccint.info*
+ 	-rm -f $(docdir)/cppinternals.info*
+ 	-rm -f $(docdir)/gcov.1 $(docdir)/cpp.1 $(docdir)/gcc.1
++	-rm -f $(docdir)/gccbug.1
+ 	-rm -f $(docdir)/fsf-funding.7 $(docdir)/gfdl.7 $(docdir)/gpl.7
+ #
+ # Entry points `install' and `uninstall'.
+@@ -2893,6 +2903,9 @@
+ 	  $(INSTALL_DATA) $(docdir)/gcc.1 $(DESTDIR)$(man1dir)/$(GCC_INSTALL_NAME)$(man1ext); \
+ 	  chmod a-x $(DESTDIR)$(man1dir)/$(GCC_INSTALL_NAME)$(man1ext); \
+ 	fi
++	-rm -f $(DESTDIR)$(man1dir)/gccbug$(man1ext)
++	-$(INSTALL_DATA) $(docdir)/gccbug.1 $(DESTDIR)$(man1dir)/gccbug$(man1ext)
++	-chmod a-x $(DESTDIR)$(man1dir)/gccbug$(man1ext)
+ 	-rm -f $(DESTDIR)$(man1dir)/cpp$(man1ext)
+ 	-$(INSTALL_DATA) $(docdir)/cpp.1 $(DESTDIR)$(man1dir)/cpp$(man1ext)
+ 	-chmod a-x $(DESTDIR)$(man1dir)/cpp$(man1ext)
+@@ -3069,6 +3082,7 @@
+ 	-rm -rf $(DESTDIR)$(bindir)/$(GCOV_INSTALL_NAME)$(exeext)
+ 	-rm -rf $(DESTDIR)$(man1dir)/$(GCC_INSTALL_NAME)$(man1ext)
+ 	-rm -rf $(DESTDIR)$(man1dir)/$(GCC_CROSS_NAME)$(man1ext)
++	-rm -rf $(DESTDIR)$(man1dir)/gccbug$(man1ext)
+ 	-rm -rf $(DESTDIR)$(man1dir)/cpp$(man1ext)
+ 	-rm -rf $(DESTDIR)$(man1dir)/protoize$(man1ext)
+ 	-rm -rf $(DESTDIR)$(man1dir)/unprotoize$(man1ext)
+
+--- gcc/doc/bugreport.texi.old	2003-03-13 20:56:48.000000000 +0100
++++ gcc/doc/bugreport.texi	2003-03-13 20:59:11.000000000 +0100
+@@ -374,6 +374,44 @@
+ @section The gccbug script
+ @cindex gccbug script
+ 
++@ignore
++@c man begin SYNOPSIS
++gccbug
++       [ @option{--cc} @var{mail-address} ]
++       [ @option{--version} ] | [ @option{--help} ]
++@c man end
++@c Set file name and title for the man page.
++@setfilename gccbug
++@settitle Reporting GCC Bugs
++@c man begin SEEALSO
++gcc(1), send-pr(1), send-pr(8), the info entries for @file{gcc} (node Bugs),
++and the online pages at @uref{http://gcc.gnu.org/bugs.html}.
++@c man end
++@c man begin DESCRIPTION
++@command{gccbug} is a version of GNU GNATS send-pr configured for GCC bug
++reporting.
++
++Invoking @command{gccbug} calls the editor named in your environment
++variable @env{VISUAL} or @env{EDITOR} on a problem report template.
++
++Your bug reports play an essential role in making GCC reliable. However
++since the maintainers are very overloaded, please first make sure that:
++@itemize @bullet
++@item
++The problem is not already known.  See
++@uref{http://gcc.gnu.org/bugs.html#known} for a list of known bugs.
++If it isn't known, then you should report the problem.
++
++You can browse the bug database for bugs reported at
++@uref{http://gcc.gnu.org/cgi-bin/gnatsweb.pl}.
++
++@item
++You include the information that makes for fixing the bug. See
++@uref{http://gcc.gnu.org/bugs.html#report} for bug reporting instructions.
++@end itemize
++@c man end
++@end ignore
++
+ To simplify creation of bug reports, and to allow better tracking of
+ reports, we use the GNATS bug tracking system.  Part of that system is
+ the @command{gccbug} script.  This is a Unix shell script, so you need a
+@@ -382,9 +420,31 @@
+ 
+ The gccbug script is derived from send-pr, @pxref{using
+ send-pr,,Creating new Problem Reports,send-pr,Reporting Problems}.  When
+-invoked, it starts a text editor so you can fill out the various fields
+-of the report.  When the you quit the editor, the report is automatically
++invoked, it starts a text editor named in your environment variable
++@env{VISUAL} or @env{EDITOR} so you can fill out the various fields of
++the report.  When the you quit the editor, the report is automatically
+ send to the bug reporting address.
+ 
+ A number of fields in this bug report form are specific to GCC, and are
+ explained at @uref{http://gcc.gnu.org/gnats.html}.
++
++The @command{gccbug} script accepts the following options:
++
++@c man begin OPTIONS
++@table @gcctabopt
++
++@item --cc @var{mail-address}
++Specifies the mail-address to which the PR should be carbon-copied.
++
++@item --version
++Displays the @command{gccbug} version number and a usage summary.  No mail
++is sent.
++
++@item --help
++Displays a usage summary for @command{gccbug}.  No mail is sent.
++@end table
++
++@command{gccbug} has more (undocumented) options, which may be
++unsupported by a future GCC bug tracking system.
++
++@c man end
+
+#--- gcc/doc/.cvsignore~ 2002-06-26 20:27:50.000000000 +0200
+#+++ gcc/doc/.cvsignore  2003-03-13 21:07:13.000000000 +0100
+#@@ -4,6 +4,7 @@
+# cpp.info*
+# cppinternals.info*
+# gcc.1
+#+gccbug.1
+# cpp.1
+# gcov.1
+# gfdl.7
+
--- gcj-4.2-4.2-20070707.orig/debian/patches/pr28102.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/pr28102.dpatch
@@ -0,0 +1,41 @@
+#! /bin/sh -e
+
+# DP: Apply proposed fix for PR target/28102.
+
+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
+
+2006-07-15  Alfred M. Szmidt  <ams@gnu.org>
+
+       * config/i386/gnu.h (TARGET_C99_FUNCTIONS): Undefine macro.
+
+Index: gcc/config/i386/gnu.h
+===================================================================
+--- gcc/config/i386/gnu.h       (revision 115472)
++++ gcc/config/i386/gnu.h       (working copy)
+@@ -36,3 +36,5 @@
+
+ /* FIXME: Is a Hurd-specific fallback mechanism necessary?  */
+ #undef MD_UNWIND_SUPPORT
++
++#undef TARGET_C99_FUNCTIONS /* config.gcc includes i386/linux.h.  */
+
+
--- gcj-4.2-4.2-20070707.orig/debian/patches/cross-include.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/cross-include.dpatch
@@ -0,0 +1,39 @@
+#! /bin/sh -e
+
+# DP: Set cross include path to .../include, not .../sys-include
+# DP: This should be a fix for famous limits.h issue
+
+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
+        cd ${dir}gcc && autoconf
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+--- gcc/configure.ac.orig	2005-08-24 06:24:11.000000000 +0400
++++ gcc/configure.ac	2005-12-06 00:40:45.000000000 +0300
+@@ -681,7 +681,7 @@
+ ], [
+  TARGET_SYSTEM_ROOT=
+  TARGET_SYSTEM_ROOT_DEFINE=
+- CROSS_SYSTEM_HEADER_DIR='$(gcc_tooldir)/sys-include'
++ CROSS_SYSTEM_HEADER_DIR='$(prefix)/$(target_noncanonical)/include'
+ ])
+ AC_SUBST(TARGET_SYSTEM_ROOT)
+ AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE)
--- gcj-4.2-4.2-20070707.orig/debian/patches/gcc-textdomain.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/gcc-textdomain.dpatch
@@ -0,0 +1,103 @@
+#! /bin/sh -e
+
+# DP: Set gettext's domain and textdomain to the versioned package name.
+
+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/Makefile.in.orig	2005-09-04 23:32:54.003440040 +0000
++++ gcc/Makefile.in	2005-09-04 23:40:10.954013456 +0000
+@@ -4565,8 +4565,8 @@
+ 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
+ 	  echo $(mkinstalldirs) $(DESTDIR)$$dir; \
+ 	  $(mkinstalldirs) $(DESTDIR)$$dir || exit 1; \
+-	  echo $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/gcc.mo; \
+-	  $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/gcc.mo; \
++	  echo $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/gcc-4.2.mo; \
++	  $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/gcc-4.2.mo; \
+ 	done
+ 
+ # Rule for regenerating the message template (gcc.pot).
+--- gcc/intl.c.orig	2005-09-04 23:32:54.006439584 +0000
++++ gcc/intl.c	2005-09-04 23:36:37.933397512 +0000
+@@ -51,8 +51,8 @@
+   setlocale (LC_ALL, "");
+ #endif
+ 
+-  (void) bindtextdomain ("gcc", LOCALEDIR);
+-  (void) textdomain ("gcc");
++  (void) bindtextdomain ("gcc-4.2", LOCALEDIR);
++  (void) textdomain ("gcc-4.2");
+ 
+   /* Opening quotation mark.  */
+   open_quote = _("`");
+--- libcpp/Makefile.in.orig	2005-09-04 23:32:54.009439128 +0000
++++ libcpp/Makefile.in	2005-09-04 23:33:24.607787472 +0000
+@@ -47,6 +47,7 @@
+ LIBICONV = @LIBICONV@
+ LIBINTL = @LIBINTL@
+ PACKAGE = @PACKAGE@
++PACKAGE_SUFFIX = -4.2
+ RANLIB = @RANLIB@
+ SHELL = @SHELL@
+ USED_CATALOGS = @USED_CATALOGS@
+@@ -66,6 +67,7 @@
+ 
+ INCLUDES = -I$(srcdir) -I. -I$(srcdir)/../include @INCINTL@ \
+ 	-I$(srcdir)/include
++CPPFLAGS += -DPACKAGE_SUFFIX=\"$(strip $(PACKAGE_SUFFIX))\"
+ 
+ ALL_CFLAGS = $(CFLAGS) $(WARN_CFLAGS) $(INCLUDES) $(CPPFLAGS)
+ 
+@@ -156,8 +158,8 @@
+ 	  else continue; \
+ 	  fi; \
+ 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
+-	  echo $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \
+-	  $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \
++	  echo $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE)$(PACKAGE_SUFFIX).mo; \
++	  $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE)$(PACKAGE_SUFFIX).mo; \
+ 	done
+ 
+ mostlyclean:
+--- libcpp/system.h.orig	2005-09-04 23:32:54.006439584 +0000
++++ libcpp/system.h	2005-09-04 23:33:24.606787624 +0000
+@@ -260,7 +260,7 @@
+ #endif
+ 
+ #ifndef _
+-# define _(msgid) dgettext (PACKAGE, msgid)
++# define _(msgid) dgettext (PACKAGE PACKAGE_SUFFIX, msgid)
+ #endif
+ 
+ #ifndef N_
+--- libcpp/init.c.orig	2005-09-04 23:32:54.008439280 +0000
++++ libcpp/init.c	2005-09-04 23:33:24.607787472 +0000
+@@ -122,7 +122,7 @@
+       init_trigraph_map ();
+ 
+ #ifdef ENABLE_NLS
+-       (void) bindtextdomain (PACKAGE, LOCALEDIR);
++       (void) bindtextdomain (PACKAGE PACKAGE_SUFFIX, LOCALEDIR);
+ #endif
+     }
+ }
--- gcj-4.2-4.2-20070707.orig/debian/patches/m68k-symbolic-operand.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/m68k-symbolic-operand.dpatch
@@ -0,0 +1,47 @@
+#! /bin/sh -e
+
+# All lines beginning with `# DPATCH:' are a description of the patch.
+# DP: better recognize symbolic operands in addresses
+
+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 -p1 < $0
+        #cd ${dir}gcc && autoconf
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p1 < $0
+        #rm ${dir}gcc/configure
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+---
+ gcc/config/m68k/m68k.h |    4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+Index: gcc-4.1/gcc/config/m68k/m68k.h
+===================================================================
+--- gcc-4.1.orig/gcc/config/m68k/m68k.h
++++ gcc-4.1/gcc/config/m68k/m68k.h
+@@ -718,9 +718,7 @@ __transfer_from_trampoline ()					\
+        && (TARGET_68020							\
+ 	   || ((unsigned) INTVAL (XEXP (X, 1)) + 0x8000) < 0x10000))	\
+    || (GET_CODE (X) == PLUS && XEXP (X, 0) == pic_offset_table_rtx 	\
+-       && flag_pic && GET_CODE (XEXP (X, 1)) == SYMBOL_REF)		\
+-   || (GET_CODE (X) == PLUS && XEXP (X, 0) == pic_offset_table_rtx 	\
+-       && flag_pic && GET_CODE (XEXP (X, 1)) == LABEL_REF))
++       && flag_pic && symbolic_operand (XEXP (X, 1), VOIDmode)))	\
+ 
+ #define GO_IF_NONINDEXED_ADDRESS(X, ADDR)  \
+ { if (INDIRECTABLE_1_ADDRESS_P (X)) goto ADDR; }
--- gcj-4.2-4.2-20070707.orig/debian/patches/ada-driver-check-trunk.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/ada-driver-check-trunk.dpatch
@@ -0,0 +1,39 @@
+#! /bin/sh -e
+
+# DP: Simplify Ada driver check (we always build using the required
+# DP: Ada version. Needed for warnings on alpha.
+
+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} && autoconf
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
+	rm -f ${dir}configure
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+--- config/acx.m4~	2005-12-15 14:59:17.000000000 +0100
++++ config/acx.m4	2006-07-08 17:01:44.325594336 +0200
+@@ -195,7 +195,7 @@
+ # Other compilers, like HP Tru64 UNIX cc, exit successfully when
+ # given a .adb file, but produce no object file.  So we must check
+ # if an object file was really produced to guard against this.
+-errors=`(${CC} -c conftest.adb) 2>&1 || echo failure`
++errors=`(${CC} -c conftest.adb) 2>/dev/null || echo failure`
+ if test x"$errors" = x && test -f conftest.$ac_objext; then
+   acx_cv_cc_gcc_supports_ada=yes
+ fi
--- gcj-4.2-4.2-20070707.orig/debian/patches/netbsd-dynlinker.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/netbsd-dynlinker.dpatch
@@ -0,0 +1,47 @@
+#! /bin/sh -e
+ 
+# JB: Dynamic linker patches for netbsd.
+ 
+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 -p1 < $0
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p1 < $0
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+diff -ur src.orig/gcc/config/i386/netbsd-elf.h src/gcc/config/i386/netbsd-elf.h
+--- src.orig/gcc/config/i386/netbsd-elf.h	2002-03-01 23:38:15.000000000 +0000
++++ src/gcc/config/i386/netbsd-elf.h	2003-01-21 19:44:46.000000000 +0000
+@@ -35,7 +35,7 @@
+ 	%{!e*:-e __start}}}						\
+     %{!static:								\
+       %{rdynamic:-export-dynamic}					\
+-      %{!dynamic-linker:-dynamic-linker /usr/libexec/ld.elf_so}}	\
++      %{!dynamic-linker:-dynamic-linker /lib/ld.elf_so}}		\
+     %{static:-static}}"
+ 
+ /* Names to predefine in the preprocessor for this target machine.  */
+diff -ur src.orig/gcc/config/netbsd-elf.h src/gcc/config/netbsd-elf.h
+--- src.orig/gcc/config/netbsd-elf.h	2002-01-22 04:23:02.000000000 +0000
++++ src/gcc/config/netbsd-elf.h	2003-01-21 19:44:27.000000000 +0000
+@@ -72,5 +72,5 @@
+ 	 %{!e*:-e __start}}}						\
+      %{!static:								\
+        %{rdynamic:-export-dynamic}					\
+-       %{!dynamic-linker:-dynamic-linker /usr/libexec/ld.elf_so}}	\
++       %{!dynamic-linker:-dynamic-linker /lib/ld.elf_so}}		\
+      %{static:-static}}"
--- gcj-4.2-4.2-20070707.orig/debian/patches/m68k-sig-unwind.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/m68k-sig-unwind.dpatch
@@ -0,0 +1,189 @@
+#! /bin/sh -e
+
+# All lines beginning with `# DPATCH:' are a description of the patch.
+# DP: add support for unwinding over signal frames
+
+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 -p1 < $0
+        #cd ${dir}gcc && autoconf
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p1 < $0
+        #rm ${dir}gcc/configure
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+---
+
+ gcc/config/m68k/linux-unwind.h |  140 +++++++++++++++++++++++++++++++++++++++++
+ gcc/config/m68k/linux.h        |    2 
+ 2 files changed, 142 insertions(+)
+
+Index: gcc-4.1/gcc/config/m68k/linux-unwind.h
+===================================================================
+--- /dev/null
++++ gcc-4.1/gcc/config/m68k/linux-unwind.h
+@@ -0,0 +1,140 @@
++/* DWARF2 EH unwinding support for Linux/m68k.
++   Copyright (C) 2006 Free Software Foundation, Inc.
++
++This file is part of GCC.
++
++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 2, or (at your option)
++any later version.
++
++In addition to the permissions in the GNU General Public License, the
++Free Software Foundation gives you unlimited permission to link the
++compiled version of this file with other programs, and to distribute
++those programs without any restriction coming from the use of this
++file.  (The General Public License restrictions do apply in other
++respects; for example, they cover modification of the file, and
++distribution when not linked into another program.)
++
++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.
++
++You should have received a copy of the GNU General Public License
++along with GCC; see the file COPYING.  If not, write to
++the Free Software Foundation, 51 Franklin Street, Fifth Floor,
++Boston, MA 02110-1301, USA.  */
++
++/* Do code reading to identify a signal frame, and set the frame
++   state data appropriately.  See unwind-dw2.c for the structs.
++   Don't use this at all if inhibit_libc is used.  */
++
++#ifndef inhibit_libc
++
++#include <signal.h>
++
++/* <sys/ucontext.h> is unfortunaly broken right now */
++struct uw_ucontext {
++	unsigned long	  uc_flags;
++	struct ucontext  *uc_link;
++	stack_t		  uc_stack;
++	mcontext_t	  uc_mcontext;
++	unsigned long	  uc_filler[80];
++	__sigset_t	  uc_sigmask;
++};
++
++#define MD_FALLBACK_FRAME_STATE_FOR m68k_fallback_frame_state
++
++static _Unwind_Reason_Code
++m68k_fallback_frame_state (struct _Unwind_Context *context,
++			   _Unwind_FrameState *fs)
++{
++  unsigned char *pc = context->ra;
++  long cfa;
++
++  /* moveq #__NR_sigreturn,%d0; trap #0  */
++  if (*(unsigned int *)(pc+0) == 0x70774e40)
++    {
++      struct sigcontext *sc;
++
++      sc = *(struct sigcontext **)(context->cfa + 8);
++
++      cfa = sc->sc_usp;
++      fs->cfa_how = CFA_REG_OFFSET;
++      fs->cfa_reg = 15;
++      fs->cfa_offset = cfa - (long) context->cfa;
++
++      fs->regs.reg[0].how = REG_SAVED_OFFSET;
++      fs->regs.reg[0].loc.offset = (long)&sc->sc_d0 - cfa;
++      fs->regs.reg[1].how = REG_SAVED_OFFSET;
++      fs->regs.reg[1].loc.offset = (long)&sc->sc_d1 - cfa;
++      fs->regs.reg[8].how = REG_SAVED_OFFSET;
++      fs->regs.reg[8].loc.offset = (long)&sc->sc_a0 - cfa;
++      fs->regs.reg[9].how = REG_SAVED_OFFSET;
++      fs->regs.reg[9].loc.offset = (long)&sc->sc_a1 - cfa;
++
++      fs->regs.reg[24].how = REG_SAVED_OFFSET;
++      fs->regs.reg[24].loc.offset = (long)&sc->sc_pc - cfa;
++
++      if (*(int *)sc->sc_fpstate)
++	{
++	  int *fpregs = (int *)sc->sc_fpregs;
++
++	  fs->regs.reg[16].how = REG_SAVED_OFFSET;
++	  fs->regs.reg[16].loc.offset = (long)&fpregs[0] - cfa;
++	  fs->regs.reg[17].how = REG_SAVED_OFFSET;
++	  fs->regs.reg[17].loc.offset = (long)&fpregs[3] - cfa;
++	}
++    }
++  /* moveq #~__NR_rt_sigreturn,%d0; not.b %d0; trap #0 */
++  else if (*(unsigned int *)(pc+0) == 0x70524600
++	   && *(unsigned short *)(pc+4) == 0x4e40)
++    {
++      struct uw_ucontext *uc;
++      greg_t *gregs;
++      int i;
++
++      uc = *(struct uw_ucontext **)(context->cfa + 8);
++
++      gregs = uc->uc_mcontext.gregs;
++      cfa = gregs[15];
++      fs->cfa_how = CFA_REG_OFFSET;
++      fs->cfa_reg = 15;
++      fs->cfa_offset = cfa - (long) context->cfa;
++
++      /* register %d0-%d7/%a0-%a6  */
++      for (i = 0; i <= 14; i++)
++	{
++	  fs->regs.reg[i].how = REG_SAVED_OFFSET;
++	  fs->regs.reg[i].loc.offset = (long)&gregs[i] - cfa;
++	}
++
++      /* return address  */
++      fs->regs.reg[24].how = REG_SAVED_OFFSET;
++      fs->regs.reg[24].loc.offset = (long)&gregs[16] - cfa;
++
++#define uc_fpstate      uc_filler[0]
++
++      if (uc->uc_fpstate)
++	{
++	  int *fpregs = (int *)uc->uc_mcontext.fpregs.f_fpregs;
++
++	  /* register %fp0-%fp7  */
++	  for (i = 16; i <= 23; i++)
++	    {
++	      fs->regs.reg[i].how = REG_SAVED_OFFSET;
++	      fs->regs.reg[i].loc.offset = (long)fpregs - cfa;
++	      fpregs += 3;
++	    }
++	}
++    }
++  else
++    return _URC_END_OF_STACK;
++
++  fs->retaddr_column = 24;
++  fs->signal_frame = 1;
++
++  return _URC_NO_REASON;
++}
++#endif /* ifdef inhibit_libc  */
+Index: gcc-4.1/gcc/config/m68k/linux.h
+===================================================================
+--- gcc-4.1.orig/gcc/config/m68k/linux.h
++++ gcc-4.1/gcc/config/m68k/linux.h
+@@ -297,3 +297,5 @@ do {									\
+ }
+ 
+ #define TARGET_ASM_FILE_END file_end_indicate_exec_stack
++
++#define MD_UNWIND_SUPPORT "config/m68k/linux-unwind.h"
--- gcj-4.2-4.2-20070707.orig/debian/patches/disable-configure-run-check.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/disable-configure-run-check.dpatch
@@ -0,0 +1,157 @@
+#! /bin/sh -e
+
+# DP: don't bogusly check if the 64bit binaries also work,
+# DP: which does break on 32bit kernels.
+
+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
+
+--- libmudflap/configure.orig	2007-07-06 20:28:43.000000000 +0200
++++ libmudflap/configure	2007-07-07 14:44:32.899598235 +0200
+@@ -2366,7 +2366,8 @@
+ echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
+ # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+ # If not cross compiling, check that we can run a simple program.
+-if test "$cross_compiling" != yes; then
++# Check disabled as it doesn't catch 64 bit biarch builds on 32 bit archs.
++if false && test "$cross_compiling" != yes; then
+   if { ac_try='./$ac_file'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+--- libiberty/configure.orig	2007-07-06 20:28:51.000000000 +0200
++++ libiberty/configure	2007-07-07 14:44:32.939598839 +0200
+@@ -2177,7 +2177,7 @@
+ echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
+ # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+ # If not cross compiling, check that we can run a simple program.
+-if test "$cross_compiling" != yes; then
++if false && test "$cross_compiling" != yes; then
+   if { ac_try='./$ac_file'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+--- libjava/libltdl/configure.orig	2007-07-06 20:28:59.000000000 +0200
++++ libjava/libltdl/configure	2007-07-07 14:44:32.919598537 +0200
+@@ -2457,7 +2457,7 @@
+ echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
+ # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+ # If not cross compiling, check that we can run a simple program.
+-if test "$cross_compiling" != yes; then
++if false && test "$cross_compiling" != yes; then
+   if { ac_try='./$ac_file'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+--- libjava/configure.orig	2007-07-07 14:42:54.778118095 +0200
++++ libjava/configure	2007-07-07 14:44:32.929598688 +0200
+@@ -2818,7 +2818,7 @@
+ echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
+ # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+ # If not cross compiling, check that we can run a simple program.
+-if test "$cross_compiling" != yes; then
++if false && test "$cross_compiling" != yes; then
+   if { ac_try='./$ac_file'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+--- libobjc/configure.orig	2007-07-06 20:28:33.000000000 +0200
++++ libobjc/configure	2007-07-07 14:44:32.889598084 +0200
+@@ -2101,7 +2101,7 @@
+ echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
+ # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+ # If not cross compiling, check that we can run a simple program.
+-if test "$cross_compiling" != yes; then
++if false && test "$cross_compiling" != yes; then
+   if { ac_try='./$ac_file'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+--- boehm-gc/configure.orig	2007-07-06 20:43:16.000000000 +0200
++++ boehm-gc/configure	2007-07-07 14:44:32.909598386 +0200
+@@ -2354,7 +2354,7 @@
+ echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
+ # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+ # If not cross compiling, check that we can run a simple program.
+-if test "$cross_compiling" != yes; then
++if false && test "$cross_compiling" != yes; then
+   if { ac_try='./$ac_file'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+--- libffi/configure.orig	2007-07-06 20:43:16.000000000 +0200
++++ libffi/configure	2007-07-07 14:44:32.909598386 +0200
+@@ -2319,7 +2319,7 @@
+ echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
+ # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+ # If not cross compiling, check that we can run a simple program.
+-if test "$cross_compiling" != yes; then
++if false && test "$cross_compiling" != yes; then
+   if { ac_try='./$ac_file'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+--- zlib/configure.orig	2007-07-06 20:28:32.000000000 +0200
++++ zlib/configure	2007-07-07 14:44:32.879597934 +0200
+@@ -2397,7 +2397,7 @@
+ echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
+ # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+ # If not cross compiling, check that we can run a simple program.
+-if test "$cross_compiling" != yes; then
++if false && test "$cross_compiling" != yes; then
+   if { ac_try='./$ac_file'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+--- libstdc++-v3/configure.orig	2007-07-06 20:28:28.000000000 +0200
++++ libstdc++-v3/configure	2007-07-07 14:47:06.371913330 +0200
+@@ -2759,7 +2759,7 @@
+ echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
+ # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+ # If not cross compiling, check that we can run a simple program.
+-if test "$cross_compiling" != yes; then
++if false && test "$cross_compiling" != yes; then
+   if { ac_try='./$ac_file'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+@@ -5840,7 +5840,7 @@
+ 
+     if test $enable_clocale = auto; then
+       # Test for bugs early in glibc-2.2.x series
+-      if test "$cross_compiling" = yes; then
++      if false && test "$cross_compiling" = yes; then
+   enable_clocale_flag=generic
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+--- libssp/configure.orig	2007-07-06 20:28:55.000000000 +0200
++++ libssp/configure	2007-07-07 14:44:32.909598386 +0200
+@@ -2406,7 +2406,7 @@
+ echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
+ # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+ # If not cross compiling, check that we can run a simple program.
+-if test "$cross_compiling" != yes; then
++if false && test "$cross_compiling" != yes; then
+   if { ac_try='./$ac_file'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+--- libgfortran/configure.orig	2007-07-06 20:28:42.000000000 +0200
++++ libgfortran/configure	2007-07-07 14:44:32.899598235 +0200
+@@ -2501,7 +2501,7 @@
+ echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
+ # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+ # If not cross compiling, check that we can run a simple program.
+-if test "$cross_compiling" != yes; then
++if false && test "$cross_compiling" != yes; then
+   if { ac_try='./$ac_file'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
--- gcj-4.2-4.2-20070707.orig/debian/patches/gccbug-posix.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/gccbug-posix.dpatch
@@ -0,0 +1,84 @@
+#! /bin/sh -e
+
+# DP: Make gccbug POSIX compliant (patch by David Weinehall)
+# DP: http://www.opengroup.org/onlinepubs/009695399/utilities/test.html
+
+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/gccbug.in~	2004-06-15 04:43:16.000000000 +0200
++++ gcc/gccbug.in	2004-07-04 23:51:38.000000000 +0200
+@@ -165,7 +165,7 @@
+         ;;
+     -f | --file) if [ $# -eq 1 ]; then echo "$USAGE"; $REMOVE_TEMP; exit 1; fi
+ 	shift ; IN_FILE="$1"
+-	if [ "$IN_FILE" != "-" -a ! -r "$IN_FILE" ]; then
++	if [ "$IN_FILE" != "-" ] && [ ! -r "$IN_FILE" ]; then
+ 	  echo "$COMMAND: cannot read $IN_FILE"
+ 	  $REMOVE_TEMP
+ 	  exit 1
+@@ -237,7 +237,7 @@
+ # Catch some signals. ($xs kludge needed by Sun /bin/sh)
+ xs=0
+ trap '$REMOVE_TEMP; exit $xs' 0
+-trap 'echo "$COMMAND: Aborting ..."; $REMOVE_TEMP; xs=1; exit' 1 3 13 15
++trap 'echo "$COMMAND: Aborting ..."; $REMOVE_TEMP; xs=1; exit' HUP QUIT PIPE TERM
+ 
+ # If they told us to use a specific file, then do so.
+ if [ -n "$IN_FILE" ]; then
+@@ -258,16 +258,16 @@
+   fi
+ else
+ 
+-  if [ -n "$PR_FORM" -a -z "$PRINT_INTERN" ]; then
++  if [ -n "$PR_FORM" ] && [ -z "$PRINT_INTERN" ]; then
+     # If their PR_FORM points to a bogus entry, then bail.
+-    if [ ! -f "$PR_FORM" -o ! -r "$PR_FORM" -o ! -s "$PR_FORM" ]; then
++    if [ ! -f "$PR_FORM" ] || [ ! -r "$PR_FORM" ] || [ ! -s "$PR_FORM" ]; then
+       echo "$COMMAND: can't seem to read your template file (\`$PR_FORM'), ignoring PR_FORM"
+       sleep 1
+       PRINT_INTERN=bad_prform
+     fi
+   fi
+ 
+-  if [ -n "$PR_FORM" -a -z "$PRINT_INTERN" ]; then
++  if [ -n "$PR_FORM" ] && [ -z "$PRINT_INTERN" ]; then
+     cp $PR_FORM $TEMP || 
+       ( echo "$COMMAND: could not copy $PR_FORM" ; xs=1; exit )
+   else
+@@ -359,7 +359,7 @@
+     done
+   fi
+ 
+-  if [ "$PRINT" = true -o "$PRINT_INTERN" = true ]; then
++  if [ "$PRINT" = true ] || [ "$PRINT_INTERN" = true ]; then
+     cat $TEMP
+     xs=0; exit
+   fi
+@@ -467,7 +467,7 @@
+     CNT=`expr $CNT + 1`
+   fi
+ 
+-  [ $CNT -lt 6 -a -z "$BATCH" ] && 
++  [ $CNT -lt 6 ] && [ -z "$BATCH" ] && 
+     echo "Errors were found with the problem report."
+ 
+   while true; do
--- gcj-4.2-4.2-20070707.orig/debian/patches/m68k-save_pic.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/m68k-save_pic.dpatch
@@ -0,0 +1,51 @@
+#! /bin/sh -e
+
+# All lines beginning with `# DPATCH:' are a description of the patch.
+# DP: gcc/config/m68k/m68k.c:
+# DP: correctly save the pic register, when not done by reload()
+# DP: (fixes _Unwind_RaiseException and thus exception handling)
+# DP: fixes 345574
+
+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 -p1 < $0
+        #cd ${dir}gcc && autoconf
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p1 < $0
+        #rm ${dir}gcc/configure
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+# append the patch here and adjust the -p? flag in the patch calls.
+
+---
+ gcc/config/m68k/m68k.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+Index: gcc-4.1/gcc/config/m68k/m68k.c
+===================================================================
+--- gcc-4.1.orig/gcc/config/m68k/m68k.c
++++ gcc-4.1/gcc/config/m68k/m68k.c
+@@ -466,7 +466,8 @@ m68k_save_reg (unsigned int regno, bool 
+ {
+   if (flag_pic && regno == PIC_OFFSET_TABLE_REGNUM)
+     {
+-      if (current_function_uses_pic_offset_table)
++      if (current_function_uses_pic_offset_table ||
++	  current_function_has_nonlocal_label)
+ 	return true;
+       if (!current_function_is_leaf && TARGET_ID_SHARED_LIBRARY)
+ 	return true;
--- gcj-4.2-4.2-20070707.orig/debian/patches/rename-info-files.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/rename-info-files.dpatch
@@ -0,0 +1,592 @@
+#! /bin/sh -e
+
+# DP: Allow transformations on info file names. Reference the
+# DP: transformed info file names in the texinfo files.
+
+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/ChangeLog:
+
+2004-02-17  Matthias Klose  <doko@debian.org>
+
+	* Makefile.in: Allow transformations on info file names.
+	Define MAKEINFODEFS, macros to pass transformated info file
+	names to makeinfo.
+	* doc/cpp.texi: Use macros defined in MAKEINFODEFS for references.
+	* doc/cppinternals.texi: Likewise.
+	* doc/extend.texi: Likewise.
+	* doc/gcc.texi: Likewise.
+	* doc/gccint.texi: Likewise.
+	* doc/invoke.texi: Likewise.
+	* doc/libgcc.texi: Likewise.
+	* doc/makefile.texi: Likewise.
+	* doc/passes.texi: Likewise.
+	* doc/sourcebuild.texi: Likewise.
+	* doc/standards.texi: Likewise.
+	* doc/trouble.texi: Likewise.
+
+gcc/fortran/ChangeLog:
+	* Make-lang.in: Allow transformations on info file names.
+	Pass macros of transformated info file defined in MAKEINFODEFS
+	names to makeinfo.
+	* gfortran.texi: Use macros defined in MAKEINFODEFS for references.
+
+gcc/java/ChangeLog:
+	* Make-lang.in: Allow transformations on info file names.
+	Pass macros of transformated info file defined in MAKEINFODEFS
+	names to makeinfo.
+	* gcj.texi: Use macros defined in MAKEINFODEFS for references.
+
+gcc/treelang/ChangeLog:
+	* Make-lang.in: Allow transformations on info file names.
+	Pass macros of transformated info file defined in MAKEINFODEFS
+	names to makeinfo.
+	Define TREELANG_MAKEINFODEFS macros to pass transformated info file
+	names to makeinfo.
+	* treelang.texi: Use macros defined in MAKEINFO_DEFS for references.
+
+
+--- gcc/doc/cpp.texi.orig	2007-03-22 14:32:10.000000000 +0100
++++ gcc/doc/cpp.texi	2007-03-22 14:32:35.000000000 +0100
+@@ -52,7 +52,7 @@
+ @ifinfo
+ @dircategory Software development
+ @direntry
+-* Cpp: (cpp).		       The GNU C preprocessor.
++* @value{fncpp}: (@value{fncpp}).		       The GNU C preprocessor.
+ @end direntry
+ @end ifinfo
+ 
+--- gcc/doc/cppinternals.texi.orig	2007-03-22 14:32:10.000000000 +0100
++++ gcc/doc/cppinternals.texi	2007-03-22 14:32:35.000000000 +0100
+@@ -7,7 +7,7 @@
+ @ifinfo
+ @dircategory Software development
+ @direntry
+-* Cpplib: (cppinternals).      Cpplib internals.
++* @value{fncppint}: (@value{fncppint}).      Cpplib internals.
+ @end direntry
+ @end ifinfo
+ 
+--- gcc/doc/extend.texi.orig	2007-03-22 14:32:10.000000000 +0100
++++ gcc/doc/extend.texi	2007-03-22 14:32:35.000000000 +0100
+@@ -10384,7 +10384,7 @@
+ test for the GNU compiler the same way as for C programs: check for a
+ predefined macro @code{__GNUC__}.  You can also use @code{__GNUG__} to
+ test specifically for GNU C++ (@pxref{Common Predefined Macros,,
+-Predefined Macros,cpp,The GNU C Preprocessor}).
++Predefined Macros,@value{fncpp},The GNU C Preprocessor}).
+ 
+ @menu
+ * Volatiles::		What constitutes an access to a volatile object.
+--- gcc/doc/gcc.texi.orig	2007-03-22 14:32:10.000000000 +0100
++++ gcc/doc/gcc.texi	2007-03-22 14:32:35.000000000 +0100
+@@ -64,7 +64,7 @@
+ @ifnottex
+ @dircategory Software development
+ @direntry
+-* gcc: (gcc).                  The GNU Compiler Collection.
++* @value{fngcc}: (@value{fngcc}).                  The GNU Compiler Collection.
+ @end direntry
+ This file documents the use of the GNU compilers.
+ @sp 1
+@@ -120,7 +120,7 @@
+ The internals of the GNU compilers, including how to port them to new
+ targets and some information about how to write front ends for new
+ languages, are documented in a separate manual.  @xref{Top,,
+-Introduction, gccint, GNU Compiler Collection (GCC) Internals}.
++Introduction, @value{fngccint}, GNU Compiler Collection (GCC) Internals}.
+ 
+ @menu
+ * G++ and GCC::     You can compile C or C++ programs.
+--- gcc/doc/gccint.texi.orig	2007-03-22 14:32:10.000000000 +0100
++++ gcc/doc/gccint.texi	2007-03-22 14:32:35.000000000 +0100
+@@ -50,7 +50,7 @@
+ @ifnottex
+ @dircategory Software development
+ @direntry
+-* gccint: (gccint).            Internals of the GNU Compiler Collection.
++* @value{fngccint}: (@value{fngccint}).            Internals of the GNU Compiler Collection.
+ @end direntry
+ This file documents the internals of the GNU compilers.
+ @sp 1
+@@ -79,7 +79,7 @@
+ how to port them to new targets and some information about how to
+ write front ends for new languages.  It corresponds to GCC version
+ @value{version-GCC}.  The use of the GNU compilers is documented in a
+-separate manual.  @xref{Top,, Introduction, gcc, Using the GNU
++separate manual.  @xref{Top,, Introduction, @value{fngcc}, Using the GNU
+ Compiler Collection (GCC)}.
+ 
+ This manual is mainly a reference manual rather than a tutorial.  It
+--- gcc/doc/invoke.texi.orig	2007-03-22 14:32:10.000000000 +0100
++++ gcc/doc/invoke.texi	2007-03-22 14:32:35.000000000 +0100
+@@ -6574,7 +6574,7 @@
+ @option{-nodefaultlibs} is @file{libgcc.a}, a library of internal subroutines
+ that GCC uses to overcome shortcomings of particular machines, or special
+ needs for some languages.
+-(@xref{Interface,,Interfacing to GCC Output,gccint,GNU Compiler
++(@xref{Interface,,Interfacing to GCC Output,@value{fngccint},GNU Compiler
+ Collection (GCC) Internals},
+ for more discussion of @file{libgcc.a}.)
+ In most cases, you need @file{libgcc.a} even when you want to avoid
+@@ -6582,7 +6582,7 @@
+ or @option{-nodefaultlibs} you should usually specify @option{-lgcc} as well.
+ This ensures that you have no unresolved references to internal GCC
+ library subroutines.  (For example, @samp{__main}, used to ensure C++
+-constructors will be called; @pxref{Collect2,,@code{collect2}, gccint,
++constructors will be called; @pxref{Collect2,,@code{collect2}, @value{fngccint},
+ GNU Compiler Collection (GCC) Internals}.)
+ 
+ @item -pie
+@@ -13714,7 +13714,7 @@
+ @option{-B}, @option{-I} and @option{-L} (@pxref{Directory Options}).  These
+ take precedence over places specified using environment variables, which
+ in turn take precedence over those specified by the configuration of GCC@.
+-@xref{Driver,, Controlling the Compilation Driver @file{gcc}, gccint,
++@xref{Driver,, Controlling the Compilation Driver @file{gcc}, @value{fngccint},
+ GNU Compiler Collection (GCC) Internals}.
+ 
+ @table @env
+@@ -13866,7 +13866,7 @@
+ 
+ A precompiled header file will be searched for when @code{#include} is
+ seen in the compilation.  As it searches for the included file
+-(@pxref{Search Path,,Search Path,cpp,The C Preprocessor}) the
++(@pxref{Search Path,,Search Path,@value{fncpp},The C Preprocessor}) the
+ compiler looks for a precompiled header in each directory just before it
+ looks for the include file in that directory.  The name searched for is
+ the name specified in the @code{#include} with @samp{.gch} appended.  If
+--- gcc/doc/libgcc.texi.orig	2007-03-22 14:32:10.000000000 +0100
++++ gcc/doc/libgcc.texi	2007-03-22 14:32:35.000000000 +0100
+@@ -24,7 +24,7 @@
+ GCC will also generate calls to C library routines, such as
+ @code{memcpy} and @code{memset}, in some cases.  The set of routines
+ that GCC may possibly use is documented in @ref{Other
+-Builtins,,,gcc, Using the GNU Compiler Collection (GCC)}.
++Builtins,,,@value{fngcc}, Using the GNU Compiler Collection (GCC)}.
+ 
+ These routines take arguments and return values of a specific machine
+ mode, not a specific C type.  @xref{Machine Modes}, for an explanation
+--- gcc/doc/makefile.texi.orig	2007-03-22 14:32:10.000000000 +0100
++++ gcc/doc/makefile.texi	2007-03-22 14:32:35.000000000 +0100
+@@ -139,7 +139,7 @@
+ @item profiledbootstrap
+ Builds a compiler with profiling feedback information.  For more
+ information, see
+-@ref{Building,,Building with profile feedback,gccinstall,Installing GCC}.
++@ref{Building,,Building with profile feedback,@value{fngccinstall},Installing GCC}.
+ 
+ @item restrap
+ Restart a bootstrap, so that everything that was not built with
+--- gcc/doc/passes.texi.orig	2007-03-22 14:32:10.000000000 +0100
++++ gcc/doc/passes.texi	2007-03-22 14:33:29.000000000 +0100
+@@ -191,7 +191,7 @@
+ @item Mudflap declaration registration
+ 
+ If mudflap (@pxref{Optimize Options,,-fmudflap -fmudflapth
+--fmudflapir,gcc,Using the GNU Compiler Collection (GCC)}) is
++-fmudflapir,@value{fngcc},Using the GNU Compiler Collection (GCC)}) is
+ enabled, we generate code to register some variable declarations with
+ the mudflap runtime.  Specifically, the runtime tracks the lifetimes of
+ those variable declarations that have their addresses taken, or whose
+--- gcc/doc/standards.texi.orig	2007-03-22 14:32:10.000000000 +0100
++++ gcc/doc/standards.texi	2007-03-22 14:32:35.000000000 +0100
+@@ -188,8 +188,8 @@
+ GNAT Reference Manual}, for information on standard
+ conformance and compatibility of the Ada compiler.
+ 
+-@xref{Standards,,Standards, gfortran, The GNU Fortran Compiler}, for details
++@xref{Standards,,Standards, @value{gfortran}, The GNU Fortran Compiler}, for details
+ of standards supported by GNU Fortran.
+ 
+-@xref{Compatibility,,Compatibility with the Java Platform, gcj, GNU gcj},
++@xref{Compatibility,,Compatibility with the Java Platform, @value{gcj}, GNU gcj},
+ for details of compatibility between @command{gcj} and the Java Platform.
+--- gcc/java/Make-lang.in.orig	2007-03-22 14:32:10.000000000 +0100
++++ gcc/java/Make-lang.in	2007-03-22 14:32:35.000000000 +0100
+@@ -129,11 +129,23 @@
+ 	etags --include TAGS.sub --include ../TAGS.sub
+ 
+ 
+-java.info: doc/gcj.info
++TEXI_GCJ_FILES = java/gcj.texi \
++		 $(gcc_docdir)/include/gpl.texi $(gcc_docdir)/include/funding.texi \
++		 $(gcc_docdir)/include/fdl.texi $(gcc_docdir)/include/gcc-common.texi
++INFO_GCJ_NAME = $(shell echo gcj|sed '$(program_transform_name)')
+ 
+-java.srcinfo: doc/gcj.info
++java.info: doc/$(INFO_GCJ_NAME).info
++
++java.srcinfo: doc/$(INFO_GCJ_NAME).info
+ 	-cp -p $^ $(srcdir)/doc
+ 
++doc/$(INFO_GCJ_NAME).info: $(TEXI_GCJ_FILES)
++	if test "x$(BUILD_INFO)" = xinfo; then \
++	  rm -f $(@)*; \
++	  $(MAKEINFO) $(MAKEINFOFLAGS) $(MAKEINFODEFS) \
++	    -I$(gcc_docdir)/include -I$(srcdir)/f -o$@ $<; \
++	fi
++
+ java.dvi: doc/gcj.dvi
+ 
+ JAVA_PDFFILES = doc/gcj.pdf
+@@ -189,8 +201,9 @@
+ 	-rm -rf $(DESTDIR)$(man1dir)/gij$(man1ext)
+ 	-rm -rf $(DESTDIR)$(man1dir)/jv-convert$(man1ext)
+ 	-rm -rf $(DESTDIR)$(man1dir)/gcj-dbtool$(man1ext)
++	-rm -f $(DESTDIR)$(infodir)/$(INFO_GCJ_NAME).info*
+ 
+-java.install-info: $(DESTDIR)$(infodir)/gcj.info
++java.install-info: $(DESTDIR)$(infodir)/$(INFO_GCJ_NAME).info
+ 
+ java.install-pdf: $(JAVA_PDFFILES)
+ 	@$(NORMAL_INSTALL)
+--- gcc/java/gcj.texi.orig	2007-03-22 14:32:10.000000000 +0100
++++ gcc/java/gcj.texi	2007-03-22 14:32:35.000000000 +0100
+@@ -59,7 +59,7 @@
+ @format
+ @dircategory Software development
+ @direntry
+-* Gcj: (gcj).               Ahead-of-time compiler for the Java language
++* @value{fngcj}: (@value{fngcj}).               Ahead-of-time compiler for the Java language
+ @end direntry
+ 
+ @dircategory Individual utilities
+@@ -164,7 +164,7 @@
+ 
+ As @command{gcj} is just another front end to @command{gcc}, it supports many
+ of the same options as gcc.  @xref{Option Summary, , Option Summary,
+-gcc, Using the GNU Compiler Collection (GCC)}.  This manual only documents the
++@value{fngcc}, Using the GNU Compiler Collection (GCC)}.  This manual only documents the
+ options specific to @command{gcj}.
+ 
+ @c man end
+--- gcc/fortran/Make-lang.in.orig	2007-03-22 14:32:10.000000000 +0100
++++ gcc/fortran/Make-lang.in	2007-03-22 14:32:35.000000000 +0100
+@@ -125,7 +125,8 @@
+ 	cd $(srcdir)/fortran; etags -o TAGS.sub *.c *.h; \
+ 	etags --include TAGS.sub --include ../TAGS.sub
+ 
+-fortran.info: doc/gfortran.info
++INFO_FORTRAN_NAME = $(shell echo gfortran|sed '$(program_transform_name)')
++fortran.info: doc/$(INFO_FORTRAN_NAME).info
+ fortran.dvi: doc/gfortran.dvi
+ fortran.pdf: doc/gfortran.pdf
+ fortran.html: $(build_htmldir)/gfortran/index.html
+@@ -154,10 +155,10 @@
+   $(srcdir)/doc/include/gcc-common.texi \
+   gcc-vers.texi
+ 
+-doc/gfortran.info: $(GFORTRAN_TEXI)
++doc/$(INFO_FORTRAN_NAME).info: $(GFORTRAN_TEXI)
+ 	if [ x$(BUILD_INFO) = xinfo ]; then \
+ 	  rm -f doc/gfortran.info-*; \
+-	  $(MAKEINFO) -I $(srcdir)/doc/include -I $(srcdir)/fortran \
++	  $(MAKEINFO) $(MAKEINFODEFS) -I $(srcdir)/doc/include -I $(srcdir)/fortran \
+ 	    -o $@ $<; \
+ 	else true; fi
+ 
+@@ -204,7 +205,7 @@
+ 	  fi ; \
+ 	fi
+ 
+-fortran.install-info: $(DESTDIR)$(infodir)/gfortran.info
++fortran.install-info: $(DESTDIR)$(infodir)/$(INFO_FORTRAN_NAME).info
+ 
+ fortran.install-man: $(DESTDIR)$(man1dir)/$(GFORTRAN_INSTALL_NAME)$(man1ext)
+ 
+@@ -222,7 +223,7 @@
+ 	rm -rf $(DESTDIR)$(bindir)/$(GFORTRAN_INSTALL_NAME)$(exeext); \
+ 	rm -rf $(DESTDIR)$(man1dir)/$(GFORTRAN_INSTALL_NAME)$(man1ext); \
+ 	rm -rf $(DESTDIR)$(bindir)/$(GFORTRAN_TARGET_INSTALL_NAME)$(exeext); \
+-	rm -rf $(DESTDIR)$(infodir)/gfortran.info*
++	rm -rf $(DESTDIR)$(infodir)/$(INFO_FORTRAN_NAME).info*
+ 
+ #
+ # Clean hooks:
+--- gcc/fortran/gfortran.texi.orig	2007-03-22 14:32:10.000000000 +0100
++++ gcc/fortran/gfortran.texi	2007-03-22 14:32:35.000000000 +0100
+@@ -103,6 +103,7 @@
+ @dircategory Software development
+ @direntry
+ * gfortran: (gfortran).                  The GNU Fortran Compiler.
++* @value{fngfortran}: (@value{fngfortran}).                  The GNU Fortran Compiler.
+ @end direntry
+ This file documents the use and the internals of
+ the GNU Fortran compiler, (@command{gfortran}).
+--- gcc/treelang/Make-lang.in.orig	2007-03-22 14:32:10.000000000 +0100
++++ gcc/treelang/Make-lang.in	2007-03-22 14:32:35.000000000 +0100
+@@ -153,9 +153,12 @@
+ 	cd $(srcdir)/treelang; etags -o TAGS.sub *.y *.l *.c *.h; \
+ 	etags --include TAGS.sub --include ../TAGS.sub
+ 
+-treelang.info: doc/treelang.info
++INFO_TREELANG_NAME = $(shell echo treelang|sed '$(program_transform_name)')
++TREELANG_MAKEINFODEFS = -D 'fntreelang $(INFO_TREELANG_NAME)'
+ 
+-treelang.srcinfo: doc/treelang.info
++treelang.info: doc/$(INFO_TREELANG_NAME).info
++
++treelang.srcinfo: doc/$(INFO_TREELANG_NAME).info
+ 	-cp -p $^ $(srcdir)/doc
+ 
+ treelang.dvi: doc/treelang.dvi
+@@ -169,8 +172,8 @@
+ 	 $(gcc_docdir)/include/funding.texi \
+ 	 gcc-vers.texi
+ 
+-doc/treelang.info: $(TEXI_TREELANG_FILES)
+-	$(MAKEINFO) $(MAKEINFOFLAGS) -I $(gcc_docdir)/include -o $@ $<
++doc/$(INFO_TREELANG_NAME).info: $(TEXI_TREELANG_FILES)
++	$(MAKEINFO) $(MAKEINFOFLAGS) $(TREELANG_MAKEINFODEFS) -I $(gcc_docdir)/include -o $@ $<
+ 
+ doc/treelang.dvi: $(TEXI_TREELANG_FILES)
+ 	$(TEXI2DVI) -I $(abs_docdir)/include -o $@ $<
+@@ -208,7 +211,7 @@
+ 	$(STAMP) treelang.install.common.done
+ 
+ # We might not be able to build the info files
+-treelang.install-info: $(DESTDIR)$(infodir)/treelang.info
++treelang.install-info: $(DESTDIR)$(infodir)/$(INFO_TREELANG_NAME).info
+ 
+ treelang.install-man:
+ 
+@@ -221,6 +224,7 @@
+ 	  echo -rm -rf $(DESTDIR)$(bindir)/$$name2$(exeext); \
+ 	  rm -rf $(DESTDIR)$(bindir)/$$name2$(exeext); \
+ 	done
++	-rm -f $(DESTDIR)$(infodir)/$(INFO_TREELANG_NAME).info*
+ 	-rm treelang.install.common.done
+ 
+ #
+--- gcc/treelang/treelang.texi.orig	2007-03-22 14:32:10.000000000 +0100
++++ gcc/treelang/treelang.texi	2007-03-22 14:32:35.000000000 +0100
+@@ -102,7 +102,7 @@
+ @ifnottex
+ @dircategory Software development
+ @direntry
+-* treelang: (treelang).                  The GNU Treelang compiler.
++* @value{fntreelang}: (@value{fntreelang}).                  The GNU Treelang compiler.
+ @end direntry
+ @ifset INTERNALS
+ @ifset USING
+@@ -255,7 +255,7 @@
+ @item
+ The packaging and compiler portions of GNU Treelang are based largely
+ on the GCC compiler.
+-@xref{Contributors,,Contributors to GCC,GCC,Using and Maintaining GCC},
++@xref{Contributors,,Contributors to GCC,@value{fngcc},Using and Maintaining GCC},
+ for more information.
+ 
+ @item
+@@ -875,7 +875,7 @@
+ command-line options that are designed to cater to Treelang users
+ but apply to other languages as well.
+ 
+-@xref{G++ and GCC,,Programming Languages Supported by GCC,GCC,Using
++@xref{G++ and GCC,,Programming Languages Supported by GCC,@value{fngcc},Using
+ the GNU Compiler Collection (GCC)},
+ for information on the way different languages are handled
+ by the GCC compiler (@code{gcc}).
+--- gcc/Makefile.in.orig	2007-03-22 14:32:10.000000000 +0100
++++ gcc/Makefile.in	2007-03-22 14:32:35.000000000 +0100
+@@ -3358,8 +3358,24 @@
+ 
+ doc: $(BUILD_INFO) $(GENERATED_MANPAGES) gccbug
+ 
+-INFOFILES = doc/cpp.info doc/gcc.info doc/gccint.info \
+-            doc/gccinstall.info doc/cppinternals.info
++INFO_CPP_NAME = $(shell echo cpp|sed '$(program_transform_name)')
++INFO_GCC_NAME = $(shell echo gcc|sed '$(program_transform_name)')
++INFO_GCCINT_NAME = $(shell echo gccint|sed '$(program_transform_name)')
++INFO_GCCINSTALL_NAME = $(shell echo gccinstall|sed '$(program_transform_name)')
++INFO_CPPINT_NAME = $(shell echo cppinternals|sed '$(program_transform_name)')
++
++INFO_FORTRAN_NAME = $(shell echo gfortran|sed '$(program_transform_name)')
++INFO_GCJ_NAME = $(shell echo gcj|sed '$(program_transform_name)')
++
++INFOFILES = doc/$(INFO_CPP_NAME).info doc/$(INFO_GCC_NAME).info \
++            doc/$(INFO_GCCINT_NAME).info \
++            doc/$(INFO_GCCINSTALL_NAME).info doc/$(INFO_CPPINT_NAME).info
++
++MAKEINFODEFS = -D 'fncpp $(INFO_CPP_NAME)' -D 'fngcc $(INFO_GCC_NAME)' \
++               -D 'fngccint $(INFO_GCCINT_NAME)' \
++               -D 'fngccinstall $(INFO_GCCINSTALL_NAME)' \
++               -D 'fncppint $(INFO_CPPINT_NAME)' \
++               -D 'fngfortran $(INFO_GFORTRAN_NAME)' \
+ 
+ info: $(INFOFILES) lang.info @GENINSRC@ srcinfo lang.srcinfo
+ 
+@@ -3405,21 +3421,41 @@
+ # patterns.  To use them, put each of the specific targets with its
+ # specific dependencies but no build commands.
+ 
+-doc/cpp.info: $(TEXI_CPP_FILES)
+-doc/gcc.info: $(TEXI_GCC_FILES)
+-doc/gccint.info: $(TEXI_GCCINT_FILES)
+-doc/cppinternals.info: $(TEXI_CPPINT_FILES)
+-
++# Generic entry to handle info files, which are not renamed (currently Ada)
+ doc/%.info: %.texi
+ 	if [ x$(BUILD_INFO) = xinfo ]; then \
+ 		$(MAKEINFO) $(MAKEINFOFLAGS) -I . -I $(gcc_docdir) \
+ 			-I $(gcc_docdir)/include -o $@ $<; \
+ 	fi
+ 
++doc/$(INFO_CPP_NAME).info: $(TEXI_CPP_FILES)
++	if [ x$(BUILD_INFO) = xinfo ]; then \
++		$(MAKEINFO) $(MAKEINFOFLAGS) $(MAKEINFODEFS) -I $(gcc_docdir) \
++			-I $(gcc_docdir)/include -o $@ $<; \
++	fi
++
++doc/$(INFO_GCC_NAME).info: $(TEXI_GCC_FILES)
++	if [ x$(BUILD_INFO) = xinfo ]; then \
++		$(MAKEINFO) $(MAKEINFOFLAGS) $(MAKEINFODEFS) -I $(gcc_docdir) \
++			-I $(gcc_docdir)/include -o $@ $<; \
++	fi
++
++doc/$(INFO_GCCINT_NAME).info: $(TEXI_GCCINT_FILES)
++	if [ x$(BUILD_INFO) = xinfo ]; then \
++		$(MAKEINFO) $(MAKEINFOFLAGS) $(MAKEINFODEFS) -I $(gcc_docdir) \
++			-I $(gcc_docdir)/include -o $@ $<; \
++	fi
++
++doc/$(INFO_CPPINT_NAME).info: $(TEXI_CPPINT_FILES)
++	if [ x$(BUILD_INFO) = xinfo ]; then \
++		$(MAKEINFO) $(MAKEINFOFLAGS) $(MAKEINFODEFS) -I $(gcc_docdir) \
++			-I $(gcc_docdir)/include -o $@ $<; \
++	fi
++
+ # Duplicate entry to handle renaming of gccinstall.info
+-doc/gccinstall.info: $(TEXI_GCCINSTALL_FILES)
++doc/$(INFO_GCCINSTALL_NAME).info: $(TEXI_GCCINSTALL_FILES)
+ 	if [ x$(BUILD_INFO) = xinfo ]; then \
+-		$(MAKEINFO) $(MAKEINFOFLAGS) -I $(gcc_docdir) \
++		$(MAKEINFO) $(MAKEINFOFLAGS) $(MAKEINFODEFS) -I $(gcc_docdir) \
+ 			-I $(gcc_docdir)/include -o $@ $<; \
+ 	fi
+ 
+@@ -3751,11 +3787,11 @@
+ # $(INSTALL_DATA) might be a relative pathname, so we can't cd into srcdir
+ # to do the install.
+ install-info:: doc installdirs \
+-	$(DESTDIR)$(infodir)/cpp.info \
+-	$(DESTDIR)$(infodir)/gcc.info \
+-	$(DESTDIR)$(infodir)/cppinternals.info \
+-	$(DESTDIR)$(infodir)/gccinstall.info \
+-	$(DESTDIR)$(infodir)/gccint.info \
++	$(DESTDIR)$(infodir)/$(INFO_CPP_NAME).info \
++	$(DESTDIR)$(infodir)/$(INFO_GCC_NAME).info \
++	$(DESTDIR)$(infodir)/$(INFO_CPPINT_NAME).info \
++	$(DESTDIR)$(infodir)/$(INFO_GCCINSTALL_NAME).info \
++	$(DESTDIR)$(infodir)/$(INFO_GCCINT_NAME).info \
+ 	lang.install-info
+ 
+ $(DESTDIR)$(infodir)/%.info: doc/%.info installdirs
+@@ -3956,8 +3992,11 @@
+ 	-rm -rf $(DESTDIR)$(man1dir)/cpp$(man1ext)
+ 	-rm -rf $(DESTDIR)$(man1dir)/protoize$(man1ext)
+ 	-rm -rf $(DESTDIR)$(man1dir)/unprotoize$(man1ext)
+-	-rm -f $(DESTDIR)$(infodir)/cpp.info* $(DESTDIR)$(infodir)/gcc.info*
+-	-rm -f $(DESTDIR)$(infodir)/cppinternals.info* $(DESTDIR)$(infodir)/gccint.info*
++	-rm -f $(DESTDIR)$(infodir)/$(INFO_CPP_NAME).info*
++	-rm -f $(DESTDIR)$(infodir)/$(INFO_GCC_NAME).info*
++	-rm -f $(DESTDIR)$(infodir)/$(INFO_CPPINT_NAME).info*
++	-rm -f $(DESTDIR)$(infodir)/$(INFO_GCCINT_NAME).info*
++	-rm -f $(DESTDIR)$(infodir)/$(INFO_GCCINSTALL_NAME).info*
+ #
+ # These targets are for the dejagnu testsuites. The file site.exp
+ # contains global variables that all the testsuites will use.
+--- libgomp/libgomp.texi.orig	2007-02-11 03:32:08.650777000 +0100
++++ libgomp/libgomp.texi	2007-02-11 03:32:35.800777000 +0100
+@@ -32,7 +32,7 @@
+ @ifinfo
+ @dircategory GNU Libraries
+ @direntry
+-* libgomp: (libgomp).                    GNU OpenMP runtime library
++* @value{fnlibgomp}: (@value{fnlibgomp}).                    GNU OpenMP runtime library
+ @end direntry
+ 
+ This manual documents the GNU implementation of the OpenMP API for 
+--- libgomp/Makefile.am.orig	2007-02-11 03:32:08.650777000 +0100
++++ libgomp/Makefile.am	2007-02-11 03:34:30.000777000 +0100
+@@ -84,16 +84,19 @@
+ 
+ all-local: $(STAMP_GENINSRC)
+ 
+-stamp-geninsrc: libgomp.info
+-	cp -p $(top_builddir)/libgomp.info $(srcdir)/libgomp.info
++INFO_LIBGOMP_NAME = $(shell echo libgomp|sed '$(program_transform_name)')
++stamp-geninsrc: $(INFO_LIBGOMP_NAME).info
++	cp -p $(top_builddir)/$(INFO_LIBGOMP_NAME).info $(srcdir)/libgomp.info
+ 	@touch $@
+ 
+-libgomp.info: $(STAMP_BUILD_INFO)
++libgomp.info: $(INFO_LIBGOMP_NAME).info
++	cp $(INFO_LIBGOMP_NAME).info libgomp.info
++$(INFO_LIBGOMP_NAME).info: $(STAMP_BUILD_INFO)
+ 
+ stamp-build-info: libgomp.texi
+-	$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -o libgomp.info $(srcdir)/libgomp.texi
++	$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -D 'fnlibgomp $(INFO_LIBGOMP_NAME)' -I $(srcdir) -o $(INFO_LIBGOMP_NAME).info $(srcdir)/libgomp.texi
+ 	@touch $@
+ 
+ 
+-CLEANFILES = $(STAMP_GENINSRC) $(STAMP_BUILD_INFO) libgomp.info
++CLEANFILES = $(STAMP_GENINSRC) $(STAMP_BUILD_INFO) $(INFO_LIBGOMP_NAME).info
+ MAINTAINERCLEANFILES = $(srcdir)/libgomp.info
+--- libgomp/Makefile.in.orig	2007-02-11 03:32:08.650777000 +0100
++++ libgomp/Makefile.in	2007-02-11 03:34:52.400777000 +0100
+@@ -303,7 +303,8 @@
+ 
+ # AM_CONDITIONAL on configure check ACX_CHECK_PROG_VER([MAKEINFO])
+ @BUILD_INFO_TRUE@STAMP_BUILD_INFO = stamp-build-info
+-CLEANFILES = $(STAMP_GENINSRC) $(STAMP_BUILD_INFO) libgomp.info
++INFO_LIBGOMP_NAME = $(shell echo libgomp|sed '$(program_transform_name)')
++CLEANFILES = $(STAMP_GENINSRC) $(STAMP_BUILD_INFO) $(INFO_LIBGOMP_NAME).info
+ MAINTAINERCLEANFILES = $(srcdir)/libgomp.info
+ all: config.h
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+@@ -1050,15 +1051,16 @@
+ install-html:
+ 
+ all-local: $(STAMP_GENINSRC)
+-
+-stamp-geninsrc: libgomp.info
+-	cp -p $(top_builddir)/libgomp.info $(srcdir)/libgomp.info
++stamp-geninsrc: $(INFO_LIBGOMP_NAME).info
++	cp -p $(top_builddir)/$(INFO_LIBGOMP_NAME).info $(srcdir)/libgomp.info
+ 	@touch $@
+ 
+-libgomp.info: $(STAMP_BUILD_INFO)
++libgomp.info: $(INFO_LIBGOMP_NAME).info
++	cp $(INFO_LIBGOMP_NAME).info libgomp.info
++$(INFO_LIBGOMP_NAME).info: $(STAMP_BUILD_INFO)
+ 
+ stamp-build-info: libgomp.texi
+-	$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -o libgomp.info $(srcdir)/libgomp.texi
++	$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -D 'fnlibgomp $(INFO_LIBGOMP_NAME)' -I $(srcdir) -o $(INFO_LIBGOMP_NAME).info $(srcdir)/libgomp.texi
+ 	@touch $@
+ # 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.
--- gcj-4.2-4.2-20070707.orig/debian/patches/arm-unbreak-eabi-armv4t.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/arm-unbreak-eabi-armv4t.dpatch
@@ -0,0 +1,37 @@
+#! /bin/sh -e
+
+# DP: Fix armv4t build on ARM
+
+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 -p1 < $0
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p1 < $0
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+diff -urN gcc-4.1.1/gcc/config/arm/linux-eabi.h gcc-4.1.1-arm9tdmi/gcc/config/arm/linux-eabi.h
+--- gcc-4.1.1/gcc/config/arm/linux-eabi.h	2006-10-22 11:11:49.000000000 -0700
++++ gcc-4.1.1-arm9tdmi/gcc/config/arm/linux-eabi.h	2006-10-24 21:34:01.000000000 -0700
+@@ -45,7 +45,7 @@
+    The ARM10TDMI core is the default for armv5t, so set
+    SUBTARGET_CPU_DEFAULT to achieve this.  */
+ #undef SUBTARGET_CPU_DEFAULT
+-#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
++#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi
+ 
+ #undef SUBTARGET_EXTRA_LINK_SPEC
+ #define SUBTARGET_EXTRA_LINK_SPEC " -m armelf_linux_eabi"
--- gcj-4.2-4.2-20070707.orig/debian/patches/m68k-align-stack.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/m68k-align-stack.dpatch
@@ -0,0 +1,44 @@
+#! /bin/sh -e
+
+# All lines beginning with `# DPATCH:' are a description of the patch.
+# DP: try to keep the stack word aligned
+
+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 -p1 < $0
+        #cd ${dir}gcc && autoconf
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p1 < $0
+        #rm ${dir}gcc/configure
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+---
+ gcc/config/m68k/m68k.h |    1 +
+ 1 file changed, 1 insertion(+)
+
+Index: gcc-4.1/gcc/config/m68k/m68k.h
+===================================================================
+--- gcc-4.1.orig/gcc/config/m68k/m68k.h
++++ gcc-4.1/gcc/config/m68k/m68k.h
+@@ -143,6 +143,7 @@ Boston, MA 02110-1301, USA.  */
+ 
+ #define PARM_BOUNDARY (TARGET_SHORT ? 16 : 32)
+ #define STACK_BOUNDARY 16
++#define PREFERRED_STACK_BOUNDARY 32
+ #define FUNCTION_BOUNDARY 16
+ #define EMPTY_FIELD_BOUNDARY 16
+ 
--- gcj-4.2-4.2-20070707.orig/debian/patches/m68k-fjump.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/m68k-fjump.dpatch
@@ -0,0 +1,320 @@
+#! /bin/sh -e
+
+# All lines beginning with `# DPATCH:' are a description of the patch.
+# DP: gcc/config/m68k/m68k.md:
+# DP: always use as fjcc pseudo op, we rely heavily on as 
+# DP: to generate the right size for the jump instructions
+# DP: fixes #359281
+
+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 -p1 < $0
+        #cd ${dir}gcc && autoconf
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p1 < $0
+        #rm ${dir}gcc/configure
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+# append the patch here and adjust the -p? flag in the patch calls.
+
+---
+ gcc/config/m68k/m68k.md |   90 ++++++++++++++----------------------------------
+ 1 file changed, 27 insertions(+), 63 deletions(-)
+
+Index: gcc-4.1/gcc/config/m68k/m68k.md
+===================================================================
+--- gcc-4.1.orig/gcc/config/m68k/m68k.md
++++ gcc-4.1/gcc/config/m68k/m68k.md
+@@ -5562,10 +5562,7 @@
+ 		      (pc)))]
+   ""
+ {
+-  if (MOTOROLA)
+-    OUTPUT_JUMP ("jbeq %l0", "fbeq %l0", "jbeq %l0");
+-  else
+-    OUTPUT_JUMP ("jeq %l0", "fjeq %l0", "jeq %l0");
++  OUTPUT_JUMP ("jeq %l0", "fjeq %l0", "jeq %l0");
+ })
+ 
+ (define_insn "bne"
+@@ -5576,10 +5573,7 @@
+ 		      (pc)))]
+   ""
+ {
+-  if (MOTOROLA)
+-    OUTPUT_JUMP ("jbne %l0", "fbne %l0", "jbne %l0");
+-  else
+-    OUTPUT_JUMP ("jne %l0", "fjne %l0", "jne %l0");
++  OUTPUT_JUMP ("jne %l0", "fjne %l0", "jne %l0");
+ })
+ 
+ (define_insn "bgt"
+@@ -5590,10 +5584,7 @@
+ 		      (pc)))]
+   ""
+ {
+-  if (MOTOROLA)
+-    OUTPUT_JUMP ("jbgt %l0", "fbgt %l0", 0);
+-  else
+-    OUTPUT_JUMP ("jgt %l0", "fjgt %l0", 0);
++  OUTPUT_JUMP ("jgt %l0", "fjgt %l0", 0);
+ })
+ 
+ (define_insn "bgtu"
+@@ -5615,10 +5606,7 @@
+ 		      (pc)))]
+   ""
+ {
+-  if (MOTOROLA)
+-    OUTPUT_JUMP ("jblt %l0", "fblt %l0", "jbmi %l0");
+-  else
+-    OUTPUT_JUMP ("jlt %l0", "fjlt %l0", "jmi %l0");
++  OUTPUT_JUMP ("jlt %l0", "fjlt %l0", "jmi %l0");
+ })
+ 
+ (define_insn "bltu"
+@@ -5640,10 +5628,7 @@
+ 		      (pc)))]
+   ""
+ {
+-  if (MOTOROLA)
+-    OUTPUT_JUMP ("jbge %l0", "fbge %l0", "jbpl %l0");
+-  else
+-    OUTPUT_JUMP ("jge %l0", "fjge %l0", "jpl %l0");
++  OUTPUT_JUMP ("jge %l0", "fjge %l0", "jpl %l0");
+ })
+ 
+ (define_insn "bgeu"
+@@ -5665,10 +5650,7 @@
+ 		      (pc)))]
+   ""
+ {
+-  if (MOTOROLA)
+-    OUTPUT_JUMP ("jble %l0", "fble %l0", 0);
+-  else
+-    OUTPUT_JUMP ("jle %l0", "fjle %l0", 0);
++  OUTPUT_JUMP ("jle %l0", "fjle %l0", 0);
+ })
+ 
+ (define_insn "bleu"
+@@ -5690,7 +5672,7 @@
+   "TARGET_68881"
+ {
+   gcc_assert (cc_prev_status.flags & CC_IN_68881);
+-  return MOTOROLA ? "fbor %l0" : "fjor %l0";
++  return "fjor %l0";
+ })
+ 
+ (define_insn "bunordered"
+@@ -5701,7 +5683,7 @@
+   "TARGET_68881"
+ {
+   gcc_assert (cc_prev_status.flags & CC_IN_68881);
+-  return MOTOROLA ? "fbun %l0" : "fjun %l0";
++  return "fjun %l0";
+ })
+ 
+ (define_insn "buneq"
+@@ -5712,7 +5694,7 @@
+   "TARGET_68881"
+ {
+   gcc_assert (cc_prev_status.flags & CC_IN_68881);
+-  return MOTOROLA ? "fbueq %l0" : "fjueq %l0";
++  return "fjueq %l0";
+ })
+ 
+ (define_insn "bunge"
+@@ -5723,7 +5705,7 @@
+   "TARGET_68881"
+ {
+   gcc_assert (cc_prev_status.flags & CC_IN_68881);
+-  return MOTOROLA ? "fbuge %l0" : "fjuge %l0";
++  return "fjuge %l0";
+ })
+ 
+ (define_insn "bungt"
+@@ -5734,7 +5716,7 @@
+   "TARGET_68881"
+ {
+   gcc_assert (cc_prev_status.flags & CC_IN_68881);
+-  return MOTOROLA ? "fbugt %l0" : "fjugt %l0";
++  return "fjugt %l0";
+ })
+ 
+ (define_insn "bunle"
+@@ -5745,7 +5727,7 @@
+   "TARGET_68881"
+ {
+   gcc_assert (cc_prev_status.flags & CC_IN_68881);
+-  return MOTOROLA ? "fbule %l0" : "fjule %l0";
++  return "fjule %l0";
+ })
+ 
+ (define_insn "bunlt"
+@@ -5756,7 +5738,7 @@
+   "TARGET_68881"
+ {
+   gcc_assert (cc_prev_status.flags & CC_IN_68881);
+-  return MOTOROLA ? "fbult %l0" : "fjult %l0";
++  return "fjult %l0";
+ })
+ 
+ (define_insn "bltgt"
+@@ -5767,7 +5749,7 @@
+   "TARGET_68881"
+ {
+   gcc_assert (cc_prev_status.flags & CC_IN_68881);
+-  return MOTOROLA ? "fbogl %l0" : "fjogl %l0";
++  return "fjogl %l0";
+ })
+ 
+ ;; Negated conditional jump instructions.
+@@ -5780,10 +5762,7 @@
+ 		      (label_ref (match_operand 0 "" ""))))]
+   ""
+ {
+-  if (MOTOROLA)
+-    OUTPUT_JUMP ("jbne %l0", "fbne %l0", "jbne %l0");
+-  else
+-    OUTPUT_JUMP ("jne %l0", "fjne %l0", "jne %l0");
++  OUTPUT_JUMP ("jne %l0", "fjne %l0", "jne %l0");
+ })
+ 
+ (define_insn ""
+@@ -5794,10 +5773,7 @@
+ 		      (label_ref (match_operand 0 "" ""))))]
+   ""
+ {
+-  if (MOTOROLA)
+-    OUTPUT_JUMP ("jbeq %l0", "fbeq %l0", "jbeq %l0");
+-  else
+-    OUTPUT_JUMP ("jeq %l0", "fjeq %l0", "jeq %l0");
++  OUTPUT_JUMP ("jeq %l0", "fjeq %l0", "jeq %l0");
+ })
+ 
+ (define_insn ""
+@@ -5808,10 +5784,7 @@
+ 		      (label_ref (match_operand 0 "" ""))))]
+   ""
+ {
+-  if (MOTOROLA)
+-    OUTPUT_JUMP ("jble %l0", "fbngt %l0", 0);
+-  else
+-    OUTPUT_JUMP ("jle %l0", "fjngt %l0", 0);
++  OUTPUT_JUMP ("jle %l0", "fjngt %l0", 0);
+ })
+ 
+ (define_insn ""
+@@ -5833,10 +5806,7 @@
+ 		      (label_ref (match_operand 0 "" ""))))]
+   ""
+ {
+-  if (MOTOROLA)
+-    OUTPUT_JUMP ("jbge %l0", "fbnlt %l0", "jbpl %l0");
+-  else
+-    OUTPUT_JUMP ("jge %l0", "fjnlt %l0", "jpl %l0");
++  OUTPUT_JUMP ("jge %l0", "fjnlt %l0", "jpl %l0");
+ })
+ 
+ (define_insn ""
+@@ -5858,10 +5828,7 @@
+ 		      (label_ref (match_operand 0 "" ""))))]
+   ""
+ {
+-  if (MOTOROLA)
+-    OUTPUT_JUMP ("jblt %l0", "fbnge %l0", "jbmi %l0");
+-  else
+-    OUTPUT_JUMP ("jlt %l0", "fjnge %l0", "jmi %l0");
++  OUTPUT_JUMP ("jlt %l0", "fjnge %l0", "jmi %l0");
+ })
+ 
+ (define_insn ""
+@@ -5883,10 +5850,7 @@
+ 		      (label_ref (match_operand 0 "" ""))))]
+   ""
+ {
+-  if (MOTOROLA)
+-    OUTPUT_JUMP ("jbgt %l0", "fbnle %l0", 0);
+-  else
+-    OUTPUT_JUMP ("jgt %l0", "fjnle %l0", 0);
++  OUTPUT_JUMP ("jgt %l0", "fjnle %l0", 0);
+ })
+ 
+ (define_insn ""
+@@ -5908,7 +5872,7 @@
+   "TARGET_68881"
+ {
+   gcc_assert (cc_prev_status.flags & CC_IN_68881);
+-  return MOTOROLA ? "fbun %l0" : "fjun %l0";
++  return "fjun %l0";
+ })
+ 
+ (define_insn "*bunordered_rev"
+@@ -5919,7 +5883,7 @@
+   "TARGET_68881"
+ {
+   gcc_assert (cc_prev_status.flags & CC_IN_68881);
+-  return MOTOROLA ? "fbor %l0" : "fjor %l0";
++  return "fjor %l0";
+ })
+ 
+ (define_insn "*buneq_rev"
+@@ -5930,7 +5894,7 @@
+   "TARGET_68881"
+ {
+   gcc_assert (cc_prev_status.flags & CC_IN_68881);
+-  return MOTOROLA ? "fbogl %l0" : "fjogl %l0";
++  return "fjogl %l0";
+ })
+ 
+ (define_insn "*bunge_rev"
+@@ -5941,7 +5905,7 @@
+   "TARGET_68881"
+ {
+   gcc_assert (cc_prev_status.flags & CC_IN_68881);
+-  return MOTOROLA ? "fbolt %l0" : "fjolt %l0";
++  return "fjolt %l0";
+ })
+ 
+ (define_insn "*bunle_rev"
+@@ -5952,7 +5916,7 @@
+   "TARGET_68881"
+ {
+   gcc_assert (cc_prev_status.flags & CC_IN_68881);
+-  return MOTOROLA ? "fbogt %l0" : "fjogt %l0";
++  return "fjogt %l0";
+ })
+ 
+ (define_insn "*bunlt_rev"
+@@ -5963,7 +5927,7 @@
+   "TARGET_68881"
+ {
+   gcc_assert (cc_prev_status.flags & CC_IN_68881);
+-  return MOTOROLA ? "fboge %l0" : "fjoge %l0";
++  return "fjoge %l0";
+ })
+ 
+ (define_insn "*bltgt_rev"
+@@ -5974,7 +5938,7 @@
+   "TARGET_68881"
+ {
+   gcc_assert (cc_prev_status.flags & CC_IN_68881);
+-  return MOTOROLA ? "fbueq %l0" : "fjueq %l0";
++  return "fjueq %l0";
+ })
+ 
+ ;; Unconditional and other jump instructions
--- gcj-4.2-4.2-20070707.orig/debian/patches/m68k-limit_reload.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/m68k-limit_reload.dpatch
@@ -0,0 +1,48 @@
+#! /bin/sh -e
+
+# All lines beginning with `# DPATCH:' are a description of the patch.
+# DP: correctly limit reload class
+# DP: fixes 375522
+
+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 -p1 < $0
+        #cd ${dir}gcc && autoconf
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p1 < $0
+        #rm ${dir}gcc/configure
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+# append the patch here and adjust the -p? flag in the patch calls.
+
+---
+ gcc/config/m68k/m68k.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: gcc-4.1/gcc/config/m68k/m68k.h
+===================================================================
+--- gcc-4.1.orig/gcc/config/m68k/m68k.h
++++ gcc-4.1/gcc/config/m68k/m68k.h
+@@ -433,7 +433,7 @@ extern enum reg_class regno_reg_class[];
+    assumption that if the class is not ADDR_REGS, then it must be a superset
+    of DATA_REGS.  */
+ #define LIMIT_RELOAD_CLASS(MODE, CLASS) \
+-  (((MODE) == QImode && (CLASS) != ADDR_REGS)	\
++  (((MODE) == QImode && (CLASS) == ADDR_REGS)	\
+    ? DATA_REGS					\
+    : (CLASS))
+ 
--- gcj-4.2-4.2-20070707.orig/debian/patches/i386-biarch.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/i386-biarch.dpatch
@@ -0,0 +1,280 @@
+#! /bin/sh -e
+ 
+# DP: biarch patches for i386/x86_64
+ 
+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}libcpp && autoconf)
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
+        cd ${dir}libcpp && autoconf
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+
+From: "Joseph S. Myers" <joseph@codesourcery.com>
+Sender: gcc-patches-owner@gcc.gnu.org
+To: gcc-patches@gcc.gnu.org, bkorb@gnu.org
+Subject: Patch to support x86-linux --enable-targets=all
+Date: Sun, 22 Oct 2006 19:57:53 +0000 (UTC)
+
+This patch allows i?86-*-linux* configurations to be built with 64-bit
+support, using the same --enable-targets=all option that enables this
+for powerpc-linux configurations.  (Using this feature needs my recent
+binutils patch
+<http://sourceware.org/ml/binutils/2006-10/msg00156.html>.)
+
+Bootstrapped with no regressions on i686-pc-linux-gnu (without the new
+option) and tested on i686-pc-linux-gnu with the new option.  OK to
+commit?
+
+The fixincludes change is because such biarch configurations have
+wrapper files <asm/*.h> that look something like
+
+#ifndef __ASM_STUB_POSIX_TYPES_H__
+# define __ASM_STUB_POSIX_TYPES_H__
+# if defined __x86_64__
+#  include <asm-x86_64/posix_types.h>
+# endif
+# if defined __i386__
+#  include <asm-i386/posix_types.h>
+# endif
+#endif
+
+and this wrongly matches a fix for an old pre-x86_64 i386
+<asm/posix_types.h> file.
+
+gcc:
+2006-10-22  Joseph Myers  <joseph@codesourcery.com>
+
+	* config.gcc (i[34567]86-*-linux*): Handle --enable-targets=all.
+	Handle tuning for bi-arch i[34567]86-*-linux* like that for
+	i[34567]86-*-solaris2.1[0-9]*.
+	* config/i386/linux64.h (TARGET_VERSION, MULTILIB_DEFAULTS):
+	Define conditionally depending on TARGET_64BIT_DEFAULT.
+	(SPEC_32, SPEC_64): Define.
+	(LINK_SPEC): Use them.
+	* doc/install.texi (--enable-targets=all): Document for x86-linux.
+
+libcpp:
+2006-10-22  Joseph Myers  <joseph@codesourcery.com>
+
+	* configure.ac (need_64bit_hwint): Set for i[34567]86-*-linux*
+	depending on --enable-targets=all.
+	* configure: Regenerate.
+
+fixincludes:
+2006-10-22  Joseph Myers  <joseph@codesourcery.com>
+
+	* inclhack.def (AAB_fd_zero_asm_posix_types_h): Bypass on x86_64.
+	* fixincl.x: Regenerate.
+
+Index: gcc/doc/install.texi
+===================================================================
+--- gcc/doc/install.texi	(revision 117956)
++++ gcc/doc/install.texi	(working copy)
+@@ -1154,7 +1154,7 @@
+ option enables the 32-bit target to be a bi-arch compiler, which is
+ useful when you want a bi-arch compiler that defaults to 32-bit, and
+ you are building a bi-arch or multi-arch binutils in a combined tree.
+-Currently, this option only affects powerpc-linux.
++Currently, this option only affects powerpc-linux and x86-linux.
+ 
+ @item --enable-secureplt
+ This option enables @option{-msecure-plt} by default for powerpc-linux.
+Index: gcc/config.gcc
+===================================================================
+--- gcc/config.gcc	(revision 117956)
++++ gcc/config.gcc	(working copy)
+@@ -1075,10 +1075,34 @@
+ i[34567]86-*-linux* | i[34567]86-*-kfreebsd*-gnu | i[34567]86-*-knetbsd*-gnu)
+ 			# Intel 80386's running GNU/*
+ 			# with ELF format using glibc 2
+-	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h linux.h i386/linux.h"
++	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h linux.h"
+ 	case ${target} in
+-	i[34567]86-*-knetbsd*-gnu) tm_file="${tm_file} knetbsd-gnu.h i386/knetbsd-gnu.h" ;;
+-	i[34567]86-*-kfreebsd*-gnu) tm_file="${tm_file} kfreebsd-gnu.h i386/kfreebsd-gnu.h" ;;
++	i[34567]86-*-linux*)
++		if test x$enable_targets = xall; then
++			tm_file="${tm_file} i386/x86-64.h i386/linux64.h"
++			tm_defines="${tm_defines} TARGET_BI_ARCH=1"
++			tmake_file="${tmake_file} i386/t-linux64"
++			need_64bit_hwint=yes
++			# FIXME: -m64 for i[34567]86-*-* should be allowed just
++			# like -m32 for x86_64-*-*.
++			case X"${with_cpu}" in
++			Xgeneric|Xnocona|Xx86-64|Xk8|Xopteron|Xathlon64|Xathlon-fx)
++				;;
++			X)
++				with_cpu=generic
++				;;
++			*)
++				echo "Unsupported CPU used in --with-cpu=$with_cpu, supported values:" 1>&2
++				echo "generic nocona x86-64 k8 opteron athlon64 athlon-fx" 1>&2
++				exit 1
++				;;
++			esac
++		else
++			tm_file="${tm_file} i386/linux.h"
++		fi
++		;;
++	i[34567]86-*-knetbsd*-gnu) tm_file="${tm_file} i386/linux.h knetbsd-gnu.h i386/knetbsd-gnu.h" ;;
++	i[34567]86-*-kfreebsd*-gnu) tm_file="${tm_file} i386/linux.h kfreebsd-gnu.h i386/kfreebsd-gnu.h" ;;
+ 	esac
+ 	tmake_file="${tmake_file} i386/t-crtstuff i386/t-crtfm t-dfprules"
+ 	;;
+Index: gcc/config/i386/linux64.h
+===================================================================
+--- gcc/config/i386/linux64.h	(revision 117956)
++++ gcc/config/i386/linux64.h	(working copy)
+@@ -19,7 +19,11 @@
+ the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.  */
+ 
++#if TARGET_64BIT_DEFAULT
+ #define TARGET_VERSION fprintf (stderr, " (x86-64 Linux/ELF)");
++#else
++#define TARGET_VERSION fprintf (stderr, " (i386 Linux/ELF)");
++#endif
+ 
+ #define TARGET_OS_CPP_BUILTINS()				\
+   do								\
+@@ -52,14 +56,22 @@
+ #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
+ #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
+ 
++#if TARGET_64BIT_DEFAULT
++#define SPEC_32 "m32"
++#define SPEC_64 "!m32"
++#else
++#define SPEC_32 "!m64"
++#define SPEC_64 "m64"
++#endif
++
+ #undef	LINK_SPEC
+-#define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} --hash-style=both \
++#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} --hash-style=both \
+   %{shared:-shared} \
+   %{!shared: \
+     %{!static: \
+       %{rdynamic:-export-dynamic} \
+-      %{m32:%{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER32 "}} \
+-      %{!m32:%{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER64 "}}} \
++      %{" SPEC_32 ":%{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER32 "}} \
++      %{" SPEC_64 ":%{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER64 "}}} \
+     %{static:-static}}"
+ 
+ /* Similar to standard Linux, but adding -ffast-math support.  */
+@@ -68,7 +80,11 @@
+   "%{ffast-math|funsafe-math-optimizations:crtfastmath.o%s} \
+    %{shared|pie:crtendS.o%s;:crtend.o%s} crtn.o%s"
+ 
++#if TARGET_64BIT_DEFAULT
+ #define MULTILIB_DEFAULTS { "m64" }
++#else
++#define MULTILIB_DEFAULTS { "m32" }
++#endif
+ 
+ #undef NEED_INDICATE_EXEC_STACK
+ #define NEED_INDICATE_EXEC_STACK 1
+Index: libcpp/configure.ac
+===================================================================
+--- libcpp/configure.ac	(revision 117956)
++++ libcpp/configure.ac	(working copy)
+@@ -130,6 +130,13 @@
+ 	sparc-*-solaris2.[789] | sparc-*-solaris2.1[0-9]* | \
+ 	sh[123456789l]*-*-*)
+ 		need_64bit_hwint=yes ;;
++	i[34567]86-*-linux*)
++		if test "x$enable_targets" = xall; then
++			need_64bit_hwint=yes
++		else
++			need_64bit_hwint=no
++		fi
++		;;
+ 	*)
+ 		need_64bit_hwint=no ;;
+ esac
+Index: fixincludes/inclhack.def
+===================================================================
+--- fixincludes/inclhack.def	(revision 117956)
++++ fixincludes/inclhack.def	(working copy)
+@@ -140,6 +140,7 @@
+     files    = asm/posix_types.h;
+     mach     = 'i[34567]86-*-linux*';
+     bypass   = '} while';
++    bypass   = 'x86_64';
+ 
+     /*
+      * Define _POSIX_TYPES_H_WRAPPER at the end of the wrapper, not
+
+-- 
+Joseph S. Myers
+joseph@codesourcery.com
+
+
+2006-12-12  Matthias Klose  <doko@debian.org>
+
+        * configure.tgt (i[456]86-*-linux*): Only add ia32 specific
+        flags if not building with -m64.
+        * testsuite/lib/libgomp-dg.exp (libgomp_init): Don't add -march
+        flag for i?86-*-* targets, if current target matches -m64.
+
+Index: libgomp/configure.tgt
+===================================================================
+--- libgomp/configure.tgt	(revision 119778)
++++ libgomp/configure.tgt	(working copy)
+@@ -49,9 +49,14 @@
+     # Note that bare i386 is not included here.  We need cmpxchg.
+     i[456]86-*-linux*)
+ 	config_path="linux/x86 linux posix"
+-	if test -z "$with_arch"; then
+-	  XCFLAGS="${XCFLAGS} -march=i486 -mtune=${target_cpu}"
+-	fi
++	case " ${CC} ${CFLAGS} " in
++	  *" -m64 "*)
++	    ;;
++	  *)
++	    if test -z "$with_arch"; then
++	      XCFLAGS="${XCFLAGS} -march=i486 -mtune=${target_cpu}"
++	    fi
++	esac
+ 	;;
+ 
+     # Similar jiggery-pokery for x86_64 multilibs, except here we
+Index: libgomp/testsuite/lib/libgomp-dg.exp
+===================================================================
+--- libgomp/testsuite/lib/libgomp-dg.exp	(revision 119985)
++++ libgomp/testsuite/lib/libgomp-dg.exp	(working copy)
+@@ -57,6 +57,7 @@
+     global lang_test_file
+     global lang_library_path
+     global lang_link_flags
++    global current_target_name
+ 
+     set blddir [lookfor_file [get_multilibs] libgomp]
+ 
+@@ -130,7 +131,7 @@
+     }
+ 
+     # We use atomic operations in the testcases to validate results.
+-    if [istarget i?86-*-*] {
++    if { [istarget i?86-*-*] && [string match *-m64* $current_target_name] == -1} {
+ 	lappend ALWAYS_CFLAGS "additional_flags=-march=i486"
+     }
+     if [istarget sparc*-*-*] {
--- gcj-4.2-4.2-20070707.orig/debian/patches/alpha-ieee-doc.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/alpha-ieee-doc.dpatch
@@ -0,0 +1,44 @@
+#! /bin/sh -e
+
+# DP: #212912
+# DP: on alpha-linux, make -mieee default and add -mieee-disable switch
+# DP: to turn default off (doc patch)
+
+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 -p1 < $0
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p1 < $0
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+
+--- src/gcc/doc/invoke.texi~	2005-09-29 20:00:57.638380128 +0200
++++ src/gcc/doc/invoke.texi	2005-09-30 22:23:22.922502992 +0200
+@@ -7670,6 +7670,13 @@
+ values such as not-a-number and plus/minus infinity.  Other Alpha
+ compilers call this option @option{-ieee_with_no_inexact}.
+ 
++DEBIAN SPECIFIC: This option is on by default, unless
++@option{-ffinite-math-only} (which is part of the @option{-ffast-math}
++set) is specified, because the software functions in the GNU libc math
++libraries generate denormalized numbers, NaNs, and infs (all of which
++will cause a programs to SIGFPE when it attempts to use the results without
++@option{-mieee}).
++
+ @item -mieee-with-inexact
+ @opindex mieee-with-inexact
+ This is like @option{-mieee} except the generated code also maintains
--- gcj-4.2-4.2-20070707.orig/debian/patches/m68k-bitfield-offset.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/m68k-bitfield-offset.dpatch
@@ -0,0 +1,192 @@
+#! /bin/sh -e
+
+# All lines beginning with `# DPATCH:' are a description of the patch.
+# DP: only use constant offset for register bitfields
+# DP: (combine expects shifts, but does a rotate)
+# test case for invalid use of bitfield inst:
+#
+# #define XINT(v) (((int)(v) << 4) >> 4)
+# #define XUINT(v) (((unsigned)(v) << 4) >> 4)
+# 
+# int f(int v, int s)
+# {
+# 	return (XUINT(v) >> -XINT(s)) & 0x0fffffff;
+# }
+
+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 -p1 < $0
+        #cd ${dir}gcc && autoconf
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p1 < $0
+        #rm ${dir}gcc/configure
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+---
+
+ gcc/config/m68k/m68k.md |   62 ++++++++++++++++++++++++------------------------
+ 1 file changed, 31 insertions(+), 31 deletions(-)
+
+Index: gcc-4.1/gcc/config/m68k/m68k.md
+===================================================================
+--- gcc-4.1.orig/gcc/config/m68k/m68k.md
++++ gcc-4.1/gcc/config/m68k/m68k.md
+@@ -4991,34 +4991,34 @@
+ ;; so that its address is reloaded.
+ 
+ (define_expand "extv"
+-  [(set (match_operand:SI 0 "nonimmediate_operand" "")
++  [(set (match_operand:SI 0 "register_operand" "")
+ 	(sign_extract:SI (match_operand:SI 1 "general_operand" "")
+-			 (match_operand:SI 2 "general_operand" "")
+-			 (match_operand:SI 3 "general_operand" "")))]
++			 (match_operand:SI 2 "const_int_operand" "")
++			 (match_operand:SI 3 "const_int_operand" "")))]
+   "TARGET_68020 && TARGET_BITFIELD"
+   "")
+ 
+ (define_insn ""
+-  [(set (match_operand:SI 0 "nonimmediate_operand" "=d")
++  [(set (match_operand:SI 0 "register_operand" "=d")
+ 	(sign_extract:SI (match_operand:QI 1 "memory_operand" "o")
+-			 (match_operand:SI 2 "general_operand" "dn")
+-			 (match_operand:SI 3 "general_operand" "dn")))]
++			 (match_operand:SI 2 "nonmemory_operand" "dn")
++			 (match_operand:SI 3 "nonmemory_operand" "dn")))]
+   "TARGET_68020 && TARGET_BITFIELD"
+   "bfexts %1{%b3:%b2},%0")
+ 
+ (define_expand "extzv"
+-  [(set (match_operand:SI 0 "nonimmediate_operand" "")
++  [(set (match_operand:SI 0 "register_operand" "")
+ 	(zero_extract:SI (match_operand:SI 1 "general_operand" "")
+-			 (match_operand:SI 2 "general_operand" "")
+-			 (match_operand:SI 3 "general_operand" "")))]
++			 (match_operand:SI 2 "const_int_operand" "")
++			 (match_operand:SI 3 "const_int_operand" "")))]
+   "TARGET_68020 && TARGET_BITFIELD"
+   "")
+ 
+ (define_insn ""
+-  [(set (match_operand:SI 0 "nonimmediate_operand" "=d,d")
+-	(zero_extract:SI (match_operand:QI 1 "memory_operand" "o,d")
+-			 (match_operand:SI 2 "general_operand" "dn,dn")
+-			 (match_operand:SI 3 "general_operand" "dn,dn")))]
++  [(set (match_operand:SI 0 "register_operand" "=d")
++	(zero_extract:SI (match_operand:QI 1 "memory_operand" "o")
++			 (match_operand:SI 2 "nonmemory_operand" "dn")
++			 (match_operand:SI 3 "nonmemory_operand" "dn")))]
+   "TARGET_68020 && TARGET_BITFIELD"
+ {
+   if (GET_CODE (operands[2]) == CONST_INT)
+@@ -5035,8 +5035,8 @@
+ 
+ (define_insn ""
+   [(set (zero_extract:SI (match_operand:QI 0 "memory_operand" "+o")
+-			 (match_operand:SI 1 "general_operand" "dn")
+-			 (match_operand:SI 2 "general_operand" "dn"))
++			 (match_operand:SI 1 "nonmemory_operand" "dn")
++			 (match_operand:SI 2 "nonmemory_operand" "dn"))
+         (xor:SI (zero_extract:SI (match_dup 0) (match_dup 1) (match_dup 2))
+ 		(match_operand 3 "const_int_operand" "n")))]
+   "TARGET_68020 && TARGET_BITFIELD
+@@ -5050,8 +5050,8 @@
+ 
+ (define_insn ""
+   [(set (zero_extract:SI (match_operand:QI 0 "memory_operand" "+o")
+-			 (match_operand:SI 1 "general_operand" "dn")
+-			 (match_operand:SI 2 "general_operand" "dn"))
++			 (match_operand:SI 1 "nonmemory_operand" "dn")
++			 (match_operand:SI 2 "nonmemory_operand" "dn"))
+ 	(const_int 0))]
+   "TARGET_68020 && TARGET_BITFIELD"
+ {
+@@ -5072,16 +5072,16 @@
+ 
+ (define_expand "insv"
+   [(set (zero_extract:SI (match_operand:SI 0 "nonimmediate_operand" "")
+-			 (match_operand:SI 1 "general_operand" "")
+-			 (match_operand:SI 2 "general_operand" ""))
++			 (match_operand:SI 1 "const_int_operand" "")
++			 (match_operand:SI 2 "const_int_operand" ""))
+ 	(match_operand:SI 3 "register_operand" ""))]
+   "TARGET_68020 && TARGET_BITFIELD"
+   "")
+ 
+ (define_insn ""
+   [(set (zero_extract:SI (match_operand:QI 0 "memory_operand" "+o")
+-			 (match_operand:SI 1 "general_operand" "dn")
+-			 (match_operand:SI 2 "general_operand" "dn"))
++			 (match_operand:SI 1 "nonmemory_operand" "dn")
++			 (match_operand:SI 2 "nonmemory_operand" "dn"))
+ 	(match_operand:SI 3 "register_operand" "d"))]
+   "TARGET_68020 && TARGET_BITFIELD"
+   "bfins %3,%0{%b2:%b1}")
+@@ -5092,16 +5092,16 @@
+ (define_insn ""
+   [(set (match_operand:SI 0 "nonimmediate_operand" "=d")
+ 	(sign_extract:SI (match_operand:SI 1 "register_operand" "d")
+-			 (match_operand:SI 2 "general_operand" "dn")
+-			 (match_operand:SI 3 "general_operand" "dn")))]
++			 (match_operand:SI 2 "const_int_operand" "n")
++			 (match_operand:SI 3 "const_int_operand" "n")))]
+   "TARGET_68020 && TARGET_BITFIELD"
+   "bfexts %1{%b3:%b2},%0")
+ 
+ (define_insn ""
+   [(set (match_operand:SI 0 "nonimmediate_operand" "=d")
+ 	(zero_extract:SI (match_operand:SI 1 "register_operand" "d")
+-			 (match_operand:SI 2 "general_operand" "dn")
+-			 (match_operand:SI 3 "general_operand" "dn")))]
++			 (match_operand:SI 2 "const_int_operand" "n")
++			 (match_operand:SI 3 "const_int_operand" "n")))]
+   "TARGET_68020 && TARGET_BITFIELD"
+ {
+   if (GET_CODE (operands[2]) == CONST_INT)
+@@ -5118,8 +5118,8 @@
+ 
+ (define_insn ""
+   [(set (zero_extract:SI (match_operand:SI 0 "register_operand" "+d")
+-			 (match_operand:SI 1 "general_operand" "dn")
+-			 (match_operand:SI 2 "general_operand" "dn"))
++			 (match_operand:SI 1 "const_int_operand" "n")
++			 (match_operand:SI 2 "const_int_operand" "n"))
+ 	(const_int 0))]
+   "TARGET_68020 && TARGET_BITFIELD"
+ {
+@@ -5129,8 +5129,8 @@
+ 
+ (define_insn ""
+   [(set (zero_extract:SI (match_operand:SI 0 "register_operand" "+d")
+-			 (match_operand:SI 1 "general_operand" "dn")
+-			 (match_operand:SI 2 "general_operand" "dn"))
++			 (match_operand:SI 1 "const_int_operand" "n")
++			 (match_operand:SI 2 "const_int_operand" "n"))
+ 	(const_int -1))]
+   "TARGET_68020 && TARGET_BITFIELD"
+ {
+@@ -5140,8 +5140,8 @@
+ 
+ (define_insn ""
+   [(set (zero_extract:SI (match_operand:SI 0 "register_operand" "+d")
+-			 (match_operand:SI 1 "general_operand" "dn")
+-			 (match_operand:SI 2 "general_operand" "dn"))
++			 (match_operand:SI 1 "const_int_operand" "n")
++			 (match_operand:SI 2 "const_int_operand" "n"))
+ 	(match_operand:SI 3 "register_operand" "d"))]
+   "TARGET_68020 && TARGET_BITFIELD"
+ {
--- gcj-4.2-4.2-20070707.orig/debian/patches/m68k-dwarf.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/m68k-dwarf.dpatch
@@ -0,0 +1,76 @@
+#! /bin/sh -e
+
+# All lines beginning with `# DPATCH:' are a description of the patch.
+# DP: correct the dwarf frame information, but preserve compatibility
+
+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 -p1 < $0
+        #cd ${dir}gcc && autoconf
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p1 < $0
+        #rm ${dir}gcc/configure
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+# append the patch here and adjust the -p? flag in the patch calls.
+
+---
+ gcc/config/m68k/m68k.c |    4 ++++
+ gcc/config/m68k/m68k.h |    9 ++++++++-
+ 2 files changed, 12 insertions(+), 1 deletion(-)
+
+Index: gcc-4.1/gcc/config/m68k/m68k.c
+===================================================================
+--- gcc-4.1.orig/gcc/config/m68k/m68k.c
++++ gcc-4.1/gcc/config/m68k/m68k.c
+@@ -3390,5 +3390,9 @@ m68k_regno_mode_ok (int regno, enum mach
+ 	    && GET_MODE_UNIT_SIZE (mode) <= 12)
+ 	  return true;
+     }
++  else if (regno == 24)
++    {
++      return GET_MODE_SIZE (mode) == 4;
++    }
+   return false;
+ }
+Index: gcc-4.1/gcc/config/m68k/m68k.h
+===================================================================
+--- gcc-4.1.orig/gcc/config/m68k/m68k.h
++++ gcc-4.1/gcc/config/m68k/m68k.h
+@@ -174,6 +174,13 @@ Boston, MA 02110-1301, USA.  */
+    register elimination.  */
+ #define FIRST_PSEUDO_REGISTER 25
+ 
++/* Number of hardware registers that go into the DWARF-2 unwind info. This
++   should be 24, but to prevent compability problems leave it at 25.  */
++#define DWARF_FRAME_REGISTERS 25
++
++#define DWARF_FRAME_RETURN_COLUMN 24
++#define DWARF_ALT_FRAME_RETURN_COLUMN 25
++
+ /* All m68k targets (except AmigaOS) use %a5 as the PIC register  */
+ #define PIC_OFFSET_TABLE_REGNUM (flag_pic ? 13 : INVALID_REGNUM)
+ 
+@@ -251,7 +258,7 @@ Boston, MA 02110-1301, USA.  */
+    for the 68881 registers, a single register is always enough for
+    anything that can be stored in them at all.  */
+ #define HARD_REGNO_NREGS(REGNO, MODE)   \
+-  ((REGNO) >= 16 ? GET_MODE_NUNITS (MODE)	\
++  ((REGNO) >= 16 && (REGNO) <= 23 ? GET_MODE_NUNITS (MODE)	\
+    : ((GET_MODE_SIZE (MODE) + UNITS_PER_WORD - 1) / UNITS_PER_WORD))
+ 
+ /* A C expression that is nonzero if hard register NEW_REG can be
--- gcj-4.2-4.2-20070707.orig/debian/patches/libjava-lib32-properties.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/libjava-lib32-properties.dpatch
@@ -0,0 +1,85 @@
+#! /bin/sh -e
+
+# DP: - When running the i386 binaries on amd64, adjust the properties
+# DP:   java.home, gnu.classpath.home.url, sun.boot.class.path,
+# DP:   gnu.gcj.precompiled.db.path.
+
+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 && autoconf
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
+	rm -f ${dir}libjava/configure
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+--- libjava/gnu/classpath/natSystemProperties.cc.orig	2006-09-10 14:07:47.130718000 +0200
++++ libjava/gnu/classpath/natSystemProperties.cc	2006-09-10 16:30:31.640718000 +0200
+@@ -209,6 +209,18 @@
+   // part we do this because most people specify only --prefix and
+   // nothing else when installing gcj.  Plus, people are free to
+   // redefine `java.home' with `-D' if necessary.
++  struct utsname u;
++#if defined(__linux__) && defined (__i386__)
++  uname (&u);
++  if (! strcmp ("x86_64", u.machine))
++    {
++      SET ("java.home", "/usr/lib32/jvm/java-1.5.0-gcj-4.2-1.5.0.0/jre");
++      SET ("gnu.classpath.home", "/usr");
++      SET ("gnu.classpath.home.url", "file:///usr/lib/../lib32");
++    }
++  else
++#endif
++    {
+   SET ("java.home", JAVA_HOME);
+   SET ("gnu.classpath.home", PREFIX);
+   // This is set to $(toolexeclibdir) because we use this to find
+@@ -217,11 +229,11 @@
+   strcpy (val2, "file://");
+   strcat (val2, TOOLEXECLIBDIR);
+   SET ("gnu.classpath.home.url", val2);
++    }
+ 
+   SET ("file.encoding", default_file_encoding);
+ 
+ #ifdef HAVE_UNAME
+-  struct utsname u;
+   if (! uname (&u))
+     {
+       SET ("os.name", u.sysname);
+@@ -348,11 +360,21 @@
+   // without overriding java.endorsed.dirs.
+   SET ("gnu.gcj.runtime.endorsed.dirs", GCJ_ENDORSED_DIRS);
+ 
++#if defined(__linux__) && defined (__i386__)
++  if (! strcmp ("x86_64", u.machine))
++    {
++      SET ("sun.boot.class.path", "/usr/lib32/jvm/java-1.5.0-gcj-4.2-1.5.0.0/jre/lib/rt.jar");
++      SET ("gnu.gcj.precompiled.db.path", "/var/lib32/gcj-4.2/classmap.db");
++    }
++  else
++#endif
++    {
+   // The path to libgcj's boot classes
+   SET ("sun.boot.class.path", BOOT_CLASS_PATH);
+ 
+   // If there is a default system database, set it.
+   SET ("gnu.gcj.precompiled.db.path", LIBGCJ_DEFAULT_DATABASE);
++    }
+ 
+   // Set some properties according to whatever was compiled in with
+   // `-D'.  Important: after this point, the only properties that
--- gcj-4.2-4.2-20070707.orig/debian/patches/m68k-autoinc.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/m68k-autoinc.dpatch
@@ -0,0 +1,160 @@
+#! /bin/sh -e
+
+# All lines beginning with `# DPATCH:' are a description of the patch.
+# DP: recognize a few more autoinc possibilities
+
+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 -p1 < $0
+        #cd ${dir}gcc && autoconf
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p1 < $0
+        #rm ${dir}gcc/configure
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+# append the patch here and adjust the -p? flag in the patch calls.
+
+---
+ gcc/flow.c |   55 +++++++++++++++++++++++++++++++++++++++++++++----------
+ 1 file changed, 45 insertions(+), 10 deletions(-)
+
+Index: gcc-4.1/gcc/flow.c
+===================================================================
+--- gcc-4.1.orig/gcc/flow.c
++++ gcc-4.1/gcc/flow.c
+@@ -1766,7 +1766,6 @@ propagate_one_insn (struct propagate_blo
+ 	&& REG_P (SET_DEST (x))
+ 	&& (GET_CODE (SET_SRC (x)) == PLUS
+ 	    || GET_CODE (SET_SRC (x)) == MINUS)
+-	&& XEXP (SET_SRC (x), 0) == SET_DEST (x)
+ 	&& GET_CODE (XEXP (SET_SRC (x), 1)) == CONST_INT
+ 	/* Ok, look for a following memory ref we can combine with.
+ 	   If one is found, change the memory ref to a PRE_INC
+@@ -3428,13 +3427,25 @@ attempt_auto_inc (struct propagate_block
+   rtx set = single_set (incr);
+   rtx q = SET_DEST (set);
+   rtx y = SET_SRC (set);
+-  int opnum = XEXP (y, 0) == incr_reg ? 0 : 1;
++  rtx *loc = &SET_SRC (set);
+   int changed;
+ 
+   /* Make sure this reg appears only once in this insn.  */
+   if (count_occurrences (PATTERN (insn), incr_reg, 1) != 1)
+     return;
+ 
++  if (GET_CODE (y) != PLUS)
++    {
++      if (MEM_P (y) && GET_CODE (XEXP (y, 0)) == PLUS)
++	loc = &XEXP (y, 0);
++      else if (MEM_P (q) && GET_CODE (XEXP (q, 0)) == PLUS)
++	loc = &XEXP (q, 0);
++      else
++	abort();
++      y = *loc;
++      q = NULL_RTX;
++    }
++
+   if (dead_or_set_p (incr, incr_reg)
+       /* Mustn't autoinc an eliminable register.  */
+       && (regno >= FIRST_PSEUDO_REGISTER
+@@ -3446,7 +3457,7 @@ attempt_auto_inc (struct propagate_block
+       if (! validate_change (insn, &XEXP (mem, 0), inc, 0))
+ 	return;
+     }
+-  else if (REG_P (q)
++  else if (q && REG_P (q)
+ 	   /* PREV_INSN used here to check the semi-open interval
+ 	      [insn,incr).  */
+ 	   && ! reg_used_between_p (q,  PREV_INSN (insn), incr)
+@@ -3461,6 +3472,7 @@ attempt_auto_inc (struct propagate_block
+ 	 Change it to q = p, ...*q..., q = q+size.
+ 	 Then fall into the usual case.  */
+       rtx insns, temp;
++      int opnum = XEXP (y, 0) == incr_reg ? 0 : 1;
+ 
+       start_sequence ();
+       emit_move_insn (q, incr_reg);
+@@ -3533,13 +3545,13 @@ attempt_auto_inc (struct propagate_block
+ 
+   /* Modify the old increment-insn to simply copy
+      the already-incremented value of our register.  */
+-  changed = validate_change (incr, &SET_SRC (set), incr_reg, 0);
++  changed = validate_change (incr, loc, incr_reg, 0);
+   gcc_assert (changed);
+ 
+   /* If that makes it a no-op (copying the register into itself) delete
+      it so it won't appear to be a "use" and a "set" of this
+      register.  */
+-  if (REGNO (SET_DEST (set)) == REGNO (incr_reg))
++  if (q && REGNO (q) == REGNO (incr_reg))
+     {
+       /* If the original source was dead, it's dead now.  */
+       rtx note;
+@@ -3613,7 +3625,22 @@ find_auto_inc (struct propagate_block_in
+   y = SET_SRC (set);
+ 
+   if (GET_CODE (y) != PLUS)
+-    return;
++    {
++      if (MEM_P (y) && GET_CODE (XEXP (y, 0)) == PLUS)
++	{
++	  if (reg_overlap_mentioned_p (addr, SET_DEST (set)))
++	    return;
++	  y = XEXP (y, 0);
++	}
++      else
++	{
++	  y = SET_DEST (set);
++	  if (!MEM_P (y) || GET_CODE (XEXP (y, 0)) != PLUS
++	      || reg_overlap_mentioned_p (addr, SET_SRC (set)))
++	    return;
++	  y = XEXP (y, 0);
++	}
++    }
+ 
+   if (REG_P (XEXP (y, 0)) && REGNO (XEXP (y, 0)) == REGNO (addr))
+     inc_val = XEXP (y, 1);
+@@ -4172,10 +4199,6 @@ try_pre_increment_1 (struct propagate_bl
+       && ! dead_or_set_p (y, SET_DEST (x))
+       && try_pre_increment (y, SET_DEST (x), amount))
+     {
+-      /* We have found a suitable auto-increment and already changed
+-	 insn Y to do it.  So flush this increment instruction.  */
+-      propagate_block_delete_insn (insn);
+-
+       /* Count a reference to this reg for the increment insn we are
+ 	 deleting.  When a reg is incremented, spilling it is worse,
+ 	 so we want to make that less likely.  */
+@@ -4185,6 +4208,18 @@ try_pre_increment_1 (struct propagate_bl
+ 	  REG_N_SETS (regno)++;
+ 	}
+ 
++      if (XEXP (SET_SRC (x), 0) != SET_DEST (x))
++	{
++	  int change;
++	  change = validate_change (insn, &SET_SRC (x), XEXP (SET_SRC (x), 0), 0);
++	  gcc_assert(change);
++	  return 0;
++	}
++
++      /* We have found a suitable auto-increment and already changed
++	 insn Y to do it.  So flush this increment instruction.  */
++      propagate_block_delete_insn (insn);
++
+       /* Flush any remembered memories depending on the value of
+ 	 the incremented register.  */
+       invalidate_mems_from_set (pbi, SET_DEST (x));
--- gcj-4.2-4.2-20070707.orig/debian/patches/libjava-rpath.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/libjava-rpath.dpatch
@@ -0,0 +1,67 @@
+#! /bin/sh -e
+
+# DP: - Link ecjx and gij with -rpath $(dbexecdir)
+
+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 && autoconf
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
+	#rm -f ${dir}libjava/configure
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+--- libjava/Makefile.am~	2007-03-04 18:50:01.000000000 +0100
++++ libjava/Makefile.am	2007-03-04 19:19:32.000000000 +0100
+@@ -653,7 +653,7 @@
+ ## We need -nodefaultlibs because we want to avoid gcj's `-lgcj'.  We
+ ## need this because we are explicitly using libtool to link using the
+ ## `.la' file.
+-gij_LDFLAGS = -rpath $(dbexecdir) -rpath $(toolexeclibdir) \
++gij_LDFLAGS = -rpath $(dbexecdir) \
+ 	-shared-libgcc $(THREADLDFLAGS)
+ gij_LINK = $(GCJLINK)
+ ## See jv_convert_LDADD.
+@@ -683,7 +683,7 @@
+ ecjx_LDFLAGS = $(ECJX_BASE_FLAGS) $(ECJ_BUILD_JAR)
+ endif !ENABLE_SHARED
+ 
+-ecjx_LDADD = -L$(here)/.libs libgcj.la
++ecjx_LDADD = -L$(here)/.libs libgcj.la -rpath $(dbexecdir)
+ ecjx_DEPENDENCIES = libgcj.la libgcj.spec
+ 
+ else !NATIVE
+--- libjava/Makefile.in~	2007-03-04 18:50:01.000000000 +0100
++++ libjava/Makefile.in	2007-03-04 19:21:22.000000000 +0100
+@@ -7771,7 +7771,7 @@
+ gcj_dbtool_LDADD = gnu/gcj/tools/gcj_dbtool.lo -L$(here)/.libs libgcj.la
+ gcj_dbtool_DEPENDENCIES = gnu/gcj/tools/gcj_dbtool.lo libgcj.la libgcj.spec
+ gij_SOURCES = 
+-gij_LDFLAGS = -rpath $(dbexecdir) -rpath $(toolexeclibdir) \
++gij_LDFLAGS = -rpath $(dbexecdir) \
+ 	-shared-libgcc $(THREADLDFLAGS)
+ 
+ gij_LINK = $(GCJLINK)
+@@ -7787,7 +7787,7 @@
+ @ENABLE_SHARED_TRUE@@NATIVE_TRUE@ecjx_LDFLAGS = $(ECJX_BASE_FLAGS) -Djava.class.path=$(ECJ_JAR)
+ @NATIVE_FALSE@ecjx_LDFLAGS = $(ECJX_BASE_FLAGS) $(ECJ_BUILD_JAR)
+ @NATIVE_FALSE@ecjx_LDADD = 
+-@NATIVE_TRUE@ecjx_LDADD = -L$(here)/.libs libgcj.la
++@NATIVE_TRUE@ecjx_LDADD = -L$(here)/.libs libgcj.la -rpath $(dbexecdir)
+ @NATIVE_FALSE@ecjx_DEPENDENCIES = 
+ @NATIVE_TRUE@ecjx_DEPENDENCIES = libgcj.la libgcj.spec
+ gappletviewer_SOURCES = 
--- gcj-4.2-4.2-20070707.orig/debian/patches/libjava-biarch-alsa.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/libjava-biarch-alsa.dpatch
@@ -0,0 +1,48 @@
+#! /bin/sh -e
+
+# DP: Fix linking with the correct biarch asound library
+
+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 && automake
+        ;;
+    -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
+
+--- libjava/classpath/native/jni/midi-alsa/Makefile.am~	2007-06-05 12:23:54.000000000 +0200
++++ libjava/classpath/native/jni/midi-alsa/Makefile.am	2007-06-05 12:25:09.000000000 +0200
+@@ -4,7 +4,7 @@
+ gnu_javax_sound_midi_alsa_AlsaPortDevice.c \
+ gnu_javax_sound_midi_alsa_AlsaMidiDeviceProvider.c
+ 
+-libgjsmalsa_la_LIBADD = -lasound
++libgjsmalsa_la_LIBADD = `case "$(CC)" in *-m64*) echo -L/usr/lib64;; *-m32*) echo -L/usr/lib32; esac` -lasound
+ libgjsmalsa_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version
+ 
+ AM_LDFLAGS = @CLASSPATH_MODULE@
+--- libjava/classpath/native/jni/midi-alsa/Makefile.in~	2007-06-05 12:23:54.000000000 +0200
++++ libjava/classpath/native/jni/midi-alsa/Makefile.in	2007-06-05 12:25:19.000000000 +0200
+@@ -326,7 +326,7 @@
+ gnu_javax_sound_midi_alsa_AlsaPortDevice.c \
+ gnu_javax_sound_midi_alsa_AlsaMidiDeviceProvider.c
+ 
+-libgjsmalsa_la_LIBADD = -lasound
++libgjsmalsa_la_LIBADD = `case "$(CC)" in *-m64*) echo -L/usr/lib64;; *-m32*) echo -L/usr/lib32; esac` -lasound
+ libgjsmalsa_la_LDFLAGS = $(AM_LDFLAGS) -avoid-version
+ AM_LDFLAGS = @CLASSPATH_MODULE@
+ AM_CPPFLAGS = @CLASSPATH_INCLUDES@ `pkg-config  --cflags-only-I alsa`
--- gcj-4.2-4.2-20070707.orig/debian/patches/libstdc++-doclink.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/libstdc++-doclink.dpatch
@@ -0,0 +1,47 @@
+#! /bin/sh -e
+
+# DP: adjust hrefs to point to the local documentation
+
+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
+
+--- libstdc++-v3/docs/doxygen/mainpage.html.orig	2006-12-11 11:49:36.056229000 +0100
++++ libstdc++-v3/docs/doxygen/mainpage.html	2006-12-11 11:50:32.936229000 +0100
+@@ -30,8 +30,8 @@
+ <p>There are two types of documentation for libstdc++.  One is the
+    distribution documentation, which can be read online at
+    <a href="http://gcc.gnu.org/onlinedocs/libstdc++/documentation.html">http://gcc.gnu.org/onlinedocs/libstdc++/documentation.html</a>
+-   or offline from docs/html/documentation.html in the library source
+-   directory.
++   or offline from
++   <a href="/usr/share/doc/gcc-4.2/libstdc++/html/documentation.html">/usr/share/doc/gcc-4.2/libstdc++/html/documentation.html</a>.
+ </p>
+ 
+ <p>The other type is the source documentation, of which this is the first page.
+@@ -75,7 +75,7 @@
+ 
+ <h2>License, Copyright, and Other Lawyerly Verbosity</h2>
+ <p>The libstdc++ documentation is released under
+-   <a href="http://gcc.gnu.org/onlinedocs/libstdc++/17_intro/license.html">
++   <a href="../17_intro/license.html">
+    these terms</a>.
+ </p>
+ <p>Part of the generated documentation involved comments and notes from
--- gcj-4.2-4.2-20070707.orig/debian/patches/m68k-split_shift.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/m68k-split_shift.dpatch
@@ -0,0 +1,730 @@
+#! /bin/sh -e
+
+# All lines beginning with `# DPATCH:' are a description of the patch.
+# DP: use correct predicates for long long shifts and use more splits
+# DP: fixes 381572
+
+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 -p1 < $0
+        #cd ${dir}gcc && autoconf
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p1 < $0
+        #rm ${dir}gcc/configure
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+# append the patch here and adjust the -p? flag in the patch calls.
+
+---
+ gcc/config/m68k/m68k-protos.h |    3 
+ gcc/config/m68k/m68k.c        |   26 ++
+ gcc/config/m68k/m68k.md       |  546 +++++++++++++++++++++++++++++++-----------
+ 3 files changed, 437 insertions(+), 138 deletions(-)
+
+Index: gcc-4.1/gcc/config/m68k/m68k-protos.h
+===================================================================
+--- gcc-4.1.orig/gcc/config/m68k/m68k-protos.h
++++ gcc-4.1/gcc/config/m68k/m68k-protos.h
+@@ -22,6 +22,9 @@ Boston, MA 02110-1301, USA.  */
+ 
+ #ifdef RTX_CODE
+ extern HOST_WIDE_INT m68k_initial_elimination_offset (int from, int to);
++
++extern void split_di (rtx[], int, rtx[], rtx[]);
++
+ extern const char *output_move_const_into_data_reg (rtx *);
+ extern int valid_mov3q_const (rtx);
+ extern const char *output_move_simode_const (rtx *);
+Index: gcc-4.1/gcc/config/m68k/m68k.c
+===================================================================
+--- gcc-4.1.orig/gcc/config/m68k/m68k.c
++++ gcc-4.1/gcc/config/m68k/m68k.c
+@@ -2243,6 +2243,32 @@ output_move_double (rtx *operands)
+   return "";
+ }
+ 
++void
++split_di (rtx operands[], int num, rtx lo_half[], rtx hi_half[])
++{
++  while (num--)
++    {
++      rtx op = operands[num];
++
++      /* simplify_subreg refuse to split volatile memory addresses,
++	 but we still have to handle it.  */
++      if (GET_CODE (op) == MEM)
++	{
++	  lo_half[num] = adjust_address (op, SImode, 4);
++	  hi_half[num] = adjust_address (op, SImode, 0);
++	}
++      else
++	{
++	  lo_half[num] = simplify_gen_subreg (SImode, op,
++					      GET_MODE (op) == VOIDmode
++					      ? DImode : GET_MODE (op), 4);
++	  hi_half[num] = simplify_gen_subreg (SImode, op,
++					      GET_MODE (op) == VOIDmode
++					      ? DImode : GET_MODE (op), 0);
++	}
++    }
++}
++
+ /* Return a REG that occurs in ADDR with coefficient 1.
+    ADDR can be effectively incremented by incrementing REG.  */
+ 
+Index: gcc-4.1/gcc/config/m68k/m68k.md
+===================================================================
+--- gcc-4.1.orig/gcc/config/m68k/m68k.md
++++ gcc-4.1/gcc/config/m68k/m68k.md
+@@ -3881,69 +3881,168 @@
+     return "move%.w %1,%0\;sub%.l %R0,%R0";
+ })
+ 
+-(define_insn "ashldi_const32"
+-  [(set (match_operand:DI 0 "nonimmediate_operand" "=rm")
+-	(ashift:DI (match_operand:DI 1 "general_operand" "ro")
+-		     (const_int 32)))]
+-  ""
++(define_insn "*ashldi3_const1"
++  [(set (match_operand:DI 0 "register_operand" "=d")
++	(ashift:DI (match_operand:DI 1 "register_operand" "0")
++		   (const_int 1)))]
++  "!TARGET_COLDFIRE"
++  "add%.l %R0,%R0\;addx%.l %0,%0")
++
++(define_split
++  [(set (match_operand:DI 0 "register_operand" "")
++	(ashift:DI (match_operand:DI 1 "register_operand" "")
++		   (const_int 2)))]
++  "reload_completed && !TARGET_COLDFIRE"
++  [(set (match_dup 0)
++	(ashift:DI (match_dup 1) (const_int 1)))
++   (set (match_dup 0)
++	(ashift:DI (match_dup 0) (const_int 1)))]
++  "")
++
++(define_split
++  [(set (match_operand:DI 0 "register_operand" "")
++	(ashift:DI (match_operand:DI 1 "register_operand" "")
++		   (const_int 3)))]
++  "reload_completed && !TARGET_COLDFIRE"
++  [(set (match_dup 0)
++	(ashift:DI (match_dup 1) (const_int 2)))
++   (set (match_dup 0)
++	(ashift:DI (match_dup 0) (const_int 1)))]
++  "")
++
++(define_split
++  [(set (match_operand:DI 0 "register_operand" "")
++	(ashift:DI (match_operand:DI 1 "register_operand" "")
++		   (const_int 8)))]
++  "reload_completed && !TARGET_COLDFIRE"
++  [(set (match_dup 2)
++	(rotate:SI (match_dup 2) (const_int 8)))
++   (set (match_dup 3)
++	(rotate:SI (match_dup 3) (const_int 8)))
++   (set (strict_low_part (subreg:QI (match_dup 0) 3))
++	(subreg:QI (match_dup 0) 7))
++   (set (strict_low_part (subreg:QI (match_dup 0) 7))
++	(const_int 0))]
+ {
+-  CC_STATUS_INIT;
+-  if (GET_CODE (operands[1]) == REG)
+-    operands[3] = gen_rtx_REG (SImode, REGNO (operands[1]) + 1);
+-  else
+-    operands[3] = adjust_address (operands[1], SImode, 4);
+-  if (GET_CODE (operands[0]) == REG)
+-    operands[2] = gen_rtx_REG (SImode, REGNO (operands[0]) + 1);
+-  else if (GET_CODE (XEXP (operands[0], 0)) == PRE_DEC)
+-    return "clr%.l %0\;move%.l %3,%0";
+-  else if (GET_CODE (XEXP (operands[0], 0)) == POST_INC)
+-    return "move%.l %3,%0\;clr%.l %0";
+-  else
+-    operands[2] = adjust_address (operands[0], SImode, 4);
+-  if (ADDRESS_REG_P (operands[2]))
+-    return "move%.l %3,%0\;sub%.l %2,%2";
+-  else
+-    return "move%.l %3,%0\;clr%.l %2";
+-})
+-
+-;; The predicate below must be general_operand, because ashldi3 allows that
+-(define_insn "ashldi_const"
+-  [(set (match_operand:DI 0 "nonimmediate_operand" "=d")
+-	(ashift:DI (match_operand:DI 1 "general_operand" "0")
+-		     (match_operand 2 "const_int_operand" "n")))]
+-  "(!TARGET_COLDFIRE
+-    && ((INTVAL (operands[2]) >= 1 && INTVAL (operands[2]) <= 3)
+-	|| INTVAL (operands[2]) == 8 || INTVAL (operands[2]) == 16
+-	|| (INTVAL (operands[2]) > 32 && INTVAL (operands[2]) <= 63)))"
++  operands[2] = gen_highpart (SImode, operands[0]);
++  operands[3] = gen_lowpart (SImode, operands[0]);
++})
++
++(define_split
++  [(set (match_operand:DI 0 "register_operand" "")
++	(ashift:DI (match_operand:DI 1 "register_operand" "")
++		   (const_int 16)))]
++  "reload_completed && !TARGET_COLDFIRE"
++  [(set (match_dup 2)
++	(rotate:SI (match_dup 2) (const_int 16)))
++   (set (match_dup 3)
++	(rotate:SI (match_dup 3) (const_int 16)))
++   (set (strict_low_part (subreg:HI (match_dup 0) 2))
++	(subreg:HI (match_dup 0) 6))
++   (set (strict_low_part (subreg:HI (match_dup 0) 6))
++	(const_int 0))]
+ {
+-  operands[1] = gen_rtx_REG (SImode, REGNO (operands[0]) + 1);
+-  if (INTVAL (operands[2]) == 1)
+-    return "add%.l %1,%1\;addx%.l %0,%0";
+-  else if (INTVAL (operands[2]) == 8)
+-    return "rol%.l #8,%1\;rol%.l #8,%0\;move%.b %1,%0\;clr%.b %1";
+-  else if (INTVAL (operands[2]) == 16)
+-    return "swap %1\;swap %0\;move%.w %1,%0\;clr%.w %1";
+-  else if (INTVAL (operands[2]) == 48)
+-    return "mov%.l %1,%0\;swap %0\;clr%.l %1\;clr%.w %0";
+-  else if (INTVAL (operands[2]) == 2)
+-    return "add%.l %1,%1\;addx%.l %0,%0\;add%.l %1,%1\;addx%.l %0,%0";
+-  else if (INTVAL (operands[2]) == 3)
+-    return "add%.l %1,%1\;addx%.l %0,%0\;add%.l %1,%1\;addx%.l %0,%0\;add%.l %1,%1\;addx%.l %0,%0";
+-  else /* 32 < INTVAL (operands[2]) <= 63 */
+-    {
+-      operands[2] = GEN_INT (INTVAL (operands[2]) - 32);
+-      output_asm_insn (INTVAL (operands[2]) <= 8 ? "asl%.l %2,%1" :
+-			"moveq %2,%0\;asl%.l %0,%1", operands);
+-      return "mov%.l %1,%0\;moveq #0,%1";
+-    }
++  operands[2] = gen_highpart (SImode, operands[0]);
++  operands[3] = gen_lowpart (SImode, operands[0]);
+ })
+ 
++(define_split
++  [(set (match_operand:DI 0 "pre_dec_operand" "")
++	(ashift:DI (match_operand:DI 1 "nonimmediate_operand" "")
++		   (const_int 32)))]
++  "reload_completed"
++  [(set (match_dup 0) (const_int 0))
++   (set (match_dup 0) (match_dup 1))]
++{
++  operands[0] = adjust_address(operands[0], SImode, 0);
++  operands[1] = gen_lowpart(SImode, operands[1]);
++})
++
++(define_split
++  [(set (match_operand:DI 0 "post_inc_operand" "")
++	(ashift:DI (match_operand:DI 1 "nonimmediate_operand" "")
++		   (const_int 32)))]
++  "reload_completed"
++  [(set (match_dup 0) (match_dup 1))
++   (set (match_dup 0) (const_int 0))]
++{
++  operands[0] = adjust_address(operands[0], SImode, 0);
++  operands[1] = gen_lowpart(SImode, operands[1]);
++})
++
++(define_insn_and_split "*ashldi3_const32"
++  [(set (match_operand:DI 0 "nonimmediate_operand" "=ro<>")
++	(ashift:DI (match_operand:DI 1 "nonimmediate_operand" "ro")
++		   (const_int 32)))]
++  ""
++  "#"
++  "&& reload_completed"
++  [(set (match_dup 4) (match_dup 3))
++   (set (match_dup 2) (const_int 0))]
++  "split_di(operands, 2, operands + 2, operands + 4);")
++
++(define_split
++  [(set (match_operand:DI 0 "register_operand" "")
++	(ashift:DI (match_operand:DI 1 "register_operand" "")
++		   (match_operand 2 "const_int_operand" "")))]
++  "reload_completed && !TARGET_COLDFIRE
++   && INTVAL (operands[2]) > 32 && INTVAL (operands[2]) <= 40"
++  [(set (match_dup 4) (ashift:SI (match_dup 4) (match_dup 2)))
++   (set (match_dup 3) (match_dup 4))
++   (set (match_dup 4) (const_int 0))]
++{
++  operands[2] = GEN_INT (INTVAL (operands[2]) - 32);
++  operands[3] = gen_highpart (SImode, operands[0]);
++  operands[4] = gen_lowpart (SImode, operands[0]);
++})
++
++(define_split
++  [(set (match_operand:DI 0 "register_operand" "")
++	(ashift:DI (match_operand:DI 1 "register_operand" "")
++		   (const_int 48)))]
++  "reload_completed && !TARGET_COLDFIRE"
++  [(set (match_dup 2) (match_dup 3))
++   (set (match_dup 2)
++	(rotate:SI (match_dup 2) (const_int 16)))
++   (set (match_dup 3) (const_int 0))
++   (set (strict_low_part (subreg:HI (match_dup 0) 2))
++	(const_int 0))]
++{
++  operands[2] = gen_highpart (SImode, operands[0]);
++  operands[3] = gen_lowpart (SImode, operands[0]);
++})
++
++(define_split
++  [(set (match_operand:DI 0 "register_operand" "")
++	(ashift:DI (match_operand:DI 1 "register_operand" "")
++		   (match_operand 2 "const_int_operand" "")))]
++  "reload_completed && !TARGET_COLDFIRE
++   && INTVAL (operands[2]) > 40 && INTVAL (operands[2]) <= 63"
++  [(set (match_dup 3) (match_dup 2))
++   (set (match_dup 4) (ashift:SI (match_dup 4) (match_dup 3)))
++   (set (match_dup 3) (match_dup 4))
++   (set (match_dup 4) (const_int 0))]
++{
++  operands[2] = GEN_INT (INTVAL (operands[2]) - 32);
++  operands[3] = gen_highpart (SImode, operands[0]);
++  operands[4] = gen_lowpart (SImode, operands[0]);
++})
++
++(define_insn "*ashldi3"
++  [(set (match_operand:DI 0 "register_operand" "=d")
++	(ashift:DI (match_operand:DI 1 "register_operand" "0")
++		   (match_operand 2 "const_int_operand" "n")))]
++  "!TARGET_COLDFIRE
++    && ((INTVAL (operands[2]) >= 1 && INTVAL (operands[2]) <= 3)
++	|| INTVAL (operands[2]) == 8 || INTVAL (operands[2]) == 16
++	|| (INTVAL (operands[2]) > 32 && INTVAL (operands[2]) <= 63))"
++  "#")
++
+ (define_expand "ashldi3"
+-  [(set (match_operand:DI 0 "nonimmediate_operand" "")
+-	(ashift:DI (match_operand:DI 1 "general_operand" "")
+-		     (match_operand 2 "const_int_operand" "")))]
++  [(set (match_operand:DI 0 "register_operand" "")
++	(ashift:DI (match_operand:DI 1 "register_operand" "")
++		   (match_operand 2 "const_int_operand" "")))]
+   "!TARGET_COLDFIRE"
+-  "
+ {
+   /* ???  This is a named pattern like this is not allowed to FAIL based
+      on its operands.  */
+@@ -3952,7 +4051,7 @@
+ 	  && INTVAL (operands[2]) != 8 && INTVAL (operands[2]) != 16
+ 	  && (INTVAL (operands[2]) < 32 || INTVAL (operands[2]) > 63)))
+     FAIL;
+-} ")
++})
+ 
+ ;; On most 68k models, this makes faster code in a special case.
+ 
+@@ -4068,21 +4167,86 @@
+   return "move%.l %1,%0";
+ })
+ 
+-(define_insn "ashrdi_const32"
++(define_insn "*ashrdi3_const1"
++  [(set (match_operand:DI 0 "register_operand" "=d")
++	(ashiftrt:DI (match_operand:DI 1 "register_operand" "0")
++		     (const_int 1)))]
++  "!TARGET_COLDFIRE"
++{
++  operands[1] = gen_rtx_REG (SImode, REGNO (operands[0]) + 1);
++  return "asr%.l #1,%0\;roxr%.l #1,%1";
++})
++
++(define_split
++  [(set (match_operand:DI 0 "register_operand" "")
++	(ashiftrt:DI (match_operand:DI 1 "register_operand" "")
++		     (const_int 2)))]
++  "reload_completed && !TARGET_COLDFIRE"
++  [(set (match_dup 0)
++	(ashiftrt:DI (match_dup 1) (const_int 1)))
++   (set (match_dup 0)
++	(ashiftrt:DI (match_dup 0) (const_int 1)))]
++  "")
++
++(define_split
++  [(set (match_operand:DI 0 "register_operand" "")
++	(ashiftrt:DI (match_operand:DI 1 "register_operand" "")
++		     (const_int 3)))]
++  "reload_completed && !TARGET_COLDFIRE"
++  [(set (match_dup 0)
++	(ashiftrt:DI (match_dup 1) (const_int 2)))
++   (set (match_dup 0)
++	(ashiftrt:DI (match_dup 0) (const_int 1)))]
++  "")
++
++(define_split
++  [(set (match_operand:DI 0 "register_operand" "")
++	(ashiftrt:DI (match_operand:DI 1 "register_operand" "")
++		     (const_int 8)))]
++  "reload_completed && !TARGET_COLDFIRE"
++  [(set (strict_low_part (subreg:QI (match_dup 0) 7))
++	(subreg:QI (match_dup 0) 3))
++   (set (match_dup 2)
++	(ashiftrt:SI (match_dup 2) (const_int 8)))
++   (set (match_dup 3)
++	(rotatert:SI (match_dup 3) (const_int 8)))]
++{
++  operands[2] = gen_highpart (SImode, operands[0]);
++  operands[3] = gen_lowpart (SImode, operands[0]);
++})
++
++(define_split
++  [(set (match_operand:DI 0 "register_operand" "")
++	(ashiftrt:DI (match_operand:DI 1 "register_operand" "")
++		     (const_int 16)))]
++  "reload_completed && !TARGET_COLDFIRE"
++  [(set (strict_low_part (subreg:HI (match_dup 0) 6))
++	(subreg:HI (match_dup 0) 2))
++   (set (match_dup 2)
++	(rotate:SI (match_dup 2) (const_int 16)))
++   (set (match_dup 3)
++	(rotate:SI (match_dup 3) (const_int 16)))
++   (set (match_dup 2)
++	(sign_extend:SI (subreg:HI (match_dup 2) 2)))]
++{
++  operands[2] = gen_highpart (SImode, operands[0]);
++  operands[3] = gen_lowpart (SImode, operands[0]);
++})
++
++(define_insn "*ashrdi_const32"
+   [(set (match_operand:DI 0 "register_operand" "=d")
+ 	(ashiftrt:DI (match_operand:DI 1 "general_operand" "ro")
+ 		     (const_int 32)))]
+   ""
+ {
+   CC_STATUS_INIT;
+-  operands[2] = gen_rtx_REG (SImode, REGNO (operands[0]) + 1);
+   if (TARGET_68020)
+-    return "move%.l %1,%2\;smi %0\;extb%.l %0";
++    return "move%.l %1,%R0\;smi %0\;extb%.l %0";
+   else
+-    return "move%.l %1,%2\;smi %0\;ext%.w %0\;ext%.l %0";
++    return "move%.l %1,%R0\;smi %0\;ext%.w %0\;ext%.l %0";
+ })
+ 
+-(define_insn "ashrdi_const32_mem"
++(define_insn "*ashrdi_const32_mem"
+   [(set (match_operand:DI 0 "nonimmediate_operand" "=o,<")
+ 	(ashiftrt:DI (match_operand:DI 1 "general_operand" "ro,ro")
+ 		     (const_int 32)))
+@@ -4100,36 +4264,35 @@
+     return "move%.l %1,%3\;smi %2\;ext%.w %2\;ext%.l %2\;move%.l %2,%0";
+ })
+ 
++(define_split
++  [(set (match_operand:DI 0 "register_operand" "")
++	(ashiftrt:DI (match_operand:DI 1 "register_operand" "")
++		     (const_int 63)))]
++  "reload_completed && !TARGET_COLDFIRE"
++  [(set (match_dup 3)
++	(ashiftrt:SI (match_dup 3) (const_int 31)))
++   (set (match_dup 2)
++	(match_dup 3))]
++  "split_di(operands, 1, operands + 2, operands + 3);")
++
+ ;; The predicate below must be general_operand, because ashrdi3 allows that
+ (define_insn "ashrdi_const"
+-  [(set (match_operand:DI 0 "nonimmediate_operand" "=d")
+-	(ashiftrt:DI (match_operand:DI 1 "general_operand" "0")
++  [(set (match_operand:DI 0 "register_operand" "=d")
++	(ashiftrt:DI (match_operand:DI 1 "register_operand" "0")
+ 		     (match_operand 2 "const_int_operand" "n")))]
+-  "(!TARGET_COLDFIRE 
++  "!TARGET_COLDFIRE
+     && ((INTVAL (operands[2]) >= 1 && INTVAL (operands[2]) <= 3)
+ 	|| INTVAL (operands[2]) == 8 || INTVAL (operands[2]) == 16
+ 	|| INTVAL (operands[2]) == 31
+-	|| (INTVAL (operands[2]) > 32 && INTVAL (operands[2]) <= 63)))"
++	|| (INTVAL (operands[2]) > 32 && INTVAL (operands[2]) <= 63))"
+ {
+   operands[1] = gen_rtx_REG (SImode, REGNO (operands[0]) + 1);
+-  if (INTVAL (operands[2]) == 63)
+-    return "add%.l %0,%0\;subx%.l %0,%0\;move%.l %0,%1";
+   CC_STATUS_INIT;
+-  if (INTVAL (operands[2]) == 1)
+-    return "asr%.l #1,%0\;roxr%.l #1,%1";
+-  else if (INTVAL (operands[2]) == 8)
+-    return "move%.b %0,%1\;asr%.l #8,%0\;ror%.l #8,%1";
+-  else if (INTVAL (operands[2]) == 16)
+-    return "move%.w %0,%1\;swap %0\;ext%.l %0\;swap %1";
+-  else if (INTVAL (operands[2]) == 48)
++  if (INTVAL (operands[2]) == 48)
+     return "swap %0\;ext%.l %0\;move%.l %0,%1\;smi %0\;ext%.w %0";
+-  else if (INTVAL (operands[2]) == 31)
++  if (INTVAL (operands[2]) == 31)
+     return "add%.l %1,%1\;addx%.l %0,%0\;move%.l %0,%1\;subx%.l %0,%0";
+-  else if (INTVAL (operands[2]) == 2)
+-    return "asr%.l #1,%0\;roxr%.l #1,%1\;asr%.l #1,%0\;roxr%.l #1,%1";
+-  else if (INTVAL (operands[2]) == 3)
+-    return "asr%.l #1,%0\;roxr%.l #1,%1\;asr%.l #1,%0\;roxr%.l #1,%1\;asr%.l #1,%0\;roxr%.l #1,%1";
+-  else /* 32 < INTVAL (operands[2]) <= 63 */
++  if (INTVAL (operands[2]) > 32 && INTVAL (operands[2]) <= 63)
+     {
+       operands[2] = GEN_INT (INTVAL (operands[2]) - 32);
+       output_asm_insn (INTVAL (operands[2]) <= 8 ? "asr%.l %2,%0" :
+@@ -4138,14 +4301,14 @@
+       return INTVAL (operands[2]) >= 15 ? "ext%.w %d0" :
+ 	     TARGET_68020 ? "extb%.l %0" : "ext%.w %0\;ext%.l %0";
+     }
++  return "#";
+ })
+ 
+ (define_expand "ashrdi3"
+-  [(set (match_operand:DI 0 "nonimmediate_operand" "")
+-	(ashiftrt:DI (match_operand:DI 1 "general_operand" "")
++  [(set (match_operand:DI 0 "register_operand" "")
++	(ashiftrt:DI (match_operand:DI 1 "register_operand" "")
+ 		     (match_operand 2 "const_int_operand" "")))]
+   "!TARGET_COLDFIRE"
+-  "
+ {
+   /* ???  This is a named pattern like this is not allowed to FAIL based
+      on its operands.  */
+@@ -4154,7 +4317,7 @@
+ 	  && INTVAL (operands[2]) != 8 && INTVAL (operands[2]) != 16
+ 	  && (INTVAL (operands[2]) < 31 || INTVAL (operands[2]) > 63)))
+     FAIL;
+-} ")
++})
+ 
+ ;; On all 68k models, this makes faster code in a special case.
+ 
+@@ -4242,69 +4405,176 @@
+   return "move%.l %1,%0";
+ })
+ 
+-(define_insn "lshrdi_const32"
+-  [(set (match_operand:DI 0 "nonimmediate_operand" "=ro,<,>")
+-	(lshiftrt:DI (match_operand:DI 1 "general_operand" "ro,ro,ro")
++(define_insn "*lshrdi3_const1"
++  [(set (match_operand:DI 0 "register_operand" "=d")
++	(lshiftrt:DI (match_operand:DI 1 "register_operand" "0")
++		     (const_int 1)))]
++  "!TARGET_COLDFIRE"
++  "lsr%.l #1,%0\;roxr%.l #1,%R0")
++
++(define_split
++  [(set (match_operand:DI 0 "register_operand" "")
++	(lshiftrt:DI (match_operand:DI 1 "register_operand" "")
++		     (const_int 2)))]
++  "reload_completed && !TARGET_COLDFIRE"
++  [(set (match_dup 0)
++	(lshiftrt:DI (match_dup 1) (const_int 1)))
++   (set (match_dup 0)
++	(lshiftrt:DI (match_dup 0) (const_int 1)))]
++  "")
++
++(define_split
++  [(set (match_operand:DI 0 "register_operand" "")
++	(lshiftrt:DI (match_operand:DI 1 "register_operand" "")
++		     (const_int 3)))]
++  "reload_completed && !TARGET_COLDFIRE"
++  [(set (match_dup 0)
++	(lshiftrt:DI (match_dup 1) (const_int 2)))
++   (set (match_dup 0)
++	(lshiftrt:DI (match_dup 0) (const_int 1)))]
++  "")
++
++(define_split
++  [(set (match_operand:DI 0 "register_operand" "")
++	(lshiftrt:DI (match_operand:DI 1 "register_operand" "")
++		     (const_int 8)))]
++  "reload_completed && !TARGET_COLDFIRE"
++  [(set (strict_low_part (subreg:QI (match_dup 0) 7))
++	(subreg:QI (match_dup 0) 3))
++   (set (match_dup 2)
++	(lshiftrt:SI (match_dup 2) (const_int 8)))
++   (set (match_dup 3)
++	(rotatert:SI (match_dup 3) (const_int 8)))]
++{
++  operands[2] = gen_highpart (SImode, operands[0]);
++  operands[3] = gen_lowpart (SImode, operands[0]);
++})
++
++(define_split
++  [(set (match_operand:DI 0 "register_operand" "")
++	(lshiftrt:DI (match_operand:DI 1 "register_operand" "")
++		     (const_int 16)))]
++  "reload_completed && !TARGET_COLDFIRE"
++  [(set (strict_low_part (subreg:HI (match_dup 0) 6))
++	(subreg:HI (match_dup 0) 2))
++   (set (strict_low_part (subreg:HI (match_dup 0) 2))
++	(const_int 0))
++   (set (match_dup 3)
++	(rotate:SI (match_dup 3) (const_int 16)))
++   (set (match_dup 2)
++	(rotate:SI (match_dup 2) (const_int 16)))]
++{
++  operands[2] = gen_highpart (SImode, operands[0]);
++  operands[3] = gen_lowpart (SImode, operands[0]);
++})
++
++(define_split
++  [(set (match_operand:DI 0 "pre_dec_operand" "")
++	(lshiftrt:DI (match_operand:DI 1 "nonimmediate_operand" "")
++		     (const_int 32)))]
++  "reload_completed"
++  [(set (match_dup 0) (match_dup 1))
++   (set (match_dup 0) (const_int 0))]
++{
++  operands[0] = adjust_address(operands[0], SImode, 0);
++  operands[1] = gen_highpart(SImode, operands[1]);
++})
++
++(define_split
++  [(set (match_operand:DI 0 "post_inc_operand" "")
++	(lshiftrt:DI (match_operand:DI 1 "nonimmediate_operand" "")
++		     (const_int 32)))]
++  "reload_completed"
++  [(set (match_dup 0) (const_int 0))
++   (set (match_dup 0) (match_dup 1))]
++{
++  operands[0] = adjust_address(operands[0], SImode, 0);
++  operands[1] = gen_highpart(SImode, operands[1]);
++})
++
++(define_split
++  [(set (match_operand:DI 0 "nonimmediate_operand" "")
++	(lshiftrt:DI (match_operand:DI 1 "nonimmediate_operand" "")
++		     (const_int 32)))]
++  "reload_completed"
++  [(set (match_dup 2) (match_dup 5))
++   (set (match_dup 4) (const_int 0))]
++  "split_di(operands, 2, operands + 2, operands + 4);")
++
++(define_insn "*lshrdi_const32"
++  [(set (match_operand:DI 0 "nonimmediate_operand" "=ro<>")
++	(lshiftrt:DI (match_operand:DI 1 "general_operand" "ro")
+ 		     (const_int 32)))]
+   ""
++  "#")
++
++(define_split
++  [(set (match_operand:DI 0 "register_operand" "")
++	(lshiftrt:DI (match_operand:DI 1 "register_operand" "")
++		     (match_operand 2 "const_int_operand" "")))]
++  "reload_completed && !TARGET_COLDFIRE
++   && INTVAL (operands[2]) > 32 && INTVAL (operands[2]) <= 40"
++  [(set (match_dup 3) (lshiftrt:SI (match_dup 3) (match_dup 2)))
++   (set (match_dup 4) (match_dup 3))
++   (set (match_dup 3) (const_int 0))]
++{
++  operands[2] = GEN_INT (INTVAL (operands[2]) - 32);
++  operands[3] = gen_highpart (SImode, operands[0]);
++  operands[4] = gen_lowpart (SImode, operands[0]);
++})
++
++(define_split
++  [(set (match_operand:DI 0 "register_operand" "")
++	(lshiftrt:DI (match_operand:DI 1 "register_operand" "")
++		     (const_int 48)))]
++  "reload_completed"
++  [(set (match_dup 3) (match_dup 2))
++   (set (strict_low_part (subreg:HI (match_dup 0) 6))
++	(const_int 0))
++   (set (match_dup 2) (const_int 0))
++   (set (match_dup 3)
++	(rotate:SI (match_dup 3) (const_int 16)))]
+ {
+-  CC_STATUS_INIT;
+-  if (which_alternative == 1)
+-    return "move%.l %1,%0\;clr%.l %0";
+-  if (which_alternative == 2)
+-    return "clr%.l %0\;move%.l %1,%0";
+-  if (GET_CODE (operands[0]) == REG)
+-    operands[2] = gen_rtx_REG (SImode, REGNO (operands[0]) + 1);
+-  else
+-    operands[2] = adjust_address (operands[0], SImode, 4);
+-  if (GET_CODE (operands[1]) == REG)
+-    operands[3] = gen_rtx_REG (SImode, REGNO (operands[1]) + 1);
+-  else
+-    operands[3] = adjust_address (operands[1], SImode, 4);
+-  if (ADDRESS_REG_P (operands[0]))
+-    return "move%.l %1,%2\;sub%.l %0,%0";
+-  else
+-    return "move%.l %1,%2\;clr%.l %0";
++  operands[2] = gen_highpart (SImode, operands[0]);
++  operands[3] = gen_lowpart (SImode, operands[0]);
++})
++
++(define_split
++  [(set (match_operand:DI 0 "register_operand" "")
++	(lshiftrt:DI (match_operand:DI 1 "register_operand" "")
++		     (match_operand 2 "const_int_operand" "")))]
++  "reload_completed && !TARGET_COLDFIRE
++   && INTVAL (operands[2]) > 40 && INTVAL (operands[2]) <= 62"
++  [(set (match_dup 4) (match_dup 2))
++   (set (match_dup 3) (lshiftrt:SI (match_dup 3) (match_dup 4)))
++   (set (match_dup 4) (match_dup 3))
++   (set (match_dup 3) (const_int 0))]
++{
++  operands[2] = GEN_INT (INTVAL (operands[2]) - 32);
++  operands[3] = gen_highpart (SImode, operands[0]);
++  operands[4] = gen_lowpart (SImode, operands[0]);
+ })
+ 
+-;; The predicate below must be general_operand, because lshrdi3 allows that
+-(define_insn "lshrdi_const"
+-  [(set (match_operand:DI 0 "nonimmediate_operand" "=d")
+-	(lshiftrt:DI (match_operand:DI 1 "general_operand" "0")
++(define_insn "*lshrdi_const63"
++  [(set (match_operand:DI 0 "register_operand" "=d")
++	(lshiftrt:DI (match_operand:DI 1 "register_operand" "0")
++		     (const_int 63)))]
++  ""
++  "add%.l %0,%0\;clr%.l %0\;clr%.l %R1\;addx%.l %R1,%R1")
++
++(define_insn "*lshrdi3_const"
++  [(set (match_operand:DI 0 "register_operand" "=d")
++	(lshiftrt:DI (match_operand:DI 1 "register_operand" "0")
+ 		     (match_operand 2 "const_int_operand" "n")))]
+   "(!TARGET_COLDFIRE
+-    && ((INTVAL (operands[2]) >= 1 && INTVAL (operands[2]) <= 3)
++    && ((INTVAL (operands[2]) >= 2 && INTVAL (operands[2]) <= 3)
+ 	 || INTVAL (operands[2]) == 8 || INTVAL (operands[2]) == 16
+ 	 || (INTVAL (operands[2]) > 32 && INTVAL (operands[2]) <= 63)))"
+-{
+-  operands[1] = gen_rtx_REG (SImode, REGNO (operands[0]) + 1);
+-  if (INTVAL (operands[2]) == 63)
+-    return "add%.l %0,%0\;clr%.l %0\;clr%.l %1\;addx%.l %1,%1";
+-  CC_STATUS_INIT;
+-  if (INTVAL (operands[2]) == 1)
+-    return "lsr%.l #1,%0\;roxr%.l #1,%1";
+-  else if (INTVAL (operands[2]) == 8)
+-    return "move%.b %0,%1\;lsr%.l #8,%0\;ror%.l #8,%1";
+-  else if (INTVAL (operands[2]) == 16)
+-    return "move%.w %0,%1\;clr%.w %0\;swap %1\;swap %0";
+-  else if (INTVAL (operands[2]) == 48)
+-    return "move%.l %0,%1\;clr%.w %1\;clr%.l %0\;swap %1";
+-  else if (INTVAL (operands[2]) == 2)
+-    return "lsr%.l #1,%0\;roxr%.l #1,%1\;lsr%.l #1,%0\;roxr%.l #1,%1";
+-  else if (INTVAL (operands[2]) == 3)
+-    return "lsr%.l #1,%0\;roxr%.l #1,%1\;lsr%.l #1,%0\;roxr%.l #1,%1\;lsr%.l #1,%0\;roxr%.l #1,%1";
+-  else /* 32 < INTVAL (operands[2]) <= 63 */
+-    {
+-      operands[2] = GEN_INT (INTVAL (operands[2]) - 32);
+-      output_asm_insn (INTVAL (operands[2]) <= 8 ? "lsr%.l %2,%0" :
+-			"moveq %2,%1\;lsr%.l %1,%0", operands);
+-      return "mov%.l %0,%1\;moveq #0,%0";
+-    }
+-})
++  "#")
+ 
+ (define_expand "lshrdi3"
+-  [(set (match_operand:DI 0 "nonimmediate_operand" "")
+-	(lshiftrt:DI (match_operand:DI 1 "general_operand" "")
++  [(set (match_operand:DI 0 "register_operand" "")
++	(lshiftrt:DI (match_operand:DI 1 "register_operand" "")
+ 		     (match_operand 2 "const_int_operand" "")))]
+   "!TARGET_COLDFIRE"
+ {
--- gcj-4.2-4.2-20070707.orig/debian/patches/libjava-library-path.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/libjava-library-path.dpatch
@@ -0,0 +1,162 @@
+#! /bin/sh -e
+
+# DP: - Add /usr/lib/jni to java.library.path.
+# DP: - When running the i386 binaries on amd64, look in
+# DP: - /usr/lib32/gcj-x.y and /usr/lib32/jni instead.
+
+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
+
+--- libjava/gnu/classpath/natSystemProperties.cc~	2006-08-02 00:53:40.000000000 +0200
++++ libjava/gnu/classpath/natSystemProperties.cc	2006-08-19 00:41:50.063803000 +0200
+@@ -141,6 +141,34 @@
+   return retval;
+ }
+ 
++static char*
++AppendJniLibdir (char *path, struct utsname *u)
++{
++  char* retval;
++  const char* jnilibdir = "/usr/lib/jni";
++
++#if defined(__linux__) && defined (__i386__)
++  if (! strcmp ("x86_64", u->machine))
++    jnilibdir = "/usr/lib32/jni";
++#endif
++
++  if (path)
++    {
++      jsize total = strlen (path)
++	+ (sizeof (PATH_SEPARATOR) - 1) + strlen (jnilibdir) + 1;
++      retval = (char*) _Jv_Malloc (total);
++      strcpy (retval, path);
++      strcat (retval, PATH_SEPARATOR);
++      strcat (retval, jnilibdir);
++    }
++  else
++    {
++      retval = (char*) _Jv_Malloc (strlen (jnilibdir) + 1);
++      strcpy (retval, jnilibdir);
++    }
++  return retval;
++}
++
+ void
+ gnu::classpath::SystemProperties::insertSystemProperties (java::util::Properties *newprops)
+ {
+@@ -370,8 +398,13 @@
+       // Prepend GCJ_VERSIONED_LIBDIR to the module load path so that
+       // libgcj will find its own JNI libraries, like libgtkpeer.so.
+       char* val = PrependVersionedLibdir (path);
+-      _Jv_SetDLLSearchPath (val);
++
++      // Append jnilibdir
++      char* val2 = AppendJniLibdir (val, &u);
++
++      _Jv_SetDLLSearchPath (val2);
+       _Jv_Free (val);
++      _Jv_Free (val2);
+     }
+   else
+     {
+@@ -379,9 +412,12 @@
+ #ifdef USE_LTDL
+       char *libpath = getenv (LTDL_SHLIBPATH_VAR);
+       char* val = _Jv_PrependVersionedLibdir (libpath);
+-      SET ("java.library.path", val);
+-      _Jv_SetDLLSearchPath (val);
++      // Append jnilibdir
++      char* val2 = AppendJniLibdir (val, &u);
++      SET ("java.library.path", val2);
++      _Jv_SetDLLSearchPath (val2);
+       _Jv_Free (val);
++      _Jv_Free (val2);
+ #else
+       SET ("java.library.path", "");
+ #endif
+--- libjava/prims.cc~	2006-07-28 10:24:31.000000000 +0200
++++ libjava/prims.cc	2006-08-19 00:47:15.993803000 +0200
+@@ -21,6 +21,10 @@
+ #include <unistd.h>
+ #endif
+ 
++#ifdef HAVE_UNAME
++#include <sys/utsname.h>
++#endif
++
+ #include <gcj/cni.h>
+ #include <jvm.h>
+ #include <java-signal.h>
+@@ -1725,12 +1729,28 @@
+ _Jv_PrependVersionedLibdir (char* libpath)
+ {
+   char* retval = 0;
++#define GCJ_VERSIONED_SUBDIR "gcj-4.2"
++#define GCJ_VERSIONED_LIB32DIR "/usr/lib32" GCJ_VERSIONED_SUBDIR
++  const char* vlibdir = GCJ_VERSIONED_LIBDIR;
++  int vlibdir_size = sizeof (GCJ_VERSIONED_LIBDIR);
++
++#if defined(__linux__) && defined (__i386__)
++  struct utsname u;
++  if (! uname (&u))
++    {
++      if (! strcmp ("x86_64", u.machine))
++	{
++	  vlibdir = GCJ_VERSIONED_LIB32DIR;
++	  vlibdir_size = sizeof (GCJ_VERSIONED_LIB32DIR);
++	}
++    }
++#endif
+ 
+   if (libpath && libpath[0] != '\0')
+     {
+       if (! strncmp (libpath,
+-                     GCJ_VERSIONED_LIBDIR,
+-                     sizeof (GCJ_VERSIONED_LIBDIR) - 1))
++                     vlibdir,
++                     vlibdir_size - 1))
+         {
+           // LD_LIBRARY_PATH is already prefixed with
+           // GCJ_VERSIONED_LIBDIR.
+@@ -1741,10 +1761,10 @@
+         {
+           // LD_LIBRARY_PATH is not prefixed with
+           // GCJ_VERSIONED_LIBDIR.
+-          jsize total = (sizeof (GCJ_VERSIONED_LIBDIR) - 1)
++          jsize total = (vlibdir_size - 1)
+             + (sizeof (PATH_SEPARATOR) - 1) + strlen (libpath) + 1;
+           retval = (char*) _Jv_Malloc (total);
+-          strcpy (retval, GCJ_VERSIONED_LIBDIR);
++          strcpy (retval, vlibdir);
+           strcat (retval, PATH_SEPARATOR);
+           strcat (retval, libpath);
+         }
+@@ -1752,8 +1772,8 @@
+   else
+     {
+       // LD_LIBRARY_PATH was not specified or is empty.
+-      retval = (char*) _Jv_Malloc (sizeof (GCJ_VERSIONED_LIBDIR));
+-      strcpy (retval, GCJ_VERSIONED_LIBDIR);
++      retval = (char*) _Jv_Malloc (vlibdir_size);
++      strcpy (retval, vlibdir);
+     }
+ 
+   return retval;
--- gcj-4.2-4.2-20070707.orig/debian/patches/m68k-peephole-note.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/m68k-peephole-note.dpatch
@@ -0,0 +1,45 @@
+#! /bin/sh -e
+
+# All lines beginning with `# DPATCH:' are a description of the patch.
+# DP: don't choke on notes while reinserting REG_EH_REGION notes
+
+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 -p1 < $0
+        #cd ${dir}gcc && autoconf
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p1 < $0
+        #rm ${dir}gcc/configure
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+---
+
+ gcc/recog.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+Index: gcc-4.1/gcc/recog.c
+===================================================================
+--- gcc-4.1.orig/gcc/recog.c
++++ gcc-4.1/gcc/recog.c
+@@ -3215,6 +3215,7 @@ peephole2_optimize (FILE *dump_file ATTR
+ 		      for (x = try ; x != before_try ; x = PREV_INSN (x))
+ 			if (CALL_P (x)
+ 			    || (flag_non_call_exceptions
++				&& INSN_P (x)
+ 				&& may_trap_p (PATTERN (x))
+ 				&& !find_reg_note (x, REG_EH_REGION, NULL)))
+ 			  {
--- gcj-4.2-4.2-20070707.orig/debian/patches/ada-symbolic-tracebacks.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/ada-symbolic-tracebacks.dpatch
@@ -0,0 +1,298 @@
+#! /bin/sh -e
+
+# DP: - Enable support for symbolic tracebacks in exceptions (delete the dummy
+# DP:   convert_addresses from adaint.c, and provide a real one separately.)
+
+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
+
+Ported Jürgen Pfeifer's patch to enable symbolic tracebacks on Debian
+GNU/Linux.
+
+The binary distribution of GNAT 3.15p comes with an old version of
+binutils that includes a library, libaddr2line.a.  This library does
+not exist in recent versions of binutils.  The patch works around this
+by calling /usr/bin/addr2line (still part of binutils) and parsing the
+output.  See debian/convert_addresses.c for the gory details.
+
+I have modified convert_addresses.c to not use a shell script anymore;
+Debian controls the version of binutils which is installed.  Also, I
+use execve instead of execle.
+
+-- 
+Ludovic Brenta.
+
+# ' make emacs highlighting happy
+
+--- gcc/ada/g-trasym.adb~      Thu Oct 24 11:02:18 2002
++++ gcc/ada/g-trasym.adb       Fri Jul  4 16:16:30 2003
+@@ -33,16 +33,16 @@
+ ------------------------------------------------------------------------------
+ 
+ --  Run-time symbolic traceback support
++--  This file has been modified by Juergen Pfeifer (31-Dec-1999) for
++--  the purpose to support the Ada for Linux Team implementation of
++--  convert_addresses. This implementation has the advantage to run
++--  on the binutils as they are deployed on Linux.
+ 
+ with System.Soft_Links;
+ with Ada.Exceptions.Traceback; use Ada.Exceptions.Traceback;
+ 
+ package body GNAT.Traceback.Symbolic is
+ 
+-   pragma Linker_Options ("-laddr2line");
+-   pragma Linker_Options ("-lbfd");
+-   pragma Linker_Options ("-liberty");
+-
+    package TSL renames System.Soft_Links;
+ 
+    ------------------------
+@@ -56,16 +56,19 @@
+          buf      : System.Address;
+          len      : System.Address);
+       pragma Import (C, convert_addresses, "convert_addresses");
+-      --  This is the procedure version of the Ada aware addr2line that will
+-      --  use argv[0] as the executable containing the debug information.
+-      --  This procedure is provided by libaddr2line on targets that support
+-      --  it. A dummy version is in a-adaint.c for other targets so that build
+-      --  of shared libraries doesn't generate unresolved symbols.
++      --  This is the ALT Linux specific version adapted to the binutils
++      --  deployed with most Linuxes. These binutils already have an
++      --  addr2line tool that demangles Ada symbolic names, but there are
++      --  version dependant variants for the option names. Therefore our
++      --  implementation spawns a shell script that does normalization of
++      --  the option and then executes addr2line and communicates with it
++      --  through a bidirectional pipe.
+       --
+       --  Note that this procedure is *not* thread-safe.
+ 
+-      Res : String (1 .. 256 * Traceback'Length);
+-      Len : Integer;
++      B_Size : constant Integer := 256 * Traceback'Length;
++      Len    : Integer := B_Size;
++      Res    : String (1 .. B_Size);
+ 
+    begin
+       if Traceback'Length > 0 then
+--- gcc/ada/convert_addresses.c~       1970-01-01 01:00:00.000000000 +0100
++++ gcc/ada/convert_addresses.c        2005-04-27 15:06:51.000000000 +0200
+@@ -0,0 +1,157 @@
++/*
++  Copyright (C) 1999 by Juergen Pfeifer <juergen.pfeifer@gmx.net>
++  Ada for Linux Team (ALT)
++
++  Permission is hereby granted, free of charge, to any person obtaining a
++  copy of this software and associated documentation files (the
++  "Software"), to deal in the Software without restriction, including
++  without limitation the rights to use, copy, modify, merge, publish,
++  distribute, distribute with modifications, sublicense, and/or sell
++  copies of the Software, and to permit persons to whom the Software is
++  furnished to do so, subject to the following conditions:
++
++  The above copyright notice and this permission notice shall be included
++  in all copies or substantial portions of the Software.
++
++  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
++  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
++  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
++  IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
++  DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
++  OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
++  THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++
++  Except as contained in this notice, the name(s) of the above copyright
++  holders shall not be used in advertising or otherwise to promote the
++  sale, use or other dealings in this Software without prior written
++  authorization.
++*/
++#include <sys/types.h>
++#include <stdlib.h>
++#include <stdio.h>
++#include <unistd.h>
++#include <string.h>
++#include <signal.h>
++
++#define STDIN_FILENO  0
++#define STDOUT_FILENO 1
++#define MAX_LINE      1024
++
++#define CLOSE1  close(fd1[0]); close(fd1[1])
++#define CLOSE2  close(fd2[0]); close(fd2[1])
++#define RESTSIG sigaction(SIGPIPE,&oact,NULL)
++
++void convert_addresses
++( void* addrs[],
++  int   n_addr,
++  char* buf,
++  int*  len)
++{
++  int max_len = *len;
++  pid_t pid = getpid();
++  pid_t child;
++
++  struct sigaction act, oact;
++
++  int fd1[2], fd2[2];
++  char exe_name[128];
++
++  *buf = 0; *len = 0;
++  /* Thanx to the /proc filesystem we can very easily reference our own
++     executable image:-)*/
++  snprintf(exe_name,sizeof(exe_name),"--exe=/proc/%ld/exe", (long)pid);
++
++  act.sa_handler = SIG_IGN;
++  sigemptyset(&act.sa_mask);
++  act.sa_flags = 0;
++  if (sigaction(SIGPIPE,&act,&oact) < 0)
++    return;
++
++  if (pipe(fd1) >= 0) {
++    if (pipe(fd2)>=0) {
++      if ((child = fork()) < 0) {
++      CLOSE1; CLOSE2; RESTSIG;
++      return;
++      }
++      else {
++      if (0==child) {
++        close(fd1[1]);
++        close(fd2[0]);
++        if (fd1[0] != STDIN_FILENO) {
++          if (dup2(fd1[0],STDIN_FILENO) != STDIN_FILENO) {
++            CLOSE1; CLOSE2;
++          }
++          close(fd1[0]);
++        }
++        if (fd2[1] != STDOUT_FILENO) {
++          if (dup2(fd2[1],STDOUT_FILENO) != STDOUT_FILENO) {
++            CLOSE1; CLOSE2;
++          }
++          close(fd2[1]);
++        }
++        {
++          /* As pointed out by Florian Weimer to me, it is a
++             security threat to call the script with a user defined
++             environment and using the path. That would be Trojans
++             pleasure.  Therefore we use the absolute path to
++             addr2line and an empty environment. That should be
++             safe.
++          */
++          char *const argv[] = { "addr2line",
++                                 exe_name,
++                                 "--demangle=gnat",
++                                 "--functions",
++                                 "--basenames",
++                                 NULL };
++          char *const envp[] = { NULL };
++          if (execve("/usr/bin/addr2line", argv, envp) < 0) {
++            CLOSE1; CLOSE2;
++          }
++        }
++      }
++      else {
++        int i, n;
++        char hex[16];
++        char line[MAX_LINE + 1];
++        char *p;
++        char *s = buf;
++
++        /* Parent context */
++        close(fd1[0]);
++        close(fd2[1]);
++
++        for(i=0; i < n_addr; i++) {
++          snprintf(hex,sizeof(hex),"%p\n",addrs[i]);
++          write(fd1[1],hex,strlen(hex));
++          n = read(fd2[0],line,MAX_LINE);
++          if (n<=0)
++            break;
++          line[n]=0;
++          /* We have approx. 16 additional chars for "%p in " clause.
++             We use this info to prevent a buffer overrun.
++          */
++          if (n + 16 + (*len) > max_len)
++            break;
++          p = strchr(line,'\n');
++          if (p) {
++            if (*(p+1)) {
++              *p = 0;
++              *len += snprintf(s, (max_len - (*len)), "%p in %s at %s",addrs[i], line, p+1);
++            }
++            else {
++              *len += snprintf(s, (max_len - (*len)), "%p at %s",addrs[i], line);
++            }
++            s = buf + (*len);
++          }
++        }
++        close(fd1[1]);
++        close(fd2[0]);
++      }
++      }
++    }
++    else {
++      CLOSE1;
++    }
++  }
++  RESTSIG;
++}
+--- gcc/ada/Makefile.in.orig	2006-04-17 19:39:15.848644432 +0000
++++ gcc/ada/Makefile.in	2006-04-17 19:43:14.794319168 +0000
+@@ -1352,7 +1352,7 @@
+ include $(fsrcdir)/Makefile.rtl
+ 
+ GNATRTL_OBJS = $(GNATRTL_NONTASKING_OBJS) $(GNATRTL_TASKING_OBJS) \
+-  g-trasym.o memtrack.o
++  g-trasym.o memtrack.o convert_addresses.o
+ 
+ # Default run time files
+ 
+@@ -1507,7 +1507,6 @@
+ 	for file in rts/*.ali; do \
+ 	    $(INSTALL_DATA_DATE) $$file $(DESTDIR)$(ADA_RTL_OBJ_DIR); \
+ 	done
+-	-$(INSTALL_DATA) rts/g-trasym$(objext) $(DESTDIR)$(ADA_RTL_OBJ_DIR)
+ 	-cd rts; for file in *$(arext);do \
+ 	    $(INSTALL_DATA) $$file $(DESTDIR)$(ADA_RTL_OBJ_DIR); \
+ 	    $(RANLIB_FOR_TARGET) $(DESTDIR)$(ADA_RTL_OBJ_DIR)/$$file; \
+@@ -1607,7 +1606,7 @@
+ 	        $(GNATRTL_OBJS)
+ 	$(RM) rts/libgnat$(arext) rts/libgnarl$(arext)
+ 	$(AR_FOR_TARGET) $(AR_FLAGS) rts/libgnat$(arext) \
+-	   $(addprefix rts/,$(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS))
++	   $(addprefix rts/,$(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) g-trasym.o convert_addresses.o)
+         ifneq ($(PREFIX_OBJS),)
+ 		$(AR_FOR_TARGET) $(AR_FLAGS) rts/libgccprefix$(arext) \
+ 		  $(PREFIX_OBJS);
+@@ -1637,6 +1636,7 @@
+ 		$(TARGET_LIBGCC2_CFLAGS) \
+ 		-o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
+ 		$(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) \
++		g-trasym.o convert_addresses.o \
+ 		$(SO_OPTS)libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
+ 		$(MISCLIB) -lm
+ 	cd rts; ../../xgcc -B../../ -shared $(GNATLIBCFLAGS) \
+@@ -1859,6 +1859,7 @@
+ sysdep.o  : sysdep.c
+ raise-gcc.o : raise-gcc.c raise.h
+ raise.o   : raise.c raise.h
++convert_addresses.o : convert_addresses.c
+ 
+ gen-soccon: gen-soccon.c gsocket.h
+ 	$(CC) $(ALL_CFLAGS) $(ADA_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
--- gcj-4.2-4.2-20070707.orig/debian/patches/arm-pr28516.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/arm-pr28516.dpatch
@@ -0,0 +1,43 @@
+#! /bin/sh -e
+
+# DP: Fix PR28516 on ARM
+
+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 -p1 < $0
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p1 < $0
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+--- trunk/gcc/config/arm/arm.c	2006/09/19 13:18:27	117055
++++ trunk/gcc/config/arm/arm.c	2006/09/19 13:19:24	117056
+@@ -15415,6 +15415,15 @@
+ 	  /* Move from sp to reg.  */
+ 	  asm_fprintf (asm_out_file, "\t.movsp %r\n", REGNO (e0));
+ 	}
++     else if (GET_CODE (e1) == PLUS
++	      && GET_CODE (XEXP (e1, 0)) == REG
++	      && REGNO (XEXP (e1, 0)) == SP_REGNUM
++	      && GET_CODE (XEXP (e1, 1)) == CONST_INT)
++	{
++	  /* Set reg to offset from sp.  */
++	  asm_fprintf (asm_out_file, "\t.movsp %r, #%d\n",
++		       REGNO (e0), (int)INTVAL(XEXP (e1, 1)));
++	}
+       else
+ 	abort ();
+       break;
--- gcj-4.2-4.2-20070707.orig/debian/patches/libstdc++-pic.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/libstdc++-pic.dpatch
@@ -0,0 +1,71 @@
+#! /bin/sh -e
+
+# DP: Build and install libstdc++_pic.a library.
+
+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 -ur libstdc++-v3/src/Makefile.am libstdc++-v3/src/Makefile.am
+--- libstdc++-v3/src/Makefile.am~	2004-04-16 21:04:05.000000000 +0200
++++ libstdc++-v3/src/Makefile.am	2004-07-03 20:22:43.000000000 +0200
+@@ -210,6 +210,10 @@
+ 	  $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LDFLAGS) -o $@
+ 
+ 
++install-exec-local:
++	$(AR) cru libstdc++_pic.a .libs/*.o $(top_builddir)/libsupc++/*.o
++	$(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir)
++
+ # Added bits to build debug library.
+ if GLIBCXX_BUILD_DEBUG
+ all-local: build_debug
+diff -ur libstdc++-v3/src/Makefile.in libstdc++-v3/src/Makefile.in
+--- libstdc++-v3/src/Makefile.in	2004-07-03 06:41:13.000000000 +0200
++++ libstdc++-v3/src/Makefile.in	2004-07-03 20:25:05.000000000 +0200
+@@ -611,7 +611,7 @@
+ 
+ install-data-am: install-data-local
+ 
+-install-exec-am: install-toolexeclibLTLIBRARIES
++install-exec-am: install-toolexeclibLTLIBRARIES install-exec-local
+ 
+ install-info: install-info-am
+ 
+@@ -644,6 +644,7 @@
+ 	distclean-libtool distclean-tags distdir dvi dvi-am html \
+ 	html-am info info-am install install-am install-data \
+ 	install-data-am install-data-local install-exec \
++	install-exec-local \
+ 	install-exec-am install-info install-info-am install-man \
+ 	install-strip install-toolexeclibLTLIBRARIES installcheck \
+ 	installcheck-am installdirs maintainer-clean \
+@@ -729,6 +730,11 @@
+ install_debug:
+ 	(cd ${debugdir} && $(MAKE) \
+ 	toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install)
++
++install-exec-local:
++	$(AR) cru libstdc++_pic.a .libs/*.o $(top_builddir)/libsupc++/*.o
++	$(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir)
++
+ # 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:
--- gcj-4.2-4.2-20070707.orig/debian/patches/ada-driver-check.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/ada-driver-check.dpatch
@@ -0,0 +1,39 @@
+#! /bin/sh -e
+
+# DP: Simplify Ada driver check (we always build using the required
+# DP: Ada version. Needed for warnings on alpha.
+
+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} && autoconf2.13
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
+	rm -f ${dir}configure
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+--- config/acx.m4~	2005-12-15 14:59:17.000000000 +0100
++++ config/acx.m4	2006-07-08 17:01:44.325594336 +0200
+@@ -195,7 +195,7 @@
+ # Other compilers, like HP Tru64 UNIX cc, exit successfully when
+ # given a .adb file, but produce no object file.  So we must check
+ # if an object file was really produced to guard against this.
+-errors=`(${CC} -c conftest.adb) 2>&1 || echo failure`
++errors=`(${CC} -c conftest.adb) 2>/dev/null || echo failure`
+ if test x"$errors" = x && test -f conftest.$ac_objext; then
+   acx_cv_cc_gcc_supports_ada=yes
+ fi
--- gcj-4.2-4.2-20070707.orig/debian/patches/ada-libgnatvsn.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/ada-libgnatvsn.dpatch
@@ -0,0 +1,1522 @@
+#! /bin/sh -e
+
+# DP: - Introduce a new shared library named libgnatvsn, containing
+# DP:   common components of GNAT under the GNAT-Modified GPL, for
+# DP:   use in GNAT tools, ASIS, GLADE and GPS.   Link the gnat tools
+# DP:   against this new library.
+
+# This patch seems large, but the hunks in Makefile.in are actually
+# generated from Makefile.def using autogen.
+
+# !!! Must be applied after ada-link-lib.dpatch
+
+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} && autoconf2.13
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
+	rm -f ${dir}configure
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+--- configure.in~
++++ configure.in	2007-06-19 16:00:28.885236576 +0200
+@@ -123,7 +123,7 @@
+ 
+ # these libraries are used by various programs built for the host environment
+ #
+-host_libs="intl mmalloc libiberty opcodes bfd readline tcl tk itcl libgui zlib libcpp libdecnumber libada"
++host_libs="intl mmalloc libiberty opcodes bfd readline tcl tk itcl libgui zlib libcpp libdecnumber libada libgnatvsn"
+ 
+ # these tools are built for the host environment
+ # Note, the powerpc-eabi build depends on sim occurring before gdb in order to
+@@ -152,6 +152,7 @@
+ 		${libgcj} \
+ 		target-libobjc \
+ 		target-libada \
++		target-libgnatvsn \
+ 		target-libgomp"
+ 
+ # these tools are built using the target libraries, and are intended to
+@@ -230,7 +231,7 @@
+ 
+ # Similarly, some are only suitable for cross toolchains.
+ # Remove these if host=target.
+-cross_only="target-libgloss target-newlib target-opcodes target-libada"
++cross_only="target-libgloss target-newlib target-opcodes target-libada target-libgnatvsn"
+ 
+ case $is_cross_compiler in
+   no) skipdirs="${skipdirs} ${cross_only}" ;;
+@@ -304,7 +304,7 @@
+ ENABLE_LIBADA=$enableval,
+ ENABLE_LIBADA=yes)
+ if test "${ENABLE_LIBADA}" != "yes" ; then
+-  noconfigdirs="$noconfigdirs gnattools"
++  noconfigdirs="$noconfigdirs libgnatvsn gnattools"
+ fi
+ 
+ AC_ARG_ENABLE(libssp,
+--- gcc/ada/config-lang.in~
++++ gcc/ada/config-lang.in	2007-06-19 16:01:00.198766122 +0200
+@@ -38,8 +38,8 @@
+ 
+ outputs=ada/Makefile
+ 
+-target_libs="target-libada"
+-lang_dirs="libada gnattools"
++target_libs="target-libada target-libgnatvsn"
++lang_dirs="libada libgnatvsn gnattools"
+ 
+ # Ada will not work until the front end starts emitting GIMPLE trees.
+ build_by_default=no
+--- gnattools/Makefile.in~
++++ gnattools/Makefile.in	2007-06-19 16:06:58.188252543 +0200
+@@ -40,9 +40,10 @@
+ INCLUDES = -I@srcdir@/../gcc/ada -I@srcdir@/../gcc
+ ADA_CFLAGS=-g -O2 -gnatn
+ ADA_INCLUDES=-nostdinc -I- -I. -I../gcc/ada/rts -I@srcdir@/../gcc/ada
++ADA_INCLUDES += -aO../libgnatvsn
+ LIB_VERSION=$(strip $(shell grep ' Library_Version :' \
+               @srcdir@/../gcc/ada/gnatvsn.ads | sed -e 's/.*"\(.*\)".*/\1/'))
+-ADA_LIBS := -L../gcc/ada/rts -lgnat-$(LIB_VERSION)
++ADA_LIBS := -L../gcc/ada/rts -lgnat-$(LIB_VERSION) -L../libgnatvsn -lgnatvsn
+ 
+ # We will use the just-built compiler to compile and link everything.
+ GCC=../gcc/xgcc -B../gcc/
+@@ -68,62 +69,34 @@
+ # Since we don't have gnatmake, we must specify the full list of
+ # object files necessary to build gnatmake and gnatlink.
+ # TODO: remove from these lists the objects that are part of
+-# libgnatvsn and libgnatprj.
++# libgnatprj.
+ GNATLINK_OBJS = \
+ ali.o \
+-alloc.o \
+ butil.o \
+-casing.o \
+-csets.o \
+-debug.o \
+ fmap.o \
+-fname.o \
+ gnatlink.o \
+-gnatvsn.o \
+-hostparm.o \
+ indepsw.o \
+-namet.o \
+-opt.o \
+ osint.o \
+-output.o \
+ prefix.o \
+ rident.o \
+ sdefault.o \
+-snames.o \
+ stylesw.o \
+ switch.o \
+-table.o \
+ targparm.o \
+-tree_io.o \
+-types.o \
+-validsw.o \
+-version.o \
+-widechar.o
++validsw.o
+ 
+ GNATMAKE_OBJS = \
+ ali-util.o \
+ ali.o \
+-alloc.o \
+-atree.o \
+ binderr.o \
+ butil.o \
+-casing.o \
+-csets.o \
+-debug.o \
+-einfo.o\
+-elists.o \
+ err_vars.o \
+ erroutc.o \
+ errutil.o \
+ fmap.o \
+ fname-sf.o \
+ fname-uf.o \
+-fname.o \
+ gnatmake.o \
+-gnatvsn.o \
+-hostparm.o \
+-krunch.o \
+-lib.o \
+ make.o \
+ makeusg.o \
+ makeutl.o \
+@@ -132,12 +105,8 @@
+ mlib-tgt.o \
+ mlib-utl.o \
+ mlib.o \
+-namet.o \
+-nlists.o \
+-opt.o \
+ osint-m.o \
+ osint.o \
+-output.o \
+ prefix.o \
+ prj-attr-pm.o \
+ prj-attr.o \
+@@ -155,33 +124,19 @@
+ prj-util.o \
+ prj.o \
+ rident.o \
+-scans.o \
+ scng.o \
+ sdefault.o \
+ sfn_scan.o \
+-sinfo.o \
+ sinput-c.o \
+ sinput-p.o \
+-sinput.o \
+-snames.o \
+-stand.o \
+-stringt.o \
+ styleg.o \
+ stylesw.o \
+ switch-m.o \
+ switch.o \
+-table.o \
+ targparm.o \
+ tempdir.o \
+-tree_io.o \
+-types.o \
+-uintp.o \
+-uname.o \
+-urealp.o \
+ usage.o \
+ validsw.o \
+-version.o \
+-widechar.o \
+ $(EXTRA_GNATMAKE_OBJS)
+ 
+ 
+@@ -204,6 +159,7 @@
+ 	touch $@
+ 
+ gnattools-native: ../gcc/ada/rts/libgnat-$(LIB_VERSION).so
++gnattools-native: ../libgnatvsn/libgnatvsn.so
+ gnattools-native: stamp-gnattools-sources
+ gnattools-native: $(TOOLS) gnatbl
+ 
+@@ -215,14 +171,14 @@
+ vpath %.ads @srcdir@/../gcc/ada
+ 
+ # Because the just-built gcc is a host tool like us, we can use some
+-# of its object files, e.g. prefix.o and version.o.
++# of its object files, e.g. prefix.o.
+ vpath prefix.o ../gcc
+-vpath version.o ../gcc
+ 
+ # gnatlink
+ 
+ gnatlink-static: $(GNATLINK_OBJS) b_gnatl.o link.o
+ 	$(GCC) -o $@ $^ \
++	   ../libgnatvsn/libgnatvsn.a \
+ 	   ../gcc/ada/rts/libgnat.a \
+ 	   ../libiberty/libiberty.a
+ 
+@@ -239,6 +195,7 @@
+ 
+ gnatmake-static: $(GNATMAKE_OBJS) b_gnatm.o link.o
+ 	$(GCC) -o $@ $(ADA_CFLAGS) $^ \
++	   ../libgnatvsn/libgnatvsn.a \
+ 	   ../gcc/ada/rts/libgnat.a \
+ 	   ../libiberty/libiberty.a
+ 
+@@ -252,7 +209,7 @@
+ 	../gcc/gnatbind -C -o $@ $(ADA_INCLUDES) gnatmake.ali
+ 
+ # Other tools
+-gnatchop gnatkr: version.o
++gnatchop gnatkr:
+ 	./gnatmake-static -c -b $@ $(ADA_CFLAGS) $(ADA_INCLUDES) \
+ 	   --GCC="$(GCC)" \
+ 	   --GNATBIND=../gcc/gnatbind
+@@ -264,7 +221,7 @@
+ 	cp -lp $< $@
+ 
+ gnatbind gnatclean gnatcmd gnatfind gnatls gnatname gnatprep gnatxref gprmake: \
+-link.o version.o prefix.o
++link.o prefix.o
+ 	./gnatmake-static -c -b $@ $(ADA_CFLAGS) $(ADA_INCLUDES) \
+ 	   --GCC="$(GCC)" \
+ 	   --GNATBIND=../gcc/gnatbind
+@@ -273,7 +230,7 @@
+ 	   --GCC="$(GCC) $(ADA_INCLUDES)"
+ 	strip $@
+ 
+-gnatbl: gnatbl.c link.o version.o prefix.o
++gnatbl: gnatbl.c link.o prefix.o
+ 	$(GCC) -o $@ $< $(CFLAGS) \
+ 	   -I../gcc -I@srcdir@/../gcc/config -I@srcdir@/../gcc \
+ 	   -I@srcdir@/../include \
+--- libgnatvsn/configure~
++++ libgnatvsn/configure	2006-04-13 08:18:04.000000000 +0200
+@@ -0,0 +1,34 @@
++#!/bin/sh
++
++# Minimal configure script for libgnatvsn.  We're only interested in
++# a few parameters.
++
++for arg in $*; do
++    case ${arg} in
++	--build=*)
++	    build=`expr ${arg} : '--build=\(.\+\)'`;;
++	--host=*)
++	    host=`expr ${arg} : '--host=\(.\+\)'`;;
++	--target=*)
++	    target=`expr ${arg} : '--target=\(.\+\)'`;;
++	--prefix=*)
++	    prefix=`expr ${arg} : '--prefix=\(.\+\)'`;;
++	--srcdir=*)
++	    srcdir=`expr ${arg} : '--srcdir=\(.\+\)'`;;
++	*)
++	    echo "Warning: ignoring option: ${arg}"
++    esac
++done
++
++echo "build: ${build}" | tee config.log
++echo "host: ${host}" | tee -a config.log
++echo "target: ${target}" | tee -a config.log
++echo "prefix: ${prefix}" | tee -a config.log
++echo "srcdir: ${srcdir}" | tee -a config.log
++
++echo "Creating Makefile..." | tee -a config.log
++sed -e "s,@build@,${build}," \
++    -e "s,@host@,${host}," \
++    -e "s,@target@,${target}," \
++    -e "s,@prefix@,${prefix}," \
++    -e "s,@srcdir@,${srcdir}," < ${srcdir}/Makefile.in > Makefile
+--- libgnatvsn/Makefile.in~
++++ libgnatvsn/Makefile.in	2007-06-21 01:10:32.000000000 +0200
+@@ -0,0 +1,131 @@
++# Makefile for libgnatvsn.
++#   Copyright (c) 2006 Ludovic Brenta <ludovic@ludovic-brenta.org>
++#
++# This file 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 of the License, or
++# (at your option) any later version.
++# 
++# 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
++
++# Default target; must be first.
++all: libgnatvsn
++
++.SUFFIXES:
++
++CPUS := $(shell getconf _NPROCESSORS_ONLN)
++LIB_VERSION := $(strip $(shell grep ' Library_Version :' \
++                 @srcdir@/../gcc/ada/gnatvsn.ads | \
++	         sed -e 's/.*"\(.*\)".*/\1/'))
++GCC:=../gcc/xgcc -B../gcc/
++LIBGNAT_JUST_BUILT := -nostdinc -I../gcc/ada/rts
++CFLAGS := -g -O2 -gnatn
++BASEVER := $(shell cat @srcdir@/../gcc/BASE-VER)
++DEVPHASE := $(shell cat @srcdir@/../gcc/DEV-PHASE)
++DATESTAMP := $(shell cat @srcdir@/../gcc/DATESTAMP)
++
++# For use in version.c - double quoted strings, with appropriate
++# surrounding punctuation and spaces, and with the datestamp and
++# development phase collapsed to the empty string in release mode
++# (i.e. if DEVPHASE_c is empty).  The space immediately after the
++# comma in the $(if ...) constructs is significant - do not remove it.
++BASEVER_s   := "\"$(BASEVER)\""
++DEVPHASE_s  := "\"$(if $(DEVPHASE), ($(DEVPHASE)))\""
++DATESTAMP_s := "\"$(if $(DEVPHASE), $(DATESTAMP))\""
++
++ifneq (@build@,@host@)
++   CFLAGS += -b @host@
++endif
++
++.PHONY: libgnatvsn install
++libgnatvsn: libgnatvsn.so.$(LIB_VERSION) libgnatvsn.a
++
++VSN_SOURCES := alloc.ads atree.adb casing.adb csets.adb debug.adb einfo.adb \
++elists.adb fname.adb gnatvsn.adb hostparm.ads krunch.adb lib.adb namet.adb \
++nlists.adb opt.adb output.adb repinfo.adb scans.adb sinfo.adb sinput.adb \
++snames.adb stand.adb stringt.adb table.adb tree_in.adb tree_io.adb types.adb \
++uintp.adb uname.adb urealp.adb widechar.adb
++
++VSN_SEPARATES := lib-list.adb lib-sort.adb
++
++OBJECTS=$(patsubst %.ads,%.o,$(VSN_SOURCES:.adb=.o)) version.o
++
++vpath %.c @srcdir@/../gcc
++vpath %.ads @srcdir@/../gcc/ada
++vpath %.adb @srcdir@/../gcc/ada
++
++libgnatvsn.so.$(LIB_VERSION): $(addprefix obj-shared/,$(OBJECTS))
++	: # Make libgnatvsn.so
++	$(GCC) -o $@ -shared -fPIC -Wl,--soname,$@ $^ \
++	   -L../gcc/ada/rts -lgnat-$(LIB_VERSION)
++	ln -s libgnatvsn.so.$(LIB_VERSION) libgnatvsn.so
++	chmod a=r obj-shared/*.ali
++# Make the .ali files, but not the .o files, visible to the gnat tools.
++	cp -lp obj-shared/*.ali .
++
++$(addprefix obj-shared/,$(OBJECTS)): | obj-shared
++
++obj-shared/%.o: %.adb
++	$(GCC) -c -fPIC $(CFLAGS) $(LIBGNAT_JUST_BUILT) $< -o $@
++
++obj-shared/%.o: %.ads
++	$(GCC) -c -fPIC $(CFLAGS) $(LIBGNAT_JUST_BUILT) $< -o $@
++
++obj-shared/version.o: version.c
++	$(GCC) -c -fPIC -g -O2 \
++	   -DBASEVER=$(BASEVER_s) \
++	   -DDATESTAMP=$(DATESTAMP_s) \
++	   -DDEVPHASE=$(DEVPHASE_s) \
++	   $(realpath $<) -o $@
++
++obj-shared:
++	-mkdir $@
++
++libgnatvsn.a: $(addprefix obj-static/,$(OBJECTS))
++	: # Make libgnatvsn.a
++	ar rc $@ $^
++	ranlib $@
++
++$(addprefix obj-static/,$(OBJECTS)): | obj-static
++
++obj-static/%.o: %.adb
++	$(GCC) -c $(CFLAGS) $(LIBGNAT_JUST_BUILT) $< -o $@
++
++obj-static/%.o: %.ads
++	$(GCC) -c $(CFLAGS) $(LIBGNAT_JUST_BUILT) $< -o $@
++
++obj-static/version.o: version.c
++	$(GCC) -c -g -O2 \
++	   -DBASEVER=$(BASEVER_s) \
++	   -DDATESTAMP=$(DATESTAMP_s) \
++	   -DDEVPHASE=$(DEVPHASE_s) \
++	   $< -o $@
++
++obj-static:
++	-mkdir $@
++
++install: libgnatvsn
++	$(INSTALL_DATA) libgnatvsn.a $(DESTDIR)$(prefix)/lib
++	$(INSTALL_DATA) libgnatvsn.so.$(LIB_VERSION) $(DESTDIR)$(prefix)/lib
++	cd $(DESTDIR)$(prefix)/lib; \
++	ln -sf libgnatvsn.so.$(LIB_VERSION) libgnatvsn.so
++	mkdir -p $(DESTDIR)$(prefix)/share/ada/adainclude/gnatvsn
++	$(INSTALL_DATA) \
++	   $(addprefix @srcdir@/../gcc/ada/,$(VSN_SOURCES) $(VSN_SEPARATES)) \
++	   $(addprefix @srcdir@/../gcc/ada/,$(patsubst %.adb,%.ads,$(filter %.adb,$(VSN_SOURCES)))) \
++	   $(DESTDIR)$(prefix)/share/ada/adainclude/gnatvsn
++	mkdir -p $(DESTDIR)$(prefix)/lib/ada/adalib/gnatvsn
++	$(INSTALL) -m 0444 obj-shared/*.ali \
++	   $(DESTDIR)$(prefix)/lib/ada/adalib/gnatvsn
++	chmod a=r $(DESTDIR)$(prefix)/lib/ada/adalib/gnatvsn/*.ali
++
++.PHONY: clean
++clean:
++	rm -rf *.ali obj-static obj-shared libgnatvsn*
+--- Makefile.def~
++++ Makefile.def	2007-06-19 16:10:02.997279759 +0200
+@@ -120,6 +120,13 @@
+ 		missing= TAGS;
+ 		missing= install-info;
+ 		missing= installcheck; };
++host_modules= { module= libgnatvsn; no_check=true;
++		missing= info;
++		missing= dvi;
++		missing= html;
++		missing= TAGS;
++		missing= install-info;
++		missing= installcheck; };
+ host_modules= { module= gnattools; no_check=true;
+ 		missing= info;
+ 		missing= dvi;
+@@ -157,6 +164,13 @@
+ 		   missing= TAGS;
+ 		   missing= install-info;
+ 		   missing= installcheck; };
++target_modules = { module= libgnatvsn; no_check=true;
++		   missing= info;
++		   missing= dvi;
++		   missing= html;
++		   missing= TAGS;
++		   missing= install-info;
++		   missing= installcheck; };
+ target_modules = { module= libgomp; lib_path=.libs; };
+ 
+ // These are (some of) the make targets to be done in each subdirectory.
+@@ -315,6 +329,8 @@
+ dependencies = { module=all-fixincludes; on=all-libiberty; };
+ 
+ dependencies = { module=all-gnattools; on=all-libada; };
++dependencies = { module=all-gnattools; on=all-libgnatvsn; };
++dependencies = { module=all-libgnatvsn; on=all-libada; };
+ 
+ // Host modules specific to gdb.
+ dependencies = { module=configure-gdb; on=configure-intl; };
+--- Makefile.in~
++++ Makefile.in	2007-06-19 16:11:13.000000000 +0200
+@@ -640,6 +640,7 @@
+     maybe-configure-libtermcap \
+     maybe-configure-utils \
+     maybe-configure-libada \
++    maybe-configure-libgnatvsn \
+     maybe-configure-gnattools
+ .PHONY: configure-target
+ configure-target:  \
+@@ -662,6 +663,7 @@
+     maybe-configure-target-qthreads \
+     maybe-configure-target-rda \
+     maybe-configure-target-libada \
++    maybe-configure-target-libgnatvsn \
+     maybe-configure-target-libgomp
+ 
+ # The target built for a native non-bootstrap build.
+@@ -784,6 +786,7 @@
+ all-host: maybe-all-libtermcap
+ all-host: maybe-all-utils
+ all-host: maybe-all-libada
++all-host: maybe-all-libgnatvsn
+ all-host: maybe-all-gnattools
+ 
+ .PHONY: all-target
+@@ -807,6 +810,7 @@
+ all-target: maybe-all-target-qthreads
+ all-target: maybe-all-target-rda
+ all-target: maybe-all-target-libada
++all-target: maybe-all-target-libgnatvsn
+ all-target: maybe-all-target-libgomp
+ 
+ # Do a target for all the subdirectories.  A ``make do-X'' will do a
+@@ -893,6 +897,7 @@
+ info-host: maybe-info-libtermcap
+ info-host: maybe-info-utils
+ info-host: maybe-info-libada
++info-host: maybe-info-libgnatvsn
+ info-host: maybe-info-gnattools
+ 
+ .PHONY: info-target
+@@ -916,6 +921,7 @@
+ info-target: maybe-info-target-qthreads
+ info-target: maybe-info-target-rda
+ info-target: maybe-info-target-libada
++info-target: maybe-info-target-libgnatvsn
+ info-target: maybe-info-target-libgomp
+ 
+ .PHONY: do-dvi
+@@ -997,6 +1003,7 @@
+ dvi-host: maybe-dvi-libtermcap
+ dvi-host: maybe-dvi-utils
+ dvi-host: maybe-dvi-libada
++dvi-host: maybe-dvi-libgnatvsn
+ dvi-host: maybe-dvi-gnattools
+ 
+ .PHONY: dvi-target
+@@ -1020,6 +1027,7 @@
+ dvi-target: maybe-dvi-target-qthreads
+ dvi-target: maybe-dvi-target-rda
+ dvi-target: maybe-dvi-target-libada
++dvi-target: maybe-dvi-target-libgnatvsn
+ dvi-target: maybe-dvi-target-libgomp
+ 
+ .PHONY: do-pdf
+@@ -1101,6 +1109,7 @@
+ pdf-host: maybe-pdf-libtermcap
+ pdf-host: maybe-pdf-utils
+ pdf-host: maybe-pdf-libada
++pdf-host: maybe-pdf-libgnatvsn
+ pdf-host: maybe-pdf-gnattools
+ 
+ .PHONY: pdf-target
+@@ -1124,6 +1133,7 @@
+ pdf-target: maybe-pdf-target-qthreads
+ pdf-target: maybe-pdf-target-rda
+ pdf-target: maybe-pdf-target-libada
++pdf-target: maybe-pdf-target-libgnatvsn
+ pdf-target: maybe-pdf-target-libgomp
+ 
+ .PHONY: do-html
+@@ -1205,6 +1215,7 @@
+ html-host: maybe-html-libtermcap
+ html-host: maybe-html-utils
+ html-host: maybe-html-libada
++html-host: maybe-html-libgnatvsn
+ html-host: maybe-html-gnattools
+ 
+ .PHONY: html-target
+@@ -1228,6 +1239,7 @@
+ html-target: maybe-html-target-qthreads
+ html-target: maybe-html-target-rda
+ html-target: maybe-html-target-libada
++html-target: maybe-html-target-libgnatvsn
+ html-target: maybe-html-target-libgomp
+ 
+ .PHONY: do-TAGS
+@@ -1309,6 +1321,7 @@
+ TAGS-host: maybe-TAGS-libtermcap
+ TAGS-host: maybe-TAGS-utils
+ TAGS-host: maybe-TAGS-libada
++TAGS-host: maybe-TAGS-libgnatvsn
+ TAGS-host: maybe-TAGS-gnattools
+ 
+ .PHONY: TAGS-target
+@@ -1332,6 +1345,7 @@
+ TAGS-target: maybe-TAGS-target-qthreads
+ TAGS-target: maybe-TAGS-target-rda
+ TAGS-target: maybe-TAGS-target-libada
++TAGS-target: maybe-TAGS-target-libgnatvsn
+ TAGS-target: maybe-TAGS-target-libgomp
+ 
+ .PHONY: do-install-info
+@@ -1413,6 +1427,7 @@
+ install-info-host: maybe-install-info-libtermcap
+ install-info-host: maybe-install-info-utils
+ install-info-host: maybe-install-info-libada
++install-info-host: maybe-install-info-libgnatvsn
+ install-info-host: maybe-install-info-gnattools
+ 
+ .PHONY: install-info-target
+@@ -1436,6 +1451,7 @@
+ install-info-target: maybe-install-info-target-qthreads
+ install-info-target: maybe-install-info-target-rda
+ install-info-target: maybe-install-info-target-libada
++install-info-target: maybe-install-info-target-libgnatvsn
+ install-info-target: maybe-install-info-target-libgomp
+ 
+ .PHONY: do-install-html
+@@ -1517,6 +1533,7 @@
+ install-html-host: maybe-install-html-libtermcap
+ install-html-host: maybe-install-html-utils
+ install-html-host: maybe-install-html-libada
++install-html-host: maybe-install-html-libgnatvsn
+ install-html-host: maybe-install-html-gnattools
+ 
+ .PHONY: install-html-target
+@@ -1540,6 +1557,7 @@
+ install-html-target: maybe-install-html-target-qthreads
+ install-html-target: maybe-install-html-target-rda
+ install-html-target: maybe-install-html-target-libada
++install-html-target: maybe-install-html-target-libgnatvsn
+ install-html-target: maybe-install-html-target-libgomp
+ 
+ .PHONY: do-installcheck
+@@ -1621,6 +1639,7 @@
+ installcheck-host: maybe-installcheck-libtermcap
+ installcheck-host: maybe-installcheck-utils
+ installcheck-host: maybe-installcheck-libada
++installcheck-host: maybe-installcheck-libgnatvsn
+ installcheck-host: maybe-installcheck-gnattools
+ 
+ .PHONY: installcheck-target
+@@ -1644,6 +1663,7 @@
+ installcheck-target: maybe-installcheck-target-qthreads
+ installcheck-target: maybe-installcheck-target-rda
+ installcheck-target: maybe-installcheck-target-libada
++installcheck-target: maybe-installcheck-target-libgnatvsn
+ installcheck-target: maybe-installcheck-target-libgomp
+ 
+ .PHONY: do-mostlyclean
+@@ -1725,6 +1745,7 @@
+ mostlyclean-host: maybe-mostlyclean-libtermcap
+ mostlyclean-host: maybe-mostlyclean-utils
+ mostlyclean-host: maybe-mostlyclean-libada
++mostlyclean-host: maybe-mostlyclean-libgnatvsn
+ mostlyclean-host: maybe-mostlyclean-gnattools
+ 
+ .PHONY: mostlyclean-target
+@@ -1748,6 +1769,7 @@
+ mostlyclean-target: maybe-mostlyclean-target-qthreads
+ mostlyclean-target: maybe-mostlyclean-target-rda
+ mostlyclean-target: maybe-mostlyclean-target-libada
++mostlyclean-target: maybe-mostlyclean-target-libgnatvsn
+ mostlyclean-target: maybe-mostlyclean-target-libgomp
+ 
+ .PHONY: do-clean
+@@ -1829,6 +1851,7 @@
+ clean-host: maybe-clean-libtermcap
+ clean-host: maybe-clean-utils
+ clean-host: maybe-clean-libada
++clean-host: maybe-clean-libgnatvsn
+ clean-host: maybe-clean-gnattools
+ 
+ .PHONY: clean-target
+@@ -1852,6 +1875,7 @@
+ clean-target: maybe-clean-target-qthreads
+ clean-target: maybe-clean-target-rda
+ clean-target: maybe-clean-target-libada
++clean-target: maybe-clean-target-libgnatvsn
+ clean-target: maybe-clean-target-libgomp
+ 
+ .PHONY: do-distclean
+@@ -1933,6 +1957,7 @@
+ distclean-host: maybe-distclean-libtermcap
+ distclean-host: maybe-distclean-utils
+ distclean-host: maybe-distclean-libada
++distclean-host: maybe-distclean-libgnatvsn
+ distclean-host: maybe-distclean-gnattools
+ 
+ .PHONY: distclean-target
+@@ -1956,6 +1981,7 @@
+ distclean-target: maybe-distclean-target-qthreads
+ distclean-target: maybe-distclean-target-rda
+ distclean-target: maybe-distclean-target-libada
++distclean-target: maybe-distclean-target-libgnatvsn
+ distclean-target: maybe-distclean-target-libgomp
+ 
+ .PHONY: do-maintainer-clean
+@@ -2037,6 +2063,7 @@
+ maintainer-clean-host: maybe-maintainer-clean-libtermcap
+ maintainer-clean-host: maybe-maintainer-clean-utils
+ maintainer-clean-host: maybe-maintainer-clean-libada
++maintainer-clean-host: maybe-maintainer-clean-libgnatvsn
+ maintainer-clean-host: maybe-maintainer-clean-gnattools
+ 
+ .PHONY: maintainer-clean-target
+@@ -2060,6 +2087,7 @@
+ maintainer-clean-target: maybe-maintainer-clean-target-qthreads
+ maintainer-clean-target: maybe-maintainer-clean-target-rda
+ maintainer-clean-target: maybe-maintainer-clean-target-libada
++maintainer-clean-target: maybe-maintainer-clean-target-libgnatvsn
+ maintainer-clean-target: maybe-maintainer-clean-target-libgomp
+ 
+ 
+@@ -2197,6 +2225,7 @@
+     maybe-check-libtermcap \
+     maybe-check-utils \
+     maybe-check-libada \
++    maybe-check-libgnatvsn \
+     maybe-check-gnattools
+ 
+ .PHONY: check-target
+@@ -2220,6 +2249,7 @@
+     maybe-check-target-qthreads \
+     maybe-check-target-rda \
+     maybe-check-target-libada \
++    maybe-check-target-libgnatvsn \
+     maybe-check-target-libgomp
+ 
+ do-check:
+@@ -2327,6 +2357,7 @@
+     maybe-install-libtermcap \
+     maybe-install-utils \
+     maybe-install-libada \
++    maybe-install-libgnatvsn \
+     maybe-install-gnattools
+ 
+ .PHONY: install-host
+@@ -2399,6 +2430,7 @@
+     maybe-install-libtermcap \
+     maybe-install-utils \
+     maybe-install-libada \
++    maybe-install-libgnatvsn \
+     maybe-install-gnattools
+ 
+ .PHONY: install-target
+@@ -2422,6 +2454,7 @@
+     maybe-install-target-qthreads \
+     maybe-install-target-rda \
+     maybe-install-target-libada \
++    maybe-install-target-libgnatvsn \
+     maybe-install-target-libgomp
+ 
+ uninstall:
+@@ -33428,115 +33461,121 @@
+ 
+ 
+ 
+-.PHONY: configure-libada maybe-configure-libada
+-maybe-configure-libada:
++.PHONY: configure-libgnatvsn maybe-configure-libgnatvsn
++maybe-configure-libgnatvsn:
+ @if gcc-bootstrap
+-configure-libada: stage_current
++configure-libgnatvsn: stage_current
+ @endif gcc-bootstrap
+-@if libada
+-maybe-configure-libada: configure-libada
+-configure-libada: 
++@if libgnatvsn
++maybe-configure-libgnatvsn: configure-libgnatvsn
++configure-libgnatvsn: 
+ 	@: $(MAKE); $(unstage)
+ 	@r=`${PWD_COMMAND}`; export r; \
+ 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+-	test ! -f $(HOST_SUBDIR)/libada/Makefile || exit 0; \
+-	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libada ; \
++	test ! -f $(HOST_SUBDIR)/libgnatvsn/Makefile || exit 0; \
++	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libgnatvsn ; \
+ 	$(HOST_EXPORTS) \
+-	echo Configuring in $(HOST_SUBDIR)/libada; \
+-	cd "$(HOST_SUBDIR)/libada" || exit 1; \
++	echo Configuring in $(HOST_SUBDIR)/libgnatvsn; \
++	cd "$(HOST_SUBDIR)/libgnatvsn" || exit 1; \
+ 	case $(srcdir) in \
+ 	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+-	  *) topdir=`echo $(HOST_SUBDIR)/libada/ | \
++	  *) topdir=`echo $(HOST_SUBDIR)/libgnatvsn/ | \
+ 		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
+ 	esac; \
+-	srcdiroption="--srcdir=$${topdir}/libada"; \
+-	libsrcdir="$$s/libada"; \
++	srcdiroption="--srcdir=$${topdir}/libgnatvsn"; \
++	libsrcdir="$$s/libgnatvsn"; \
+ 	$(SHELL) $${libsrcdir}/configure \
+ 	  $(HOST_CONFIGARGS) $${srcdiroption}  \
+ 	  || exit 1
+-@endif libada
++@endif libgnatvsn
+ 
+ 
+ 
+ 
+ 
+-.PHONY: all-libada maybe-all-libada
+-maybe-all-libada:
++.PHONY: all-libgnatvsn maybe-all-libgnatvsn
++maybe-all-libgnatvsn:
+ @if gcc-bootstrap
+-all-libada: stage_current
++all-libgnatvsn: stage_current
+ @endif gcc-bootstrap
+-@if libada
+-TARGET-libada=all
+-maybe-all-libada: all-libada
+-all-libada: configure-libada
++@if libgnatvsn
++TARGET-libgnatvsn=all
++maybe-all-libgnatvsn: all-libgnatvsn
++all-libgnatvsn: configure-libgnatvsn
+ 	@: $(MAKE); $(unstage)
+ 	@r=`${PWD_COMMAND}`; export r; \
+ 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+ 	$(HOST_EXPORTS) \
+-	(cd $(HOST_SUBDIR)/libada && \
+-	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-libada))
+-@endif libada
++	(cd $(HOST_SUBDIR)/libgnatvsn && \
++	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-libgnatvsn))
++@endif libgnatvsn
+ 
+ 
+ 
+ 
+-.PHONY: check-libada maybe-check-libada
+-maybe-check-libada:
+-@if libada
+-maybe-check-libada: check-libada
++.PHONY: check-libgnatvsn maybe-check-libgnatvsn
++maybe-check-libgnatvsn:
++@if libgnatvsn
++maybe-check-libgnatvsn: check-libgnatvsn
+ 
+-check-libada:
++check-libgnatvsn:
+ 
+-@endif libada
++@endif libgnatvsn
+ 
+-.PHONY: install-libada maybe-install-libada
+-maybe-install-libada:
+-@if libada
+-maybe-install-libada: install-libada
++.PHONY: install-libgnatvsn maybe-install-libgnatvsn
++maybe-install-libgnatvsn:
++@if libgnatvsn
++maybe-install-libgnatvsn: install-libgnatvsn
+ 
+-install-libada:
++install-libgnatvsn: installdirs
++	@: $(MAKE); $(unstage)
++	@r=`${PWD_COMMAND}`; export r; \
++	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++	$(HOST_EXPORTS) \
++	(cd $(HOST_SUBDIR)/libgnatvsn && \
++	  $(MAKE) $(FLAGS_TO_PASS)  install)
+ 
+-@endif libada
++@endif libgnatvsn
+ 
+ # Other targets (info, dvi, pdf, etc.)
+ 
+-.PHONY: maybe-info-libada info-libada
+-maybe-info-libada:
+-@if libada
+-maybe-info-libada: info-libada
++.PHONY: maybe-info-libgnatvsn info-libgnatvsn
++maybe-info-libgnatvsn:
++@if libgnatvsn
++maybe-info-libgnatvsn: info-libgnatvsn
+ 
+-# libada doesn't support info.
+-info-libada:
++# libgnatvsn doesn't support info.
++info-libgnatvsn:
+ 
+-@endif libada
++@endif libgnatvsn
+ 
+-.PHONY: maybe-dvi-libada dvi-libada
+-maybe-dvi-libada:
+-@if libada
+-maybe-dvi-libada: dvi-libada
++.PHONY: maybe-dvi-libgnatvsn dvi-libgnatvsn
++maybe-dvi-libgnatvsn:
++@if libgnatvsn
++maybe-dvi-libgnatvsn: dvi-libgnatvsn
+ 
+-# libada doesn't support dvi.
+-dvi-libada:
++# libgnatvsn doesn't support dvi.
++dvi-libgnatvsn:
+ 
+-@endif libada
++@endif libgnatvsn
+ 
+-.PHONY: maybe-pdf-libada pdf-libada
+-maybe-pdf-libada:
+-@if libada
+-maybe-pdf-libada: pdf-libada
++.PHONY: maybe-pdf-libgnatvsn pdf-libgnatvsn
++maybe-pdf-libgnatvsn:
++@if libgnatvsn
++maybe-pdf-libgnatvsn: pdf-libgnatvsn
+ 
+-pdf-libada: \
+-    configure-libada 
++pdf-libgnatvsn: \
++    configure-libgnatvsn 
+ 	@: $(MAKE); $(unstage)
+-	@[ -f ./libada/Makefile ] || exit 0; \
++	@[ -f ./libgnatvsn/Makefile ] || exit 0; \
+ 	r=`${PWD_COMMAND}`; export r; \
+ 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+ 	$(HOST_EXPORTS) \
+ 	for flag in $(EXTRA_HOST_FLAGS) ; do \
+ 	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+ 	done; \
+-	echo "Doing pdf in libada" ; \
+-	(cd $(HOST_SUBDIR)/libada && \
++	echo "Doing pdf in libgnatvsn" ; \
++	(cd $(HOST_SUBDIR)/libgnatvsn && \
+ 	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+ 	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+ 	          "RANLIB=$${RANLIB}" \
+@@ -33544,56 +33583,56 @@
+ 	          pdf) \
+ 	  || exit 1
+ 
+-@endif libada
++@endif libgnatvsn
+ 
+-.PHONY: maybe-html-libada html-libada
+-maybe-html-libada:
+-@if libada
+-maybe-html-libada: html-libada
++.PHONY: maybe-html-libgnatvsn html-libgnatvsn
++maybe-html-libgnatvsn:
++@if libgnatvsn
++maybe-html-libgnatvsn: html-libgnatvsn
+ 
+-# libada doesn't support html.
+-html-libada:
++# libgnatvsn doesn't support html.
++html-libgnatvsn:
+ 
+-@endif libada
++@endif libgnatvsn
+ 
+-.PHONY: maybe-TAGS-libada TAGS-libada
+-maybe-TAGS-libada:
+-@if libada
+-maybe-TAGS-libada: TAGS-libada
++.PHONY: maybe-TAGS-libgnatvsn TAGS-libgnatvsn
++maybe-TAGS-libgnatvsn:
++@if libgnatvsn
++maybe-TAGS-libgnatvsn: TAGS-libgnatvsn
+ 
+-# libada doesn't support TAGS.
+-TAGS-libada:
++# libgnatvsn doesn't support TAGS.
++TAGS-libgnatvsn:
+ 
+-@endif libada
++@endif libgnatvsn
+ 
+-.PHONY: maybe-install-info-libada install-info-libada
+-maybe-install-info-libada:
+-@if libada
+-maybe-install-info-libada: install-info-libada
++.PHONY: maybe-install-info-libgnatvsn install-info-libgnatvsn
++maybe-install-info-libgnatvsn:
++@if libgnatvsn
++maybe-install-info-libgnatvsn: install-info-libgnatvsn
+ 
+-# libada doesn't support install-info.
+-install-info-libada:
++# libgnatvsn doesn't support install-info.
++install-info-libgnatvsn:
+ 
+-@endif libada
++@endif libgnatvsn
+ 
+-.PHONY: maybe-install-html-libada install-html-libada
+-maybe-install-html-libada:
+-@if libada
+-maybe-install-html-libada: install-html-libada
++.PHONY: maybe-install-html-libgnatvsn install-html-libgnatvsn
++maybe-install-html-libgnatvsn:
++@if libgnatvsn
++maybe-install-html-libgnatvsn: install-html-libgnatvsn
+ 
+-install-html-libada: \
+-    configure-libada \
+-    html-libada 
++install-html-libgnatvsn: \
++    configure-libgnatvsn \
++    html-libgnatvsn 
+ 	@: $(MAKE); $(unstage)
+-	@[ -f ./libada/Makefile ] || exit 0; \
++	@[ -f ./libgnatvsn/Makefile ] || exit 0; \
+ 	r=`${PWD_COMMAND}`; export r; \
+ 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+ 	$(HOST_EXPORTS) \
+ 	for flag in $(EXTRA_HOST_FLAGS) ; do \
+ 	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+ 	done; \
+-	echo "Doing install-html in libada" ; \
+-	(cd $(HOST_SUBDIR)/libada && \
++	echo "Doing install-html in libgnatvsn" ; \
++	(cd $(HOST_SUBDIR)/libgnatvsn && \
+ 	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+ 	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+ 	          "RANLIB=$${RANLIB}" \
+@@ -33601,34 +33640,34 @@
+ 	          install-html) \
+ 	  || exit 1
+ 
+-@endif libada
++@endif libgnatvsn
+ 
+-.PHONY: maybe-installcheck-libada installcheck-libada
+-maybe-installcheck-libada:
+-@if libada
+-maybe-installcheck-libada: installcheck-libada
++.PHONY: maybe-installcheck-libgnatvsn installcheck-libgnatvsn
++maybe-installcheck-libgnatvsn:
++@if libgnatvsn
++maybe-installcheck-libgnatvsn: installcheck-libgnatvsn
+ 
+-# libada doesn't support installcheck.
+-installcheck-libada:
++# libgnatvsn doesn't support installcheck.
++installcheck-libgnatvsn:
+ 
+-@endif libada
++@endif libgnatvsn
+ 
+-.PHONY: maybe-mostlyclean-libada mostlyclean-libada
+-maybe-mostlyclean-libada:
+-@if libada
+-maybe-mostlyclean-libada: mostlyclean-libada
++.PHONY: maybe-mostlyclean-libgnatvsn mostlyclean-libgnatvsn
++maybe-mostlyclean-libgnatvsn:
++@if libgnatvsn
++maybe-mostlyclean-libgnatvsn: mostlyclean-libgnatvsn
+ 
+-mostlyclean-libada: 
++mostlyclean-libgnatvsn: 
+ 	@: $(MAKE); $(unstage)
+-	@[ -f ./libada/Makefile ] || exit 0; \
++	@[ -f ./libgnatvsn/Makefile ] || exit 0; \
+ 	r=`${PWD_COMMAND}`; export r; \
+ 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+ 	$(HOST_EXPORTS) \
+ 	for flag in $(EXTRA_HOST_FLAGS) ; do \
+ 	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+ 	done; \
+-	echo "Doing mostlyclean in libada" ; \
+-	(cd $(HOST_SUBDIR)/libada && \
++	echo "Doing mostlyclean in libgnatvsn" ; \
++	(cd $(HOST_SUBDIR)/libgnatvsn && \
+ 	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+ 	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+ 	          "RANLIB=$${RANLIB}" \
+@@ -33636,24 +33675,24 @@
+ 	          mostlyclean) \
+ 	  || exit 1
+ 
+-@endif libada
++@endif libgnatvsn
+ 
+-.PHONY: maybe-clean-libada clean-libada
+-maybe-clean-libada:
+-@if libada
+-maybe-clean-libada: clean-libada
++.PHONY: maybe-clean-libgnatvsn clean-libgnatvsn
++maybe-clean-libgnatvsn:
++@if libgnatvsn
++maybe-clean-libgnatvsn: clean-libgnatvsn
+ 
+-clean-libada: 
++clean-libgnatvsn: 
+ 	@: $(MAKE); $(unstage)
+-	@[ -f ./libada/Makefile ] || exit 0; \
++	@[ -f ./libgnatvsn/Makefile ] || exit 0; \
+ 	r=`${PWD_COMMAND}`; export r; \
+ 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+ 	$(HOST_EXPORTS) \
+ 	for flag in $(EXTRA_HOST_FLAGS) ; do \
+ 	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+ 	done; \
+-	echo "Doing clean in libada" ; \
+-	(cd $(HOST_SUBDIR)/libada && \
++	echo "Doing clean in libgnatvsn" ; \
++	(cd $(HOST_SUBDIR)/libgnatvsn && \
+ 	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+ 	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+ 	          "RANLIB=$${RANLIB}" \
+@@ -33661,24 +33700,24 @@
+ 	          clean) \
+ 	  || exit 1
+ 
+-@endif libada
++@endif libgnatvsn
+ 
+-.PHONY: maybe-distclean-libada distclean-libada
+-maybe-distclean-libada:
+-@if libada
+-maybe-distclean-libada: distclean-libada
++.PHONY: maybe-distclean-libgnatvsn distclean-libgnatvsn
++maybe-distclean-libgnatvsn:
++@if libgnatvsn
++maybe-distclean-libgnatvsn: distclean-libgnatvsn
+ 
+-distclean-libada: 
++distclean-libgnatvsn: 
+ 	@: $(MAKE); $(unstage)
+-	@[ -f ./libada/Makefile ] || exit 0; \
++	@[ -f ./libgnatvsn/Makefile ] || exit 0; \
+ 	r=`${PWD_COMMAND}`; export r; \
+ 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+ 	$(HOST_EXPORTS) \
+ 	for flag in $(EXTRA_HOST_FLAGS) ; do \
+ 	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+ 	done; \
+-	echo "Doing distclean in libada" ; \
+-	(cd $(HOST_SUBDIR)/libada && \
++	echo "Doing distclean in libgnatvsn" ; \
++	(cd $(HOST_SUBDIR)/libgnatvsn && \
+ 	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+ 	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+ 	          "RANLIB=$${RANLIB}" \
+@@ -33686,24 +33725,24 @@
+ 	          distclean) \
+ 	  || exit 1
+ 
+-@endif libada
++@endif libgnatvsn
+ 
+-.PHONY: maybe-maintainer-clean-libada maintainer-clean-libada
+-maybe-maintainer-clean-libada:
+-@if libada
+-maybe-maintainer-clean-libada: maintainer-clean-libada
++.PHONY: maybe-maintainer-clean-libgnatvsn maintainer-clean-libgnatvsn
++maybe-maintainer-clean-libgnatvsn:
++@if libgnatvsn
++maybe-maintainer-clean-libgnatvsn: maintainer-clean-libgnatvsn
+ 
+-maintainer-clean-libada: 
++maintainer-clean-libgnatvsn: 
+ 	@: $(MAKE); $(unstage)
+-	@[ -f ./libada/Makefile ] || exit 0; \
++	@[ -f ./libgnatvsn/Makefile ] || exit 0; \
+ 	r=`${PWD_COMMAND}`; export r; \
+ 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+ 	$(HOST_EXPORTS) \
+ 	for flag in $(EXTRA_HOST_FLAGS) ; do \
+ 	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+ 	done; \
+-	echo "Doing maintainer-clean in libada" ; \
+-	(cd $(HOST_SUBDIR)/libada && \
++	echo "Doing maintainer-clean in libgnatvsn" ; \
++	(cd $(HOST_SUBDIR)/libgnatvsn && \
+ 	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+ 	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+ 	          "RANLIB=$${RANLIB}" \
+@@ -33711,7 +33750,7 @@
+ 	          maintainer-clean) \
+ 	  || exit 1
+ 
+-@endif libada
++@endif libgnatvsn
+ 
+ 
+ 
+@@ -41675,6 +41714,317 @@
+ 
+ 
+ 
++.PHONY: configure-target-libgnatvsn maybe-configure-target-libgnatvsn
++maybe-configure-target-libgnatvsn:
++@if gcc-bootstrap
++configure-target-libgnatvsn: stage_current
++@endif gcc-bootstrap
++@if target-libgnatvsn
++maybe-configure-target-libgnatvsn: configure-target-libgnatvsn
++configure-target-libgnatvsn: 
++	@: $(MAKE); $(unstage)
++	@r=`${PWD_COMMAND}`; export r; \
++	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++	echo "Checking multilib configuration for libgnatvsn..."; \
++	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgnatvsn ; \
++	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgnatvsn/multilib.tmp 2> /dev/null ; \
++	if test -r $(TARGET_SUBDIR)/libgnatvsn/multilib.out; then \
++	  if cmp -s $(TARGET_SUBDIR)/libgnatvsn/multilib.tmp $(TARGET_SUBDIR)/libgnatvsn/multilib.out; then \
++	    rm -f $(TARGET_SUBDIR)/libgnatvsn/multilib.tmp; \
++	  else \
++	    rm -f $(TARGET_SUBDIR)/libgnatvsn/Makefile; \
++	    mv $(TARGET_SUBDIR)/libgnatvsn/multilib.tmp $(TARGET_SUBDIR)/libgnatvsn/multilib.out; \
++	  fi; \
++	else \
++	  mv $(TARGET_SUBDIR)/libgnatvsn/multilib.tmp $(TARGET_SUBDIR)/libgnatvsn/multilib.out; \
++	fi; \
++	test ! -f $(TARGET_SUBDIR)/libgnatvsn/Makefile || exit 0; \
++	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgnatvsn ; \
++	$(NORMAL_TARGET_EXPORTS) \
++	echo Configuring in $(TARGET_SUBDIR)/libgnatvsn; \
++	cd "$(TARGET_SUBDIR)/libgnatvsn" || exit 1; \
++	case $(srcdir) in \
++	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
++	  *) topdir=`echo $(TARGET_SUBDIR)/libgnatvsn/ | \
++		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
++	esac; \
++	srcdiroption="--srcdir=$${topdir}/libgnatvsn"; \
++	libsrcdir="$$s/libgnatvsn"; \
++	rm -f no-such-file || : ; \
++	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
++	  $(TARGET_CONFIGARGS) $${srcdiroption}  \
++	  || exit 1
++@endif target-libgnatvsn
++
++
++
++
++
++.PHONY: all-target-libgnatvsn maybe-all-target-libgnatvsn
++maybe-all-target-libgnatvsn:
++@if gcc-bootstrap
++all-target-libgnatvsn: stage_current
++@endif gcc-bootstrap
++@if target-libgnatvsn
++TARGET-target-libgnatvsn=all
++maybe-all-target-libgnatvsn: all-target-libgnatvsn
++all-target-libgnatvsn: configure-target-libgnatvsn
++	@: $(MAKE); $(unstage)
++	@r=`${PWD_COMMAND}`; export r; \
++	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++	$(NORMAL_TARGET_EXPORTS) \
++	(cd $(TARGET_SUBDIR)/libgnatvsn && \
++	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libgnatvsn))
++@endif target-libgnatvsn
++
++
++
++
++
++.PHONY: check-target-libgnatvsn maybe-check-target-libgnatvsn
++maybe-check-target-libgnatvsn:
++@if target-libgnatvsn
++maybe-check-target-libgnatvsn: check-target-libgnatvsn
++
++# Dummy target for uncheckable module.
++check-target-libgnatvsn:
++
++@endif target-libgnatvsn
++
++.PHONY: install-target-libgnatvsn maybe-install-target-libgnatvsn
++maybe-install-target-libgnatvsn:
++@if target-libgnatvsn
++maybe-install-target-libgnatvsn: install-target-libgnatvsn
++
++install-target-libgnatvsn: installdirs
++	@: $(MAKE); $(unstage)
++	@r=`${PWD_COMMAND}`; export r; \
++	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++	$(NORMAL_TARGET_EXPORTS) \
++	(cd $(TARGET_SUBDIR)/libgnatvsn && \
++	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
++
++@endif target-libgnatvsn
++
++# Other targets (info, dvi, pdf, etc.)
++
++.PHONY: maybe-info-target-libgnatvsn info-target-libgnatvsn
++maybe-info-target-libgnatvsn:
++@if target-libgnatvsn
++maybe-info-target-libgnatvsn: info-target-libgnatvsn
++
++# libgnatvsn doesn't support info.
++info-target-libgnatvsn:
++
++@endif target-libgnatvsn
++
++.PHONY: maybe-dvi-target-libgnatvsn dvi-target-libgnatvsn
++maybe-dvi-target-libgnatvsn:
++@if target-libgnatvsn
++maybe-dvi-target-libgnatvsn: dvi-target-libgnatvsn
++
++# libgnatvsn doesn't support dvi.
++dvi-target-libgnatvsn:
++
++@endif target-libgnatvsn
++
++.PHONY: maybe-pdf-target-libgnatvsn pdf-target-libgnatvsn
++maybe-pdf-target-libgnatvsn:
++@if target-libgnatvsn
++maybe-pdf-target-libgnatvsn: pdf-target-libgnatvsn
++
++pdf-target-libgnatvsn: \
++    configure-target-libgnatvsn 
++	@: $(MAKE); $(unstage)
++	@[ -f $(TARGET_SUBDIR)/libgnatvsn/Makefile ] || exit 0 ; \
++	r=`${PWD_COMMAND}`; export r; \
++	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++	$(NORMAL_TARGET_EXPORTS) \
++	echo "Doing pdf in $(TARGET_SUBDIR)/libgnatvsn" ; \
++	for flag in $(EXTRA_TARGET_FLAGS); do \
++	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
++	done; \
++	(cd $(TARGET_SUBDIR)/libgnatvsn && \
++	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
++	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
++	          "RANLIB=$${RANLIB}" \
++	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
++	           pdf) \
++	  || exit 1
++
++@endif target-libgnatvsn
++
++.PHONY: maybe-html-target-libgnatvsn html-target-libgnatvsn
++maybe-html-target-libgnatvsn:
++@if target-libgnatvsn
++maybe-html-target-libgnatvsn: html-target-libgnatvsn
++
++# libgnatvsn doesn't support html.
++html-target-libgnatvsn:
++
++@endif target-libgnatvsn
++
++.PHONY: maybe-TAGS-target-libgnatvsn TAGS-target-libgnatvsn
++maybe-TAGS-target-libgnatvsn:
++@if target-libgnatvsn
++maybe-TAGS-target-libgnatvsn: TAGS-target-libgnatvsn
++
++# libgnatvsn doesn't support TAGS.
++TAGS-target-libgnatvsn:
++
++@endif target-libgnatvsn
++
++.PHONY: maybe-install-info-target-libgnatvsn install-info-target-libgnatvsn
++maybe-install-info-target-libgnatvsn:
++@if target-libgnatvsn
++maybe-install-info-target-libgnatvsn: install-info-target-libgnatvsn
++
++# libgnatvsn doesn't support install-info.
++install-info-target-libgnatvsn:
++
++@endif target-libgnatvsn
++
++.PHONY: maybe-install-html-target-libgnatvsn install-html-target-libgnatvsn
++maybe-install-html-target-libgnatvsn:
++@if target-libgnatvsn
++maybe-install-html-target-libgnatvsn: install-html-target-libgnatvsn
++
++install-html-target-libgnatvsn: \
++    configure-target-libgnatvsn \
++    html-target-libgnatvsn 
++	@: $(MAKE); $(unstage)
++	@[ -f $(TARGET_SUBDIR)/libgnatvsn/Makefile ] || exit 0 ; \
++	r=`${PWD_COMMAND}`; export r; \
++	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++	$(NORMAL_TARGET_EXPORTS) \
++	echo "Doing install-html in $(TARGET_SUBDIR)/libgnatvsn" ; \
++	for flag in $(EXTRA_TARGET_FLAGS); do \
++	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
++	done; \
++	(cd $(TARGET_SUBDIR)/libgnatvsn && \
++	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
++	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
++	          "RANLIB=$${RANLIB}" \
++	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
++	           install-html) \
++	  || exit 1
++
++@endif target-libgnatvsn
++
++.PHONY: maybe-installcheck-target-libgnatvsn installcheck-target-libgnatvsn
++maybe-installcheck-target-libgnatvsn:
++@if target-libgnatvsn
++maybe-installcheck-target-libgnatvsn: installcheck-target-libgnatvsn
++
++# libgnatvsn doesn't support installcheck.
++installcheck-target-libgnatvsn:
++
++@endif target-libgnatvsn
++
++.PHONY: maybe-mostlyclean-target-libgnatvsn mostlyclean-target-libgnatvsn
++maybe-mostlyclean-target-libgnatvsn:
++@if target-libgnatvsn
++maybe-mostlyclean-target-libgnatvsn: mostlyclean-target-libgnatvsn
++
++mostlyclean-target-libgnatvsn: 
++	@: $(MAKE); $(unstage)
++	@[ -f $(TARGET_SUBDIR)/libgnatvsn/Makefile ] || exit 0 ; \
++	r=`${PWD_COMMAND}`; export r; \
++	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++	$(NORMAL_TARGET_EXPORTS) \
++	echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgnatvsn" ; \
++	for flag in $(EXTRA_TARGET_FLAGS); do \
++	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
++	done; \
++	(cd $(TARGET_SUBDIR)/libgnatvsn && \
++	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
++	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
++	          "RANLIB=$${RANLIB}" \
++	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
++	           mostlyclean) \
++	  || exit 1
++
++@endif target-libgnatvsn
++
++.PHONY: maybe-clean-target-libgnatvsn clean-target-libgnatvsn
++maybe-clean-target-libgnatvsn:
++@if target-libgnatvsn
++maybe-clean-target-libgnatvsn: clean-target-libgnatvsn
++
++clean-target-libgnatvsn: 
++	@: $(MAKE); $(unstage)
++	@[ -f $(TARGET_SUBDIR)/libgnatvsn/Makefile ] || exit 0 ; \
++	r=`${PWD_COMMAND}`; export r; \
++	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++	$(NORMAL_TARGET_EXPORTS) \
++	echo "Doing clean in $(TARGET_SUBDIR)/libgnatvsn" ; \
++	for flag in $(EXTRA_TARGET_FLAGS); do \
++	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
++	done; \
++	(cd $(TARGET_SUBDIR)/libgnatvsn && \
++	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
++	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
++	          "RANLIB=$${RANLIB}" \
++	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
++	           clean) \
++	  || exit 1
++
++@endif target-libgnatvsn
++
++.PHONY: maybe-distclean-target-libgnatvsn distclean-target-libgnatvsn
++maybe-distclean-target-libgnatvsn:
++@if target-libgnatvsn
++maybe-distclean-target-libgnatvsn: distclean-target-libgnatvsn
++
++distclean-target-libgnatvsn: 
++	@: $(MAKE); $(unstage)
++	@[ -f $(TARGET_SUBDIR)/libgnatvsn/Makefile ] || exit 0 ; \
++	r=`${PWD_COMMAND}`; export r; \
++	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++	$(NORMAL_TARGET_EXPORTS) \
++	echo "Doing distclean in $(TARGET_SUBDIR)/libgnatvsn" ; \
++	for flag in $(EXTRA_TARGET_FLAGS); do \
++	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
++	done; \
++	(cd $(TARGET_SUBDIR)/libgnatvsn && \
++	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
++	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
++	          "RANLIB=$${RANLIB}" \
++	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
++	           distclean) \
++	  || exit 1
++
++@endif target-libgnatvsn
++
++.PHONY: maybe-maintainer-clean-target-libgnatvsn maintainer-clean-target-libgnatvsn
++maybe-maintainer-clean-target-libgnatvsn:
++@if target-libgnatvsn
++maybe-maintainer-clean-target-libgnatvsn: maintainer-clean-target-libgnatvsn
++
++maintainer-clean-target-libgnatvsn: 
++	@: $(MAKE); $(unstage)
++	@[ -f $(TARGET_SUBDIR)/libgnatvsn/Makefile ] || exit 0 ; \
++	r=`${PWD_COMMAND}`; export r; \
++	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++	$(NORMAL_TARGET_EXPORTS) \
++	echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libgnatvsn" ; \
++	for flag in $(EXTRA_TARGET_FLAGS); do \
++	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
++	done; \
++	(cd $(TARGET_SUBDIR)/libgnatvsn && \
++	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
++	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
++	          "RANLIB=$${RANLIB}" \
++	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
++	           maintainer-clean) \
++	  || exit 1
++
++@endif target-libgnatvsn
++
++
++
++
++
+ .PHONY: configure-target-libgomp maybe-configure-target-libgomp
+ maybe-configure-target-libgomp:
+ @if gcc-bootstrap
+@@ -43570,6 +43920,7 @@
+ configure-target-qthreads: stage_last
+ configure-target-rda: stage_last
+ configure-target-libada: stage_last
++configure-target-libgnatvsn: stage_last
+ configure-target-libgomp: stage_last
+ @endif gcc-bootstrap
+ 
+@@ -43593,6 +43944,7 @@
+ configure-target-qthreads: maybe-all-gcc
+ configure-target-rda: maybe-all-gcc
+ configure-target-libada: maybe-all-gcc
++configure-target-libgnatvsn: maybe-all-gcc
+ configure-target-libgomp: maybe-all-gcc
+ @endif gcc-no-bootstrap
+ 
+@@ -43829,6 +44181,8 @@
+ all-stagefeedback-libcpp: maybe-all-stagefeedback-intl
+ all-fixincludes: maybe-all-libiberty
+ all-gnattools: maybe-all-libada
++all-gnattools: maybe-all-libgnatvsn
++all-libgnatvsn: maybe-all-libada
+ configure-gdb: maybe-configure-intl
+ configure-gdb: maybe-configure-sim
+ all-gdb: maybe-all-intl
--- gcj-4.2-4.2-20070707.orig/debian/patches/libjava-stacktrace.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/libjava-stacktrace.dpatch
@@ -0,0 +1,70 @@
+#! /bin/sh -e
+
+# DP: libgcj: Lookup source file name and line number in separated
+# DP: debug files found in /usr/lib/debug
+
+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
+
+
+--- libjava/stacktrace.cc.orig	2006-06-16 13:54:07.078577632 +0200
++++ libjava/stacktrace.cc	2006-06-16 13:56:08.032189888 +0200
+@@ -20,6 +20,11 @@
+ #endif
+ 
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#ifdef HAVE_UNISTD_H
++#include <unistd.h>
++#endif
+ 
+ #include <java/lang/Class.h>
+ #include <java/lang/Long.h>
+@@ -222,6 +227,28 @@
+       finder->lookup (binaryName, (jlong) offset);
+       *sourceFileName = finder->getSourceFile();
+       *lineNum = finder->getLineNum();
++      if (*lineNum == -1 && info.file_name[0] == '/')
++	{
++	  const char *debugPrefix = "/usr/lib/debug";
++	  char *debugPath = (char *) malloc (strlen(debugPrefix)
++					     + strlen(info.file_name)
++					     + 2);
++
++	  if (debugPath)
++	    {
++	      strcpy (debugPath, debugPrefix);
++	      strcat (debugPath, info.file_name);
++	      //printf ("%s: 0x%x\n", debugPath, offset);
++	      if (!access (debugPath, R_OK))
++		{
++		  binaryName = JvNewStringUTF (debugPath);
++		  finder->lookup (binaryName, (jlong) offset);
++		  *sourceFileName = finder->getSourceFile();
++		  *lineNum = finder->getLineNum();
++		}
++	      free (debugPath);
++	    }
++	}
+       if (*lineNum == -1 && NameFinder::showRaw())
+         {
+           gnu::gcj::runtime::StringBuffer *t =
--- gcj-4.2-4.2-20070707.orig/debian/patches/gpc-gcc-4.x.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/gpc-gcc-4.x.dpatch
@@ -0,0 +1,42 @@
+#! /bin/sh -e
+
+# DP: The gpc patch from the gpc tarball.
+
+if [ "x$gpc_gcc_patch" = "x" ]
+then
+  gpc_gcc_patch=gcc-3.2.1.diff
+fi
+
+pdir=gcc
+if [ $# -eq 3 -a "$2" = '-d' ]; then
+    pdir="$3/gcc"
+elif [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+
+gpc_gcc_patch=$pdir/p/diffs/gcc-4.1.diff
+gpc_gcc_patch=debian/patches/gpc-gcc-4.1.diff
+
+case "$1" in
+    -patch)
+	# keep the backup files ... to regenerate p/diffs/${gpc_gcc_patch}
+	# dan@debian.org: no, don't.  Apply it by hand if you need to regen.
+	# get the patch from the gpc source
+	echo Using patch file ${gpc_gcc_patch}
+	patch -d $pdir -f -p2 < ${gpc_gcc_patch}
+	#pf=`echo $0 | sed 's/\.dpatch/.diff/'`
+	#patch -d $pdir -f -p1 < $pf
+	;;
+    -unpatch)
+	# get the patch from the gpc source
+	echo Using patch file ${gpc_gcc_patch}
+	patch -d $pdir -f -R -p2 < ${gpc_gcc_patch}
+	#pf=`echo $0 | sed 's/\.dpatch/.diff/'`
+	#patch -d $pdir -f -R -p1 < $pf
+	;;
+    *)
+	echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+	exit 1
+esac
+exit 0
--- gcj-4.2-4.2-20070707.orig/debian/patches/ld-lib-path.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/ld-lib-path.dpatch
@@ -0,0 +1,41 @@
+#! /bin/sh -e
+
+# DP: Add <builddir>/gcc/ada/rts to the runtime gcc library path.
+
+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} && autoconf
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
+        cd ${dir} && autoconf
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+--- configure.in~	2004-11-13 20:06:43.000000000 +0100
++++ configure.in	2004-11-14 09:24:02.000000000 +0100
+@@ -2344,9 +2344,9 @@
+     *)
+       eval "d=\$$RPATH_ENVVAR"
+       if test x"$d" != x; then
+-	d="$pwd/gcc:$d"
++	d="$pwd/gcc:$pwd/gcc/ada/rts:$d"
+       else
+-	d="$pwd/gcc"
++	d="$pwd/gcc:$pwd/gcc/ada/rts"
+     fi
+     SET_GCC_LIB_PATH="\$(RPATH_ENVVAR)=$d; export \$(RPATH_ENVVAR);"
+     ;;
--- gcj-4.2-4.2-20070707.orig/debian/patches/m68k-return.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/m68k-return.dpatch
@@ -0,0 +1,47 @@
+#! /bin/sh -e
+
+# All lines beginning with `# DPATCH:' are a description of the patch.
+# DP: don't use single return if fp register have to be restored
+# DP: fixes 386864
+
+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 -p1 < $0
+        #cd ${dir}gcc && autoconf
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p1 < $0
+        #rm ${dir}gcc/configure
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+---
+
+ gcc/config/m68k/m68k.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: gcc-4.1/gcc/config/m68k/m68k.c
+===================================================================
+--- gcc-4.1/gcc/config/m68k/m68k.c~	2006-08-09 01:40:20.000000000 +0200
++++ gcc-4.1/gcc/config/m68k/m68k.c	2007-05-19 08:23:35.000000000 +0200
+@@ -778,7 +778,7 @@
+   /* We can output the epilogue as RTL only if no registers need to be
+      restored.  */
+   m68k_compute_frame_layout ();
+-  return current_frame.reg_no ? false : true;
++  return (current_frame.reg_no + current_frame.fpu_no) ? false : true;
+ }
+ 
+ /* This function generates the assembly code for function exit,
--- gcj-4.2-4.2-20070707.orig/debian/patches/link-libs.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/link-libs.dpatch
@@ -0,0 +1,157 @@
+#! /bin/sh -e
+
+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/config/t-slibgcc-elf-ver.orig	2006-10-03 18:16:53.094898500 +0200
++++ gcc/config/t-slibgcc-elf-ver	2006-10-03 18:17:40.061833750 +0200
+@@ -14,6 +14,7 @@
+ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \
+ 	-Wl,--soname=$(SHLIB_SONAME) \
+ 	-Wl,--version-script=$(SHLIB_MAP) \
++	-Wl,-O1 \
+ 	-o $(SHLIB_DIR)/$(SHLIB_SONAME).tmp @multilib_flags@ \
+ 	$(SHLIB_OBJS) $(SHLIB_LC) && \
+ 	rm -f $(SHLIB_DIR)/$(SHLIB_SOLINK) && \
+--- libstdc++-v3/src/Makefile.am.orig	2006-10-03 18:16:53.186904250 +0200
++++ libstdc++-v3/src/Makefile.am	2006-10-03 18:17:40.121837500 +0200
+@@ -185,6 +185,7 @@
+ libstdc___la_DEPENDENCIES = ${version_dep} $(libstdc___la_LIBADD)
+ 
+ libstdc___la_LDFLAGS = \
++	-Wl,-O1 \
+ 	-version-info $(libtool_VERSION) ${version_arg} -lm 
+ 
+ # Use special rules for the deprecated source files so that they find
+--- libstdc++-v3/src/Makefile.in.orig	2006-10-03 18:16:53.206905500 +0200
++++ libstdc++-v3/src/Makefile.in	2006-10-03 18:17:40.137838500 +0200
+@@ -387,6 +387,7 @@
+ 
+ libstdc___la_DEPENDENCIES = ${version_dep} $(libstdc___la_LIBADD)
+ libstdc___la_LDFLAGS = \
++	-Wl,-O1 \
+ 	-version-info $(libtool_VERSION) ${version_arg} -lm 
+ 
+ 
+--- libobjc/Makefile.in.orig	2006-10-03 18:16:53.098898750 +0200
++++ libobjc/Makefile.in	2006-10-03 18:17:40.061833750 +0200
+@@ -276,11 +276,13 @@
+ libobjc$(libext).la: $(OBJS)
+ 	$(LIBTOOL_LINK) $(CC) -o $@ $(OBJS) \
+ 		-rpath $(toolexeclibdir) \
++		-Wl,-O1 \
+ 		-version-info $(LIBOBJC_VERSION) $(extra_ldflags_libobjc)
+ 
+ libobjc_gc$(libext).la: $(OBJS_GC)
+ 	$(LIBTOOL_LINK) $(CC) -o $@ $(OBJS_GC) \
+ 		-rpath $(toolexeclibdir) \
++		-Wl,-O1 \
+ 		-version-info $(LIBOBJC_GC_VERSION) $(extra_ldflags_libobjc)
+ 
+ #
+--- libgfortran/Makefile.am.orig	2006-10-03 18:16:53.102899000 +0200
++++ libgfortran/Makefile.am	2006-10-03 18:18:59.566802500 +0200
+@@ -7,7 +7,7 @@
+ gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
+ 
+ toolexeclib_LTLIBRARIES = libgfortran.la
+-libgfortran_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` -lm $(extra_ldflags_libgfortran)
++libgfortran_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` -lm $(extra_ldflags_libgfortran) -Wl,-O1
+ 
+ myexeclib_LTLIBRARIES = libgfortranbegin.la
+ myexeclibdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)$(MULTISUBDIR)
+--- libgfortran/Makefile.in.orig	2006-10-03 18:16:53.106899250 +0200
++++ libgfortran/Makefile.in	2006-10-03 18:19:17.543926000 +0200
+@@ -359,7 +359,7 @@
+ ACLOCAL_AMFLAGS = -I ../config
+ gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
+ toolexeclib_LTLIBRARIES = libgfortran.la
+-libgfortran_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` -lm $(extra_ldflags_libgfortran)
++libgfortran_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` -lm $(extra_ldflags_libgfortran) -Wl,-O1
+ myexeclib_LTLIBRARIES = libgfortranbegin.la
+ myexeclibdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)$(MULTISUBDIR)
+ libgfortranbegin_la_SOURCES = fmain.c
+--- libmudflap/Makefile.am.orig	2006-10-03 18:16:53.182904000 +0200
++++ libmudflap/Makefile.am	2006-10-03 18:17:40.117837250 +0200
+@@ -34,7 +34,7 @@
+ 	mf-hooks2.c
+ libmudflap_la_LIBADD = 
+ libmudflap_la_DEPENDENCIES = $(libmudflap_la_LIBADD)
+-libmudflap_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version`
++libmudflap_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` -Wl,-O1
+ 
+ clean-local:
+ 	rm -f pth/*.o pth/*.lo
+--- libmudflap/Makefile.in.orig	2006-10-03 18:16:53.182904000 +0200
++++ libmudflap/Makefile.in	2006-10-03 18:17:40.121837500 +0200
+@@ -241,7 +241,7 @@
+ 
+ libmudflap_la_LIBADD = 
+ libmudflap_la_DEPENDENCIES = $(libmudflap_la_LIBADD)
+-libmudflap_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version`
++libmudflap_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` -Wl,-O1
+ libmudflapth_la_SOURCES = 
+ libmudflapth_la_LIBADD = \
+ 	pth/mf-runtime.lo \
+--- libffi/Makefile.am.orig	2006-10-03 18:16:53.098898750 +0200
++++ libffi/Makefile.am	2006-10-03 18:17:40.061833750 +0200
+@@ -154,7 +154,7 @@
+ 
+ AM_CFLAGS = -Wall -g -fexceptions
+ 
+-libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version`
++libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` -Wl,-O1
+ 
+ AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src
+ AM_CCASFLAGS = $(AM_CPPFLAGS)
+--- libffi/Makefile.in.orig	2006-10-03 18:16:53.102899000 +0200
++++ libffi/Makefile.in	2006-10-03 18:17:40.065834000 +0200
+@@ -436,7 +436,7 @@
+ libffi_convenience_la_SOURCES = $(libffi_la_SOURCES)
+ nodist_libffi_convenience_la_SOURCES = $(nodist_libffi_la_SOURCES)
+ AM_CFLAGS = -Wall -g -fexceptions
+-libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version`
++libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` -Wl,-O1
+ AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src
+ AM_CCASFLAGS = $(AM_CPPFLAGS)
+ all: fficonfig.h
+--- libjava/Makefile.am.orig	2006-10-03 18:16:53.130900750 +0200
++++ libjava/Makefile.am	2006-10-03 18:17:40.093835750 +0200
+@@ -97,7 +97,7 @@
+ GCJLINK = $(LIBTOOL) --tag=GCJ --mode=link $(GCJ) -L$(here) $(JC1FLAGS) \
+           $(LDFLAGS) -o $@
+ LIBLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXX) -L$(here) $(JC1FLAGS) \
+-          $(LDFLAGS) $(extra_ldflags_libjava) -o $@
++          $(LDFLAGS) $(extra_ldflags_libjava) -Wl,-O1 -o $@
+ 
+ GCC_UNWIND_INCLUDE = @GCC_UNWIND_INCLUDE@
+ 
+--- libjava/Makefile.in.orig	2006-10-03 18:16:53.162902750 +0200
++++ libjava/Makefile.in	2006-10-03 18:17:40.117837250 +0200
+@@ -733,7 +733,7 @@
+           $(LDFLAGS) -o $@
+ 
+ LIBLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXX) -L$(here) $(JC1FLAGS) \
+-          $(LDFLAGS) $(extra_ldflags_libjava) -o $@
++          $(LDFLAGS) $(extra_ldflags_libjava) -Wl,-O1 -o $@
+ 
+ WARNINGS = -Wextra -Wall
+ AM_CXXFLAGS = \
--- gcj-4.2-4.2-20070707.orig/debian/patches/autoreconf.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/autoreconf.dpatch
@@ -0,0 +1,26 @@
+#! /bin/sh -e
+
+# DP: autoreconf several directories for proper mipsen libtool support
+
+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)
+	for i in libstdc++-v3 zlib; do
+		(cd ${dir}/${i} ; autoreconf --force)
+	done
+        ;;
+    -unpatch)
+	echo unable to unpatch autoreconf.
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
--- gcj-4.2-4.2-20070707.orig/debian/patches/sparc-biarch.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/sparc-biarch.dpatch
@@ -0,0 +1,80 @@
+#! /bin/sh -e
+# 10_newpatch.dpatch by  <schizo@debian.org>
+# updated for 4.0, 4.1, 4.2 by Matthias Klose <doko@debian.org>
+#
+# DP: Enable biarch support for the 32bit sparc compiler
+
+if [ $# -eq 3 ] && [ "$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}libcpp && autoconf
+	;;
+    -unpatch)
+	patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
+        cd ${dir}libcpp && autoconf
+	;;
+    *)
+	echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+	exit 1;;
+esac
+
+exit 0
+
+--- gcc/config/sparc/linux64.h.orig	2006-06-04 13:09:21.857528428 -0300
++++ gcc/config/sparc/linux64.h	2006-06-04 13:11:15.385012057 -0300
+@@ -54,8 +54,8 @@
+    + MASK_STACK_BIAS + MASK_APP_REGS + MASK_FPU + MASK_LONG_DOUBLE_128)
+ #endif
+ 
+-#undef ASM_CPU_DEFAULT_SPEC
+-#define ASM_CPU_DEFAULT_SPEC "-Av9a"
++#undef ASM_CPU64_DEFAULT_SPEC
++#define ASM_CPU64_DEFAULT_SPEC "-Av9a"
+ 
+ /* Provide a STARTFILE_SPEC appropriate for GNU/Linux.  Here we add
+    the GNU/Linux magical crtbegin.o file (see crtstuff.c) which
+--- gcc/config.gcc.orig	2006-06-04 13:09:21.882530957 -0300
++++ gcc/config.gcc	2006-06-04 13:14:13.577036688 -0300
+@@ -315,6 +315,7 @@
+ 	;;
+ sparc*-*-*)
+ 	cpu_type=sparc
++	need_64bit_hwint=yes
+ 	;;
+ s390*-*-*)
+ 	cpu_type=s390
+@@ -2105,9 +2106,16 @@
+ 	use_fixproto=yes
+ 	;;
+ sparc-*-linux*)		# SPARC's running GNU/Linux, libc6
++	# If cpu is specified, assume we want a 32/64 compiler
++	if test x$with_cpu = x; then
+ 	tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/linux.h"
+ 	extra_options="${extra_options} sparc/long-double-switch.opt"
+ 	tmake_file="${tmake_file} sparc/t-linux sparc/t-crtfm"
++	else
++	  tm_file="sparc/biarch64.h ${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/linux64.h"
++	  extra_options="${extra_options} sparc/long-double-switch.opt"
++	  tmake_file="${tmake_file} sparc/t-linux sparc/t-linux64 sparc/t-crtfm"
++	fi
+ 	;;
+ sparc-*-rtems*)
+ 	tm_file="${tm_file} dbxelf.h elfos.h svr4.h sparc/sysv4.h sparc/sp-elf.h sparc/rtemself.h rtems.h"
+--- libcpp/configure.ac~	2006-01-18 22:52:36.862072128 +0100
++++ libcpp/configure.ac	2006-08-15 14:48:00.484137064 +0200
+@@ -124,7 +124,7 @@
+ 	powerpc*-*-* | \
+ 	rs6000*-*-* | \
+ 	s390*-*-* | \
+-	sparc64*-*-* | ultrasparc-*-freebsd* | \
++	sparc*-*-* | ultrasparc-*-freebsd* | \
+ 	sparcv9-*-solaris2* | \
+ 	sparc-*-solaris2.[789] | sparc-*-solaris2.1[0-9]* | \
+ 	sh[123456789l]*-*-*)
--- gcj-4.2-4.2-20070707.orig/debian/patches/libjava-native-libdir.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/libjava-native-libdir.dpatch
@@ -0,0 +1,97 @@
+#! /bin/sh -e
+
+# DP: Set the native libjava libdir to gcj-4.2.
+
+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 && autoconf
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
+        rm -f ${dir}libjava/configure
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+--- libjava/Makefile.am.orig	2006-08-24 12:51:54.070781500 +0200
++++ libjava/Makefile.am	2006-08-24 12:55:31.912395750 +0200
+@@ -63,7 +63,8 @@
+ ## Name of the default .db.
+ db_name = classmap.db
+ ## Compiler specific component of the .db file
+-db_pathtail = gcj-$(gcc_version)/$(db_name)
++short_version := $(shell echo $(gcc_version) | sed -r 's/([0-9]+\.[0-9]+).*/\1/')
++db_pathtail = gcj-$(short_version)/$(db_name)
+ 
+ ## For now, only on native systems.  FIXME.
+ if NATIVE
+@@ -124,9 +125,9 @@
+         -DBOOT_CLASS_PATH="\"$(BOOT_CLASS_PATH_DIR)\"" \
+ 	-DJAVA_EXT_DIRS="\"$(jardir)/ext\"" \
+ 	-DGCJ_ENDORSED_DIRS="\"$(jardir)/gcj-endorsed\"" \
+-	-DGCJ_VERSIONED_LIBDIR="\"$(dbexecdir)\"" \
++	-DGCJ_VERSIONED_LIBDIR="\"$(libdir)/gcj-$(short_version)\"" \
+ 	-DPATH_SEPARATOR="\"$(CLASSPATH_SEPARATOR)\"" \
+-	-DLIBGCJ_DEFAULT_DATABASE="\"$(dbexecdir)/$(db_name)\"" \
++	-DLIBGCJ_DEFAULT_DATABASE="\"/var/lib$(replace /,,$(MULTISUBDIR))/gcj-$(short_version)/$(db_name)\"" \
+ 	-DLIBGCJ_DEFAULT_DATABASE_PATH_TAIL="\"$(db_pathtail)\"" \
+ 	-DTOOLEXECLIBDIR="\"$(toolexeclibdir)\""
+ 
+--- libjava/Makefile.in.orig	2006-08-24 12:51:54.178788250 +0200
++++ libjava/Makefile.in	2006-08-24 12:55:41.104970250 +0200
+@@ -722,7 +722,8 @@
+ @JAVA_HOME_SET_FALSE@BOOT_CLASS_PATH_DIR = $(jardir)/libgcj-$(gcc_version).jar
+ @JAVA_HOME_SET_TRUE@BOOT_CLASS_PATH_DIR = $(JAVA_HOME)/lib/rt.jar
+ db_name = classmap.db
+-db_pathtail = gcj-$(gcc_version)/$(db_name)
++short_version := $(shell echo $(gcc_version) | sed -r 's/([0-9]+\.[0-9]+).*/\1/')
++db_pathtail = gcj-$(short_version)/$(db_name)
+ @NATIVE_TRUE@dbexec_DATA = $(db_name)
+ bin_SCRIPTS = addr2name.awk $(am__append_4)
+ GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated
+@@ -750,9 +751,9 @@
+         -DBOOT_CLASS_PATH="\"$(BOOT_CLASS_PATH_DIR)\"" \
+ 	-DJAVA_EXT_DIRS="\"$(jardir)/ext\"" \
+ 	-DGCJ_ENDORSED_DIRS="\"$(jardir)/gcj-endorsed\"" \
+-	-DGCJ_VERSIONED_LIBDIR="\"$(dbexecdir)\"" \
++	-DGCJ_VERSIONED_LIBDIR="\"$(libdir)/gcj-$(short_version)\"" \
+ 	-DPATH_SEPARATOR="\"$(CLASSPATH_SEPARATOR)\"" \
+-	-DLIBGCJ_DEFAULT_DATABASE="\"$(dbexecdir)/$(db_name)\"" \
++	-DLIBGCJ_DEFAULT_DATABASE="\"/var/lib$(replace /,,$(MULTISUBDIR))/gcj-$(short_version)/$(db_name)\"" \
+ 	-DLIBGCJ_DEFAULT_DATABASE_PATH_TAIL="\"$(db_pathtail)\"" \
+ 	-DTOOLEXECLIBDIR="\"$(toolexeclibdir)\""
+ 
+--- libjava/configure.ac.orig	2006-08-24 12:51:54.306796250 +0200
++++ libjava/configure.ac	2006-08-24 13:05:08.424425500 +0200
+@@ -1292,15 +1292,17 @@
+ # Determine where the standard .db file and GNU Classpath JNI
+ # libraries are found.
+ multi_os_directory=`$CC -print-multi-os-directory`
++short_version=`sed -r 's/([[0-9]]+\.[[0-9]]+).*/\1/' $srcdir/../gcc/BASE-VER`
+ case $multi_os_directory in
+   .)
+-   dbexecdir='$(libdir)/gcj-$(gcc_version)' # Avoid /.
++   dbexecdir='$(libdir)/gcj-$(short_version)' # Avoid /.
+    ;;
+   *)
+-   dbexecdir='$(libdir)/'$multi_os_directory'/gcj-$(gcc_version)'
++   dbexecdir='$(libdir)/'$multi_os_directory'/gcj-$(short_version)'
+    ;;
+ esac
+ AC_SUBST(dbexecdir)
++ac_configure_args="$ac_configure_args --with-native-libdir=\$\(toolexeclibdir\)/gcj-$short_version"
+ 
+ # Determine gcj version number.
+ gcjversion=`$GCJ -v 2>&1 | sed -n 's/^.*version \([[^ ]]*\).*$/\1/p'`
--- gcj-4.2-4.2-20070707.orig/debian/patches/libssp-gnu.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/libssp-gnu.dpatch
@@ -0,0 +1,51 @@
+#! /bin/sh -e
+
+# DP: GNU/k*BSD support
+# Author: Aurelien Jarno <aurel32@debian.org>
+# Status: Submitted: http://gcc.gnu.org/ml/gcc-patches/2007-04/msg01962.html
+
+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 -p1 < $0
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p1 < $0
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+# append the patch here and adjust the -p? flag in the patch calls.
+
+--- src/gcc/configure.orig	2007-05-17 13:41:11.000000000 +0200
++++ src/gcc/configure	2007-05-17 13:42:24.000000000 +0200
+@@ -16002,7 +16002,7 @@
+ 
+ # Test for stack protector support in target C library.
+ case "$target" in
+-  *-*-linux*)
++  *-*-*-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
+--- src/gcc/configure.ac.orig	2007-05-17 13:41:11.000000000 +0200
++++ src/gcc/configure.ac	2007-05-17 13:41:14.000000000 +0200
+@@ -3202,7 +3202,7 @@
+ 
+ # Test for stack protector support in target C library.
+ case "$target" in
+-  *-*-linux*)
++  *-*-*-gnu*)
+     AC_CACHE_CHECK(__stack_chk_fail in target GNU C library,
+       gcc_cv_libc_provides_ssp,
+       [gcc_cv_libc_provides_ssp=no
--- gcj-4.2-4.2-20070707.orig/debian/patches/ppc64-ada.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/ppc64-ada.dpatch
@@ -0,0 +1,257 @@
+#! /bin/sh -e
+
+# DP: Add gcc/ada/system-linux-ppc64.ads and use it in gcc/ada/Makefile.in
+# DP: 
+
+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 -p1 < $0
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p1 < $0
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+diff -urN src.orig/gcc/ada/Makefile.in src/gcc/ada/Makefile.in
+--- src.orig/gcc/ada/Makefile.in	2005-05-02 16:39:32.000000000 +0200
++++ src/gcc/ada/Makefile.in	2005-05-02 16:36:37.000000000 +0200
+@@ -1346,6 +1346,31 @@
+   LIBRARY_VERSION := $(LIB_VERSION)
+ endif
+ 
++ifeq ($(strip $(filter-out powerpc64% linux%,$(arch) $(osys))),)
++  LIBGNAT_TARGET_PAIRS = \
++  a-intnam.ads<a-intnam-linux.ads \
++  s-inmaop.adb<s-inmaop-posix.adb \
++  s-intman.adb<s-intman-posix.adb \
++  s-osinte.adb<s-osinte-posix.adb \
++  s-osinte.ads<s-osinte-linux.ads \
++  s-osprim.adb<s-osprim-posix.adb \
++  s-taprop.adb<s-taprop-linux.adb \
++  s-taspri.ads<s-taspri-linux.ads \
++  s-tpopsp.adb<s-tpopsp-posix-foreign.adb \
++  s-parame.adb<s-parame-linux.adb \
++  system.ads<system-linux-ppc64.ads
++
++  TOOLS_TARGET_PAIRS =  \
++    mlib-tgt.adb<mlib-tgt-linux.adb \
++    indepsw.adb<indepsw-linux.adb
++
++  THREADSLIB = -lpthread
++  GNATLIB_SHARED = gnatlib-shared-dual
++  GMEM_LIB = gmemlib
++  PREFIX_OBJS = $(PREFIX_REAL_OBJS)
++  LIBRARY_VERSION := $(LIB_VERSION)
++endif
++
+ ifeq ($(strip $(filter-out sparc% linux%,$(arch) $(osys))),)
+   LIBGNAT_TARGET_PAIRS = \
+   a-intnam.ads<a-intnam-linux.ads \
+diff -urN src.orig/gcc/ada/system-linux-ppc64.ads src/gcc/ada/system-linux-ppc64.ads
+--- src.orig/gcc/ada/system-linux-ppc64.ads	1970-01-01 01:00:00.000000000 +0100
++++ src/gcc/ada/system-linux-ppc64.ads	2005-05-02 16:33:38.000000000 +0200
+@@ -0,0 +1,151 @@
++------------------------------------------------------------------------------
++--                                                                          --
++--                        GNAT RUN-TIME COMPONENTS                          --
++--                                                                          --
++--                               S Y S T E M                                --
++--                                                                          --
++--                                 S p e c                                  --
++--                          (GNU-Linux/PPC64 Version)                       --
++--                                                                          --
++--          Copyright (C) 1992-2004 Free Software Foundation, Inc.          --
++--                                                                          --
++-- This specification is derived from the Ada Reference Manual for use with --
++-- GNAT. The copyright notice above, and the license provisions that follow --
++-- apply solely to the  contents of the part following the private keyword. --
++--                                                                          --
++-- GNAT is free software;  you can  redistribute it  and/or modify it under --
++-- terms of the  GNU General Public License as published  by the Free Soft- --
++-- ware  Foundation;  either version 2,  or (at your option) any later ver- --
++-- sion.  GNAT is distributed in the hope that it will be useful, but WITH- --
++-- OUT 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  distributed with GNAT;  see file COPYING.  If not, write --
++-- to  the Free Software Foundation,  59 Temple Place - Suite 330,  Boston, --
++-- MA 02111-1307, USA.                                                      --
++--                                                                          --
++-- As a special exception,  if other files  instantiate  generics from this --
++-- unit, or you link  this unit with other files  to produce an executable, --
++-- this  unit  does not  by itself cause  the resulting  executable  to  be --
++-- covered  by the  GNU  General  Public  License.  This exception does not --
++-- however invalidate  any other reasons why  the executable file  might be --
++-- covered by the  GNU Public License.                                      --
++--                                                                          --
++-- GNAT was originally developed  by the GNAT team at  New York University. --
++-- Extensive contributions were provided by Ada Core Technologies Inc.      --
++--                                                                          --
++------------------------------------------------------------------------------
++
++package System is
++pragma Pure (System);
++--  Note that we take advantage of the implementation permission to
++--  make this unit Pure instead of Preelaborable, see RM 13.7(36)
++
++   type Name is (SYSTEM_NAME_GNAT);
++   System_Name : constant Name := SYSTEM_NAME_GNAT;
++
++   --  System-Dependent Named Numbers
++
++   Min_Int               : constant := Long_Long_Integer'First;
++   Max_Int               : constant := Long_Long_Integer'Last;
++
++   Max_Binary_Modulus    : constant := 2 ** Long_Long_Integer'Size;
++   Max_Nonbinary_Modulus : constant := Integer'Last;
++
++   Max_Base_Digits       : constant := Long_Long_Float'Digits;
++   Max_Digits            : constant := Long_Long_Float'Digits;
++
++   Max_Mantissa          : constant := 63;
++   Fine_Delta            : constant := 2.0 ** (-Max_Mantissa);
++
++   Tick                  : constant := 0.000_001;
++
++   --  Storage-related Declarations
++
++   type Address is private;
++   Null_Address : constant Address;
++
++   Storage_Unit : constant := 8;
++   Word_Size    : constant := 64;
++   Memory_Size  : constant := 2 ** 64;
++
++   --  Address comparison
++
++   function "<"  (Left, Right : Address) return Boolean;
++   function "<=" (Left, Right : Address) return Boolean;
++   function ">"  (Left, Right : Address) return Boolean;
++   function ">=" (Left, Right : Address) return Boolean;
++   function "="  (Left, Right : Address) return Boolean;
++
++   pragma Import (Intrinsic, "<");
++   pragma Import (Intrinsic, "<=");
++   pragma Import (Intrinsic, ">");
++   pragma Import (Intrinsic, ">=");
++   pragma Import (Intrinsic, "=");
++
++   --  Other System-Dependent Declarations
++
++   type Bit_Order is (High_Order_First, Low_Order_First);
++   Default_Bit_Order : constant Bit_Order := High_Order_First;
++
++   --  Priority-related Declarations (RM D.1)
++
++   Max_Priority           : constant Positive := 30;
++   Max_Interrupt_Priority : constant Positive := 31;
++
++   subtype Any_Priority       is Integer      range  0 .. 31;
++   subtype Priority           is Any_Priority range  0 .. 30;
++   subtype Interrupt_Priority is Any_Priority range 31 .. 31;
++
++   Default_Priority : constant Priority := 15;
++
++private
++
++   type Address is mod Memory_Size;
++   Null_Address : constant Address := 0;
++
++   --------------------------------------
++   -- System Implementation Parameters --
++   --------------------------------------
++
++   --  These parameters provide information about the target that is used
++   --  by the compiler. They are in the private part of System, where they
++   --  can be accessed using the special circuitry in the Targparm unit
++   --  whose source should be consulted for more detailed descriptions
++   --  of the individual switch values.
++
++   AAMP                      : constant Boolean := False;
++   Backend_Divide_Checks     : constant Boolean := False;
++   Backend_Overflow_Checks   : constant Boolean := False;
++   Command_Line_Args         : constant Boolean := True;
++   Configurable_Run_Time     : constant Boolean := False;
++   Denorm                    : constant Boolean := True;
++   Duration_32_Bits          : constant Boolean := False;
++   Exit_Status_Supported     : constant Boolean := True;
++   Fractional_Fixed_Ops      : constant Boolean := False;
++   Frontend_Layout           : constant Boolean := False;
++   Functions_Return_By_DSP   : constant Boolean := False;
++   Machine_Overflows         : constant Boolean := False;
++   Machine_Rounds            : constant Boolean := True;
++   OpenVMS                   : constant Boolean := False;
++   Preallocated_Stacks       : constant Boolean := False;
++   Signed_Zeros              : constant Boolean := True;
++   Stack_Check_Default       : constant Boolean := False;
++   Stack_Check_Probes        : constant Boolean := False;
++   Support_64_Bit_Divides    : constant Boolean := True;
++   Support_Aggregates        : constant Boolean := True;
++   Support_Composite_Assign  : constant Boolean := True;
++   Support_Composite_Compare : constant Boolean := True;
++   Support_Long_Shifts       : constant Boolean := True;
++   Suppress_Standard_Library : constant Boolean := False;
++   Use_Ada_Main_Program_Name : constant Boolean := False;
++   ZCX_By_Default            : constant Boolean := True;
++   GCC_ZCX_Support           : constant Boolean := True;
++   Front_End_ZCX_Support     : constant Boolean := False;
++
++   --  Obsolete entries, to be removed eventually (bootstrap issues!)
++
++   High_Integrity_Mode       : constant Boolean := False;
++   Long_Shifts_Inlined       : constant Boolean := True;
++
++end System;
+diff -urN tmp/gcc/ada/s-auxdec.ads src/gcc/ada/s-auxdec.ads
+--- tmp/gcc/ada/s-auxdec.ads	2004-06-11 12:47:36.000000000 +0200
++++ src/gcc/ada/s-auxdec.ads	2005-05-03 11:34:17.000000000 +0200
+@@ -108,13 +108,13 @@
+    pragma Warnings (Off);
+ 
+    type F_Float is digits 6;
+-   pragma Float_Representation (VAX_Float, F_Float);
++--   pragma Float_Representation (VAX_Float, F_Float);
+ 
+    type D_Float is digits 9;
+-   pragma Float_Representation (Vax_Float, D_Float);
++--   pragma Float_Representation (Vax_Float, D_Float);
+ 
+    type G_Float is digits 15;
+-   pragma Float_Representation (Vax_Float, G_Float);
++--   pragma Float_Representation (Vax_Float, G_Float);
+ 
+    --  Floating point type declarations for IEEE floating point data types
+ 
+--- tmp/gcc/ada/s-vaflop.ads	2003-10-21 15:42:18.000000000 +0200
++++ src/gcc/ada/s-vaflop.ads	2005-05-03 15:24:24.000000000 +0200
+@@ -40,15 +40,15 @@
+    --  Suppress warnings if not on Alpha/VAX
+ 
+    type D is digits 9;
+-   pragma Float_Representation (VAX_Float, D);
++--   pragma Float_Representation (VAX_Float, D);
+    --  D Float type on Vax
+ 
+    type G is digits 15;
+-   pragma Float_Representation (VAX_Float, G);
++--   pragma Float_Representation (VAX_Float, G);
+    --  G Float type on Vax
+ 
+    type F is digits 6;
+-   pragma Float_Representation (VAX_Float, F);
++--   pragma Float_Representation (VAX_Float, F);
+    --  F Float type on Vax
+ 
+    type S is digits 6;
--- gcj-4.2-4.2-20070707.orig/debian/patches/libjava-subdir.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/libjava-subdir.dpatch
@@ -0,0 +1,237 @@
+#! /bin/sh -e
+
+# DP: - Set the libjava sublibdir to /usr/lib/gcj-4.2
+# DP: - Set the default libgcj database dir to /var/lib/gcj-4.2
+
+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 && aclocal -I ../config -I .. -I . && autoconf -I ../config -I .. -I .
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
+	rm -f ${dir}libjava/configure
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+--- libjava/testsuite/lib/libjava.exp.orig	2007-03-22 14:35:52.000000000 +0100
++++ libjava/testsuite/lib/libjava.exp	2007-03-22 14:36:05.000000000 +0100
+@@ -169,6 +169,7 @@
+     set text [eval exec "$GCJ_UNDER_TEST -B$specdir -v 2>@ stdout"]
+     regexp " version \[^\n\r\]*" $text version
+     set libjava_version [lindex $version 1]
++    set libjava_version "4.2"
+ 
+     verbose "version: $libjava_version"
+ 
+--- libjava/testsuite/Makefile.am.orig	2007-03-22 14:35:52.000000000 +0100
++++ libjava/testsuite/Makefile.am	2007-03-22 14:36:05.000000000 +0100
+@@ -4,6 +4,7 @@
+ 
+ # May be used by various substitution variables.
+ gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
++gcc_short_version := $(shell sed -r 's/([0-9]+\.[0-9]+).*/\1/' $(top_srcdir)/../gcc/BASE-VER)
+ 
+ # autoconf2.13's target_alias
+ target_noncanonical = @target_noncanonical@
+@@ -59,11 +60,11 @@
+ 	  rm -rf $$testtmpdir; $(mkdir_p) $$testtmpdir; \
+ 	  if test -n "$$testdep"; then \
+ 	    $(GCJ) -C -g -w --encoding=UTF-8 -bootclasspath \
+-	      $(top_builddir)/libgcj-$(gcc_version).jar::$$testtmpdir \
++	      $(top_builddir)/libgcj-$(gcc_short_version).jar::$$testtmpdir \
+ 	      -d $$testtmpdir $(srcdir)/$$testdep || exit; \
+ 	  fi; \
+ 	  $(GCJ) -C -g -w --encoding=UTF-8 -bootclasspath \
+-	    $(top_builddir)/libgcj-$(gcc_version).jar:$$testtmpdir \
++	    $(top_builddir)/libgcj-$(gcc_short_version).jar:$$testtmpdir \
+ 	    -d $$testtmpdir $(srcdir)/$$test || exit; \
+ 	  case "$$test" in \
+ 	    libjava.loader/dummy.java) \
+@@ -75,7 +76,7 @@
+ 	  esac; \
+ 	  if test -n "$$genheader"; then \
+ 	    $(MYGCJH) $$genheader $$testtmpdir/*.class \
+-	      -bootclasspath $(top_builddir)/libgcj-$(gcc_version).jar \
++	      -bootclasspath $(top_builddir)/libgcj-$(gcc_short_version).jar \
+ 	      -d $$testtmpdir/ || exit; \
+ 	    mv $$testtmpdir/*.h $(srcdir)/`dirname $$test`/ 2>/dev/null; \
+ 	  fi; \
+--- libjava/testsuite/Makefile.in.orig	2007-03-22 14:35:52.000000000 +0100
++++ libjava/testsuite/Makefile.in	2007-03-22 14:36:05.000000000 +0100
+@@ -311,6 +311,7 @@
+ 
+ # May be used by various substitution variables.
+ gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
++gcc_short_version := $(shell sed -r 's/([0-9]+\.[0-9]+).*/\1/' $(top_srcdir)/../gcc/BASE-VER)
+ 
+ # Setup the testing framework, if you have one
+ EXPECT = `if [ -f $(top_builddir)/../expect/expect ] ; then \
+@@ -558,11 +559,11 @@
+ @JAVA_MAINTAINER_MODE_TRUE@	  rm -rf $$testtmpdir; $(mkdir_p) $$testtmpdir; \
+ @JAVA_MAINTAINER_MODE_TRUE@	  if test -n "$$testdep"; then \
+ @JAVA_MAINTAINER_MODE_TRUE@	    $(GCJ) -C -g -w --encoding=UTF-8 -bootclasspath \
+-@JAVA_MAINTAINER_MODE_TRUE@	      $(top_builddir)/libgcj-$(gcc_version).jar::$$testtmpdir \
++@JAVA_MAINTAINER_MODE_TRUE@	      $(top_builddir)/libgcj-$(gcc_short_version).jar::$$testtmpdir \
+ @JAVA_MAINTAINER_MODE_TRUE@	      -d $$testtmpdir $(srcdir)/$$testdep || exit; \
+ @JAVA_MAINTAINER_MODE_TRUE@	  fi; \
+ @JAVA_MAINTAINER_MODE_TRUE@	  $(GCJ) -C -g -w --encoding=UTF-8 -bootclasspath \
+-@JAVA_MAINTAINER_MODE_TRUE@	    $(top_builddir)/libgcj-$(gcc_version).jar:$$testtmpdir \
++@JAVA_MAINTAINER_MODE_TRUE@	    $(top_builddir)/libgcj-$(gcc_short_version).jar:$$testtmpdir \
+ @JAVA_MAINTAINER_MODE_TRUE@	    -d $$testtmpdir $(srcdir)/$$test || exit; \
+ @JAVA_MAINTAINER_MODE_TRUE@	  case "$$test" in \
+ @JAVA_MAINTAINER_MODE_TRUE@	    libjava.loader/dummy.java) \
+@@ -574,7 +575,7 @@
+ @JAVA_MAINTAINER_MODE_TRUE@	  esac; \
+ @JAVA_MAINTAINER_MODE_TRUE@	  if test -n "$$genheader"; then \
+ @JAVA_MAINTAINER_MODE_TRUE@	    $(MYGCJH) $$genheader $$testtmpdir/*.class \
+-@JAVA_MAINTAINER_MODE_TRUE@	      -bootclasspath $(top_builddir)/libgcj-$(gcc_version).jar \
++@JAVA_MAINTAINER_MODE_TRUE@	      -bootclasspath $(top_builddir)/libgcj-$(gcc_short_version).jar \
+ @JAVA_MAINTAINER_MODE_TRUE@	      -d $$testtmpdir/ || exit; \
+ @JAVA_MAINTAINER_MODE_TRUE@	    mv $$testtmpdir/*.h $(srcdir)/`dirname $$test`/ 2>/dev/null; \
+ @JAVA_MAINTAINER_MODE_TRUE@	  fi; \
+--- libjava/Makefile.am.orig	2007-03-22 14:35:52.000000000 +0100
++++ libjava/Makefile.am	2007-03-22 14:41:39.000000000 +0100
+@@ -5,7 +5,8 @@
+ ACLOCAL_AMFLAGS = -I . -I .. -I ../config
+ 
+ # May be used by various substitution variables.
+-gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
++gcc_full_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
++gcc_version := $(shell sed -r 's/([0-9]+\.[0-9]+).*/\1/' $(top_srcdir)/../gcc/BASE-VER)
+ 
+ SUBDIRS = $(DIRLTDL) gcj include classpath
+ if TESTSUBDIR
+@@ -27,7 +28,7 @@
+ target_noncanonical = @target_noncanonical@
+ 
+ # This is required by TL_AC_GXX_INCLUDE_DIR.
+-libsubdir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)
++libsubdir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_full_version)
+ 
+ libexecsubdir = $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version)
+ 
+@@ -140,7 +141,7 @@
+ 	-DGCJ_VERSIONED_LIBDIR="\"$(dbexecdir)\"" \
+ 	-DPATH_SEPARATOR="\"$(CLASSPATH_SEPARATOR)\"" \
+ 	-DECJ_JAR_FILE="\"$(ECJ_JAR)\"" \
+-	-DLIBGCJ_DEFAULT_DATABASE="\"$(dbexecdir)/$(db_name)\"" \
++	-DLIBGCJ_DEFAULT_DATABASE="\"/var/lib/gcj-4.2/$(db_name)\"" \
+ 	-DLIBGCJ_DEFAULT_DATABASE_PATH_TAIL="\"$(db_pathtail)\""
+ 
+ AM_GCJFLAGS = \
+--- libjava/Makefile.in.orig	2007-03-22 14:35:52.000000000 +0100
++++ libjava/Makefile.in	2007-03-22 14:42:00.000000000 +0100
+@@ -762,7 +762,7 @@
+ install_sh = @install_sh@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+-libstdcxx_incdir = @libstdcxx_incdir@
++libstdcxx_incdir = c++/$(gcc_full_version)
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -791,7 +791,8 @@
+ ACLOCAL_AMFLAGS = -I . -I .. -I ../config
+ 
+ # May be used by various substitution variables.
+-gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
++gcc_full_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
++gcc_version := $(shell sed -r 's/([0-9]+\.[0-9]+).*/\1/' $(top_srcdir)/../gcc/BASE-VER)
+ SUBDIRS = $(DIRLTDL) gcj include classpath $(am__append_1)
+ 
+ # write_entries_to_file - writes each entry in a list
+@@ -804,8 +805,8 @@
+ write_entries_to_file = $(shell rm -f $(2) || :) $(shell touch $(2)) $(foreach object,$(1),$(shell echo $(object) >> $(2)))
+ 
+ # This is required by TL_AC_GXX_INCLUDE_DIR.
+-libsubdir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)
+-libexecsubdir = $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_version)
++libsubdir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_full_version)
++libexecsubdir = $(libexecdir)/gcc/$(target_noncanonical)/$(gcc_full_version)
+ toolexeclib_LTLIBRARIES = libgcj.la libgij.la libgcj-tools.la \
+ 	$(am__append_2) $(am__append_3)
+ toolexecmainlib_DATA = libgcj.spec
+@@ -850,7 +851,7 @@
+ 	-DGCJ_VERSIONED_LIBDIR="\"$(dbexecdir)\"" \
+ 	-DPATH_SEPARATOR="\"$(CLASSPATH_SEPARATOR)\"" \
+ 	-DECJ_JAR_FILE="\"$(ECJ_JAR)\"" \
+-	-DLIBGCJ_DEFAULT_DATABASE="\"$(dbexecdir)/$(db_name)\"" \
++	-DLIBGCJ_DEFAULT_DATABASE="\"/var/lib/gcj-4.2/$(db_name)\"" \
+ 	-DLIBGCJ_DEFAULT_DATABASE_PATH_TAIL="\"$(db_pathtail)\""
+ 
+ AM_GCJFLAGS = \
+--- libjava/configure.ac.orig	2007-03-22 14:35:52.000000000 +0100
++++ libjava/configure.ac	2007-03-22 14:36:05.000000000 +0100
+@@ -511,6 +511,9 @@
+   AS_HELP_STRING([--with-java-home=DIRECTORY],
+                  [value of java.home system property]),
+ 		 [JAVA_HOME="${withval}"], [JAVA_HOME=""])
++if test -n "$with_multisubdir"; then
++  JAVA_HOME=`echo $JAVA_HOME | sed "s,/usr/lib/,/usr/lib$with_multisubdir/,"`
++fi
+ AM_CONDITIONAL(JAVA_HOME_SET, test ! -z "$JAVA_HOME")
+ AC_SUBST(JAVA_HOME)
+ 
+@@ -1358,6 +1361,7 @@
+     multi_os_directory=`$CC -print-multi-os-directory`
+     case $multi_os_directory in
+       .) toolexeclibdir=$toolexecmainlibdir ;; # Avoid trailing /.
++      ../lib*) toolexeclibdir='$(subst /lib/../lib,/lib,'$toolexecmainlibdir/$multi_os_directory')' ;;
+       *) toolexeclibdir=$toolexecmainlibdir/$multi_os_directory ;;
+     esac
+     ;;
+@@ -1369,15 +1373,21 @@
+ # Determine where the standard .db file and GNU Classpath JNI
+ # libraries are found.
+ multi_os_directory=`$CC -print-multi-os-directory`
++short_version=`sed -r 's/([[0-9]]+\.[[0-9]]+).*/\1/' $srcdir/../gcc/BASE-VER`
++libgcj_soversion=`awk -F: '/^[[^#]].*:/ { print $1 }' $srcdir/libtool-version`
+ case $multi_os_directory in
+   .)
+-   dbexecdir='$(libdir)/gcj-$(gcc_version)' # Avoid /.
++   dbexecdir='$(libdir)/'gcj-$short_version-$libgcj_soversion # Avoid /.
++   ;;
++  ../lib*)
++   dbexecdir='$(subst /lib/../lib,/lib,$(libdir)/'$multi_os_directory/gcj-$short_version-$libgcj_soversion')'
+    ;;
+   *)
+-   dbexecdir='$(libdir)/'$multi_os_directory'/gcj-$(gcc_version)'
++   dbexecdir='$(libdir)/'$multi_os_directory/gcj-$short_version-$libgcj_soversion
+    ;;
+ esac
+ AC_SUBST(dbexecdir)
++ac_configure_args="$ac_configure_args --with-native-libdir=\$\(subst\ /lib/../lib,/lib,\$\(toolexeclibdir\)\)/gcj-$short_version-$libgcj_soversion"
+ 
+ # Determine gcj version number.
+ gcjversion=`$GCJ -v 2>&1 | sed -n 's/^.*version \([[^ ]]*\).*$/\1/p'`
+--- gcc/java/Make-lang.in~	2006-09-11 08:41:56.950718000 +0200
++++ gcc/java/Make-lang.in	2006-09-11 09:25:28.160718000 +0200
+@@ -385,12 +385,13 @@
+ 	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $(ZLIBINC) \
+ 		$(srcdir)/java/jcf-io.c $(OUTPUT_OPTION)
+ 
++short_version := $(shell echo $(version) | sed -r 's/([0-9]+\.[0-9]+).*/\1/')
+ # jcf-path.o needs a -D.
+ java/jcf-path.o: java/jcf-path.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \
+   java/jcf.h
+ 	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
+-	  -DLIBGCJ_ZIP_FILE='"$(datadir)/java/libgcj-$(version).jar"' \
+-	  -DDEFAULT_TARGET_VERSION=\"$(version)\" \
++	  -DLIBGCJ_ZIP_FILE='"$(datadir)/java/libgcj-$(short_version).jar"' \
++	  -DDEFAULT_TARGET_VERSION=\"$(short_version)\" \
+ 	  $(srcdir)/java/jcf-path.c $(OUTPUT_OPTION)
+ 
+ # create gjnih's object
--- gcj-4.2-4.2-20070707.orig/debian/patches/disable-biarch-check.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/disable-biarch-check.dpatch
@@ -0,0 +1,44 @@
+#! /bin/sh -e
+
+# DP: For biarch builds, disable the testsuite for the non-default architecture
+# DP: for runtime libraries, which are not built by default (libjava).
+
+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
+
+--- libjava/testsuite/Makefile.in~	2005-09-29 23:53:39.213898000 +0200
++++ libjava/testsuite/Makefile.in	2005-09-29 23:55:33.382541760 +0200
+@@ -346,12 +346,14 @@
+ 
+ 
+ check-DEJAGNU: site.exp
++	runtestflags="`echo '$(RUNTESTFLAGS)' | sed 's/,-m[36][24]//'`"; \
++	case "$$runtestflags" in *\\{\\}) runtestflags=; esac; \
+ 	srcdir=`$(am__cd) $(srcdir) && pwd`; export srcdir; \
+ 	EXPECT=$(EXPECT); export EXPECT; \
+ 	runtest=$(RUNTEST); \
+ 	if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \
+ 	  l='$(DEJATOOL)'; for tool in $$l; do \
+-	    $$runtest $(AM_RUNTESTFLAGS) $(RUNTESTDEFAULTFLAGS) $(RUNTESTFLAGS); \
++	    $$runtest $(AM_RUNTESTFLAGS) $(RUNTESTDEFAULTFLAGS) $$runtestflags; \
+ 	  done; \
+ 	else echo "WARNING: could not find \`runtest'" 1>&2; :;\
+ 	fi
--- gcj-4.2-4.2-20070707.orig/debian/patches/libjava-lib32subdir.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/libjava-lib32subdir.dpatch
@@ -0,0 +1,93 @@
+#! /bin/sh -e
+
+# DP: - When running the i386 binaries on amd64, look in /usr/lib32/gcj-x-y
+
+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
+
+--- libjava/prims.cc.orig	2007-01-18 20:12:18.000000000 +0100
++++ libjava/prims.cc	2007-01-19 01:10:44.000000000 +0100
+@@ -21,6 +21,10 @@
+ #include <unistd.h>
+ #endif
+ 
++#ifdef HAVE_UNAME
++#include <sys/utsname.h>
++#endif
++
+ #include <gcj/cni.h>
+ #include <jvm.h>
+ #include <java-signal.h>
+@@ -1806,12 +1810,28 @@
+ _Jv_PrependVersionedLibdir (char* libpath)
+ {
+   char* retval = 0;
++#define GCJ_VERSIONED_SUBDIR "gcj-4.2-80"
++#define GCJ_VERSIONED_LIB32DIR "/usr/lib32/" GCJ_VERSIONED_SUBDIR
++  const char* vlibdir = GCJ_VERSIONED_LIBDIR;
++  int vlibdir_size = sizeof (GCJ_VERSIONED_LIBDIR);
++
++#if defined(__linux__) && defined (__i386__)
++  struct utsname u;
++  if (! uname (&u))
++    {
++      if (! strcmp ("x86_64", u.machine))
++	{
++	  vlibdir = GCJ_VERSIONED_LIB32DIR;
++	  vlibdir_size = sizeof (GCJ_VERSIONED_LIB32DIR);
++	}
++    }
++#endif
+ 
+   if (libpath && libpath[0] != '\0')
+     {
+       if (! strncmp (libpath,
+-                     GCJ_VERSIONED_LIBDIR,
+-                     sizeof (GCJ_VERSIONED_LIBDIR) - 1))
++                     vlibdir,
++                     vlibdir_size - 1))
+         {
+           // LD_LIBRARY_PATH is already prefixed with
+           // GCJ_VERSIONED_LIBDIR.
+@@ -1825,10 +1845,10 @@
+ 	  char path_sep[2];
+ 	  path_sep[0] = (char) _Jv_platform_path_separator;
+ 	  path_sep[1] = '\0';
+-          jsize total = ((sizeof (GCJ_VERSIONED_LIBDIR) - 1)
++          jsize total = ((vlibdir_size - 1)
+ 			 + 1 /* path separator */ + strlen (libpath) + 1);
+           retval = (char*) _Jv_Malloc (total);
+-          strcpy (retval, GCJ_VERSIONED_LIBDIR);
++          strcpy (retval, vlibdir);
+           strcat (retval, path_sep);
+           strcat (retval, libpath);
+         }
+@@ -1836,8 +1856,8 @@
+   else
+     {
+       // LD_LIBRARY_PATH was not specified or is empty.
+-      retval = (char*) _Jv_Malloc (sizeof (GCJ_VERSIONED_LIBDIR));
+-      strcpy (retval, GCJ_VERSIONED_LIBDIR);
++      retval = (char*) _Jv_Malloc (vlibdir_size);
++      strcpy (retval, vlibdir);
+     }
+ 
+   return retval;
--- gcj-4.2-4.2-20070707.orig/debian/patches/hurd-changes.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/hurd-changes.dpatch
@@ -0,0 +1,90 @@
+#! /bin/sh -e
+
+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
+
+# DP: Traditional GNU systems don't have a /usr directory.  However, Debian
+# DP: systems do, and we support both having a /usr -> . symlink, and having a
+# DP: /usr directory like the other ports.  So this patch should NOT go
+# DP: upstream.
+# DP: 
+# DP: Define MAXPATHLEN and PATH_MAX.
+
+--- gcc/ada/adaint.c.orig	2005-11-15 14:52:31.000000000 +0100
++++ gcc/ada/adaint.c	2006-12-10 12:28:46.000000000 +0100
+@@ -272,6 +272,10 @@
+ #include <sys/param.h>
+ #endif
+ 
++#ifndef MAXPATHLEN
++#define MAXPATHLEN 4096
++#endif
++
+ #ifdef MAXPATHLEN
+ #define GNAT_MAX_PATH_LEN MAXPATHLEN
+ #else
+--- gcc/config/i386/gnu.h.orig	2004-09-08 02:17:19.000000000 +0200
++++ gcc/config/i386/gnu.h	2006-12-10 12:28:45.000000000 +0100
+@@ -17,7 +17,7 @@
+   while (0)
+ 
+ #undef CPP_SPEC
+-#define CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{bsd:-D_BSD_SOURCE}"
++#define CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{bsd:-D_BSD_SOURCE} %{pthread:-D_REENTRANT}"
+ 
+ #undef CC1_SPEC
+ #define CC1_SPEC "%(cc1_cpu)"
+--- gcc/config/gnu.h.orig	2004-07-05 21:49:20.000000000 +0200
++++ gcc/config/gnu.h	2006-12-10 12:28:45.000000000 +0100
+@@ -6,11 +6,12 @@
+ 
+ /* Default C library spec.  Use -lbsd-compat for gcc -bsd.  */
+ #undef LIB_SPEC
+-#define LIB_SPEC "%{bsd:-lbsd-compat} %{!p:%{!pg:-lc}}%{p:-lc_p}%{pg:-lc_p}"
++#define LIB_SPEC "%{pthread:-lpthread} %{bsd:-lbsd-compat} %{!p:%{!pg:-lc}}%{p:-lc_p}%{pg:-lc_p}"
+ 
+ /* Standard include directory.  In GNU, "/usr" is a four-letter word.  */
+ #undef STANDARD_INCLUDE_DIR
+-#define STANDARD_INCLUDE_DIR "/include"
++/* Overriden for Debian GNU/Hurd.  */
++#define STANDARD_INCLUDE_DIR "/usr/include"
+ 
+ /* The system headers under GNU are C++-aware.  */
+ #define NO_IMPLICIT_EXTERN_C
+--- gcc/config/t-gnu.orig	2004-01-10 07:40:24.000000000 +0100
++++ gcc/config/t-gnu	2006-12-10 12:28:45.000000000 +0100
+@@ -1,2 +1,2 @@
+ # In GNU, "/usr" is a four-letter word.
+-NATIVE_SYSTEM_HEADER_DIR = /include
++NATIVE_SYSTEM_HEADER_DIR = /usr/include
+--- gcc/tlink.c.orig	2005-06-25 04:02:01.000000000 +0200
++++ gcc/tlink.c	2006-12-10 12:28:45.000000000 +0100
+@@ -34,6 +34,10 @@
+ 
+ #define MAX_ITERATIONS 17
+ 
++#ifndef MAXPATHLEN
++#define MAXPATHLEN 4096
++#endif
++
+ /* Defined in the automatically-generated underscore.c.  */
+ extern int prepends_underscore;
+ 
--- gcj-4.2-4.2-20070707.orig/debian/patches/s390-biarch.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/s390-biarch.dpatch
@@ -0,0 +1,36 @@
+#! /bin/sh -e
+
+# DP: enable biarch for 31 bit compiler
+
+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/config.gcc~	2006-06-02 01:59:42.000000000 +0200
++++ gcc/config.gcc	2006-06-04 18:20:56.272554984 +0200
+@@ -1884,7 +1884,7 @@
+ 	;;
+ s390-*-linux*)
+ 	tm_file="s390/s390.h dbxelf.h elfos.h svr4.h linux.h s390/linux.h"
+-	tmake_file="${tmake_file} t-dfprules s390/t-crtstuff s390/t-linux"
++	tmake_file="${tmake_file} t-dfprules s390/t-crtstuff s390/t-linux s390/t-linux64"
+ 	;;
+ s390x-*-linux*)
+ 	tm_file="s390/s390x.h s390/s390.h dbxelf.h elfos.h svr4.h linux.h s390/linux.h"
--- gcj-4.2-4.2-20070707.orig/debian/patches/m68k-prevent-qipush.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/m68k-prevent-qipush.dpatch
@@ -0,0 +1,50 @@
+#! /bin/sh -e
+
+# All lines beginning with `# DPATCH:' are a description of the patch.
+# DP: prevent combine from creating a byte push on the stack (invalid 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 -p1 < $0
+        #cd ${dir}gcc && autoconf
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p1 < $0
+        #rm ${dir}gcc/configure
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+# append the patch here and adjust the -p? flag in the patch calls.
+
+---
+ gcc/config/m68k/m68k.md |    5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+Index: gcc-4.1/gcc/config/m68k/m68k.md
+===================================================================
+--- gcc-4.1.orig/gcc/config/m68k/m68k.md
++++ gcc-4.1/gcc/config/m68k/m68k.md
+@@ -748,7 +748,10 @@
+ (define_insn ""
+   [(set (match_operand:QI 0 "nonimmediate_operand" "=d,*a,m")
+ 	(match_operand:QI 1 "general_src_operand" "dmSi*a,di*a,dmSi"))]
+-  "!TARGET_COLDFIRE"
++  "!TARGET_COLDFIRE
++   && (!MEM_P (operands[0])
++       || GET_CODE (XEXP (operands[0], 0)) != PRE_DEC
++       || XEXP (XEXP (operands[0], 0), 0) != stack_pointer_rtx)"
+   "* return output_move_qimode (operands);")
+ 
+ (define_insn ""
--- gcj-4.2-4.2-20070707.orig/debian/patches/libjava-disable-static.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/libjava-disable-static.dpatch
@@ -0,0 +1,47 @@
+#! /bin/sh -e
+
+# DP: Disable building the static libjava.
+
+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
+
+Index: Makefile.in
+===================================================================
+--- Makefile.in	(revision 117742)
++++ Makefile.in	(working copy)
+@@ -32681,7 +32681,7 @@
+ 	libsrcdir="$$s/libjava"; \
+ 	rm -f no-such-file || : ; \
+ 	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+-	  $(TARGET_CONFIGARGS) $${srcdiroption}  \
++	  $(TARGET_CONFIGARGS) --disable-static $${srcdiroption}  \
+ 	  || exit 1
+ @endif target-libjava
+ 
+@@ -33379,7 +33379,7 @@
+ 	libsrcdir="$$s/boehm-gc"; \
+ 	rm -f no-such-file || : ; \
+ 	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+-	  $(TARGET_CONFIGARGS) $${srcdiroption}  \
++	  $(TARGET_CONFIGARGS) --disable-static $${srcdiroption}  \
+ 	  || exit 1
+ @endif target-boehm-gc
+ 
--- gcj-4.2-4.2-20070707.orig/debian/patches/pr31868.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/pr31868.dpatch
@@ -0,0 +1,143 @@
+#! /bin/sh -e
+
+# DP: Backport from mainline for PR target/31868
+
+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
+
+2007-05-08  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR target/31868
+	* config.gcc (x86_64-*-freebsd*): Add i386/t-crtstuff64 to
+	tmake_file.
+	(x86_64-*-netbsd*): Likewise.
+	(x86_64-*-linux*): Likewise.
+	(x86_64-*-kfreebsd*-gnu): Likewise.
+	(x86_64-*-knetbsd*-gnu): Likewise.
+	(i[34567]86-*-solaris2.1[0-9]*): Likewise.
+
+	* config/i386/t-linux64 (CRTSTUFF_T_CFLAGS): Move to ...
+	* config/i386/t-crtstuff64: This. New file.
+
+	* config/t-freebsd (CRTSTUFF_T_CFLAGS_S): Add $(CRTSTUFF_T_CFLAGS).
+	* config/t-libc-ok (CRTSTUFF_T_CFLAGS_S): Likewise.
+	* config/t-lynx (CRTSTUFF_T_CFLAGS_S): Likewise.
+	* config/t-netbsd (CRTSTUFF_T_CFLAGS_S): Likewise.
+	* config/t-svr4 (CRTSTUFF_T_CFLAGS_S): Likewise.
+
+--- gcc/config.gcc.crtend	2007-05-06 11:24:44.000000000 -0700
++++ gcc/config.gcc	2007-05-08 10:45:04.000000000 -0700
+@@ -1064,6 +1064,7 @@ i[34567]86-*-freebsd*)
+ 	;;
+ x86_64-*-freebsd*)
+ 	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ${fbsd_tm_file} i386/x86-64.h i386/freebsd.h i386/freebsd64.h"
++	tmake_file="${tmake_file} i386/t-crtstuff64"
+ 	;;
+ i[34567]86-*-netbsdelf*)
+ 	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h netbsd.h netbsd-elf.h i386/netbsd-elf.h"
+@@ -1076,6 +1077,7 @@ i[34567]86-*-netbsd*)
+ 	;;
+ x86_64-*-netbsd*)
+ 	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h netbsd.h netbsd-elf.h i386/x86-64.h i386/netbsd64.h"
++	tmake_file="${tmake_file} i386/t-crtstuff64"
+ 	;;
+ i[34567]86-*-openbsd2.*|i[34567]86-*openbsd3.[0123])
+ 	tm_file="i386/i386.h i386/unix.h i386/bsd.h i386/gas.h i386/gstabs.h openbsd-oldgas.h openbsd.h i386/openbsd.h"
+@@ -1111,7 +1113,7 @@ x86_64-*-linux* | x86_64-*-kfreebsd*-gnu
+ 	x86_64-*-kfreebsd*-gnu) tm_file="${tm_file} kfreebsd-gnu.h" ;;
+ 	x86_64-*-knetbsd*-gnu) tm_file="${tm_file} knetbsd-gnu.h" ;;
+ 	esac
+-	tmake_file="${tmake_file} i386/t-linux64 i386/t-crtfm t-dfprules"
++	tmake_file="${tmake_file} i386/t-linux64 i386/t-crtstuff64 i386/t-crtfm t-dfprules"
+ 	;;
+ i[34567]86-*-gnu*)
+ 	;;
+@@ -1208,7 +1210,7 @@ i[34567]86-*-solaris2*)
+ 	*-*-solaris2.1[0-9]*)
+ 		tm_file="${tm_file} i386/x86-64.h i386/sol2-10.h"
+ 		tm_defines="${tm_defines} TARGET_BI_ARCH=1"
+-		tmake_file="$tmake_file i386/t-sol2-10"
++		tmake_file="$tmake_file i386/t-crtstuff64 i386/t-sol2-10"
+ 		need_64bit_hwint=yes
+ 		# FIXME: -m64 for i[34567]86-*-* should be allowed just
+ 		# like -m32 for x86_64-*-*.
+--- gcc/config/i386/t-crtstuff64.crtend	2007-05-08 10:42:59.000000000 -0700
++++ gcc/config/i386/t-crtstuff64	2007-05-08 10:42:59.000000000 -0700
+@@ -0,0 +1,5 @@
++# The pushl in CTOR initialization interferes with frame pointer elimination.
++# crtend*.o cannot be compiled without -fno-asynchronous-unwind-tables,
++# because then __FRAME_END__ might not be the last thing in .eh_frame
++# section.
++CRTSTUFF_T_CFLAGS = -fno-omit-frame-pointer -fno-asynchronous-unwind-tables
+--- gcc/config/i386/t-linux64.crtend	2006-11-18 06:26:01.000000000 -0800
++++ gcc/config/i386/t-linux64	2007-05-08 10:42:59.000000000 -0700
+@@ -13,9 +13,3 @@ INSTALL_LIBGCC = install-multilib
+ 
+ EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o \
+ 		     crtbeginT.o crtfastmath.o
+-
+-# The pushl in CTOR initialization interferes with frame pointer elimination.
+-# crtend*.o cannot be compiled without -fno-asynchronous-unwind-tables,
+-# because then __FRAME_END__ might not be the last thing in .eh_frame
+-# section.
+-CRTSTUFF_T_CFLAGS = -fno-omit-frame-pointer -fno-asynchronous-unwind-tables
+--- gcc/config/t-freebsd.crtend	2006-11-18 06:26:22.000000000 -0800
++++ gcc/config/t-freebsd	2007-05-08 10:42:59.000000000 -0700
+@@ -1,5 +1,5 @@
+ # Compile crtbeginS.o and crtendS.o with pic.
+-CRTSTUFF_T_CFLAGS_S = -fPIC
++CRTSTUFF_T_CFLAGS_S = $(CRTSTUFF_T_CFLAGS) -fPIC
+ 
+ # Compile libgcc.a with pic.
+ TARGET_LIBGCC2_CFLAGS += -fPIC
+--- gcc/config/t-libc-ok.crtend	2006-11-18 06:26:22.000000000 -0800
++++ gcc/config/t-libc-ok	2007-05-08 10:42:59.000000000 -0700
+@@ -1 +1 @@
+-CRTSTUFF_T_CFLAGS_S=-fPIC
++CRTSTUFF_T_CFLAGS_S = $(CRTSTUFF_T_CFLAGS) -fPIC
+--- gcc/config/t-lynx.crtend	2006-11-18 06:26:22.000000000 -0800
++++ gcc/config/t-lynx	2007-05-08 10:42:59.000000000 -0700
+@@ -1,5 +1,5 @@
+ # Compile crtbeginS.o and crtendS.o with pic.
+-CRTSTUFF_T_CFLAGS_S = -fPIC
++CRTSTUFF_T_CFLAGS_S = $(CRTSTUFF_T_CFLAGS) -fPIC
+ 
+ # Compile libgcc2.a with pic.
+ TARGET_LIBGCC2_CFLAGS = -fPIC
+--- gcc/config/t-netbsd.crtend	2006-11-18 06:26:22.000000000 -0800
++++ gcc/config/t-netbsd	2007-05-08 10:42:59.000000000 -0700
+@@ -1,2 +1,2 @@
+ # Always build crtstuff with PIC.
+-CRTSTUFF_T_CFLAGS = -fPIC
++CRTSTUFF_T_CFLAGS_S = $(CRTSTUFF_T_CFLAGS) -fPIC
+--- gcc/config/t-svr4.crtend	2006-11-18 06:26:22.000000000 -0800
++++ gcc/config/t-svr4	2007-05-08 10:42:59.000000000 -0700
+@@ -4,7 +4,7 @@
+ # we will be doing that, we just always use -fPIC when compiling the
+ # routines in crtstuff.c.  Likewise for libgcc2.c.
+ 
+-CRTSTUFF_T_CFLAGS = -fPIC
++CRTSTUFF_T_CFLAGS_S = $(CRTSTUFF_T_CFLAGS) -fPIC
+ TARGET_LIBGCC2_CFLAGS = -fPIC
+ 
+ # See all the declarations.
--- gcj-4.2-4.2-20070707.orig/debian/patches/m68k-reg-inc.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/m68k-reg-inc.dpatch
@@ -0,0 +1,90 @@
+#! /bin/sh -e
+
+# All lines beginning with `# DPATCH:' are a description of the patch.
+# DP: reinsert REG_INC notes after splitting an instruction
+
+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 -p1 < $0
+        #cd ${dir}gcc && autoconf
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p1 < $0
+        #rm ${dir}gcc/configure
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+---
+ gcc/emit-rtl.c |   40 ++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 40 insertions(+)
+
+Index: gcc-4.1/gcc/emit-rtl.c
+===================================================================
+--- gcc-4.1.orig/gcc/emit-rtl.c
++++ gcc-4.1/gcc/emit-rtl.c
+@@ -3103,6 +3103,34 @@ prev_cc0_setter (rtx insn)
+ }
+ #endif
+ 
++#ifdef AUTO_INC_DEC
++static int
++find_auto_inc (rtx *xp, void *data)
++{
++  rtx x = *xp;
++  rtx reg = data;
++
++  if (GET_RTX_CLASS (GET_CODE (x)) != RTX_AUTOINC)
++    return 0;
++
++  switch (GET_CODE (x)) {
++  case PRE_DEC:
++  case PRE_INC:
++  case POST_DEC:
++  case POST_INC:
++  case PRE_MODIFY:
++  case POST_MODIFY:
++    if (rtx_equal_p (reg, XEXP (x, 0)))
++      return 1;
++    break;
++
++  default:
++    gcc_unreachable ();
++  }
++  return -1;
++}
++#endif
++
+ /* Increment the label uses for all labels present in rtx.  */
+ 
+ static void
+@@ -3268,6 +3296,18 @@ try_split (rtx pat, rtx trial, int last)
+ 	    }
+ 	  break;
+ 
++#ifdef AUTO_INC_DEC
++	case REG_INC:
++	  for (insn = insn_last; insn; insn = PREV_INSN (insn))
++	    {
++	      rtx reg = XEXP (note, 0);
++	      if (for_each_rtx (&PATTERN (insn), find_auto_inc, reg) > 0)
++		REG_NOTES (insn) = gen_rtx_EXPR_LIST (REG_INC, reg,
++						      REG_NOTES (insn));
++	    }
++	  break;
++#endif
++
+ 	default:
+ 	  break;
+ 	}
--- gcj-4.2-4.2-20070707.orig/debian/patches/mips-libspec.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/mips-libspec.dpatch
@@ -0,0 +1,69 @@
+#! /bin/sh -e
+
+# DP: mips*-linux: Always imply -lpthread for -pthread
+
+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
+
+
+2007-06-13  Thiemo Seufer  <ths@networkno.de>
+
+	* config/mips/linux.h, config/mips/linux64.h (LIB_SPEC): Always
+	imply -lpthread for -pthread.
+
+
+Index: gcc/config/mips/linux.h
+===================================================================
+--- gcc/config/mips/linux.h	(revision 125681)
++++ gcc/config/mips/linux.h	(working copy)
+@@ -174,9 +174,10 @@
+ 
+ #undef LIB_SPEC
+ #define LIB_SPEC "\
+-%{shared: -lc} \
+-%{!shared: %{pthread:-lpthread} \
+-  %{profile:-lc_p} %{!profile: -lc}}"
++%{pthread:-lpthread} \
++%{shared:-lc} \
++%{!shared: \
++  %{profile:-lc_p} %{!profile:-lc}}"
+ 
+ #define MD_UNWIND_SUPPORT "config/mips/linux-unwind.h"
+ 
+Index: gcc/config/mips/linux64.h
+===================================================================
+--- gcc/config/mips/linux64.h	(revision 125681)
++++ gcc/config/mips/linux64.h	(working copy)
+@@ -34,9 +34,10 @@
+ 
+ #undef LIB_SPEC
+ #define LIB_SPEC "\
+-%{shared: -lc} \
+-%{!shared: %{pthread:-lpthread} \
+-  %{profile:-lc_p} %{!profile: -lc}}"
++%{pthread:-lpthread} \
++%{shared:-lc} \
++%{!shared: \
++  %{profile:-lc_p} %{!profile:-lc}}"
+ 
+ #define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
+ #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1"
+
--- gcj-4.2-4.2-20070707.orig/debian/patches/libjava-jnipath.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/libjava-jnipath.dpatch
@@ -0,0 +1,94 @@
+#! /bin/sh -e
+
+# DP: - Add /usr/lib/jni to java.library.path.
+# DP: - When running the i386 binaries on amd64, look in
+# DP: - /usr/lib32/gcj-x.y and /usr/lib32/jni instead.
+
+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
+
+--- libjava/gnu/classpath/natSystemProperties.cc~	2006-08-02 00:53:40.000000000 +0200
++++ libjava/gnu/classpath/natSystemProperties.cc	2006-08-19 00:41:50.063803000 +0200
+@@ -141,6 +141,34 @@
+   return retval;
+ }
+ 
++static char*
++AppendJniLibdir (char *path, struct utsname *u)
++{
++  char* retval;
++  const char* jnilibdir = "/usr/lib/jni";
++
++#if defined(__linux__) && defined (__i386__)
++  if (! strcmp ("x86_64", u->machine))
++    jnilibdir = "/usr/lib32/jni";
++#endif
++
++  if (path)
++    {
++      jsize total = strlen (path)
++	+ (sizeof (PATH_SEPARATOR) - 1) + strlen (jnilibdir) + 1;
++      retval = (char*) _Jv_Malloc (total);
++      strcpy (retval, path);
++      strcat (retval, PATH_SEPARATOR);
++      strcat (retval, jnilibdir);
++    }
++  else
++    {
++      retval = (char*) _Jv_Malloc (strlen (jnilibdir) + 1);
++      strcpy (retval, jnilibdir);
++    }
++  return retval;
++}
++
+ void
+ gnu::classpath::SystemProperties::insertSystemProperties (java::util::Properties *newprops)
+ {
+@@ -370,8 +398,13 @@
+       // Prepend GCJ_VERSIONED_LIBDIR to the module load path so that
+       // libgcj will find its own JNI libraries, like libgtkpeer.so.
+       char* val = PrependVersionedLibdir (path);
+-      _Jv_SetDLLSearchPath (val);
++
++      // Append jnilibdir
++      char* val2 = AppendJniLibdir (val, &u);
++
++      _Jv_SetDLLSearchPath (val2);
+       _Jv_Free (val);
++      _Jv_Free (val2);
+     }
+   else
+     {
+@@ -379,9 +412,12 @@
+ #ifdef USE_LTDL
+       char *libpath = getenv (LTDL_SHLIBPATH_VAR);
+       char* val = _Jv_PrependVersionedLibdir (libpath);
+-      SET ("java.library.path", val);
+-      _Jv_SetDLLSearchPath (val);
++      // Append jnilibdir
++      char* val2 = AppendJniLibdir (val, &u);
++      SET ("java.library.path", val2);
++      _Jv_SetDLLSearchPath (val2);
+       _Jv_Free (val);
++      _Jv_Free (val2);
+ #else
+       SET ("java.library.path", "");
+ #endif
--- gcj-4.2-4.2-20070707.orig/debian/patches/ada-default-project-path.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/ada-default-project-path.dpatch
@@ -0,0 +1,101 @@
+#! /bin/sh -e
+
+# DP: - Change the default search path for project files to the one specified
+# DP:   by the Debian Policy for Ada: /usr/share/ada/adainclude.
+
+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.old/ada/prj-ext.adb    2005-11-15 15:01:18.000000000 +0100
++++ gcc/ada/prj-ext.adb        2006-03-22 09:09:51.000000000 +0100
+@@ -282,9 +282,7 @@
+       if Add_Default_Dir then
+          Current_Project_Path :=
+            new String'(Name_Buffer (1 .. Name_Len) & Path_Separator &
+-                       Sdefault.Search_Dir_Prefix.all & ".." &
+-                       Directory_Separator & ".." & Directory_Separator &
+-                       ".." & Directory_Separator & "gnat");
++                       Sdefault.Search_Dir_Prefix.all);
+       else
+          Current_Project_Path := new String'(Name_Buffer (1 .. Name_Len));
+       end if;
+--- gcc.old/ada/gnatls.adb     2005-07-01 03:29:17.000000000 +0200
++++ gcc/ada/gnatls.adb 2006-03-22 12:19:39.000000000 +0100
+@@ -1547,9 +1547,6 @@
+       declare
+          Project_Path : constant String_Access := Getenv (Ada_Project_Path);
+ 
+-         Lib    : constant String :=
+-                    Directory_Separator & "lib" & Directory_Separator;
+-
+          First : Natural;
+          Last  : Natural;
+ 
+@@ -1605,35 +1602,9 @@
+          if Add_Default_Dir then
+             Name_Len := 0;
+             Add_Str_To_Name_Buffer (Sdefault.Search_Dir_Prefix.all);
+-
+-            --  On Windows, make sure that all directory separators are '\'
+-
+-            if Directory_Separator /= '/' then
+-               for J in 1 .. Name_Len loop
+-                  if Name_Buffer (J) = '/' then
+-                     Name_Buffer (J) := Directory_Separator;
+-                  end if;
+-               end loop;
+-            end if;
+-
+-            --  Find the sequence "/lib/"
+-
+-            while Name_Len >= Lib'Length
+-              and then Name_Buffer (Name_Len - 4 .. Name_Len) /= Lib
+-            loop
+-               Name_Len := Name_Len - 1;
+-            end loop;
+-
+-            --  If the sequence "/lib"/ was found, display the default
+-            --  directory <prefix>/lib/gnat/.
+-
+-            if Name_Len >= 5 then
+-               Write_Str ("   ");
+-               Write_Str (Name_Buffer (1 .. Name_Len));
+-               Write_Str ("gnat");
+-               Write_Char (Directory_Separator);
+-               Write_Eol;
+-            end if;
++            Write_Str ("   ");
++            Write_Str (Name_Buffer (1 .. Name_Len));
++            Write_Eol;
+          end if;
+       end;
+ 
+--- gcc.old/ada/Make-lang.in
++++ gcc/ada/Make-lang.in
+@@ -930,7 +930,7 @@
+ 	$(ECHO) "   S1 : constant String := \"$(ADA_INCLUDE_DIR)/\";" >>tmp-sdefault.adb
+ 	$(ECHO) "   S2 : constant String := \"$(ADA_RTL_OBJ_DIR)/\";" >>tmp-sdefault.adb
+ 	$(ECHO) "   S3 : constant String := \"$(target)/\";" >>tmp-sdefault.adb
+-	$(ECHO) "   S4 : constant String := \"$(libsubdir)/\";" >>tmp-sdefault.adb
++	$(ECHO) "   S4 : constant String := \"/usr/share/ada/adainclude/\";" >>tmp-sdefault.adb
+ 	$(ECHO) "   function Include_Dir_Default_Name return String_Ptr is" >>tmp-sdefault.adb
+ 	$(ECHO) "   begin" >>tmp-sdefault.adb
+ 	$(ECHO) "      return Relocate_Path (S0, S1);" >>tmp-sdefault.adb
--- gcj-4.2-4.2-20070707.orig/debian/patches/m68k-align-code.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/m68k-align-code.dpatch
@@ -0,0 +1,48 @@
+#! /bin/sh -e
+
+# All lines beginning with `# DPATCH:' are a description of the patch.
+# DP: use "move.l %a4,%a4" to advance within code.
+
+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 -p1 < $0
+        #cd ${dir}gcc && autoconf
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p1 < $0
+        #rm ${dir}gcc/configure
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+---
+ gcc/config/m68k/linux.h |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+Index: gcc-4.1/gcc/config/m68k/linux.h
+===================================================================
+--- gcc-4.1.orig/gcc/config/m68k/linux.h
++++ gcc-4.1/gcc/config/m68k/linux.h
+@@ -163,6 +163,11 @@ Boston, MA 02110-1301, USA.  */
+   if ((LOG) > 0)						\
+     fprintf ((FILE), "%s%u\n", ALIGN_ASM_OP, 1 << (LOG));
+ 
++/* Use "move.l %a4,%a4" to advance within code.  */
++#define ASM_OUTPUT_ALIGN_WITH_NOP(FILE,LOG)			\
++  if ((LOG) > 0)						\
++    fprintf ((FILE), "\t.balignw %u,0x284c\n", 1 << (LOG));
++
+ /* If defined, a C expression whose value is a string containing the
+    assembler operation to identify the following data as uninitialized global
+    data.  */
--- gcj-4.2-4.2-20070707.orig/debian/patches/gcc-ice-hack.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/gcc-ice-hack.dpatch
@@ -0,0 +1,320 @@
+#! /bin/sh -e
+
+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
+
+# DP: 2004-01-23  Jakub Jelinek  <jakub@redhat.com>
+# DP: 
+# DP: 	* system.h (ICE_EXIT_CODE): Define.
+# DP: 	* gcc.c (execute): Don't free first string early, but at the end
+# DP: 	of the function.  Call retry_ice if compiler exited with
+# DP: 	ICE_EXIT_CODE.
+# DP: 	(retry_ice): New function.
+# DP: 	* diagnostic.c (diagnostic_count_diagnostic,
+# DP: 	diagnostic_action_after_output, error_recursion): Exit with
+# DP: 	ICE_EXIT_CODE instead of FATAL_EXIT_CODE.
+
+--- gcc/diagnostic.c~	2006-04-02 00:43:34.347240936 +0200
++++ gcc/diagnostic.c	2006-04-02 00:54:47.676879272 +0200
+@@ -265,7 +265,7 @@
+ 	       "See %s for instructions.\n", bug_report_url);
+       fnotice (stderr, "For Debian GNU/Linux specific bug reporting instructions,\n"
+ 	       "see %s.\n", debian_bug_report_url);
+-      exit (ICE_EXIT_CODE);
++      exit (FATAL_EXIT_CODE);
+ 
+     case DK_FATAL:
+       if (context->abort_on_error)
+--- gcc/gcc.c~	2006-04-02 01:07:37.323875144 +0200
++++ gcc/gcc.c	2006-04-02 01:11:15.310736104 +0200
+@@ -348,6 +348,9 @@
+ #if defined(HAVE_TARGET_OBJECT_SUFFIX) || defined(HAVE_TARGET_EXECUTABLE_SUFFIX)
+ static const char *convert_filename (const char *, int, int);
+ #endif
++#if !(defined (__MSDOS__) || defined (OS2) || defined (VMS))
++static void retry_ice (const char *prog, const char **argv);
++#endif
+ 
+ static const char *if_exists_spec_function (int, const char **);
+ static const char *if_exists_else_spec_function (int, const char **);
+@@ -2951,7 +2954,7 @@
+ 	    }
+ 	}
+ 
+-      if (string != commands[i].prog)
++      if (i && string != commands[i].prog)
+ 	free ((void *) string);
+     }
+ 
+@@ -3010,6 +3013,16 @@
+ 	else if (WIFEXITED (status)
+ 		 && WEXITSTATUS (status) >= MIN_FATAL_STATUS)
+ 	  {
++#if !(defined (__MSDOS__) || defined (OS2) || defined (VMS))
++	    /* For ICEs in cc1, cc1obj, cc1plus see if it is
++	       reproducible or not.  */
++	    char *p;
++	    if (WEXITSTATUS (status) == ICE_EXIT_CODE
++		&& i == 0
++		&& (p = strrchr (commands[0].argv[0], DIR_SEPARATOR))
++		&& ! strncmp (p + 1, "cc1", 3))
++	      retry_ice (commands[0].prog, commands[0].argv);
++#endif
+ 	    if (WEXITSTATUS (status) > greatest_status)
+ 	      greatest_status = WEXITSTATUS (status);
+ 	    ret_code = -1;
+@@ -3030,6 +3043,9 @@
+ 	  }
+       }
+ 
++    if (commands[0].argv[0] != commands[0].prog)
++      free ((PTR) commands[0].argv[0]);
++
+     return ret_code;
+   }
+ }
+@@ -5963,6 +5979,224 @@
+   switches[switchnum].validated = 1;
+ }
+ 
++#if !(defined (__MSDOS__) || defined (OS2) || defined (VMS))
++#define RETRY_ICE_ATTEMPTS 2
++
++static void
++retry_ice (const char *prog, const char **argv)
++{
++  int nargs, out_arg = -1, quiet = 0, attempt;
++  int pid, retries, sleep_interval;
++  const char **new_argv;
++  char *temp_filenames[RETRY_ICE_ATTEMPTS * 2 + 2];
++
++  if (input_filename == NULL || ! strcmp (input_filename, "-"))
++    return;
++
++  for (nargs = 0; argv[nargs] != NULL; ++nargs)
++    /* Only retry compiler ICEs, not preprocessor ones.  */
++    if (! strcmp (argv[nargs], "-E"))
++      return;
++    else if (argv[nargs][0] == '-' && argv[nargs][1] == 'o')
++      {
++	if (out_arg == -1)
++	  out_arg = nargs;
++	else
++	  return;
++      }
++    /* If the compiler is going to output any time information,
++       it might vary between invocations.  */
++    else if (! strcmp (argv[nargs], "-quiet"))
++      quiet = 1;
++    else if (! strcmp (argv[nargs], "-ftime-report"))
++      return;
++
++  if (out_arg == -1 || !quiet)
++    return;
++
++  memset (temp_filenames, '\0', sizeof (temp_filenames));
++  new_argv = alloca ((nargs + 3) * sizeof (const char *));
++  memcpy (new_argv, argv, (nargs + 1) * sizeof (const char *));
++  new_argv[nargs++] = "-frandom-seed=0";
++  new_argv[nargs] = NULL;
++  if (new_argv[out_arg][2] == '\0')
++    new_argv[out_arg + 1] = "-";
++  else
++    new_argv[out_arg] = "-o-";
++
++  for (attempt = 0; attempt < RETRY_ICE_ATTEMPTS + 1; ++attempt)
++    {
++      int fd = -1;
++      int status;
++
++      temp_filenames[attempt * 2] = make_temp_file (".out");
++      temp_filenames[attempt * 2 + 1] = make_temp_file (".err");
++
++      if (attempt == RETRY_ICE_ATTEMPTS)
++        {
++	  int i;
++	  int fd1, fd2;
++	  struct stat st1, st2;
++	  size_t n, len;
++	  char *buf;
++
++	  buf = xmalloc (8192);
++
++	  for (i = 0; i < 2; ++i)
++	    {
++	      fd1 = open (temp_filenames[i], O_RDONLY);
++	      fd2 = open (temp_filenames[2 + i], O_RDONLY);
++
++	      if (fd1 < 0 || fd2 < 0)
++		{
++		  i = -1;
++		  close (fd1);
++		  close (fd2);
++		  break;
++		}
++
++	      if (fstat (fd1, &st1) < 0 || fstat (fd2, &st2) < 0)
++		{
++		  i = -1;
++		  close (fd1);
++		  close (fd2);
++		  break;
++		}
++
++	      if (st1.st_size != st2.st_size)
++		{
++		  close (fd1);
++		  close (fd2);
++		  break;
++		}
++
++	      len = 0;
++	      for (n = st1.st_size; n; n -= len)
++		{
++		  len = n;
++		  if (len > 4096)
++		    len = 4096;
++
++		  if (read (fd1, buf, len) != (int) len
++		      || read (fd2, buf + 4096, len) != (int) len)
++		    {
++		      i = -1;
++		      break;
++		    }
++
++		  if (memcmp (buf, buf + 4096, len) != 0)
++		    break;
++		}
++
++	      close (fd1);
++	      close (fd2);
++
++	      if (n)
++		break;
++	    }
++
++	  free (buf);
++	  if (i == -1)
++	    break;
++
++	  if (i != 2)
++	    {
++	      notice ("The bug is not reproducible, so it is likely a hardware or OS problem.\n");
++	      break;
++	    }
++
++          fd = open (temp_filenames[attempt * 2], O_RDWR);
++	  if (fd < 0)
++	    break;
++	  write (fd, "//", 2);
++	  for (i = 0; i < nargs; i++)
++	    {
++	      write (fd, " ", 1);
++	      write (fd, new_argv[i], strlen (new_argv[i]));
++	    }
++	  write (fd, "\n", 1);
++	  new_argv[nargs] = "-E";
++	  new_argv[nargs + 1] = NULL;
++        }
++
++      /* Fork a subprocess; wait and retry if it fails.  */
++      sleep_interval = 1;
++      pid = -1;
++      for (retries = 0; retries < 4; retries++)
++	{
++	  pid = fork ();
++	  if (pid >= 0)
++	    break;
++	  sleep (sleep_interval);
++	  sleep_interval *= 2;
++	}
++
++      if (pid < 0)
++	break;
++      else if (pid == 0)
++	{
++	  if (attempt != RETRY_ICE_ATTEMPTS)
++	    fd = open (temp_filenames[attempt * 2], O_RDWR);
++	  if (fd < 0)
++	    exit (-1);
++	  if (fd != 1)
++	    {
++	      close (1);
++	      dup (fd);
++	      close (fd);
++	    }
++
++	  fd = open (temp_filenames[attempt * 2 + 1], O_RDWR);
++	  if (fd < 0)
++	    exit (-1);
++	  if (fd != 2)
++	    {
++	      close (2);
++	      dup (fd);
++	      close (fd);
++	    }
++
++	  if (prog == new_argv[0])
++	    execvp (prog, (char *const *) new_argv);
++	  else
++	    execv (new_argv[0], (char *const *) new_argv);
++	  exit (-1);
++	}
++
++      if (waitpid (pid, &status, 0) < 0)
++	break;
++
++      if (attempt < RETRY_ICE_ATTEMPTS
++	  && (! WIFEXITED (status) || WEXITSTATUS (status) != ICE_EXIT_CODE))
++	{
++	  notice ("The bug is not reproducible, so it is likely a hardware or OS problem.\n");
++	  break;
++	}
++      else if (attempt == RETRY_ICE_ATTEMPTS)
++	{
++	  close (fd);
++	  if (WIFEXITED (status)
++	      && WEXITSTATUS (status) == SUCCESS_EXIT_CODE)
++	    {
++	      notice ("Preprocessed source stored into %s file, please attach this to your bugreport.\n",
++		      temp_filenames[attempt * 2]);
++	      /* Make sure it is not deleted.  */
++	      free (temp_filenames[attempt * 2]);
++	      temp_filenames[attempt * 2] = NULL;
++	      break;
++	    }
++	}
++    }
++
++  for (attempt = 0; attempt < RETRY_ICE_ATTEMPTS * 2 + 2; attempt++)
++    if (temp_filenames[attempt])
++      {
++	unlink (temp_filenames[attempt]);
++	free (temp_filenames[attempt]);
++      }
++}
++#endif
++
+ /* Search for a file named NAME trying various prefixes including the
+    user's -B prefix and some standard ones.
+    Return the absolute file name found.  If nothing is found, return NAME.  */
--- gcj-4.2-4.2-20070707.orig/debian/patches/boehm-gc-nocheck.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/boehm-gc-nocheck.dpatch
@@ -0,0 +1,37 @@
+#! /bin/sh -e
+
+# DP: Disable running the boehm-gc testsuite. Hangs the buildd at least on hppa.
+
+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
+
+--- boehm-gc/Makefile.in~	2004-06-20 16:24:06.000000000 +0200
++++ boehm-gc/Makefile.in	2004-06-23 09:43:42.000000000 +0200
+@@ -662,7 +662,8 @@
+ 	  test "$$failed" -eq 0; \
+ 	else :; fi
+ check-am: $(check_PROGRAMS)
+-	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
++	: # $(MAKE) $(AM_MAKEFLAGS) check-TESTS
++	@echo target $@ disabled for Debian build.
+ check: check-recursive
+ all-am: Makefile $(LTLIBRARIES) all-multi
+ installdirs: installdirs-recursive
--- gcj-4.2-4.2-20070707.orig/debian/patches/netbsd-all-gcc.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/netbsd-all-gcc.dpatch
@@ -0,0 +1,395 @@
+#! /bin/sh -e
+
+# DP: General NetBSD support patches
+
+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/config/netbsd-elf-gnu.h src/gcc/config/netbsd-elf-gnu.h
+--- gcc/config/netbsd-elf-gnu.h	1970-01-01 00:00:00.000000000 +0000
++++ gcc/config/netbsd-elf-gnu.h	2003-04-24 05:42:44.000000000 +0000
+@@ -0,0 +1,98 @@
++/* Common configuration file for NetBSD ELF w/ GNU userland targets.
++   Copyright (C) 2002 Free Software Foundation, Inc.
++   Contributed by Wasabi Systems, Inc.
++
++This file is part of GNU CC.
++
++GNU CC 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.
++
++GNU CC 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 GNU CC; see the file COPYING.  If not, write to
++the Free Software Foundation, 59 Temple Place - Suite 330,
++Boston, MA 02111-1307, USA.  */
++
++/* TARGET_OS_CPP_BUILTINS() common to all NetBSD ELF targets.  */
++#define NETBSD_OS_CPP_BUILTINS_ELF()		\
++  do						\
++    {						\
++      NETBSD_OS_CPP_BUILTINS_COMMON();		\
++      builtin_define ("__ELF__");		\
++    }						\
++  while (0)
++
++/* This defines which switch letters take arguments.  On NetBSD, most
++   of the normal cases (defined by gcc.c) apply, and we also have -h*
++   and -z* options (for the linker) (coming from SVR4).  */
++
++#undef SWITCH_TAKES_ARG
++#define SWITCH_TAKES_ARG(CHAR)			\
++  (DEFAULT_SWITCH_TAKES_ARG (CHAR)		\
++   || (CHAR) == 'h'				\
++   || (CHAR) == 'z'				\
++   || (CHAR) == 'R')
++
++
++/* Provide a STARTFILE_SPEC appropriate for NetBSD ELF.  Here we
++   provide support for the special GCC option -static.  On ELF
++   targets, we also add the crtbegin.o file, which provides part
++   of the support for getting C++ file-scope static objects
++   constructed before entering "main".  */
++
++#define NETBSD_STARTFILE_SPEC	\
++  "%{!shared:			\
++     %{pg:gcrt0%O%s}		\
++     %{!pg:			\
++       %{p:gcrt0%O%s}		\
++       %{!p:crt0%O%s}}}		\
++   %:if-exists(crti%O%s)	\
++   %{static:%:if-exists-else(crtbeginT%O%s crtbegin%O%s)} \
++   %{!static: \
++     %{!shared:crtbegin%O%s} %{shared:crtbeginS%O%s}}"
++
++#undef STARTFILE_SPEC
++#define STARTFILE_SPEC NETBSD_STARTFILE_SPEC
++
++
++/* Provide an ENDFILE_SPEC appropriate for NetBSD ELF.  Here we
++   add crtend.o, which provides part of the support for getting
++   C++ file-scope static objects deconstructed after exiting "main".  */
++
++#define NETBSD_ENDFILE_SPEC	\
++  "%{!shared:crtend%O%s} %{shared:crtendS%O%s} \
++   %:if-exists(crtn%O%s)"
++
++#undef ENDFILE_SPEC
++#define ENDFILE_SPEC NETBSD_ENDFILE_SPEC
++
++/* Provide a LINK_SPEC appropriate for NetBSD ELF.  Here we provide
++   support for the special GCC options -assert, -R, -rpath, -shared,
++   -nostdlib, -static, -rdynamic, and -dynamic-linker.
++
++   Target-specific code can use this in conjunction with any other
++   target-specific LINK_SPEC options.
++
++   Target-specific code must provide the %(netbsd_entry_point) spec.  */
++
++/* This differs from native NetBSD only in that the linker is expected to
++   live in /lib, rather than /usr/libexec (or /libexec). */
++
++#define NETBSD_LINK_SPEC_ELF \
++  "%{assert*} %{R*} %{rpath*} \
++   %{shared:-shared} \
++   %{!shared: \
++     -dc -dp \
++     %{!nostdlib: \
++       %{!r*: \
++	 %{!e*:-e %(netbsd_entry_point)}}} \
++     %{!static: \
++       %{rdynamic:-export-dynamic} \
++       %{!dynamic-linker:-dynamic-linker /lib/ld.elf_so}} \
++     %{static:-static}}"
+diff -urN gcc/config/netbsd-gnu.h src/gcc/config/netbsd-gnu.h
+--- gcc/config/netbsd-gnu.h	1970-01-01 00:00:00.000000000 +0000
++++ gcc/config/netbsd-gnu.h	2003-04-24 05:41:04.000000000 +0000
+@@ -0,0 +1,206 @@
++/* Base configuration file for all NetBSD w/ GNU userland targets.
++   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003
++   Free Software Foundation, Inc.
++
++This file is part of GNU CC.
++
++GNU CC 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.
++
++GNU CC 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 GNU CC; see the file COPYING.  If not, write to
++the Free Software Foundation, 59 Temple Place - Suite 330,
++Boston, MA 02111-1307, USA.  */
++
++/* TARGET_OS_CPP_BUILTINS() common to all NetBSD targets.  */
++#define NETBSD_OS_CPP_BUILTINS_COMMON()		\
++  do						\
++    {						\
++      builtin_define ("__NetBSD__");		\
++      builtin_assert ("system=unix");		\
++      builtin_assert ("system=NetBSD");		\
++    }						\
++  while (0)
++
++/* TARGET_OS_CPP_BUILTINS() common to all LP64 NetBSD targets.  */
++#define NETBSD_OS_CPP_BUILTINS_LP64()		\
++  do						\
++    {						\
++      builtin_define ("_LP64");			\
++    }						\
++  while (0)
++
++/* CPP_SPEC parts common to all NetBSD targets.  */
++#define NETBSD_CPP_SPEC				\
++  "%{posix:-D_POSIX_SOURCE} \
++   %{pthread:-D_REENTRANT -D_PTHREADS}"
++
++/* NETBSD_NATIVE is defined only when gcc is integrated into a NetBSD
++   system with a NetBSD userland - NetBSD with a GNU userland never defines
++   it, and all references to it have been removed for this system type. */
++
++/* FIXME: This should link to libc, but there are problems with that under
++   3.2 - find out of they still apply under 3.3! */
++
++/* Provide a LIB_SPEC appropriate for NetBSD.  Here we:
++
++   1. Select the appropriate set of libs, depending on whether we're
++      profiling.
++
++   2. Include the pthread library if -pthread is specified (only
++      if threads are enabled).
++
++   3. Include the posix library if -posix is specified.
++
++   FIXME: Could eliminate the duplication here if we were allowed to
++   use string concatenation.  */
++
++#ifdef NETBSD_ENABLE_PTHREADS
++#define NETBSD_LIB_SPEC		\
++  "%{pthread:			\
++     %{!p:			\
++       %{!pg:-lpthread}}	\
++     %{p:-lpthread_p}		\
++     %{pg:-lpthread_p}}		\
++   %{posix:			\
++     %{!p:			\
++       %{!pg:-lposix}}		\
++     %{p:-lposix_p}		\
++     %{pg:-lposix_p}}		\
++   %{!shared:			\
++     %{!symbolic:		\
++       %{!p:			\
++	 %{!pg:-lc}}		\
++       %{p:-lc_p}		\
++       %{pg:-lc_p}}}"
++#else
++#define NETBSD_LIB_SPEC		\
++  "%{posix:			\
++     %{!p:			\
++       %{!pg:-lposix}}		\
++     %{p:-lposix_p}		\
++     %{pg:-lposix_p}}		\
++   %{!shared:			\
++     %{!symbolic:		\
++       %{!p:			\
++	 %{!pg:-lc}}		\
++       %{p:-lc_p}		\
++       %{pg:-lc_p}}}"
++#endif
++
++#undef LIB_SPEC
++#define LIB_SPEC NETBSD_LIB_SPEC
++
++/* Provide a LIBGCC_SPEC appropriate for NetBSD.  We also want to exclude
++   libgcc with -symbolic.  */
++
++#ifdef NETBSD_NATIVE
++#define NETBSD_LIBGCC_SPEC	\
++  "%{!symbolic:			\
++     %{!shared:			\
++       %{!p:			\
++	 %{!pg: -lgcc}}}	\
++     %{shared: -lgcc_pic}	\
++     %{p: -lgcc_p}		\
++     %{pg: -lgcc_p}}"
++#else
++#define NETBSD_LIBGCC_SPEC "%{!shared:%{!symbolic: -lgcc}}"
++#endif
++
++#undef LIBGCC_SPEC
++#define LIBGCC_SPEC NETBSD_LIBGCC_SPEC
++
++/* When building shared libraries, the initialization and finalization 
++   functions for the library are .init and .fini respectively.  */
++
++#define COLLECT_SHARED_INIT_FUNC(STREAM,FUNC)				\
++  do {									\
++    fprintf ((STREAM), "void __init() __asm__ (\".init\");");		\
++    fprintf ((STREAM), "void __init() {\n\t%s();\n}\n", (FUNC));	\
++  } while (0)
++
++#define COLLECT_SHARED_FINI_FUNC(STREAM,FUNC)				\
++  do {									\
++    fprintf ((STREAM), "void __fini() __asm__ (\".fini\");");		\
++    fprintf ((STREAM), "void __fini() {\n\t%s();\n}\n", (FUNC));	\
++  } while (0)
++
++#undef TARGET_HAS_F_SETLKW
++#define TARGET_HAS_F_SETLKW
++
++/* Implicit library calls should use memcpy, not bcopy, etc.  */
++
++#undef TARGET_MEM_FUNCTIONS
++#define TARGET_MEM_FUNCTIONS 1
++
++/* Handle #pragma weak and #pragma pack.  */
++
++#define HANDLE_SYSV_PRAGMA 1
++
++
++/* Define some types that are the same on all NetBSD platforms,
++   making them agree with <machine/ansi.h>.  */
++
++#undef WCHAR_TYPE
++#define WCHAR_TYPE "int"
++
++#undef WCHAR_TYPE_SIZE
++#define WCHAR_TYPE_SIZE 32
++
++#undef WINT_TYPE
++#define WINT_TYPE "int"
++
++
++/* Attempt to turn on execute permission for the stack.  This may be
++   used by TRANSFER_FROM_TRAMPOLINE of the target needs it (that is,
++   if the target machine can change execute permissions on a page).
++
++   There is no way to query the execute permission of the stack, so
++   we always issue the mprotect() call.
++
++   Note that we go out of our way to use namespace-non-invasive calls
++   here.  Unfortunately, there is no libc-internal name for mprotect().
++
++   Also note that no errors should be emitted by this code; it is considered
++   dangerous for library calls to send messages to stdout/stderr.  */
++
++#define NETBSD_ENABLE_EXECUTE_STACK					\
++extern void __enable_execute_stack (void *);				\
++void									\
++__enable_execute_stack (addr)						\
++     void *addr;							\
++{									\
++  extern int mprotect (void *, size_t, int);				\
++  extern int __sysctl (int *, unsigned int, void *, size_t *,		\
++		       void *, size_t);					\
++									\
++  static int size;							\
++  static long mask;							\
++									\
++  char *page, *end;							\
++									\
++  if (size == 0)							\
++    {									\
++      int mib[2];							\
++      size_t len;							\
++									\
++      mib[0] = 6; /* CTL_HW */						\
++      mib[1] = 7; /* HW_PAGESIZE */					\
++      len = sizeof (size);						\
++      (void) __sysctl (mib, 2, &size, &len, NULL, 0);			\
++      mask = ~((long) size - 1);					\
++    }									\
++									\
++  page = (char *) (((long) addr) & mask);				\
++  end  = (char *) ((((long) (addr + TRAMPOLINE_SIZE)) & mask) + size);	\
++									\
++  /* 7 == PROT_READ | PROT_WRITE | PROT_EXEC */				\
++  (void) mprotect (page, end - page, 7);				\
++}
+diff -urN gcc/config/t-netbsd-gnu src/gcc/config/t-netbsd-gnu
+--- gcc/config/t-netbsd-gnu	1970-01-01 00:00:00.000000000 +0000
++++ gcc/config/t-netbsd-gnu	2003-02-21 10:31:17.000000000 +0000
+@@ -0,0 +1,5 @@
++# Don't run fixproto
++STMP_FIXPROTO =
++
++# Always build crtstuff with PIC.
++CRTSTUFF_T_CFLAGS = -fPIC
+diff -urN gcc/config.gcc src/gcc/config.gcc
+--- gcc/config.gcc	2003-03-02 07:39:03.000000000 +0000
++++ gcc/config.gcc	2003-04-24 06:02:55.000000000 +0000
+@@ -329,6 +329,45 @@
+ 		;;
+ 	esac
+ 	;;
++*-*-netbsd*-gnu*)
++	tmake_file="t-slibgcc-elf-ver t-libc-ok t-netbsd"
++	xm_defines=POSIX
++	gas=yes
++	gnu_ld=yes
++
++	# This section MUST go above the matches for Hurd and native NetBSD,
++	# or they will catch the value, due to using excessively permissive 
++	# match values. Also, $machine doesn't contain any version data, on
++	# a NetBSD w/ GNU userland machine, so we use uname -r instead.
++
++	osr=`uname -r`
++
++	# NetBSD 2.0 and later get POSIX threads enabled by default.
++	# Allow them to be explicitly enabled on any other version.
++	case x${enable_threads} in
++	x)
++		case $osr in
++		[2-9]*)
++			thread_file='posix'
++			tm_defines="${tm_defines} NETBSD_ENABLE_PTHREADS"
++			;;
++		esac
++		;;
++	xyes | xposix)
++		thread_file='posix'
++		tm_defines="${tm_defines} NETBSD_ENABLE_PTHREADS"
++		;;
++	esac
++
++	# NetBSD 1.7 and later are set up to use GCC's crtstuff for
++	# ELF configurations.  We will clear extra_parts in the
++	# a.out configurations.
++	case $osr in
++	1.[7-9]* | [2-9]*)
++		extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o"
++		;;
++	esac
++	;;
+ *-*-gnu*)
+ 	# On the Hurd, the setup is just about the same on
+ 	# each different CPU.  The specific machines that we
--- gcj-4.2-4.2-20070707.orig/debian/patches/kbsd-gnu.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/kbsd-gnu.dpatch
@@ -0,0 +1,94 @@
+#! /bin/sh -e
+
+# DP: GNU/k*BSD support
+# Author: Robert Millan <rmh@aybabtu.com>
+# Status: Not yet submitted
+
+
+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 -p1 < $0
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p1 < $0
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+# append the patch here and adjust the -p? flag in the patch calls.
+
+diff -Nurd gcc-4.2.orig/gcc/config/i386/kfreebsd-gnu.h gcc-4.2/gcc/config/i386/kfreebsd-gnu.h
+--- gcc-4.2.orig/gcc/config/i386/kfreebsd-gnu.h	2006-01-18 22:46:30.000000000 +0100
++++ gcc-4.2/gcc/config/i386/kfreebsd-gnu.h	2007-05-23 05:34:47.000000000 +0200
+@@ -20,7 +20,29 @@
+ the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.  */
+ 
++#ifdef GLIBC_DYNAMIC_LINKER32
++#undef GLIBC_DYNAMIC_LINKER32
++#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
++#endif
++
++#ifdef GLIBC_DYNAMIC_LINKER64
++#undef GLIBC_DYNAMIC_LINKER64
++#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-kfreebsd-x86-64.so.1"
++#endif
++
+ #undef LINK_EMULATION
+ #define LINK_EMULATION "elf_i386_fbsd"
++
++#ifdef LINK_EMULATION32
++#undef LINK_EMULATION32
++#define LINK_EMULATION32 LINK_EMULATION
++#endif
++
++#ifdef LINK_EMULATION64
++#undef LINK_EMULATION64
++#define LINK_EMULATION64 "elf_x86_64_fbsd"
++#endif
++
+ #undef REG_NAME
+ #define REG_NAME(reg) sc_ ## reg
++
+diff -Nurd gcc-4.2.orig/gcc/config/i386/linux64.h gcc-4.2/gcc/config/i386/linux64.h
+--- gcc-4.2.orig/gcc/config/i386/linux64.h	2007-05-22 22:25:11.000000000 +0200
++++ gcc-4.2/gcc/config/i386/linux64.h	2007-05-23 05:39:11.000000000 +0200
+@@ -49,11 +49,14 @@
+    When the -shared link option is used a final link is not being
+    done.  */
+ 
++/* These macros may be overridden in k*bsd-gnu.h and i386/k*bsd-gnu.h. */
+ #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
+ #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
++#define LINK_EMULATION32 "elf_i386"
++#define LINK_EMULATION64 "elf_x86_64"
+ 
+ #undef	LINK_SPEC
+-#define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} --hash-style=both \
++#define LINK_SPEC "%{!m32:-m " LINK_EMULATION64 "} %{m32:-m " LINK_EMULATION32 "} --hash-style=both \
+   %{shared:-shared} \
+   %{!shared: \
+     %{!static: \
+diff -Nurd gcc-4.2.orig/gcc/config.gcc gcc-4.2/gcc/config.gcc
+--- gcc-4.2.orig/gcc/config.gcc	2007-02-03 10:03:58.000000000 +0100
++++ gcc-4.2/gcc/config.gcc	2007-05-23 05:37:10.000000000 +0200
+@@ -1102,7 +1102,7 @@
+ 	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h linux.h \
+ 		 i386/x86-64.h i386/linux64.h"
+ 	case ${target} in
+-	x86_64-*-kfreebsd*-gnu) tm_file="${tm_file} kfreebsd-gnu.h" ;;
++	x86_64-*-kfreebsd*-gnu) tm_file="${tm_file} kfreebsd-gnu.h i386/kfreebsd-gnu.h" ;;
+ 	x86_64-*-knetbsd*-gnu) tm_file="${tm_file} knetbsd-gnu.h" ;;
+ 	esac
+ 	tmake_file="${tmake_file} i386/t-linux64 i386/t-crtfm t-dfprules"
--- gcj-4.2-4.2-20070707.orig/debian/patches/note-gnu-stack.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/note-gnu-stack.dpatch
@@ -0,0 +1,316 @@
+#! /bin/sh -e
+
+# DP: Add .note.GNU-stack sections for gcc's crt files, libffi and boehm-gc
+# DP: Taken from FC.
+
+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/
+
+2004-09-20  Jakub Jelinek  <jakub@redhat.com>
+
+	* config/rs6000/ppc-asm.h: Add .note.GNU-stack section also
+	on ppc64-linux.
+
+	* config/ia64/lib1funcs.asm: Add .note.GNU-stack section on
+	ia64-linux.
+	* config/ia64/crtbegin.asm: Likewise.
+	* config/ia64/crtend.asm: Likewise.
+	* config/ia64/crti.asm: Likewise.
+	* config/ia64/crtn.asm: Likewise.
+
+2004-05-14  Jakub Jelinek  <jakub@redhat.com>
+
+	* config/ia64/linux.h (TARGET_ASM_FILE_END): Define.
+
+
+boehm-gc/
+
+2005-02-08  Jakub Jelinek  <jakub@redhat.com>
+
+	* ia64_save_regs_in_stack.s: Moved to...
+	* ia64_save_regs_in_stack.S: ... this.  Add .note.GNU-stack
+	on Linux.
+
+libffi/
+
+2007-05-11  Daniel Jacobowitz  <dan@debian.org>
+
+	* src/arm/sysv.S: Fix ARM comment marker.
+
+2005-02-08  Jakub Jelinek  <jakub@redhat.com>
+
+	* src/alpha/osf.S: Add .note.GNU-stack on Linux.
+	* src/s390/sysv.S: Likewise.
+	* src/powerpc/linux64.S: Likewise.
+	* src/powerpc/linux64_closure.S: Likewise.
+	* src/powerpc/ppc_closure.S: Likewise.
+	* src/powerpc/sysv.S: Likewise.
+	* src/x86/unix64.S: Likewise.
+	* src/x86/sysv.S: Likewise.
+	* src/sparc/v8.S: Likewise.
+	* src/sparc/v9.S: Likewise.
+	* src/m68k/sysv.S: Likewise.
+	* src/ia64/unix.S: Likewise.
+	* src/arm/sysv.S: Likewise.
+
+
+Index: boehm-gc/ia64_save_regs_in_stack.s
+===================================================================
+--- boehm-gc/ia64_save_regs_in_stack.s	(revision 107431)
++++ boehm-gc/ia64_save_regs_in_stack.s	(revision 107432)
+@@ -1,12 +0,0 @@
+-        .text
+-        .align 16
+-        .global GC_save_regs_in_stack
+-        .proc GC_save_regs_in_stack
+-GC_save_regs_in_stack:
+-        .body
+-        flushrs
+-        ;;
+-        mov r8=ar.bsp
+-        br.ret.sptk.few rp
+-        .endp GC_save_regs_in_stack
+-
+Index: boehm-gc/ia64_save_regs_in_stack.S
+===================================================================
+--- boehm-gc/ia64_save_regs_in_stack.S	(revision 0)
++++ boehm-gc/ia64_save_regs_in_stack.S	(revision 107432)
+@@ -0,0 +1,15 @@
++        .text
++        .align 16
++        .global GC_save_regs_in_stack
++        .proc GC_save_regs_in_stack
++GC_save_regs_in_stack:
++        .body
++        flushrs
++        ;;
++        mov r8=ar.bsp
++        br.ret.sptk.few rp
++        .endp GC_save_regs_in_stack
++
++#ifdef __linux__
++	.section .note.GNU-stack,"",@progbits
++#endif
+--- gcc/config/ia64/linux.h.orig	2006-10-12 02:01:00.000000000 +0200
++++ gcc/config/ia64/linux.h	2006-12-11 10:33:13.000000000 +0100
+@@ -5,6 +5,8 @@
+ 
+ #define TARGET_VERSION fprintf (stderr, " (IA-64) Linux");
+ 
++#define TARGET_ASM_FILE_END file_end_indicate_exec_stack
++
+ /* This is for -profile to use -lc_p instead of -lc.  */
+ #undef CC1_SPEC
+ #define CC1_SPEC "%{profile:-p} %{G*}"
+--- gcc/config/ia64/lib1funcs.asm.orig	2006-01-18 22:46:41.000000000 +0100
++++ gcc/config/ia64/lib1funcs.asm	2006-12-11 10:33:13.000000000 +0100
+@@ -792,3 +792,7 @@
+ 	}
+ 	.endp __floattitf
+ #endif
++
++#ifdef __linux__
++.section .note.GNU-stack; .previous
++#endif
+--- gcc/config/ia64/crti.asm.orig	2006-01-18 22:46:41.000000000 +0100
++++ gcc/config/ia64/crti.asm	2006-12-11 10:33:13.000000000 +0100
+@@ -64,3 +64,7 @@
+ 	.body
+ 
+ # end of crti.asm
++
++#ifdef __linux__
++.section .note.GNU-stack; .previous
++#endif
+--- gcc/config/ia64/crtn.asm.orig	2006-01-18 22:46:41.000000000 +0100
++++ gcc/config/ia64/crtn.asm	2006-12-11 10:33:13.000000000 +0100
+@@ -54,3 +54,7 @@
+ 	br.ret.sptk.many b0
+ 
+ # end of crtn.asm
++
++#ifdef __linux__
++.section .note.GNU-stack; .previous
++#endif
+--- gcc/config/ia64/crtend.asm.orig	2006-01-18 22:46:41.000000000 +0100
++++ gcc/config/ia64/crtend.asm	2006-12-11 10:33:13.000000000 +0100
+@@ -122,3 +122,7 @@
+ 
+ 	br.ret.sptk.many rp
+ 	.endp __do_global_ctors_aux
++
++#ifdef __linux__
++.section .note.GNU-stack; .previous
++#endif
+--- gcc/config/ia64/crtbegin.asm.orig	2006-01-18 22:46:41.000000000 +0100
++++ gcc/config/ia64/crtbegin.asm	2006-12-11 10:33:13.000000000 +0100
+@@ -255,3 +255,7 @@
+ .weak __cxa_finalize
+ #endif
+ .weak _Jv_RegisterClasses
++
++#ifdef __linux__
++.section .note.GNU-stack; .previous
++#endif
+--- gcc/config/rs6000/ppc-asm.h.orig	2006-01-18 22:46:46.000000000 +0100
++++ gcc/config/rs6000/ppc-asm.h	2006-12-11 10:33:14.000000000 +0100
+@@ -158,7 +158,7 @@
+ 	.size FUNC_NAME(name),GLUE(.L,name)-FUNC_NAME(name)
+ #endif
+ 
+-#if defined __linux__ && !defined __powerpc64__
++#if defined __linux__
+ 	.section .note.GNU-stack
+ 	.previous
+ #endif
+--- libffi/src/powerpc/ppc_closure.S.orig	2006-03-25 09:16:06.000000000 +0100
++++ libffi/src/powerpc/ppc_closure.S	2006-12-11 10:33:14.000000000 +0100
+@@ -281,3 +281,7 @@
+ .LEFDE1:
+ 
+ #endif
++
++#if defined __ELF__ && defined __linux__
++	.section	.note.GNU-stack,"",@progbits
++#endif
+--- libffi/src/powerpc/sysv.S.orig	2006-03-25 09:16:06.000000000 +0100
++++ libffi/src/powerpc/sysv.S	2006-12-11 10:33:14.000000000 +0100
+@@ -217,3 +217,7 @@
+       .align 2
+ .LEFDE1:
+ #endif
++
++#if defined __ELF__ && defined __linux__
++	.section	.note.GNU-stack,"",@progbits
++#endif
+--- libffi/src/powerpc/linux64_closure.S.orig	2006-01-18 22:49:27.000000000 +0100
++++ libffi/src/powerpc/linux64_closure.S	2006-12-11 10:33:14.000000000 +0100
+@@ -204,3 +204,7 @@
+ 	.align 3
+ .LEFDE1:
+ #endif
++
++#if defined __ELF__ && defined __linux__
++	.section	.note.GNU-stack,"",@progbits
++#endif
+--- libffi/src/powerpc/linux64.S.orig	2006-03-25 09:16:06.000000000 +0100
++++ libffi/src/powerpc/linux64.S	2006-12-11 10:33:14.000000000 +0100
+@@ -175,3 +175,7 @@
+ 	.align 3
+ .LEFDE1:
+ #endif
++
++#if defined __ELF__ && defined __linux__
++	.section	.note.GNU-stack,"",@progbits
++#endif
+--- libffi/src/arm/sysv.S.orig	2006-10-12 02:00:57.000000000 +0200
++++ libffi/src/arm/sysv.S	2006-12-11 10:33:14.000000000 +0100
+@@ -255,3 +255,6 @@
+ .ffi_closure_SYSV_end:
+         .size    CNAME(ffi_closure_SYSV),.ffi_closure_SYSV_end-CNAME(ffi_closure_SYSV)
+ 
++#if defined __ELF__ && defined __linux__
++	.section	.note.GNU-stack,"",%progbits
++#endif
+--- libffi/src/m68k/sysv.S.orig	2006-01-18 22:49:27.000000000 +0100
++++ libffi/src/m68k/sysv.S	2006-12-11 10:33:14.000000000 +0100
+@@ -207,3 +207,7 @@
+ 	rts
+ 	CFI_ENDPROC()
+ 	.size	ffi_closure_struct_SYSV,.-ffi_closure_struct_SYSV
++
++#if defined __ELF__ && defined __linux__
++	.section	.note.GNU-stack,"",@progbits
++#endif
+--- libffi/src/alpha/osf.S.orig	2006-01-18 22:49:27.000000000 +0100
++++ libffi/src/alpha/osf.S	2006-12-11 10:33:14.000000000 +0100
+@@ -356,4 +356,8 @@
+ 	.byte	16		# uleb128 offset 16*-8
+ 	.align 3
+ $LEFDE3:
++
++#ifdef __linux__
++	.section	.note.GNU-stack,"",@progbits
++#endif
+ #endif
+--- libffi/src/x86/sysv.S.orig	2006-01-18 22:49:28.000000000 +0100
++++ libffi/src/x86/sysv.S	2006-12-11 10:33:14.000000000 +0100
+@@ -376,3 +376,7 @@
+ #endif
+ 
+ #endif /* ifndef __x86_64__ */
++
++#if defined __ELF__ && defined __linux__
++	.section	.note.GNU-stack,"",@progbits
++#endif
+--- libffi/src/x86/unix64.S.orig	2006-01-18 22:49:28.000000000 +0100
++++ libffi/src/x86/unix64.S	2006-12-11 10:33:14.000000000 +0100
+@@ -410,3 +410,7 @@
+ .LEFDE3:
+ 
+ #endif /* __x86_64__ */
++
++#if defined __ELF__ && defined __linux__
++	.section	.note.GNU-stack,"",@progbits
++#endif
+--- libffi/src/s390/sysv.S.orig	2006-01-18 22:49:28.000000000 +0100
++++ libffi/src/s390/sysv.S	2006-12-11 10:33:14.000000000 +0100
+@@ -427,3 +427,6 @@
+ 
+ #endif
+ 
++#if defined __ELF__ && defined __linux__
++	.section	.note.GNU-stack,"",@progbits
++#endif
+--- libffi/src/ia64/unix.S.orig	2006-01-18 22:49:29.000000000 +0100
++++ libffi/src/ia64/unix.S	2006-12-11 10:33:14.000000000 +0100
+@@ -553,3 +553,7 @@
+ 	data8	@pcrel(.Lld_hfa_float)		// FFI_IA64_TYPE_HFA_FLOAT
+ 	data8	@pcrel(.Lld_hfa_double)		// FFI_IA64_TYPE_HFA_DOUBLE
+ 	data8	@pcrel(.Lld_hfa_ldouble)	// FFI_IA64_TYPE_HFA_LDOUBLE
++
++#if defined __ELF__ && defined __linux__
++	.section	.note.GNU-stack,"",@progbits
++#endif
+--- libffi/src/sparc/v9.S.orig	2006-01-18 22:49:29.000000000 +0100
++++ libffi/src/sparc/v9.S	2006-12-11 10:33:14.000000000 +0100
+@@ -300,3 +300,7 @@
+ 	.align 8
+ .LLEFDE2:
+ #endif
++
++#ifdef __linux__
++	.section	.note.GNU-stack,"",@progbits
++#endif
+--- libffi/src/sparc/v8.S.orig	2006-01-18 22:49:29.000000000 +0100
++++ libffi/src/sparc/v8.S	2006-12-11 10:33:14.000000000 +0100
+@@ -265,3 +265,7 @@
+ 	.byte	0x1f	! uleb128 0x1f
+ 	.align	WS
+ .LLEFDE2:
++
++#if defined __ELF__ && defined __linux__
++	.section	.note.GNU-stack,"",@progbits
++#endif
--- gcj-4.2-4.2-20070707.orig/debian/patches/alpha-ieee.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/alpha-ieee.dpatch
@@ -0,0 +1,57 @@
+#! /bin/sh -e
+
+# DP: #212912
+# DP: on alpha-linux, make -mieee default and add -mieee-disable switch
+# DP: to turn default off
+
+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 -p1 < $0
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p1 < $0
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+
+--- src/gcc/config/alpha/alpha.c~	2005-06-04 21:25:45.000000000 +0200
++++ src/gcc/config/alpha/alpha.c	2005-09-30 22:21:33.251175568 +0200
+@@ -248,6 +248,10 @@
+     { 0, 0, 0 }
+   };
+ 
++  /* If not -ffinite-math-only, enable -mieee*/
++  if (!flag_finite_math_only)
++    target_flags |= MASK_IEEE|MASK_IEEE_CONFORMANT;
++
+   /* Unicos/Mk doesn't have shared libraries.  */
+   if (TARGET_ABI_UNICOSMK && flag_pic)
+     {
+#--- src/gcc/doc/invoke.texi~	2005-09-29 20:00:57.638380128 +0200
+#+++ src/gcc/doc/invoke.texi	2005-09-30 22:23:22.922502992 +0200
+#@@ -7670,6 +7670,13 @@
+# values such as not-a-number and plus/minus infinity.  Other Alpha
+# compilers call this option @option{-ieee_with_no_inexact}.
+# 
+#+DEBIAN SPECIFIC: This option is on by default, unless
+#+@option{-ffinite-math-only} (which is part of the @option{-ffast-math}
+#+set) is specified, because the software functions in the GNU libc math
+#+libraries generate denormalized numbers, NaNs, and infs (all of which
+#+will cause a programs to SIGFPE when it attempts to use the results without
+#+@option{-mieee}).
+#+
+# @item -mieee-with-inexact
+# @opindex mieee-with-inexact
+# This is like @option{-mieee} except the generated code also maintains
--- gcj-4.2-4.2-20070707.orig/debian/patches/libstdc++-baseline.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/libstdc++-baseline.dpatch
@@ -0,0 +1,42 @@
+#! /bin/sh -e
+
+# DP: overwrite baseline detection for i386: use the i486 headers
+
+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
+
+--- libstdc++-v3/configure.target~	2003-06-19 19:55:35.000000000 +0200
++++ libstdc++-v3/configure.target	2003-06-20 09:15:08.000000000 +0200
+@@ -91,6 +91,14 @@
+     ;;
+ esac
+ 
++# Debian adjustments
++echo "LIBSTDCXX TARGET CPU: $target_cpu"
++case "${target_cpu}" in
++  i386)
++    # we use the i486 ABI ...
++    try_cpu=i486
++    ;;
++esac
+ 
+ # Now look for the file(s) usually tied to a CPU model, and make
+ # default choices for those if they haven't been explicitly set
--- gcj-4.2-4.2-20070707.orig/debian/patches/libstdc++-doxygen.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/libstdc++-doxygen.dpatch
@@ -0,0 +1,36 @@
+#! /bin/sh -e
+
+# DP: libstdc++ doxygen docs: Set SHORT_NAMES to YES
+
+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
+
+--- libstdc++-v3/docs/doxygen/user.cfg.in~	2005-03-04 19:44:51.000000000 +0100
++++ libstdc++-v3/docs/doxygen/user.cfg.in	2005-04-09 01:00:44.753742400 +0200
+@@ -133,7 +133,7 @@
+ # (but less readable) file names. This can be useful is your file systems 
+ # doesn't support long names like on DOS, Mac, or CD-ROM.
+ 
+-SHORT_NAMES            = NO
++SHORT_NAMES            = YES
+ 
+ # If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
+ # will interpret the first line (until the first dot) of a JavaDoc-style 
--- gcj-4.2-4.2-20070707.orig/debian/patches/gcc-hash-style-gnu.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/gcc-hash-style-gnu.dpatch
@@ -0,0 +1,163 @@
+#! /bin/sh -e
+
+# DP: Link using --hash-style=gnu (alpha, amd64, ia64, i386, powerpc, ppc64, s390, sparc)
+
+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
+
+2006-07-11  Jakub Jelinek  <jakub@redhat.com>
+
+	* config/i386/linux.h (LINK_SPEC): Add --hash-style=gnu.
+	* config/i386/linux64.h (LINK_SPEC): Likewise.
+	* config/rs6000/sysv4.h (LINK_OS_LINUX_SPEC): Likewise.
+	* config/rs6000/linux64.h (LINK_OS_LINUX_SPEC32,
+	LINK_OS_LINUX_SPEC64): Likewise.
+	* config/s390/linux.h (LINK_SPEC): Likewise.
+	* config/ia64/linux.h (LINK_SPEC): Likewise.
+	* config/sparc/linux.h (LINK_SPEC): Likewise.
+	* config/sparc/linux64.h (LINK_SPEC, LINK_ARCH32_SPEC,
+	LINK_ARCH64_SPEC): Likewise.
+	* config/alpha/linux-elf.h (LINK_SPEC): Likewise.
+
+--- gcc/config/alpha/linux-elf.h.orig	2006-12-11 13:02:43.396229000 +0100
++++ gcc/config/alpha/linux-elf.h	2006-12-11 13:03:10.336229000 +0100
+@@ -40,7 +40,7 @@
+ 
+ #define ELF_DYNAMIC_LINKER	LINUX_DYNAMIC_LINKER
+ 
+-#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax}		\
++#define LINK_SPEC "-m elf64alpha --hash-style=gnu %{G*} %{relax:-relax}	\
+   %{O*:-O3} %{!O*:-O1}						\
+   %{shared:-shared}						\
+   %{!shared:							\
+--- gcc/config/s390/linux.h.orig	2006-12-11 13:02:43.396229000 +0100
++++ gcc/config/s390/linux.h	2006-12-11 13:03:10.336229000 +0100
+@@ -78,7 +78,7 @@
+ 
+ #undef  LINK_SPEC
+ #define LINK_SPEC \
+-  "%{m31:-m elf_s390}%{m64:-m elf64_s390} \
++  "%{m31:-m elf_s390}%{m64:-m elf64_s390} --hash-style=gnu \
+    %{shared:-shared} \
+    %{!shared: \
+       %{static:-static} \
+--- gcc/config/sparc/linux.h.orig	2006-12-11 13:02:43.396229000 +0100
++++ gcc/config/sparc/linux.h	2006-12-11 13:03:10.336229000 +0100
+@@ -133,7 +133,7 @@
+ 
+ 
+ #undef  LINK_SPEC
+-#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
++#define LINK_SPEC "-m elf32_sparc --hash-style=gnu -Y P,/usr/lib %{shared:-shared} \
+   %{!mno-relax:%{!r:-relax}} \
+   %{!shared: \
+     %{!ibcs: \
+--- gcc/config/sparc/linux64.h.orig	2006-12-11 13:02:43.396229000 +0100
++++ gcc/config/sparc/linux64.h	2006-12-11 13:03:10.336229000 +0100
+@@ -167,7 +167,7 @@
+   { "link_arch_default", LINK_ARCH_DEFAULT_SPEC },	  \
+   { "link_arch",	 LINK_ARCH_SPEC },
+ 
+-#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
++#define LINK_ARCH32_SPEC "-m elf32_sparc --hash-style=gnu -Y P,/usr/lib %{shared:-shared} \
+   %{!shared: \
+     %{!ibcs: \
+       %{!static: \
+@@ -176,7 +176,7 @@
+         %{static:-static}}} \
+ "
+ 
+-#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,/usr/lib64 %{shared:-shared} \
++#define LINK_ARCH64_SPEC "-m elf64_sparc --hash-style=gnu -Y P,/usr/lib64 %{shared:-shared} \
+   %{!shared: \
+     %{!ibcs: \
+       %{!static: \
+@@ -257,7 +257,7 @@
+ #else /* !SPARC_BI_ARCH */
+ 
+ #undef LINK_SPEC
+-#define LINK_SPEC "-m elf64_sparc -Y P,/usr/lib64 %{shared:-shared} \
++#define LINK_SPEC "-m elf64_sparc --hash-style=gnu -Y P,/usr/lib64 %{shared:-shared} \
+   %{!shared: \
+     %{!ibcs: \
+       %{!static: \
+--- gcc/config/i386/linux.h.orig	2006-12-11 13:02:43.396229000 +0100
++++ gcc/config/i386/linux.h	2006-12-11 13:03:10.336229000 +0100
+@@ -109,7 +109,7 @@
+   { "dynamic_linker", LINUX_DYNAMIC_LINKER }
+ 
+ #undef	LINK_SPEC
+-#define LINK_SPEC "-m %(link_emulation) %{shared:-shared} \
++#define LINK_SPEC "-m %(link_emulation) --hash-style=gnu %{shared:-shared} \
+   %{!shared: \
+     %{!ibcs: \
+       %{!static: \
+--- gcc/config/i386/linux64.h.orig	2006-12-11 13:02:43.396229000 +0100
++++ gcc/config/i386/linux64.h	2006-12-11 13:03:51.046229000 +0100
+@@ -53,7 +53,7 @@
+ #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
+ 
+ #undef	LINK_SPEC
+-#define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \
++#define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} --hash-style=gnu \
+   %{shared:-shared} \
+   %{!shared: \
+     %{!static: \
+--- gcc/config/ia64/linux.h.orig	2006-12-11 13:02:43.406229000 +0100
++++ gcc/config/ia64/linux.h	2006-12-11 13:03:10.346229000 +0100
+@@ -40,7 +40,7 @@
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
+ 
+ #undef LINK_SPEC
+-#define LINK_SPEC "\
++#define LINK_SPEC "--hash-style=gnu \
+   %{shared:-shared} \
+   %{!shared: \
+     %{!static: \
+--- gcc/config/rs6000/sysv4.h.orig	2006-12-11 13:02:43.406229000 +0100
++++ gcc/config/rs6000/sysv4.h	2006-12-11 13:03:10.346229000 +0100
+@@ -908,7 +908,7 @@
+ #define LINUX_DYNAMIC_LINKER \
+   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
+ 
+-#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
++#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --hash-style=gnu %{!shared: %{!static: \
+   %{rdynamic:-export-dynamic} \
+   %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER "}}}"
+ 
+--- gcc/config/rs6000/linux64.h.orig	2006-12-11 13:02:43.406229000 +0100
++++ gcc/config/rs6000/linux64.h	2006-12-11 13:03:10.346229000 +0100
+@@ -351,11 +351,11 @@
+   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64)
+ 
+ 
+-#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \
++#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux --hash-style=gnu %{!shared: %{!static: \
+   %{rdynamic:-export-dynamic} \
+   %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER32 "}}}"
+ 
+-#define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \
++#define LINK_OS_LINUX_SPEC64 "-m elf64ppc --hash-style=gnu %{!shared: %{!static: \
+   %{rdynamic:-export-dynamic} \
+   %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER64 "}}}"
+ 
--- gcj-4.2-4.2-20070707.orig/debian/patches/ada-link-lib.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/ada-link-lib.dpatch
@@ -0,0 +1,2479 @@
+#! /bin/sh -e
+
+# DP: - Install the shared Ada libraries as '.so.1', not '.so' to conform
+# DP:   to the Debian policy.
+# DP: - Don't include a runtime link path (-rpath), when linking binaries.
+# DP: - Build the shared libraries on hppa-linux.
+# DP: - Instead of building libada as a target library only, build it as
+# DP:   both a host and, if different, target library.
+# DP: - Build the GNAT tools in their top-level directory; do not use
+# DP:   recursive makefiles.
+# DP: - Link the GNAT tools dynamically.
+# DP: - Fix a bug in src/gnattools/configure.ac whereby a nonexistent version
+# DP:   of indepsw's body was selected.  Regenerate configure. (PR ada/27300)
+
+# This patch seems large, but the hunks in Makefile.in are actually
+# generated from Makefile.def using autogen.
+
+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} && autoconf2.13
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
+	rm -f ${dir}configure
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+--- configure.in~	2007-01-01 09:51:04.000000000 +0100
++++ configure.in	2007-06-15 12:04:39.996241825 +0200
+@@ -123,7 +123,7 @@
+ 
+ # these libraries are used by various programs built for the host environment
+ #
+-host_libs="intl mmalloc libiberty opcodes bfd readline tcl tk itcl libgui zlib libcpp libdecnumber"
++host_libs="intl mmalloc libiberty opcodes bfd readline tcl tk itcl libgui zlib libcpp libdecnumber libada"
+ 
+ # these tools are built for the host environment
+ # Note, the powerpc-eabi build depends on sim occurring before gdb in order to
+@@ -230,7 +230,7 @@
+ 
+ # Similarly, some are only suitable for cross toolchains.
+ # Remove these if host=target.
+-cross_only="target-libgloss target-newlib target-opcodes"
++cross_only="target-libgloss target-newlib target-opcodes target-libada"
+ 
+ case $is_cross_compiler in
+   no) skipdirs="${skipdirs} ${cross_only}" ;;
+--- gcc/ada/config-lang.in~	2006-01-18 22:44:53.000000000 +0100
++++ gcc/ada/config-lang.in	2007-06-15 12:04:40.000242020 +0200
+@@ -39,7 +39,7 @@
+ outputs=ada/Makefile
+ 
+ target_libs="target-libada"
+-lang_dirs="gnattools"
++lang_dirs="libada gnattools"
+ 
+ # Ada will not work until the front end starts emitting GIMPLE trees.
+ build_by_default=no
+--- gcc/ada/link.c~	2006-01-18 22:44:59.000000000 +0100
++++ gcc/ada/link.c	2007-06-15 12:04:40.564269545 +0200
+@@ -155,8 +155,8 @@
+ 
+ #elif defined (__FreeBSD__)
+ char *__gnat_object_file_option = "";
+-char *__gnat_run_path_option = "-Wl,-rpath,";
+-char __gnat_shared_libgnat_default = STATIC;
++char *__gnat_run_path_option = "";
++char __gnat_shared_libgnat_default = SHARED;
+ int __gnat_link_max = 8192;
+ unsigned char __gnat_objlist_file_supported = 1;
+ unsigned char __gnat_using_gnu_linker = 1;
+@@ -164,8 +164,8 @@
+ 
+ #elif defined (linux)
+ const char *__gnat_object_file_option = "";
+-const char *__gnat_run_path_option = "-Wl,-rpath,";
+-char __gnat_shared_libgnat_default = STATIC;
++const char *__gnat_run_path_option = "";
++char __gnat_shared_libgnat_default = SHARED;
+ int __gnat_link_max = 8192;
+ unsigned char __gnat_objlist_file_supported = 1;
+ unsigned char __gnat_using_gnu_linker = 1;
+--- gcc/ada/Makefile.in~	2007-06-12 01:12:08.000000000 +0200
++++ gcc/ada/Makefile.in	2007-06-15 12:04:40.644273449 +0200
+@@ -116,7 +116,7 @@
+ TEXI2DVI = texi2dvi
+ TEXI2PDF = texi2pdf
+ GNATBIND = $(STAGE_PREFIX)gnatbind
+-GNATBIND_FLAGS = -static -x
++GNATBIND_FLAGS = -shared -x
+ ADA_CFLAGS =
+ ADAFLAGS = -W -Wall -gnatpg -gnata
+ SOME_ADAFLAGS =-gnata
+@@ -248,7 +248,6 @@
+ LIBDEPS = $(LIBINTL_DEP) $(LIBIBERTY)
+ # Default is no TGT_LIB; one might be passed down or something
+ TGT_LIB =
+-TOOLS_LIBS = $(EXTRA_GNATTOOLS_OBJS) targext.o link.o $(LIBGNAT) ../../../libiberty/libiberty.a $(SYSLIBS) $(TGT_LIB)
+ 
+ # Specify the directories to be searched for header files.
+ # Both . and srcdir are used, in that order,
+@@ -294,31 +293,6 @@
+ # defined in this file into the environment.
+ .NOEXPORT:
+ 
+-# Lists of files for various purposes.
+-
+-GNATLINK_OBJS = gnatlink.o \
+- a-except.o ali.o alloc.o butil.o casing.o csets.o debug.o fmap.o fname.o \
+- gnatvsn.o hostparm.o indepsw.o interfac.o i-c.o i-cstrin.o namet.o opt.o \
+- osint.o output.o rident.o s-exctab.o s-secsta.o s-stalib.o s-stoele.o \
+- sdefault.o snames.o stylesw.o switch.o system.o table.o targparm.o tree_io.o \
+- types.o validsw.o widechar.o
+-
+-GNATMAKE_OBJS = a-except.o ali.o ali-util.o s-casuti.o \
+- alloc.o atree.o binderr.o butil.o casing.o csets.o debug.o elists.o einfo.o\
+- erroutc.o errutil.o err_vars.o fmap.o fname.o fname-uf.o fname-sf.o \
+- gnatmake.o gnatvsn.o hostparm.o interfac.o i-c.o i-cstrin.o krunch.o lib.o \
+- make.o makeusg.o makeutl.o mlib.o mlib-fil.o mlib-prj.o mlib-tgt.o mlib-utl.o \
+- namet.o nlists.o opt.o osint.o osint-m.o output.o \
+- prj.o prj-attr.o prj-attr-pm.o prj-com.o prj-dect.o prj-env.o prj-err.o prj-ext.o prj-nmsc.o \
+- prj-pars.o prj-part.o prj-proc.o prj-strt.o prj-tree.o prj-util.o \
+- rident.o s-exctab.o s-secsta.o s-stalib.o s-stoele.o \
+- scans.o scng.o sdefault.o sfn_scan.o s-purexc.o s-htable.o \
+- sinfo.o sinput.o sinput-c.o sinput-p.o \
+- snames.o stand.o stringt.o styleg.o stylesw.o system.o validsw.o switch.o switch-m.o \
+- table.o targparm.o tempdir.o tree_io.o types.o \
+- uintp.o  uname.o urealp.o usage.o widechar.o \
+- $(EXTRA_GNATMAKE_OBJS)
+-
+ # Convert the target variable into a space separated list of architecture,
+ # manufacturer, and operating system and assign each of those to its own
+ # variable.
+@@ -411,8 +385,6 @@
+   g-socthi.adb<g-socthi-vxworks.adb \
+   system.ads<system-vxworks-m68k.ads
+ 
+-  TOOLS_TARGET_PAIRS=mlib-tgt.adb<mlib-tgt-vxworks.adb
+-
+   EXTRA_GNATRTL_NONTASKING_OBJS=i-vxwork.o i-vxwoio.o
+   EXTRA_GNATRTL_TASKING_OBJS=s-vxwork.o
+ 
+@@ -446,8 +418,6 @@
+   g-socthi.ads<g-socthi-vxworks.ads \
+   g-socthi.adb<g-socthi-vxworks.adb
+ 
+-  TOOLS_TARGET_PAIRS=mlib-tgt.adb<mlib-tgt-vxworks.adb
+-
+   ifeq ($(strip $(filter-out yes,$(TRACE))),)
+     LIBGNAT_TARGET_PAIRS += \
+     s-traces.adb<s-traces-default.adb \
+@@ -503,8 +473,6 @@
+   g-socthi.adb<g-socthi-vxworks.adb \
+   system.ads<system-vxworks-ppc-vthread.ads
+ 
+-  TOOLS_TARGET_PAIRS=mlib-tgt.adb<mlib-tgt-vxworks.adb
+-
+   EXTRA_GNATRTL_NONTASKING_OBJS=i-vxwork.o i-vxwoio.o s-vxwexc.o
+   EXTRA_GNATRTL_TASKING_OBJS=s-vxwork.o
+ 
+@@ -548,8 +516,6 @@
+   g-socthi.adb<g-socthi-vxworks.adb \
+   system.ads<system-vxworks-sparcv9.ads   \
+ 
+-  TOOLS_TARGET_PAIRS=mlib-tgt.adb<mlib-tgt-vxworks.adb
+-
+   EXTRA_GNATRTL_NONTASKING_OBJS=i-vxwork.o i-vxwoio.o
+   EXTRA_GNATRTL_TASKING_OBJS=s-vxwork.o
+ endif
+@@ -576,8 +542,6 @@
+   g-socthi.ads<g-socthi-vxworks.ads \
+   g-socthi.adb<g-socthi-vxworks.adb
+ 
+-  TOOLS_TARGET_PAIRS=mlib-tgt.adb<mlib-tgt-vxworks.adb
+-
+   ifeq ($(strip $(filter-out yes,$(TRACE))),)
+     LIBGNAT_TARGET_PAIRS += \
+     s-traces.adb<s-traces-default.adb \
+@@ -629,8 +593,6 @@
+   g-socthi.adb<g-socthi-vxworks.adb \
+   system.ads<system-vxworks-arm.ads
+ 
+-  TOOLS_TARGET_PAIRS=mlib-tgt.adb<mlib-tgt-vxworks.adb
+-
+   EXTRA_GNATRTL_NONTASKING_OBJS=i-vxwork.o i-vxwoio.o
+   EXTRA_GNATRTL_TASKING_OBJS=s-vxwork.o
+ endif
+@@ -658,8 +620,6 @@
+   g-socthi.adb<g-socthi-vxworks.adb \
+   system.ads<system-vxworks-mips.ads
+ 
+-  TOOLS_TARGET_PAIRS=mlib-tgt.adb<mlib-tgt-vxworks.adb
+-
+   EXTRA_GNATRTL_NONTASKING_OBJS=i-vxwork.o i-vxwoio.o
+   EXTRA_GNATRTL_TASKING_OBJS=s-vxwork.o
+ endif
+@@ -703,8 +663,6 @@
+     LIBGNAT_TARGET_PAIRS = $(LIBGNAT_TARGET_PAIRS_64)
+   endif
+   
+-  TOOLS_TARGET_PAIRS=mlib-tgt.adb<mlib-tgt-solaris.adb
+-
+   EH_MECHANISM=-gcc
+   THREADSLIB = -lposix4 -lthread
+   MISCLIB = -lposix4 -lnsl -lsocket
+@@ -756,8 +714,6 @@
+   g-soliop.ads<g-soliop-solaris.ads \
+   system.ads<system-solaris-x86.ads
+ 
+-  TOOLS_TARGET_PAIRS=mlib-tgt.adb<mlib-tgt-solaris.adb
+-
+   THREADSLIB = -lposix4 -lthread
+   MISCLIB = -lposix4 -lnsl -lsocket
+   SO_OPTS = -Wl,-h,
+@@ -783,10 +739,6 @@
+   s-tpopsp.adb<s-tpopsp-posix-foreign.adb \
+   system.ads<system-linux-x86.ads
+ 
+-  TOOLS_TARGET_PAIRS =  \
+-    mlib-tgt.adb<mlib-tgt-linux.adb \
+-    indepsw.adb<indepsw-gnu.adb
+-
+   EH_MECHANISM=-gcc
+   THREADSLIB = -lpthread
+   GNATLIB_SHARED = gnatlib-shared-dual
+@@ -811,10 +763,6 @@
+   s-tpopsp.adb<s-tpopsp-posix-foreign.adb \
+   system.ads<system-freebsd-x86.ads
+ 
+-  TOOLS_TARGET_PAIRS =  \
+-    mlib-tgt.adb<mlib-tgt-linux.adb \
+-    indepsw.adb<indepsw-gnu.adb
+-
+   SYMLIB = -laddr2line -lbfd -liberty $(LIBINTL)
+   THREADSLIB = -lpthread
+   GNATLIB_SHARED = gnatlib-shared-dual
+@@ -839,8 +787,6 @@
+   s-tpopsp.adb<s-tpopsp-posix.adb \
+   system.ads<system-freebsd-x86.ads
+ 
+-  TOOLS_TARGET_PAIRS = \
+-  mlib-tgt.adb<mlib-tgt-linux.adb
+   GNATLIB_SHARED = gnatlib-shared-dual
+ 
+   THREADSLIB= -lc_r
+@@ -876,9 +822,6 @@
+     system.ads<system-linux-s390.ads
+   endif
+ 
+-  TOOLS_TARGET_PAIRS =  \
+-    mlib-tgt.adb<mlib-tgt-linux.adb
+-
+   EH_MECHANISM=-gcc
+   THREADSLIB = -lpthread
+   GNATLIB_SHARED = gnatlib-shared-dual
+@@ -919,13 +862,17 @@
+   endif
+ 
+   EH_MECHANISM=-gcc
+-  TOOLS_TARGET_PAIRS = mlib-tgt.adb<mlib-tgt-irix.adb
+   TGT_LIB = -lexc
+   MISCLIB = -lexc
+   PREFIX_OBJS = $(PREFIX_REAL_OBJS)
+   LIBRARY_VERSION := $(LIB_VERSION)
+ endif
+ 
++ifeq ($(strip $(filter-out hppa% unknown linux gnu,$(targ))),)
++  GNATLIB_SHARED = gnatlib-shared-dual
++  LIBRARY_VERSION := $(LIB_VERSION)
++endif
++
+ ifeq ($(strip $(filter-out hppa% hp hpux10%,$(targ))),)
+   LIBGNAT_TARGET_PAIRS = \
+   a-excpol.adb<a-excpol-abort.adb \
+@@ -963,7 +910,6 @@
+   g-soccon.ads<g-soccon-hpux.ads \
+   system.ads<system-hpux.ads
+ 
+-  TOOLS_TARGET_PAIRS = mlib-tgt.adb<mlib-tgt-hpux.adb
+   EH_MECHANISM=-gcc
+   TGT_LIB = /usr/lib/libcl.a
+   THREADSLIB = -lpthread
+@@ -992,18 +938,10 @@
+   THREADSLIB = -lpthreads
+   PREFIX_OBJS=$(PREFIX_REAL_OBJS)
+ 
+-  TOOLS_TARGET_PAIRS = \
+-  mlib-tgt.adb<mlib-tgt-aix.adb \
+-  indepsw.adb<indepsw-aix.adb
+-
+   GMEM_LIB = gmemlib
+ endif
+ 
+ ifeq ($(strip $(filter-out lynxos,$(osys))),)
+-  TOOLS_TARGET_PAIRS = \
+-  mlib-tgt.adb<mlib-tgt-lynxos.adb \
+-  indepsw.adb<indepsw-gnu.adb
+-
+   ifeq ($(strip $(filter-out %86 lynxos,$(arch) $(osys))),)
+     LIBGNAT_TARGET_PAIRS = \
+     a-numaux.adb<a-numaux-x86.adb \
+@@ -1069,8 +1007,6 @@
+   g-soccon.ads<g-soccon-tru64.ads \
+   system.ads<system-tru64.ads
+ 
+-  TOOLS_TARGET_PAIRS=mlib-tgt.adb<mlib-tgt-tru64.adb
+-
+   EH_MECHANISM=-gcc
+   GMEM_LIB=gmemlib
+   THREADSLIB = -lpthread -lmach -lexc -lrt
+@@ -1163,19 +1099,6 @@
+   $(LIBGNAT_TARGET_PAIRS_AUX1) \
+   $(LIBGNAT_TARGET_PAIRS_AUX2)
+ 
+-ifeq ($(strip $(filter-out ia64 hp vms% openvms%,$(targ))),)
+-  TOOLS_TARGET_PAIRS= \
+-  mlib-tgt.adb<mlib-tgt-vms-ia64.adb \
+-  symbols.adb<symbols-vms.adb \
+-  symbols-processing.adb<symbols-processing-vms-ia64.adb
+-else
+-  TOOLS_TARGET_PAIRS= \
+-  mlib-tgt.adb<mlib-tgt-vms-alpha.adb \
+-  symbols.adb<symbols-vms.adb \
+-  symbols-processing.adb<symbols-processing-vms-alpha.adb
+-endif
+-
+-
+   GMEM_LIB = gmemlib
+   EH_MECHANISM=-gcc
+   GNATLIB_SHARED=gnatlib-shared-vms
+@@ -1191,7 +1114,6 @@
+      ../../gnat.hlp
+   # This command transforms (YYYYMMDD) into YY,MMDD
+   GSMATCH_VERSION := $(shell grep "^ *Gnat_Static_Version_String" $(fsrcpfx)gnatvsn.ads | sed -e 's/.*(\(.*\)).*/\1/' -e 's/\(..\)\(..\)\(....\)/\2,\3/')
+-  TOOLS_LIBS_LO := --for-linker=sys\\$$\$$library:trace.exe
+   LIBRARY_VERSION := $(subst .,_,$(LIB_VERSION))
+ endif
+ 
+@@ -1218,10 +1140,6 @@
+   g-soliop.ads<g-soliop-mingw.ads \
+   system.ads<system-mingw.ads
+ 
+-  TOOLS_TARGET_PAIRS= \
+-  mlib-tgt.adb<mlib-tgt-mingw.adb \
+-  indepsw.adb<indepsw-mingw.adb
+-
+   MISCLIB = -lwsock32
+   GMEM_LIB = gmemlib
+   PREFIX_OBJS = $(PREFIX_REAL_OBJS)
+@@ -1249,10 +1167,6 @@
+   s-tpopsp.adb<s-tpopsp-posix-foreign.adb \
+   system.ads<system-linux-ppc.ads
+ 
+-  TOOLS_TARGET_PAIRS =  \
+-    mlib-tgt.adb<mlib-tgt-linux.adb \
+-    indepsw.adb<indepsw-gnu.adb
+-
+   EH_MECHANISM=-gcc
+   THREADSLIB = -lpthread
+   GNATLIB_SHARED = gnatlib-shared-dual
+@@ -1274,10 +1188,6 @@
+   s-tpopsp.adb<s-tpopsp-posix-foreign.adb \
+   system.ads<system-linux-sparc.ads
+ 
+-  TOOLS_TARGET_PAIRS =  \
+-    mlib-tgt.adb<mlib-tgt-linux.adb \
+-    indepsw.adb<indepsw-gnu.adb
+-
+   EH_MECHANISM=-gcc
+   THREADSLIB = -lpthread
+   GNATLIB_SHARED = gnatlib-shared-dual
+@@ -1299,10 +1209,6 @@
+   s-tpopsp.adb<s-tpopsp-posix-foreign.adb \
+   system.ads<system-linux-hppa.ads
+ 
+-  TOOLS_TARGET_PAIRS =  \
+-    mlib-tgt.adb<mlib-tgt-linux.adb \
+-    indepsw.adb<indepsw-gnu.adb
+-
+   EH_MECHANISM=-gcc
+   THREADSLIB = -lpthread
+   GNATLIB_SHARED = gnatlib-shared-dual
+@@ -1326,10 +1232,6 @@
+   s-taspri.ads<s-taspri-posix.ads \
+   system.ads<system-linux-ia64.ads
+ 
+-  TOOLS_TARGET_PAIRS =  \
+-    mlib-tgt.adb<mlib-tgt-linux.adb \
+-    indepsw.adb<indepsw-gnu.adb
+-
+   EH_MECHANISM=-gcc
+   MISCLIB=
+   THREADSLIB=-lpthread
+@@ -1352,10 +1254,6 @@
+   s-taspri.ads<s-taspri-posix.ads \
+   system.ads<system-linux-alpha.ads
+ 
+-  TOOLS_TARGET_PAIRS =  \
+-    mlib-tgt.adb<mlib-tgt-linux.adb \
+-    indepsw.adb<indepsw-gnu.adb
+-
+   EH_MECHANISM=-gcc
+   MISCLIB=
+   THREADSLIB=-lpthread
+@@ -1380,10 +1278,6 @@
+   s-taspri.ads<s-taspri-posix.ads \
+   system.ads<system-linux-x86_64.ads
+ 
+-  TOOLS_TARGET_PAIRS =  \
+-    mlib-tgt.adb<mlib-tgt-linux.adb \
+-    indepsw.adb<indepsw-gnu.adb
+-
+   EH_MECHANISM=-gcc
+   THREADSLIB=-lpthread
+   GNATLIB_SHARED=gnatlib-shared-dual
+@@ -1408,9 +1302,6 @@
+   a-numaux.adb<a-numaux-darwin.adb \
+   system.ads<system-darwin-ppc.ads
+ 
+-  TOOLS_TARGET_PAIRS =  \
+-    mlib-tgt.adb<mlib-tgt-darwin.adb
+-
+   EH_MECHANISM=-gcc
+   GNATLIB_SHARED = gnatlib-shared-darwin
+   SO_OPTS = -Wl,-flat_namespace -shared-libgcc
+@@ -1480,128 +1371,6 @@
+  a-[a-o]*.adb a-[p-z]*.adb a-[a-o]*.ads a-[p-z]*.ads g-*.ad? i-*.ad? \
+  s-[a-o]*.adb s-[p-z]*.adb s-[a-o]*.ads s-[p-z]*.ads  
+ 
+-LIBGNAT=../rts/libgnat.a 
+-GCC_LINK=$(CC) -static-libgcc $(ADA_INCLUDES)
+-
+-# when compiling the tools, the runtime has to be first on the path so that
+-# it hides the runtime files lying with the rest of the sources
+-ifeq ($(TOOLSCASE),native)
+-  vpath %.ads ../rts ../
+-  vpath %.adb ../rts ../
+-  vpath %.c   ../rts ../
+-  vpath %.h   ../rts ../
+-endif
+-
+-# in the cross tools case, everything is compiled with the native 
+-# gnatmake/link. Therefore only -I needs to be modified in ADA_INCLUDES
+-ifeq ($(TOOLSCASE),cross)
+-  vpath %.ads ../
+-  vpath %.adb ../
+-  vpath %.c   ../
+-  vpath %.h   ../
+-endif
+-
+-
+-../../gnatchop$(exeext): 
+-	$(GNATMAKE) -c $(ADA_INCLUDES) gnatchop --GCC="$(CC) $(ALL_ADAFLAGS)"
+-	$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatchop 
+-	$(GNATLINK) -v gnatchop -o $@ --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
+-
+-../../gnat$(exeext): 
+-	$(GNATMAKE) -c $(ADA_INCLUDES) gnatcmd --GCC="$(CC) $(ALL_ADAFLAGS)"
+-	$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatcmd 
+-	$(GNATLINK) -v gnatcmd -o $@ --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
+-
+-../../gnatkr$(exeext): 
+-	$(GNATMAKE) -c $(ADA_INCLUDES) gnatkr --GCC="$(CC) $(ALL_ADAFLAGS)"
+-	$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatkr 
+-	$(GNATLINK) -v gnatkr -o $@ --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
+-
+-../../gnatls$(exeext): 
+-	$(GNATMAKE) -c $(ADA_INCLUDES) gnatls --GCC="$(CC) $(ALL_ADAFLAGS)"
+-	$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatls 
+-	$(GNATLINK) -v gnatls -o $@ --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
+-
+-../../gnatname$(exeext): 
+-	$(GNATMAKE) -c $(ADA_INCLUDES) gnatname --GCC="$(CC) $(ALL_ADAFLAGS)"
+-	$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatname 
+-	$(GNATLINK) -v gnatname -o $@ --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
+-
+-../../gprmake$(exeext): 
+-	$(GNATMAKE) -c $(ADA_INCLUDES) gprmake --GCC="$(CC) $(ALL_ADAFLAGS)"
+-	$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gprmake
+-	$(GNATLINK) -v gprmake -o $@ --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
+-
+-../../gnatprep$(exeext): 
+-	$(GNATMAKE) -c $(ADA_INCLUDES) gnatprep --GCC="$(CC) $(ALL_ADAFLAGS)"
+-	$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatprep 
+-	$(GNATLINK) -v gnatprep -o $@ --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
+-
+-../../gnatxref$(exeext): 
+-	$(GNATMAKE) -c $(ADA_INCLUDES) gnatxref --GCC="$(CC) $(ALL_ADAFLAGS)"
+-	$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatxref 
+-	$(GNATLINK) -v gnatxref -o $@ --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
+-
+-../../gnatfind$(exeext): 
+-	$(GNATMAKE) -c $(ADA_INCLUDES) gnatfind --GCC="$(CC) $(ALL_ADAFLAGS)"
+-	$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatfind 
+-	$(GNATLINK) -v gnatfind -o $@ --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
+-
+-../../gnatclean$(exeext): 
+-	$(GNATMAKE) -c $(ADA_INCLUDES) gnatclean --GCC="$(CC) $(ALL_ADAFLAGS)"
+-	$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatclean
+-	$(GNATLINK) -v gnatclean -o $@ --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
+-
+-../../gnatsym$(exeext): 
+-	$(GNATMAKE) -c $(ADA_INCLUDES) gnatsym --GCC="$(CC) $(ALL_ADAFLAGS)"
+-	$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatsym
+-	$(GNATLINK) -v gnatsym -o $@ --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
+-
+-../../gnatdll$(exeext): 
+-	$(GNATMAKE) -c $(ADA_INCLUDES) gnatdll --GCC="$(CC) $(ALL_ADAFLAGS)"
+-	$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) $(GNATBIND_FLAGS) gnatdll
+-	$(GNATLINK) -v gnatdll -o $@ --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
+-
+-../../vxaddr2line$(exeext): targext.o
+-	$(GNATMAKE) -c  $(ADA_INCLUDES) vxaddr2line --GCC="$(CC) $(ALL_ADAFLAGS)"
+-	$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) vxaddr2line 
+-	$(GNATLINK) -v vxaddr2line -o $@ --GCC="$(GCC_LINK)" targext.o $(CLIB)
+-
+-gnatmake-re:  link.o targext.o
+-	$(GNATMAKE) $(ADA_INCLUDES) -u sdefault --GCC="$(CC) $(MOST_ADA_FLAGS)"
+-	$(GNATMAKE) -c $(ADA_INCLUDES) gnatmake --GCC="$(CC) $(ALL_ADAFLAGS)"
+-	$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatmake 
+-	$(GNATLINK) -v gnatmake -o ../../gnatmake$(exeext) \
+-		--GCC="$(GCC_LINK)" $(TOOLS_LIBS)
+-
+-# Note the use of the "mv" command in order to allow gnatlink to be linked with
+-# with the former version of gnatlink itself which cannot override itself.
+-gnatlink-re:  link.o targext.o
+-	$(GNATMAKE) -c $(ADA_INCLUDES) gnatlink --GCC="$(CC) $(ALL_ADAFLAGS)"
+-	$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatlink 
+-	$(GNATLINK) -v gnatlink -o ../../gnatlinknew$(exeext) \
+-		    --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
+-	$(MV)  ../../gnatlinknew$(exeext)  ../../gnatlink$(exeext)
+-  
+-# Needs to be built with CC=gcc
+-# Since the RTL should be built with the latest compiler, remove the
+-#  stamp target in the parent directory whenever gnat1 is rebuilt
+-
+-# Likewise for the tools
+-../../gnatmake$(exeext): $(P) b_gnatm.o link.o targext.o $(GNATMAKE_OBJS)
+-	$(GCC_LINK) $(ALL_CFLAGS) $(LDFLAGS) -o $@ b_gnatm.o $(GNATMAKE_OBJS) \
+-		    $(TOOLS_LIBS)
+-
+-../../gnatlink$(exeext): $(P) b_gnatl.o link.o targext.o $(GNATLINK_OBJS)
+-	$(GCC_LINK) $(ALL_CFLAGS) $(LDFLAGS) -o $@ b_gnatl.o $(GNATLINK_OBJS) \
+-		    $(TOOLS_LIBS)
+-
+-../../gnatbl$(exeext): gnatbl.o
+-	$(GCC_LINK) -o $@ $(ALL_CFLAGS) $(LDFLAGS) gnatbl.o $(TOOLS_LIBS)
+-
+-gnatbl.o: gnatbl.c adaint.h
+-	$(CC) $(ALL_CFLAGS) $(INCLUDES) -c $< $(OUTPUT_OPTION)
+-
+ ../stamp-gnatlib:
+ 	@if [ ! -f stamp-gnatlib ] ; \
+ 	then \
+@@ -1637,12 +1406,10 @@
+ #     permission is required.
+ 	for file in gnat gnarl; do \
+ 	   if [ -f rts/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext) ]; then \
+-	      $(INSTALL) rts/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext) \
++	      $(INSTALL) rts/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext).1 \
+ 			 $(DESTDIR)$(ADA_RTL_OBJ_DIR); \
+-	   fi; \
+-	   if [ -f rts/lib$${file}$(soext) ]; then \
+-	      $(LN_S) lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext) \
+-	      $(DESTDIR)$(ADA_RTL_OBJ_DIR)/lib$${file}$(soext); \
++	      $(LN_S) lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext).1 \
++	      $(DESTDIR)$(ADA_RTL_OBJ_DIR)/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext); \
+ 	   fi; \
+ 	done
+ # This copy must be done preserving the date on the original file.
+@@ -1652,18 +1419,6 @@
+ 	cd $(DESTDIR)$(ADA_INCLUDE_DIR); $(CHMOD) a-wx *.adb
+ 	cd $(DESTDIR)$(ADA_INCLUDE_DIR); $(CHMOD) a-wx *.ads
+ 
+-../stamp-gnatlib2:
+-	$(RM) rts/s-*.ali
+-	$(RM) rts/s-*$(objext)
+-	$(RM) rts/a-*.ali
+-	$(RM) rts/a-*$(objext)
+-	$(RM) rts/*.ali
+-	$(RM) rts/*$(objext)
+-	$(RM) rts/*$(arext)
+-	$(RM) rts/*$(soext)
+-	touch ../stamp-gnatlib2
+-	$(RM) ../stamp-gnatlib
+-
+ # NOTE: The $(foreach ...) commands assume ";" is the valid separator between
+ #       successive target commands. Although the Gnu make documentation
+ #       implies this is true on all systems, I suspect it may not be, So care
+@@ -1673,7 +1428,7 @@
+ 
+ # GNULLI Begin ###########################################################
+ 
+-../stamp-gnatlib1: Makefile ../stamp-gnatlib2
++../stamp-gnatlib1: Makefile
+ 	$(RMDIR) rts
+ 	$(MKDIR) rts
+ 	$(CHMOD) u+w rts
+@@ -1699,7 +1454,7 @@
+ # Example: cd rts; ar rc libfoo.a $(LONG_LIST_OF_OBJS)
+ # is guaranteed to overflow the buffer.
+ 
+-gnatlib: ../stamp-gnatlib1 ../stamp-gnatlib2
++gnatlib: ../stamp-gnatlib1
+ 	$(MAKE) -C rts \
+ 		CC="`echo \"$(GCC_FOR_TARGET)\" \
+ 		| sed -e 's,^\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'`" \
+@@ -1733,64 +1488,75 @@
+ 		  rts/memtrack.o
+ 		$(RANLIB_FOR_TARGET) rts/libgmem$(arext)
+         endif
+-	$(CHMOD) a-wx rts/*.ali
+ 	touch ../stamp-gnatlib
+ 
+ # Warning: this target assumes that LIBRARY_VERSION has been set correctly.
+-gnatlib-shared-default:
+-	$(MAKE) $(FLAGS_TO_PASS) \
+-             GNATLIBFLAGS="$(GNATLIBFLAGS)" \
+-	     GNATLIBCFLAGS="$(GNATLIBCFLAGS) $(TARGET_LIBGCC2_CFLAGS)" \
+-	     THREAD_KIND="$(THREAD_KIND)" \
+-             gnatlib
+-	$(RM) rts/libgna*$(soext)
++gnatlib-shared-default: ../stamp-gnatlib1
++	$(MAKE) -C rts \
++		CC="`echo \"$(GCC_FOR_TARGET)\" \
++		| sed -e 's,^\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'`" \
++	        INCLUDES="$(INCLUDES_FOR_SUBDIR) -I./../.." \
++                CFLAGS="$(GNATLIBCFLAGS_FOR_C)" \
++		srcdir=$(fsrcdir) \
++	        -f ../Makefile $(LIBGNAT_OBJS)
++	$(MAKE) -C rts \
++		CC="`echo \"$(GCC_FOR_TARGET)\" \
++		| sed -e 's,^\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'`" \
++	        ADA_INCLUDES="" \
++                CFLAGS="$(GNATLIBCFLAGS) $(TARGET_LIBGCC2_CFLAGS)" \
++	        ADAFLAGS="$(GNATLIBFLAGS)" \
++	        THREAD_KIND="$(THREAD_KIND)" \
++		srcdir=$(fsrcdir) \
++	        -f ../Makefile \
++	        $(GNATRTL_OBJS)
++	$(RM) rts/libgna*$(soext) rts/libgna*$(soext).1
+ 	cd rts; ../../xgcc -B../../ -shared $(GNATLIBCFLAGS) \
+ 		$(TARGET_LIBGCC2_CFLAGS) \
+-		-o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
++		-o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext).1 \
+ 		$(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) \
+ 		g-trasym.o convert_addresses.o \
+-		$(SO_OPTS)libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
++		$(SO_OPTS)libgnat$(hyphen)$(LIBRARY_VERSION)$(soext).1 \
+ 		$(MISCLIB) -lm
+ 	cd rts; ../../xgcc -B../../ -shared $(GNATLIBCFLAGS) \
+ 		$(TARGET_LIBGCC2_CFLAGS) \
+-		-o libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
++		-o libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext).1 \
+ 		$(GNATRTL_TASKING_OBJS) \
+-		$(SO_OPTS)libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
++		$(SO_OPTS)libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext).1 \
+ 		$(THREADSLIB)
+-	cd rts; $(LN_S) libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
+-		libgnat$(soext)
+-	cd rts; $(LN_S) libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
+-		libgnarl$(soext)
++	cd rts; for lib in gnat gnarl; do \
++		l=lib$${lib}$(hyphen)$(LIBRARY_VERSION)$(soext); \
++		$(LN_S) $$l.1 $$l; \
++	done
++# Delete the object files, lest they be linked statically into the tools
++# executables.  Only the .ali, .a and .so files must remain.
++	rm -f rts/*.o
++	$(CHMOD) a-wx rts/*.ali
+ 
+ gnatlib-shared-dual:
+ 	$(MAKE) $(FLAGS_TO_PASS) \
+              GNATLIBFLAGS="$(GNATLIBFLAGS)" \
+ 	     GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \
+ 	     THREAD_KIND="$(THREAD_KIND)" \
+-             gnatlib-shared-default
+-	$(MV) rts/libgna*$(soext) .
+-	$(RM) ../stamp-gnatlib2
++             gnatlib
++	$(RM) rts/*.o rts/*.ali
+ 	$(MAKE) $(FLAGS_TO_PASS) \
+              GNATLIBFLAGS="$(GNATLIBFLAGS)" \
+ 	     GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \
+ 	     THREAD_KIND="$(THREAD_KIND)" \
+-             gnatlib
+-	$(MV) libgna*$(soext) rts
++             gnatlib-shared-default
+ 
+ gnatlib-shared-dual-win32:
+ 	$(MAKE) $(FLAGS_TO_PASS) \
+              GNATLIBFLAGS="$(GNATLIBFLAGS)" \
+-	     GNATLIBCFLAGS="$(GNATLIBCFLAGS) $(TARGET_LIBGCC2_CFLAGS)" \
++	     GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \
+ 	     THREAD_KIND="$(THREAD_KIND)" \
+-             gnatlib-shared-win32
+-	$(MV) rts/libgna*$(soext) .
+-	$(RM) ../stamp-gnatlib2
++             gnatlib
++	$(RM) rts/*.o rts/*.ali
+ 	$(MAKE) $(FLAGS_TO_PASS) \
+              GNATLIBFLAGS="$(GNATLIBFLAGS)" \
+-	     GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \
++	     GNATLIBCFLAGS="$(GNATLIBCFLAGS) $(TARGET_LIBGCC2_CFLAGS)" \
+ 	     THREAD_KIND="$(THREAD_KIND)" \
+-             gnatlib
+-	$(MV) libgna*$(soext) rts
++             gnatlib-shared-win32
+ 
+ # ??? we need to add the option to support auto-import of arrays/records to
+ # the GNATLIBFLAGS when this will be supported by GNAT. At this point we will
+@@ -1899,22 +1665,6 @@
+ gnat-cross: force
+ 	make $(GNAT1_ADA_OBJS) CC="gcc -B../stage1/" CFLAGS="-S -gnatp"
+ 
+-# Compiling object files from source files.
+-
+-# Note that dependencies on obstack.h are not written
+-# because that file is not part of GCC.
+-# Dependencies on gvarargs.h are not written
+-# because all that file does, when not compiling with GCC,
+-# is include the system varargs.h.
+-
+-b_gnatl.c : $(GNATLINK_OBJS)
+-	$(GNATBIND) -C $(ADA_INCLUDES) -o b_gnatl.c gnatlink.ali
+-b_gnatl.o : b_gnatl.c
+-
+-b_gnatm.c : $(GNATMAKE_OBJS)
+-	$(GNATBIND) -C $(ADA_INCLUDES) -o b_gnatm.c gnatmake.ali
+-b_gnatm.o : b_gnatm.c
+-
+ ADA_INCLUDE_DIR = $(libsubdir)/adainclude
+ ADA_RTL_OBJ_DIR = $(libsubdir)/adalib
+ 
+@@ -2014,19 +1764,3 @@
+ .PHONY: risky-stage1 risky-stage2 risky-stage3 risky-stage4
+ 
+ force:
+-
+-# Gnatlbr, Vms_help, and Gnat.hlp are only used on VMS
+-
+-../../gnatlbr$(exeext): ../../prefix.o
+-	$(GNATMAKE) -c $(ADA_INCLUDES) gnatlbr --GCC="$(CC) $(ALL_ADAFLAGS)"
+-	$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatlbr
+-	$(GNATLINK) -v gnatlbr -o $@ --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
+-
+-../../vms_help$(exeext):
+-	$(GNATMAKE) -c $(ADA_INCLUDES) vms_help --GCC="$(CC) $(ALL_ADAFLAGS)"
+-	$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) vms_help
+-	$(GNATLINK) -v vms_help -o $@ --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
+-
+-../../gnat.hlp: ../../vms_help$(exeext)
+-	../../vms_help$(exeext) $(fsrcdir)/gnat.help_in \
+-	                        $(fsrcdir)/vms_data.ads ../../gnat.hlp
+--- gnattools/configure.ac~	2006-01-18 22:52:36.000000000 +0100
++++ gnattools/configure.ac	2007-06-15 12:04:40.696275987 +0200
+@@ -91,21 +91,9 @@
+   *86-*-solaris2*)
+     TOOLS_TARGET_PAIRS="mlib-tgt.adb<mlib-tgt-solaris.adb"
+     ;;
+-  *86-*-linux* \
+-  | powerpc*-*-linux*)
++  *-*-linux*)
+     TOOLS_TARGET_PAIRS="\
+     mlib-tgt.adb<mlib-tgt-linux.adb \
+-    indepsw.adb<indepsw-linux.adb"
+-    ;;
+-  *ia64-*-linux* \
+-  | alpha*-*-linux )
+-    TOOLS_TARGET_PAIRS="\
+-    mlib-tgt.adb<mlib-tgt-linux.adb \
+-    indepsw.adb<indepsw-linux.adb"
+-    ;;
+-  *x86_64-*-linux* \
+-  | s390*-*-linux*)
+-    TOOLS_TARGET_PAIRS="mlib-tgt.adb<mlib-tgt-linux.adb"
+     ;;
+   *86-*-freebsd*)
+     TOOLS_TARGET_PAIRS="\
+--- gnattools/Makefile.in~	2006-10-12 00:52:27.000000000 +0200
++++ gnattools/Makefile.in	2007-06-15 14:39:17.849851347 +0200
+@@ -18,6 +18,10 @@
+ # Default target; must be first.
+ all: gnattools
+ 
++.SUFFIXES:
++
++.SUFFIXES:
++
+ # Standard autoconf-set variables.
+ SHELL = @SHELL@
+ srcdir = @srcdir@
+@@ -32,113 +36,16 @@
+ LN_S=@LN_S@
+ target_noncanonical=@target_noncanonical@
+ 
+-# Variables for the user (or the top level) to override.
+-objext=.o
+-TRACE=no
+-ADA_FOR_BUILD=
+-ADA_FOR_TARGET=
+-LDFLAGS=
+-STAGE_PREFIX=
+-PWD_COMMAND = $${PWDCMD-pwd}
+-
+-# The tedious process of getting CFLAGS right.
+-CFLAGS=-g
+-LOOSE_WARN = -W -Wall -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes
+-GCC_WARN_CFLAGS = $(LOOSE_WARN) $(NOCOMMON_FLAG)
+-
+-ADA_CFLAGS=
+-T_ADA_CFLAGS=
+-# HPPA is literally the only target which sets X_ADA_CFLAGS
+-X_ADA_CFLAGS=@x_ada_cflags@
+-ALL_ADA_CFLAGS=$(X_ADA_CFLAGS) $(T_ADA_CFLAGS) $(ADA_CFLAGS)
+-
+-# Variables for gnattools.
+-ADAFLAGS= -gnatpg -gnata
+-ADA_INCLUDE_DIR = $(libsubdir)/adainclude
+-ADA_RTL_OBJ_DIR = $(libsubdir)/adalib
+-
+-# For finding the GCC build dir, which is used far too much
+-GCC_DIR=../gcc
+-# Include fragment generated by GCC configure; shared with libada for now.
+-include $(GCC_DIR)/libada-mk
+-# Variables based on those gleaned from the GCC makefile.  :-P
+-libsubdir=$(libdir)/gcc/$(target_noncanonical)/$(gcc_version)
+-
+-# Get possible host-specific override for libsubdir (ick).
+-xmake_file=$(subst /config,/../gcc/config,$(gcc_xmake_file))
+-ifneq ($(xmake_file),)
+-include $(xmake_file)
+-endif
+-
+-# Absolute srcdir for gcc/ada (why do we want absolute?  I dunno)
+-fsrcdir := $(shell cd $(srcdir)/../gcc/ada/; ${PWD_COMMAND})
+-
+-# Useful "subroutines" for the excess includes
+-INCLUDES_FOR_SUBDIR = -I. -I.. -I../.. -I$(fsrcdir) -I$(fsrcdir)/../config \
+-	-I$(fsrcdir)/../../include -I$(fsrcdir)/..
+-ADA_INCLUDES_FOR_SUBDIR = -I. -I$(fsrcdir)
+-
+-# Variables for gnattools1, native
+-TOOLS_FLAGS_TO_PASS_1= \
+-	"CC=../../xgcc -B../../" \
+-	"CFLAGS=$(CFLAGS) $(WARN_CFLAGS)" \
+-	"LDFLAGS=$(LDFLAGS)" \
+-	"ADAFLAGS=$(ADAFLAGS)" \
+-	"INCLUDES=$(INCLUDES_FOR_SUBDIR)" \
+-	"ADA_INCLUDES=-I- -I../rts $(ADA_INCLUDES_FOR_SUBDIR)"\
+-	"exeext=$(exeext)" \
+-	"fsrcdir=$(fsrcdir)" \
+-	"srcdir=$(fsrcdir)" \
+-	"GNATBIND=../../gnatbind" \
+-	"TOOLSCASE=native"
+-
+-# Variables for regnattools
+-TOOLS_FLAGS_TO_PASS_1re= \
+-	"CC=../../xgcc -B../../" \
+-	"CFLAGS=$(CFLAGS)" \
+-	"ADAFLAGS=$(ADAFLAGS)" \
+-	"INCLUDES=$(INCLUDES_FOR_SUBDIR)" \
+-	"ADA_INCLUDES=-I../rts $(ADA_INCLUDES_FOR_SUBDIR)"\
+-	"exeext=$(exeext)" \
+-	"fsrcdir=$(fsrcdir)" \
+-	"srcdir=$(fsrcdir)" \
+-	"GNATMAKE=../../gnatmake" \
+-	"GNATLINK=../../gnatlink" \
+-	"GNATBIND=../../gnatbind" \
+-	"TOOLSCASE=cross" \
+-	"INCLUDES="
+-
+-# Variables for gnattools2, native
+-TOOLS_FLAGS_TO_PASS_NATIVE= \
+-	"CC=../../xgcc -B../../" \
+-	"CFLAGS=$(CFLAGS)" \
+-	"ADAFLAGS=$(ADAFLAGS)" \
+-	"INCLUDES=$(INCLUDES_FOR_SUBDIR)" \
+-	"ADA_INCLUDES=-I../rts $(ADA_INCLUDES_FOR_SUBDIR)" \
+-	"exeext=$(exeext)" \
+-	"fsrcdir=$(fsrcdir)" \
+-	"srcdir=$(fsrcdir)" \
+-	"GNATMAKE=../../gnatmake" \
+-	"GNATLINK=../../gnatlink" \
+-	"GNATBIND=../../gnatbind" \
+-	"TOOLSCASE=native"
+-
+-# Variables for gnattools, cross
+-TOOLS_FLAGS_TO_PASS_CROSS= \
+-	"CC=$(CC)" \
+-	"CFLAGS=$(CFLAGS) $(WARN_CFLAGS)" \
+-	"LDFLAGS=$(LDFLAGS)" \
+-	"ADAFLAGS=$(ADAFLAGS)"	\
+-	"INCLUDES=$(INCLUDES_FOR_SUBDIR)" \
+-	"ADA_INCLUDES=-I$(RTS_DIR)../adainclude -I$(RTS_DIR) $(ADA_INCLUDES_FOR_SUBDIR)" \
+-	"exeext=$(exeext)" \
+-	"fsrcdir=$(fsrcdir)" \
+-	"srcdir=$(fsrcdir)" \
+-	"GNATMAKE=gnatmake" \
+-	"GNATLINK=gnatlink" \
+-	"GNATBIND=gnatbind" \
+-	"TOOLSCASE=cross" \
+-	"LIBGNAT="
++CFLAGS=-g -O2 -Wall
++INCLUDES = -I@srcdir@/../gcc/ada -I@srcdir@/../gcc
++ADA_CFLAGS=-g -O2 -gnatn
++ADA_INCLUDES=-nostdinc -I- -I. -I../gcc/ada/rts -I@srcdir@/../gcc/ada
++LIB_VERSION=$(strip $(shell grep ' Library_Version :' \
++              @srcdir@/../gcc/ada/gnatvsn.ads | sed -e 's/.*"\(.*\)".*/\1/'))
++ADA_LIBS := -L../gcc/ada/rts -lgnat-$(LIB_VERSION)
++
++# We will use the just-built compiler to compile and link everything.
++GCC=../gcc/xgcc -B../gcc/
+ 
+ # File lists
+ # ----------
+@@ -147,18 +54,136 @@
+ EXTRA_GNATTOOLS = @EXTRA_GNATTOOLS@
+ TOOLS_TARGET_PAIRS = @TOOLS_TARGET_PAIRS@
+ 
+-# These are built by gnatmake, and in both native and cross configurations.
+-GNATTOOLS2_FILES = \
+-	../../gnatchop$(exeext) \
+-	../../gnat$(exeext) \
+-	../../gnatkr$(exeext) \
+-	../../gnatls$(exeext) \
+-	../../gnatprep$(exeext) \
+-	../../gnatxref$(exeext) \
+-	../../gnatfind$(exeext) \
+-	../../gnatname$(exeext) \
+-	../../gnatclean$(exeext) \
+-	../../gprmake$(exeext)
++# Stage 1 builds xgcc and gnatbind; we can use them to build
++# gnatmake-static and gnatlink-static, then use gnatmake-static and
++# gnatlink-static to build the other tools.  The reason we first build
++# statically-linked versions of gnatmake and gnatlink is so we can run
++# them with confidence on all build platforms, without LD_LIBRARY_PATH
++# or some such variable.
++
++# The tools we will build using gnatmake-static and gnatlink-static.
++TOOLS := gnat gnatbind gnatchop gnatclean gnatfind gnatkr gnatls gnatlink
++TOOLS += gnatmake gnatname gnatprep gnatxref gprmake
++
++# Since we don't have gnatmake, we must specify the full list of
++# object files necessary to build gnatmake and gnatlink.
++# TODO: remove from these lists the objects that are part of
++# libgnatvsn and libgnatprj.
++GNATLINK_OBJS = \
++ali.o \
++alloc.o \
++butil.o \
++casing.o \
++csets.o \
++debug.o \
++fmap.o \
++fname.o \
++gnatlink.o \
++gnatvsn.o \
++hostparm.o \
++indepsw.o \
++namet.o \
++opt.o \
++osint.o \
++output.o \
++prefix.o \
++rident.o \
++sdefault.o \
++snames.o \
++stylesw.o \
++switch.o \
++table.o \
++targparm.o \
++tree_io.o \
++types.o \
++validsw.o \
++version.o \
++widechar.o
++
++GNATMAKE_OBJS = \
++ali-util.o \
++ali.o \
++alloc.o \
++atree.o \
++binderr.o \
++butil.o \
++casing.o \
++csets.o \
++debug.o \
++einfo.o\
++elists.o \
++err_vars.o \
++erroutc.o \
++errutil.o \
++fmap.o \
++fname-sf.o \
++fname-uf.o \
++fname.o \
++gnatmake.o \
++gnatvsn.o \
++hostparm.o \
++krunch.o \
++lib.o \
++make.o \
++makeusg.o \
++makeutl.o \
++mlib-fil.o \
++mlib-prj.o \
++mlib-tgt.o \
++mlib-utl.o \
++mlib.o \
++namet.o \
++nlists.o \
++opt.o \
++osint-m.o \
++osint.o \
++output.o \
++prefix.o \
++prj-attr-pm.o \
++prj-attr.o \
++prj-com.o \
++prj-dect.o \
++prj-env.o \
++prj-err.o \
++prj-ext.o \
++prj-nmsc.o \
++prj-pars.o \
++prj-part.o \
++prj-proc.o \
++prj-strt.o \
++prj-tree.o \
++prj-util.o \
++prj.o \
++rident.o \
++scans.o \
++scng.o \
++sdefault.o \
++sfn_scan.o \
++sinfo.o \
++sinput-c.o \
++sinput-p.o \
++sinput.o \
++snames.o \
++stand.o \
++stringt.o \
++styleg.o \
++stylesw.o \
++switch-m.o \
++switch.o \
++table.o \
++targparm.o \
++tempdir.o \
++tree_io.o \
++types.o \
++uintp.o \
++uname.o \
++urealp.o \
++usage.o \
++validsw.o \
++version.o \
++widechar.o \
++$(EXTRA_GNATMAKE_OBJS)
++
+ 
+ # Makefile targets
+ # ----------------
+@@ -166,126 +191,107 @@
+ .PHONY: gnattools gnattools-native gnattools-cross regnattools
+ gnattools: @default_gnattools_target@
+ 
+-# Sanity check
+-$(GCC_DIR)/stamp-gnatlib:
+-	@if [ ! -f $(GCC_DIR)/stamp-gnatlib ] ; \
+-        then \
+-          echo "Cannot build gnattools while gnatlib is out of date or unbuilt" ; \
+-          false; \
+-        else \
+-          true; \
+-        fi
+-
+-
+ # Build directory for the tools. Let's copy the target-dependent
+ # sources using the same mechanism as for gnatlib. The other sources are
+-# accessed using the vpath directive in ada/Makefile.in
++# accessed using the vpath directive.
++
++stamp-gnattools-sources:
++	$(LN_S) ../gcc/ada/sdefault.adb .
++	$(foreach PAIR,$(TOOLS_TARGET_PAIRS), \
++	          rm -f $(word 1,$(subst <, ,$(PAIR)));\
++	          $(LN_S) @srcdir@/../gcc/ada/$(word 2,$(subst <, ,$(PAIR))) \
++	                  $(word 1,$(subst <, ,$(PAIR)));)
++	touch $@
++
++gnattools-native: ../gcc/ada/rts/libgnat-$(LIB_VERSION).so
++gnattools-native: stamp-gnattools-sources
++gnattools-native: $(TOOLS) gnatbl
++
++$(TOOLS) gnatcmd: | gnatmake-static gnatlink-static
++
++vpath %.c @srcdir@/../gcc/ada:@srcdir@/../gcc
++vpath %.h @srcdir@/../gcc/ada
++vpath %.adb .:@srcdir@/../gcc/ada
++vpath %.ads @srcdir@/../gcc/ada
++
++# Because the just-built gcc is a host tool like us, we can use some
++# of its object files, e.g. prefix.o and version.o.
++vpath prefix.o ../gcc
++vpath version.o ../gcc
++
++# gnatlink
++
++gnatlink-static: $(GNATLINK_OBJS) b_gnatl.o link.o
++	$(GCC) -o $@ $^ \
++	   ../gcc/ada/rts/libgnat.a \
++	   ../libiberty/libiberty.a
++
++gnatlink: $(GNATLINK_OBJS) b_gnatl.o link.o
++	$(GCC) -o $@ $^ $(ADA_LIBS) ../libiberty/libiberty.a
++
++b_gnatl.o: b_gnatl.c adaint.h
++	$(GCC) -c -o $@ $(CFLAGS) $<
++
++b_gnatl.c: $(GNATLINK_OBJS)
++	../gcc/gnatbind -C -o $@ $(ADA_INCLUDES) gnatlink.ali
++
++# gnatmake
++
++gnatmake-static: $(GNATMAKE_OBJS) b_gnatm.o link.o
++	$(GCC) -o $@ $(ADA_CFLAGS) $^ \
++	   ../gcc/ada/rts/libgnat.a \
++	   ../libiberty/libiberty.a
++
++gnatmake: $(GNATMAKE_OBJS) b_gnatm.o link.o
++	$(GCC) -o $@ $(ADA_CFLAGS) $^ $(ADA_LIBS) ../libiberty/libiberty.a
++
++b_gnatm.o: b_gnatm.c adaint.h
++	$(GCC) -c -o $@ $(CFLAGS) $<
++
++b_gnatm.c: $(GNATMAKE_OBJS) adaint.h
++	../gcc/gnatbind -C -o $@ $(ADA_INCLUDES) gnatmake.ali
++
++# Other tools
++gnatchop gnatkr: version.o
++	./gnatmake-static -c -b $@ $(ADA_CFLAGS) $(ADA_INCLUDES) \
++	   --GCC="$(GCC)" \
++	   --GNATBIND=../gcc/gnatbind
++	./gnatlink-static -o $@ $@.ali $^ $(ADA_INCLUDES) $(ADA_LIBS) \
++	   --GCC="$(GCC) $(ADA_INCLUDES)" 
++	strip $@
++
++gnat: gnatcmd
++	cp -lp $< $@
++
++gnatbind gnatclean gnatcmd gnatfind gnatls gnatname gnatprep gnatxref gprmake: \
++link.o version.o prefix.o
++	./gnatmake-static -c -b $@ $(ADA_CFLAGS) $(ADA_INCLUDES) \
++	   --GCC="$(GCC)" \
++	   --GNATBIND=../gcc/gnatbind
++	./gnatlink-static -o $@ $@.ali $^ $(ADA_INCLUDES) $(ADA_LIBS) \
++	   ../libiberty/libiberty.a \
++	   --GCC="$(GCC) $(ADA_INCLUDES)"
++	strip $@
++
++gnatbl: gnatbl.c link.o version.o prefix.o
++	$(GCC) -o $@ $< $(CFLAGS) \
++	   -I../gcc -I@srcdir@/../gcc/config -I@srcdir@/../gcc \
++	   -I@srcdir@/../include \
++	   $(filter-out %.c,$^) \
++	   $(ADA_LIBS) ../libiberty/libiberty.a
++	strip $@
++
++# Force compiling sdefault.adb, not .ads, to produce sdefault.o
++sdefault.o: sdefault.adb
++
++%.o: %.adb
++	$(GCC) -c -o $@ $< $(ADA_CFLAGS) $(ADA_INCLUDES)
++
++%.o: %.ads
++	$(GCC) -c -o $@ $< $(ADA_CFLAGS) $(ADA_INCLUDES)
+ 
+-$(GCC_DIR)/stamp-tools:
+-	-rm -rf $(GCC_DIR)/ada/tools
+-	-mkdir -p $(GCC_DIR)/ada/tools
+-	-(cd $(GCC_DIR)/ada/tools; $(LN_S) ../sdefault.adb .)
+-	-$(foreach PAIR,$(TOOLS_TARGET_PAIRS), \
+-	          rm -f $(GCC_DIR)/ada/tools/$(word 1,$(subst <, ,$(PAIR)));\
+-	          $(LN_S) $(fsrcdir)/$(word 2,$(subst <, ,$(PAIR))) \
+-	                $(GCC_DIR)/ada/tools/$(word 1,$(subst <, ,$(PAIR)));)
+-	touch $(GCC_DIR)/stamp-tools
+-
+-# gnatmake/link tools cannot always be built with gnatmake/link for bootstrap 
+-# reasons: gnatmake should be built with a recent compiler, a recent compiler
+-# may not generate ALI files compatible with an old gnatmake so it is important
+-# to be able to build gnatmake without a version of gnatmake around. Once 
+-# everything has been compiled once, gnatmake can be recompiled with itself 
+-# (see target regnattools) 
+-gnattools-native: $(GCC_DIR)/stamp-tools $(GCC_DIR)/stamp-gnatlib
+-	# gnattools1
+-	$(MAKE) -C $(GCC_DIR)/ada/tools -f ../Makefile \
+-	  $(TOOLS_FLAGS_TO_PASS_1) \
+-	  ../../gnatmake$(exeext) ../../gnatlink$(exeext) ../../gnatbl$(exeext)
+-	# gnattools2
+-	$(MAKE) -C $(GCC_DIR)/ada/tools -f ../Makefile \
+-	  $(TOOLS_FLAGS_TO_PASS_NATIVE) \
+-	  $(GNATTOOLS2_FILES)
+-
+-# gnatmake/link can be built with recent gnatmake/link if they are available.
+-# This is especially convenient for building cross tools or for rebuilding
+-# the tools when the original bootstrap has already be done.
+-regnattools: $(GCC_DIR)/stamp-gnatlib
+-	# gnattools1-re
+-	$(MAKE) -C $(GCC_DIR)/ada/tools -f ../Makefile \
+-	  $(TOOLS_FLAGS_TO_PASS_1re) \
+-	  gnatmake-re gnatlink-re
+-	# gnattools2
+-	$(MAKE) -C $(GCC_DIR)/ada/tools -f ../Makefile \
+-	  $(TOOLS_FLAGS_TO_PASS_NATIVE) \
+-	  $(GNATTOOLS2_FILES)
+-
+-# For cross builds of gnattools,
+-# put the host RTS dir first in the PATH to hide the default runtime
+-# files that are among the sources
+-# FIXME: This should be done in configure.
+-RTS_DIR:=$(strip $(subst \,/,$(shell gnatls -v | grep adalib )))
+-gnattools-cross: $(GCC_DIR)/stamp-tools
+-	# gnattools1-re
+-	$(MAKE) -C $(GCC_DIR)/ada/tools -f ../Makefile \
+-	  $(TOOLS_FLAGS_TO_PASS_CROSS) INCLUDES="" \
+-	  gnatmake-re gnatlink-re
+-	# gnattools2
+-	$(MAKE) -C $(GCC_DIR)/ada/tools -f ../Makefile \
+-	  $(TOOLS_FLAGS_TO_PASS_CROSS) \
+-	  $(GNATTOOLS2_FILES)
+-	# gnattools4 (cross only)
+-	$(MAKE) -C $(GCC_DIR)/ada/tools -f ../Makefile \
+-	  $(TOOLS_FLAGS_TO_PASS_CROSS) \
+-	  top_buildir=../../.. \
+-           ../../vxaddr2line$(exeext)
+-	# Rename cross tools to where the GCC makefile wants them when
+-	# installing.  FIXME: installation should be done elsewhere.
+-	if [ -f $(GCC_DIR)/gnatbind$(exeext) ] ; then \
+-	  mv $(GCC_DIR)/gnatbind$(exeext) $(GCC_DIR)/gnatbind-cross$(exeext); \
+-	fi
+-	if [ -f $(GCC_DIR)/gnatbl$(exeext) ] ; then \
+-	  mv $(GCC_DIR)/gnatbl$(exeext) $(GCC_DIR)/gnatbl-cross$(exeext); \
+-	fi
+-	if [ -f $(GCC_DIR)/gnatchop$(exeext) ] ; then \
+-	  mv $(GCC_DIR)/gnatchop$(exeext) $(GCC_DIR)/gnatchop-cross$(exeext); \
+-	fi
+-	if [ -f $(GCC_DIR)/gnat$(exeext) ] ; then \
+-	  mv $(GCC_DIR)/gnat$(exeext) $(GCC_DIR)/gnat-cross$(exeext); \
+-	fi
+-	if [ -f $(GCC_DIR)/gnatkr$(exeext) ] ; then \
+-	  mv $(GCC_DIR)/gnatkr$(exeext) $(GCC_DIR)/gnatkr-cross$(exeext); \
+-	fi
+-	if [ -f $(GCC_DIR)/gnatlink$(exeext) ] ; then \
+-	  mv $(GCC_DIR)/gnatlink$(exeext) $(GCC_DIR)/gnatlink-cross$(exeext); \
+-	fi
+-	if [ -f $(GCC_DIR)/gnatls$(exeext) ] ; then \
+-	  mv $(GCC_DIR)/gnatls$(exeext) $(GCC_DIR)/gnatls-cross$(exeext); \
+-	fi
+-	if [ -f $(GCC_DIR)/gnatmake$(exeext) ] ; then \
+-	  mv $(GCC_DIR)/gnatmake$(exeext) $(GCC_DIR)/gnatmake-cross$(exeext); \
+-	fi
+-	if [ -f $(GCC_DIR)/gnatmem$(exeext) ] ; then \
+-	  mv $(GCC_DIR)/gnatmem$(exeext) $(GCC_DIR)/gnatmem-cross$(exeext); \
+-	fi
+-	if [ -f $(GCC_DIR)/gnatname$(exeext) ] ; then \
+-	  mv $(GCC_DIR)/gnatname$(exeext) $(GCC_DIR)/gnatname-cross$(exeext); \
+-	fi
+-	if [ -f $(GCC_DIR)/gnatprep$(exeext) ] ; then \
+-	  mv $(GCC_DIR)/gnatprep$(exeext) $(GCC_DIR)/gnatprep-cross$(exeext); \
+-	fi
+-	if [ -f $(GCC_DIR)/gnatxref$(exeext) ] ; then \
+-	  mv $(GCC_DIR)/gnatxref$(exeext) $(GCC_DIR)/gnatxref-cross$(exeext); \
+-	fi
+-	if [ -f $(GCC_DIR)/gnatfind$(exeext) ] ; then \
+-	  mv $(GCC_DIR)/gnatfind$(exeext) $(GCC_DIR)/gnatfind-cross$(exeext); \
+-	fi
+-	if [ -f $(GCC_DIR)/gnatclean$(exeext) ] ; then \
+-	  mv $(GCC_DIR)/gnatclean$(exeext) $(GCC_DIR)/gnatclean-cross$(exeext); \
+-	fi
+-	if [ -f $(GCC_DIR)/gnatsym$(exeext) ] ; then \
+-	  mv $(GCC_DIR)/gnatsym$(exeext) $(GCC_DIR)/gnatsym-cross$(exeext); \
+-	fi
++%.o: %.c
++	$(GCC) -c -o $@ $< $(CFLAGS) $(INCLUDES)
+ 
+ # Other
+ # -----
+@@ -313,6 +319,7 @@
+ 
+ # Installation rules.
+ install:
++	$(INSTALL) -s gnatmake gnatlink $(TOOLS) gnatbl $(DESTDIR)$(bindir)
+ 
+ install-info:
+ 
+@@ -320,8 +327,10 @@
+ 
+ # Cleaning rules.
+ mostlyclean:
++	$(RM) gnatmake gnatlink $(TOOLS) gnatbl *.o *.ali
+ 
+ clean:
++	$(RM) *.ads *.adb stamp-gnattools-sources
+ 
+ distclean:
+ 	$(RM) Makefile config.status config.log
+--- libada/Makefile.in~	2006-11-27 22:14:44.000000000 +0100
++++ libada/Makefile.in	2007-06-15 13:18:07.816270512 +0200
+@@ -50,7 +50,7 @@
+ 
+ # For finding the GCC build dir, which is used far too much
+ host_subdir = @host_subdir@
+-GCC_DIR=../../$(host_subdir)/gcc
++GCC_DIR=../$(host_subdir)/gcc
+ # Include fragment generated by GCC configure.
+ include $(GCC_DIR)/libada-mk
+ 
+--- Makefile.def~	2007-01-01 09:51:04.000000000 +0100
++++ Makefile.def	2007-06-15 12:04:40.832282624 +0200
+@@ -113,7 +113,20 @@
+                 missing=distclean;
+                 missing=maintainer-clean; };
+ host_modules= { module= utils; no_check=true; };
+-host_modules= { module= gnattools; };
++host_modules= { module= libada; no_install=true; no_check=true;
++		missing= info;
++		missing= dvi;
++		missing= html;
++		missing= TAGS;
++		missing= install-info;
++		missing= installcheck; };
++host_modules= { module= gnattools; no_check=true;
++		missing= info;
++		missing= dvi;
++		missing= html;
++		missing= TAGS;
++		missing= install-info;
++		missing= installcheck; };
+ 
+ target_modules = { module= libstdc++-v3; lib_path=.libs; raw_cxx=true; };
+ target_modules = { module= libmudflap; lib_path=.libs; };
+@@ -137,7 +150,13 @@
+ target_modules = { module= boehm-gc; };
+ target_modules = { module= qthreads; };
+ target_modules = { module= rda; };
+-target_modules = { module= libada; };
++target_modules = { module= libada; no_install=true; no_check=true;
++		   missing= info;
++		   missing= dvi;
++		   missing= html;
++		   missing= TAGS;
++		   missing= install-info;
++		   missing= installcheck; };
+ target_modules = { module= libgomp; lib_path=.libs; };
+ 
+ // These are (some of) the make targets to be done in each subdirectory.
+@@ -295,7 +314,7 @@
+ 
+ dependencies = { module=all-fixincludes; on=all-libiberty; };
+ 
+-dependencies = { module=all-gnattools; on=all-target-libada; };
++dependencies = { module=all-gnattools; on=all-libada; };
+ 
+ // Host modules specific to gdb.
+ dependencies = { module=configure-gdb; on=configure-intl; };
+--- Makefile.in~	2007-06-12 01:12:08.000000000 +0200
++++ Makefile.in	2007-06-15 12:04:41.184299803 +0200
+@@ -639,6 +639,7 @@
+     maybe-configure-tk \
+     maybe-configure-libtermcap \
+     maybe-configure-utils \
++    maybe-configure-libada \
+     maybe-configure-gnattools
+ .PHONY: configure-target
+ configure-target:  \
+@@ -782,6 +783,7 @@
+ all-host: maybe-all-tk
+ all-host: maybe-all-libtermcap
+ all-host: maybe-all-utils
++all-host: maybe-all-libada
+ all-host: maybe-all-gnattools
+ 
+ .PHONY: all-target
+@@ -890,6 +892,7 @@
+ info-host: maybe-info-tk
+ info-host: maybe-info-libtermcap
+ info-host: maybe-info-utils
++info-host: maybe-info-libada
+ info-host: maybe-info-gnattools
+ 
+ .PHONY: info-target
+@@ -993,6 +996,7 @@
+ dvi-host: maybe-dvi-tk
+ dvi-host: maybe-dvi-libtermcap
+ dvi-host: maybe-dvi-utils
++dvi-host: maybe-dvi-libada
+ dvi-host: maybe-dvi-gnattools
+ 
+ .PHONY: dvi-target
+@@ -1096,6 +1100,7 @@
+ pdf-host: maybe-pdf-tk
+ pdf-host: maybe-pdf-libtermcap
+ pdf-host: maybe-pdf-utils
++pdf-host: maybe-pdf-libada
+ pdf-host: maybe-pdf-gnattools
+ 
+ .PHONY: pdf-target
+@@ -1199,6 +1204,7 @@
+ html-host: maybe-html-tk
+ html-host: maybe-html-libtermcap
+ html-host: maybe-html-utils
++html-host: maybe-html-libada
+ html-host: maybe-html-gnattools
+ 
+ .PHONY: html-target
+@@ -1302,6 +1308,7 @@
+ TAGS-host: maybe-TAGS-tk
+ TAGS-host: maybe-TAGS-libtermcap
+ TAGS-host: maybe-TAGS-utils
++TAGS-host: maybe-TAGS-libada
+ TAGS-host: maybe-TAGS-gnattools
+ 
+ .PHONY: TAGS-target
+@@ -1405,6 +1412,7 @@
+ install-info-host: maybe-install-info-tk
+ install-info-host: maybe-install-info-libtermcap
+ install-info-host: maybe-install-info-utils
++install-info-host: maybe-install-info-libada
+ install-info-host: maybe-install-info-gnattools
+ 
+ .PHONY: install-info-target
+@@ -1508,6 +1516,7 @@
+ install-html-host: maybe-install-html-tk
+ install-html-host: maybe-install-html-libtermcap
+ install-html-host: maybe-install-html-utils
++install-html-host: maybe-install-html-libada
+ install-html-host: maybe-install-html-gnattools
+ 
+ .PHONY: install-html-target
+@@ -1611,6 +1620,7 @@
+ installcheck-host: maybe-installcheck-tk
+ installcheck-host: maybe-installcheck-libtermcap
+ installcheck-host: maybe-installcheck-utils
++installcheck-host: maybe-installcheck-libada
+ installcheck-host: maybe-installcheck-gnattools
+ 
+ .PHONY: installcheck-target
+@@ -1714,6 +1724,7 @@
+ mostlyclean-host: maybe-mostlyclean-tk
+ mostlyclean-host: maybe-mostlyclean-libtermcap
+ mostlyclean-host: maybe-mostlyclean-utils
++mostlyclean-host: maybe-mostlyclean-libada
+ mostlyclean-host: maybe-mostlyclean-gnattools
+ 
+ .PHONY: mostlyclean-target
+@@ -1817,6 +1828,7 @@
+ clean-host: maybe-clean-tk
+ clean-host: maybe-clean-libtermcap
+ clean-host: maybe-clean-utils
++clean-host: maybe-clean-libada
+ clean-host: maybe-clean-gnattools
+ 
+ .PHONY: clean-target
+@@ -1920,6 +1932,7 @@
+ distclean-host: maybe-distclean-tk
+ distclean-host: maybe-distclean-libtermcap
+ distclean-host: maybe-distclean-utils
++distclean-host: maybe-distclean-libada
+ distclean-host: maybe-distclean-gnattools
+ 
+ .PHONY: distclean-target
+@@ -2023,6 +2036,7 @@
+ maintainer-clean-host: maybe-maintainer-clean-tk
+ maintainer-clean-host: maybe-maintainer-clean-libtermcap
+ maintainer-clean-host: maybe-maintainer-clean-utils
++maintainer-clean-host: maybe-maintainer-clean-libada
+ maintainer-clean-host: maybe-maintainer-clean-gnattools
+ 
+ .PHONY: maintainer-clean-target
+@@ -2182,6 +2196,7 @@
+     maybe-check-tk \
+     maybe-check-libtermcap \
+     maybe-check-utils \
++    maybe-check-libada \
+     maybe-check-gnattools
+ 
+ .PHONY: check-target
+@@ -2311,6 +2326,7 @@
+     maybe-install-tk \
+     maybe-install-libtermcap \
+     maybe-install-utils \
++    maybe-install-libada \
+     maybe-install-gnattools
+ 
+ .PHONY: install-host
+@@ -2382,6 +2398,7 @@
+     maybe-install-tk \
+     maybe-install-libtermcap \
+     maybe-install-utils \
++    maybe-install-libada \
+     maybe-install-gnattools
+ 
+ .PHONY: install-target
+@@ -33124,6 +33141,580 @@
+ 
+ 
+ 
++.PHONY: configure-libada maybe-configure-libada
++maybe-configure-libada:
++@if gcc-bootstrap
++configure-libada: stage_current
++@endif gcc-bootstrap
++@if libada
++maybe-configure-libada: configure-libada
++configure-libada: 
++	@: $(MAKE); $(unstage)
++	@r=`${PWD_COMMAND}`; export r; \
++	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++	test ! -f $(HOST_SUBDIR)/libada/Makefile || exit 0; \
++	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libada ; \
++	$(HOST_EXPORTS) \
++	echo Configuring in $(HOST_SUBDIR)/libada; \
++	cd "$(HOST_SUBDIR)/libada" || exit 1; \
++	case $(srcdir) in \
++	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
++	  *) topdir=`echo $(HOST_SUBDIR)/libada/ | \
++		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
++	esac; \
++	srcdiroption="--srcdir=$${topdir}/libada"; \
++	libsrcdir="$$s/libada"; \
++	$(SHELL) $${libsrcdir}/configure \
++	  $(HOST_CONFIGARGS) $${srcdiroption}  \
++	  || exit 1
++@endif libada
++
++
++
++
++
++.PHONY: all-libada maybe-all-libada
++maybe-all-libada:
++@if gcc-bootstrap
++all-libada: stage_current
++@endif gcc-bootstrap
++@if libada
++TARGET-libada=all
++maybe-all-libada: all-libada
++all-libada: configure-libada
++	@: $(MAKE); $(unstage)
++	@r=`${PWD_COMMAND}`; export r; \
++	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++	$(HOST_EXPORTS) \
++	(cd $(HOST_SUBDIR)/libada && \
++	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-libada))
++@endif libada
++
++
++
++
++.PHONY: check-libada maybe-check-libada
++maybe-check-libada:
++@if libada
++maybe-check-libada: check-libada
++
++check-libada:
++
++@endif libada
++
++.PHONY: install-libada maybe-install-libada
++maybe-install-libada:
++@if libada
++maybe-install-libada: install-libada
++
++install-libada:
++
++@endif libada
++
++# Other targets (info, dvi, pdf, etc.)
++
++.PHONY: maybe-info-libada info-libada
++maybe-info-libada:
++@if libada
++maybe-info-libada: info-libada
++
++# libada doesn't support info.
++info-libada:
++
++@endif libada
++
++.PHONY: maybe-dvi-libada dvi-libada
++maybe-dvi-libada:
++@if libada
++maybe-dvi-libada: dvi-libada
++
++# libada doesn't support dvi.
++dvi-libada:
++
++@endif libada
++
++.PHONY: maybe-pdf-libada pdf-libada
++maybe-pdf-libada:
++@if libada
++maybe-pdf-libada: pdf-libada
++
++pdf-libada: \
++    configure-libada 
++	@: $(MAKE); $(unstage)
++	@[ -f ./libada/Makefile ] || exit 0; \
++	r=`${PWD_COMMAND}`; export r; \
++	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++	$(HOST_EXPORTS) \
++	for flag in $(EXTRA_HOST_FLAGS) ; do \
++	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
++	done; \
++	echo "Doing pdf in libada" ; \
++	(cd $(HOST_SUBDIR)/libada && \
++	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
++	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
++	          "RANLIB=$${RANLIB}" \
++	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
++	          pdf) \
++	  || exit 1
++
++@endif libada
++
++.PHONY: maybe-html-libada html-libada
++maybe-html-libada:
++@if libada
++maybe-html-libada: html-libada
++
++# libada doesn't support html.
++html-libada:
++
++@endif libada
++
++.PHONY: maybe-TAGS-libada TAGS-libada
++maybe-TAGS-libada:
++@if libada
++maybe-TAGS-libada: TAGS-libada
++
++# libada doesn't support TAGS.
++TAGS-libada:
++
++@endif libada
++
++.PHONY: maybe-install-info-libada install-info-libada
++maybe-install-info-libada:
++@if libada
++maybe-install-info-libada: install-info-libada
++
++# libada doesn't support install-info.
++install-info-libada:
++
++@endif libada
++
++.PHONY: maybe-install-html-libada install-html-libada
++maybe-install-html-libada:
++@if libada
++maybe-install-html-libada: install-html-libada
++
++install-html-libada: \
++    configure-libada \
++    html-libada 
++	@: $(MAKE); $(unstage)
++	@[ -f ./libada/Makefile ] || exit 0; \
++	r=`${PWD_COMMAND}`; export r; \
++	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++	$(HOST_EXPORTS) \
++	for flag in $(EXTRA_HOST_FLAGS) ; do \
++	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
++	done; \
++	echo "Doing install-html in libada" ; \
++	(cd $(HOST_SUBDIR)/libada && \
++	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
++	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
++	          "RANLIB=$${RANLIB}" \
++	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
++	          install-html) \
++	  || exit 1
++
++@endif libada
++
++.PHONY: maybe-installcheck-libada installcheck-libada
++maybe-installcheck-libada:
++@if libada
++maybe-installcheck-libada: installcheck-libada
++
++# libada doesn't support installcheck.
++installcheck-libada:
++
++@endif libada
++
++.PHONY: maybe-mostlyclean-libada mostlyclean-libada
++maybe-mostlyclean-libada:
++@if libada
++maybe-mostlyclean-libada: mostlyclean-libada
++
++mostlyclean-libada: 
++	@: $(MAKE); $(unstage)
++	@[ -f ./libada/Makefile ] || exit 0; \
++	r=`${PWD_COMMAND}`; export r; \
++	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++	$(HOST_EXPORTS) \
++	for flag in $(EXTRA_HOST_FLAGS) ; do \
++	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
++	done; \
++	echo "Doing mostlyclean in libada" ; \
++	(cd $(HOST_SUBDIR)/libada && \
++	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
++	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
++	          "RANLIB=$${RANLIB}" \
++	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
++	          mostlyclean) \
++	  || exit 1
++
++@endif libada
++
++.PHONY: maybe-clean-libada clean-libada
++maybe-clean-libada:
++@if libada
++maybe-clean-libada: clean-libada
++
++clean-libada: 
++	@: $(MAKE); $(unstage)
++	@[ -f ./libada/Makefile ] || exit 0; \
++	r=`${PWD_COMMAND}`; export r; \
++	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++	$(HOST_EXPORTS) \
++	for flag in $(EXTRA_HOST_FLAGS) ; do \
++	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
++	done; \
++	echo "Doing clean in libada" ; \
++	(cd $(HOST_SUBDIR)/libada && \
++	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
++	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
++	          "RANLIB=$${RANLIB}" \
++	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
++	          clean) \
++	  || exit 1
++
++@endif libada
++
++.PHONY: maybe-distclean-libada distclean-libada
++maybe-distclean-libada:
++@if libada
++maybe-distclean-libada: distclean-libada
++
++distclean-libada: 
++	@: $(MAKE); $(unstage)
++	@[ -f ./libada/Makefile ] || exit 0; \
++	r=`${PWD_COMMAND}`; export r; \
++	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++	$(HOST_EXPORTS) \
++	for flag in $(EXTRA_HOST_FLAGS) ; do \
++	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
++	done; \
++	echo "Doing distclean in libada" ; \
++	(cd $(HOST_SUBDIR)/libada && \
++	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
++	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
++	          "RANLIB=$${RANLIB}" \
++	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
++	          distclean) \
++	  || exit 1
++
++@endif libada
++
++.PHONY: maybe-maintainer-clean-libada maintainer-clean-libada
++maybe-maintainer-clean-libada:
++@if libada
++maybe-maintainer-clean-libada: maintainer-clean-libada
++
++maintainer-clean-libada: 
++	@: $(MAKE); $(unstage)
++	@[ -f ./libada/Makefile ] || exit 0; \
++	r=`${PWD_COMMAND}`; export r; \
++	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++	$(HOST_EXPORTS) \
++	for flag in $(EXTRA_HOST_FLAGS) ; do \
++	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
++	done; \
++	echo "Doing maintainer-clean in libada" ; \
++	(cd $(HOST_SUBDIR)/libada && \
++	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
++	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
++	          "RANLIB=$${RANLIB}" \
++	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
++	          maintainer-clean) \
++	  || exit 1
++
++@endif libada
++
++
++
++.PHONY: configure-libada maybe-configure-libada
++maybe-configure-libada:
++@if gcc-bootstrap
++configure-libada: stage_current
++@endif gcc-bootstrap
++@if libada
++maybe-configure-libada: configure-libada
++configure-libada: 
++	@: $(MAKE); $(unstage)
++	@r=`${PWD_COMMAND}`; export r; \
++	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++	test ! -f $(HOST_SUBDIR)/libada/Makefile || exit 0; \
++	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libada ; \
++	$(HOST_EXPORTS) \
++	echo Configuring in $(HOST_SUBDIR)/libada; \
++	cd "$(HOST_SUBDIR)/libada" || exit 1; \
++	case $(srcdir) in \
++	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
++	  *) topdir=`echo $(HOST_SUBDIR)/libada/ | \
++		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
++	esac; \
++	srcdiroption="--srcdir=$${topdir}/libada"; \
++	libsrcdir="$$s/libada"; \
++	$(SHELL) $${libsrcdir}/configure \
++	  $(HOST_CONFIGARGS) $${srcdiroption}  \
++	  || exit 1
++@endif libada
++
++
++
++
++
++.PHONY: all-libada maybe-all-libada
++maybe-all-libada:
++@if gcc-bootstrap
++all-libada: stage_current
++@endif gcc-bootstrap
++@if libada
++TARGET-libada=all
++maybe-all-libada: all-libada
++all-libada: configure-libada
++	@: $(MAKE); $(unstage)
++	@r=`${PWD_COMMAND}`; export r; \
++	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++	$(HOST_EXPORTS) \
++	(cd $(HOST_SUBDIR)/libada && \
++	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-libada))
++@endif libada
++
++
++
++
++.PHONY: check-libada maybe-check-libada
++maybe-check-libada:
++@if libada
++maybe-check-libada: check-libada
++
++check-libada:
++
++@endif libada
++
++.PHONY: install-libada maybe-install-libada
++maybe-install-libada:
++@if libada
++maybe-install-libada: install-libada
++
++install-libada:
++
++@endif libada
++
++# Other targets (info, dvi, pdf, etc.)
++
++.PHONY: maybe-info-libada info-libada
++maybe-info-libada:
++@if libada
++maybe-info-libada: info-libada
++
++# libada doesn't support info.
++info-libada:
++
++@endif libada
++
++.PHONY: maybe-dvi-libada dvi-libada
++maybe-dvi-libada:
++@if libada
++maybe-dvi-libada: dvi-libada
++
++# libada doesn't support dvi.
++dvi-libada:
++
++@endif libada
++
++.PHONY: maybe-pdf-libada pdf-libada
++maybe-pdf-libada:
++@if libada
++maybe-pdf-libada: pdf-libada
++
++pdf-libada: \
++    configure-libada 
++	@: $(MAKE); $(unstage)
++	@[ -f ./libada/Makefile ] || exit 0; \
++	r=`${PWD_COMMAND}`; export r; \
++	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++	$(HOST_EXPORTS) \
++	for flag in $(EXTRA_HOST_FLAGS) ; do \
++	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
++	done; \
++	echo "Doing pdf in libada" ; \
++	(cd $(HOST_SUBDIR)/libada && \
++	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
++	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
++	          "RANLIB=$${RANLIB}" \
++	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
++	          pdf) \
++	  || exit 1
++
++@endif libada
++
++.PHONY: maybe-html-libada html-libada
++maybe-html-libada:
++@if libada
++maybe-html-libada: html-libada
++
++# libada doesn't support html.
++html-libada:
++
++@endif libada
++
++.PHONY: maybe-TAGS-libada TAGS-libada
++maybe-TAGS-libada:
++@if libada
++maybe-TAGS-libada: TAGS-libada
++
++# libada doesn't support TAGS.
++TAGS-libada:
++
++@endif libada
++
++.PHONY: maybe-install-info-libada install-info-libada
++maybe-install-info-libada:
++@if libada
++maybe-install-info-libada: install-info-libada
++
++# libada doesn't support install-info.
++install-info-libada:
++
++@endif libada
++
++.PHONY: maybe-install-html-libada install-html-libada
++maybe-install-html-libada:
++@if libada
++maybe-install-html-libada: install-html-libada
++
++install-html-libada: \
++    configure-libada \
++    html-libada 
++	@: $(MAKE); $(unstage)
++	@[ -f ./libada/Makefile ] || exit 0; \
++	r=`${PWD_COMMAND}`; export r; \
++	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++	$(HOST_EXPORTS) \
++	for flag in $(EXTRA_HOST_FLAGS) ; do \
++	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
++	done; \
++	echo "Doing install-html in libada" ; \
++	(cd $(HOST_SUBDIR)/libada && \
++	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
++	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
++	          "RANLIB=$${RANLIB}" \
++	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
++	          install-html) \
++	  || exit 1
++
++@endif libada
++
++.PHONY: maybe-installcheck-libada installcheck-libada
++maybe-installcheck-libada:
++@if libada
++maybe-installcheck-libada: installcheck-libada
++
++# libada doesn't support installcheck.
++installcheck-libada:
++
++@endif libada
++
++.PHONY: maybe-mostlyclean-libada mostlyclean-libada
++maybe-mostlyclean-libada:
++@if libada
++maybe-mostlyclean-libada: mostlyclean-libada
++
++mostlyclean-libada: 
++	@: $(MAKE); $(unstage)
++	@[ -f ./libada/Makefile ] || exit 0; \
++	r=`${PWD_COMMAND}`; export r; \
++	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++	$(HOST_EXPORTS) \
++	for flag in $(EXTRA_HOST_FLAGS) ; do \
++	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
++	done; \
++	echo "Doing mostlyclean in libada" ; \
++	(cd $(HOST_SUBDIR)/libada && \
++	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
++	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
++	          "RANLIB=$${RANLIB}" \
++	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
++	          mostlyclean) \
++	  || exit 1
++
++@endif libada
++
++.PHONY: maybe-clean-libada clean-libada
++maybe-clean-libada:
++@if libada
++maybe-clean-libada: clean-libada
++
++clean-libada: 
++	@: $(MAKE); $(unstage)
++	@[ -f ./libada/Makefile ] || exit 0; \
++	r=`${PWD_COMMAND}`; export r; \
++	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++	$(HOST_EXPORTS) \
++	for flag in $(EXTRA_HOST_FLAGS) ; do \
++	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
++	done; \
++	echo "Doing clean in libada" ; \
++	(cd $(HOST_SUBDIR)/libada && \
++	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
++	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
++	          "RANLIB=$${RANLIB}" \
++	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
++	          clean) \
++	  || exit 1
++
++@endif libada
++
++.PHONY: maybe-distclean-libada distclean-libada
++maybe-distclean-libada:
++@if libada
++maybe-distclean-libada: distclean-libada
++
++distclean-libada: 
++	@: $(MAKE); $(unstage)
++	@[ -f ./libada/Makefile ] || exit 0; \
++	r=`${PWD_COMMAND}`; export r; \
++	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++	$(HOST_EXPORTS) \
++	for flag in $(EXTRA_HOST_FLAGS) ; do \
++	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
++	done; \
++	echo "Doing distclean in libada" ; \
++	(cd $(HOST_SUBDIR)/libada && \
++	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
++	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
++	          "RANLIB=$${RANLIB}" \
++	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
++	          distclean) \
++	  || exit 1
++
++@endif libada
++
++.PHONY: maybe-maintainer-clean-libada maintainer-clean-libada
++maybe-maintainer-clean-libada:
++@if libada
++maybe-maintainer-clean-libada: maintainer-clean-libada
++
++maintainer-clean-libada: 
++	@: $(MAKE); $(unstage)
++	@[ -f ./libada/Makefile ] || exit 0; \
++	r=`${PWD_COMMAND}`; export r; \
++	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++	$(HOST_EXPORTS) \
++	for flag in $(EXTRA_HOST_FLAGS) ; do \
++	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
++	done; \
++	echo "Doing maintainer-clean in libada" ; \
++	(cd $(HOST_SUBDIR)/libada && \
++	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
++	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
++	          "RANLIB=$${RANLIB}" \
++	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
++	          maintainer-clean) \
++	  || exit 1
++
++@endif libada
++
++
++
+ .PHONY: configure-gnattools maybe-configure-gnattools
+ maybe-configure-gnattools:
+ @if gcc-bootstrap
+@@ -33182,12 +33773,6 @@
+ maybe-check-gnattools: check-gnattools
+ 
+ check-gnattools:
+-	@: $(MAKE); $(unstage)
+-	@r=`${PWD_COMMAND}`; export r; \
+-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+-	$(HOST_EXPORTS) \
+-	(cd $(HOST_SUBDIR)/gnattools && \
+-	  $(MAKE) $(FLAGS_TO_PASS)  check)
+ 
+ @endif gnattools
+ 
+@@ -33213,24 +33798,8 @@
+ @if gnattools
+ maybe-info-gnattools: info-gnattools
+ 
+-info-gnattools: \
+-    configure-gnattools 
+-	@: $(MAKE); $(unstage)
+-	@[ -f ./gnattools/Makefile ] || exit 0; \
+-	r=`${PWD_COMMAND}`; export r; \
+-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+-	$(HOST_EXPORTS) \
+-	for flag in $(EXTRA_HOST_FLAGS) ; do \
+-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+-	done; \
+-	echo "Doing info in gnattools" ; \
+-	(cd $(HOST_SUBDIR)/gnattools && \
+-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+-	          "RANLIB=$${RANLIB}" \
+-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+-	          info) \
+-	  || exit 1
++# gnattools doesn't support info.
++info-gnattools:
+ 
+ @endif gnattools
+ 
+@@ -33239,24 +33808,8 @@
+ @if gnattools
+ maybe-dvi-gnattools: dvi-gnattools
+ 
+-dvi-gnattools: \
+-    configure-gnattools 
+-	@: $(MAKE); $(unstage)
+-	@[ -f ./gnattools/Makefile ] || exit 0; \
+-	r=`${PWD_COMMAND}`; export r; \
+-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+-	$(HOST_EXPORTS) \
+-	for flag in $(EXTRA_HOST_FLAGS) ; do \
+-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+-	done; \
+-	echo "Doing dvi in gnattools" ; \
+-	(cd $(HOST_SUBDIR)/gnattools && \
+-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+-	          "RANLIB=$${RANLIB}" \
+-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+-	          dvi) \
+-	  || exit 1
++# gnattools doesn't support dvi.
++dvi-gnattools:
+ 
+ @endif gnattools
+ 
+@@ -33291,24 +33844,8 @@
+ @if gnattools
+ maybe-html-gnattools: html-gnattools
+ 
+-html-gnattools: \
+-    configure-gnattools 
+-	@: $(MAKE); $(unstage)
+-	@[ -f ./gnattools/Makefile ] || exit 0; \
+-	r=`${PWD_COMMAND}`; export r; \
+-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+-	$(HOST_EXPORTS) \
+-	for flag in $(EXTRA_HOST_FLAGS) ; do \
+-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+-	done; \
+-	echo "Doing html in gnattools" ; \
+-	(cd $(HOST_SUBDIR)/gnattools && \
+-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+-	          "RANLIB=$${RANLIB}" \
+-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+-	          html) \
+-	  || exit 1
++# gnattools doesn't support html.
++html-gnattools:
+ 
+ @endif gnattools
+ 
+@@ -33317,24 +33854,8 @@
+ @if gnattools
+ maybe-TAGS-gnattools: TAGS-gnattools
+ 
+-TAGS-gnattools: \
+-    configure-gnattools 
+-	@: $(MAKE); $(unstage)
+-	@[ -f ./gnattools/Makefile ] || exit 0; \
+-	r=`${PWD_COMMAND}`; export r; \
+-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+-	$(HOST_EXPORTS) \
+-	for flag in $(EXTRA_HOST_FLAGS) ; do \
+-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+-	done; \
+-	echo "Doing TAGS in gnattools" ; \
+-	(cd $(HOST_SUBDIR)/gnattools && \
+-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+-	          "RANLIB=$${RANLIB}" \
+-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+-	          TAGS) \
+-	  || exit 1
++# gnattools doesn't support TAGS.
++TAGS-gnattools:
+ 
+ @endif gnattools
+ 
+@@ -33343,25 +33864,8 @@
+ @if gnattools
+ maybe-install-info-gnattools: install-info-gnattools
+ 
+-install-info-gnattools: \
+-    configure-gnattools \
+-    info-gnattools 
+-	@: $(MAKE); $(unstage)
+-	@[ -f ./gnattools/Makefile ] || exit 0; \
+-	r=`${PWD_COMMAND}`; export r; \
+-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+-	$(HOST_EXPORTS) \
+-	for flag in $(EXTRA_HOST_FLAGS) ; do \
+-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+-	done; \
+-	echo "Doing install-info in gnattools" ; \
+-	(cd $(HOST_SUBDIR)/gnattools && \
+-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+-	          "RANLIB=$${RANLIB}" \
+-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+-	          install-info) \
+-	  || exit 1
++# gnattools doesn't support install-info.
++install-info-gnattools:
+ 
+ @endif gnattools
+ 
+@@ -33397,24 +33901,8 @@
+ @if gnattools
+ maybe-installcheck-gnattools: installcheck-gnattools
+ 
+-installcheck-gnattools: \
+-    configure-gnattools 
+-	@: $(MAKE); $(unstage)
+-	@[ -f ./gnattools/Makefile ] || exit 0; \
+-	r=`${PWD_COMMAND}`; export r; \
+-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+-	$(HOST_EXPORTS) \
+-	for flag in $(EXTRA_HOST_FLAGS) ; do \
+-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+-	done; \
+-	echo "Doing installcheck in gnattools" ; \
+-	(cd $(HOST_SUBDIR)/gnattools && \
+-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+-	          "RANLIB=$${RANLIB}" \
+-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+-	          installcheck) \
+-	  || exit 1
++# gnattools doesn't support installcheck.
++installcheck-gnattools:
+ 
+ @endif gnattools
+ 
+@@ -40953,13 +41441,8 @@
+ @if target-libada
+ maybe-check-target-libada: check-target-libada
+ 
++# Dummy target for uncheckable module.
+ check-target-libada:
+-	@: $(MAKE); $(unstage)
+-	@r=`${PWD_COMMAND}`; export r; \
+-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+-	$(NORMAL_TARGET_EXPORTS) \
+-	(cd $(TARGET_SUBDIR)/libada && \
+-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
+ 
+ @endif target-libada
+ 
+@@ -40968,13 +41451,8 @@
+ @if target-libada
+ maybe-install-target-libada: install-target-libada
+ 
+-install-target-libada: installdirs
+-	@: $(MAKE); $(unstage)
+-	@r=`${PWD_COMMAND}`; export r; \
+-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+-	$(NORMAL_TARGET_EXPORTS) \
+-	(cd $(TARGET_SUBDIR)/libada && \
+-	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
++# Dummy target for uninstallable.
++install-target-libada:
+ 
+ @endif target-libada
+ 
+@@ -40985,24 +41463,8 @@
+ @if target-libada
+ maybe-info-target-libada: info-target-libada
+ 
+-info-target-libada: \
+-    configure-target-libada 
+-	@: $(MAKE); $(unstage)
+-	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
+-	r=`${PWD_COMMAND}`; export r; \
+-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+-	$(NORMAL_TARGET_EXPORTS) \
+-	echo "Doing info in $(TARGET_SUBDIR)/libada" ; \
+-	for flag in $(EXTRA_TARGET_FLAGS); do \
+-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+-	done; \
+-	(cd $(TARGET_SUBDIR)/libada && \
+-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+-	          "RANLIB=$${RANLIB}" \
+-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+-	           info) \
+-	  || exit 1
++# libada doesn't support info.
++info-target-libada:
+ 
+ @endif target-libada
+ 
+@@ -41011,24 +41473,8 @@
+ @if target-libada
+ maybe-dvi-target-libada: dvi-target-libada
+ 
+-dvi-target-libada: \
+-    configure-target-libada 
+-	@: $(MAKE); $(unstage)
+-	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
+-	r=`${PWD_COMMAND}`; export r; \
+-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+-	$(NORMAL_TARGET_EXPORTS) \
+-	echo "Doing dvi in $(TARGET_SUBDIR)/libada" ; \
+-	for flag in $(EXTRA_TARGET_FLAGS); do \
+-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+-	done; \
+-	(cd $(TARGET_SUBDIR)/libada && \
+-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+-	          "RANLIB=$${RANLIB}" \
+-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+-	           dvi) \
+-	  || exit 1
++# libada doesn't support dvi.
++dvi-target-libada:
+ 
+ @endif target-libada
+ 
+@@ -41063,24 +41509,8 @@
+ @if target-libada
+ maybe-html-target-libada: html-target-libada
+ 
+-html-target-libada: \
+-    configure-target-libada 
+-	@: $(MAKE); $(unstage)
+-	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
+-	r=`${PWD_COMMAND}`; export r; \
+-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+-	$(NORMAL_TARGET_EXPORTS) \
+-	echo "Doing html in $(TARGET_SUBDIR)/libada" ; \
+-	for flag in $(EXTRA_TARGET_FLAGS); do \
+-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+-	done; \
+-	(cd $(TARGET_SUBDIR)/libada && \
+-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+-	          "RANLIB=$${RANLIB}" \
+-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+-	           html) \
+-	  || exit 1
++# libada doesn't support html.
++html-target-libada:
+ 
+ @endif target-libada
+ 
+@@ -41089,24 +41519,8 @@
+ @if target-libada
+ maybe-TAGS-target-libada: TAGS-target-libada
+ 
+-TAGS-target-libada: \
+-    configure-target-libada 
+-	@: $(MAKE); $(unstage)
+-	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
+-	r=`${PWD_COMMAND}`; export r; \
+-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+-	$(NORMAL_TARGET_EXPORTS) \
+-	echo "Doing TAGS in $(TARGET_SUBDIR)/libada" ; \
+-	for flag in $(EXTRA_TARGET_FLAGS); do \
+-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+-	done; \
+-	(cd $(TARGET_SUBDIR)/libada && \
+-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+-	          "RANLIB=$${RANLIB}" \
+-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+-	           TAGS) \
+-	  || exit 1
++# libada doesn't support TAGS.
++TAGS-target-libada:
+ 
+ @endif target-libada
+ 
+@@ -41115,25 +41529,8 @@
+ @if target-libada
+ maybe-install-info-target-libada: install-info-target-libada
+ 
+-install-info-target-libada: \
+-    configure-target-libada \
+-    info-target-libada 
+-	@: $(MAKE); $(unstage)
+-	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
+-	r=`${PWD_COMMAND}`; export r; \
+-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+-	$(NORMAL_TARGET_EXPORTS) \
+-	echo "Doing install-info in $(TARGET_SUBDIR)/libada" ; \
+-	for flag in $(EXTRA_TARGET_FLAGS); do \
+-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+-	done; \
+-	(cd $(TARGET_SUBDIR)/libada && \
+-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+-	          "RANLIB=$${RANLIB}" \
+-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+-	           install-info) \
+-	  || exit 1
++# libada doesn't support install-info.
++install-info-target-libada:
+ 
+ @endif target-libada
+ 
+@@ -41169,24 +41566,8 @@
+ @if target-libada
+ maybe-installcheck-target-libada: installcheck-target-libada
+ 
+-installcheck-target-libada: \
+-    configure-target-libada 
+-	@: $(MAKE); $(unstage)
+-	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \
+-	r=`${PWD_COMMAND}`; export r; \
+-	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+-	$(NORMAL_TARGET_EXPORTS) \
+-	echo "Doing installcheck in $(TARGET_SUBDIR)/libada" ; \
+-	for flag in $(EXTRA_TARGET_FLAGS); do \
+-	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+-	done; \
+-	(cd $(TARGET_SUBDIR)/libada && \
+-	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+-	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+-	          "RANLIB=$${RANLIB}" \
+-	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
+-	           installcheck) \
+-	  || exit 1
++# libada doesn't support installcheck.
++installcheck-target-libada:
+ 
+ @endif target-libada
+ 
+@@ -43447,7 +43828,7 @@
+ all-stageprofile-libcpp: maybe-all-stageprofile-intl
+ all-stagefeedback-libcpp: maybe-all-stagefeedback-intl
+ all-fixincludes: maybe-all-libiberty
+-all-gnattools: maybe-all-target-libada
++all-gnattools: maybe-all-libada
+ configure-gdb: maybe-configure-intl
+ configure-gdb: maybe-configure-sim
+ all-gdb: maybe-all-intl
--- gcj-4.2-4.2-20070707.orig/debian/patches/pr20218-mips.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/pr20218-mips.dpatch
@@ -0,0 +1,243 @@
+#! /bin/sh -e
+
+# DP: Backport from mainline for PR middle-end/20218, mips part.
+
+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/
+2007-01-17  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* config/mips/mips-protos.h (mips_output_external): Make it
+	return void.
+	* config/mips/iris.h (TARGET_ASM_EXTERNAL_LIBCALL): Removed.
+	* config/mips/mips.c (irix_output_external_libcall): Likewise.
+	(extern_list): Likewise.
+	(extern_head): Likewise.
+	(TARGET_ASM_FILE_END): Likewise.
+	(mips_file_end): Likewise.
+	(mips_output_external): Rewritten.
+
+Index: gcc/config/mips/iris.h
+===================================================================
+--- gcc/config/mips/iris.h	(revision 120822)
++++ gcc/config/mips/iris.h	(working copy)
+@@ -61,10 +61,6 @@ #define ASM_DECLARE_OBJECT_NAME mips_dec
+ #undef ASM_FINISH_DECLARE_OBJECT
+ #define ASM_FINISH_DECLARE_OBJECT mips_finish_declare_object
+ 
+-/* Also do this for libcalls.  */
+-#undef TARGET_ASM_EXTERNAL_LIBCALL
+-#define TARGET_ASM_EXTERNAL_LIBCALL irix_output_external_libcall
+-
+ /* The linker needs a space after "-o".  */
+ #define SWITCHES_NEED_SPACES "o"
+ 
+Index: gcc/config/mips/mips-protos.h
+===================================================================
+--- gcc/config/mips/mips-protos.h	(revision 120822)
++++ gcc/config/mips/mips-protos.h	(working copy)
+@@ -197,7 +197,7 @@ extern HOST_WIDE_INT mips_debugger_offse
+ 
+ extern void print_operand (FILE *, rtx, int);
+ extern void print_operand_address (FILE *, rtx);
+-extern int mips_output_external (FILE *, tree, const char *);
++extern void mips_output_external (FILE *, tree, const char *);
+ extern void mips_output_filename (FILE *, const char *);
+ extern void mips_output_ascii (FILE *, const char *, size_t, const char *);
+ extern void mips_output_aligned_bss (FILE *, tree, const char *,
+Index: gcc/config/mips/mips.c
+===================================================================
+--- gcc/config/mips/mips.c	(revision 120822)
++++ gcc/config/mips/mips.c	(working copy)
+@@ -303,11 +303,7 @@ static void mips_set_tune (const struct 
+ static bool mips_handle_option (size_t, const char *, int);
+ static struct machine_function *mips_init_machine_status (void);
+ static void print_operand_reloc (FILE *, rtx, const char **);
+-#if TARGET_IRIX
+-static void irix_output_external_libcall (rtx);
+-#endif
+ static void mips_file_start (void);
+-static void mips_file_end (void);
+ static bool mips_rewrite_small_data_p (rtx);
+ static int mips_small_data_pattern_1 (rtx *, void *);
+ static int mips_rewrite_small_data_1 (rtx *, void *);
+@@ -552,19 +548,6 @@ int sdb_label_count = 0;
+ /* Next label # for each statement for Silicon Graphics IRIS systems.  */
+ int sym_lineno = 0;
+ 
+-/* Linked list of all externals that are to be emitted when optimizing
+-   for the global pointer if they haven't been declared by the end of
+-   the program with an appropriate .comm or initialization.  */
+-
+-struct extern_list GTY (())
+-{
+-  struct extern_list *next;	/* next external */
+-  const char *name;		/* name of the external */
+-  int size;			/* size in bytes */
+-};
+-
+-static GTY (()) struct extern_list *extern_head = 0;
+-
+ /* Name of the file containing the current function.  */
+ const char *current_function_file = "";
+ 
+@@ -1144,9 +1127,7 @@ #define TARGET_IN_SMALL_DATA_P mips_in_s
+ #define TARGET_MACHINE_DEPENDENT_REORG mips_reorg
+ 
+ #undef TARGET_ASM_FILE_START
+-#undef TARGET_ASM_FILE_END
+ #define TARGET_ASM_FILE_START mips_file_start
+-#define TARGET_ASM_FILE_END mips_file_end
+ #undef TARGET_ASM_FILE_START_FILE_DIRECTIVE
+ #define TARGET_ASM_FILE_START_FILE_DIRECTIVE true
+ 
+@@ -5786,48 +5767,38 @@ print_operand_address (FILE *file, rtx x
+    the -G limit but declared by the user to be in a section other
+    than .sbss or .sdata.  */
+ 
+-int
+-mips_output_external (FILE *file ATTRIBUTE_UNUSED, tree decl, const char *name)
+-{
+-  register struct extern_list *p;
+-
+-  if (!TARGET_EXPLICIT_RELOCS && mips_in_small_data_p (decl))
+-    {
+-      p = (struct extern_list *) ggc_alloc (sizeof (struct extern_list));
+-      p->next = extern_head;
+-      p->name = name;
+-      p->size = int_size_in_bytes (TREE_TYPE (decl));
+-      extern_head = p;
+-    }
+-
+-  if (TARGET_IRIX && mips_abi == ABI_32 && TREE_CODE (decl) == FUNCTION_DECL)
+-    {
+-      p = (struct extern_list *) ggc_alloc (sizeof (struct extern_list));
+-      p->next = extern_head;
+-      p->name = name;
+-      p->size = -1;
+-      extern_head = p;
+-    }
+-
+-  return 0;
+-}
+-
+-#if TARGET_IRIX
+-static void
+-irix_output_external_libcall (rtx fun)
++void
++mips_output_external (FILE *file, tree decl, const char *name)
+ {
+-  register struct extern_list *p;
++  default_elf_asm_output_external (file, decl, name);
+ 
+-  if (mips_abi == ABI_32)
+-    {
+-      p = (struct extern_list *) ggc_alloc (sizeof (struct extern_list));
+-      p->next = extern_head;
+-      p->name = XSTR (fun, 0);
+-      p->size = -1;
+-      extern_head = p;
++  /* We output the name if and only if TREE_SYMBOL_REFERENCED is
++     set in order to avoid putting out names that are never really
++     used. */
++  if (TREE_SYMBOL_REFERENCED (DECL_ASSEMBLER_NAME (decl)))
++    {
++      if (!TARGET_EXPLICIT_RELOCS && mips_in_small_data_p (decl))
++	{
++	  fputs ("\t.extern\t", file);
++	  assemble_name (file, name);
++	  fprintf (file, ", " HOST_WIDE_INT_PRINT_DEC "\n",
++		   int_size_in_bytes (TREE_TYPE (decl)));
++	}
++      else if (TARGET_IRIX
++	       && mips_abi == ABI_32
++	       && TREE_CODE (decl) == FUNCTION_DECL)
++	{
++	  /* In IRIX 5 or IRIX 6 for the O32 ABI, we must output a
++	     `.global name .text' directive for every used but
++	     undefined function.  If we don't, the linker may perform
++	     an optimization (skipping over the insns that set $gp)
++	     when it is unsafe.  */
++	  fputs ("\t.globl ", file);
++	  assemble_name (file, name);
++	  fputs (" .text\n", file);
++	}
+     }
+ }
+-#endif
+ 
+ /* Emit a new filename to a stream.  If we are smuggling stabs, try to
+    put out a MIPS ECOFF file and a stab.  */
+@@ -5989,50 +5960,6 @@ mips_output_aligned_bss (FILE *stream, t
+ }
+ #endif
+ 
+-/* Implement TARGET_ASM_FILE_END.  When using assembler macros, emit
+-   .externs for any small-data variables that turned out to be external.  */
+-
+-static void
+-mips_file_end (void)
+-{
+-  tree name_tree;
+-  struct extern_list *p;
+-
+-  if (extern_head)
+-    {
+-      fputs ("\n", asm_out_file);
+-
+-      for (p = extern_head; p != 0; p = p->next)
+-	{
+-	  name_tree = get_identifier (p->name);
+-
+-	  /* Positively ensure only one .extern for any given symbol.  */
+-	  if (!TREE_ASM_WRITTEN (name_tree)
+-	      && TREE_SYMBOL_REFERENCED (name_tree))
+-	    {
+-	      TREE_ASM_WRITTEN (name_tree) = 1;
+-	      /* In IRIX 5 or IRIX 6 for the O32 ABI, we must output a
+-		 `.global name .text' directive for every used but
+-		 undefined function.  If we don't, the linker may perform
+-		 an optimization (skipping over the insns that set $gp)
+-		 when it is unsafe.  */
+-	      if (TARGET_IRIX && mips_abi == ABI_32 && p->size == -1)
+-		{
+-		  fputs ("\t.globl ", asm_out_file);
+-		  assemble_name (asm_out_file, p->name);
+-		  fputs (" .text\n", asm_out_file);
+-		}
+-	      else
+-		{
+-		  fputs ("\t.extern\t", asm_out_file);
+-		  assemble_name (asm_out_file, p->name);
+-		  fprintf (asm_out_file, ", %d\n", p->size);
+-		}
+-	    }
+-	}
+-    }
+-}
+-
+ /* Implement ASM_OUTPUT_ALIGNED_DECL_COMMON.  This is usually the same as the
+    elfos.h version, but we also need to handle -muninit-const-in-rodata.  */
+ 
+
--- gcj-4.2-4.2-20070707.orig/debian/patches/arm-pragma-pack.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/arm-pragma-pack.dpatch
@@ -0,0 +1,91 @@
+#! /bin/sh -e
+
+# DP: Fix #pragma pack on ARM
+
+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
+
+From: Paul Brook <paul@codesourcery.com>
+Sender: gcc-patches-owner@gcc.gnu.org
+To: gcc-patches@gcc.gnu.org
+Subject: [patch] #pragma pack vs. STRUCTURE_SIZE_BOUNDARY
+Date: Sun, 22 Oct 2006 16:32:31 +0100
+
+Currently STRUCTURE_SIZE_BOUNDARY is obeyed even when
+#pragma pack(1) is in effect. By contrast __attribute__((packed)) overrides 
+STRUCTURE_SIZE_BOUNDARY.
+
+This matters when odd sized packed structs are nested inside each other.
+
+Given the purpose of #pragma pack is for compatibility with Win32, I think 
+#pragma pack(1) act the same as __attribute__((packed)).
+
+The patch below fixes this.
+Tested with cross to arm-none-eabi.
+Ok?
+
+Paul
+
+2006-10-22  Paul Brook  <paul@codesourcery.com>
+
+	gcc/
+	* stor-layout.c (start_record_layout): maximum_field_alignment
+	overrides STRUCTURE_SIZE_BOUNDARY.
+
+	gcc/testsuite/
+	* gcc.dg/pragma-pack-4.c: New test.
+
+Index: gcc/stor-layout.c
+===================================================================
+--- gcc/stor-layout.c	(revision 117906)
++++ gcc/stor-layout.c	(working copy)
+@@ -525,7 +525,15 @@ start_record_layout (tree t)
+ #ifdef STRUCTURE_SIZE_BOUNDARY
+   /* Packed structures don't need to have minimum size.  */
+   if (! TYPE_PACKED (t))
+-    rli->record_align = MAX (rli->record_align, (unsigned) STRUCTURE_SIZE_BOUNDARY);
++    {
++      unsigned tmp;
++
++      /* #pragma pack overrides STRUCTURE_SIZE_BOUNDARY.  */
++      tmp = (unsigned) STRUCTURE_SIZE_BOUNDARY;
++      if (maximum_field_alignment != 0)
++	tmp = MIN (tmp, maximum_field_alignment);
++      rli->record_align = MAX (rli->record_align, tmp);
++    }
+ #endif
+ 
+   rli->offset = size_zero_node;
+Index: gcc/testsuite/gcc.dg/pragma-pack-4.c
+===================================================================
+--- gcc/testsuite/gcc.dg/pragma-pack-4.c	(revision 0)
++++ gcc/testsuite/gcc.dg/pragma-pack-4.c	(revision 0)
+@@ -0,0 +1,10 @@
++/* Check that pragma pack overrides STRUCTURE_SIZE_BOUNDARY.  */
++/* { dg-do compile } */
++
++#pragma pack(1)
++struct S
++{
++  char a;
++};
++
++int test[sizeof(struct S) == 1 ? 1: -1];
--- gcj-4.2-4.2-20070707.orig/debian/patches/cpu-default-i486-trunk.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/cpu-default-i486-trunk.dpatch
@@ -0,0 +1,37 @@
+#! /bin/sh -e
+ 
+# DP: set default 32bit ix86 architecture to i486
+ 
+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/config/i386/i386.c~	2007-06-28 13:23:31.000000000 +0200
++++ gcc/config/i386/i386.c	2007-06-28 13:26:33.000000000 +0200
+@@ -1953,7 +1953,7 @@
+ 	     "-mtune=generic instead as appropriate.");
+ 
+   if (!ix86_arch_string)
+-    ix86_arch_string = TARGET_64BIT ? "x86-64" : "i386";
++    ix86_arch_string = TARGET_64BIT ? "x86-64" : "i486";
+   else
+     ix86_arch_specified = 1;
+   
--- gcj-4.2-4.2-20070707.orig/debian/patches/m68k-dwarf3.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/m68k-dwarf3.dpatch
@@ -0,0 +1,50 @@
+#! /bin/sh -e
+
+# All lines beginning with `# DPATCH:' are a description of the patch.
+# DP: emit correct dwarf info for cfa offset and register with -fomit-frame-pointer
+
+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 -p1 < $0
+        #cd ${dir}gcc && autoconf
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p1 < $0
+        #rm ${dir}gcc/configure
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+---
+ gcc/config/m68k/m68k.c |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+Index: gcc-4.1/gcc/config/m68k/m68k.c
+===================================================================
+--- gcc-4.1.orig/gcc/config/m68k/m68k.c
++++ gcc-4.1/gcc/config/m68k/m68k.c
+@@ -604,10 +604,12 @@ m68k_output_function_prologue (FILE *str
+ 
+       if (dwarf2out_do_frame ())
+ 	{
+-	  cfa_offset += current_frame.size + 4;
++	  cfa_offset += current_frame.size;
+ 	  dwarf2out_def_cfa ("", STACK_POINTER_REGNUM, cfa_offset);
+ 	}
+     } /* !frame_pointer_needed */
++  else if (dwarf2out_do_frame ())
++    dwarf2out_def_cfa ("", STACK_POINTER_REGNUM, cfa_offset);
+ 
+   if (current_frame.fpu_mask)
+     {
--- gcj-4.2-4.2-20070707.orig/debian/patches/multiarch-include.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/multiarch-include.dpatch
@@ -0,0 +1,138 @@
+#! /bin/sh -e
+
+# DP: biarch-include.dpatch
+# DP:
+# DP: Adds biarch include directories
+# DP:     /usr/local/include/<arch>-linux-gnu
+# DP:     /usr/include/<arch>-linux-gnu
+# DP: to the system include paths, depending on 32/64 bit mode.
+
+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
+
+Index: gcc/cppdefault.c
+===================================================================
+--- gcc/cppdefault.c	(revision 112832)
++++ gcc/cppdefault.c	(working copy)
+@@ -60,6 +60,7 @@
+ #endif
+ #ifdef LOCAL_INCLUDE_DIR
+     /* /usr/local/include comes before the fixincluded header files.  */
++    { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 },
+     { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 0 },
+ #endif
+ #ifdef PREFIX_INCLUDE_DIR
+@@ -83,6 +84,7 @@
+ #endif
+ #ifdef STANDARD_INCLUDE_DIR
+     /* /usr/include comes dead last.  */
++    { STANDARD_INCLUDE_DIR, STANDARD_INCLUDE_COMPONENT, 0, 0, 1, 2 },
+     { STANDARD_INCLUDE_DIR, STANDARD_INCLUDE_COMPONENT, 0, 0, 1, 0 },
+ #endif
+     { 0, 0, 0, 0, 0, 0 }
+Index: gcc/c-incpath.c
+===================================================================
+--- gcc/c-incpath.c	(revision 112832)
++++ gcc/c-incpath.c	(working copy)
+@@ -30,6 +30,7 @@
+ #include "intl.h"
+ #include "c-incpath.h"
+ #include "cppdefault.h"
++#include "errors.h"
+ 
+ /* Windows does not natively support inodes, and neither does MSDOS.
+    Cygwin's emulation can generate non-unique inodes, so don't use it.
+@@ -121,6 +121,31 @@
+     }
+ }
+ 
++struct multiarch_mapping
++{
++  const char *const multilib;
++  const char *const multiarch;
++};
++
++const struct multiarch_mapping multiarch_mappings[]
++= {
++#include "multiarch.inc"
++  { 0, 0 }
++};
++
++static const char*
++multilib_to_multiarch (const char *imultilib)
++{
++  const struct multiarch_mapping *p;
++
++  for (p = multiarch_mappings; p->multiarch; p++)
++    {
++      if (!strcmp(p->multilib, imultilib ? imultilib : ""))
++	return p->multiarch;
++    }
++  internal_error("no multiarch mapping for multilib (%s)\n", imultilib);
++}
++
+ /* Append the standard include chain defined in cppdefault.c.  */
+ static void
+ add_standard_paths (const char *sysroot, const char *iprefix,
+@@ -128,6 +153,7 @@
+ {
+   const struct default_include *p;
+   size_t len;
++  const char *multiarch;
+ 
+   if (iprefix && (len = cpp_GCC_INCLUDE_DIR_len) != 0)
+     {
+@@ -146,8 +172,15 @@
+ 	      if (!strncmp (p->fname, cpp_GCC_INCLUDE_DIR, len))
+ 		{
+ 		  char *str = concat (iprefix, p->fname + len, NULL);
+-		  if (p->multilib && imultilib)
++		  if (p->multilib == 1 && imultilib)
+ 		    str = concat (str, dir_separator_str, imultilib, NULL);
++		  if (p->multilib == 2)
++		    {
++		      multiarch = multilib_to_multiarch (imultilib);
++		      if (!multiarch)
++			continue;
++		      str = concat (str, dir_separator_str, multiarch, NULL);
++		    }
+ 		  add_path (str, SYSTEM, p->cxx_aware, false);
+ 		}
+ 	    }
+@@ -166,9 +199,17 @@
+ 	  else
+ 	    str = update_path (p->fname, p->component);
+ 
+-	  if (p->multilib && imultilib)
++	  if (p->multilib == 1 && imultilib)
+ 	    str = concat (str, dir_separator_str, imultilib, NULL);
+ 
++	  if (p->multilib == 2)
++	    {
++	      multiarch = multilib_to_multiarch (imultilib);
++	      if (!multiarch)
++		continue;
++	      str = concat (str, dir_separator_str, multiarch, NULL);
++	    }
++
+ 	  add_path (str, SYSTEM, p->cxx_aware, false);
+ 	}
+     }
--- gcj-4.2-4.2-20070707.orig/debian/patches/m68k-fpcompare.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/m68k-fpcompare.dpatch
@@ -0,0 +1,176 @@
+#! /bin/sh -e
+
+# All lines beginning with `# DPATCH:' are a description of the patch.
+# DP: bring fp compare early to its desired form to relieve reload,
+# DP: allow any fp constant during and after reload (even special constants)
+# DP: in case reload can't find a free register for them.
+
+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 -p1 < $0
+        #cd ${dir}gcc && autoconf
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p1 < $0
+        #rm ${dir}gcc/configure
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+---
+
+ gcc/config/m68k/m68k.c        |    3 +
+ gcc/config/m68k/m68k.md       |   86 ++++++------------------------------------
+ gcc/config/m68k/predicates.md |    7 +++
+ 3 files changed, 24 insertions(+), 72 deletions(-)
+
+Index: gcc-4.1/gcc/config/m68k/m68k.c
+===================================================================
+--- gcc-4.1.orig/gcc/config/m68k/m68k.c
++++ gcc-4.1/gcc/config/m68k/m68k.c
+@@ -2467,6 +2467,9 @@ notice_update_cc (rtx exp, rtx insn)
+   if (((cc_status.value1 && FP_REG_P (cc_status.value1))
+        || (cc_status.value2 && FP_REG_P (cc_status.value2))))
+     cc_status.flags = CC_IN_68881;
++  if (cc_status.value2 && GET_CODE (cc_status.value2) == COMPARE
++      && GET_MODE_CLASS (GET_MODE (XEXP (cc_status.value2, 0))) == MODE_FLOAT)
++    cc_status.flags = CC_IN_68881;
+ }
+ 
+ const char *
+Index: gcc-4.1/gcc/config/m68k/m68k.md
+===================================================================
+--- gcc-4.1.orig/gcc/config/m68k/m68k.md
++++ gcc-4.1/gcc/config/m68k/m68k.md
+@@ -408,59 +408,26 @@
+   return "cmp%.b %d1,%d0";
+ })
+ 
+-(define_expand "cmpdf"
+-  [(set (cc0)
+-	(compare (match_operand:DF 0 "general_operand" "")
+-		 (match_operand:DF 1 "general_operand" "")))]
+-  "TARGET_68881"
+-{
+-  m68k_last_compare_had_fp_operands = 1;
+-})
++(define_mode_macro F [XF DF SF])
++(define_mode_attr F_fmt [(XF "%.x") (DF "%.d") (SF "%.s")])
++(define_mode_attr F_c [(XF "mF") (DF "mF") (SF "mdF")])
+ 
+-(define_insn ""
++(define_expand "cmp<mode>"
+   [(set (cc0)
+-	(compare (match_operand:DF 0 "general_operand" "f,mG")
+-		 (match_operand:DF 1 "general_operand" "fmG,f")))]
++	(compare (match_operand:F 0 "register_operand" "")
++		 (match_operand:F 1 "fp_src_operand" "")))]
+   "TARGET_68881"
+-{
+-  cc_status.flags = CC_IN_68881;
+-  if (REG_P (operands[0]))
+-    {
+-      if (REG_P (operands[1]))
+-	return "fcmp%.x %1,%0";
+-      else
+-        return "fcmp%.d %f1,%0";
+-    }
+-  cc_status.flags |= CC_REVERSED;
+-  return "fcmp%.d %f0,%1";
+-})
+-
+-(define_expand "cmpsf"
+- [(set (cc0)
+-       (compare (match_operand:SF 0 "general_operand" "")
+-		(match_operand:SF 1 "general_operand" "")))]
+- "TARGET_68881"
+-{
+-  m68k_last_compare_had_fp_operands = 1;
+-})
++  "m68k_last_compare_had_fp_operands = 1;")
+ 
+-(define_insn ""
++(define_insn "*cmp<mode>"
+   [(set (cc0)
+-	(compare (match_operand:SF 0 "general_operand" "f,mdG")
+-		 (match_operand:SF 1 "general_operand" "fmdG,f")))]
++	(compare (match_operand:F 0 "register_operand" "f,f")
++		 (match_operand:F 1 "fp_src_operand" "f,<F_c>")))]
+   "TARGET_68881"
+-{
+-  cc_status.flags = CC_IN_68881;
+-  if (FP_REG_P (operands[0]))
+-    {
+-      if (FP_REG_P (operands[1]))
+-	return "fcmp%.x %1,%0";
+-      else
+-        return "fcmp%.s %f1,%0";
+-    }
+-  cc_status.flags |= CC_REVERSED;
+-  return "fcmp%.s %f0,%1";
+-})
++  "@
++   fcmp%.x %1,%0
++   fcmp<F_fmt> %f1,%0")
++
+ 
+ ;; Recognizers for btst instructions.
+ 
+@@ -6819,31 +6786,6 @@
+   return "ftst%.x %0";
+ })
+ 
+-(define_expand "cmpxf"
+-  [(set (cc0)
+-	(compare (match_operand:XF 0 "nonimmediate_operand" "")
+-		 (match_operand:XF 1 "nonimmediate_operand" "")))]
+-  "TARGET_68881"
+-  "m68k_last_compare_had_fp_operands = 1;")
+-
+-(define_insn ""
+-  [(set (cc0)
+-	(compare (match_operand:XF 0 "nonimmediate_operand" "f,m")
+-		 (match_operand:XF 1 "nonimmediate_operand" "fm,f")))]
+-  "TARGET_68881"
+-{
+-  cc_status.flags = CC_IN_68881;
+-  if (REG_P (operands[0]))
+-    {
+-      if (REG_P (operands[1]))
+-	return "fcmp%.x %1,%0";
+-      else
+-        return "fcmp%.x %f1,%0";
+-    }
+-  cc_status.flags |= CC_REVERSED;
+-  return "fcmp%.x %f0,%1";
+-})
+-
+ (define_insn "extendsfxf2"
+   [(set (match_operand:XF 0 "nonimmediate_operand" "=fm,f")
+ 	(float_extend:XF (match_operand:SF 1 "general_operand" "f,rmF")))]
+Index: gcc-4.1/gcc/config/m68k/predicates.md
+===================================================================
+--- gcc-4.1.orig/gcc/config/m68k/predicates.md
++++ gcc-4.1/gcc/config/m68k/predicates.md
+@@ -194,3 +194,10 @@
+ {
+   return MEM_P (op) && GET_CODE (XEXP (op, 0)) == PRE_DEC;
+ })
++
++(define_predicate "fp_src_operand"
++  (match_operand 0 "general_src_operand")
++{
++  return !CONSTANT_P (op) || !standard_68881_constant_p (op)
++	 || reload_completed || reload_in_progress;
++})
--- gcj-4.2-4.2-20070707.orig/debian/patches/libjava-examples.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/libjava-examples.dpatch
@@ -0,0 +1,114 @@
+#! /bin/sh -e
+
+# DP: Fix build for libjava/classpath/examples
+
+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
+
+
+2007-07-06  Matthias Klose  <doko@ubuntu.com>
+
+	* examples/Makefile.am: Use the just built compiler to build
+	the examples.
+	* examples/Makefile.in: Regenerate.
+
+Index: libjava/classpath/examples/Makefile.in
+===================================================================
+--- libjava/classpath/examples/Makefile.in	(revision 126369)
++++ libjava/classpath/examples/Makefile.in	(working copy)
+@@ -317,19 +317,13 @@
+ target_vendor = @target_vendor@
+ toolexeclibdir = @toolexeclibdir@
+ vm_classes = @vm_classes@
+-GLIBJ_CLASSPATH = '$(top_builddir)/lib':'$(top_builddir)/lib/glibj.zip':'$(top_builddir)/tools/tools.zip'
+-@FOUND_ECJ_FALSE@@FOUND_JAVAC_TRUE@JCOMPILER = $(JAVAC) -encoding UTF-8 -bootclasspath $(GLIBJ_CLASSPATH) -classpath .
++GLIBJ_BOOTCLASSPATH = '$(top_srcdir)/lib'
++GLIBJ_CLASSPATH = $(srcdir)/asm:$(top_srcdir)/tools
++@FOUND_ECJ_FALSE@@FOUND_GCJ_FALSE@@FOUND_JAVAC_TRUE@JCOMPILER = $(JAVAC) -encoding UTF-8 -bootclasspath $(GLIBJ_CLASSPATH) -classpath .:$(GLIBJ_CLASSPATH)
++@FOUND_ECJ_TRUE@@FOUND_GCJ_FALSE@JCOMPILER = $(ECJ) -1.5 -encoding UTF-8 -warn:-deprecation,serial,typeHiding,unchecked,unused,varargsCast -bootclasspath $(GLIBJ_CLASSPATH) -classpath .:$(GLIBJ_CLASSPATH)
+ 
+ # Setup the compiler to use the GNU Classpath library we just build
+-#if FOUND_GCJ
+-#JCOMPILER = $(GCJ) --bootclasspath '$(top_builddir)/lib' --classpath . -C
+-#else
+-#if FOUND_JIKES
+-#JCOMPILER = $(JIKES) -bootclasspath '' -extdirs '' -sourcepath '' --classpath $(top_builddir)/lib:.
+-#else
+-@FOUND_ECJ_TRUE@JCOMPILER = $(ECJ) -1.5 -encoding UTF-8 -warn:-deprecation,serial,typeHiding,unchecked,unused,varargsCast -bootclasspath $(GLIBJ_CLASSPATH) -classpath .
+-#endif
+-#endif
++@FOUND_GCJ_TRUE@JCOMPILER = $(GCJ) -C -encoding UTF-8 -bootclasspath $(GLIBJ_BOOTCLASSPATH) -classpath $(GLIBJ_CLASSPATH):.
+ 
+ # All our example java source files
+ EXAMPLE_JAVA_FILES = $(srcdir)/gnu/classpath/examples/*/*.java $(srcdir)/gnu/classpath/examples/*/*/*.java $(srcdir)/gnu/classpath/examples/*/*/*/*.java
+@@ -558,7 +552,7 @@
+ 	uninstall uninstall-am uninstall-exampleDATA uninstall-info-am \
+ 	uninstall-local
+ 
+-@FOUND_ECJ_FALSE@@FOUND_JAVAC_FALSE@error dunno how to setup the JCOMPILER and compile
++@FOUND_ECJ_FALSE@@FOUND_GCJ_FALSE@@FOUND_JAVAC_FALSE@error dunno how to setup the JCOMPILER and compile
+ 
+ # Make sure all sources and icons are also installed so users can use them.
+ # (Be careful to strip off the srcdir part of the path when installing.)
+Index: libjava/classpath/examples/Makefile.am
+===================================================================
+--- libjava/classpath/examples/Makefile.am	(revision 126369)
++++ libjava/classpath/examples/Makefile.am	(working copy)
+@@ -1,24 +1,24 @@
+ ## Input file for automake to generate the Makefile.in used by configure
+-GLIBJ_CLASSPATH='$(top_builddir)/lib':'$(top_builddir)/lib/glibj.zip':'$(top_builddir)/tools/tools.zip'
+ 
++## GCJ LOCAL: use srcdir to find core classes.
++GLIBJ_BOOTCLASSPATH='$(top_srcdir)/lib'
++GLIBJ_CLASSPATH=$(srcdir)/asm:$(top_srcdir)/tools
++## END GCJ LOCAL
++
+ # Setup the compiler to use the GNU Classpath library we just build
+-#if FOUND_GCJ
+-#JCOMPILER = $(GCJ) --bootclasspath '$(top_builddir)/lib' --classpath . -C
+-#else
+-#if FOUND_JIKES
+-#JCOMPILER = $(JIKES) -bootclasspath '' -extdirs '' -sourcepath '' --classpath $(top_builddir)/lib:.
+-#else
++if FOUND_GCJ
++JCOMPILER = $(GCJ) -C -encoding UTF-8 -bootclasspath $(GLIBJ_BOOTCLASSPATH) -classpath $(GLIBJ_CLASSPATH):.
++else
+ if FOUND_ECJ
+-JCOMPILER = $(ECJ) -1.5 -encoding UTF-8 -warn:-deprecation,serial,typeHiding,unchecked,unused,varargsCast -bootclasspath $(GLIBJ_CLASSPATH) -classpath .
++JCOMPILER = $(ECJ) -1.5 -encoding UTF-8 -warn:-deprecation,serial,typeHiding,unchecked,unused,varargsCast -bootclasspath $(GLIBJ_CLASSPATH) -classpath .:$(GLIBJ_CLASSPATH)
+ else
+ if FOUND_JAVAC
+-JCOMPILER = $(JAVAC) -encoding UTF-8 -bootclasspath $(GLIBJ_CLASSPATH) -classpath .
++JCOMPILER = $(JAVAC) -encoding UTF-8 -bootclasspath $(GLIBJ_CLASSPATH) -classpath .:$(GLIBJ_CLASSPATH)
+ else
+ error dunno how to setup the JCOMPILER and compile
+-#endif
+-#endif
+-endif
+-endif
++endif # FOUND_JAVAC
++endif # FOUND_ECJ
++endif # FOUND_GCJ
+ 
+ # All our example java source files
+ EXAMPLE_JAVA_FILES = $(srcdir)/gnu/classpath/examples/*/*.java $(srcdir)/gnu/classpath/examples/*/*/*.java $(srcdir)/gnu/classpath/examples/*/*/*/*.java
--- gcj-4.2-4.2-20070707.orig/debian/patches/config-ml.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/config-ml.dpatch
@@ -0,0 +1,220 @@
+#! /bin/sh -e
+
+# DP: disable some biarch libraries for biarch builds
+
+if [ $# -eq 3 ] && [ "$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
+
+--- config-ml.in.orig	2005-11-22 14:42:01.208516952 +0100
++++ config-ml.in	2005-11-22 14:46:39.072275240 +0100
+@@ -215,6 +215,13 @@
+   fi
+ done
+ 
++if [ -z "$biarch_multidir_names" ]; then
++  biarch_multidir_names="libiberty libstdc++-v3 libgfortran libmudflap libssp libffi libobjc"
++  echo "WARNING: biarch_multidir_names is unset. Use default value:"
++  echo "  $biarch_multidir_names"
++fi
++ml_srcbase=`basename $ml_realsrcdir`
++
+ # Target libraries are configured for the host they run on, so we check
+ # $host here, not $target.
+ 
+@@ -301,6 +308,26 @@
+ 	  done
+ 	fi
+ 	;;
++i[34567]86-*-*)
++	case " $multidirs " in
++	*" 64 "*)
++	  ac_configure_args="${ac_configure_args} --host=x86_64-linux-gnu"
++	  # Setting $host this late is a hack.  Some directories can't
++	  # handle it, so disable them for now.
++	  old_multidirs="${multidirs}"
++	  multidirs=""
++	  for x in ${old_multidirs}; do
++	    case "$x" in
++	    *64* ) case "$biarch_multidir_names" in
++		     *"$ml_srcbase"*) multidirs="${multidirs} ${x}" ;;
++		   esac
++		   ;;
++	    *) multidirs="${multidirs} ${x}" ;;
++	  esac
++	  done
++	  ;;
++	esac
++	;;
+ m68*-*-*)
+ 	if [ x$enable_softfloat = xno ]
+ 	then
+@@ -494,16 +521,56 @@
+ 	    esac
+ 	  done
+ 	fi
++	case " $multidirs " in
++	*" 64 "*)
++	  # We will not be able to create libraries with -m64 if
++	  # we cannot even link a trivial program.  It usually
++	  # indicates the 64bit libraries are missing.
++	  if echo 'main() {}' > conftest.c &&
++	     ${CC-gcc} -m64 conftest.c -o conftest; then
++           old_multidirs="${multidirs}"
++           multidirs=""
++           for x in ${old_multidirs}; do
++             case "$x" in
++	     *64* ) case "$biarch_multidir_names" in
++		       *"$ml_srcbase"*) multidirs="${multidirs} ${x}" ;;
++		    esac ;;
++             *) multidirs="${multidirs} ${x}" ;;
++             esac
++           done
++	  else
++	    echo Could not link program with -m64, disabling it.
++	    old_multidirs="${multidirs}"
++	    multidirs=""
++	    for x in ${old_multidirs}; do
++	      case "$x" in
++	      *m64* ) : ;;
++	      *) multidirs="${multidirs} ${x}" ;;
++	      esac
++	    done
++	  fi
++	  rm -f conftest.c conftest
++	  ;;
++	esac
+ 	;;
+ sparc*-*-*)
+ 	case " $multidirs " in
+-	*" m64 "*)
++	*" 64 "*)
+ 	  # We will not be able to create libraries with -m64 if
+ 	  # we cannot even link a trivial program.  It usually
+ 	  # indicates the 64bit libraries are missing.
+ 	  if echo 'main() {}' > conftest.c &&
+ 	     ${CC-gcc} -m64 conftest.c -o conftest; then
+-	    :
++           old_multidirs="${multidirs}"
++           multidirs=""
++           for x in ${old_multidirs}; do
++             case "$x" in
++	     *64* ) case "$biarch_multidir_names" in
++		       *"$ml_srcbase"*) multidirs="${multidirs} ${x}" ;;
++		    esac ;;
++             *) multidirs="${multidirs} ${x}" ;;
++             esac
++           done
+ 	  else
+ 	    echo Could not link program with -m64, disabling it.
+ 	    old_multidirs="${multidirs}"
+@@ -519,6 +586,74 @@
+ 	  ;;
+ 	esac
+ 	;;
++x86_64*-*-*)
++	case " $multidirs " in
++	*" 32 "*)
++	  # We will not be able to create libraries with -m32 if
++	  # we cannot even link a trivial program.  It usually
++	  # indicates the 32bit libraries are missing.
++	  if echo 'main() {}' > conftest.c &&
++	     ${CC-gcc} -m32 conftest.c -o conftest; then
++	   old_multidirs="${multidirs}"
++	   multidirs=""
++	   for x in ${old_multidirs}; do
++	     case "$x" in
++	     *32* ) case "$biarch_multidir_names" in
++		       *"$ml_srcbase"*) multidirs="${multidirs} ${x}" ;;
++		    esac ;;
++	     *) multidirs="${multidirs} ${x}" ;;
++	     esac
++	   done
++	  else
++	    echo Could not link program with -m32, disabling it.
++	    old_multidirs="${multidirs}"
++	    multidirs=""
++	    for x in ${old_multidirs}; do
++	      case "$x" in
++	      *m32* ) : ;;
++	      *) multidirs="${multidirs} ${x}" ;;
++	      esac
++	    done
++	  fi
++	  rm -f conftest.c conftest
++	  ;;
++	esac
++	;;
++s390-*-*)
++	ac_configure_args="${ac_configure_args} --host=s390x-linux-gnu"
++
++	case " $multidirs " in
++	*" 64 "*)
++	  # We will not be able to create libraries with -m64 if
++	  # we cannot even link a trivial program.  It usually
++	  # indicates the 64bit libraries are missing.
++	  if echo 'main() {}' > conftest.c &&
++	     ${CC-gcc} -m64 conftest.c -o conftest; then
++	    old_multidirs="${multidirs}"
++	    multidirs=""
++	    for x in ${old_multidirs}; do
++	      case "$x" in
++	      *64* ) case "$biarch_multidir_names" in
++		        *"$ml_srcbase"*) multidirs="${multidirs} ${x}" ;;
++		     esac ;;
++	      *) multidirs="${multidirs} ${x}" ;;
++	      esac
++	    done
++	  else
++	    echo Could not link program with -m64, disabling it.
++	    old_multidirs="${multidirs}"
++	    multidirs=""
++	    for x in ${old_multidirs}; do
++	      case "$x" in
++	      *64* ) : ;;
++	      *) multidirs="${multidirs} ${x}" ;;
++	      esac
++	    done
++	  fi
++	  rm -f conftest.c conftest
++	  ;;
++	esac
++	;;
+ esac
+ 
+ # Remove extraneous blanks from multidirs.
+@@ -892,9 +1027,20 @@
+ 	fi
+     fi
+ 
++    ml_configure_args=
++    for arg in ${ac_configure_args}
++    do
++      case $arg in
++      *CC=*)  ml_configure_args=${ml_config_env} ;;
++      *CXX=*) ml_configure_args=${ml_config_env} ;;
++      *GCJ=*) ml_configure_args=${ml_config_env} ;;
++      *) ;;
++      esac
++    done
++
+     if eval ${ml_config_env} ${ml_config_shell} ${ml_recprog} \
+ 	--with-multisubdir=${ml_dir} --with-multisrctop=${multisrctop} \
+-	${ac_configure_args} ${ml_srcdiroption} ; then
++	${ac_configure_args} ${ml_configure_args} ${ml_srcdiroption} ; then
+       true
+     else
+       exit 1
--- gcj-4.2-4.2-20070707.orig/debian/patches/reporting.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/reporting.dpatch
@@ -0,0 +1,122 @@
+#! /bin/sh -e
+
+# DP: Add Debian URL for bug reporting instructions.
+
+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
+	if grep -q debian_bug_report_url ${dir}gcc/version.c; then
+	  :
+	else
+	  echo 'const char debian_bug_report_url[] = "<URL:file:///usr/share/doc/gcc-4.2/README.Bugs>";' >> ${dir}gcc/version.c
+	fi
+	;;
+    -unpatch)
+	grep -v debian_bug_report_url ${dir}gcc/version.c > ${dir}gcc/version.c.new
+	${dir}move-if-change ${dir}gcc/version.c.new ${dir}gcc/version.c
+	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/java/jcf-dump.c.old	2006-04-02 00:23:43.052345288 +0200
++++ gcc/java/jcf-dump.c	2006-04-02 00:24:17.571097640 +0200
+@@ -921,6 +921,8 @@
+   printf ("\n");
+   printf (_("For bug reporting instructions, please see:\n"
+ 	    "%s.\n"), bug_report_url);
++  printf (_("For Debian GNU/Linux specific bug reporting instructions, please see:\n"
++	    "%s.\n"), debian_bug_report_url);
+   exit (0);
+ }
+ 
+--- gcc/diagnostic.c.old	2006-04-02 00:23:43.053345136 +0200
++++ gcc/diagnostic.c	2006-04-02 00:27:15.732013064 +0200
+@@ -263,6 +263,8 @@
+       fnotice (stderr, "Please submit a full bug report,\n"
+ 	       "with preprocessed source if appropriate.\n"
+ 	       "See %s for instructions.\n", bug_report_url);
++      fnotice (stderr, "For Debian GNU/Linux specific bug reporting instructions,\n"
++	       "see %s.\n", debian_bug_report_url);
+       exit (ICE_EXIT_CODE);
+ 
+     case DK_FATAL:
+--- gcc/gcc.c.old	2006-04-02 00:23:43.068342856 +0200
++++ gcc/gcc.c	2006-04-02 00:26:35.020202200 +0200
+@@ -3001,9 +3001,11 @@
+ 	      fatal_ice ("\
+ Internal error: %s (program %s)\n\
+ Please submit a full bug report.\n\
+-See %s for instructions.",
++See %s for instructions.\n\
++For Debian GNU/Linux specific bug reporting instructions, see\n\
++%s.\n",
+ 		 	strsignal (WTERMSIG (status)), commands[i].prog,
+-		 	bug_report_url);
++			bug_report_url, debian_bug_report_url);
+ 	  }
+ 	else if (WIFEXITED (status)
+ 		 && WEXITSTATUS (status) >= MIN_FATAL_STATUS)
+@@ -6421,6 +6423,8 @@
+ 	{
+ 	  printf (_("\nFor bug reporting instructions, please see:\n"));
+ 	  printf ("%s.\n", bug_report_url);
++	  printf ("For Debian GNU/Linux specific bug reporting instructions, please see:\n");
++	  printf ("%s.\n", debian_bug_report_url);
+ 
+ 	  return (0);
+ 	}
+@@ -6713,6 +6717,8 @@
+     {
+       printf (("\nFor bug reporting instructions, please see:\n"));
+       printf ("%s\n", bug_report_url);
++      printf ("For Debian GNU/Linux specific bug reporting instructions, please see:\n");
++      printf ("%s\n", debian_bug_report_url);
+     }
+ 
+   return (signal_count != 0 ? 2
+--- gcc/gccbug.in.old	2006-04-02 00:23:43.069342704 +0200
++++ gcc/gccbug.in	2006-04-02 00:24:17.588095056 +0200
+@@ -25,10 +25,10 @@
+ VERSION=3.113
+ 
+ # The submitter-id for your site.
+-SUBMITTER=net
++SUBMITTER=net # net-debian
+ 
+ # The default mail address for PR submissions. 
+-GNATS_ADDR=gcc-gnats@gcc.gnu.org
++GNATS_ADDR="gcc-gnats@gcc.gnu.org,debian-gcc@lists.debian.org"
+ 
+ # The default release for this host.
+ # We have to guess at what program_transform_name might have done.
+--- gcc/gcov.c.old	2006-04-02 00:23:43.070342552 +0200
++++ gcc/gcov.c	2006-04-02 00:24:17.589094904 +0200
+@@ -402,6 +402,8 @@
+   fnotice (file, "  -u, --unconditional-branches    Show unconditional branch counts too\n");
+   fnotice (file, "\nFor bug reporting instructions, please see:\n%s.\n",
+ 	   bug_report_url);
++  fnotice (file, "\nFor Debian GNU/Linux specific bug reporting instructions, please see:\n%s.\n",
++	   debian_bug_report_url);
+   exit (status);
+ }
+ 
+--- gcc/version.h.old	2006-04-02 00:23:43.071342400 +0200
++++ gcc/version.h	2006-04-02 00:24:17.589094904 +0200
+@@ -2,4 +2,5 @@
+ #define GCC_VERSION_H
+ extern const char version_string[];
+ extern const char bug_report_url[];
++extern const char debian_bug_report_url[];
+ #endif /* ! GCC_VERSION_H */
--- gcj-4.2-4.2-20070707.orig/debian/patches/m68k-notice-move.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/m68k-notice-move.dpatch
@@ -0,0 +1,52 @@
+#! /bin/sh -e
+
+# All lines beginning with `# DPATCH:' are a description of the patch.
+# DP: don't set cc_status for fp move without fp register
+
+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 -p1 < $0
+        #cd ${dir}gcc && autoconf
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p1 < $0
+        #rm ${dir}gcc/configure
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+---
+
+ gcc/config/m68k/m68k.c |    6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+Index: gcc-4.1/gcc/config/m68k/m68k.c
+===================================================================
+--- gcc-4.1.orig/gcc/config/m68k/m68k.c
++++ gcc-4.1/gcc/config/m68k/m68k.c
+@@ -2618,10 +2618,12 @@ notice_update_cc (rtx exp, rtx insn)
+ 		   || GET_CODE (SET_SRC (exp)) == FLOAT_TRUNCATE
+ 		   || GET_CODE (SET_SRC (exp)) == FLOAT_EXTEND))
+ 	CC_STATUS_INIT; 
+-      /* A pair of move insns doesn't produce a useful overall cc.  */
++      /* A pair of move insns or a fp move without fp register
++         doesn't produce a useful overall cc.  */
+       else if (!FP_REG_P (SET_DEST (exp))
+ 	       && !FP_REG_P (SET_SRC (exp))
+-	       && GET_MODE_SIZE (GET_MODE (SET_SRC (exp))) > 4
++	       && (GET_MODE_SIZE (GET_MODE (SET_SRC (exp))) > 4
++		   || GET_MODE_CLASS (GET_MODE (SET_SRC (exp))) == MODE_FLOAT)
+ 	       && (GET_CODE (SET_SRC (exp)) == REG
+ 		   || GET_CODE (SET_SRC (exp)) == MEM
+ 		   || GET_CODE (SET_SRC (exp)) == CONST_DOUBLE))
--- gcj-4.2-4.2-20070707.orig/debian/patches/svn-updates.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/svn-updates.dpatch
@@ -0,0 +1,40 @@
+#! /bin/sh -e
+
+# DP: CVS updates from the 4.2 branch upto 2006xxxx.
+
+last_updated()
+{
+	cat > ${dir}LAST_UPDATED <<EOF
+Thu Jun  1 17:15:27 CEST 2006
+Thu Jun  1 15:15:27 UTC 2006 (revision 114308)
+EOF
+}
+
+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 -p1 < $0
+	last_updated
+        #cd ${dir}gcc && autoconf
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p1 < $0
+        #rm ${dir}gcc/configure
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+# diff -urN --exclude=.svn gcc_4_2_0_release gcc-4_2-branch
+# svn diff svn://gcc.gnu.org/svn/gcc/tags/gcc_4_2_0_release svn://gcc.gnu.org/svn/gcc/branches/gcc-4_2-branch
+
+
--- gcj-4.2-4.2-20070707.orig/debian/patches/amd64-biarch.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/amd64-biarch.dpatch
@@ -0,0 +1,38 @@
+#! /bin/sh -e
+ 
+# DP: Set MULTILIB_OSDIRNAMES to the correct multilib path names for amd64.
+# DP: 
+# DP: 
+ 
+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 -p1 < $0
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p1 < $0
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+--- src/gcc/config/i386/t-linux64~	2002-11-28 14:47:02.000000000 +0000
++++ src/gcc/config/i386/t-linux64	2004-06-02 16:07:30.533131301 +0000
+@@ -6,7 +6,7 @@
+ 
+ MULTILIB_OPTIONS = m64/m32
+ MULTILIB_DIRNAMES = 64 32 
+-MULTILIB_OSDIRNAMES = ../lib64 ../lib
++MULTILIB_OSDIRNAMES = ../lib ../lib32
+ 
+ LIBGCC = stmp-multilib
+ INSTALL_LIBGCC = install-multilib
--- gcj-4.2-4.2-20070707.orig/debian/patches/gpc-updates.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/gpc-updates.dpatch
@@ -0,0 +1,36 @@
+#! /bin/sh -e
+
+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/p/predef.def~	2006-02-14 08:14:19.000000000 +0100
++++ gcc/p/predef.def	2006-02-28 18:24:42.585086192 +0100
+@@ -33,6 +33,10 @@
+    The identifiers that are only attributes don't have separate
+    comments and are documented under `attribute'. */
+ 
++#if defined(noinline)
++#undef noinline
++#endif
++
+ PREDEF_ID (all,        GNU_PASCAL)          /* <export> extension (`export foo = all') */
+ PREDEF_ID (export,     E_O_PASCAL)          /* module interface export */
+ PREDEF_ID (ignorable,  GNU_PASCAL)
--- gcj-4.2-4.2-20070707.orig/debian/patches/ada-libgnatprj.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/ada-libgnatprj.dpatch
@@ -0,0 +1,1449 @@
+#! /bin/sh -e
+
+# DP: - Introduce a new shared library named libgnatprj, containing
+# DP:   the GNAT project file manager licensed under the pure GPL, for
+# DP:   use in GNAT tools, GLADE and GPS.  Link the GNAT tools against
+# DP:   this new library.
+
+# This patch seems large, but the hunks in Makefile.in are actually
+# generated from Makefile.def using autogen.
+
+# !!! Must be applied after ada-libgnatvsn.dpatch
+
+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} && autoconf2.13
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
+	rm -f ${dir}configure
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+
+--- configure.in~
++++ configure.in	2007-06-20 21:04:33.968594098 +0200
+@@ -123,7 +123,7 @@
+ 
+ # these libraries are used by various programs built for the host environment
+ #
+-host_libs="intl mmalloc libiberty opcodes bfd readline tcl tk itcl libgui zlib libcpp libdecnumber libada libgnatvsn"
++host_libs="intl mmalloc libiberty opcodes bfd readline tcl tk itcl libgui zlib libcpp libdecnumber libada libgnatvsn libgnatprj"
+ 
+ # these tools are built for the host environment
+ # Note, the powerpc-eabi build depends on sim occurring before gdb in order to
+@@ -153,6 +153,7 @@
+ 		target-libobjc \
+ 		target-libada \
+ 		target-libgnatvsn \
++		target-libgnatprj \
+ 		target-libgomp"
+ 
+ # these tools are built using the target libraries, and are intended to
+@@ -231,7 +232,7 @@
+ 
+ # Similarly, some are only suitable for cross toolchains.
+ # Remove these if host=target.
+-cross_only="target-libgloss target-newlib target-opcodes target-libada target-libgnatvsn"
++cross_only="target-libgloss target-newlib target-opcodes target-libada target-libgnatvsn target-libgnatprj"
+ 
+ case $is_cross_compiler in
+   no) skipdirs="${skipdirs} ${cross_only}" ;;
+@@ -305,7 +306,7 @@
+ ENABLE_LIBADA=$enableval,
+ ENABLE_LIBADA=yes)
+ if test "${ENABLE_LIBADA}" != "yes" ; then
+-  noconfigdirs="$noconfigdirs libgnatvsn gnattools"
++  noconfigdirs="$noconfigdirs libgnatvsn libgnatprj gnattools"
+ fi
+ 
+ AC_ARG_ENABLE(libssp,
+--- gcc/ada/config-lang.in~
++++ gcc/ada/config-lang.in	2007-06-20 21:05:06.994184936 +0200
+@@ -38,8 +38,8 @@
+ 
+ outputs=ada/Makefile
+ 
+-target_libs="target-libada target-libgnatvsn"
+-lang_dirs="libada libgnatvsn gnattools"
++target_libs="target-libada target-libgnatvsn target-libgnatprj"
++lang_dirs="libada libgnatvsn libgnatprj gnattools"
+ 
+ # Ada will not work until the front end starts emitting GIMPLE trees.
+ build_by_default=no
+--- gnattools/Makefile.in~
++++ gnattools/Makefile.in	2007-06-20 21:24:49.439989983 +0200
+@@ -37,13 +37,13 @@
+ target_noncanonical=@target_noncanonical@
+ 
+ CFLAGS=-g -O2 -Wall
+-INCLUDES = -I@srcdir@/../gcc/ada -I@srcdir@/../gcc
+ ADA_CFLAGS=-g -O2 -gnatn
+ ADA_INCLUDES=-nostdinc -I- -I. -I../gcc/ada/rts -I@srcdir@/../gcc/ada
+-ADA_INCLUDES += -aO../libgnatvsn
++ADA_INCLUDES += -aO../libgnatvsn -aO../libgnatprj
+ LIB_VERSION=$(strip $(shell grep ' Library_Version :' \
+               @srcdir@/../gcc/ada/gnatvsn.ads | sed -e 's/.*"\(.*\)".*/\1/'))
+-ADA_LIBS := -L../gcc/ada/rts -lgnat-$(LIB_VERSION) -L../libgnatvsn -lgnatvsn
++ADA_LIBS := -L../gcc/ada/rts -lgnat-$(LIB_VERSION) -L../libgnatvsn -lgnatvsn \
++-L../libgnatprj -lgnatprj
+ 
+ # We will use the just-built compiler to compile and link everything.
+ GCC=../gcc/xgcc -B../gcc/
+@@ -68,75 +68,10 @@
+ 
+ # Since we don't have gnatmake, we must specify the full list of
+ # object files necessary to build gnatmake and gnatlink.
+-# TODO: remove from these lists the objects that are part of
+-# libgnatprj.
+-GNATLINK_OBJS = \
+-ali.o \
+-butil.o \
+-fmap.o \
+-gnatlink.o \
+-indepsw.o \
+-osint.o \
+-prefix.o \
+-rident.o \
+-sdefault.o \
+-stylesw.o \
+-switch.o \
+-targparm.o \
+-validsw.o
+-
+-GNATMAKE_OBJS = \
+-ali-util.o \
+-ali.o \
+-binderr.o \
+-butil.o \
+-err_vars.o \
+-erroutc.o \
+-errutil.o \
+-fmap.o \
+-fname-sf.o \
+-fname-uf.o \
+-gnatmake.o \
+-make.o \
+-makeusg.o \
+-makeutl.o \
+-mlib-fil.o \
+-mlib-prj.o \
+-mlib-tgt.o \
+-mlib-utl.o \
+-mlib.o \
+-osint-m.o \
+-osint.o \
+-prefix.o \
+-prj-attr-pm.o \
+-prj-attr.o \
+-prj-com.o \
+-prj-dect.o \
+-prj-env.o \
+-prj-err.o \
+-prj-ext.o \
+-prj-nmsc.o \
+-prj-pars.o \
+-prj-part.o \
+-prj-proc.o \
+-prj-strt.o \
+-prj-tree.o \
+-prj-util.o \
+-prj.o \
+-rident.o \
+-scng.o \
+-sdefault.o \
+-sfn_scan.o \
+-sinput-c.o \
+-sinput-p.o \
+-styleg.o \
+-stylesw.o \
+-switch-m.o \
+-switch.o \
+-targparm.o \
+-tempdir.o \
+-usage.o \
+-validsw.o \
++GNATLINK_OBJS = gnatlink.o indepsw.o validsw.o
++
++GNATMAKE_OBJS = fname-sf.o fname-uf.o gnatmake.o make.o makeusg.o makeutl.o \
++mlib-prj.o osint-m.o usage.o validsw.o \
+ $(EXTRA_GNATMAKE_OBJS)
+ 
+ 
+@@ -151,7 +86,6 @@
+ # accessed using the vpath directive.
+ 
+ stamp-gnattools-sources:
+-	$(LN_S) ../gcc/ada/sdefault.adb .
+ 	$(foreach PAIR,$(TOOLS_TARGET_PAIRS), \
+ 	          rm -f $(word 1,$(subst <, ,$(PAIR)));\
+ 	          $(LN_S) @srcdir@/../gcc/ada/$(word 2,$(subst <, ,$(PAIR))) \
+@@ -170,19 +104,16 @@
+ vpath %.adb .:@srcdir@/../gcc/ada
+ vpath %.ads @srcdir@/../gcc/ada
+ 
+-# Because the just-built gcc is a host tool like us, we can use some
+-# of its object files, e.g. prefix.o.
+-vpath prefix.o ../gcc
+-
+ # gnatlink
+ 
+-gnatlink-static: $(GNATLINK_OBJS) b_gnatl.o link.o
++gnatlink-static: $(GNATLINK_OBJS) b_gnatl.o
+ 	$(GCC) -o $@ $^ \
++	   ../libgnatprj/libgnatprj.a \
+ 	   ../libgnatvsn/libgnatvsn.a \
+ 	   ../gcc/ada/rts/libgnat.a \
+ 	   ../libiberty/libiberty.a
+ 
+-gnatlink: $(GNATLINK_OBJS) b_gnatl.o link.o
++gnatlink: $(GNATLINK_OBJS) b_gnatl.o
+ 	$(GCC) -o $@ $^ $(ADA_LIBS) ../libiberty/libiberty.a
+ 
+ b_gnatl.o: b_gnatl.c adaint.h
+@@ -193,13 +124,14 @@
+ 
+ # gnatmake
+ 
+-gnatmake-static: $(GNATMAKE_OBJS) b_gnatm.o link.o
++gnatmake-static: $(GNATMAKE_OBJS) b_gnatm.o
+ 	$(GCC) -o $@ $(ADA_CFLAGS) $^ \
++	   ../libgnatprj/libgnatprj.a \
+ 	   ../libgnatvsn/libgnatvsn.a \
+ 	   ../gcc/ada/rts/libgnat.a \
+ 	   ../libiberty/libiberty.a
+ 
+-gnatmake: $(GNATMAKE_OBJS) b_gnatm.o link.o
++gnatmake: $(GNATMAKE_OBJS) b_gnatm.o
+ 	$(GCC) -o $@ $(ADA_CFLAGS) $^ $(ADA_LIBS) ../libiberty/libiberty.a
+ 
+ b_gnatm.o: b_gnatm.c adaint.h
+@@ -209,7 +141,8 @@
+ 	../gcc/gnatbind -C -o $@ $(ADA_INCLUDES) gnatmake.ali
+ 
+ # Other tools
+-gnatchop gnatkr:
++gnatbind gnatchop gnatclean gnatcmd gnatfind gnatkr gnatls gnatname gnatprep \
++gnatxref gprmake:
+ 	./gnatmake-static -c -b $@ $(ADA_CFLAGS) $(ADA_INCLUDES) \
+ 	   --GCC="$(GCC)" \
+ 	   --GNATBIND=../gcc/gnatbind
+@@ -220,17 +153,7 @@
+ gnat: gnatcmd
+ 	cp -lp $< $@
+ 
+-gnatbind gnatclean gnatcmd gnatfind gnatls gnatname gnatprep gnatxref gprmake: \
+-link.o prefix.o
+-	./gnatmake-static -c -b $@ $(ADA_CFLAGS) $(ADA_INCLUDES) \
+-	   --GCC="$(GCC)" \
+-	   --GNATBIND=../gcc/gnatbind
+-	./gnatlink-static -o $@ $@.ali $^ $(ADA_INCLUDES) $(ADA_LIBS) \
+-	   ../libiberty/libiberty.a \
+-	   --GCC="$(GCC) $(ADA_INCLUDES)"
+-	strip $@
+-
+-gnatbl: gnatbl.c link.o prefix.o
++gnatbl: gnatbl.c
+ 	$(GCC) -o $@ $< $(CFLAGS) \
+ 	   -I../gcc -I@srcdir@/../gcc/config -I@srcdir@/../gcc \
+ 	   -I@srcdir@/../include \
+@@ -238,18 +161,12 @@
+ 	   $(ADA_LIBS) ../libiberty/libiberty.a
+ 	strip $@
+ 
+-# Force compiling sdefault.adb, not .ads, to produce sdefault.o
+-sdefault.o: sdefault.adb
+-
+ %.o: %.adb
+ 	$(GCC) -c -o $@ $< $(ADA_CFLAGS) $(ADA_INCLUDES)
+ 
+ %.o: %.ads
+ 	$(GCC) -c -o $@ $< $(ADA_CFLAGS) $(ADA_INCLUDES)
+ 
+-%.o: %.c
+-	$(GCC) -c -o $@ $< $(CFLAGS) $(INCLUDES)
+-
+ # Other
+ # -----
+ 
+--- libgnatprj/configure~
++++ libgnatprj/configure	2006-04-19 07:54:53.000000000 +0200
+@@ -0,0 +1,34 @@
++#!/bin/sh
++
++# Minimal configure script for libgnatprj.  We're only interested in
++# a few parameters.
++
++for arg in $*; do
++    case ${arg} in
++	--build=*)
++	    build=`expr ${arg} : '--build=\(.\+\)'`;;
++	--host=*)
++	    host=`expr ${arg} : '--host=\(.\+\)'`;;
++	--target=*)
++	    target=`expr ${arg} : '--target=\(.\+\)'`;;
++	--prefix=*)
++	    prefix=`expr ${arg} : '--prefix=\(.\+\)'`;;
++	--srcdir=*)
++	    srcdir=`expr ${arg} : '--srcdir=\(.\+\)'`;;
++	*)
++	    echo "Warning: ignoring option: ${arg}"
++    esac
++done
++
++echo "build: ${build}" | tee config.log
++echo "host: ${host}" | tee -a config.log
++echo "target: ${target}" | tee -a config.log
++echo "prefix: ${prefix}" | tee -a config.log
++echo "srcdir: ${srcdir}" | tee -a config.log
++
++echo "Creating Makefile..." | tee -a config.log
++sed -e "s,@build@,${build},g" \
++    -e "s,@host@,${host},g" \
++    -e "s,@target@,${target},g" \
++    -e "s,@prefix@,${prefix},g" \
++    -e "s,@srcdir@,${srcdir},g" < ${srcdir}/Makefile.in > Makefile
+--- libgnatprj/Makefile.in~
++++ libgnatprj/Makefile.in	2006-04-19 19:28:33.000000000 +0200
+@@ -0,0 +1,177 @@
++# Makefile for libgnatprj.
++#   Copyright (c) 2006 Ludovic Brenta <ludovic@ludovic-brenta.org>
++#
++# This file 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 of the License, or
++# (at your option) any later version.
++# 
++# 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
++
++# Default target; must be first.
++all: libgnatprj
++
++.SUFFIXES:
++
++CPUS := $(shell getconf _NPROCESSORS_ONLN)
++LIB_VERSION := $(strip $(shell grep ' Library_Version :' \
++                 @srcdir@/../gcc/ada/gnatvsn.ads | \
++	         sed -e 's/.*"\(.*\)".*/\1/'))
++GCC:=../gcc/xgcc -B../gcc/
++LIBGNAT_JUST_BUILT := -nostdinc -I../gcc/ada/rts
++CFLAGS := -g -O2
++ADAFLAGS := -g -O2 -gnatn
++BASEVER := $(shell cat @srcdir@/../gcc/BASE-VER)
++DEVPHASE := $(shell cat @srcdir@/../gcc/DEV-PHASE)
++DATESTAMP := $(shell cat @srcdir@/../gcc/DATESTAMP)
++
++ifneq (@build@,@host@)
++   CFLAGS += -b @host@
++endif
++
++.PHONY: libgnatprj install
++libgnatprj: libgnatprj.so.$(LIB_VERSION) libgnatprj.a
++
++# Here we list one file per Ada unit: the body file if the unit has a
++# body, the spec file otherwise.
++PRJ_SOURCES := ali.adb ali-util.adb butil.adb binderr.adb errout.adb \
++erroutc.adb errutil.adb err_vars.ads fmap.adb impunit.adb lib-util.adb \
++mlib.adb mlib-fil.adb mlib-tgt.adb mlib-utl.adb osint.adb osint-c.adb \
++prj.adb prj-attr.adb prj-attr-pm.adb prj-com.ads prj-dect.adb prj-env.adb \
++prj-err.adb prj-ext.adb prj-nmsc.adb prj-pars.adb prj-part.adb prj-pp.adb \
++prj-proc.adb prj-strt.adb prj-tree.adb prj-util.adb rident.ads scng.adb \
++sdefault.adb sfn_scan.adb sinfo-cn.adb sinput-c.adb sinput-p.adb style.ads \
++styleg.adb styleg-c.adb stylesw.adb switch.adb switch-m.adb targparm.adb \
++tempdir.adb
++
++OBJECTS := $(patsubst %.ads,%.o,$(PRJ_SOURCES:.adb=.o))
++
++# Add some object files compiled from C sources.  prefix.o requires
++# some objects from libiberty.
++OBJECTS += concat.o link.o prefix.o xexit.o xmalloc.o xstrdup.o
++
++INCLUDES = -I@srcdir@/../gcc/ada -I@srcdir@/../gcc
++
++vpath %.c @srcdir@/../gcc/ada
++vpath %.ads @srcdir@/../gcc/ada
++vpath %.adb @srcdir@/../gcc/ada:../gcc/ada
++
++libgnatprj.so.$(LIB_VERSION): $(addprefix obj-shared/,$(OBJECTS))
++	: # Make libgnatprj.so
++	$(GCC) -o $@ -shared -fPIC -Wl,--soname,$@ $^ \
++	   -L../gcc/ada/rts -lgnat-$(LIB_VERSION) \
++	   -L../libgnatvsn -lgnatvsn
++	ln -s libgnatprj.so.$(LIB_VERSION) libgnatprj.so
++	chmod a=r obj-shared/*.ali
++# Make the .ali files, but not the .o files, visible to the gnat tools.
++	cp -lp obj-shared/*.ali .
++
++$(addprefix obj-shared/,$(OBJECTS)): | obj-shared
++
++obj-shared/mlib-tgt.o: mlib-tgt-linux.adb
++	-ln -s $< mlib-tgt.adb
++	$(GCC) -c -fPIC $(ADAFLAGS) $(LIBGNAT_JUST_BUILT) $(INCLUDES) \
++	   mlib-tgt.adb -o $@
++
++obj-shared/%.o: %.adb
++	$(GCC) -c -fPIC $(ADAFLAGS) $(LIBGNAT_JUST_BUILT) $< -o $@
++
++obj-shared/%.o: %.ads
++	$(GCC) -c -fPIC $(ADAFLAGS) $(LIBGNAT_JUST_BUILT) $< -o $@
++
++obj-shared/%.o: %.c
++	$(GCC) -c -fPIC $(CFLAGS) $(INCLUDES) $< -o $@
++
++obj-shared/sdefault.o: sdefault.adb
++	$(GCC) -c -fPIC $(ADAFLAGS) $(LIBGNAT_JUST_BUILT) -I@srcdir@/../gcc/ada \
++	   $< -o $@
++
++obj-shared/prefix.o: @srcdir@/../gcc/prefix.c
++	$(GCC) -c -fPIC $(CFLAGS) -DPREFIX=\"@prefix@\" -DBASEVER=\"$(BASEVER)\" \
++	   -I@srcdir@/../gcc -I@srcdir@/../include -I../gcc -I../libiberty \
++	   $< -o $@
++
++obj-shared/%.o: @srcdir@/../libiberty/%.c
++	$(GCC) -c -fPIC $(CFLAGS) \
++	   -I@srcdir@/../libiberty -I@srcdir@/../include $< -o $@
++
++obj-shared:
++	-mkdir $@
++
++libgnatprj.a: $(addprefix obj-static/,$(OBJECTS))
++	: # Make libgnatprj.a
++	ar rc $@ $^
++	ranlib $@
++
++$(addprefix obj-static/,$(OBJECTS)): | obj-static
++
++obj-static/mlib-tgt.o: mlib-tgt-linux.adb
++	-ln -s $< mlib-tgt.adb
++	$(GCC) -c -fPIC $(ADAFLAGS) $(LIBGNAT_JUST_BUILT) $(INCLUDES) \
++	   mlib-tgt.adb -o $@
++
++obj-static/%.o: %.adb
++	$(GCC) -c $(ADAFLAGS) $(LIBGNAT_JUST_BUILT) $< -o $@
++
++obj-static/%.o: %.ads
++	$(GCC) -c $(ADAFLAGS) $(LIBGNAT_JUST_BUILT) $< -o $@
++
++obj-static/%.o: %.c
++	$(GCC) -c $(CFLAGS) $(INCLUDES) $< -o $@
++
++obj-static/sdefault.o: sdefault.adb
++	$(GCC) -c $(ADAFLAGS) $(LIBGNAT_JUST_BUILT) -I@srcdir@/../gcc/ada \
++	   $< -o $@
++
++obj-static/prefix.o: @srcdir@/../gcc/prefix.c
++	$(GCC) -c $(CFLAGS) -DPREFIX=\"@prefix@\" -DBASEVER=\"$(BASEVER)\" \
++	   -I@srcdir@/../gcc -I@srcdir@/../include -I../gcc -I../libiberty \
++	   $< -o $@
++
++obj-static/%.o: @srcdir@/../libiberty/%.c
++	$(GCC) -c -fPIC $(CFLAGS) \
++	   -I@srcdir@/../libiberty -I@srcdir@/../include $< -o $@
++
++obj-static:
++	-mkdir $@
++
++# Generate a list of source files (.ads and .adb) to install.  Almost
++# all of them are in src/gcc/ada, but some are generated during build
++# and are in build/gcc/ada.
++BODIES := $(filter %.adb,$(PRJ_SOURCES))
++SPECS := $(filter %.ads,$(PRJ_SOURCES))
++SPECS += $(patsubst %.adb,%.ads,$(BODIES))
++GENERATED_SOURCES := sdefault.adb
++
++# Filter out the mlib-tgt.adb from the source directory...
++SOURCES := $(filter-out $(GENERATED_SOURCES) mlib-tgt.adb, \
++                        $(SPECS) $(BODIES) $(PRJ_SEPARATES))
++# ... and add our symlink to mlib-tgt-linux.adb instead.
++SOURCES_TO_INSTALL := \
++$(addprefix @srcdir@/../gcc/ada/,$(SOURCES)) \
++$(addprefix ../gcc/ada/,$(GENERATED_SOURCES)) \
++mlib-tgt.adb
++
++install: libgnatprj
++	$(INSTALL_DATA) libgnatprj.a $(DESTDIR)$(prefix)/lib
++	$(INSTALL_DATA) libgnatprj.so.$(LIB_VERSION) $(DESTDIR)$(prefix)/lib
++	cd $(DESTDIR)$(prefix)/lib; \
++	ln -sf libgnatprj.so.$(LIB_VERSION) libgnatprj.so
++	mkdir -p $(DESTDIR)$(prefix)/share/ada/adainclude/gnatprj
++	$(INSTALL_DATA) $(SOURCES_TO_INSTALL) \
++	   $(DESTDIR)$(prefix)/share/ada/adainclude/gnatprj
++	mkdir -p $(DESTDIR)$(prefix)/lib/ada/adalib/gnatprj
++	$(INSTALL) -m 0444 obj-shared/*.ali \
++	   $(DESTDIR)$(prefix)/lib/ada/adalib/gnatprj
++	chmod a=r $(DESTDIR)$(prefix)/lib/ada/adalib/gnatprj/*.ali
++
++.PHONY: clean
++clean:
++	rm -rf *.ali obj-static obj-shared libgnatprj*
+--- Makefile.def~
++++ Makefile.def	2007-06-20 21:09:33.715032842 +0200
+@@ -127,6 +127,13 @@
+ 		missing= TAGS;
+ 		missing= install-info;
+ 		missing= installcheck; };
++host_modules= { module= libgnatprj; no_check=true;
++		missing= info;
++		missing= dvi;
++		missing= html;
++		missing= TAGS;
++		missing= install-info;
++		missing= installcheck; };
+ host_modules= { module= gnattools; no_check=true;
+ 		missing= info;
+ 		missing= dvi;
+@@ -171,6 +178,13 @@
+ 		   missing= TAGS;
+ 		   missing= install-info;
+ 		   missing= installcheck; };
++target_modules = { module= libgnatprj; no_check=true;
++		   missing= info;
++		   missing= dvi;
++		   missing= html;
++		   missing= TAGS;
++		   missing= install-info;
++		   missing= installcheck; };
+ target_modules = { module= libgomp; lib_path=.libs; };
+ 
+ // These are (some of) the make targets to be done in each subdirectory.
+@@ -330,7 +344,10 @@
+ 
+ dependencies = { module=all-gnattools; on=all-libada; };
+ dependencies = { module=all-gnattools; on=all-libgnatvsn; };
++dependencies = { module=all-gnattools; on=all-libgnatprj; };
+ dependencies = { module=all-libgnatvsn; on=all-libada; };
++dependencies = { module=all-libgnatprj; on=all-libada; };
++dependencies = { module=all-libgnatprj; on=all-libgnatvsn; };
+ 
+ // Host modules specific to gdb.
+ dependencies = { module=configure-gdb; on=configure-intl; };
+--- Makefile.in~
++++ Makefile.in	2007-06-20 21:09:45.000000000 +0200
+@@ -641,6 +641,7 @@
+     maybe-configure-utils \
+     maybe-configure-libada \
+     maybe-configure-libgnatvsn \
++    maybe-configure-libgnatprj \
+     maybe-configure-gnattools
+ .PHONY: configure-target
+ configure-target:  \
+@@ -664,6 +665,7 @@
+     maybe-configure-target-rda \
+     maybe-configure-target-libada \
+     maybe-configure-target-libgnatvsn \
++    maybe-configure-target-libgnatprj \
+     maybe-configure-target-libgomp
+ 
+ # The target built for a native non-bootstrap build.
+@@ -787,6 +789,7 @@
+ all-host: maybe-all-utils
+ all-host: maybe-all-libada
+ all-host: maybe-all-libgnatvsn
++all-host: maybe-all-libgnatprj
+ all-host: maybe-all-gnattools
+ 
+ .PHONY: all-target
+@@ -811,6 +814,7 @@
+ all-target: maybe-all-target-rda
+ all-target: maybe-all-target-libada
+ all-target: maybe-all-target-libgnatvsn
++all-target: maybe-all-target-libgnatprj
+ all-target: maybe-all-target-libgomp
+ 
+ # Do a target for all the subdirectories.  A ``make do-X'' will do a
+@@ -898,6 +902,7 @@
+ info-host: maybe-info-utils
+ info-host: maybe-info-libada
+ info-host: maybe-info-libgnatvsn
++info-host: maybe-info-libgnatprj
+ info-host: maybe-info-gnattools
+ 
+ .PHONY: info-target
+@@ -922,6 +927,7 @@
+ info-target: maybe-info-target-rda
+ info-target: maybe-info-target-libada
+ info-target: maybe-info-target-libgnatvsn
++info-target: maybe-info-target-libgnatprj
+ info-target: maybe-info-target-libgomp
+ 
+ .PHONY: do-dvi
+@@ -1004,6 +1010,7 @@
+ dvi-host: maybe-dvi-utils
+ dvi-host: maybe-dvi-libada
+ dvi-host: maybe-dvi-libgnatvsn
++dvi-host: maybe-dvi-libgnatprj
+ dvi-host: maybe-dvi-gnattools
+ 
+ .PHONY: dvi-target
+@@ -1028,6 +1035,7 @@
+ dvi-target: maybe-dvi-target-rda
+ dvi-target: maybe-dvi-target-libada
+ dvi-target: maybe-dvi-target-libgnatvsn
++dvi-target: maybe-dvi-target-libgnatprj
+ dvi-target: maybe-dvi-target-libgomp
+ 
+ .PHONY: do-pdf
+@@ -1110,6 +1118,7 @@
+ pdf-host: maybe-pdf-utils
+ pdf-host: maybe-pdf-libada
+ pdf-host: maybe-pdf-libgnatvsn
++pdf-host: maybe-pdf-libgnatprj
+ pdf-host: maybe-pdf-gnattools
+ 
+ .PHONY: pdf-target
+@@ -1134,6 +1143,7 @@
+ pdf-target: maybe-pdf-target-rda
+ pdf-target: maybe-pdf-target-libada
+ pdf-target: maybe-pdf-target-libgnatvsn
++pdf-target: maybe-pdf-target-libgnatprj
+ pdf-target: maybe-pdf-target-libgomp
+ 
+ .PHONY: do-html
+@@ -1216,6 +1226,7 @@
+ html-host: maybe-html-utils
+ html-host: maybe-html-libada
+ html-host: maybe-html-libgnatvsn
++html-host: maybe-html-libgnatprj
+ html-host: maybe-html-gnattools
+ 
+ .PHONY: html-target
+@@ -1240,6 +1251,7 @@
+ html-target: maybe-html-target-rda
+ html-target: maybe-html-target-libada
+ html-target: maybe-html-target-libgnatvsn
++html-target: maybe-html-target-libgnatprj
+ html-target: maybe-html-target-libgomp
+ 
+ .PHONY: do-TAGS
+@@ -1322,6 +1334,7 @@
+ TAGS-host: maybe-TAGS-utils
+ TAGS-host: maybe-TAGS-libada
+ TAGS-host: maybe-TAGS-libgnatvsn
++TAGS-host: maybe-TAGS-libgnatprj
+ TAGS-host: maybe-TAGS-gnattools
+ 
+ .PHONY: TAGS-target
+@@ -1346,6 +1359,7 @@
+ TAGS-target: maybe-TAGS-target-rda
+ TAGS-target: maybe-TAGS-target-libada
+ TAGS-target: maybe-TAGS-target-libgnatvsn
++TAGS-target: maybe-TAGS-target-libgnatprj
+ TAGS-target: maybe-TAGS-target-libgomp
+ 
+ .PHONY: do-install-info
+@@ -1428,6 +1442,7 @@
+ install-info-host: maybe-install-info-utils
+ install-info-host: maybe-install-info-libada
+ install-info-host: maybe-install-info-libgnatvsn
++install-info-host: maybe-install-info-libgnatprj
+ install-info-host: maybe-install-info-gnattools
+ 
+ .PHONY: install-info-target
+@@ -1452,6 +1467,7 @@
+ install-info-target: maybe-install-info-target-rda
+ install-info-target: maybe-install-info-target-libada
+ install-info-target: maybe-install-info-target-libgnatvsn
++install-info-target: maybe-install-info-target-libgnatprj
+ install-info-target: maybe-install-info-target-libgomp
+ 
+ .PHONY: do-install-html
+@@ -1534,6 +1550,7 @@
+ install-html-host: maybe-install-html-utils
+ install-html-host: maybe-install-html-libada
+ install-html-host: maybe-install-html-libgnatvsn
++install-html-host: maybe-install-html-libgnatprj
+ install-html-host: maybe-install-html-gnattools
+ 
+ .PHONY: install-html-target
+@@ -1558,6 +1575,7 @@
+ install-html-target: maybe-install-html-target-rda
+ install-html-target: maybe-install-html-target-libada
+ install-html-target: maybe-install-html-target-libgnatvsn
++install-html-target: maybe-install-html-target-libgnatprj
+ install-html-target: maybe-install-html-target-libgomp
+ 
+ .PHONY: do-installcheck
+@@ -1640,6 +1658,7 @@
+ installcheck-host: maybe-installcheck-utils
+ installcheck-host: maybe-installcheck-libada
+ installcheck-host: maybe-installcheck-libgnatvsn
++installcheck-host: maybe-installcheck-libgnatprj
+ installcheck-host: maybe-installcheck-gnattools
+ 
+ .PHONY: installcheck-target
+@@ -1664,6 +1683,7 @@
+ installcheck-target: maybe-installcheck-target-rda
+ installcheck-target: maybe-installcheck-target-libada
+ installcheck-target: maybe-installcheck-target-libgnatvsn
++installcheck-target: maybe-installcheck-target-libgnatprj
+ installcheck-target: maybe-installcheck-target-libgomp
+ 
+ .PHONY: do-mostlyclean
+@@ -1746,6 +1766,7 @@
+ mostlyclean-host: maybe-mostlyclean-utils
+ mostlyclean-host: maybe-mostlyclean-libada
+ mostlyclean-host: maybe-mostlyclean-libgnatvsn
++mostlyclean-host: maybe-mostlyclean-libgnatprj
+ mostlyclean-host: maybe-mostlyclean-gnattools
+ 
+ .PHONY: mostlyclean-target
+@@ -1770,6 +1791,7 @@
+ mostlyclean-target: maybe-mostlyclean-target-rda
+ mostlyclean-target: maybe-mostlyclean-target-libada
+ mostlyclean-target: maybe-mostlyclean-target-libgnatvsn
++mostlyclean-target: maybe-mostlyclean-target-libgnatprj
+ mostlyclean-target: maybe-mostlyclean-target-libgomp
+ 
+ .PHONY: do-clean
+@@ -1852,6 +1874,7 @@
+ clean-host: maybe-clean-utils
+ clean-host: maybe-clean-libada
+ clean-host: maybe-clean-libgnatvsn
++clean-host: maybe-clean-libgnatprj
+ clean-host: maybe-clean-gnattools
+ 
+ .PHONY: clean-target
+@@ -1876,6 +1899,7 @@
+ clean-target: maybe-clean-target-rda
+ clean-target: maybe-clean-target-libada
+ clean-target: maybe-clean-target-libgnatvsn
++clean-target: maybe-clean-target-libgnatprj
+ clean-target: maybe-clean-target-libgomp
+ 
+ .PHONY: do-distclean
+@@ -1958,6 +1982,7 @@
+ distclean-host: maybe-distclean-utils
+ distclean-host: maybe-distclean-libada
+ distclean-host: maybe-distclean-libgnatvsn
++distclean-host: maybe-distclean-libgnatprj
+ distclean-host: maybe-distclean-gnattools
+ 
+ .PHONY: distclean-target
+@@ -1982,6 +2007,7 @@
+ distclean-target: maybe-distclean-target-rda
+ distclean-target: maybe-distclean-target-libada
+ distclean-target: maybe-distclean-target-libgnatvsn
++distclean-target: maybe-distclean-target-libgnatprj
+ distclean-target: maybe-distclean-target-libgomp
+ 
+ .PHONY: do-maintainer-clean
+@@ -2064,6 +2090,7 @@
+ maintainer-clean-host: maybe-maintainer-clean-utils
+ maintainer-clean-host: maybe-maintainer-clean-libada
+ maintainer-clean-host: maybe-maintainer-clean-libgnatvsn
++maintainer-clean-host: maybe-maintainer-clean-libgnatprj
+ maintainer-clean-host: maybe-maintainer-clean-gnattools
+ 
+ .PHONY: maintainer-clean-target
+@@ -2088,6 +2115,7 @@
+ maintainer-clean-target: maybe-maintainer-clean-target-rda
+ maintainer-clean-target: maybe-maintainer-clean-target-libada
+ maintainer-clean-target: maybe-maintainer-clean-target-libgnatvsn
++maintainer-clean-target: maybe-maintainer-clean-target-libgnatprj
+ maintainer-clean-target: maybe-maintainer-clean-target-libgomp
+ 
+ 
+@@ -2226,6 +2254,7 @@
+     maybe-check-utils \
+     maybe-check-libada \
+     maybe-check-libgnatvsn \
++    maybe-check-libgnatprj \
+     maybe-check-gnattools
+ 
+ .PHONY: check-target
+@@ -2250,6 +2279,7 @@
+     maybe-check-target-rda \
+     maybe-check-target-libada \
+     maybe-check-target-libgnatvsn \
++    maybe-check-target-libgnatprj \
+     maybe-check-target-libgomp
+ 
+ do-check:
+@@ -2358,6 +2388,7 @@
+     maybe-install-utils \
+     maybe-install-libada \
+     maybe-install-libgnatvsn \
++    maybe-install-libgnatprj \
+     maybe-install-gnattools
+ 
+ .PHONY: install-host
+@@ -2431,6 +2462,7 @@
+     maybe-install-utils \
+     maybe-install-libada \
+     maybe-install-libgnatvsn \
++    maybe-install-libgnatprj \
+     maybe-install-gnattools
+ 
+ .PHONY: install-target
+@@ -2455,6 +2487,7 @@
+     maybe-install-target-rda \
+     maybe-install-target-libada \
+     maybe-install-target-libgnatvsn \
++    maybe-install-target-libgnatprj \
+     maybe-install-target-libgomp
+ 
+ uninstall:
+@@ -33754,6 +33787,299 @@
+ 
+ 
+ 
++.PHONY: configure-libgnatprj maybe-configure-libgnatprj
++maybe-configure-libgnatprj:
++@if gcc-bootstrap
++configure-libgnatprj: stage_current
++@endif gcc-bootstrap
++@if libgnatprj
++maybe-configure-libgnatprj: configure-libgnatprj
++configure-libgnatprj: 
++	@: $(MAKE); $(unstage)
++	@r=`${PWD_COMMAND}`; export r; \
++	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++	test ! -f $(HOST_SUBDIR)/libgnatprj/Makefile || exit 0; \
++	$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libgnatprj ; \
++	$(HOST_EXPORTS) \
++	echo Configuring in $(HOST_SUBDIR)/libgnatprj; \
++	cd "$(HOST_SUBDIR)/libgnatprj" || exit 1; \
++	case $(srcdir) in \
++	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
++	  *) topdir=`echo $(HOST_SUBDIR)/libgnatprj/ | \
++		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
++	esac; \
++	srcdiroption="--srcdir=$${topdir}/libgnatprj"; \
++	libsrcdir="$$s/libgnatprj"; \
++	$(SHELL) $${libsrcdir}/configure \
++	  $(HOST_CONFIGARGS) $${srcdiroption}  \
++	  || exit 1
++@endif libgnatprj
++
++
++
++
++
++.PHONY: all-libgnatprj maybe-all-libgnatprj
++maybe-all-libgnatprj:
++@if gcc-bootstrap
++all-libgnatprj: stage_current
++@endif gcc-bootstrap
++@if libgnatprj
++TARGET-libgnatprj=all
++maybe-all-libgnatprj: all-libgnatprj
++all-libgnatprj: configure-libgnatprj
++	@: $(MAKE); $(unstage)
++	@r=`${PWD_COMMAND}`; export r; \
++	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++	$(HOST_EXPORTS) \
++	(cd $(HOST_SUBDIR)/libgnatprj && \
++	  $(MAKE) $(FLAGS_TO_PASS)  $(TARGET-libgnatprj))
++@endif libgnatprj
++
++
++
++
++.PHONY: check-libgnatprj maybe-check-libgnatprj
++maybe-check-libgnatprj:
++@if libgnatprj
++maybe-check-libgnatprj: check-libgnatprj
++
++check-libgnatprj:
++
++@endif libgnatprj
++
++.PHONY: install-libgnatprj maybe-install-libgnatprj
++maybe-install-libgnatprj:
++@if libgnatprj
++maybe-install-libgnatprj: install-libgnatprj
++
++install-libgnatprj: installdirs
++	@: $(MAKE); $(unstage)
++	@r=`${PWD_COMMAND}`; export r; \
++	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++	$(HOST_EXPORTS) \
++	(cd $(HOST_SUBDIR)/libgnatprj && \
++	  $(MAKE) $(FLAGS_TO_PASS)  install)
++
++@endif libgnatprj
++
++# Other targets (info, dvi, pdf, etc.)
++
++.PHONY: maybe-info-libgnatprj info-libgnatprj
++maybe-info-libgnatprj:
++@if libgnatprj
++maybe-info-libgnatprj: info-libgnatprj
++
++# libgnatprj doesn't support info.
++info-libgnatprj:
++
++@endif libgnatprj
++
++.PHONY: maybe-dvi-libgnatprj dvi-libgnatprj
++maybe-dvi-libgnatprj:
++@if libgnatprj
++maybe-dvi-libgnatprj: dvi-libgnatprj
++
++# libgnatprj doesn't support dvi.
++dvi-libgnatprj:
++
++@endif libgnatprj
++
++.PHONY: maybe-pdf-libgnatprj pdf-libgnatprj
++maybe-pdf-libgnatprj:
++@if libgnatprj
++maybe-pdf-libgnatprj: pdf-libgnatprj
++
++pdf-libgnatprj: \
++    configure-libgnatprj 
++	@: $(MAKE); $(unstage)
++	@[ -f ./libgnatprj/Makefile ] || exit 0; \
++	r=`${PWD_COMMAND}`; export r; \
++	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++	$(HOST_EXPORTS) \
++	for flag in $(EXTRA_HOST_FLAGS) ; do \
++	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
++	done; \
++	echo "Doing pdf in libgnatprj" ; \
++	(cd $(HOST_SUBDIR)/libgnatprj && \
++	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
++	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
++	          "RANLIB=$${RANLIB}" \
++	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
++	          pdf) \
++	  || exit 1
++
++@endif libgnatprj
++
++.PHONY: maybe-html-libgnatprj html-libgnatprj
++maybe-html-libgnatprj:
++@if libgnatprj
++maybe-html-libgnatprj: html-libgnatprj
++
++# libgnatprj doesn't support html.
++html-libgnatprj:
++
++@endif libgnatprj
++
++.PHONY: maybe-TAGS-libgnatprj TAGS-libgnatprj
++maybe-TAGS-libgnatprj:
++@if libgnatprj
++maybe-TAGS-libgnatprj: TAGS-libgnatprj
++
++# libgnatprj doesn't support TAGS.
++TAGS-libgnatprj:
++
++@endif libgnatprj
++
++.PHONY: maybe-install-info-libgnatprj install-info-libgnatprj
++maybe-install-info-libgnatprj:
++@if libgnatprj
++maybe-install-info-libgnatprj: install-info-libgnatprj
++
++# libgnatprj doesn't support install-info.
++install-info-libgnatprj:
++
++@endif libgnatprj
++
++.PHONY: maybe-install-html-libgnatprj install-html-libgnatprj
++maybe-install-html-libgnatprj:
++@if libgnatprj
++maybe-install-html-libgnatprj: install-html-libgnatprj
++
++install-html-libgnatprj: \
++    configure-libgnatprj \
++    html-libgnatprj 
++	@: $(MAKE); $(unstage)
++	@[ -f ./libgnatprj/Makefile ] || exit 0; \
++	r=`${PWD_COMMAND}`; export r; \
++	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++	$(HOST_EXPORTS) \
++	for flag in $(EXTRA_HOST_FLAGS) ; do \
++	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
++	done; \
++	echo "Doing install-html in libgnatprj" ; \
++	(cd $(HOST_SUBDIR)/libgnatprj && \
++	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
++	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
++	          "RANLIB=$${RANLIB}" \
++	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
++	          install-html) \
++	  || exit 1
++
++@endif libgnatprj
++
++.PHONY: maybe-installcheck-libgnatprj installcheck-libgnatprj
++maybe-installcheck-libgnatprj:
++@if libgnatprj
++maybe-installcheck-libgnatprj: installcheck-libgnatprj
++
++# libgnatprj doesn't support installcheck.
++installcheck-libgnatprj:
++
++@endif libgnatprj
++
++.PHONY: maybe-mostlyclean-libgnatprj mostlyclean-libgnatprj
++maybe-mostlyclean-libgnatprj:
++@if libgnatprj
++maybe-mostlyclean-libgnatprj: mostlyclean-libgnatprj
++
++mostlyclean-libgnatprj: 
++	@: $(MAKE); $(unstage)
++	@[ -f ./libgnatprj/Makefile ] || exit 0; \
++	r=`${PWD_COMMAND}`; export r; \
++	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++	$(HOST_EXPORTS) \
++	for flag in $(EXTRA_HOST_FLAGS) ; do \
++	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
++	done; \
++	echo "Doing mostlyclean in libgnatprj" ; \
++	(cd $(HOST_SUBDIR)/libgnatprj && \
++	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
++	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
++	          "RANLIB=$${RANLIB}" \
++	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
++	          mostlyclean) \
++	  || exit 1
++
++@endif libgnatprj
++
++.PHONY: maybe-clean-libgnatprj clean-libgnatprj
++maybe-clean-libgnatprj:
++@if libgnatprj
++maybe-clean-libgnatprj: clean-libgnatprj
++
++clean-libgnatprj: 
++	@: $(MAKE); $(unstage)
++	@[ -f ./libgnatprj/Makefile ] || exit 0; \
++	r=`${PWD_COMMAND}`; export r; \
++	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++	$(HOST_EXPORTS) \
++	for flag in $(EXTRA_HOST_FLAGS) ; do \
++	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
++	done; \
++	echo "Doing clean in libgnatprj" ; \
++	(cd $(HOST_SUBDIR)/libgnatprj && \
++	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
++	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
++	          "RANLIB=$${RANLIB}" \
++	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
++	          clean) \
++	  || exit 1
++
++@endif libgnatprj
++
++.PHONY: maybe-distclean-libgnatprj distclean-libgnatprj
++maybe-distclean-libgnatprj:
++@if libgnatprj
++maybe-distclean-libgnatprj: distclean-libgnatprj
++
++distclean-libgnatprj: 
++	@: $(MAKE); $(unstage)
++	@[ -f ./libgnatprj/Makefile ] || exit 0; \
++	r=`${PWD_COMMAND}`; export r; \
++	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++	$(HOST_EXPORTS) \
++	for flag in $(EXTRA_HOST_FLAGS) ; do \
++	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
++	done; \
++	echo "Doing distclean in libgnatprj" ; \
++	(cd $(HOST_SUBDIR)/libgnatprj && \
++	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
++	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
++	          "RANLIB=$${RANLIB}" \
++	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
++	          distclean) \
++	  || exit 1
++
++@endif libgnatprj
++
++.PHONY: maybe-maintainer-clean-libgnatprj maintainer-clean-libgnatprj
++maybe-maintainer-clean-libgnatprj:
++@if libgnatprj
++maybe-maintainer-clean-libgnatprj: maintainer-clean-libgnatprj
++
++maintainer-clean-libgnatprj: 
++	@: $(MAKE); $(unstage)
++	@[ -f ./libgnatprj/Makefile ] || exit 0; \
++	r=`${PWD_COMMAND}`; export r; \
++	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++	$(HOST_EXPORTS) \
++	for flag in $(EXTRA_HOST_FLAGS) ; do \
++	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
++	done; \
++	echo "Doing maintainer-clean in libgnatprj" ; \
++	(cd $(HOST_SUBDIR)/libgnatprj && \
++	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
++	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
++	          "RANLIB=$${RANLIB}" \
++	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
++	          maintainer-clean) \
++	  || exit 1
++
++@endif libgnatprj
++
++
++
+ .PHONY: configure-gnattools maybe-configure-gnattools
+ maybe-configure-gnattools:
+ @if gcc-bootstrap
+@@ -42025,6 +42351,317 @@
+ 
+ 
+ 
++.PHONY: configure-target-libgnatprj maybe-configure-target-libgnatprj
++maybe-configure-target-libgnatprj:
++@if gcc-bootstrap
++configure-target-libgnatprj: stage_current
++@endif gcc-bootstrap
++@if target-libgnatprj
++maybe-configure-target-libgnatprj: configure-target-libgnatprj
++configure-target-libgnatprj: 
++	@: $(MAKE); $(unstage)
++	@r=`${PWD_COMMAND}`; export r; \
++	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++	echo "Checking multilib configuration for libgnatprj..."; \
++	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgnatprj ; \
++	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgnatprj/multilib.tmp 2> /dev/null ; \
++	if test -r $(TARGET_SUBDIR)/libgnatprj/multilib.out; then \
++	  if cmp -s $(TARGET_SUBDIR)/libgnatprj/multilib.tmp $(TARGET_SUBDIR)/libgnatprj/multilib.out; then \
++	    rm -f $(TARGET_SUBDIR)/libgnatprj/multilib.tmp; \
++	  else \
++	    rm -f $(TARGET_SUBDIR)/libgnatprj/Makefile; \
++	    mv $(TARGET_SUBDIR)/libgnatprj/multilib.tmp $(TARGET_SUBDIR)/libgnatprj/multilib.out; \
++	  fi; \
++	else \
++	  mv $(TARGET_SUBDIR)/libgnatprj/multilib.tmp $(TARGET_SUBDIR)/libgnatprj/multilib.out; \
++	fi; \
++	test ! -f $(TARGET_SUBDIR)/libgnatprj/Makefile || exit 0; \
++	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgnatprj ; \
++	$(NORMAL_TARGET_EXPORTS) \
++	echo Configuring in $(TARGET_SUBDIR)/libgnatprj; \
++	cd "$(TARGET_SUBDIR)/libgnatprj" || exit 1; \
++	case $(srcdir) in \
++	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
++	  *) topdir=`echo $(TARGET_SUBDIR)/libgnatprj/ | \
++		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
++	esac; \
++	srcdiroption="--srcdir=$${topdir}/libgnatprj"; \
++	libsrcdir="$$s/libgnatprj"; \
++	rm -f no-such-file || : ; \
++	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
++	  $(TARGET_CONFIGARGS) $${srcdiroption}  \
++	  || exit 1
++@endif target-libgnatprj
++
++
++
++
++
++.PHONY: all-target-libgnatprj maybe-all-target-libgnatprj
++maybe-all-target-libgnatprj:
++@if gcc-bootstrap
++all-target-libgnatprj: stage_current
++@endif gcc-bootstrap
++@if target-libgnatprj
++TARGET-target-libgnatprj=all
++maybe-all-target-libgnatprj: all-target-libgnatprj
++all-target-libgnatprj: configure-target-libgnatprj
++	@: $(MAKE); $(unstage)
++	@r=`${PWD_COMMAND}`; export r; \
++	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++	$(NORMAL_TARGET_EXPORTS) \
++	(cd $(TARGET_SUBDIR)/libgnatprj && \
++	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libgnatprj))
++@endif target-libgnatprj
++
++
++
++
++
++.PHONY: check-target-libgnatprj maybe-check-target-libgnatprj
++maybe-check-target-libgnatprj:
++@if target-libgnatprj
++maybe-check-target-libgnatprj: check-target-libgnatprj
++
++# Dummy target for uncheckable module.
++check-target-libgnatprj:
++
++@endif target-libgnatprj
++
++.PHONY: install-target-libgnatprj maybe-install-target-libgnatprj
++maybe-install-target-libgnatprj:
++@if target-libgnatprj
++maybe-install-target-libgnatprj: install-target-libgnatprj
++
++install-target-libgnatprj: installdirs
++	@: $(MAKE); $(unstage)
++	@r=`${PWD_COMMAND}`; export r; \
++	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++	$(NORMAL_TARGET_EXPORTS) \
++	(cd $(TARGET_SUBDIR)/libgnatprj && \
++	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
++
++@endif target-libgnatprj
++
++# Other targets (info, dvi, pdf, etc.)
++
++.PHONY: maybe-info-target-libgnatprj info-target-libgnatprj
++maybe-info-target-libgnatprj:
++@if target-libgnatprj
++maybe-info-target-libgnatprj: info-target-libgnatprj
++
++# libgnatprj doesn't support info.
++info-target-libgnatprj:
++
++@endif target-libgnatprj
++
++.PHONY: maybe-dvi-target-libgnatprj dvi-target-libgnatprj
++maybe-dvi-target-libgnatprj:
++@if target-libgnatprj
++maybe-dvi-target-libgnatprj: dvi-target-libgnatprj
++
++# libgnatprj doesn't support dvi.
++dvi-target-libgnatprj:
++
++@endif target-libgnatprj
++
++.PHONY: maybe-pdf-target-libgnatprj pdf-target-libgnatprj
++maybe-pdf-target-libgnatprj:
++@if target-libgnatprj
++maybe-pdf-target-libgnatprj: pdf-target-libgnatprj
++
++pdf-target-libgnatprj: \
++    configure-target-libgnatprj 
++	@: $(MAKE); $(unstage)
++	@[ -f $(TARGET_SUBDIR)/libgnatprj/Makefile ] || exit 0 ; \
++	r=`${PWD_COMMAND}`; export r; \
++	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++	$(NORMAL_TARGET_EXPORTS) \
++	echo "Doing pdf in $(TARGET_SUBDIR)/libgnatprj" ; \
++	for flag in $(EXTRA_TARGET_FLAGS); do \
++	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
++	done; \
++	(cd $(TARGET_SUBDIR)/libgnatprj && \
++	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
++	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
++	          "RANLIB=$${RANLIB}" \
++	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
++	           pdf) \
++	  || exit 1
++
++@endif target-libgnatprj
++
++.PHONY: maybe-html-target-libgnatprj html-target-libgnatprj
++maybe-html-target-libgnatprj:
++@if target-libgnatprj
++maybe-html-target-libgnatprj: html-target-libgnatprj
++
++# libgnatprj doesn't support html.
++html-target-libgnatprj:
++
++@endif target-libgnatprj
++
++.PHONY: maybe-TAGS-target-libgnatprj TAGS-target-libgnatprj
++maybe-TAGS-target-libgnatprj:
++@if target-libgnatprj
++maybe-TAGS-target-libgnatprj: TAGS-target-libgnatprj
++
++# libgnatprj doesn't support TAGS.
++TAGS-target-libgnatprj:
++
++@endif target-libgnatprj
++
++.PHONY: maybe-install-info-target-libgnatprj install-info-target-libgnatprj
++maybe-install-info-target-libgnatprj:
++@if target-libgnatprj
++maybe-install-info-target-libgnatprj: install-info-target-libgnatprj
++
++# libgnatprj doesn't support install-info.
++install-info-target-libgnatprj:
++
++@endif target-libgnatprj
++
++.PHONY: maybe-install-html-target-libgnatprj install-html-target-libgnatprj
++maybe-install-html-target-libgnatprj:
++@if target-libgnatprj
++maybe-install-html-target-libgnatprj: install-html-target-libgnatprj
++
++install-html-target-libgnatprj: \
++    configure-target-libgnatprj \
++    html-target-libgnatprj 
++	@: $(MAKE); $(unstage)
++	@[ -f $(TARGET_SUBDIR)/libgnatprj/Makefile ] || exit 0 ; \
++	r=`${PWD_COMMAND}`; export r; \
++	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++	$(NORMAL_TARGET_EXPORTS) \
++	echo "Doing install-html in $(TARGET_SUBDIR)/libgnatprj" ; \
++	for flag in $(EXTRA_TARGET_FLAGS); do \
++	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
++	done; \
++	(cd $(TARGET_SUBDIR)/libgnatprj && \
++	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
++	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
++	          "RANLIB=$${RANLIB}" \
++	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
++	           install-html) \
++	  || exit 1
++
++@endif target-libgnatprj
++
++.PHONY: maybe-installcheck-target-libgnatprj installcheck-target-libgnatprj
++maybe-installcheck-target-libgnatprj:
++@if target-libgnatprj
++maybe-installcheck-target-libgnatprj: installcheck-target-libgnatprj
++
++# libgnatprj doesn't support installcheck.
++installcheck-target-libgnatprj:
++
++@endif target-libgnatprj
++
++.PHONY: maybe-mostlyclean-target-libgnatprj mostlyclean-target-libgnatprj
++maybe-mostlyclean-target-libgnatprj:
++@if target-libgnatprj
++maybe-mostlyclean-target-libgnatprj: mostlyclean-target-libgnatprj
++
++mostlyclean-target-libgnatprj: 
++	@: $(MAKE); $(unstage)
++	@[ -f $(TARGET_SUBDIR)/libgnatprj/Makefile ] || exit 0 ; \
++	r=`${PWD_COMMAND}`; export r; \
++	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++	$(NORMAL_TARGET_EXPORTS) \
++	echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgnatprj" ; \
++	for flag in $(EXTRA_TARGET_FLAGS); do \
++	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
++	done; \
++	(cd $(TARGET_SUBDIR)/libgnatprj && \
++	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
++	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
++	          "RANLIB=$${RANLIB}" \
++	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
++	           mostlyclean) \
++	  || exit 1
++
++@endif target-libgnatprj
++
++.PHONY: maybe-clean-target-libgnatprj clean-target-libgnatprj
++maybe-clean-target-libgnatprj:
++@if target-libgnatprj
++maybe-clean-target-libgnatprj: clean-target-libgnatprj
++
++clean-target-libgnatprj: 
++	@: $(MAKE); $(unstage)
++	@[ -f $(TARGET_SUBDIR)/libgnatprj/Makefile ] || exit 0 ; \
++	r=`${PWD_COMMAND}`; export r; \
++	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++	$(NORMAL_TARGET_EXPORTS) \
++	echo "Doing clean in $(TARGET_SUBDIR)/libgnatprj" ; \
++	for flag in $(EXTRA_TARGET_FLAGS); do \
++	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
++	done; \
++	(cd $(TARGET_SUBDIR)/libgnatprj && \
++	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
++	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
++	          "RANLIB=$${RANLIB}" \
++	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
++	           clean) \
++	  || exit 1
++
++@endif target-libgnatprj
++
++.PHONY: maybe-distclean-target-libgnatprj distclean-target-libgnatprj
++maybe-distclean-target-libgnatprj:
++@if target-libgnatprj
++maybe-distclean-target-libgnatprj: distclean-target-libgnatprj
++
++distclean-target-libgnatprj: 
++	@: $(MAKE); $(unstage)
++	@[ -f $(TARGET_SUBDIR)/libgnatprj/Makefile ] || exit 0 ; \
++	r=`${PWD_COMMAND}`; export r; \
++	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++	$(NORMAL_TARGET_EXPORTS) \
++	echo "Doing distclean in $(TARGET_SUBDIR)/libgnatprj" ; \
++	for flag in $(EXTRA_TARGET_FLAGS); do \
++	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
++	done; \
++	(cd $(TARGET_SUBDIR)/libgnatprj && \
++	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
++	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
++	          "RANLIB=$${RANLIB}" \
++	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
++	           distclean) \
++	  || exit 1
++
++@endif target-libgnatprj
++
++.PHONY: maybe-maintainer-clean-target-libgnatprj maintainer-clean-target-libgnatprj
++maybe-maintainer-clean-target-libgnatprj:
++@if target-libgnatprj
++maybe-maintainer-clean-target-libgnatprj: maintainer-clean-target-libgnatprj
++
++maintainer-clean-target-libgnatprj: 
++	@: $(MAKE); $(unstage)
++	@[ -f $(TARGET_SUBDIR)/libgnatprj/Makefile ] || exit 0 ; \
++	r=`${PWD_COMMAND}`; export r; \
++	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++	$(NORMAL_TARGET_EXPORTS) \
++	echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libgnatprj" ; \
++	for flag in $(EXTRA_TARGET_FLAGS); do \
++	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
++	done; \
++	(cd $(TARGET_SUBDIR)/libgnatprj && \
++	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
++	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
++	          "RANLIB=$${RANLIB}" \
++	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
++	           maintainer-clean) \
++	  || exit 1
++
++@endif target-libgnatprj
++
++
++
++
++
+ .PHONY: configure-target-libgomp maybe-configure-target-libgomp
+ maybe-configure-target-libgomp:
+ @if gcc-bootstrap
+@@ -43921,6 +44558,7 @@
+ configure-target-rda: stage_last
+ configure-target-libada: stage_last
+ configure-target-libgnatvsn: stage_last
++configure-target-libgnatprj: stage_last
+ configure-target-libgomp: stage_last
+ @endif gcc-bootstrap
+ 
+@@ -43945,6 +44583,7 @@
+ configure-target-rda: maybe-all-gcc
+ configure-target-libada: maybe-all-gcc
+ configure-target-libgnatvsn: maybe-all-gcc
++configure-target-libgnatprj: maybe-all-gcc
+ configure-target-libgomp: maybe-all-gcc
+ @endif gcc-no-bootstrap
+ 
+@@ -44182,7 +44821,10 @@
+ all-fixincludes: maybe-all-libiberty
+ all-gnattools: maybe-all-libada
+ all-gnattools: maybe-all-libgnatvsn
++all-gnattools: maybe-all-libgnatprj
+ all-libgnatvsn: maybe-all-libada
++all-libgnatprj: maybe-all-libada
++all-libgnatprj: maybe-all-libgnatvsn
+ configure-gdb: maybe-configure-intl
+ configure-gdb: maybe-configure-sim
+ all-gdb: maybe-all-intl
--- gcj-4.2-4.2-20070707.orig/debian/patches/libjava-disable-static-trunk.dpatch
+++ gcj-4.2-4.2-20070707/debian/patches/libjava-disable-static-trunk.dpatch
@@ -0,0 +1,45 @@
+#! /bin/sh -e
+
+# DP: Disable building the static libjava.
+
+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
+
+--- Makefile.in~	2007-03-26 10:44:16.881179540 +0200
++++ Makefile.in	2007-03-26 10:48:27.564961048 +0200
+@@ -43901,7 +43901,7 @@
+ 	rm -f no-such-file || : ; \
+ 	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+ 	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+-	  --target=${target_alias} $${srcdiroption}  \
++	  --target=${target_alias} --disable-static $${srcdiroption}  \
+ 	  || exit 1
+ @endif target-libjava
+ 
+@@ -44783,7 +44783,7 @@
+ 	rm -f no-such-file || : ; \
+ 	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
+ 	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
+-	  --target=${target_alias} $${srcdiroption}  \
++	  --target=${target_alias} --disable-static $${srcdiroption}  \
+ 	  || exit 1
+ @endif target-boehm-gc
+ 
--- gcj-4.2-4.2-20070707.orig/debian/gcc-BV-doc.prerm
+++ gcj-4.2-4.2-20070707/debian/gcc-BV-doc.prerm
@@ -0,0 +1,7 @@
+#! /bin/sh -e
+
+install-info --quiet --remove gcc-@BV@
+install-info --quiet --remove gccint-@BV@
+install-info --quiet --remove libgomp-@BV@
+
+#DEBHELPER#
--- gcj-4.2-4.2-20070707.orig/debian/runcheck.sh
+++ gcj-4.2-4.2-20070707/debian/runcheck.sh
@@ -0,0 +1,18 @@
+#! /bin/sh
+
+mkdir -p build
+
+cat >build/runcheck.c <<EOF
+#include <stdio.h>
+int main()
+{
+	return printf("yes\n") != 4;
+}
+EOF
+
+if m=$(${CC:-gcc} -o build/runcheck build/runcheck.c 2>&1); then
+    m=$(build/runcheck 2>&1)
+    echo ${m#* }
+else
+    echo ${m##*:}
+fi
--- gcj-4.2-4.2-20070707.orig/debian/README.ssp
+++ gcj-4.2-4.2-20070707/debian/README.ssp
@@ -0,0 +1,28 @@
+Stack smashing protection is a feature of GCC that enables a program to
+detect buffer overflows and immediately terminate execution, rather than
+continuing execution with corrupt internal data structures. It uses
+"canaries" and local variable reordering to reduce the likelihood of
+stack corruption through buffer overflows.
+
+Options that affect stack smashing protection:
+
+-fstack-protector
+    Enables protection for functions that are vulnerable to stack
+    smashing, such as those that call alloca() or use pointers.
+
+-fstack-protector-all
+    Enables protection for all functions.
+
+-Wstack-protector
+    Warns about functions that will not be protected. Only active when
+    -fstack-protector has been used.
+
+Applications built with stack smashing protection should link with the
+ssp library by using the option "-lssp" for systems with glibc-2.3.x or
+older; glibc-2.4 and newer versions provide this functionality in libc.
+
+The Debian architectures alpha, hppa, ia64, m68k, mips, mipsel do not
+have support for stack smashing protection.
+
+More documentation can be found at the project's website:
+http://researchweb.watson.ibm.com/trl/projects/security/ssp/
--- gcj-4.2-4.2-20070707.orig/debian/porting.texi
+++ gcj-4.2-4.2-20070707/debian/porting.texi
@@ -0,0 +1,47 @@
+\input texinfo
+
+@setfilename porting.info
+@settitle Porting libstdc++-v3
+@setchapternewpage odd
+
+@ifinfo
+This file explains how to port libstdc++-v3 (the GNU C++ library) to 
+a new target.
+
+The documentation in this file was removed, because it is licencensed
+under a non DFSG conforming licencse.
+@end ifinfo
+
+@c ---------------------------------------------------------------------
+@c Titlepage
+@c ---------------------------------------------------------------------
+
+@titlepage
+@title Porting libstdc++-v3
+@author Mark Mitchell
+@page
+@vskip 0pt plus 1filll
+
+The documentation in this file was removed, because it is licencensed
+under a non DFSG conforming licencse.
+@end titlepage
+
+@c ---------------------------------------------------------------------
+@c Top
+@c ---------------------------------------------------------------------
+
+@node Top
+@top Porting libstdc++-v3
+
+This document explains how to port libstdc++-v3 (the GNU C++ library) to 
+a new target.
+
+The documentation in this file was removed, because it is licencensed
+under a non DFSG conforming licencse.
+
+@c ---------------------------------------------------------------------
+@c Epilogue
+@c ---------------------------------------------------------------------
+
+@contents
+@bye
--- gcj-4.2-4.2-20070707.orig/debian/cpp-BV-doc.doc-base.cpp
+++ gcj-4.2-4.2-20070707/debian/cpp-BV-doc.doc-base.cpp
@@ -0,0 +1,16 @@
+Document: cpp-@BV@
+Title: The GNU C preprocessor
+Author: Various
+Abstract: The C preprocessor is a "macro processor" that is used automatically
+ by the C compiler to transform your program before actual compilation.
+ It is called a macro processor because it allows you to define "macros",
+ which are brief abbreviations for longer constructs.
+Section: Apps/Programming
+
+Format: html
+Index: /usr/share/doc/gcc-@BV@-base/cpp.html
+Files: /usr/share/doc/gcc-@BV@-base/cpp.html
+
+Format: info
+Index: /usr/share/info/cpp-@BV@.info.gz
+Files: /usr/share/info/cpp-@BV@*
--- gcj-4.2-4.2-20070707.orig/debian/copyright
+++ gcj-4.2-4.2-20070707/debian/copyright
@@ -0,0 +1,667 @@
+This is the Debian GNU/Linux prepackaged version of the GNU compiler
+collection, containing Ada, C, C++, Fortran 95, Java, Objective-C,
+Objective-C++, and Treelang compilers, documentation, and support
+libraries.  In addition, Debian provides the GNU Pascal compiler in the
+same source package.  Packaging is done by the Debian GCC Maintainers
+<debian-gcc@lists.debian.org>, with sources obtained from:
+
+  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)
+
+Changes: See changelog.Debian.gz
+
+Debian splits the GNU Compiler Collection into packages for each language,
+library, and documentation as follows:
+
+Language       Compiler package  Library package    Documentation
+---------------------------------------------------------------------------
+Ada            gnat-4.2          libgnat-4.2        gnat-4.2-doc
+C              gcc-4.2                              gcc-4.2-doc
+C++            g++-4.2           libstdc++6         libstdc++6-4.2-doc
+Fortran 95     gfortran-4.2      libgfortran1       gfortran-4.2-doc
+Java           gcj-4.2           libgcj8            libgcj-doc
+Objective C    gobjc-4.2         libobjc2
+Objective C++  gobjc++-4.2
+Pascal         gpc-4.2
+Treelang       treelang-4.2
+
+For some language run-time libraries, Debian provides source files,
+development files, debugging symbols and libraries containing position-
+independent code in separate packages:
+
+Language  Sources     Development  Debugging           Position-Independent
+---------------------------------------------------------------------------
+C++                                libstdc++6-4.2-dbg  libstdc++6-4.2-pic
+Java      libgcj8-src libgcj8-dev  libgcj8-dbg
+
+Additional packages include:
+
+All languages:
+libgcc1, libgcc2, libgcc4       GCC intrinsics (platform-dependent)
+libffi4-dev, libffi4            Foreign Function Interface library
+gcc-4.2-base                    Base files common to all compilers
+gcc-4.2-soft-float              Software floating point (ARM only)
+gcc-4.2-source                  The sources with patches
+
+Ada:
+libgnatvsn-dev, libgnatvsn4.2   GNAT version library
+libgnatprj-dev, libgnatprj4.2   GNAT Project Manager library
+
+C:
+cpp-4.2, cpp-4.2-doc            GNU C Preprocessor
+libmudflap0-dev, libmudflap0    Library for instrumenting pointers
+libssp0-dev, libssp0            GCC stack smashing protection library
+fixincludes                     Fix non-ANSI header files
+protoize                        Create/remove ANSI prototypes from C code
+
+Java:
+gij                             The Java bytecode interpreter and VM
+libgcj-common                   Common files for the Java run-time
+libgcj8-awt                     The Abstract Windowing Toolkit
+libgcj8-jar                     Java ARchive for the Java run-time
+
+C, C++ and Fortran 95:
+libgomp1-dev, libgomp1		GCC OpenMP (GOMP) support library
+
+Biarch support: On some 64-bit platforms which can also run 32-bit code,
+Debian provides additional packages containing 32-bit versions of some
+libraries.  These packages have names beginning with 'lib32' instead of
+'lib', for example lib32stdc++6.  Similarly, on some 32-bit platforms which
+can also run 64-bit code, Debian provides additional packages with names
+beginning with 'lib64' instead of 'lib'.  These packages contain 64-bit
+versions of the libraries.  (At this time, not all platforms and not all
+libraries support biarch.)  The license terms for these lib32 or lib64
+packages are identical to the ones for the lib packages.
+
+
+COPYRIGHT STATEMENTS AND LICENSING TERMS
+
+
+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
+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.
+
+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.
+
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License is in `/usr/share/common-licenses/GPL'.
+
+The libstdc++-v3 library is licensed under the terms of the GNU General
+Public License, with this special exception:
+
+   As a special exception, you may use this file as part of a free software
+   library without restriction.  Specifically, if other files instantiate
+   templates or use macros or inline functions from this file, or you compile
+   this file and link it with other files to produce an executable, this
+   file does not by itself cause the resulting executable to be covered by
+   the GNU General Public License.  This exception does not however
+   invalidate any other reasons why the executable file might be covered by
+   the GNU General Public License.
+
+The libgnat-4.2 Ada support library and libgnatvsn are licensed under the
+terms of the GNU General Public License, with this special exception:
+
+   As a special exception, if other files instantiate generics from this
+   unit, or you link this unit with other files to produce an executable,
+   this unit does not by itself cause the resulting executable to be
+   covered by the GNU General Public License. This exception does not
+   however invalidate any other reasons why the executable file might be
+   covered by the GNU Public License.
+
+In contrast, libgnatprj is licensed under the terms of the pure GNU
+General Public License.
+
+gpc is copyright Free Software Foundation, and is licensed under the
+GNU General Public License which on Debian GNU/Linux systems can be
+found as `/usr/share/common-licenses/GPL'.
+
+The gpc runtime library is licensed under the terms of the GNU General
+Public License, with this special exception:
+
+  As a special exception, if you link this file with files compiled
+  with a GNU compiler to produce an executable, this does not cause
+  the resulting executable to be covered by the GNU General Public
+  License. This exception does not however invalidate any other
+  reasons why the executable file might be covered by the GNU
+  General Public License. }
+
+The libgcj library is licensed under the terms of the GNU General
+Public License, with a special exception:
+
+    Linking this library statically or dynamically with other modules
+    is making a combined work based on this library.  Thus, the terms
+    and conditions of the GNU General Public License cover the whole
+    combination.
+
+    As a special exception, the copyright holders of this library give
+    you permission to link this library with independent modules to
+    produce an executable, regardless of the license terms of these
+    independent modules, and to copy and distribute the resulting
+    executable under terms of your choice, provided that you also
+    meet, for each linked independent module, the terms and conditions
+    of the license of that module.  An independent module is a module
+    which is not derived from or based on this library.  If you modify
+    this library, you may extend this exception to your version of the
+    library, but you are not obligated to do so.  If you do not wish
+    to do so, delete this exception statement from your version.
+
+gcc/libgcc2.c (source for libgcc) has the following addition:
+
+    In addition to the permissions in the GNU General Public License,
+    the Free Software Foundation gives you unlimited permission to
+    link the compiled version of this file into combinations with
+    other programs, and to distribute those combinations without any
+    restriction coming from the use of this file.  (The General Public
+    License restrictions do apply in other respects; for example, they
+    cover modification of the file, and distribution when not linked
+    into a combine executable.)
+
+gcc/unwind-libunwind.c (source for libgcc) has the following addition:
+
+    As a special exception, if you link this library with other files,
+    some of which are compiled with GCC, to produce an executable,
+    this library does not by itself cause the resulting executable to
+    be covered by the GNU General Public License.  This exception does
+    not however invalidate any other reasons why the executable file
+    might be covered by the GNU General Public License.
+
+The mudflap library is licensed under the terms of the GNU General
+Public License, and has the following addition:
+
+    In addition to the permissions in the GNU General Public License,
+    the Free Software Foundation gives you unlimited permission to
+    link the compiled version of this file into combinations with
+    other programs, and to distribute those combinations without any
+    restriction coming from the use of this file.  (The General Public
+    License restrictions do apply in other respects; for example, they
+    cover modification of the file, and distribution when not linked
+    into a combine executable.)
+
+The ssp library is licensed under the terms of the GNU General
+Public License, with a special exception:
+
+    As a special exception, if you link this library with other files,
+    some of which are compiled with GCC, to produce an executable,
+    this library does not by itself cause the resulting executable to
+    be covered by the GNU General Public License.  This exception does
+    not however invalidate any other reasons why the executable file
+    might be covered by the GNU General Public License.
+
+The Libgomp library is licensed under the terms of the GNU Lesser
+General Public License, with a special exception:
+
+    As a special exception, if you link this library with other files, some
+    of which are compiled with GCC, to produce an executable, this library
+    does not by itself cause the resulting executable to be covered by the
+    GNU General Public License.  This exception does not however invalidate
+    any other reasons why the executable file might be covered by the GNU
+    General Public License.
+
+The libffi library is licensed under the following terms:
+
+    libffi - Copyright (c) 1996-2003  Red Hat, Inc.
+
+    Permission is hereby granted, free of charge, to any person obtaining
+    a copy of this software and associated documentation files (the
+    ``Software''), to deal in the Software without restriction, including
+    without limitation the rights to use, copy, modify, merge, publish,
+    distribute, sublicense, and/or sell copies of the Software, and to
+    permit persons to whom the Software is furnished to do so, subject to
+    the following conditions:
+
+    The above copyright notice and this permission notice shall be included
+    in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS
+    OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+    IN NO EVENT SHALL CYGNUS SOLUTIONS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+    OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+    ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+    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.
--- gcj-4.2-4.2-20070707.orig/debian/fastjar.prerm
+++ gcj-4.2-4.2-20070707/debian/fastjar.prerm
@@ -0,0 +1,16 @@
+#! /bin/sh -e
+
+if [ -f /usr/share/info/fastjar.info.gz ]; then
+  install-info --quiet --remove fastjar
+else
+  # GFDL invariant free
+  true
+fi
+
+if [ "$1" != "upgrade" ]; then
+  update-alternatives --quiet --remove jar /usr/bin/fastjar
+fi
+
+#DEBHELPER#
+
+exit 0
--- gcj-4.2-4.2-20070707.orig/debian/libgcj-common.preinst
+++ gcj-4.2-4.2-20070707/debian/libgcj-common.preinst
@@ -0,0 +1,12 @@
+#! /bin/sh -e
+
+case "$1" in
+    upgrade|install)
+	if [ -n "$2" ] && [ -h /usr/share/doc/libgcj-common ] \
+	   && dpkg --compare-versions "$2" lt 1:4.0.2-10
+	then
+	    rm -f /usr/share/doc/libgcj-common
+	fi
+esac
+
+#DEBHELPER#
--- gcj-4.2-4.2-20070707.orig/debian/dummy-man.1
+++ gcj-4.2-4.2-20070707/debian/dummy-man.1
@@ -0,0 +1,29 @@
+.TH @NAME@ 1 "May 24, 2003" @name@ "Debian Free Documentation"
+.SH NAME
+@name@ \- A program with a man page covered by the GFDL with invariant sections
+.SH SYNOPSIS
+@name@ [\fB\s-1OPTION\s0\fR] ... [\fI\s-1ARGS\s0\fR...]
+
+.SH DESCRIPTION
+
+\fB@name@\fR is documented by a man page, which is covered by the "GNU
+Free Documentation License" (GFDL) containing invariant sections.
+.P
+In November 2002, version 1.2 of the GNU Free Documentation License (GNU
+FDL) was released by the Free Software Foundation after a long period
+of consultation. Unfortunately, some concerns raised by members of the
+Debian Project were not addressed, and as such the GNU FDL can apply
+to works that do not pass the Debian Free Software Guidelines (DFSG),
+and may thus only be included in the non-free component of the Debian
+archive, not the Debian distribution itself.
+
+.SH "SEE ALSO"
+.BR http://gcc.gnu.org/onlinedocs/
+for the complete documentation,
+.BR http://lists.debian.org/debian-legal/2003/debian-legal-200304/msg00307.html
+for a proposed statement of Debian with respect to the GFDL,
+.BR gfdl(7)
+
+.SH AUTHOR
+This manual page was written by the Debian GCC maintainers,
+for the Debian GNU/Linux system.
--- gcj-4.2-4.2-20070707.orig/debian/gfortran-BV-doc.postinst
+++ gcj-4.2-4.2-20070707/debian/gfortran-BV-doc.postinst
@@ -0,0 +1,10 @@
+#! /bin/sh -e
+
+case "$1" in
+    configure)
+	install-info --quiet --section "Development" "Development" \
+	    --description="The GNU Fortran compiler (Version @BV@)." \
+	    /usr/share/info/gfortran-@BV@.info
+esac
+
+#DEBHELPER#
--- gcj-4.2-4.2-20070707.orig/debian/gcc-BV-doc.doc-base.gcc
+++ gcj-4.2-4.2-20070707/debian/gcc-BV-doc.doc-base.gcc
@@ -0,0 +1,14 @@
+Document: gcc-@BV@
+Title: The GNU C and C++ compiler
+Author: Various
+Abstract: This manual documents how to run, install and port the GNU compiler,
+ as well as its new features and incompatibilities, and how to report bugs.
+Section: Apps/Programming
+
+Format: html
+Index: /usr/share/doc/gcc-@BV@-base/gcc.html
+Files: /usr/share/doc/gcc-@BV@-base/gcc.html
+
+Format: info
+Index: /usr/share/info/gcc-@BV@.info.gz
+Files: /usr/share/info/gcc-@BV@*
--- gcj-4.2-4.2-20070707.orig/debian/gcjwebplugin-BV.postinst
+++ gcj-4.2-4.2-20070707/debian/gcjwebplugin-BV.postinst
@@ -0,0 +1,30 @@
+#!/bin/sh -e
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+
+priority=$(echo @BV@ | sed 's/\.//g')
+PLUGINPTH=/usr/lib/gcj-@BV@/libgcjwebplugin.so
+
+update-alternatives --quiet --install \
+    /usr/lib/mozilla/plugins/libjavaplugin.so \
+    mozilla-javaplugin.so \
+    $PLUGINPTH \
+    $priority
+
+# /usr/lib/mozilla-firefox/plugins is still searched
+# by the firefox installation in /usr/lib/firefox
+update-alternatives --quiet --install \
+    /usr/lib/mozilla-firefox/plugins/libjavaplugin.so \
+    firefox-javaplugin.so \
+    $PLUGINPTH \
+    $priority
+
+update-alternatives --quiet --install \
+    /usr/lib/mozilla-snapshot/plugins/libjavaplugin.so \
+    mozilla-snapshot-javaplugin.so \
+    $PLUGINPTH \
+    $priority
+
+#DEBHELPER#
+
+exit 0
--- gcj-4.2-4.2-20070707.orig/debian/gnat.1
+++ gcj-4.2-4.2-20070707/debian/gnat.1
@@ -0,0 +1,39 @@
+.\" Hey, Emacs!  This is an -*- nroff -*- source file.
+.\"
+.\" Copyright (C) 1996 Erick Branderhorst <branderh@debian.org>
+.\"
+.\" This 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.
+.\"
+.\" This 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 with
+.\" your Debian GNU/Linux system, in /usr/doc/copyright/GPL, or with the
+.\" dpkg source package as the file COPYING.  If not, write to the Free
+.\" Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+.\"
+.\"
+.TH "GNAT TOOLBOX" 1 "Jun 2002" "Debian Project" "Debian Linux"
+.SH NAME
+gnat, gnatbind, gnatbl, gnatchop, gnatfind, gnatkr, gnatlink,
+gnatls, gnatmake, gnatprep, gnatpsta, gnatpsys, gnatxref \-
+GNAT toolbox
+.SH DESCRIPTION
+Those programs are part of GNU GNAT 4.1, a freely available Ada 95 compiler.
+.PP
+For accessing the full GNAT manuals, use
+.B info gnat-ug-4.1
+and
+.B info gnat-rm-4.1
+for the sections related to the reference manual.  If those sections cannot
+be found, you will have to install the gnat-3.4-doc package as well.
+.SH SEE ALSO
+.BR gcc-4.1 (1)
+.SH AUTHOR
+This manpage has been written by Samuel Tardieu <sam@debian.org>, for the
+Debian GNU/Linux project.
--- gcj-4.2-4.2-20070707.orig/debian/gpc-PV-BV-doc.prerm
+++ gcj-4.2-4.2-20070707/debian/gpc-PV-BV-doc.prerm
@@ -0,0 +1,10 @@
+#! /bin/sh -e
+
+if [ -f /usr/share/info/gpc-@PV@-@BV@.info.gz ]; then
+  install-info --quiet --remove gpc-@PV@-@BV@
+else
+  # GFDL invariant free
+  true
+fi
+
+#DEBHELPER#
--- gcj-4.2-4.2-20070707.orig/debian/gpc-PV-BV-doc.postinst
+++ gcj-4.2-4.2-20070707/debian/gpc-PV-BV-doc.postinst
@@ -0,0 +1,12 @@
+#! /bin/sh -e
+
+if [ -f /usr/share/info/gpc-@PV@-@BV@.info.gz ]; then
+  install-info --quiet --section "Development" "Development" \
+	--description="The GNU Pascal compiler." \
+	/usr/share/info/gpc-@PV@-@BV@.info
+else
+  # GFDL invariant free
+  true
+fi
+
+#DEBHELPER#
--- gcj-4.2-4.2-20070707.orig/debian/README.treelang
+++ gcj-4.2-4.2-20070707/debian/README.treelang
@@ -0,0 +1,11 @@
+Treelang documentation
+======================
+
+The treelang compiler is called via the `gcc-3.4' command (or via
+`gcc', when `gcc-3.4' is the default gcc compiler).
+
+Documentation for treelang is provided in info format only. You
+can read docs in the info format with emacs, xemacs or the info
+command:
+
+	info treelang-3.4
--- gcj-4.2-4.2-20070707.orig/debian/rules2
+++ gcj-4.2-4.2-20070707/debian/rules2
@@ -0,0 +1,1620 @@
+#! /usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+.SUFFIXES:
+
+include debian/rules.defs
+include debian/rules.parameters
+
+# some tools
+SHELL	= /bin/bash -e		# brace expansion in rules file
+IR	= install -m 644	# Install regular file
+IP	= install -m 755	# Install program
+IS	= install -m 755	# Install script
+
+#number of jobs to run for build
+ifeq ($(USE_NJOBS),no)
+  NJOBS :=
+  USE_CPUS := 1
+else
+  ifeq ($(with_java),yes)
+    MEM_PER_CPU = 192
+  else
+    MEM_PER_CPU = 128
+  endif
+  NUM_CPUS := $(shell if echo $(USE_NJOBS) | grep -q -E '^[0-9]+$$'; \
+			then echo $(USE_NJOBS); \
+			else getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1; fi)
+  USE_CPUS := $(shell mt=`awk '/^MemTotal/ { print $$2 }' /proc/meminfo`; \
+			awk -vn=$(NUM_CPUS) -vmt=$$mt -vm=$(MEM_PER_CPU) \
+				'END { mt/=1024; n2 = int(mt/m); print n==1 ? 1 : n2<n+1 ? n2 : n+1}' < /dev/null)
+  ifneq (,$(strip $(USE_CPUS)))
+    NJOBS := -j $(USE_CPUS)
+  endif
+endif
+
+# kernel-specific ulimit hack
+ifeq ($(findstring linux,$(DEB_HOST_GNU_SYSTEM)),linux)
+  ULIMIT_M =  if [ -e /proc/meminfo ]; then \
+	    m=`awk '/^((Mem|Swap)Free|Cached)/{m+=$$2}END{print int(m*.9)}' \
+		/proc/meminfo`; \
+	  else \
+	    m=`vmstat --free --swap-free --kilobytes|awk '{m+=$$2}END{print int(m*.9)}'`; \
+	  fi; \
+	  ulimit -m $$m; \
+	  echo "Limited memory for test runs to `ulimit -m`kB"
+else
+  ULIMIT_M = true
+endif
+
+ifeq ($(locale_data),generate)
+  SET_LOCPATH = LOCPATH=$(PWD)/locales
+endif
+
+# the recipient for the test summaries. Send with: debian/rules mail-summary
+S_EMAIL = gcc@packages.debian.org gcc-testresults@gcc.gnu.org
+
+CPPFLAGS	=
+CFLAGS		= $(strip -g -O2 $(CPPFLAGS))
+LDFLAGS		=
+BOOT_CFLAGS	= $(strip -O2 $(CPPFLAGS))
+ifeq ($(with_ada),yes)
+  CC		= $(strip gcc-4.1 $(CPPFLAGS))
+else
+  CC		= $(strip cc $(CPPFLAGS))
+endif
+
+#ifeq ($(DEB_HOST_ARCH), $(findstring $(DEB_HOST_ARCH),m68k))
+#  STAGE1_CFLAGS = STAGE1_CFLAGS="-g -O"
+#endif
+
+ifeq ($(with_ssp_default),yes)
+  STAGE1_CFLAGS = STAGE1_CFLAGS="-g -fno-stack-protector"
+  BOOT_CFLAGS = $(strip -O2 $(CPPFLAGS) -fno-stack-protector)
+endif
+
+ifdef DEB_CROSS
+  CFLAGS	= $(BOOT_CFLAGS)
+endif
+
+docdir		= usr/share/doc
+
+# PF is the installation prefix for the package without the leading slash.
+# It's "usr" for gcc releases
+ifeq ($(PKGSOURCE),gcc-snapshot)
+  PF		= usr/lib/gcc-snapshot
+else
+  PF		= usr
+endif
+
+ifeq ($(with_multiarch_lib),yes)
+  libdir	= lib/$(DEB_TARGET_GNU_TYPE)
+else
+  libdir	= lib
+endif
+# /usr/libexec doesn't follow the FHS
+ifeq ($(PKGSOURCE),gcc-snapshot)
+  libexecdir	= $(PF)/libexec
+else
+  libexecdir	= $(PF)/$(libdir)
+endif
+buildlibdir	= $(builddir)/$(TARGET_ALIAS)
+
+ifeq ($(with_common_gcclibdir),yes)
+  gcc_lib_dir	= $(PF)/$(libdir)/gcc/$(TARGET_ALIAS)/$(BASE_VERSION)
+  gcc_lexec_dir	= $(libexecdir)/gcc/$(TARGET_ALIAS)/$(BASE_VERSION)
+else
+  gcc_lib_dir	= $(PF)/$(libdir)/gcc/$(TARGET_ALIAS)/$(GCC_VERSION)
+  gcc_lexec_dir	= $(libexecdir)/gcc/$(TARGET_ALIAS)/$(GCC_VERSION)
+endif
+
+lib32		= $(PF)/lib32
+ifneq ($(PKGSOURCE),gcc-snapshot)
+  ifeq ($(distribution)-$(DEB_TARGET_ARCH),Debian-amd64)
+    lib32		= emul/ia32-linux/usr/lib
+  endif
+endif
+lib64		= lib64
+
+checkdir = $(builddir)
+ifeq ($(with_separate_libgcj),yes)
+  ifeq ($(PKGSOURCE),gcj-$(BASE_VERSION))
+    ifneq ($(with_standalone_gcj),yes)
+      checkdir = $(buildlibdir)/libjava
+    endif
+  endif
+endif
+ifeq ($(with_separate_gnat),yes)
+  ifeq ($(PKGSOURCE),gnat-$(BASE_VERSION))
+    checkdir = $(builddir)/gcc
+  endif
+endif
+
+ifndef DEB_CROSS
+  ifneq ($(PKGSOURCE),gcc-snapshot)
+    cxx_inc_dir	= $(PF)/include/c++/$(BASE_VERSION)
+  endif
+else
+  cxx_inc_dir	= $(PF)/$(TARGET_ALIAS)/include/c++/$(GCC_VERSION)
+endif
+
+CONFARGS = -v \
+	--enable-languages=$(shell echo $(enabled_languages) | tr -s ' ' ',') \
+	--prefix=/$(PF) \
+	--enable-shared \
+	--with-system-zlib \
+
+ifeq ($(PKGSOURCE),gcc-snapshot)
+  with_nls := no
+else
+  CONFARGS += \
+	--libexecdir=/$(libexecdir) \
+	--without-included-gettext \
+	--enable-threads=posix
+endif
+
+ifeq ($(with_nls),yes)
+  CONFARGS += --enable-nls
+else
+  CONFARGS += --disable-nls
+endif
+
+ifneq ($(PKGSOURCE),gcc-snapshot)
+  CONFARGS += --with-gxx-include-dir=/$(cxx_inc_dir)
+endif
+
+ifeq ($(versioned_packages),yes)
+  CONFARGS += --program-suffix=-$(BASE_VERSION)
+endif
+
+ifneq ($(with_sysroot),)
+  CONFARGS += --with-sysroot=$(with_sysroot)
+endif
+
+ifneq ($(with_bootstrap),)
+  CONFARGS += --enable-bootstrap=$(with_bootstrap)
+endif
+
+ifeq ($(force_gnu_locales),yes)
+  CONFARGS += --enable-clocale=gnu
+endif
+
+ifeq ($(with_cxx)-$(with_debug),yes-yes)
+  CONFARGS += --enable-libstdcxx-debug
+endif
+
+ifeq ($(with_java),yes)
+  ifeq ($(with_java_maintainer_mode),yes)
+    CONFARGS += --enable-java-maintainer-mode
+  endif
+  ifeq ($(with_java_biarch_awt),yes)
+    CONFARGS += --enable-java-awt=$(shell echo $(foreach p,$(java_awt_peers),$(p)-default) | tr ' ' ,)
+  else
+    CONFARGS += --enable-java-awt=$(shell echo $(foreach p,$(java_awt_peers),$(p)) | tr ' ' ,)
+  endif
+  ifneq (,$(findstring gtk,$(java_awt_peers)))
+    CONFARGS += --enable-gtk-cairo
+  endif
+  ifeq ($(with_java_plugin),yes)
+    CONFARGS += --enable-plugin
+  endif
+  ifeq ($(PKGSOURCE),gcc-snapshot)
+    CONFARGS += --with-java-home=/$(PF)/jre
+  else
+    CONFARGS += --with-java-home=/$(PF)/lib/jvm/java-1.5.0-gcj-$(BASE_VERSION)-1.5.0.0/jre
+  endif
+  CONFARGS += --with-ecj-jar=/usr/share/java/ecj.jar
+endif
+
+ifeq ($(with_objc)-$(with_objc_gc),yes-yes)
+  CONFARGS += --enable-objc-gc
+endif
+
+ifeq ($(with_fortran),yes)
+  CONFARGS += --enable-mpfr
+endif
+
+ifneq ($(with_libmudflap),yes)
+  CONFARGS += --disable-libmudflap
+endif
+
+ifeq ($(findstring i486-linux,$(DEB_TARGET_GNU_TYPE)),i486-linux)
+    ifeq ($(biarch),yes)
+      CONFARGS += --enable-targets=all
+    endif
+endif
+
+ifeq ($(findstring x86_64-linux,$(DEB_TARGET_GNU_TYPE)),x86_64-linux)
+    ifneq ($(biarch32),yes)
+      CONFARGS += --disable-multilib
+    endif
+endif
+
+ifneq ($(with_ssp),yes)
+  CONFARGS += --disable-libssp
+endif
+
+ifeq ($(with_gcj),yes)
+    ifeq ($(DEB_HOST_GNU_CPU),m32r)
+	CONFARGS += --enable-libgcj
+    endif
+endif
+
+ifeq ($(findstring powerpc-linux,$(DEB_TARGET_GNU_TYPE)),powerpc-linux)
+    ifeq ($(biarch),yes)
+      CONFARGS += --disable-softfloat --enable-secureplt \
+	--enable-targets=powerpc-linux,powerpc64-linux --with-cpu=default32
+    else
+      CONFARGS += --disable-multilib
+    endif
+endif
+
+ifneq (,$(findstring softfloat,$(DEB_TARGET_GNU_CPU)))
+  CONFARGS += --with-float=soft
+endif
+
+ifneq (,$(findstring arm-vfp,$(DEB_TARGET_GNU_CPU)))
+  CONFARGS += --with-fpu=vfp
+endif
+
+ifeq ($(DEB_TARGET_GNU_CPU),$(findstring $(DEB_TARGET_GNU_CPU),m68k))
+  CONFARGS += --disable-werror
+endif
+CONFARGS += --disable-werror
+
+ifeq ($(findstring sparc-linux,$(DEB_TARGET_GNU_TYPE)),sparc-linux)
+  ifeq ($(biarch),yes)
+    CONFARGS += --with-cpu=v8
+  endif
+endif
+
+# lpia
+ifeq ($(DEB_TARGET_ARCH),lpia)
+  #ifeq ($(TARGET_ALIAS),i686-linux-gnu)
+    CONFARGS += --with-tune=i586
+  #endif
+endif
+
+ifeq ($(DEB_TARGET_ARCH_OS),linux)
+  ifneq (,$(findstring $(DEB_TARGET_ARCH), alpha powerpc ppc64 s390 s390x sparc sparc64))
+    ifeq ($(DEB_TARGET_ARCH),alpha)
+      glibc_version := $(shell dpkg -s libc6.1 | awk '/^Version:/ {print $$2}')
+    else
+      glibc_version := $(shell dpkg -s libc6 | awk '/^Version:/ {print $$2}')
+    endif
+    with_ldbl128 := $(shell dpkg --compare-versions $(glibc_version) gt 2.3.99 && echo yes)
+    ifeq ($(with_ldbl128),yes)
+      CONFARGS += --with-long-double-128
+    endif
+  endif
+endif
+
+ifeq ($(findstring ia64-linux,$(DEB_TARGET_GNU_TYPE)),ia64-linux)
+  CONFARGS += --with-system-libunwind
+endif
+
+ifeq ($(findstring i486,$(DEB_TARGET_GNU_TYPE)),i486)
+  # conflicts with biarch builds, see cpu-default-i486 patch
+  #CONFARGS += --with-arch=i486
+endif
+
+ifeq ($(PKGSOURCE),gcc-snapshot)
+  ifeq ($(findstring --disable-werror, $(CONFARGS)),)
+    CONFARGS += --disable-werror
+  endif
+else
+  CONFARGS += --enable-checking=release
+endif
+
+ifndef DEB_CROSS
+  CONFARGS += \
+	--build=$(DEB_BUILD_GNU_TYPE) \
+	--host=$(DEB_HOST_GNU_TYPE) \
+	--target=$(TARGET_ALIAS)
+else
+  CONFARGS += \
+	--program-prefix=$(TARGET_ALIAS)- \
+	--includedir=/$(PF)/$(DEB_TARGET_GNU_TYPE)/include \
+	--build=$(DEB_BUILD_GNU_TYPE) \
+	--host=$(DEB_HOST_GNU_TYPE) \
+	--target=$(TARGET_ALIAS)
+endif
+
+ifeq ($(with_bootstrap),)
+  # no profiledbootstrap on the following architectures
+  # - m68k: we're happy that it builds at all
+  # - ia64: doesn't work, see PR16108
+  # - hppa: when using gcc-3.3.4 as stage1 compiler, nearly all of the
+  #   tests in the libstdc++-v3 testsuite fail
+  no_profiled_bs_archs := hppa ia64 m68k
+  ifneq (,$(findstring $(DEB_TARGET_GNU_CPU),$(no_profiled_bs_archs)))
+    bootstrap_target = bootstrap-lean
+  else
+    bootstrap_target = profiledbootstrap
+  endif
+endif
+bootstrap_target = bootstrap-lean
+
+# Increase the timeout for one testrun on slow architectures
+ifeq ($(DEB_TARGET_GNU_CPU), $(findstring $(DEB_TARGET_GNU_CPU),arm armeb hppa m68k sparc))
+  DEJAGNU_TIMEOUT=600
+else
+  DEJAGNU_TIMEOUT=450
+endif
+ifeq ($(DEB_TARGET_GNU_SYSTEM),gnu)
+  DEJAGNU_TIMEOUT=900
+endif
+
+DEJAGNU_RUNS =
+ifeq ($(with_ssp),yes)
+  ifeq ($(with_ssp_default),yes)
+    DEJAGNU_RUNS += -fno-stack-protector
+  else
+    DEJAGNU_RUNS += -fstack-protector
+  endif
+endif
+ifeq ($(with_32bit_check),yes)
+  DEJAGNU_RUNS += -m32
+endif
+ifeq ($(with_64bit_check),yes)
+  DEJAGNU_RUNS += -m64
+endif
+# the builds already take that long
+ifneq (,$(findstring $(DEB_TARGET_GNU_CPU),arm m68k))
+  DEJAGNU_RUNS =
+endif
+
+ifneq (,$(DEJAGNU_RUNS))
+  RUNTESTFLAGS = RUNTESTFLAGS="--target_board=unix\{,$(shell echo $(DEJAGNU_RUNS) | tr ' ' ,)\}"
+endif
+
+default: build
+
+configure: $(configure_dependencies)
+
+$(configure_dummy_stamp):
+	touch $(configure_dummy_stamp)
+
+$(configure_stamp):
+	dh_testdir
+	: # give information about the build process
+	@echo "------------------------ Build process variables ------------------------"
+	@echo "Number of parallel processes used for the build: $(USE_CPUS)"
+	@echo "Package source: $(PKGSOURCE)"
+	@echo "GCC version: $(GCC_VERSION)"
+	@echo "Base Debian version: $(BASE_VERSION)"
+	@echo -e "Configured with: $(foreach i,$(CONFARGS),$(i)\n\t)"
+ifdef DEB_CROSS
+	@echo "Building cross compiler for $(DEB_TARGET_ARCH)"
+endif
+	@echo "Using shell $(SHELL)"
+	@echo "Architecture: $(DEB_TARGET_ARCH) (GNU: $(TARGET_ALIAS))"
+	@echo "CPPFLAGS: $(CPPFLAGS)"
+	@echo "CFLAGS: $(CFLAGS)"
+	@echo "LDFLAGS: $(LDFLAGS)"
+	@echo "BOOT_CFLAGS: $(BOOT_CFLAGS)"
+	@echo "DEBIAN_BUILDARCH: $(DEBIAN_BUILDARCH)"
+	@echo "Install prefix: /$(PF)"
+ifeq ($(biarch),yes)
+	@echo "Will build the biarch compilers (32/64, defaulting to 32bit)"
+else
+  ifeq ($(biarch32),yes)
+	@echo "Will build the biarch compilers (64/32, defaulting to 64bit)"
+  else
+	@echo "Will not build the biarch compilers"
+  endif
+endif
+
+ifeq ($(with_cxx),yes)
+	@echo "Will build the C++ compiler"
+else
+	@echo "Will not build the C++ compiler: $(with_cxx)"
+endif
+ifeq ($(with_objc),yes)
+	@echo "Will build the ObjC compiler."
+    ifeq ($(with_objc_gc),yes)
+	@echo "Will build the extra ObjC runtime for garbage collection."
+    else
+	@echo "Will not build the extra ObjC runtime for garbage collection."
+    endif
+else
+	@echo "Will not build the ObjC compiler: $(with_objc)"
+endif
+ifeq ($(with_objcxx),yes)
+	@echo "Will build the Obj-C++ compiler"
+else
+	@echo "Will not build the Obj-C++ compiler: $(with_objcxx)"
+endif
+ifeq ($(with_fortran),yes)
+	@echo "Will build the Fortran 95 compiler."
+else
+	@echo "Will not build the Fortran 95 compiler: $(with_fortran)"
+endif
+ifeq ($(with_java),yes)
+	@echo "Will build the Java compiler."
+else
+	@echo "Will not build the Java compiler: $(with_java)"
+endif
+ifeq ($(with_pascal),yes)
+	@echo "Will build the Pascal compiler."
+else
+	@echo "Will not build the Pascal compiler: $(with_pascal)"
+endif
+ifeq ($(with_ada),yes)
+	@echo "Will build the Ada compiler."
+  ifeq ($(with_libgnat),yes)
+	@echo "Will build the shared Ada libraries."
+  else
+	@echo "Will not build the shared Ada libraries."
+  endif
+else
+	@echo "Will not build the Ada compiler: $(with_ada)"
+endif
+ifeq ($(with_treelang),yes)
+	@echo "Will build the Treelang compiler."
+else
+	@echo "Will not build the Treelang compiler: $(with_treelang)"
+endif
+ifeq ($(with_libffi),yes)
+	@echo "Will build the FFI library."
+else
+	@echo "Will not build the FFI library: $(with_libffi)"
+endif
+ifeq ($(with_ssp),yes)
+	@echo "Will build with SSP support."
+else
+	@echo "Will build without SSP support: $(with_ssp)"
+endif
+ifeq ($(with_check),yes)
+	@echo "Will run the testsuite."
+  ifeq ($(biarch),yes)
+	@echo 'Will run the testsuite with -m64: $(with_64bit_check)'
+  endif
+  ifeq ($(biarch32),yes)
+	@echo 'Will run the testsuite with -m32: $(with_32bit_check)'
+  endif
+else
+	@echo "Will not run the testsuite: $(with_check)"
+endif
+ifeq ($(with_nls),yes)
+	@echo "Will enable national language support."
+else
+	@echo "Will disable national language support: $(with_nls)"
+endif
+	@echo "-----------------------------------------------------------------------------"
+	@echo ""
+ifeq ($(with_check),yes)
+	@if echo "spawn true" | /usr/bin/expect -f - >/dev/null; then \
+	  : ; \
+	else \
+	  echo "expect is failing on your system with the above error, which means the GCC"; \
+	  echo "testsuite will fail.  Please resolve the above issues and retry the build."; \
+	  echo "-----------------------------------------------------------------------------"; \
+	  exit 1; \
+	fi
+endif
+	rm -f $(configure_stamp) $(build_stamp)
+	: # generate debian/README.Debian
+	cat debian/README $(patch_stamp) > debian/README.Debian
+
+	rm -rf $(builddir)
+	mkdir $(builddir)
+
+	: # configure
+	cd $(builddir) \
+	  && PATH=$(PWD)/bin:$$PATH \
+		CC="$(CC)" \
+		$(SET_SHELL) \
+	LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}$(builddir)/gcc/ada/rts \
+		../src/configure $(CONFARGS)
+
+	mkdir -p $(builddir)/gcc
+	( \
+	  echo '#define __$(subst -,_,$(DEB_TARGET_GNU_TYPE))__'; \
+	  echo ''; \
+	  echo '  { "",  "$(DEB_TARGET_GNU_TYPE)"},'; \
+	  cat debian/multiarch.inc; \
+	) > $(builddir)/gcc/multiarch.inc
+	cp -p $(builddir)/gcc/multiarch.inc $(srcdir)/gcc/
+
+	touch $(configure_stamp)
+
+build: $(build_dependencies)
+
+$(build_dummy_stamp):
+	touch $(build_dummy_stamp)
+
+$(build_locale_stamp):
+ifeq ($(locale_data),generate)
+	: # build locales needed by libstdc++ testsuite
+	rm -rf locales
+	mkdir locales
+	chmod +x debian/locale-gen
+	debian/locale-gen
+endif
+	touch $(build_locale_stamp)
+
+
+$(build_stamp): $(configure_stamp) $(build_locale_stamp)
+	dh_testdir
+	rm -f bootstrap-protocol
+# DEB_CROSS is never set if REVERSE_CROSS is set and vice-versa.
+ifndef DEB_CROSS
+ifndef REVERSE_CROSS
+  ifeq ($(with_java),yes)
+	mkdir -p bin
+	ln -sf /usr/bin/fastjar bin/jar
+    ifeq ($(with_native_ecj),yes)
+	: # prepare the standalone ecj jar
+	cp /usr/share/java/ecj.jar $(srcdir)/ecj-standalone.jar
+	zip -d $(srcdir)/ecj-standalone.jar 'org/eclipse/jdt/core/JDTCompilerAdapter*'
+    endif
+	( \
+	  echo '#!/bin/sh'; \
+	  echo 'exec gij-4.1 -cp /usr/share/java/ecj.jar org.eclipse.jdt.internal.compiler.batch.GCCMain "$$@"'; \
+	) > bin/ecj1
+	chmod +x bin/ecj1
+    ifeq ($(with_java_maintainer_mode),yes)
+	: # If we don't have gjavah in PATH, try to build it with the old gij
+	mkdir -p bin
+	if [ -x /usr/bin/gjavah-4.1 ]; then \
+	  ln -sf /usr/bin/gjavah-4.1 bin/gjavah; \
+	elif [ -x bin/gjavah ]; then \
+	  : ; \
+	else \
+	  mkdir -p $(builddir)/java_hacks; \
+	  cd $(builddir)/java_hacks; \
+	  cp -a $(srcdir)/libjava/classpath/tools/external external; \
+	  mkdir -p gnu/classpath/tools; \
+	  cp -a $(srcdir)/libjava/classpath/tools/gnu/classpath/tools/{common,javah,getopt} \
+	    gnu/classpath/tools/; \
+	  cp -a $(srcdir)/libjava/classpath/resource/gnu/classpath/tools/common/Messages.properties \
+	    gnu/classpath/tools/common; \
+	  cd external/asm; \
+	  for i in `find . -name \*.java`; do gcj-4.1 --encoding ISO-8859-1 -C $$i -I.; done; \
+	  cd ../..; \
+	  for i in `find gnu -name \*.java`; do gcj-4.1 -C $$i -I. -Iexternal/asm/; done; \
+	  gcj-4.1 -findirect-dispatch -O2 -fmain=gnu.classpath.tools.javah.Main \
+	    -I. -Iexternal/asm/ `find . -name \*.class` -o $(PWD)/bin/gjavah.real; \
+	  ( \
+	    echo '#!/bin/sh'; \
+	    echo 'export CLASSPATH='`pwd`'$${CLASSPATH:+:$$CLASSPATH}'; \
+	    echo 'exec $(PWD)/bin/gjavah.real "$$@"'; \
+	  ) > $(PWD)/bin/gjavah; \
+	  chmod +x $(PWD)/bin/gjavah; \
+	fi
+    endif
+  endif
+	: # build native compiler
+	( \
+	  set +e; \
+	  PATH=$(PWD)/bin:$$PATH \
+	  $(SET_SHELL) \
+	  $(SET_LOCPATH) \
+	    $(MAKE) -C $(builddir) $(NJOBS) $(bootstrap_target) \
+		CC="$(CC)" \
+		CFLAGS="$(CFLAGS)" \
+		BOOT_CFLAGS="$(BOOT_CFLAGS)" \
+		LDFLAGS="$(LDFLAGS)" \
+		$(STAGE1_CFLAGS) \
+		; \
+	  echo $$? > status; \
+	) 2>&1 | tee bootstrap-protocol
+	s=`cat status`; rm -f status; test $$s -eq 0
+else
+	: # build cross compiler for $(TARGET_ALIAS)
+	( \
+	  set +e; \
+	  PATH=$(PWD)/bin:$$PATH \
+	  $(SET_LOCPATH) \
+	    $(MAKE) -C $(builddir) $(NJOBS) \
+		CC="$(CC)" \
+		CFLAGS="$(CFLAGS)" \
+		BOOT_CFLAGS="$(BOOT_CFLAGS)" \
+		LDFLAGS="$(LDFLAGS)" \
+		; \
+	  echo $$? > status; \
+	) 2>&1 | tee bootstrap-protocol
+	s=`cat status`; rm -f status; test $$s -eq 0
+endif
+endif
+	-chmod 755 $(srcdir)/contrib/warn_summary
+	if [ -x $(srcdir)/contrib/warn_summary ]; then \
+	  rm -f bootstrap-summary; \
+	  $(srcdir)/contrib/warn_summary bootstrap-protocol \
+	    > bootstrap-summary; \
+	fi
+
+	touch $(build_stamp)
+
+ifeq ($(versioned_packages),yes)
+  hppa64_configure_flags += --program-suffix=-$(BASE_VERSION)
+endif
+
+$(configure_hppa64_stamp): $(build_stamp)
+	dh_testdir
+	rm -f $(configure_hppa64_stamp) $(build_hppa64_stamp)
+	rm -rf $(builddir_hppa64)
+	mkdir $(builddir_hppa64)
+	: # configure
+	cd $(builddir_hppa64) && \
+	  PATH=$(PWD)/bin:$$PATH \
+	  $(SET_SHELL) \
+	  CC="$(builddir)/gcc/xgcc -B$(builddir)/gcc/" \
+	     ../src/configure \
+		--enable-languages=c \
+		--prefix=/$(PF) \
+		--libexecdir=/$(libexecdir) \
+		--disable-shared \
+		--disable-nls \
+		--disable-threads \
+		--disable-libffi \
+		--disable-libgomp \
+		--disable-libmudflap \
+		--disable-libssp \
+		--with-as=/usr/bin/hppa64-linux-gnu-as \
+		--with-ld=/usr/bin/hppa64-linux-gnu-ld \
+		--includedir=/usr/hppa64-linux-gnu/include \
+		--host=hppa-linux-gnu \
+		--build=hppa-linux-gnu \
+		--target=hppa64-linux-gnu
+
+	mkdir -p $(builddir_hppa64)/gcc
+	( \
+	  echo '#define __$(subst -,_,hppa64-linux-gnu)__'; \
+	  echo ''; \
+	  echo '  { "",  "hppa64-linux-gnu"},'; \
+	) > $(builddir_hppa64)/gcc/multiarch.inc
+	cp -p $(builddir_hppa64)/gcc/multiarch.inc $(srcdir)/gcc/
+
+	touch $(configure_hppa64_stamp)
+
+$(build_hppa64_stamp): $(configure_hppa64_stamp)
+	  PATH=$(PWD)/bin:$$PATH \
+	  $(SET_SHELL) \
+	  $(SET_LOCPATH) \
+	    $(MAKE) -C $(builddir_hppa64) $(NJOBS) \
+		CC="$(builddir)/gcc/xgcc -B$(builddir)/gcc/" \
+		CFLAGS="$(CFLAGS)" \
+		BOOT_CFLAGS="$(BOOT_CFLAGS)" LDFLAGS="$(LDFLAGS)"
+	touch $(build_hppa64_stamp)
+
+$(configure_ia6432_stamp): $(build_stamp)
+	dh_testdir
+	rm -f $(configure_ia6432_stamp) $(build_ia6432_stamp)
+	rm -rf $(builddir_ia6432)
+	mkdir $(builddir_ia6432)
+	: # configure
+	cd $(builddir_ia6432) && \
+	  PATH=$(PWD)/bin:$$PATH \
+	  $(SET_SHELL) \
+	  CC="$(builddir)/gcc/xgcc -B$(builddir)/gcc/" \
+	     ../src/configure \
+		--enable-languages=c \
+		--prefix=/$(PF) \
+		--libexecdir=/$(libexecdir) \
+		--disable-nls \
+		--disable-libmudflap \
+		--program-suffix=-$(BASE_VERSION) \
+		--host=ia64-linux-gnu \
+		--build=ia64-linux-gnu \
+		--target=i486-linux-gnu
+	touch $(configure_ia6432_stamp)
+
+$(build_ia6432_stamp): $(configure_ia6432_stamp)
+	  PATH=$(PWD)/bin:$$PATH \
+	  $(SET_SHELL) \
+	    $(MAKE) -C $(builddir_ia6432) $(NJOBS) \
+		CC="$(builddir)/gcc/xgcc -B$(builddir)/gcc/" \
+		CFLAGS="$(CFLAGS)" \
+		BOOT_CFLAGS="$(BOOT_CFLAGS)" LDFLAGS="$(LDFLAGS)"
+	touch $(build_ia6432_stamp)
+
+
+MANUALS = \
+	$(srcdir)/gcc/doc/cpp.texi \
+	$(srcdir)/gcc/doc/cppinternals.texi \
+	$(srcdir)/gcc/doc/gcc.texi \
+	$(srcdir)/gcc/doc/gccint.texi
+ifeq ($(with_fortran),yes)
+  MANUALS += $(srcdir)/gcc/fortran/gfortran.texi
+endif
+ifeq ($(with_java),yes)
+  MANUALS += $(srcdir)/gcc/java/gcj.texi
+endif
+ifeq ($(with_treelang),yes)
+  MANUALS += $(srcdir)/gcc/treelang/treelang.texi
+endif
+ifeq ($(with_ada),yes)
+  MANUALS += \
+	$(builddir)/gcc/doc/gnat_ugn_unw.texi \
+	$(srcdir)/gcc/ada/gnat_rm.texi \
+	$(srcdir)/gcc/ada/gnat-style.texi
+endif
+ifeq ($(with_pascal),yes)
+  MANUALS += \
+	$(srcdir)/gcc/p/doc/en/gpc.texi \
+	$(srcdir)/gcc/p/doc/en/gpcs.texi
+endif
+ifeq ($(with_libgomp),yes)
+  MANUALS += $(srcdir)/libgomp/libgomp.texi
+endif
+
+html-docs: $(build_html_stamp)
+#$(build_html_stamp): html-texi2html
+#$(build_html_stamp): html-makeinfo
+$(build_html_stamp): html-makeinfo-nosplit
+
+html-texi2html:
+	rm -rf html $(builddir)/gcc/html
+	mkdir $(builddir)/gcc/html
+	ln -s $(builddir)/gcc/html html
+	cd $(builddir)/gcc; \
+	for manual in $(MANUALS); do \
+	  outname=`basename $${manual} .texi`; \
+	  echo "generating $$outname ..."; \
+	  texi2html -number -split chapter \
+		-I $(srcdir)/gcc/doc/include \
+		-I $(srcdir)/gcc/p/doc \
+		-I $(srcdir)/gcc/p/doc/generated \
+		-I `dirname $${manual}` \
+		-I $(builddir)/gcc \
+		-subdir html \
+		$${manual}; \
+	done
+
+html-makeinfo:
+	rm -rf html
+	mkdir html
+	cd $(builddir)/gcc; \
+	for manual in $(MANUALS); do \
+	  manual=`find $(srcdir) -name $${file}.texi`; \
+	  outname=`basename $${manual} .texi`; \
+	  echo "generating $$outname ..."; \
+	  if [ "$${manual}" ]; then \
+	    makeinfo --html --number-sections \
+		-I $(srcdir)/gcc/doc/include -I `dirname $${manual}` \
+		-I $(srcdir)/gcc/p/doc \
+		-I $(srcdir)/gcc/p/doc/generated \
+		-I $(builddir)/gcc \
+		-o $${outname} \
+		$${manual}; \
+	  fi; \
+	done
+
+html-makeinfo-nosplit:
+	rm -rf html
+	mkdir html
+	cd $(builddir)/gcc; \
+	for manual in $(MANUALS); do \
+	  outname=`basename $${manual} .texi`.html; \
+	  echo "generating $$outname ..."; \
+	  makeinfo --html --number-sections --no-split \
+		-I $(srcdir)/gcc/doc/include -I `dirname $${manual}` \
+		-I $(srcdir)/gcc/p/doc \
+		-I $(srcdir)/gcc/p/doc/generated \
+		-I $(builddir)/gcc \
+		-o $(PWD)/html/$${outname} \
+		$${manual}; \
+	done
+
+# start the script only on architectures known to have slow autobilders ...
+logwatch_archs := arm armeb m68k mips mipsel sparc
+ifeq ($(DEB_HOST_GNU_CPU), $(findstring $(DEB_HOST_GNU_CPU),$(logwatch_archs)))
+  start_logwatch = yes
+endif
+ifeq ($(DEB_HOST_GNU_SYSTEM),gnu)
+  start_logwatch = yes
+endif
+
+check: $(check_stamp) #$(check_inst_stamp)
+$(check_stamp): $(build_stamp) $(build_locale_stamp)
+	rm -f test-protocol
+
+ifeq ($(start_logwatch),yes)
+	: # start logwatch script for regular output during test runs
+	chmod +x debian/logwatch.sh
+	-debian/logwatch.sh -t 900 -p $(builddir)/logwatch.pid \
+		-m '\ntestsuite still running ...\n' \
+		test-protocol \
+		$(builddir)/gcc/testsuite/{gcc,g++,g77,objc,obj-c++}.log \
+		$(builddir)/gcc/testsuite/ada/acats/acats.log \
+		$(builddir)/gcc/p/test/test_log \
+		$(buildlibdir)/libstdc++-v3/testsuite/libstdc++-v3.log \
+		$(buildlibdir)/libjava/testsuite/libjava.log \
+		$(buildlibdir)/libmudflap/testsuite/libmudflap.log \
+		&
+endif
+
+ifeq ($(with_ada),yes)
+	chmod +x debian/acats-killer.sh
+	-debian/acats-killer.sh -p $(builddir)/acats-killer.pid \
+		$(builddir)/gcc/testsuite/ada/acats/acats.log \
+		$(builddir)/gcc/testsuite/g++.log \
+		&
+endif
+
+ifeq ($(with_ada),yes)
+ifneq ($(PKGSOURCE),gcc-snapshot)
+# seems to be necessary for all archs
+# see above, hppa & gnatlib-shared-dual target
+#  ifeq ($(with_libgnat_shared_dual),yes)
+	if [ ! -f $(builddir)/gcc/ada/rts/libgnat-$(GNAT_SONAME).so ]; then \
+	  ln -sf libgnat-$(GNAT_SONAME).so.1 \
+	    $(builddir)/gcc/ada/rts/libgnat-$(GNAT_SONAME).so; \
+	fi
+	if [ ! -f $(builddir)/gcc/ada/rts/libgnarl-$(GNAT_SONAME).so ]; then \
+	  ln -sf libgnarl-$(GNAT_SONAME).so.1 \
+	    $(builddir)/gcc/ada/rts/libgnarl-$(GNAT_SONAME).so; \
+	fi
+#  endif
+endif
+endif
+
+	echo "Running testsuite ..."
+	-$(ULIMIT_M); \
+	    $(SET_SHELL) \
+	    $(SET_LOCPATH) \
+	    PATH=$(PWD)/bin:$$PATH \
+	    EXTRA_TEST_PFLAGS=-g0 \
+	    DEJAGNU_TIMEOUT=$(DEJAGNU_TIMEOUT) \
+		$(MAKE) -C $(checkdir) -k $(NJOBS) \
+		    check $(RUNTESTFLAGS) 2>&1 | tee test-protocol
+
+	-ps aux | fgrep logwatch | fgrep -v fgrep
+	-if [ -f $(builddir)/logwatch.pid ]; then \
+	  kill -1 `cat $(builddir)/logwatch.pid`; \
+	  sleep 1; \
+	  kill -9 `cat $(builddir)/logwatch.pid`; \
+	  rm -f $(builddir)/logwatch.pid; \
+	fi
+	-ps aux | fgrep logwatch | fgrep -v fgrep
+
+ifeq ($(with_ada),yes)
+	-if [ -f $(builddir)/acats-killer.pid ]; then \
+	  kill -1 `cat $(builddir)/acats-killer.pid`; \
+	  sleep 1; \
+	  kill -9 `cat $(builddir)/acats-killer.pid`; \
+	  rm -f $(builddir)/acats-killer.pid; \
+	fi
+endif
+
+	: # running the libjava testsuite alone is missing this information
+	$(builddir)/gcc/xgcc -B$(builddir)/gcc/ -v > $(builddir)/compiler_version.sum 2>&1
+
+	-chmod 755 $(srcdir)/contrib/test_summary
+	if [ -x $(srcdir)/contrib/test_summary ]; then \
+	  rm -f test-summary; \
+	  ( \
+	    cd $(builddir); \
+	    echo '' > ts-include; \
+	    echo '' >> ts-include; \
+	    if [ -f $(builddir)/gcc/.bad_compare ]; then \
+	      echo 'Bootstrap comparison failure:' >> ts-include; \
+	      cat $(builddir)/gcc/.bad_compare >> ts-include; \
+	      echo '' >> ts-include; \
+	      echo '' >> ts-include; \
+	    fi; \
+	    echo "Build Dependencies:" >> ts-include; \
+	    dpkg -l binutils `echo '$(LIBC_DEP)' | awk '{print $$1}'` \
+	        >> ts-include; \
+	    echo '' >> ts-include; \
+	    cat ../$(patch_stamp) >> ts-include; \
+	    BOOT_CFLAGS="$(BOOT_CFLAGS)" \
+	      $(srcdir)/contrib/test_summary \
+		-i ts-include -m "$(S_EMAIL)" \
+	  ) > raw-test-summary; \
+	  if [ -n "$(testsuite_tarball)" ]; then \
+	    echo "Test suite used: $(testsuite_srcdir)" > test-summary; \
+	    echo "  Do not interpret the results on its own" >> test-summary; \
+	    echo "  but compare them with the results from" >> test-summary; \
+	    echo "  the gcc-snapshot package." >> test-summary; \
+	  fi; \
+	  sed -n '/^Mail/s/.*"\([^"][^"]*\)".*/\1/p' raw-test-summary \
+		>> test-summary; \
+	  awk '/^cat/, /^EOF/' raw-test-summary | grep -v EOF >> test-summary; \
+	  if [ -f bootstrap-summary -a "$(bootstrap_target)" != profiledbootstrap ]; then \
+	    echo '' >> test-summary; \
+	    cat bootstrap-summary >> test-summary; \
+	  fi; \
+	  echo 'BEGIN test-summary'; \
+	  cat test-summary; \
+	  echo 'END test-summary'; \
+	fi
+
+	touch $(check_stamp)
+
+$(check_inst_stamp): $(check_stamp)
+	rm -f test-inst-protocol
+
+ifeq ($(start_logwatch),yes)
+	: # start logwatch script for regular output during test runs
+	chmod +x debian/logwatch.sh
+	-debian/logwatch.sh -t 900 -p $(builddir)/logwatch-inst.pid \
+		-m '\ntestsuite (3.3) still running ...\n' \
+		test-inst-protocol \
+		check-inst/{gcc,g++,g77,objc}.log \
+		&
+endif
+
+	rm -rf check-inst
+	mkdir check-inst
+
+	echo "Running testsuite ..."
+	-$(ULIMIT_M) ; \
+	    $(SET_SHELL) \
+	    $(SET_LOCPATH) \
+	    EXTRA_TEST_PFLAGS=-g0 \
+	    DEJAGNU_TIMEOUT=$(DEJAGNU_TIMEOUT) \
+	  cd check-inst && $(srcdir)/contrib/test_installed \
+	    --with-gcc=gcc-3.3 --with-g++=g++-3.3 --with-g77=g77-3.3 \
+		2>&1 | tee test-inst-protocol
+
+	-ps aux | fgrep logwatch | fgrep -v fgrep
+	if [ -f $(builddir)/logwatch-inst.pid ]; then \
+	  kill -1 `cat $(builddir)/logwatch-inst.pid`; \
+	else \
+	  true; \
+	fi
+	-ps aux | fgrep logwatch | fgrep -v fgrep
+
+	-chmod 755 $(srcdir)/contrib/test_summary
+	if [ -x $(srcdir)/contrib/test_summary ]; then \
+	  rm -f test-inst-summary; \
+	  ( \
+	    cd check-inst; \
+	    echo '' > ts-include; \
+	    echo '' >> ts-include; \
+	    echo "Build Dependencies:" >> ts-include; \
+	    dpkg -l g++-3.3 binutils `echo '$(LIBC_DEP)' | awk '{print $$1}'` \
+	        >> ts-include; \
+	    echo '' >> ts-include; \
+	    echo 'Results for the installed GCC-3.3 compilers' >> ts-include; \
+	    $(srcdir)/contrib/test_summary \
+		-i ts-include -m "$(S_EMAIL)" \
+	  ) > raw-test-inst-summary; \
+	  sed -n '/^Mail/s/.*"\([^"][^"]*\)".*/\1/p' raw-test-inst-summary \
+		>> test-inst-summary; \
+	  awk '/^cat/, /^EOF/' raw-test-inst-summary \
+		| grep -v EOF >> test-inst-summary; \
+	  echo 'BEGIN test-installed-summary'; \
+	  cat test-inst-summary; \
+	  echo 'END test-installed-summary'; \
+	fi
+
+	chmod 755 debian/reduce-test-diff.awk
+	if diff -u test-inst-summary test-summary \
+		| debian/reduce-test-diff.awk > diff-summary; \
+	then \
+	  mv -f diff-summary testsuite-comparision; \
+	else \
+	  ( \
+	    echo "WARNING: New failures in gcc-3.4 compared to gcc-3.3"; \
+	    echo ''; \
+	    cat diff-summary; \
+	  ) > testsuite-comparision; \
+	  rm -f diff-summary; \
+	fi
+	touch $(check_inst_stamp)
+
+clean: debian/control
+	dh_testdir
+	rm -f pxxx status
+	rm -f *-summary *-protocol testsuite-comparision summary-diff
+ifeq ($(with_pascal),yes)
+	-rm -f $(srcdir)/gcc/p/doc/*info
+	rm -f $(srcdir)/gcc/p/test/{fjf51,fjf141aa,fjf199aa,magic,?,knownbugs/a.out}
+endif
+	if [ -f $(srcdir)/gcc/p/config-lang.in.debian ]; then \
+	  mv -f $(srcdir)/gcc/p/config-lang.in.debian $(srcdir)/gcc/p/config-lang.in; \
+	else true; fi
+	rm -f $(srcdir)/gcc/po/*.gmo
+	rm -f debian/lib{ffi,g2c,gcc,gcj,objc,stdc++}{-v3,[0-9]}*.{{pre,post}{inst,rm},shlibs}
+	fs=`echo debian/*-BV* debian/*GCJ* debian/*CXX* debian/*LC*|sort -u`; \
+	for f in $$fs; do \
+	  [ -f $$f ] || continue; \
+	  f2=$$(echo $$f \
+		| sed 's/BV/$(BASE_VERSION)/;s/PV/$(GPC_BASE_VERSION)/;s/CXX/$(CXX_SONAME)/;s/LGCJ/$(PKG_LIBGCJ_EXT)/;s/GCJ/$(PKG_GCJ_EXT)/;s/LC/$(GCC_SONAME)/;s/FFI/$(FFI_SONAME)/'); \
+	  rm -f $$f2; \
+	done
+	rm -f debian/shlibs.local debian/substvars.local
+	rm -f debian/*.debhelper
+	-[ -d debian/bugs ] && $(MAKE) -C debian/bugs clean
+	rm -f debian/README.libstdc++-baseline
+	rm -f debian/lib*gcj-bc.shlibs
+	rm -rf bin locales
+	rm -rf check-inst
+	dh_clean
+
+# -----------------------------------------------------------------------------
+# some abbrevations for the package names and directories;
+# p_XXX is the package name, d_XXX is the package directory
+# these macros are only used in the binary-* targets.
+
+ifeq ($(versioned_packages),yes)
+  pkg_ver := -$(BASE_VERSION)
+  gpc_pkg_ver := -$(GPC_BASE_VERSION)$(pkg_ver)
+endif
+
+ifndef DEB_CROSS
+  p_base = gcc$(pkg_ver)-base
+  p_gcc  = gcc$(pkg_ver)
+  p_cpp  = cpp$(pkg_ver)
+  p_cppd = cpp$(pkg_ver)-doc
+  p_cxx  = g++$(pkg_ver)
+  p_doc  = gcc$(pkg_ver)-doc
+  p_lgcc = libgcc$(GCC_SONAME)
+else
+  # only triggered if DEB_CROSS set
+  p_base = gcc$(pkg_ver)$(cross_bin_arch)-base
+  p_cpp  = cpp$(pkg_ver)$(cross_bin_arch)
+  p_gcc  = gcc$(pkg_ver)$(cross_bin_arch)
+  p_cxx  = g++$(pkg_ver)$(cross_bin_arch)
+endif
+p_hppa64 = gcc$(pkg_ver)-hppa64
+
+d	= debian/tmp
+d_base	= debian/$(p_base)
+d_gcc	= debian/$(p_gcc)
+d_cpp	= debian/$(p_cpp)
+d_cppd	= debian/$(p_cppd)
+d_cxx	= debian/$(p_cxx)
+d_doc	= debian/$(p_doc)
+d_lgcc	= debian/$(p_lgcc)
+d_hppa64= debian/$(p_hppa64)
+
+common_substvars = \
+	$(shell awk "{printf \"'-V%s' \", \$$0}" debian/substvars.local)
+
+# ---------------------------------------------------------------------------
+
+ifeq ($(PKGSOURCE),gcc-snapshot)
+  include debian/rules.d/binary-snapshot.mk
+else
+
+ifndef DEB_CROSS
+# ----------------------------------------
+# native target
+
+ifeq ($(with_gccbase),yes)
+  include debian/rules.d/binary-base.mk
+endif
+ifeq ($(with_libgcc),yes)
+  include debian/rules.d/binary-libgcc.mk
+endif
+
+ifeq ($(with_gccmath),yes)
+  include debian/rules.d/binary-libgccmath.mk
+endif
+
+ifeq ($(with_libgomp),yes)
+  include debian/rules.d/binary-libgomp.mk
+endif
+
+ifeq ($(with_source),yes)
+  include debian/rules.d/binary-source.mk
+endif
+
+ifeq ($(with_cdev),yes)
+  include debian/rules.d/binary-cpp.mk
+endif
+
+ifeq ($(with_proto),yes)
+  include debian/rules.d/binary-proto.mk
+endif
+
+ifeq ($(with_fixincl),yes)
+  include debian/rules.d/binary-fixincl.mk
+endif
+
+ifeq ($(with_libmudflap),yes)
+  include debian/rules.d/binary-libmudflap.mk
+endif
+
+ifeq ($(with_libssp),yes)
+  include debian/rules.d/binary-libssp.mk
+endif
+
+ifeq ($(with_objcxx),yes)
+  include debian/rules.d/binary-objcxx.mk
+endif
+
+ifeq ($(with_objc),yes)
+  include debian/rules.d/binary-objc.mk
+endif
+ifeq ($(with_libobjc),yes)
+  include debian/rules.d/binary-libobjc.mk
+endif
+
+# include before cxx
+include debian/rules.d/binary-java.mk
+
+ifeq ($(with_libffi),yes)
+  include debian/rules.d/binary-libffi.mk
+endif
+
+ifeq ($(with_cxxdev),yes)
+  include debian/rules.d/binary-cxx.mk
+endif
+ifeq ($(with_cxx),yes)
+  include debian/rules.d/binary-libstdcxx.mk
+endif
+
+ifeq ($(with_f77),yes)
+  include debian/rules.d/binary-f77.mk
+endif
+
+ifeq ($(with_fortran),yes)
+  include debian/rules.d/binary-fortran.mk
+endif
+
+ifeq ($(with_ada),yes)
+  include debian/rules.d/binary-ada.mk
+endif
+
+ifeq ($(with_treelang),yes)
+  include debian/rules.d/binary-treelang.mk
+endif
+
+ifeq ($(with_pascal),yes)
+  include debian/rules.d/binary-pascal.mk
+endif
+
+ifeq ($(with_libnof),yes)
+  ifeq ($(DEB_TARGET_GNU_CPU),powerpc)
+    include debian/rules.d/binary-nof.mk
+  endif
+endif
+
+# gcc must be moved/built after g77 and g++
+ifeq ($(with_cdev),yes)
+  include debian/rules.d/binary-gcc.mk
+endif
+
+ifeq ($(with_hppa64),yes)
+  include debian/rules.d/binary-hppa64.mk
+endif
+
+else
+# ----------------------------------------
+# cross target
+
+ifeq ($(with_gccxbase),yes)
+  include debian/rules.d/binary-base.mk
+endif
+
+ifeq ($(with_libgcc),yes)
+  include debian/rules.d/binary-libgcc-cross.mk
+endif
+
+ifeq ($(with_cdev),yes)
+  include debian/rules.d/binary-cpp-cross.mk
+endif
+
+ifeq ($(with_objcxx),yes)
+  include debian/rules.d/binary-objcxx-cross.mk
+endif
+
+ifeq ($(with_objc),yes)
+  include debian/rules.d/binary-objc-cross.mk
+endif
+ifeq ($(with_libobjc),yes)
+  include debian/rules.d/binary-libobjc-cross.mk
+endif
+
+ifeq ($(with_cxxdev),yes)
+  include debian/rules.d/binary-cxx-cross.mk
+endif
+ifeq ($(with_cxx),yes)
+  include debian/rules.d/binary-libstdcxx-cross.mk
+endif
+
+ifeq ($(with_libnof),yes)
+  ifeq ($(DEB_TARGET_GNU_CPU),powerpc)
+    include debian/rules.d/binary-nof-cross.mk
+  endif
+endif
+
+ifeq ($(with_cdev),yes)
+  include debian/rules.d/binary-gcc-cross.mk
+endif
+
+endif
+endif # ($(PKGSOURCE),gcc-snapshot)
+
+# ----------------------------------------------------------------------
+install: $(install_dependencies)
+
+$(install_dummy_stamp): $(build_dummy_stamp)
+	touch $(install_dummy_stamp)
+
+$(install_snap_stamp): $(build_dependencies)
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+
+	: # Install directories
+	rm -rf $(d)
+	mkdir -p $(d)/$(PF)
+
+ifeq ($(with_hppa64),yes)
+	: # Install hppa64
+	PATH=$(PWD)/bin:$$PATH \
+	    $(MAKE) -C $(builddir_hppa64) \
+		CC="$(CC)" \
+		CFLAGS="$(CFLAGS)" \
+		BOOT_CFLAGS="$(BOOT_CFLAGS)" \
+		LDFLAGS="$(LDFLAGS)" \
+		DESTDIR=$(PWD)/$(d) \
+		    install
+
+	ls -l $(d)/$(PF)/bin
+	if [ ! -x $(d)/$(PF)/bin/hppa64-linux-gnu-gcc ]; then \
+	  mv $(d)/$(PF)/bin/hppa64-linux-gnu-gcc-4* $(d)/$(PF)/bin/hppa64-linux-gnu-gcc; \
+	else \
+	  rm -f $(d)/$(PF)/bin/hppa64-linux-gnu-gcc-4*; \
+	fi
+
+	: # remove files not needed from the hppa64 build
+	rm -rf $(d)/$(PF)/info
+	rm -rf $(d)/$(PF)/man
+	rm -f $(d)/$(PF)/lib/libiberty.a
+	rm -f $(d)/$(PF)/bin/*{protoize,gcov,gccbug,gcc}
+
+	rm -rf $(d)/$(PF)/hppa64-linux-gnu/include
+	rm -rf $(d)/$(PF)/hppa64-linux-gnu/lib
+	rm -rf $(d)/$(PF)/$(libdir)/gcc/hppa64-linux-gnu/$(BASE_VERSION)/include-fixed
+endif
+
+	: # Install everything
+	PATH=$(PWD)/bin:$$PATH \
+	$(SET_SHELL) \
+	  $(MAKE) -C $(builddir) \
+	    CFLAGS="$(CFLAGS)" \
+	    LDFLAGS="$(LDFLAGS)" \
+	    BOOT_CFLAGS="$(BOOT_CFLAGS)" \
+	    DESTDIR=$(PWD)/$(d) \
+	    infodir=/$(PF)/share/info \
+	    mandir=/$(PF)/share/man \
+		install
+
+	ls -l $(d)/$(PF)/bin
+	if [ ! -x $(d)/$(PF)/bin/$(TARGET_ALIAS)-gcc ]; then \
+	  mv $(d)/$(PF)/bin/$(TARGET_ALIAS)-gcc-4* $(d)/$(PF)/bin/$(TARGET_ALIAS)-gcc; \
+	else \
+	  rm -f $(d)/$(PF)/bin/$(TARGET_ALIAS)-gcc-4*; \
+	fi
+	rm -rf $(d)/$(gcc_lib_dir)/include-fixed
+
+ifeq ($(with_java),yes)
+  ifneq (,$(filter yes, $(biarch) $(biarch32)))
+	: # workaround to install the correct binaries for multilib builds
+	PATH=$(PWD)/bin:$$PATH \
+	$(SET_SHELL) \
+	  $(MAKE) -C $(buildlibdir)/libjava \
+	    CFLAGS="$(CFLAGS)" \
+	    LDFLAGS="$(LDFLAGS)" \
+	    BOOT_CFLAGS="$(BOOT_CFLAGS)" \
+	    DESTDIR=$(PWD)/$(d) \
+	    infodir=/$(PF)/share/info \
+	    mandir=/$(PF)/share/man \
+		install-binPROGRAMS install-binSCRIPTS \
+		install-dbexecDATA install-dbexecLTLIBRARIES \
+		install-libexecsubPROGRAMS \
+		install-exec-hook \
+		install-data-local install-jarDATA
+  endif
+endif
+
+	-ls -l $(d)/usr
+	if [ -d $(d)/usr/man/man1 ]; then \
+	  mv $(d)/usr/man/man1/* $(d)/usr/share/man/man1/; \
+	fi
+
+	chmod 755 debian/dh_*
+	touch $(install_snap_stamp)
+
+$(install_stamp): $(build_stamp)
+	dh_testdir
+	dh_testroot
+	dh_clean -k -N$(p_hppa64)
+	if [ -f $(binary_stamp)-hppa64 ]; then \
+	  mv $(binary_stamp)-hppa64 saved-stamp; \
+	  rm -f $(binary_stamp)*; \
+	  mv saved-stamp $(binary_stamp)-hppa64; \
+	else \
+	  rm -f $(binary_stamp)*; \
+	fi
+
+	: # Install directories
+	rm -rf $(d)
+	mkdir -p $(d)/$(libdir) $(d)/$(PF) $(d)/$(PF)/lib/debug
+ifeq ($(biarch32),yes)
+	mkdir -p $(d)/$(PF)/lib32/debug
+endif
+ifeq ($(biarch),yes)
+	mkdir -p $(d)/$(PF)/lib64/debug
+endif
+
+ifeq ($(with_java)-$(biarch32)-$(DEB_TARGET_ARCH),yes-yes-amd64)
+	rm -rf debian/tmp32
+	$(MAKE) -C $(buildlibdir)/32/libjava \
+		install DESTDIR=$(PWD)/debian/tmp32
+  ifeq ($(with_common_gcclibdir),yes)
+	mv debian/tmp32/$(subst /$(BASE_VERSION),/$(GCC_VERSION),$(gcc_lib_dir)) \
+		debian/tmp32/$(gcc_lib_dir)
+    ifneq ($(gcc_lib_dir),$(gcc_lexec_dir))
+	mv debian/tmp32/$(subst /$(BASE_VERSION),/$(GCC_VERSION),$(gcc_lexec_dir)) \
+		debian/tmp32/$(gcc_lexec_dir)
+    endif
+  endif
+endif
+
+ifeq ($(DEB_TARGET_GNU_CPU),x86_64)
+	: # link lib to lib64 and $(PF)/lib to $(PF)/lib64
+	: # (this works when CONFARGS contains '--disable-multilib')
+	ln -s $(libdir) $(d)/lib64
+	mkdir -p $(d)/$(PF)/$(libdir)
+	ln -s $(libdir) $(d)/$(PF)/lib64
+endif
+
+	: # Install everything
+	PATH=$(PWD)/bin:$$PATH \
+	$(SET_SHELL) \
+	  $(MAKE) -C $(builddir) \
+	    CFLAGS="$(CFLAGS)" \
+	    LDFLAGS="$(LDFLAGS)" \
+	    BOOT_CFLAGS="$(BOOT_CFLAGS)" \
+	    DESTDIR=$(PWD)/$(d) \
+	    infodir=/$(PF)/share/info \
+	    mandir=/$(PF)/share/man \
+		install
+
+ifeq ($(with_java),yes)
+  ifneq (,$(filter yes, $(biarch) $(biarch32)))
+	: # workaround to install the correct binaries for multilib builds
+	PATH=$(PWD)/bin:$$PATH \
+	$(SET_SHELL) \
+	  $(MAKE) -C $(buildlibdir)/libjava \
+	    CFLAGS="$(CFLAGS)" \
+	    LDFLAGS="$(LDFLAGS)" \
+	    BOOT_CFLAGS="$(BOOT_CFLAGS)" \
+	    DESTDIR=$(PWD)/$(d) \
+	    infodir=/$(PF)/share/info \
+	    mandir=/$(PF)/share/man \
+		install-binPROGRAMS install-binSCRIPTS \
+		install-dbexecDATA install-dbexecLTLIBRARIES \
+		install-libexecsubPROGRAMS \
+		install-exec-hook \
+		install-data-local install-jarDATA
+  endif
+endif
+
+ifeq ($(with_common_gcclibdir),yes)
+	mv $(d)/$(subst /$(BASE_VERSION),/$(GCC_VERSION),$(gcc_lib_dir)) \
+		$(d)/$(gcc_lib_dir)
+  ifneq ($(gcc_lib_dir),$(gcc_lexec_dir))
+	mv $(d)/$(subst /$(BASE_VERSION),/$(GCC_VERSION),$(gcc_lexec_dir)) \
+		$(d)/$(gcc_lexec_dir)
+  endif
+endif
+
+	: # remove rpath settings from binaries and shared libs
+	for i in $$(chrpath -k $(d)/$(PF)/bin/* $(d)/$(PF)/lib*/lib*.so.* \
+			$(d)/$(PF)/lib*/gcj$(pkg_ver)*/lib*.so.* \
+			2>/dev/null | awk -F: '/RPATH=/ {print $$1}'); \
+	do \
+	  case "$$i" in ecj1|*gij-*|*libjawt*|*libjvm*) continue; esac; \
+	  [ -h $$i ] && continue; \
+	  chrpath --delete $$i; \
+	  echo "removed RPATH: $$i"; \
+	done
+
+ifneq (,$(findstring emul/ia32-linux, $(lib32)))
+	mkdir -p $(d)/$(lib32)
+	mv $(d)/$(PF)/lib32/* $(d)/$(lib32)/.
+	rmdir $(d)/$(PF)/lib32
+endif
+
+ifeq ($(biarch),yes)
+  ifeq ($(DEB_TARGET_ARCH),i386)
+    ifneq (,$(filter c++, $(enabled_languages)))
+	: # fix biarch C++ header installation
+	mv $(d)/$(cxx_inc_dir)/x86_64-linux-gnu/64 \
+	  $(d)/$(cxx_inc_dir)/i486-linux-gnu/
+	rmdir $(d)/$(cxx_inc_dir)/x86_64-linux-gnu
+    endif
+  endif
+endif
+
+	: # fix '*.la' and '*.lai' files
+	for i in $$(find $(d) -name '*.la' -o -name '*.lai'); do \
+	  libdir=$$(sed -n "s,^libdir='\(.*\)'.*,\1,p" $$i); \
+	  [ -z "$$libdir" ] && continue; \
+	  libdir=$$(realpath -s $$libdir); \
+	  sed -e "s,^libdir='\(.*\)'.*,libdir='$$libdir'," \
+	    -e 's, -L$(builddir)[^ ]*,,g' \
+	    $$i > $$i.new; \
+	  if diff -u $$i $$i.new; then \
+	    rm -f $$i.new; \
+	  else \
+	    echo "$$i: path normalized"; \
+	    touch -r $$i $$i.new; \
+	    mv -f $$i.new $$i; \
+	  fi; \
+	done
+
+ifeq ($(DEB_TARGET_ARCH),amd64)
+	: # fix '*.la' and '*.lai' files (don't resolve the /lib64 symlink)
+	for i in $$(find $(d) -name '*.la' -o -name '*.lai'); do \
+	  sed -e 's,/usr/lib64,/usr/lib,g' -e 's,/lib/\.\./lib64,/lib,g' \
+	    $$i > $$i.new; \
+	  if diff -u $$i $$i.new; then \
+	    rm -f $$i.new; \
+	  else \
+	    echo "$$i: references to lib64 fixed"; \
+	    touch -r $$i $$i.new; \
+	    mv -f $$i.new $$i; \
+	  fi; \
+	done
+endif
+
+ifneq ($(with_libgnat),yes)
+	rm -f $(d)/$(gcc_lib_dir)/adalib/lib*.so*
+endif
+
+ifeq ($(GFDL_INVARIANT_FREE),yes)
+	for i in gcc gcov; do \
+	  I=`echo $$i | tr a-z A-Z`; \
+	  sed -e "s/@NAME@/$$I$(pkg_ver)/g" -e "s/@name@/$$i$(pkg_ver)/g" \
+	    debian/dummy-man.1 > $(d)/$(PF)/share/man/man1/$$i.1; \
+	done
+	cp -p debian/gccbug.1 $(d)/$(PF)/share/man/man1/$(TP)gccbug$(pkg_ver)
+
+  ifeq ($(with_fortran),yes)
+	for i in g77; do \
+	  I=`echo $$i | tr a-z A-Z`; \
+	  sed -e "s/@NAME@/$$I$(pkg_ver)/g" -e "s/@name@/$$i$(pkg_ver)/g" \
+	    debian/dummy-man.1 > $(d)/$(PF)/share/man/man1/$$i.1; \
+	done
+  endif
+  ifeq ($(with_java),yes)
+	for i in gcj gcjh gij jv-convert jv-scan jcf-dump grmic grmiregistry; \
+	do \
+	  I=`echo $$i | tr a-z A-Z`; \
+	  sed -e "s/@NAME@/$$I$(pkg_ver)/g" -e "s/@name@/$$i$(pkg_ver)/g" \
+	    debian/dummy-man.1 > $(d)/$(PF)/share/man/man1/$$i.1; \
+	done
+  endif
+endif
+
+ifeq ($(with_pascal),yes)
+	: # gpc is already versioned with the gcc version.
+	mv $(d)/$(PF)/bin/gpc$(pkg_ver) $(d)/$(PF)/bin/gpc
+	mv $(d)/$(PF)/share/man/man1/gpc$(pkg_ver).1 \
+		$(d)/$(PF)/share/man/man1/gpc.1
+endif
+ifeq ($(versioned_packages),yes)
+  ifeq ($(with_pascal),yes)
+    ifeq ($(GFDL_INVARIANT_FREE),yes-XXXX)
+	for i in binobj gpc gpc-run gpidump; do \
+	  I=`echo $$i | tr a-z A-Z`; \
+	  sed -e "s/@NAME@/$$I$(gpc_pkg_ver)/g" \
+	      -e "s/@name@/$$i$(gpc_pkg_ver)/g" \
+	    debian/dummy-man.1 > $(d)/$(PF)/share/man/man1/$$i.1; \
+	done
+    endif
+    ifeq ($(with_gpidump),yes)
+	: # rename files (versioned gpc binaries)
+	for i in binobj gpc gpc-run gpidump; do \
+	  mv $(d)/$(PF)/bin/$$i $(d)/$(PF)/bin/$$i$(gpc_pkg_ver); \
+	done
+	: # rename files (versioned gpc man pages)
+	for i in binobj gpc gpc-run gpidump; do \
+	  mv $(d)/$(PF)/share/man/man1/$$i.1 \
+		$(d)/$(PF)/share/man/man1/$$i$(gpc_pkg_ver).1; \
+	done
+    else
+	: # rename files (versioned gpc binaries)
+	for i in binobj gpc gpc-run; do \
+	  mv $(d)/$(PF)/bin/$$i $(d)/$(PF)/bin/$$i$(gpc_pkg_ver); \
+	done
+	: # rename files (versioned gpc man pages)
+	for i in binobj gpc gpc-run; do \
+	  mv $(d)/$(PF)/share/man/man1/$$i.1 \
+		$(d)/$(PF)/share/man/man1/$$i$(gpc_pkg_ver).1; \
+	done
+    endif
+  endif
+endif
+
+#  ifeq ($(with_ada),yes)
+#	: # rename files (versioned ada binaries)
+#	for i in ; do \
+#	  mv $(d)/$(PF)/bin/$$i $(d)/$(PF)/bin/$$i-$(GNAT_VERSION); \
+#	  mv $(d)/$(PF)/share/man/man1/$$i.1 \
+#		$(d)/$(PF)/share/man/man1/$$i-$(GNAT_VERSION).1; \
+#	done
+#	for i in $(GNAT_TOOLS); do \
+#	  mv $(d)/$(PF)/bin/$$i $(d)/$(PF)/bin/$$i-$(GNAT_VERSION); \
+#	done
+#  endif
+
+#ifneq ($(with_libgcc),yes)
+#	: # needed for dependency of other shared libs
+#	echo 'libgcc_s $(GCC_SONAME) libgcc$(GCC_SONAME) (>= $(DEB_LIBGCC_SOVERSION))' \
+#	    > debian/shlibs.local
+#endif
+
+ifdef DEB_CROSS
+  ifeq ($(DEB_TARGET_ARCH),s390)
+	: # s390 64bit stuff happens to be in s390x-linux-gnu/lib64/
+	mkdir -p $(d)/$(PF)/s390-linux-gnu/lib64
+	cp -a $(d)/$(PF)/s390x-linux-gnu/lib64/* $(d)/$(PF)/s390-linux-gnu/lib64/
+  endif
+endif
+
+	chmod 755 debian/dh_*
+
+#	tar cf tmp.tar debian/tmp
+
+	touch $(install_stamp)
+
+$(install_hppa64_stamp): $(build_hppa64_stamp)
+	dh_testdir
+	dh_testroot
+	rm -rf $(d_hppa64)
+	mkdir -p $(d_hppa64)/$(PF)
+
+	PATH=$(PWD)/bin:$$PATH \
+	    $(MAKE) -C $(builddir_hppa64) \
+		CC="$(CC)" \
+		CFLAGS="$(CFLAGS)" \
+		BOOT_CFLAGS="$(BOOT_CFLAGS)" \
+		LDFLAGS="$(LDFLAGS)" \
+		DESTDIR=$(PWD)/$(d_hppa64) \
+		    install
+
+ifeq ($(versioned_packages),yes)
+	mv $(d_hppa64)/$(PF)/bin/hppa64-linux-gnu-gcc-$(GCC_VERSION) \
+		$(d_hppa64)/$(PF)/bin/hppa64-linux-gnu-gcc$(pkg_ver)
+	mv $(d_hppa64)/$(PF)/bin/hppa64-linux-gnu-cpp \
+		$(d_hppa64)/$(PF)/bin/hppa64-linux-gnu-cpp$(pkg_ver)
+endif
+
+ifneq ($(PKGSOURCE),gcc-snapshot)
+	: # remove files not needed
+	rm -rf $(d_hppa64)/$(PF)/info
+	rm -rf $(d_hppa64)/$(PF)/man
+	rm -f $(d_hppa64)/$(PF)/lib/libiberty.a
+	rm -f $(d_hppa64)/$(PF)/bin/*{protoize,gcov,gccbug,gcc}
+
+	rm -rf $(d_hppa64)/$(PF)/hppa64-linux-gnu/include
+	rm -rf $(d_hppa64)/$(PF)/hppa64-linux-gnu/lib
+endif
+
+	touch $(install_hppa64_stamp)
+
+# ----------------------------------------------------------------------
+# Build architecture-dependent files here.
+#binary-arch: build install $(foreach i,$(arch_binaries),$(binary_stamp)-$(i))
+binary-arch: $(foreach i,$(arch_binaries),$(binary_stamp)-$(i))
+ifeq ($(with_check),yes)
+	@echo Done
+#	: # Send Email about sucessfull build.
+#	# cat raw-test-summary | sh; echo "Sent mail to $(S_EMAIL)"
+endif
+
+# ----------------------------------------------------------------------
+# Build architecture-independent files here.
+#binary-indep: build install $(foreach i,$(indep_binaries),$(binary_stamp)-$(i))
+binary-indep: $(foreach i,$(indep_binaries),$(binary_stamp)-$(i))
+
+source diff:
+	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary
--- gcj-4.2-4.2-20070707.orig/debian/README.libstdc++-baseline.in
+++ gcj-4.2-4.2-20070707/debian/README.libstdc++-baseline.in
@@ -0,0 +1,2 @@
+The libstdc++ baseline file is a list of symbols exported by the
+libstdc++ library.
--- gcj-4.2-4.2-20070707.orig/debian/gpc-PV-BV-doc.doc-base.gpcs
+++ gcj-4.2-4.2-20070707/debian/gpc-PV-BV-doc.doc-base.gpcs
@@ -0,0 +1,23 @@
+Document: gpcs-@PV@-@BV@-doc
+Title: The GNU Pascal Coding Standards
+Author: Various
+Abstract: The GNU Pascal Coding Standards were designed by a group of
+ GNU Pascal project volunteers. The aim of this document is extending
+ the GNU Coding Standards with specific information relating Pascal
+ programming.  As a matter of fact, the information contained in the
+ GNU Coding Standards mainly pertains to programs written in the C
+ language. On the other hand, they also explain many of the rules and
+ principles that are useful for writing portable, robust and reliable
+ programs. Most of those general topics could be shared with this
+ document with just a few specific notes, thus cross references are
+ provided which will lead you to the more extensive information
+ contained in the GNU Coding Standards.
+Section: Apps/Programming
+
+Format: html
+Index: /usr/share/doc/gcc-@BV@-base/pascal/gpcs.html
+Files: /usr/share/doc/gcc-@BV@-base/pascal/gpcs.html
+
+Format: info
+Index: /usr/share/info/gpcs-@PV@-@BV@.info.gz
+Files: /usr/share/info/gpcs-@PV@-@BV@*
--- gcj-4.2-4.2-20070707.orig/debian/rules
+++ gcj-4.2-4.2-20070707/debian/rules
@@ -0,0 +1,86 @@
+#! /usr/bin/make -f
+# -*- makefile -*-
+# Build rules for gcc (>= 2.95) and gcc-snapshot
+# Targets found in this makefile:
+#	- unpack tarballs
+#	- patch sources
+#	- (re)create the control file
+#	- create a debian/rules.parameters file, which is included
+#	  by debian/rules2
+# All other targets are passed to the debian/rules2 file
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+unexport LANG LC_ALL LC_CTYPE LC_COLLATE LC_TIME LC_NUMERIC LC_MESSAGES
+
+default: build
+
+include debian/rules.defs
+include debian/rules.unpack
+include debian/rules.patch
+
+control: $(control_dependencies)
+	-mkdir -p $(stampdir)
+	$(MAKE) -f debian/rules.conf $@
+
+configure: $(configure_dependencies)
+$(configure_stamp): control $(unpack_stamp) $(patch_stamp)
+	$(MAKE) -f debian/rules2 $@
+$(configure_dummy_stamp): control
+	$(MAKE) -f debian/rules2 $@
+$(configure_hppa64_stamp): $(build_stamp)
+	$(MAKE) -f debian/rules2 $@
+
+build: $(build_dependencies)
+$(build_stamp): $(unpack_stamp) $(patch_stamp) $(configure_stamp)
+	$(MAKE) -f debian/rules2 $@
+$(build_dummy_stamp): $(configure_dummy_stamp)
+	$(MAKE) -f debian/rules2 $@
+$(build_javadoc_stamp): $(build_stamp)
+	$(MAKE) -f debian/rules2 $@
+$(build_hppa64_stamp): $(configure_hppa64_stamp)
+	$(MAKE) -f debian/rules2 $@
+
+check: $(build_stamp)
+	$(MAKE) -f debian/rules2 $@
+
+clean:
+	rm -rf $(stampdir)
+# remove temporary dirs used for unpacking
+	rm -rf $(gcc_srcdir) $(gpc_srcdir) p
+	-$(MAKE) -f debian/rules2 $@
+	rm -rf $(srcdir) $(builddir)* debian/tmp* html
+	rm -f bootstrap-* first-move-stamp
+	rm -f debian/*.tmp
+	find debian -name '.#*' | xargs -r rm -f
+	find debian/patches -name '*.dpatch' -type f ! -perm 644 | xargs -r chmod 644
+	dh_clean
+
+install: $(install_dependencies)
+$(install_stamp): $(build_stamp)
+	$(MAKE) -f debian/rules2 $@
+$(install_snap_stamp): $(build_stamp)
+	$(MAKE) -f debian/rules2 $@
+$(install_dummy_stamp): $(build_dummy_stamp)
+	$(MAKE) -f debian/rules2 $@
+$(install_hppa64_stamp): $(build_hppa64_stamp)
+	$(MAKE) -f debian/rules2 $@
+
+html-docs doxygen-docs update-doxygen-docs update-ada-files xxx:
+	$(MAKE) -f debian/rules2 $@
+
+binary-indep binary-arch binary: install
+	$(MAKE) -f debian/rules2 $@
+
+source diff:
+	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
+
+release:
+	foo=$(shell basename $(CURDIR)); \
+		if [ "$$foo" != "gcc-3.4" ]; then \
+			find -name CVS -o -name .cvsignore -o -name '.#*' | \
+				xargs rm -rf; \
+		fi
+
+.PHONY: build clean binary-indep binary-arch binary release
--- gcj-4.2-4.2-20070707.orig/debian/gcc-cross.postinst
+++ gcj-4.2-4.2-20070707/debian/gcc-cross.postinst
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+update-alternatives --quiet \
+	--install /usr/bin/cross-gcc cross-gcc /usr/bin/cross-gcc-ver 41 \
+	--slave /usr/share/man/man1/cross-gcc.1.gz cross-gcc.1.gz /usr/share/man/man1/cross-gcc-ver.1.gz
+
+exit 0
--- gcj-4.2-4.2-20070707.orig/debian/rules.source
+++ gcj-4.2-4.2-20070707/debian/rules.source
@@ -0,0 +1,21 @@
+__SOURCE_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
+patchdir = $(__SOURCE_DIR)/patches
+
+include $(__SOURCE_DIR)/rules.defs
+include $(__SOURCE_DIR)/rules.patch
+include $(__SOURCE_DIR)/rules.unpack
+
+patch-source: $(patch_stamp)
+	( \
+	  echo '#define __$(subst -,_,$(DEB_TARGET_GNU_TYPE))__'; \
+	  echo ''; \
+	  echo '  { "",  "$(DEB_TARGET_GNU_TYPE)"},'; \
+	  cat $(__SOURCE_DIR)/multiarch.inc; \
+	) > $(srcdir)/gcc/multiarch.inc
+
+clean-source:
+	rm -rf $(stampdir)
+	rm -rf $(gcc_srcdir) $(gpc_srcdir) p
+	rm -rf bin
+	rm -rf $(srcdir)
+
--- gcj-4.2-4.2-20070707.orig/debian/control
+++ gcj-4.2-4.2-20070707/debian/control
@@ -0,0 +1,192 @@
+Source: gcj-4.2
+Section: devel
+Priority: standard
+Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian GCC Maintainers <debian-gcc@lists.debian.org>
+Uploaders: Matthias Klose <doko@debian.org>
+Standards-Version: 3.7.2
+Build-Depends: dpkg-dev (>= 1.13.9), gcc-4.1-multilib [amd64 i386 powerpc ppc64 s390 sparc kfreebsd-amd64] | gcc-4.2-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, expect-tcl8.3 [!m68k !hurd-i386], bzip2, binutils (>= 2.17cvs20070426) | binutils-multiarch (>= 2.17cvs20070426), binutils-hppa64 (>= 2.17cvs20070426) [hppa], debhelper (>= 5.0), gperf (>= 3.0.1), bison (>= 1:2.3), flex, gettext, texinfo (>= 4.3), libmpfr-dev (>= 2.2.1) [!avr], locales [!hurd-i386 !knetbsd-i386 !netbsd-i386], procps [!hurd-i386], sharutils, libz-dev, fastjar [!kfreebsd-amd64 !knetbsd-i386 !netbsd-i386 !hurd-i386], libmagic-dev [!kfreebsd-amd64 !knetbsd-i386 !netbsd-i386 !hurd-i386], ecj (>= 3.2.1-6) [!kfreebsd-amd64 !knetbsd-i386 !netbsd-i386 !hurd-i386], zip [!kfreebsd-amd64 !knetbsd-i386 !netbsd-i386 !hurd-i386], libasound2-dev [!kfreebsd-amd64 !knetbsd-i386 !netbsd-i386 !hurd-i386 !hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], lib32asound2-dev [amd64 ppc64], lib64asound2-dev [i386 powerpc sparc s390], libxtst-dev [!kfreebsd-amd64 !knetbsd-i386 !netbsd-i386 !hurd-i386], libxt-dev [!kfreebsd-amd64 !knetbsd-i386 !netbsd-i386 !hurd-i386], libgtk2.0-dev (>= 2.4.4-2) [!kfreebsd-amd64 !knetbsd-i386 !netbsd-i386 !hurd-i386], libart-2.0-dev [!kfreebsd-amd64 !knetbsd-i386 !netbsd-i386 !hurd-i386], libcairo2-dev [!kfreebsd-amd64 !knetbsd-i386 !netbsd-i386 !hurd-i386], libgconf2-dev [!kfreebsd-amd64 !knetbsd-i386 !netbsd-i386 !hurd-i386], firefox-dev [!kfreebsd-amd64 !knetbsd-i386 !netbsd-i386 !hurd-i386], gcc-4.2-source (>= 4.2-20070707), gcc-4.2-source (<< 4.2.0), realpath (>= 1.9.12), chrpath, lsb-release, make (>= 3.81)
+Build-Depends-Indep:  gjdoc
+
+Package: gcj-4.2-base
+Architecture: any
+Section: libs
+Priority: optional
+Description: The GNU Compiler Collection (gcj base package)
+ This package contains files common to all java related packages
+ built from the GNU Compiler Collection (GCC).
+
+Package: gcj-4.2
+Architecture: any
+Priority: optional
+Depends: gcj-4.2-base (= ${gcj:Version}), ${dep:gcj}, ${dep:libcdev}, gij-4.2 (= ${gcj:Version}), libgcj8-dev (= ${gcj:Version}), libgcj8-jar (>= ${gcj:SoftVersion}), ecj (>= 3.2.1-6), java-common, ${shlibs:Depends}
+Recommends: fastjar, ecj-gcj
+Suggests: java-gcj-compat-dev
+Provides: java-compiler
+Conflicts: cpp-4.1 (<< 4.1.1), gcc-4.1 (<< 4.1.1), java-gcj-compat-dev (<< 1.0.56-2)
+Description: The GNU compiler for Java(TM)
+ GCJ is a front end to the GCC compiler which can natively compile both
+ Java(tm) source and bytecode files. The compiler can also generate class
+ files.
+
+Package: gij-4.2
+Priority: optional
+Architecture: any
+Depends: gcj-4.2-base (= ${gcj:Version}), libgcj8-0 (= ${gcj:Version}), ${dep:prctl}, ${shlibs:Depends}
+Recommends: libgcj8-0-awt (= ${gcj:Version})
+Suggests: fastjar, gcj-4.2 (= ${gcj:Version}), java-gcj-compat
+Replaces: libgcj8
+Provides: java-virtual-machine, java2-runtime, java1-runtime, java-runtime
+Description: The GNU Java bytecode interpreter
+ GIJ is not limited to interpreting bytecode. It includes a class loader which
+ can dynamically load shared objects, so it is possible to give it the name
+ of a class which has been compiled and put into a shared library on the
+ class path.
+
+Package: libgcj8-0
+Section: libs
+Architecture: any
+Priority: optional
+Depends: gcj-4.2-base (>= ${gcj:Version}), libgcj-common (>= 1:4.1.1-21), ${shlibs:Depends}
+Recommends: libgcj8-jar (>= ${gcj:SoftVersion}), libgcj8-0-awt (= ${gcj:Version})
+Suggests: libgcj8-dbg
+Conflicts: libgcj8
+Replaces: libgcj8, libgcj8-awt (<< 4.2-20060817)
+Description: Java runtime library for use with gcj
+ This is the runtime that goes along with the gcj front end to
+ gcc. libgcj includes parts of the Java Class Libraries, plus glue to
+ connect the libraries to the compiler and the underlying OS.
+ .
+ To show file names and line numbers in stack traces, the packages
+ libgcj8-dbg and binutils are required.
+
+Package: libgcj8-jar
+Section: libs
+Architecture: all
+Priority: optional
+Depends: gcj-4.2-base (>= ${gcj:SoftVersion}), libgcj8-0 (>= ${gcj:SoftVersion})
+Conflicts: libgcj7-common
+Replaces: libgcj7-common
+Description: Java runtime library for use with gcj (jar files)
+ This is the jar file that goes along with the gcj front end to gcc.
+
+Package: libgcj8-0-awt
+Section: libs
+Architecture: any
+Priority: optional
+Depends: gcj-4.2-base (= ${gcj:Version}), libgcj8-0 (= ${gcj:Version}), ${shlibs:Depends}
+Suggests: ${pkg:gcjqt}
+Replaces: libgcj8-awt-gtk (<< 4.2-20070210)
+Description: AWT peer runtime libraries for use with gcj
+ These are runtime libraries holding the AWT peer implementations
+ for libgcj (currently the GTK based peer library is required, the
+ QT bases library is not built).
+
+Package: gappletviewer-4.2
+Section: utils
+Architecture: any
+Priority: optional
+Depends: gcj-4.2-base (= ${gcj:Version}), gij-4.2 (= ${gcj:Version}), libgcj8-0-awt (= ${gcj:Version}), ${shlibs:Depends}
+Description: Standalone application to execute Java (tm) applets
+ gappletviewer is a standalone application to execute Java (tm) applets.
+
+Package: gcjwebplugin-4.2
+Section: web
+Architecture: any
+Priority: optional
+Depends: gcj-4.2-base (= ${gcj:Version}), gappletviewer-4.2 (= ${gcj:Version}), ${shlibs:Depends}, firefox | mozilla-browser | epiphany-browser | galeon | konqueror
+Description: Web browser plugin to execute Java (tm) applets
+ gcjwebplugin is a little web browser plugin to execute Java (tm) applets.
+ It is targeted for Mozilla and compatible browsers that support the NPAPI.
+
+Package: lib64gcj8-0
+Section: libs
+Architecture: i386 powerpc sparc s390
+Priority: optional
+Depends: gcj-4.2-base (= ${gcj:Version}), libgcj-common, ${shlibs:Depends}
+Description: Java runtime library for use with gcj (64bit)
+ This is the runtime that goes along with the gcj front end to
+ gcc. libgcj includes parts of the Java Class Libraries, plus glue to
+ connect the libraries to the compiler and the underlying OS.
+
+Package: lib32gcj8-0
+Section: libs
+Architecture: amd64 ppc64 kfreebsd-amd64
+Priority: optional
+Depends: gcj-4.2-base (= ${gcj:Version}), libgcj-common, lib32stdc++6, lib32z1
+Suggests: lib32gcj8-dbg
+Description: Java runtime library for use with gcj (32bit)
+ This is the runtime that goes along with the gcj front end to
+ gcc. libgcj includes parts of the Java Class Libraries, plus glue to
+ connect the libraries to the compiler and the underlying OS.
+ .
+ To show file names and line numbers in stack traces, the packages
+ libgcj8-dbg and binutils are required.
+
+Package: libgcj8-dev
+Section: libdevel
+Architecture: any
+Priority: optional
+Depends: gcj-4.2-base (= ${gcj:Version}), gcj-4.2 (= ${gcj:Version}), libgcj8-jar (>= ${gcj:SoftVersion}), libgcj8-0-awt (= ${gcj:Version}), libgcj-bc, ${pkg:gcjgtk}, ${pkg:gcjqt}, zlib1g-dev, ${shlibs:Depends}
+Suggests: libgcj-doc
+Description: Java development headers and static library for use with gcj
+ These are the development headers and static libraries that go along
+ with the gcj front end to gcc. libgcj includes parts of the Java Class
+ Libraries, plus glue to connect the libraries to the compiler and the
+ underlying OS.
+
+Package: lib32gcj8-dev
+Section: libdevel
+Architecture: amd64 ppc64 kfreebsd-amd64
+Priority: optional
+Depends: gcj-4.2-base (= ${gcj:Version}), libgcj8-dev (= ${gcj:Version}), lib32gcj-bc, lib32gcj8-0 (= ${gcj:Version}), lib32z1-dev, ${shlibs:Depends}
+Description: Java development and static library for use with gcj (32bit)
+ These are the development headers and static libraries that go along
+ with the gcj front end to gcc. libgcj includes parts of the Java Class
+ Libraries, plus glue to connect the libraries to the compiler and the
+ underlying OS.
+
+Package: libgcj8-dbg
+Section: libdevel
+Architecture: any
+Priority: extra
+Depends: gcj-4.2-base (= ${gcj:Version}), libgcj8-0 (= ${gcj:Version})
+Recommends: binutils
+Description: Debugging symbols for libraries provided in libgcj8-dev
+ The package provides debugging symbols for the libraries provided
+ in libgcj8-dev.
+ .
+ binutils is required to show file names and line numbers in stack traces.
+
+Package: lib32gcj8-dbg
+Section: libdevel
+Architecture: amd64 ppc64 kfreebsd-amd64
+Priority: extra
+Depends: gcj-4.2-base (= ${gcj:Version}), lib32gcj8-0 (= ${gcj:Version})
+Recommends: binutils
+Description: Debugging symbols for libraries provided in lib32gcj8-dev
+ The package provides debugging symbols for the libraries provided
+ in lib32gcj8-dev.
+ .
+ binutils is required to show file names and line numbers in stack traces.
+
+Package: libgcj8-src
+Section: libdevel
+Architecture: all
+Priority: optional
+Depends: gcj-4.2-base (>= ${gcj:SoftVersion}), gcj-4.2 (>= ${gcj:SoftVersion}), libgcj8-jar (= ${gcj:Version})
+Description: libgcj java sources for use in eclipse
+ These are the java source files packaged as a zip file for use in development
+ environments like eclipse.
+
+Package: libgcj-doc
+Section: doc
+Architecture: all
+Priority: optional
+Depends: gcj-4.2-base (>= ${gcj:SoftVersion})
+Enhances: libgcj8-dev
+Provides: classpath-doc
+Description: libgcj API documentation and example programs
+ Autogenerated documentation describing the API of the libgcj library.
+ Sources and precompiled example programs from the classpath library.
+
--- gcj-4.2-4.2-20070707.orig/debian/dummy.texi
+++ gcj-4.2-4.2-20070707/debian/dummy.texi
@@ -0,0 +1 @@
+@c This file is empty because the original one has a non DFSG free license (GFDL)
--- gcj-4.2-4.2-20070707.orig/debian/rules.d/binary-cpp-cross.mk
+++ gcj-4.2-4.2-20070707/debian/rules.d/binary-cpp-cross.mk
@@ -0,0 +1,40 @@
+arch_binaries  := $(arch_binaries) cpp
+
+dirs_cpp = \
+	$(docdir) \
+	$(PF)/share/man/man1 \
+	$(PF)/bin \
+	$(gcc_lexec_dir)
+
+files_cpp = \
+	$(PF)/bin/$(DEB_TARGET_GNU_TYPE)-cpp$(pkg_ver) \
+	$(PF)/share/man/man1/$(DEB_TARGET_GNU_TYPE)-cpp$(pkg_ver).1 \
+	$(gcc_lexec_dir)/cc1
+
+# ----------------------------------------------------------------------
+$(binary_stamp)-cpp: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_cpp)
+	dh_installdirs -p$(p_cpp) $(dirs_cpp)
+	DH_COMPAT=2 dh_movefiles -p$(p_cpp) $(files_cpp)
+
+	debian/dh_doclink -p$(p_cpp) $(p_base)
+	debian/dh_rmemptydirs -p$(p_cpp)
+
+	dh_strip -p$(p_cpp)
+	dh_compress -p$(p_cpp)
+	dh_fixperms -p$(p_cpp)
+	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
+	chmod 755 debian/$(p_cpp)/DEBIAN/{postinst,prerm}
+	dh_md5sums -p$(p_cpp)
+	dh_builddeb -p$(p_cpp)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+
--- gcj-4.2-4.2-20070707.orig/debian/rules.d/binary-libstdcxx-cross.mk
+++ gcj-4.2-4.2-20070707/debian/rules.d/binary-libstdcxx-cross.mk
@@ -0,0 +1,327 @@
+ifeq ($(with_libcxx),yes)
+  arch_binaries  := $(arch_binaries) libstdcxx
+endif
+ifeq ($(with_lib64cxx),yes)
+  arch_binaries  := $(arch_binaries) lib64stdcxx
+endif
+ifeq ($(biarch32),yes)
+  arch_binaries	:= $(arch_binaries) lib32stdcxx
+endif
+
+ifeq ($(with_cxxdev),yes)
+  arch_binaries  := $(arch_binaries) libstdcxx-dev
+endif
+
+libstdc_ext = -$(BASE_VERSION)
+
+p_lib	= libstdc++$(CXX_SONAME)$(cross_lib_arch)
+p_lib64	= lib64stdc++$(CXX_SONAME)$(cross_lib_arch)
+p_lib32	= lib32stdc++$(CXX_SONAME)$(cross_lib_arch)
+p_dev	= libstdc++$(CXX_SONAME)$(libstdc_ext)-dev$(cross_lib_arch)
+p_pic	= libstdc++$(CXX_SONAME)$(libstdc_ext)-pic$(cross_lib_arch)
+p_dbg	= libstdc++$(CXX_SONAME)$(libstdc_ext)-dbg$(cross_lib_arch)
+p_dbg64	= lib64stdc++$(CXX_SONAME)$(libstdc_ext)-dbg$(cross_lib_arch)
+p_dbg32	= lib32stdc++$(CXX_SONAME)$(libstdc_ext)-dbg$(cross_lib_arch)
+
+d_lib	= debian/$(p_lib)
+d_lib64	= debian/$(p_lib64)
+d_lib32	= debian/$(p_lib32)
+d_dev	= debian/$(p_dev)
+d_pic	= debian/$(p_pic)
+d_dbg	= debian/$(p_dbg)
+d_dbg64	= debian/$(p_dbg64)
+d_dbg32	= debian/$(p_dbg32)
+
+dirs_lib = \
+	$(docdir) \
+	$(PF)/$(DEB_TARGET_GNU_TYPE)/lib
+
+dirs_lib64 = \
+	$(docdir) \
+	$(PF)/$(DEB_TARGET_GNU_TYPE)/lib64
+
+files_lib = \
+	$(PF)/$(DEB_TARGET_GNU_TYPE)/lib/libstdc++.so.*
+
+files_lib64 = \
+	$(PF)/$(DEB_TARGET_GNU_TYPE)/lib64/libstdc++.so.*
+
+dirs_dev = \
+	$(docdir) \
+	$(PF)/$(DEB_TARGET_GNU_TYPE)/lib \
+	$(gcc_lib_dir)/include \
+	$(cxx_inc_dir)
+
+files_dev = \
+	$(cxx_inc_dir)/ \
+	$(gcc_lib_dir)/libstdc++.{a,so} \
+	$(gcc_lib_dir)/libsupc++.a
+# Not yet...
+#	$(PF)/$(libdir)/lib{supc,stdc}++.la
+
+dirs_dbg = \
+	$(docdir) \
+	$(PF)/$(DEB_TARGET_GNU_TYPE)/lib/debug \
+	$(gcc_lib_dir)
+files_dbg = \
+	$(PF)/$(DEB_TARGET_GNU_TYPE)/lib/debug/libstdc++.*
+
+dirs_pic = \
+	$(docdir) \
+	$(gcc_lib_dir)
+files_pic = \
+	$(gcc_lib_dir)/libstdc++_pic.a
+
+ifeq ($(biarch),yes)
+    dirs_dev += $(gcc_lib_dir)/$(biarchsubdir)
+    files_dev += \
+	$(gcc_lib_dir)/$(biarchsubdir)/libstdc++.{a,so} \
+        $(gcc_lib_dir)/$(biarchsubdir)/libsupc++.a
+    dirs_pic += $(gcc_lib_dir)
+    files_pic += $(gcc_lib_dir)/$(biarchsubdir)/libstdc++_pic.a
+endif
+ifeq ($(biarch32),yes)
+    dirs_dev += $(gcc_lib_dir)/$(biarchsubdir)/
+    files_dev += \
+	$(gcc_lib_dir)/$(biarchsubdir)/libstdc++.{a,so} \
+        $(gcc_lib_dir)/$(biarchsubdir)/libsupc++.a
+    dirs_pic += $(gcc_lib_dir)
+    files_pic += $(gcc_lib_dir)/$(biarchsubdir)/libstdc++_pic.a
+endif
+
+# ----------------------------------------------------------------------
+
+$(binary_stamp)-libstdcxx: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_lib)
+	dh_installdirs -p$(p_lib) $(dirs_lib)
+	DH_COMPAT=2 dh_movefiles -p$(p_lib) $(files_lib)
+
+	dh_installdocs -p$(p_lib)
+	echo "See /$(docdir)/$(p_base) for more information" \
+		> $(d_lib)/$(docdir)/$(p_lib)/README.Debian
+
+	dh_installchangelogs -p$(p_lib)
+	debian/dh_rmemptydirs -p$(p_lib)
+
+	mkdir -p $(d_dbg)
+	PATH=/usr/share/dpkg-cross:$$PATH dh_strip -p$(p_lib) --keep-debug
+	# The above line puts debugging information into some strange location
+	# that is hardcoded into dh_strip. Move it from there.
+	mkdir -p $(d_lib)/usr/$(DEB_TARGET_GNU_TYPE)/lib/debug
+	mv $(d_lib)/usr/lib/debug/usr/$(DEB_TARGET_GNU_TYPE)/lib/* $(d_lib)/usr/$(DEB_TARGET_GNU_TYPE)/lib/debug/
+	rm -rf $(d_lib)/usr/lib
+	# End workaround
+	find $(d_dbg)
+	tar -C $(d_lib) -c -f - usr/$(DEB_TARGET_GNU_TYPE)/lib/debug | tar -v -C $(d_dbg) -x -f -
+	rm -rf $(d_lib)/usr/$(DEB_TARGET_GNU_TYPE)/lib/debug
+
+	dh_compress -p$(p_lib)
+	dh_fixperms -p$(p_lib)
+	dh_makeshlibs -p$(p_lib) -V '$(p_lib) (>= $(DEB_STDCXX_SOVERSION))' -n
+	sed s/$(cross_lib_arch)//g < debian/$(p_lib)/DEBIAN/shlibs > debian/$(p_lib)/DEBIAN/shlibs.fixed
+	mv debian/$(p_lib)/DEBIAN/shlibs.fixed debian/$(p_lib)/DEBIAN/shlibs
+	ARCH=$(DEB_TARGET_ARCH) MAKEFLAGS="CC=something" dh_shlibdeps -p$(p_lib)
+	sed 's/\(lib[^ ]*\) /\1$(cross_lib_arch) /g' < debian/$(p_lib).substvars > debian/$(p_lib).substvars.new
+	mv debian/$(p_lib).substvars.new debian/$(p_lib).substvars
+	dh_gencontrol -p$(p_lib) -- -v$(DEB_VERSION) $(common_substvars)
+
+	dh_installdeb -p$(p_lib)
+	dh_md5sums -p$(p_lib)
+	dh_builddeb -p$(p_lib)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+
+# ----------------------------------------------------------------------
+
+$(binary_stamp)-lib64stdcxx: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_lib64)
+	dh_installdirs -p$(p_lib64) $(dirs_lib64)
+	DH_COMPAT=2 dh_movefiles -p$(p_lib64) $(files_lib64)
+
+	dh_installdirs -p$(p_dbg64) \
+		$(PF)/$(DEB_TARGET_GNU_TYPE)/lib64
+	mv $(d)/$(PF)/$(DEB_TARGET_GNU_TYPE)/lib64/debug $(d_dbg64)/$(PF)/$(DEB_TARGET_GNU_TYPE)/lib64/.
+
+	mkdir -p $(d_dbg64)
+	PATH=/usr/share/dpkg-cross:$$PATH dh_strip -p$(p_lib64) --keep-debug
+	# The above line puts debugging information into some strange location
+	# that is hardcoded into dh_strip. Move it from there.
+	mkdir -p $(d_lib64)/usr/$(DEB_TARGET_GNU_TYPE)/lib64/debug
+	mv $(d_lib64)/usr/lib/debug/usr/$(DEB_TARGET_GNU_TYPE)/lib64/* $(d_lib64)/usr/$(DEB_TARGET_GNU_TYPE)/lib64/debug/
+	rm -rf $(d_lib64)/usr/lib64
+	# End workaround
+	find $(d_lib64)
+	tar -C $(d_lib64) -c -f - usr/$(DEB_TARGET_GNU_TYPE)/lib64/debug | tar -v -C $(d_dbg64) -x -f -
+	rm -rf $(d_lib64)/usr/$(DEB_TARGET_GNU_TYPE)/lib64/debug
+
+	dh_installdocs -p$(p_lib64)
+	echo "See /$(docdir)/$(p_base) for more information" \
+		> $(d_lib64)/$(docdir)/$(p_lib64)/README.Debian
+	dh_installchangelogs -p$(p_lib64)
+	debian/dh_doclink -p$(p_dbg64) $(p_lib64)
+
+	debian/dh_rmemptydirs -p$(p_lib64)
+	dh_compress -p$(p_lib64)
+	dh_fixperms -p$(p_lib64)
+	dh_makeshlibs -p$(p_lib64) -V '$(p_lib64) (>= $(DEB_STDCXX_SOVERSION))' -n
+	sed s/$(cross_lib_arch)//g < debian/$(p_lib64)/DEBIAN/shlibs > debian/$(p_lib64)/DEBIAN/shlibs.fixed
+	mv debian/$(p_lib64)/DEBIAN/shlibs.fixed debian/$(p_lib64)/DEBIAN/shlibs
+	ARCH=$(DEB_TARGET_ARCH) MAKEFLAGS="CC=something" dh_shlibdeps -p$(p_lib64)
+	sed 's/\(lib[^ ]*\) /\1$(cross_lib_arch) /g' < debian/$(p_lib64).substvars > debian/$(p_lib64).substvars.new
+	mv debian/$(p_lib64).substvars.new debian/$(p_lib64).substvars
+	dh_gencontrol -p$(p_lib64) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_gencontrol -p$(p_dbg64) -- -v$(DEB_VERSION) $(common_substvars)
+
+	dh_installdeb -p$(p_lib64)
+	dh_md5sums -p$(p_lib64)
+	dh_builddeb -p$(p_lib64)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+
+# ----------------------------------------------------------------------
+
+$(binary_stamp)-lib32stdcxx: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_lib32)
+	dh_installdirs -p$(p_lib32) $(dirs_lib32)
+	DH_COMPAT=2 dh_movefiles -p$(p_lib32) $(files_lib32)
+
+	dh_installdirs -p$(p_dbg32) \
+		$(PF)/$(DEB_TARGET_GNU_TYPE)/lib32
+	mv $(d)/$(PF)/$(DEB_TARGET_GNU_TYPE)/lib32/debug $(d_dbg32)/$(PF)/$(DEB_TARGET_GNU_TYPE)/lib32/.
+
+	mkdir -p $(d_dbg32)
+	PATH=/usr/share/dpkg-cross:$$PATH dh_strip -p$(p_lib32) --keep-debug
+	# The above line puts debugging information into some strange location
+	# that is hardcoded into dh_strip. Move it from there.
+	mkdir -p $(d_lib32)/usr/$(DEB_TARGET_GNU_TYPE)/lib32/debug
+	mv $(d_lib32)/usr/lib/debug/usr/$(DEB_TARGET_GNU_TYPE)/lib32/* $(d_lib32)/usr/$(DEB_TARGET_GNU_TYPE)/lib32/debug/
+	rm -rf $(d_lib32)/usr/lib32
+	# End workaround
+	find $(d_lib32)
+	tar -C $(d_lib32) -c -f - usr/$(DEB_TARGET_GNU_TYPE)/lib/debug | tar -v -C $(d_dbg32) -x -f -
+	rm -rf $(d_lib32)/usr/$(DEB_TARGET_GNU_TYPE)/lib/debug
+
+	dh_installdocs -p$(p_lib32)
+	echo "See /$(docdir)/$(p_base) for more information" \
+		> $(d_lib32)/$(docdir)/$(p_lib32)/README.Debian
+	dh_installchangelogs -p$(p_lib32)
+	debian/dh_doclink -p$(p_dbg32) $(p_lib32)
+
+	debian/dh_rmemptydirs -p$(p_lib32)
+	dh_compress -p$(p_lib32)
+	dh_fixperms -p$(p_lib32)
+
+	sed s/$(cross_lib_arch)//g < debian/$(p_lib32)/DEBIAN/shlibs > debian/$(p_lib32)/DEBIAN/shlibs.fixed
+	mv debian/$(p_lib32)/DEBIAN/shlibs.fixed debian/$(p_lib32)/DEBIAN/shlibs
+	ARCH=$(DEB_TARGET_ARCH) MAKEFLAGS="CC=something" dh_shlibdeps -p$(p_lib32)
+	sed 's/\(lib[^ ]*\) /\1$(cross_lib_arch) /g' < debian/$(p_lib32).substvars > debian/$(p_lib32).substvars.new
+	mv debian/$(p_lib32).substvars.new debian/$(p_lib32).substvars
+	dh_gencontrol -p$(p_lib32) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_gencontrol -p$(p_dbg32) -- -v$(DEB_VERSION) $(common_substvars)
+
+	dh_installdeb -p$(p_lib32)
+	dh_md5sums -p$(p_lib32)
+	dh_builddeb -p$(p_lib32)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+
+# ----------------------------------------------------------------------
+libcxxdev_deps = $(install_stamp)
+ifeq ($(with_libcxx),yes)
+  libcxxdev_deps += $(binary_stamp)-libstdcxx
+endif
+$(binary_stamp)-libstdcxx-dev: $(libcxxdev_deps) \
+    $(binary_stamp)-libstdcxx
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_dev) $(d_pic)
+	dh_installdirs -p$(p_dev) $(dirs_dev)
+	dh_installdirs -p$(p_pic) $(dirs_pic)
+	dh_installdirs -p$(p_dbg) $(dirs_dbg)
+
+	: # - correct libstdc++-v3 file locations
+	mv $(d)/$(PF)/$(DEB_TARGET_GNU_TYPE)/lib/libsupc++.a $(d)/$(gcc_lib_dir)/
+	mv $(d)/$(PF)/$(DEB_TARGET_GNU_TYPE)/lib/libstdc++.{a,so} $(d)/$(gcc_lib_dir)/
+	ln -sf ../../../../$(DEB_TARGET_GNU_TYPE)/lib/libstdc++.so.$(CXX_SONAME) $(d)/$(gcc_lib_dir)/libstdc++.so
+	mv $(d)/$(PF)/$(DEB_TARGET_GNU_TYPE)/lib/libstdc++_pic.a \
+		$(d)/$(gcc_lib_dir)/
+
+	rm -f $(d)/$(PF)/$(DEB_TARGET_GNU_TYPE)/lib/debug/libstdc++_pic.a
+	rm -f $(d)/$(PF)/$(DEB_TARGET_GNU_TYPE)/lib64/debug/libstdc++_pic.a
+
+	: # remove precompiled headers
+	-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)/.
+	ln -sf ../../../../../lib64/libstdc++.so.$(CXX_SONAME) \
+		$(d)/$(gcc_lib_dir)/$(biarchsubdir)/libstdc++.so
+endif
+ifeq ($(biarch32),yes)
+	mv $(d)/$(PF)/$(DEB_TARGET_GNU_TYPE)/lib32/lib*c++*.a $(d)/$(gcc_lib_dir)/$(biarchsubdir)/.
+	ln -sf ../../../../../lib64/libstdc++.so.$(CXX_SONAME) \
+		$(d)/$(gcc_lib_dir)/$(biarchsubdir)/libstdc++.so
+endif
+
+	for i in $(d)/$(PF)/include/c++/$(GCC_VERSION)/*-linux; do \
+	  if [ -d $$i ]; then mv $$i $$i-gnu; fi; \
+	done
+
+	DH_COMPAT=2 dh_movefiles -p$(p_dev) $(files_dev)
+	DH_COMPAT=2 dh_movefiles -p$(p_pic) $(files_pic)
+	DH_COMPAT=2 dh_movefiles -p$(p_dbg) $(files_dbg)
+
+	dh_link -p$(p_dev) \
+		/$(PF)/$(DEB_TARGET_GNU_TYPE)/$(libdir)/libstdc++.so.$(CXX_SONAME) \
+		/$(gcc_lib_dir)/libstdc++.so \
+		/$(cxx_inc_dir) /$(PF)/$(DEB_TARGET_GNU_TYPE)/include/c++/$(BASE_VERSION)
+
+ifeq ($(biarch),yes)
+	dh_link -p$(p_dev) \
+		/$(PF)/$(DEB_TARGET_GNU_TYPE)/lib64/libstdc++.so.$(CXX_SONAME) \
+		/$(gcc_lib_dir)/$(biarchsubdir)/libstdc++.so
+endif
+ifeq ($(biarch32),yes)
+	dh_link -p$(p_dev) \
+		/$(PF)/$(DEB_TARGET_GNU_TYPE)/lib32/libstdc++.so.$(CXX_SONAME) \
+		/$(gcc_lib_dir)/$(biarchsubdir)/libstdc++.so
+endif
+
+	debian/dh_doclink -p$(p_dev) $(p_lib)
+	debian/dh_doclink -p$(p_pic) $(p_lib)
+	debian/dh_doclink -p$(p_dbg) $(p_lib)
+	cp -p $(srcdir)/libstdc++-v3/config/abi/pre/gnu.ver \
+		$(d_pic)/$(gcc_lib_dir)/libstdc++_pic.map
+
+ifeq ($(with_cxxdev),yes)
+	debian/dh_rmemptydirs -p$(p_dev)
+	debian/dh_rmemptydirs -p$(p_pic)
+	debian/dh_rmemptydirs -p$(p_dbg)
+endif
+
+	PATH=/usr/share/dpkg-cross:$$PATH dh_strip -p$(p_dev) --dbg-package=$(p_lib)
+	PATH=/usr/share/dpkg-cross:$$PATH dh_strip -p$(p_pic)
+	dh_compress -p$(p_dev) -p$(p_pic) -p$(p_dbg) -X.txt
+	dh_fixperms -p$(p_dev) -p$(p_pic) -p$(p_dbg)
+	dh_gencontrol -p$(p_dev) -p$(p_pic) -p$(p_dbg) \
+		-- -v$(DEB_VERSION) $(common_substvars)
+
+	dh_installdeb -p$(p_dev) -p$(p_pic) -p$(p_dbg)
+	dh_md5sums -p$(p_dev) -p$(p_pic) -p$(p_dbg)
+	dh_builddeb -p$(p_dev) -p$(p_pic) -p$(p_dbg)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
--- gcj-4.2-4.2-20070707.orig/debian/rules.d/binary-objcxx.mk
+++ gcj-4.2-4.2-20070707/debian/rules.d/binary-objcxx.mk
@@ -0,0 +1,62 @@
+ifneq (,$(filter yes, $(biarch) $(biarch32)))
+  arch_binaries  := $(arch_binaries) objcxx-multi
+endif
+arch_binaries := $(arch_binaries) objcxx
+
+p_objcx		= gobjc++$(pkg_ver)
+d_objcx		= debian/$(p_objcx)
+
+p_objcx_m	= gobjc++$(pkg_ver)-multilib
+d_objcx_m	= debian/$(p_objcx_m)
+
+dirs_objcx = \
+	$(docdir)/$(p_base)/Obj-C++ \
+	$(gcc_lexec_dir)
+
+files_objcx = \
+	$(gcc_lexec_dir)/cc1objplus
+
+$(binary_stamp)-objcxx: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_objcx)
+	dh_installdirs -p$(p_objcx) $(dirs_objcx)
+	DH_COMPAT=2 dh_movefiles -p$(p_objcx) $(files_objcx)
+
+	debian/dh_doclink -p$(p_objcx) $(p_base)
+	cp -p $(srcdir)/gcc/objcp/ChangeLog \
+		$(d_objcx)/$(docdir)/$(p_base)/Obj-C++/changelog
+
+	debian/dh_rmemptydirs -p$(p_objcx)
+
+	dh_strip -p$(p_objcx)
+	dh_compress -p$(p_objcx)
+
+	dh_fixperms -p$(p_objcx)
+	dh_shlibdeps -p$(p_objcx)
+	dh_gencontrol -p$(p_objcx) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_objcx)
+	dh_md5sums -p$(p_objcx)
+	dh_builddeb -p$(p_objcx)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+
+$(binary_stamp)-objcxx-multi: $(install_stamp)
+	dh_testdir
+	dh_testroot
+
+	rm -rf $(d_objcx_m)
+
+	debian/dh_doclink -p$(p_objcx_m) $(p_base)
+	debian/dh_rmemptydirs -p$(p_objcx_m)
+	dh_strip -p$(p_objcx_m)
+	dh_compress -p$(p_objcx_m)
+
+	dh_fixperms -p$(p_objcx_m)
+	dh_shlibdeps -p$(p_objcx_m)
+	dh_gencontrol -p$(p_objcx_m) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_objcx_m)
+	dh_md5sums -p$(p_objcx_m)
+	dh_builddeb -p$(p_objcx_m)
--- gcj-4.2-4.2-20070707.orig/debian/rules.d/binary-libgomp.mk
+++ gcj-4.2-4.2-20070707/debian/rules.d/binary-libgomp.mk
@@ -0,0 +1,96 @@
+arch_binaries  := $(arch_binaries) libgomp
+ifeq ($(with_lib64gomp),yes)
+  arch_binaries  := $(arch_binaries) lib64gomp
+endif
+ifeq ($(with_lib32gomp),yes)
+  arch_binaries	:= $(arch_binaries) lib32gomp
+endif
+
+p_gomp	= libgomp$(GOMP_SONAME)
+p_l32gomp= lib32gomp$(GOMP_SONAME)
+p_l64gomp= lib64gomp$(GOMP_SONAME)
+
+d_gomp	= debian/$(p_gomp)
+d_l32gomp= debian/$(p_l32gomp)
+d_l64gomp= debian/$(p_l64gomp)
+
+dirs_gomp = \
+	$(PF)/$(libdir)
+files_gomp = \
+	$(PF)/$(libdir)/libgomp.so.*
+
+$(binary_stamp)-libgomp: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_gomp)
+	dh_installdirs -p$(p_gomp) $(dirs_gomp)
+
+	DH_COMPAT=2 dh_movefiles -p$(p_gomp) $(files_gomp)
+
+	debian/dh_doclink -p$(p_gomp) $(p_base)
+
+	dh_strip -p$(p_gomp)
+	dh_compress -p$(p_gomp)
+	dh_fixperms -p$(p_gomp)
+	dh_makeshlibs -p$(p_gomp) -V '$(p_gomp) (>= $(DEB_GOMP_SOVERSION))'
+	dh_shlibdeps -p$(p_gomp)
+	dh_gencontrol -p$(p_gomp) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_gomp)
+	dh_md5sums -p$(p_gomp)
+	dh_builddeb -p$(p_gomp)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+
+# ----------------------------------------------------------------------
+$(binary_stamp)-lib64gomp: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_l64gomp)
+	dh_installdirs -p$(p_l64gomp) \
+		$(PF)/lib64
+	DH_COMPAT=2 dh_movefiles -p$(p_l64gomp) \
+		$(PF)/lib64/libgomp.so.*
+
+	debian/dh_doclink -p$(p_l64gomp) $(p_base)
+
+	dh_strip -p$(p_l64gomp)
+	dh_compress -p$(p_l64gomp)
+	dh_fixperms -p$(p_l64gomp)
+	dh_makeshlibs -p$(p_l64gomp) -V '$(p_l64gomp) (>= $(DEB_GOMP_SOVERSION))'
+#	dh_shlibdeps -p$(p_l64gomp)
+	dh_gencontrol -p$(p_l64gomp) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_l64gomp)
+	dh_md5sums -p$(p_l64gomp)
+	dh_builddeb -p$(p_l64gomp)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+
+# ----------------------------------------------------------------------
+$(binary_stamp)-lib32gomp: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_l32gomp)
+	dh_installdirs -p$(p_l32gomp) \
+		$(lib32)
+	DH_COMPAT=2 dh_movefiles -p$(p_l32gomp) \
+		$(lib32)/libgomp.so.*
+
+	debian/dh_doclink -p$(p_l32gomp) $(p_base)
+
+	dh_strip -p$(p_l32gomp)
+	dh_compress -p$(p_l32gomp)
+	dh_fixperms -p$(p_l32gomp)
+	dh_makeshlibs -p$(p_l32gomp) -V '$(p_l32gomp) (>= $(DEB_GOMP_SOVERSION))'
+	dh_shlibdeps -p$(p_l32gomp)
+	dh_gencontrol -p$(p_l32gomp) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_l32gomp)
+	dh_md5sums -p$(p_l32gomp)
+	dh_builddeb -p$(p_l32gomp)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
--- gcj-4.2-4.2-20070707.orig/debian/rules.d/binary-objc.mk
+++ gcj-4.2-4.2-20070707/debian/rules.d/binary-objc.mk
@@ -0,0 +1,100 @@
+ifneq (,$(filter yes, $(biarch) $(biarch32)))
+  arch_binaries  := $(arch_binaries) objc-multi
+endif
+arch_binaries := $(arch_binaries) objc
+
+p_objc	= gobjc$(pkg_ver)
+d_objc	= debian/$(p_objc)
+
+p_objc_m= gobjc$(pkg_ver)-multilib
+d_objc_m= debian/$(p_objc_m)
+
+dirs_objc = \
+	$(docdir)/$(p_base)/ObjC \
+	$(gcc_lexec_dir) \
+	$(gcc_lib_dir)/include
+
+files_objc = \
+	$(gcc_lexec_dir)/cc1obj \
+	$(gcc_lib_dir)/include/objc \
+	$(gcc_lib_dir)/libobjc*.a
+
+$(binary_stamp)-objc: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -f $(d)/$(PF)/$(libdir)/libobjc.{la,so}
+	mv $(d)/$(PF)/$(libdir)/libobjc*.a $(d)/$(gcc_lib_dir)/
+
+	rm -rf $(d_objc)
+	dh_installdirs -p$(p_objc) $(dirs_objc)
+	DH_COMPAT=2 dh_movefiles -p$(p_objc) $(files_objc)
+
+	dh_link -p$(p_objc) \
+	  /$(PF)/$(libdir)/libobjc.so.$(OBJC_SONAME) /$(gcc_lib_dir)/libobjc.so
+ifeq ($(with_objc_gc),yes)
+	dh_link -p$(p_objc) \
+	  /$(PF)/$(libdir)/libobjc_gc.so.$(OBJC_SONAME) \
+	  /$(gcc_lib_dir)/libobjc_gc.so
+endif
+
+	debian/dh_doclink -p$(p_objc) $(p_base)
+	cp -p $(srcdir)/libobjc/{README*,THREADS*} \
+		$(d_objc)/$(docdir)/$(p_base)/ObjC/.
+
+	cp -p $(srcdir)/libobjc/ChangeLog \
+		$(d_objc)/$(docdir)/$(p_base)/ObjC/changelog.libobjc
+
+	debian/dh_rmemptydirs -p$(p_objc)
+
+	dh_strip -p$(p_objc)
+	dh_compress -p$(p_objc)
+
+	dh_fixperms -p$(p_objc)
+	dh_shlibdeps -p$(p_objc)
+	dh_gencontrol -p$(p_objc) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_objc)
+	dh_md5sums -p$(p_objc)
+	dh_builddeb -p$(p_objc)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+
+$(binary_stamp)-objc-multi: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_objc_m)
+	dh_installdirs -p$(p_objc_m) \
+		$(docdir) \
+		$(gcc_lib_dir)/$(biarchsubdir)
+
+ifeq ($(with_lib64objc),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)/
+	dh_link -p$(p_objc_m) \
+	  /$(PF)/lib64/libobjc.so.$(OBJC_SONAME) /$(gcc_lib_dir)/$(biarchsubdir)/libobjc.so
+endif
+ifeq ($(with_lib32objc),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)/
+	dh_link -p$(p_objc_m) \
+	  /$(lib32)/libobjc.so.$(OBJC_SONAME) /$(gcc_lib_dir)/$(biarchsubdir)/libobjc.so
+endif
+
+	debian/dh_doclink -p$(p_objc_m) $(p_base)
+
+	dh_strip -p$(p_objc_m)
+	dh_compress -p$(p_objc_m)
+
+	dh_fixperms -p$(p_objc_m)
+	dh_shlibdeps -p$(p_objc_m)
+	dh_gencontrol -p$(p_objc_m) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_objc_m)
+	dh_md5sums -p$(p_objc_m)
+	dh_builddeb -p$(p_objc_m)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
--- gcj-4.2-4.2-20070707.orig/debian/rules.d/binary-java.mk
+++ gcj-4.2-4.2-20070707/debian/rules.d/binary-java.mk
@@ -0,0 +1,741 @@
+ifeq ($(with_separate_libgcj),yes)
+  ifeq ($(PKGSOURCE),gcj-$(BASE_VERSION))
+    arch_binaries  := $(arch_binaries) jbase
+  endif
+else
+  arch_binaries  := $(arch_binaries) jbase
+endif
+
+ifeq ($(with_gcj),yes)
+    arch_binaries  := $(arch_binaries) gcj
+endif
+
+ifeq ($(with_libgcj),yes)
+  ifeq ($(with_java),yes)
+    arch_binaries  := $(arch_binaries) java gcjapplet
+    indep_binaries  := $(indep_binaries) libgcjjar
+  endif
+
+  ifeq ($(with_javadev),yes)
+    arch_binaries  := $(arch_binaries) libgcjdev libgcjdbg
+    indep_binaries := $(indep_binaries) libgcjsrc
+    ifeq ($(with_libgcj_doc),yes)
+      indep_binaries := $(indep_binaries) libgcjdoc
+    endif
+  endif
+
+  ifeq ($(with_java32),yes)
+    arch_binaries  := $(arch_binaries) java32
+  endif
+endif
+
+p_jbase	= gcj$(pkg_ver)-base
+p_gcj	= gcj$(pkg_ver)
+p_gij	= gij$(pkg_ver)
+p_jlib	= libgcj$(PKG_LIBGCJ_EXT)
+p_jdbg	= libgcj$(PKG_GCJ_EXT)-dbg
+p_jar	= libgcj$(PKG_GCJ_EXT)-jar
+p_jlibx	= libgcj$(PKG_LIBGCJ_EXT)-awt
+p_jgtk	= libgcj$(PKG_GCJ_EXT)-awt-gtk
+p_jqt	= libgcj$(PKG_GCJ_EXT)-awt-qt
+p_jdev	= libgcj$(PKG_GCJ_EXT)-dev
+p_jsrc	= libgcj$(PKG_GCJ_EXT)-src
+p_view	= gappletviewer$(pkg_ver)
+p_plug	= gcjwebplugin$(pkg_ver)
+p_jdoc	= libgcj-doc
+p_j32lib= lib32gcj$(PKG_LIBGCJ_EXT)
+p_j32dev= lib32gcj$(PKG_GCJ_EXT)-dev
+p_j32dbg= lib32gcj$(PKG_GCJ_EXT)-dbg
+p_j32libc = lib32gcj-bc
+
+d_jbase	= debian/$(p_jbase)
+d_gcj	= debian/$(p_gcj)
+d_gij	= debian/$(p_gij)
+d_jlib	= debian/$(p_jlib)
+d_jdbg	= debian/$(p_jdbg)
+d_jar	= debian/$(p_jar)
+d_jlibx	= debian/$(p_jlibx)
+d_jgtk	= debian/$(p_jgtk)
+d_jqt	= debian/$(p_jqt)
+d_jdev	= debian/$(p_jdev)
+d_jsrc	= debian/$(p_jsrc)
+d_jdoc	= debian/$(p_jdoc)
+d_view	= debian/$(p_view)
+d_plug	= debian/$(p_plug)
+d_j32lib= debian/$(p_j32lib)
+d_j32dev= debian/$(p_j32dev)
+d_j32dbg= debian/$(p_j32dbg)
+d_j32libc= debian/$(p_j32libc)
+
+GCJ_BASE_VERSION = $(BASE_VERSION)
+
+gcj_vlibdir	= $(PF)/$(libdir)/gcj-$(BASE_VERSION)-$(GCJ_SONAME)
+gcj_vlib32dir	= $(lib32)/gcj-$(BASE_VERSION)-$(GCJ_SONAME)
+gcj_vlib64dir	= $(PF)/$(lib64)/gcj-$(BASE_VERSION)-$(GCJ_SONAME)
+
+dirs_gcj = \
+	$(docdir)/$(p_jbase) \
+	$(PF)/bin \
+	$(PF)/share/man/man1 \
+	$(PF)/share/info \
+	$(gcc_lexec_dir)
+files_gcj = \
+	$(PF)/bin/{gcj,gjar,gjarsigner,gcjh,gjavah,gnative2ascii,grmic,gtnameserv,jv-convert,jcf-dump}$(pkg_ver) \
+	$(PF)/share/man/man1/{gjar,gjarsigner,gcjh,gjavah,gnative2ascii,grmic,gtnameserv}$(pkg_ver).1 \
+	$(gcc_lexec_dir)/{ecj1,jc1,jvgenmain}
+
+ifneq ($(GFDL_INVARIANT_FREE),yes)
+  files_gcj += \
+	$(PF)/share/info/gcj* \
+	$(PF)/share/man/man1/{gcj,jv-convert,jcf-dump}$(pkg_ver).1
+endif
+
+dirs_gij = \
+	$(docdir)/$(p_jbase) \
+	$(PF)/bin \
+	$(PF)/share/man/man1 \
+	var/lib/gcj$(pkg_ver)
+
+files_gij = \
+	$(PF)/bin/{gij,gcj-dbtool,gorbd,grmid,grmiregistry,gkeytool,gserialver}$(pkg_ver) \
+	$(PF)/share/man/man1/{gorbd,grmid,grmiregistry,gkeytool,gserialver}$(pkg_ver).1
+
+ifneq ($(GFDL_INVARIANT_FREE),yes)
+  files_gij += \
+	$(PF)/share/man/man1/{gij,gcj-dbtool}$(pkg_ver).1
+endif
+
+dirs_jlib = \
+	$(docdir)/$(p_jbase) \
+	$(gcj_vlibdir) \
+	$(PF)/$(libdir)
+
+files_jlib = \
+	$(PF)/$(libdir)/libgij.so.* \
+	$(PF)/$(libdir)/libgcj-tools.so.* \
+	$(PF)/$(libdir)/libgcj.so.* \
+	$(gcj_vlibdir)/libjvm.so \
+
+#	$(gcj_vlibdir)/libgconfpeer.so
+
+ifeq ($(with_java_alsa),yes)
+  files_jlib += \
+	$(gcj_vlibdir)/libgjsmalsa.so
+endif
+
+dirs_jar = \
+	$(PF)/share/java
+
+dirs_jlibx = \
+	$(PF)/$(libdir) \
+	$(gcj_vlibdir) \
+	$(PF)/share/java
+
+files_jlibx = \
+	$(gcj_vlibdir)/libjawt.so \
+	$(gcj_vlibdir)/libgtkpeer.so
+
+#files_jgtk = \
+#	$(gcj_vlibdir)/libgtkpeer.so
+#files_jqt = \
+#	$(gcj_vlibdir)/libqtpeer.so
+
+dirs_jdev = \
+	$(docdir)/$(p_jbase)/examples \
+	$(PF)/{include,lib} \
+	$(gcc_lib_dir)/include/gcj
+
+files_jdev = \
+	$(cxx_inc_dir)/{org,gcj,java,javax} \
+	$(cxx_inc_dir)/gnu/{awt,classpath,gcj,java,javax} \
+	$(gcc_lib_dir)/include/{jni.h,jni_md.h,jvmpi.h} \
+	$(gcc_lib_dir)/include/{jawt.h,jawt_md.h} \
+	$(gcc_lib_dir)/include/gcj/libgcj-config.h \
+	$(PF)/$(libdir)/libgij.so \
+	$(PF)/$(libdir)/libgcj.{so,spec} \
+	$(PF)/$(libdir)/libgcj-tools.so \
+	$(PF)/$(libdir)/pkgconfig/libgcj-$(BASE_VERSION).pc \
+	$(gcj_vlibdir)/lib*peer.so \
+
+ifeq ($(with_static_java),yes)
+  files_jdev += \
+	$(PF)/$(libdir)/libgij.a \
+	$(PF)/$(libdir)/libgcj.a \
+	$(PF)/$(libdir)/libgcj-tools.a
+endif
+
+ifeq ($(with_lib64gcj),yes)
+	dirs_jlib    +=	$(gcj_vlib64dir)
+	files_jlib   +=	\
+		$(gcj_vlib64dir)/libjawt.so \
+		$(gcj_vlib64dir)/lib*peer.so
+endif
+
+ifeq ($(with_standalone_gcj),yes)
+
+  dirs_gcj += \
+	$(gcc_lib_dir)/include \
+	$(PF)/share/man/man1
+
+  files_gcj += \
+	$(PF)/bin/{cpp,gcc,gcov}$(pkg_ver) \
+	$(gcc_lexec_dir)/cc1 \
+	$(gcc_lexec_dir)/collect2 \
+	$(gcc_lib_dir)/{libgcc*,libgcov.a,*.o} \
+	$(gcc_lib_dir)/include/README \
+	$(gcc_lib_dir)/include/{decfloat,float,iso646,limits,std*,syslimits,unwind,varargs}.h \
+	$(shell for d in asm bits gnu linux; do \
+		  test -e $(d)/$(gcc_lib_dir)/include/$$d \
+		    && echo $(gcc_lib_dir)/include/$$d; \
+		done) \
+	$(shell test -e $(d)/$(gcc_lib_dir)/SYSCALLS.c.X \
+		&& echo $(gcc_lib_dir)/SYSCALLS.c.X) \
+	$(shell for h in {,e,p,x}mmintrin.h mm3dnow.h mm_malloc.h; do \
+		  test -e $(d)/$(gcc_lib_dir)/include/$$h \
+		    && echo $(gcc_lib_dir)/include/$$h; \
+		done)
+
+  ifneq ($(GFDL_INVARIANT_FREE),yes)
+    files_gcj += \
+	$(PF)/share/man/man1/{cpp,gcc,gcov}$(pkg_ver).1
+  endif
+
+  ifeq ($(biarch),yes)
+    files_gcj += $(gcc_lib_dir)/$(biarchsubdir)/{libgcc*,libgcov.a,*.o}
+  endif
+  ifeq ($(biarch32),yes)
+    files_gcj += $(gcc_lib_dir)/$(biarchsubdir)/{libgcc*,*.o}
+  endif
+
+  ifeq ($(DEB_HOST_ARCH),ia64)
+    files_gcj += $(gcc_lib_dir)/include/ia64intrin.h
+  endif
+
+  ifeq ($(DEB_HOST_ARCH),m68k)
+    files_gcj += $(gcc_lib_dir)/include/math-68881.h
+  endif
+
+  ifeq ($(DEB_TARGET_ARCH),$(findstring $(DEB_TARGET_ARCH),powerpc ppc64))
+    files_gcj += $(gcc_lib_dir)/include/{altivec.h,ppc-asm.h,spe.h}
+  endif
+
+endif
+
+# ----------------------------------------------------------------------
+$(binary_stamp)-jbase: $(install_dependencies)
+	dh_testdir
+	dh_testroot
+	rm -rf $(d_jbase)
+	dh_installdirs -p$(p_jbase)
+	dh_installdocs -p$(p_jbase)
+	dh_installchangelogs -p$(p_jbase)
+	dh_compress -p$(p_jbase)
+	dh_fixperms -p$(p_jbase)
+	dh_gencontrol -p$(p_jbase) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_jbase)
+	dh_md5sums -p$(p_jbase)
+	dh_builddeb -p$(p_jbase)
+	touch $@
+
+# ----------------------------------------------------------------------
+$(binary_stamp)-libgcjjar: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	dh_installdirs -p$(p_jar) $(dirs_jar)
+	mv $(d)/$(PF)/share/java/libgcj-$(BASE_VERSION).jar \
+		$(d_jar)/$(PF)/share/java/
+	mv $(d)/$(PF)/share/java/libgcj-tools-$(BASE_VERSION).jar \
+		$(d_jar)/$(PF)/share/java/
+
+	debian/dh_doclink -p$(p_jar) $(p_jbase)
+	debian/dh_rmemptydirs -p$(p_jar)
+	dh_compress -p$(p_jar)
+	dh_fixperms -p$(p_jar)
+	dh_gencontrol -p$(p_jar) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_jar)
+	dh_md5sums -p$(p_jar)
+	dh_builddeb -p$(p_jar)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+
+# ----------------------------------------------------------------------
+$(binary_stamp)-libgcjsrc: $(install_stamp)
+	dh_testdir
+	dh_testroot
+
+	PATH=$(PWD)/bin:$$PATH \
+	  $(MAKE) -C $(buildlibdir)/libjava \
+		DESTDIR=$(PWD)/$(d) install-src.zip
+	mkdir -p $(d_jsrc)/$(PF)/share/java
+	mv $(d)/$(PF)/share/java/src-$(BASE_VERSION).zip \
+	   $(d_jsrc)/$(PF)/share/java/libgcj-src-$(BASE_VERSION).zip
+
+	: #  add files for the classpath examples
+	cd $(srcdir)/libjava/classpath/examples && \
+	  find ! -type d ! -name 'Makefile.??' ! -name '*.java' \
+	  | fastjar -uvfM@ \
+		$(PWD)/$(d_jsrc)/$(PF)/share/java/libgcj-src-$(BASE_VERSION).zip
+
+	debian/dh_doclink -p$(p_jsrc) $(p_jbase)
+	debian/dh_rmemptydirs -p$(p_jsrc)
+	dh_compress -p$(p_jsrc)
+	dh_fixperms -p$(p_jsrc)
+	dh_gencontrol -p$(p_jsrc) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_jsrc)
+	dh_md5sums -p$(p_jsrc)
+	dh_builddeb -p$(p_jsrc)
+
+	touch $@
+
+# ----------------------------------------------------------------------
+libgcj_version = $(shell $(builddir)/gcc/xgcc --version \
+			 | sed -n '/GCC/s/.*(GCC) *//p')
+libgcj_title = LibGCJ Classpath
+libgcjhbox_href = http://gcc.gnu.org/java
+libgcjhbox = <span class='logo'><a href='$(libgcjhbox_href)' target='_top'>$(title)</a> ($(libgcj_version))
+
+$(build_javadoc_stamp): $(build_stamp)
+	mkdir -p $(builddir)/java-src
+	cd $(builddir)/java-src && fastjar -xf $(buildlibdir)/libjava/src.zip
+
+	mkdir -p $(builddir)/html
+	gjdoc \
+	  -use \
+	  -sourcepath "$(builddir)/java-src" \
+	  -encoding UTF-8 \
+	  -breakiterator \
+	  -licensetext \
+	  -linksource \
+	  -splitindex \
+	  -d $(builddir)/html \
+	  -doctitle "$(title) $(libgcj_version)" \
+	  -windowtitle "$(title) $(libgcj_version) Documentation" \
+	  -header "$(classpathbox)" \
+	  -footer "$(classpathbox)" \
+	  -subpackages gnu:java:javax:org
+
+	PATH=$(PWD)/bin:$$PATH \
+	  $(MAKE) -C $(buildlibdir)/libjava/classpath/examples
+
+	touch $@
+
+$(binary_stamp)-libgcjdoc: $(install_stamp) $(build_javadoc_stamp)
+	dh_testdir
+	dh_testroot
+
+	$(MAKE) -C $(buildlibdir)/libjava/classpath/examples \
+	    GLIBJ_CLASSPATH="$(buildlibdir)/libjava/libgcj-$(BASE_VERSION).jar:$(buildlibdir)/libjava/libgcj-tools-$(BASE_VERSION).jar" \
+	    DESTDIR=$(PWD)/$(d_jdoc) \
+	    pkgdatadir=/usr/share/doc/$(p_jbase) \
+		install
+
+	dh_installdocs -p$(p_jdoc)
+	dh_installchangelogs -p$(p_jdoc)
+	mkdir -p $(d_jdoc)/usr/share/doc/$(p_jbase)
+	cp -al $(builddir)/html $(d_jdoc)/usr/share/doc/$(p_jbase)/
+	ln -sf ../$(p_jbase)/html $(d_jdoc)/usr/share/doc/$(p_jdoc)/html
+	ln -sf ../$(p_jbase)/examples $(d_jdoc)/usr/share/doc/$(p_jdoc)/examples
+	dh_compress -p$(p_jdoc) -X.java -X.c
+	dh_fixperms -p$(p_jdoc)
+	dh_gencontrol -p$(p_jdoc) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_jdoc)
+	dh_md5sums -p$(p_jdoc)
+	dh_builddeb -p$(p_jdoc)
+
+	touch $@
+
+# ----------------------------------------------------------------------
+
+#peer_pkgs =
+#ifneq (,$(findstring gtk, $(java_awt_peers)))
+#  peer_pkgs += -p$(p_jgtk)
+#endif
+#ifneq (,$(findstring qt, $(java_awt_peers)))
+#  peer_pkgs += -p$(p_jqt)
+#endif
+
+$(binary_stamp)-java: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	dh_installdirs -p$(p_gij)   $(dirs_gij)
+	dh_installdirs -p$(p_jlib)  $(dirs_jlib)
+	dh_installdirs -p$(p_jlibx) $(dirs_jlibx)
+
+	DH_COMPAT=2 dh_movefiles -p$(p_gij)   $(files_gij)
+	DH_COMPAT=2 dh_movefiles -p$(p_jlib)  $(files_jlib)
+	DH_COMPAT=2 dh_movefiles -p$(p_jlibx) $(files_jlibx)
+#ifneq (,$(findstring gtk, $(java_awt_peers)))
+#	DH_COMPAT=2 dh_movefiles -p$(p_jgtk) $(files_jgtk)
+#endif
+#ifneq (,$(findstring qt, $(java_awt_peers)))
+#	DH_COMPAT=2 dh_movefiles -p$(p_jqt) $(files_jqt)
+#endif
+
+ifeq ($(DEB_HOST_ARCH),hppa)
+	mv $(d_gij)/$(PF)/bin/gij$(pkg_ver) \
+		$(d_gij)/$(PF)/bin/gij$(pkg_ver).bin
+	install -m755 debian/gij-hppa $(d_gij)/$(PF)/bin/gij$(pkg_ver)
+endif
+
+	ln -s ../libgcj.so.$(GCJ_SONAME) \
+		$(d_jlib)/$(gcj_vlibdir)/libgcj_bc.so.1
+
+	cp -p $(srcdir)/libjava/{NEWS,README,THANKS} \
+		$(d_gij)/usr/share/doc/$(p_jbase)/
+
+	debian/dh_doclink -p$(p_gij)   $(p_jbase)
+	debian/dh_doclink -p$(p_jlib)  $(p_jbase)
+	debian/dh_doclink -p$(p_jlibx) $(p_jbase)
+#ifneq (,$(findstring gtk, $(java_awt_peers)))
+#	debian/dh_doclink -p$(p_jgtk) $(p_jbase)
+#endif
+#ifneq (,$(findstring qt, $(java_awt_peers)))
+#	debian/dh_doclink -p$(p_jqt) $(p_jbase)
+#endif
+
+ifeq ($(with_separate_libgcj),yes)
+  ifeq ($(PKGSOURCE),gcj-$(BASE_VERSION))
+    ifeq ($(with_check),yes)
+	cp -p test-summary $(d_gij)/usr/share/doc/$(p_jbase)/test-summary
+    endif
+  endif
+endif
+	debian/dh_rmemptydirs -p$(p_gij)
+	debian/dh_rmemptydirs -p$(p_jlib)
+	debian/dh_rmemptydirs -p$(p_jlibx)
+
+	mkdir -p $(d_gij)/var/lib/gcj$(pkg_ver)
+
+	dh_makeshlibs -p$(p_jlib) -V '$(p_jlib) (>= $(DEB_GCJ_SOVERSION))'
+	cat debian/$(p_jlib)/DEBIAN/shlibs >> debian/shlibs.local
+
+	dh_makeshlibs -p$(p_jlibx) -V '$(p_jlibx) (>= $(DEB_GCJ_SOVERSION))'
+
+#ifneq (,$(findstring gtk, $(java_awt_peers)))
+#	dh_makeshlibs -p$(p_jgtk) -V '$(p_jgtk) (>= $(DEB_GCJ_SOVERSION))'
+#endif
+#ifneq (,$(findstring qt, $(java_awt_peers)))
+#	dh_makeshlibs -p$(p_jqt) -V '$(p_jqt) (>= $(DEB_GCJ_SOVERSION))'
+#endif
+
+	DH_COMPAT=5 dh_strip --dbg-package=$(p_jdbg) \
+		-p$(p_gij) -p$(p_jlib) -p$(p_jlibx) $(peer_pkgs)
+	dh_compress -p$(p_gij) -p$(p_jlib) -p$(p_jlibx) $(peer_pkgs)
+	dh_fixperms -p$(p_gij) -p$(p_jlib) -p$(p_jlibx) $(peer_pkgs)
+# the libstdc++ binary packages aren't built yet ...
+	echo 'libstdc++ $(CXX_SONAME) libstdc++$(CXX_SONAME) (>= $(DEB_STDCXX_SOVERSION))' \
+	    >> debian/shlibs.local
+	-[ -d $(d_l64gcc) ] && mv $(d_l64gcc) $(d_l64gcc).saved
+	dh_shlibdeps \
+		-L$(p_lgcc) \
+		-L$(p_jlib) \
+		-l:$(d)/$(PF)/$(libdir):$(d_lib)/$(PF)/$(libdir):$(d_jlib)/$(PF)/$(libdir):$(d_lgcc)/lib \
+		-p$(p_gij) -p$(p_jlib) -p$(p_jlibx) $(peer_pkgs)
+	-[ -d $(d_l64gcc).saved ] && mv $(d_l64gcc).saved $(d_l64gcc)
+	sed -e 's/$(p_jlib)[^,]*//' -e 's/, *,/,/' debian/$(p_jlib).substvars \
+		>> debian/$(p_jlib).substvars.tmp \
+	    && mv -f debian/$(p_jlib).substvars.tmp debian/$(p_jlib).substvars
+	dh_gencontrol \
+		-p$(p_gij) -p$(p_jlib) -p$(p_jlibx) $(peer_pkgs) \
+		-- -v$(DEB_VERSION) $(common_substvars)
+
+#	mkdir -p $(d_jlibx)/usr/share/lintian/overrides
+#	cp -p debian/$(p_jlibx).overrides \
+#		$(d_jlibx)/usr/share/lintian/overrides/$(p_jlibx)
+
+	dh_installdeb -p$(p_gij) -p$(p_jlib) -p$(p_jlibx) $(peer_pkgs)
+	dh_md5sums -p$(p_gij) -p$(p_jlib) -p$(p_jlibx) $(peer_pkgs)
+	dh_builddeb -p$(p_gij) -p$(p_jlib) -p$(p_jlibx) $(peer_pkgs)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+
+# ----------------------------------------------------------------------
+$(binary_stamp)-gcj: $(build_html_stamp) $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_gcj)
+	dh_installdirs -p$(p_gcj)  $(dirs_gcj)
+
+	mkdir -p $(d_gcj)/usr/share/lintian/overrides
+	cp -p debian/$(p_gcj).overrides \
+		$(d_gcj)/usr/share/lintian/overrides/$(p_gcj)
+	cp -p $(srcdir)/gcc/java/ChangeLog \
+		$(d_gcj)/usr/share/doc/$(p_jbase)/changelog.gcj
+	cp -p $(srcdir)/libjava/ChangeLog \
+		$(d_gcj)/usr/share/doc/$(p_jbase)/changelog.libjava
+
+ifeq ($(with_standalone_gcj),yes)
+	rm -f $(d)/$(PF)/$(libdir)/libgcc_s.so
+	ln -sf /$(libdir)/libgcc_s.so.$(GCC_SONAME) $(d)/$(gcc_lib_dir)/libgcc_s.so
+  ifeq ($(biarch),yes)
+	rm -f $(d)/$(PF)/$(lib64)/libgcc_s.so
+	dh_link -p$(p_gcj) \
+	  /$(lib64)/libgcc_s.so.$(GCC_SONAME) /$(gcc_lib_dir)/libgcc_s_64.so \
+	  /$(lib64)/libgcc_s.so.$(GCC_SONAME) /$(gcc_lib_dir)/$(biarchsubdir)/libgcc_s.so
+  endif
+  ifeq ($(biarch32),yes)
+	mkdir -p $(d_gcj)/$(gcc_lib_dir)
+	mv $(d)/$(gcc_lib_dir)/$(biarchsubdir) $(d_gcj)/$(gcc_lib_dir)/
+	dh_link -p$(p_gcj) \
+	  /$(lib32)/libgcc_s.so.$(GCC_SONAME)  /$(gcc_lib_dir)/libgcc_s_32.so \
+	  /$(lib32)/libgcc_s.so.$(GCC_SONAME)  /$(gcc_lib_dir)/$(biarchsubdir)/libgcc_s_32.so \
+	  /$(lib32)/libgcc_s.so.$(GCC_SONAME)  /$(gcc_lib_dir)/$(biarchsubdir)/libgcc_s.so
+  endif
+endif
+	DH_COMPAT=2 dh_movefiles -p$(p_gcj)  $(files_gcj)
+
+	ln -sf gcj$(pkg_ver) \
+	    $(d_gcj)/$(PF)/bin/$(TARGET_ALIAS)-gcj$(pkg_ver)
+
+ifneq ($(GFDL_INVARIANT_FREE),yes)
+	ln -sf gcj$(pkg_ver).1 \
+	    $(d_gcj)/$(PF)/share/man/man1/$(TARGET_ALIAS)-gcj$(pkg_ver).1
+	cp -p html/gcj.html $(d_gcj)/$(docdir)/$(p_jbase)/
+endif
+
+	debian/dh_doclink -p$(p_gcj) $(p_jbase)
+
+	cp -p debian/FAQ.gcj $(d_gcj)/$(docdir)/$(p_jbase)/
+
+	cp -p debian/gcj-wrapper$(pkg_ver) $(d_gcj)/$(PF)/bin/
+	chmod 755 $(d_gcj)/$(PF)/bin/gcj-wrapper$(pkg_ver)
+	cp -p debian/gcj-wrapper$(pkg_ver).1 $(d_gcj)/$(PF)/share/man/man1/
+
+	debian/dh_rmemptydirs -p$(p_gcj)
+
+	dh_strip -p$(p_gcj)
+	dh_compress -p$(p_gcj) -X.java
+	dh_fixperms -p$(p_gcj)
+	dh_shlibdeps -p$(p_gcj)
+	dh_gencontrol -p$(p_gcj) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_gcj)
+	dh_md5sums -p$(p_gcj)
+	dh_builddeb -p$(p_gcj)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+
+# ----------------------------------------------------------------------
+$(binary_stamp)-libgcjdev: $(build_html_stamp) $(install_stamp) $(binary_stamp)-java
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	dh_installdirs -p$(p_jdev) $(dirs_jdev)
+
+	DH_COMPAT=2 dh_movefiles -p$(p_jdev) $(files_jdev)
+
+	for i in libgij libgcj libgcj-tools; do \
+	  dh_link -p$(p_jdev) /$(PF)/$(libdir)/$$i.so.$(GCJ_SONAME) \
+	    $(gcc_lib_dir)/$$i.so; \
+	  rm -f $(d_jdev)/$(PF)/$(libdir)/$$i.{la,so}; \
+	done
+ifeq ($(with_static_java),yes)
+	for i in libgij libgcj libgcj-tools; do \
+	  mv $(d_jdev)/$(PF)/$(libdir)/$$i.a $(d_jdev)/$(gcc_lib_dir)/; \
+	done
+endif
+
+	ln -sf libgcj-$(BASE_VERSION).pc \
+		$(d_jdev)/$(PF)/$(libdir)/pkgconfig/libgcj$(PKG_GCJ_EXT).pc
+
+	mv $(d_jdev)/$(PF)/$(libdir)/libgcj.spec $(d_jdev)/$(gcc_lib_dir)/
+
+	install -m 755 $(d)/$(PF)/lib/libgcj_bc.so.1 \
+		$(d_jdev)/$(gcc_lib_dir)/libgcj_bc.so
+	$(builddir)/gcc/xgcc -B$(builddir)/gcc/ -shared -fpic -xc /dev/null \
+		-o build/libgcj.so -Wl,-soname,libgcj.so.$(GCJ_SONAME) -nostdlib
+	$(builddir)/gcc/xgcc -B$(builddir)/gcc/ -shared -fpic \
+		$(srcdir)/libjava/libgcj_bc.c \
+		-o $(d_jdev)/$(gcc_lib_dir)/libgcj_bc.so \
+		-Wl,-soname,libgcj_bc.so.1 $(builddir)/libgcj.so -shared-libgcc 
+
+	debian/dh_doclink -p$(p_jdev) $(p_jbase)
+
+	debian/dh_rmemptydirs -p$(p_jdev)
+
+	mkdir -p $(d_jdev)/usr/share/lintian/overrides
+	cp -p debian/libgcj$(PKG_GCJ_EXT)-dev.overrides \
+		$(d_jdev)/usr/share/lintian/overrides/$(p_jdev)
+
+	DH_COMPAT=5 dh_strip -p$(p_jdev) --dbg-package=$(p_jdbg)
+	dh_compress -p$(p_jdev) -X.java
+	dh_fixperms -p$(p_jdev)
+	dh_shlibdeps \
+		-L$(p_lgcc) \
+		-l:$(d)/$(PF)/$(libdir):$(d_lib)/$(PF)/$(libdir):$(d_jlib)/$(PF)/$(libdir):$(d_lgcc)/lib \
+		-p$(p_jdev)
+	dh_gencontrol -p$(p_jdev) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_jdev)
+	dh_md5sums -p$(p_jdev)
+	dh_builddeb -p$(p_jdev)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+
+# ----------------------------------------------------------------------
+$(binary_stamp)-libgcjdbg: $(install_stamp) $(binary_stamp)-java $(binary_stamp)-libgcjdev $(binary_stamp)-gcjapplet
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	debian/dh_doclink -p$(p_jdbg) $(p_jbase)
+
+	for i in libgij libgcj libgcj-tools; do \
+	  if [ -f $(d_jdbg)/usr/lib/debug/usr/lib/$$i.so.$(GCJ_SONAME).0.0 ]; then \
+	    ln -sf $$i.so.$(GCJ_SONAME).0.0 \
+	      $(d_jdbg)/usr/lib/debug/usr/lib/$$i.so.$(GCJ_SONAME); \
+	  fi; \
+	done
+#	ln -sf libgconfpeer.so.0.0.0 \
+#	  $(d_jdbg)/usr/lib/debug/$(gcj_vlibdir)/libgconfpeer.so.0
+
+	dh_compress -p$(p_jdbg)
+	dh_fixperms -p$(p_jdbg)
+	dh_gencontrol -p$(p_jdbg) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_jdbg)
+	dh_md5sums -p$(p_jdbg)
+	dh_builddeb -p$(p_jdbg)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+
+# ----------------------------------------------------------------------
+$(binary_stamp)-gcjapplet: $(install_stamp) $(binary_stamp)-java
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	dh_installdirs -p$(p_view) \
+		usr/bin
+	DH_COMPAT=2 dh_movefiles -p$(p_view) \
+		$(PF)/bin/gappletviewer$(pkg_ver)
+
+ifneq ($(GFDL_INVARIANT_FREE),yes)
+#	DH_COMPAT=2 dh_movefiles -p$(p_view) \
+#		$(PF)/share/man/man1/gappletviewer$(pkg_ver).1
+endif
+
+ifeq ($(with_pkg_plugin),yes)
+	dh_installdirs -p$(p_plug) \
+		$(gcj_vlibdir) \
+		usr/lib/mozilla/plugins \
+		usr/lib/mozilla-firefox/plugins \
+		usr/lib/mozilla-snapshot/plugins
+	DH_COMPAT=2 dh_movefiles -p$(p_plug) \
+		$(gcj_vlibdir)/libgcjwebplugin.so
+else
+	DH_COMPAT=2 dh_movefiles -p$(p_view) \
+		$(gcj_vlibdir)/libgcjwebplugin.so
+endif
+	rm -f $(d)/$(gcj_vlibdir)/libgcjwebplugin.*a
+
+	debian/dh_doclink -p$(p_view) $(p_jbase)
+	DH_COMPAT=5 dh_strip -p$(p_view) --dbg-package=$(p_jdbg)
+	dh_compress -p$(p_view)
+	dh_fixperms -p$(p_view)
+	dh_gencontrol -p$(p_view) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_view)
+	dh_md5sums -p$(p_view)
+	dh_builddeb -p$(p_view)
+
+ifeq ($(with_pkg_plugin),yes)
+	debian/dh_doclink -p$(p_plug) $(p_jbase)
+	DH_COMPAT=5 dh_strip -p$(p_plug) --dbg-package=$(p_jdbg)
+	dh_compress -p$(p_plug)
+	dh_fixperms -p$(p_plug)
+	dh_gencontrol -p$(p_plug) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_plug)
+	dh_md5sums -p$(p_plug)
+	dh_builddeb -p$(p_plug)
+endif
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+
+# ----------------------------------------------------------------------
+$(binary_stamp)-java32: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	if [ -d $(d)/$(lib32)/gcj-$(GCC_VERSION) ]; then \
+	  mkdir -p $(d)/$(gcj_vlib32dir); \
+	  mv $(d)/$(lib32)/gcj-$(GCC_VERSION)/* $(d)/$(gcj_vlib32dir)/; \
+	fi
+	rm -f $(d)/$(gcj_vlib32dir)/classmap.db
+
+	dh_installdirs -p$(p_j32lib) \
+		$(PF)/bin \
+		$(gcj_vlib32dir)
+	dh_installdirs -p$(p_j32dev) \
+		$(gcc_lib_dir)/$(biarchsubdir) \
+		$(gcj_vlib32dir)
+
+	for i in gij gcj-dbtool grmiregistry; do \
+	  install -m755 debian/tmp32/usr/bin/$$i$(pkg_ver) \
+		$(d_j32lib)/$(PF)/bin/ia32-$$i$(pkg_ver); \
+	done
+
+	mv $(d)/$(lib32)/lib{gij,gcj,gcj-tools}.so.* \
+		$(d_j32lib)/$(lib32)/.
+	mv $(d)/$(gcj_vlib32dir)/lib*.so \
+		$(d_j32lib)/$(gcj_vlib32dir)/.
+
+	ln -s ../libgcj.so.$(GCJ_SONAME) \
+		$(d_j32lib)/$(gcj_vlib32dir)/libgcj_bc.so.1
+
+	for i in libgij libgcj libgcj-tools; do \
+	  dh_link -p$(p_j32dev) /$(lib32)/$$i.so.$(GCJ_SONAME) \
+	    $(gcc_lib_dir)/$(biarchsubdir)/$$i.so; \
+	  rm -f $(d_j32dev)/$(lib32)/$$i.{la,so}; \
+	done
+ifeq ($(with_static_java),yes)
+	for i in libgij libgcj libgcj-tools; do \
+	  mv $(d)/$(lib32)/$$i.a $(d_j32dev)/$(gcc_lib_dir)/$(biarchsubdir)/; \
+	done
+endif
+
+	install -m 755 $(d)/$(PF)/lib/libgcj_bc.so.1 \
+		$(d_j32dev)/$(gcc_lib_dir)/$(biarchsubdir)/libgcj_bc.so
+	$(builddir)/gcc/xgcc -B$(builddir)/gcc/ -m32 -shared -fpic -xc /dev/null \
+		-o build/libgcj.so -Wl,-soname,libgcj.so.$(GCJ_SONAME) -nostdlib
+	$(builddir)/gcc/xgcc -B$(builddir)/gcc/ -m32 -shared -fpic \
+		$(srcdir)/libjava/libgcj_bc.c \
+		-o $(d_j32dev)/$(gcc_lib_dir)/$(biarchsubdir)/libgcj_bc.so \
+		-Wl,-soname,libgcj_bc.so.1 $(builddir)/libgcj.so -shared-libgcc 
+
+	debian/dh_doclink -p$(p_j32lib) $(p_jbase)
+	debian/dh_doclink -p$(p_j32dev) $(p_jbase)
+	debian/dh_doclink -p$(p_j32dbg) $(p_jbase)
+
+	DH_COMPAT=5 dh_strip \
+		-p$(p_j32lib) -p$(p_j32dev) --dbg-package=$(p_j32dbg)
+
+	for i in libgij libgcj libgcj-tools; do \
+	  if [ -f $(d_j32dbg)/usr/lib/debug/$(lib32)/$$i.so.$(GCJ_SONAME).0.0 ]; then \
+	    ln -sf $$i.so.$(GCJ_SONAME).0.0 \
+	      $(d_j32dbg)/usr/lib/debug/$(lib32)/$$i.so.$(GCJ_SONAME); \
+	  fi; \
+	done
+
+	rm -f $(gcj_vlib32dir)/classmap.db
+	mv $(d)/$(gcj_vlib32dir)/* \
+		$(d_j32dev)/$(gcj_vlib32dir)/.
+
+	debian/dh_rmemptydirs -p$(p_j32lib)
+	debian/dh_rmemptydirs -p$(p_j32dev)
+	debian/dh_rmemptydirs -p$(p_j32dbg)
+
+	dh_compress -p$(p_j32lib) -p$(p_j32dev) -p$(p_j32dbg)
+	dh_fixperms -p$(p_j32lib) -p$(p_j32dev) -p$(p_j32dbg)
+	dh_shlibdeps -p$(p_j32lib) -p$(p_j32dev) -p$(p_j32dbg)
+	dh_gencontrol -p$(p_j32lib) -p$(p_j32dev) -p$(p_j32dbg) \
+		-- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_j32lib) -p$(p_j32dev) -p$(p_j32dbg)
+	dh_md5sums -p$(p_j32lib) -p$(p_j32dev) -p$(p_j32dbg)
+	dh_builddeb -p$(p_j32lib) -p$(p_j32dev) -p$(p_j32dbg)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
--- gcj-4.2-4.2-20070707.orig/debian/rules.d/binary-libmudflap.mk
+++ gcj-4.2-4.2-20070707/debian/rules.d/binary-libmudflap.mk
@@ -0,0 +1,177 @@
+ifeq ($(with_dev),yes)
+  arch_binaries  := $(arch_binaries) libmudflapdev
+endif
+
+ifeq ($(with_libmudflap),yes)
+  arch_binaries  := $(arch_binaries) libmudflap
+  ifeq ($(with_lib64mudflap),yes)
+    arch_binaries  := $(arch_binaries) lib64mudflap
+  endif
+  ifeq ($(with_lib32mudflap),yes)
+    arch_binaries	:= $(arch_binaries) lib32mudflap
+  endif
+endif
+
+p_mf	= libmudflap$(MUDFLAP_SONAME)
+p_l32mf	= lib32mudflap$(MUDFLAP_SONAME)
+p_l64mf	= lib64mudflap$(MUDFLAP_SONAME)
+p_mfd	= libmudflap$(MUDFLAP_SONAME)$(pkg_ver)-dev
+
+d_mf	= debian/$(p_mf)
+d_l32mf	= debian/$(p_l32mf)
+d_l64mf	= debian/$(p_l64mf)
+d_mfd	= debian/$(p_mfd)
+
+dirs_mfd = \
+	$(docdir)/$(p_base)/mudflap \
+	$(PF)/include \
+	$(PF)/$(libdir)
+files_mfd = \
+	$(gcc_lib_dir)/include/mf-runtime.h \
+	$(gcc_lib_dir)/libmudflap*.a
+
+ifeq ($(with_lib32mudflap),yes)
+	dirs_mfd  += $(gcc_lib_dir)/$(biarchsubdir)
+	files_mfd += $(gcc_lib_dir)/$(biarchsubdir)/libmudflap*.a
+endif
+ifeq ($(with_lib64mudflap),yes)
+	dirs_mfd  += $(gcc_lib_dir)/$(biarchsubdir)
+	files_mfd += $(gcc_lib_dir)/$(biarchsubdir)/libmudflap*.a
+endif
+
+$(binary_stamp)-libmudflap: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_mf)
+	dh_installdirs -p$(p_mf) \
+		$(docdir) \
+		$(PF)/$(libdir)
+
+	DH_COMPAT=2 dh_movefiles -p$(p_mf) \
+		$(PF)/$(libdir)/libmudflap*.so.*
+
+	debian/dh_doclink -p$(p_mf) $(p_base)
+	debian/dh_rmemptydirs -p$(p_mf)
+	dh_strip -p$(p_mf)
+	dh_compress -p$(p_mf)
+	dh_fixperms -p$(p_mf)
+	dh_makeshlibs -p$(p_mf) -V '$(p_mf) (>= $(DEB_SOVERSION))'
+	dh_shlibdeps -p$(p_mf)
+	dh_gencontrol -p$(p_mf) \
+		-- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_mf)
+	dh_md5sums -p$(p_mf)
+	dh_builddeb -p$(p_mf)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+
+# ----------------------------------------------------------------------
+$(binary_stamp)-libmudflapdev: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_mfd)
+	dh_installdirs -p$(p_mfd) $(dirs_mfd)
+
+	rm -f $(d)/$(PF)/$(libdir)/libmudflap*.so
+	mv $(d)/$(PF)/$(libdir)/libmudflap*.a $(d)/$(gcc_lib_dir)/
+
+	rm -f $(d)/$(PF)/$(libdir)/libmudflap*.la
+	rm -f $(d)/$(PF)/$(libdir)/$(biarchsubdir)/libmudflap*.la
+
+	DH_COMPAT=2 dh_movefiles -p$(p_mfd) $(files_mfd)
+
+	dh_link -p$(p_mfd) \
+	  /$(PF)/$(libdir)/libmudflap.so.$(MUDFLAP_SONAME) /$(gcc_lib_dir)/libmudflap.so \
+	  /$(PF)/$(libdir)/libmudflapth.so.$(MUDFLAP_SONAME) /$(gcc_lib_dir)/libmudflapth.so
+
+ifeq ($(with_lib32mudflap),yes)
+	rm -f $(d)/$(lib32)/libmudflap*.so
+	mkdir -p $(d_mfd)/$(gcc_lib_dir)/$(biarchsubdir)
+	mv $(d)/$(lib32)/libmudflap*.a $(d_mfd)/$(gcc_lib_dir)/$(biarchsubdir)/
+	dh_link -p$(p_mfd) \
+	  /$(lib32)/libmudflap.so.$(MUDLFLAP_SONAME) /$(gcc_lib_dir)/$(biarchsubdir)/libmudflap.so \
+	  /$(lib32)/libmudflapth.so.$(MUDFLAP_SONAME) /$(gcc_lib_dir)/$(biarchsubdir)/libmudflapth.so
+endif
+
+ifeq ($(with_lib64mudflap),yes)
+	rm -f $(d)/$(PF)/$(lib64)/libmudflap*.so
+	mkdir -p $(d_mfd)/$(gcc_lib_dir)/$(biarchsubdir)
+	mv $(d)/$(PF)/$(lib64)/libmudflap*.a $(d_mfd)/$(gcc_lib_dir)/$(biarchsubdir)/
+	dh_link -p$(p_mfd) \
+	  /$(PF)/lib64/libmudflap.so.$(MUDLFLAP_SONAME) /$(gcc_lib_dir)/$(biarchsubdir)/libmudflap.so \
+	  /$(PF)/lib64/libmudflapth.so.$(MUDFLAP_SONAME) /$(gcc_lib_dir)/$(biarchsubdir)/libmudflapth.so
+endif
+
+	cp -p $(srcdir)/libmudflap/ChangeLog \
+		$(d_mfd)/$(docdir)/$(p_base)/mudflap/changelog
+
+	debian/dh_doclink -p$(p_mfd) $(p_base)
+	debian/dh_rmemptydirs -p$(p_mfd)
+
+	dh_strip -p$(p_mfd)
+	dh_compress -p$(p_mfd)
+	dh_fixperms -p$(p_mfd)
+	dh_shlibdeps -p$(p_mfd)
+	dh_gencontrol -p$(p_mfd) \
+		-- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_mfd)
+	dh_md5sums -p$(p_mfd)
+	dh_builddeb -p$(p_mfd)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+
+# ----------------------------------------------------------------------
+$(binary_stamp)-lib64mudflap: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_l64mf)
+	dh_installdirs -p$(p_l64mf) \
+		$(PF)/lib64
+	DH_COMPAT=2 dh_movefiles -p$(p_l64mf) \
+		$(PF)/lib64/libmudflap*.so.*
+
+	debian/dh_doclink -p$(p_l64mf) $(p_base)
+
+	dh_strip -p$(p_l64mf)
+	dh_compress -p$(p_l64mf)
+	dh_fixperms -p$(p_l64mf)
+	dh_makeshlibs -p$(p_l64mf) -V '$(p_l64mf) (>= $(DEB_SOVERSION))'
+#	dh_shlibdeps -p$(p_l64mf)
+	dh_gencontrol -p$(p_l64mf) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_l64mf)
+	dh_md5sums -p$(p_l64mf)
+	dh_builddeb -p$(p_l64mf)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+
+# ----------------------------------------------------------------------
+$(binary_stamp)-lib32mudflap: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_l32mf)
+	dh_installdirs -p$(p_l32mf) \
+		$(lib32)
+	DH_COMPAT=2 dh_movefiles -p$(p_l32mf) \
+		$(lib32)/libmudflap*.so.*
+
+	debian/dh_doclink -p$(p_l32mf) $(p_base)
+
+	dh_strip -p$(p_l32mf)
+	dh_compress -p$(p_l32mf)
+	dh_fixperms -p$(p_l32mf)
+	dh_makeshlibs -p$(p_l32mf) -V '$(p_l32mf) (>= $(DEB_SOVERSION))'
+#	dh_shlibdeps -p$(p_l32mf)
+	dh_gencontrol -p$(p_l32mf) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_l32mf)
+	dh_md5sums -p$(p_l32mf)
+	dh_builddeb -p$(p_l32mf)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
--- gcj-4.2-4.2-20070707.orig/debian/rules.d/binary-fortran.mk
+++ gcj-4.2-4.2-20070707/debian/rules.d/binary-fortran.mk
@@ -0,0 +1,251 @@
+ifeq ($(with_libfortran),yes)
+  arch_binaries  := $(arch_binaries) libfortran
+endif
+ifeq ($(with_lib64fortran),yes)
+  arch_binaries  := $(arch_binaries) lib64fortran
+endif
+ifeq ($(with_lib32fortran),yes)
+  arch_binaries	:= $(arch_binaries) lib32fortran
+endif
+
+ifeq ($(with_fdev),yes)
+  ifneq (,$(filter yes, $(biarch) $(biarch32)))
+    arch_binaries  := $(arch_binaries) fdev-multi
+  endif
+  arch_binaries  := $(arch_binaries) fdev
+  ifneq ($(GFDL_INVARIANT_FREE),yes)
+    indep_binaries := $(indep_binaries) fortran-doc
+  endif
+endif
+
+p_g95	= gfortran$(pkg_ver)
+p_g95_m	= gfortran$(pkg_ver)-multilib
+p_g95d	= gfortran$(pkg_ver)-doc
+p_flib	= libgfortran$(FORTRAN_SONAME)
+p_f32lib= lib32gfortran$(FORTRAN_SONAME)
+p_f64lib= lib64gfortran$(FORTRAN_SONAME)
+
+d_g95	= debian/$(p_g95)
+d_g95_m	= debian/$(p_g95_m)
+d_g95d	= debian/$(p_g95d)
+d_flib	= debian/$(p_flib)
+d_f32lib= debian/$(p_f32lib)
+d_f64lib= debian/$(p_f64lib)
+
+dirs_g95 = \
+	$(docdir)/$(p_base)/fortran \
+	$(PF)/bin \
+	$(gcc_lexec_dir) \
+	$(gcc_lib_dir) \
+	$(PF)/include \
+	$(PF)/share/man/man1
+files_g95 = \
+	$(PF)/bin/gfortran$(pkg_ver) \
+	$(gcc_lib_dir)/finclude \
+	$(gcc_lib_dir)/libgfortranbegin.a \
+	$(gcc_lexec_dir)/f951 
+
+ifneq ($(GFDL_INVARIANT_FREE),yes)
+  files_g95 += \
+	$(PF)/share/man/man1/gfortran$(pkg_ver).1
+endif
+
+dirs_flib = \
+	$(docdir)/$(p_base)/fortran \
+	$(PF)/$(libdir) \
+
+files_flib = \
+	$(PF)/$(libdir)/libgfortran.so.*
+
+# ----------------------------------------------------------------------
+$(binary_stamp)-libfortran: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_flib)
+	dh_installdirs -p$(p_flib) $(dirs_flib)
+	DH_COMPAT=2 dh_movefiles -p$(p_flib) $(files_flib)
+	debian/dh_doclink -p$(p_flib) $(p_base)
+
+	dh_strip -p$(p_flib)
+	dh_compress -p$(p_flib)
+	dh_fixperms -p$(p_flib)
+	dh_makeshlibs -p$(p_flib) -V '$(p_flib) (>= $(DEB_SOVERSION))'
+	dh_shlibdeps -p$(p_flib)
+	dh_gencontrol -p$(p_flib) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_flib)
+	dh_md5sums -p$(p_flib)
+	dh_builddeb -p$(p_flib)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+
+# ----------------------------------------------------------------------
+$(binary_stamp)-lib64fortran: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_f64lib)
+	dh_installdirs -p$(p_f64lib) \
+		$(PF)/lib64
+	DH_COMPAT=2 dh_movefiles -p$(p_f64lib) \
+		$(PF)/lib64/libgfortran.so.*
+
+	debian/dh_doclink -p$(p_f64lib) $(p_base)
+
+	dh_strip -p$(p_f64lib)
+	dh_compress -p$(p_f64lib)
+	dh_fixperms -p$(p_f64lib)
+	dh_makeshlibs -p$(p_f64lib) -V '$(p_f64lib) (>= $(DEB_SOVERSION))'
+#	dh_shlibdeps -p$(p_f64lib)
+	dh_gencontrol -p$(p_f64lib) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_f64lib)
+	dh_md5sums -p$(p_f64lib)
+	dh_builddeb -p$(p_f64lib)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+
+# ----------------------------------------------------------------------
+$(binary_stamp)-lib32fortran: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_f32lib)
+	dh_installdirs -p$(p_f32lib) \
+		$(lib32)
+	DH_COMPAT=2 dh_movefiles -p$(p_f32lib) \
+		$(lib32)/libgfortran.so.*
+
+	debian/dh_doclink -p$(p_f32lib) $(p_base)
+
+	dh_strip -p$(p_f32lib)
+	dh_compress -p$(p_f32lib)
+	dh_fixperms -p$(p_f32lib)
+	dh_makeshlibs -p$(p_f32lib) -V '$(p_f32lib) (>= $(DEB_SOVERSION))'
+#	dh_shlibdeps -p$(p_f32lib)
+	dh_gencontrol -p$(p_f32lib) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_f32lib)
+	dh_md5sums -p$(p_f32lib)
+	dh_builddeb -p$(p_f32lib)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+
+# ----------------------------------------------------------------------
+$(binary_stamp)-fdev: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_g95)
+	dh_installdirs -p$(p_g95) $(dirs_g95)
+
+	rm -f $(d)/$(gcc_lib_dir)/libgfortranbegin.la
+	rm -f $(d)/$(gcc_lib_dir)/$(biarchsubdir)/libgfortranbegin.la
+
+	DH_COMPAT=2 dh_movefiles -p$(p_g95) $(files_g95)
+
+	rm -f $(d)/$(PF)/lib/libgfortran*.{la,so}
+	mv $(d)/$(PF)/lib/libgfortran*.a $(d_g95)/$(gcc_lib_dir)/
+	dh_link -p$(p_g95) \
+	  /$(PF)/$(libdir)/libgfortran.so.$(FORTRAN_SONAME) \
+	  /$(gcc_lib_dir)/libgfortran.so
+
+	ln -sf gfortran$(pkg_ver) \
+	    $(d_g95)/$(PF)/bin/$(DEB_TARGET_GNU_TYPE)-gfortran$(pkg_ver)
+	ln -sf gfortran$(pkg_ver) \
+	    $(d_g95)/$(PF)/bin/$(TARGET_ALIAS)-gfortran$(pkg_ver)
+ifneq ($(GFDL_INVARIANT_FREE),yes)
+	ln -sf gfortran$(pkg_ver).1 \
+	    $(d_g95)/$(PF)/share/man/man1/$(DEB_TARGET_GNU_TYPE)-gfortran$(pkg_ver).1
+	ln -sf gfortran$(pkg_ver).1 \
+	    $(d_g95)/$(PF)/share/man/man1/$(TARGET_ALIAS)-gfortran$(pkg_ver).1
+endif
+
+	debian/dh_doclink -p$(p_g95) $(p_base)
+
+	cp -p $(srcdir)/gcc/fortran/ChangeLog \
+		$(d_g95)/$(docdir)/$(p_base)/fortran/changelog
+	debian/dh_rmemptydirs -p$(p_g95)
+
+	dh_strip -p$(p_g95)
+	dh_compress -p$(p_g95)
+	dh_fixperms -p$(p_g95)
+	dh_shlibdeps -p$(p_g95)
+	dh_gencontrol -p$(p_g95) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_g95)
+	dh_md5sums -p$(p_g95)
+	dh_builddeb -p$(p_g95)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+
+# ----------------------------------------------------------------------
+$(binary_stamp)-fdev-multi: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_g95_m)
+	dh_installdirs -p$(p_g95_m) \
+		$(docdir) \
+		$(gcc_lib_dir)/$(biarchsubdir)
+	DH_COMPAT=2 dh_movefiles -p$(p_g95_m) \
+		$(gcc_lib_dir)/$(biarchsubdir)/libgfortranbegin.a
+
+ifeq ($(with_lib64fortran),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)
+	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)/
+	dh_link -p$(p_g95_m) \
+	  /$(lib32)/libgfortran.so.$(FORTRAN_SONAME) /$(gcc_lib_dir)/$(biarchsubdir)/libgfortran.so
+endif
+
+	debian/dh_doclink -p$(p_g95_m) $(p_base)
+	debian/dh_rmemptydirs -p$(p_g95_m)
+	dh_strip -p$(p_g95_m)
+	dh_compress -p$(p_g95_m)
+	dh_fixperms -p$(p_g95_m)
+	dh_shlibdeps -p$(p_g95_m)
+	dh_gencontrol -p$(p_g95_m) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_g95_m)
+	dh_md5sums -p$(p_g95_m)
+	dh_builddeb -p$(p_g95_m)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+
+# ----------------------------------------------------------------------
+$(binary_stamp)-fortran-doc: $(build_html_stamp) $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_g95d)
+	dh_installdirs -p$(p_g95d) \
+		$(docdir)/$(p_base)/fortran \
+		$(PF)/share/info
+	DH_COMPAT=2 dh_movefiles -p$(p_g95d) \
+		$(PF)/share/info/gfortran*
+
+	debian/dh_doclink -p$(p_g95d) $(p_base)
+ifneq ($(GFDL_INVARIANT_FREE),yes)
+	dh_installdocs -p$(p_g95d)
+	rm -f $(d_g95d)/$(docdir)/$(p_base)/copyright
+	cp -p html/gfortran.html $(d_g95d)/$(docdir)/$(p_base)/fortran/
+endif
+
+	dh_compress -p$(p_g95d)
+	dh_fixperms -p$(p_g95d)
+	dh_installdeb -p$(p_g95d)
+	dh_gencontrol -p$(p_g95d) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_md5sums -p$(p_g95d)
+	dh_builddeb -p$(p_g95d)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
--- gcj-4.2-4.2-20070707.orig/debian/rules.d/binary-nof-cross.mk
+++ gcj-4.2-4.2-20070707/debian/rules.d/binary-nof-cross.mk
@@ -0,0 +1,46 @@
+arch_binaries  := $(arch_binaries) nof
+
+p_nof  = gcc$(pkg_arch)-nof
+d_nof  = debian/$(p_nof)
+
+dirs_nof = \
+	$(docdir) \
+	$(PF)/$(DEB_TARGET_GNU_TYPE)/lib/nof
+ifeq ($(with_cdev),yes)
+  dirs_nof += \
+	$(gcc_lib_dir)/nof
+endif
+
+ifeq ($(with_cdev),yes)
+  files_nof = \
+	$(PF)/$(DEB_TARGET_GNU_TYPE)/lib/libgcc_s_nof.so.$(GCC_SONAME) \
+	$(gcc_lib_dir)/libgcc_s_nof.so \
+	$(PF)/$(DEB_TARGET_GNU_TYPE)/lib/nof \
+	$(gcc_lib_dir)/nof
+else
+  files_nof = \
+	lib/libgcc_s_nof.so.$(GCC_SONAME)
+endif
+
+# ----------------------------------------------------------------------
+$(binary_stamp)-nof: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	ln -sf /$(PF)/$(DEB_TARGET_GNU_TYPE)/lib/libgcc_s_nof.so.$(GCC_SONAME) \
+		$(d)/$(gcc_lib_dir)/libgcc_s_nof.so
+
+	rm -rf $(d_nof)
+	dh_installdirs -p$(p_nof) $(dirs_nof)
+	DH_COMPAT=2 dh_movefiles -p$(p_nof) $(files_nof)
+	debian/dh_doclink -p$(p_nof) $(p_base)
+	dh_strip -p$(p_nof)
+	dh_compress -p$(p_nof)
+	dh_fixperms -p$(p_nof)
+	dh_gencontrol -p$(p_nof) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_nof)
+	dh_md5sums -p$(p_nof)
+	dh_builddeb -p$(p_nof)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
--- gcj-4.2-4.2-20070707.orig/debian/rules.d/binary-snapshot.mk
+++ gcj-4.2-4.2-20070707/debian/rules.d/binary-snapshot.mk
@@ -0,0 +1,83 @@
+arch_binaries  := $(arch_binaries) snapshot
+
+p_snap	= gcc-snapshot
+d_snap	= debian/$(p_snap)
+
+dirs_snap = \
+	$(docdir)/$(p_snap) \
+	usr/lib
+
+# ----------------------------------------------------------------------
+$(binary_stamp)-snapshot: $(install_snap_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_snap_stamp) $(install_snap_stamp)-tmp
+
+	rm -rf $(d_snap)
+	dh_installdirs -p$(p_snap) $(dirs_snap)
+
+	-find $(d) -name '*.gch' -type d | xargs rm -rf
+
+	mv $(d)/$(PF) $(d_snap)/usr/lib/
+
+	rm -rf $(d_snap)/$(PF)/lib/nof
+
+ifeq ($(with_hppa64),yes)
+	: # provide as and ld links
+	dh_link -p $(p_snap) \
+		/usr/bin/hppa64-linux-gnu-as \
+		/$(PF)/libexec/gcc/hppa64-linux-gnu/$(GCC_VERSION)/as \
+		/usr/bin/hppa64-linux-gnu-ld \
+		/$(PF)/libexec/gcc/hppa64-linux-gnu/$(GCC_VERSION)/ld
+endif
+
+ifeq ($(with_check),yes)
+	dh_installdocs -p$(p_snap) test-summary
+  ifeq ($(with_pascal),yes)
+	cp -p gpc-test-summary $(d_snap)/$(docdir)/$(p_snap)/
+  endif
+else
+	dh_installdocs -p$(p_snap)
+endif
+	if [ -f $(buildlibdir)/libstdc++-v3/testsuite/current_symbols.txt ]; \
+	then \
+	  cp -p $(buildlibdir)/libstdc++-v3/testsuite/current_symbols.txt \
+	    $(d_snap)/$(docdir)/$(p_snap)/libstdc++6_symbols.txt; \
+	fi
+	cp -p debian/README.snapshot \
+		$(d_snap)/$(docdir)/$(p_snap)/README.Debian
+	dh_installchangelogs -p$(p_snap)
+ifeq ($(DEB_TARGET_ARCH),hppa)
+	dh_strip -p$(p_snap) -Xdebug -X.o -X.a
+else
+	dh_strip -p$(p_snap) -Xdebug
+endif
+	dh_compress -p$(p_snap)
+	-find $(d_snap) -type d ! -perm 755 -exec chmod 755 {} \;
+	dh_fixperms -p$(p_snap)
+
+ifeq (0,1)
+ifeq ($(biarch),yes)
+	mv $(d_snap)/$(PF)/lib64 .
+endif
+ifeq ($(biarch32),yes)
+	mv $(d_snap)/$(PF)/lib32 .
+endif
+	dh_shlibdeps -p$(p_snap) \
+		-l$(d_snap)/$(PF)/lib:$(d_snap)/$(gcc_lib_dir)
+ifeq ($(biarch),yes)
+	mv lib64 $(d_snap)/$(PF)/
+endif
+ifeq ($(biarch32),yes)
+	mv lib32 $(d_snap)/$(PF)/
+endif
+endif
+	-dh_shlibdeps -p$(p_snap) \
+		-l$(d_snap)/$(PF)/lib:$(d_snap)/$(gcc_lib_dir)
+
+	dh_gencontrol -p$(p_snap) -- $(common_substvars)
+	dh_installdeb -p$(p_snap)
+	dh_md5sums -p$(p_snap)
+	dh_builddeb -p$(p_snap)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_snap_stamp)-tmp $(install_snap_stamp)
--- gcj-4.2-4.2-20070707.orig/debian/rules.d/binary-fixincl.mk
+++ gcj-4.2-4.2-20070707/debian/rules.d/binary-fixincl.mk
@@ -0,0 +1,47 @@
+arch_binaries  := $(arch_binaries) fixincl
+
+p_fix	= fixincludes
+d_fix	= debian/$(p_fix)
+
+dirs_fix = \
+	$(docdir)/$(p_base)/fixincludes \
+	$(PF)/share/man/man1 \
+	$(PF)/bin \
+	$(gcc_lexec_dir) \
+	$(gcc_lib_dir)
+files_fix = \
+	$(gcc_lexec_dir)/install-tools \
+	$(gcc_lib_dir)/install-tools
+
+# ----------------------------------------------------------------------
+$(binary_stamp)-fixincl: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_fix)
+	dh_installdirs -p$(p_fix) $(dirs_fix)
+	DH_COMPAT=2 dh_movefiles -p$(p_fix) $(files_fix)
+
+#	$(IP) $(builddir)/gcc/fixinc/fixincl $(d_fix)/$(PF)/lib/fixincludes/
+#	sed -e "s,^FIXINCL=\(.*\),FIXINCL=/$(PF)/lib/fixincludes/fixincl," \
+#	    $(builddir)/gcc/fixinc.sh \
+#		> $(d_fix)/$(PF)/lib/fixincludes/fixinc.sh
+#	chmod 755 $(d_fix)/$(PF)/lib/fixincludes/fixinc.sh
+	$(IR) $(srcdir)/fixincludes/README \
+	    $(d_fix)/$(docdir)/$(p_base)/fixincludes
+	sed -e 's,@LIBEXECDIR@,$(gcc_lexec_dir),g' debian/fixincludes.in \
+	    > $(d_fix)/$(PF)/bin/fixincludes
+	chmod 755 $(d_fix)/$(PF)/bin/fixincludes
+
+	debian/dh_doclink -p$(p_fix) $(p_base)
+	dh_strip -p$(p_fix)
+	dh_compress -p$(p_fix)
+	dh_fixperms -p$(p_fix)
+	dh_shlibdeps -p$(p_fix)
+	dh_gencontrol -p$(p_fix) -- -v$(DEB_EVERSION) $(common_substvars)
+	dh_installdeb -p$(p_fix)
+	dh_md5sums -p$(p_fix)
+	dh_builddeb -p$(p_fix)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
--- gcj-4.2-4.2-20070707.orig/debian/rules.d/binary-cross.mk
+++ gcj-4.2-4.2-20070707/debian/rules.d/binary-cross.mk
@@ -0,0 +1,57 @@
+arch_binaries  := $(arch_binaries) gcc-cross
+
+dirs_gcc = \
+	$(docdir)/$(p_base)/gcc \
+	$(PF)/bin \
+	$(gcc_lib_dir)/include \
+	$(PF)/share/man/man1
+
+files_gcc = \
+	$(PF)/bin/{$(DEB_TARGET_GNU_TPE)-gcc,$(DEB_TARGET_GNU_TYPE)-cpp}$(pkg_ver) \
+	$(PF)/share/man/man1/{$(DEB_TARGET_GNU_TYPE)-gcc}$(pkg_ver).1 \
+	$(gcc_lib_dir) \
+
+
+files_gcc += \
+	$(shell test -e $(d)/$(gcc_lib_dir)/SYSCALLS.c.X \
+		&& echo $(gcc_lib_dir)/SYSCALLS.c.X)
+
+usr_doc_files = debian/README.Bugs \
+	$(shell test -f $(srcdir)/FAQ && echo $(srcdir)/FAQ)
+ifeq ($(with_check),yes)
+  usr_doc_files += test-summary
+endif
+ifeq ($(DEB_HOST_ARCH),sparc)
+  usr_doc_files += debian/README.sparc
+endif
+
+# ----------------------------------------------------------------------
+$(binary_stamp)-gcc-cross: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	rm -rf $(d_gcc)
+	dh_installdirs -p$(p_gcc) $(dirs_gcc)
+	$(IS) debian/c89 $(d)/$(PF)/bin/
+	$(IR) debian/c89.1 $(d)/$(PF)/share/man/man1/
+
+	rm -f $(d)/$(PF)/$(libdir)/libgcc_s.so
+	ln -sf /$(libdir)/libgcc_s.so.$(GCC_SONAME) $(d)/$(gcc_lib_dir)/libgcc_s.so
+
+	DH_COMPAT=2 dh_movefiles -p$(p_gcc) $(files_gcc)
+
+#	dh_installdebconf
+	debian/dh_doclink -p$(p_gcc) $(p_base)
+	cp -p $(usr_doc_files) $(d_gcc)/$(docdir)/$(p_base)/.
+	cp -p debian/NEWS.gcc $(d_gcc)/$(docdir)/$(p_base)/NEWS
+	dh_undocumented -p$(p_gcc) gccbug$(pkg_ver).1
+	debian/dh_rmemptydirs -p$(p_gcc)
+	dh_strip -p$(p_gcc)
+	dh_compress -p$(p_gcc)
+	dh_fixperms -p$(p_gcc)
+	dh_shlibdeps -p$(p_gcc)
+	dh_gencontrol -p$(p_gcc) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_gcc)
+	dh_md5sums -p$(p_gcc)
+	dh_builddeb -p$(p_gcc)
+	touch $@
+
--- gcj-4.2-4.2-20070707.orig/debian/rules.d/binary-libffi.mk
+++ gcj-4.2-4.2-20070707/debian/rules.d/binary-libffi.mk
@@ -0,0 +1,143 @@
+arch_binaries  := $(arch_binaries) libffi
+ifeq ($(with_lib64ffi),yes)
+  arch_binaries  := $(arch_binaries) lib64ffi
+endif
+ifeq ($(with_lib32ffi),yes)
+  arch_binaries	:= $(arch_binaries) lib32ffi
+endif
+
+p_ffi	= libffi$(FFI_SONAME)
+p_l32ffi= lib32ffi$(FFI_SONAME)
+p_l64ffi= lib64ffi$(FFI_SONAME)
+p_ffid	= libffi$(FFI_SONAME)-dev
+
+d_ffi	= debian/$(p_ffi)
+d_l32ffi= debian/$(p_l32ffi)
+d_l64ffi= debian/$(p_l64ffi)
+d_ffid	= debian/$(p_ffid)
+
+dirs_ffi = \
+	$(docdir)/$(p_base)/libffi \
+	$(PF)/$(libdir)
+files_ffi = \
+	$(PF)/$(libdir)/libffi.so.*
+
+dirs_ffid = \
+	$(docdir)/$(p_base)/libffi \
+	$(PF)/include \
+	$(gcc_lib_dir)/include
+files_ffid = \
+	$(PF)/include/{ffi.h,ffitarget.h} \
+	$(PF)/$(libdir)/libffi.{a,so}
+
+ifeq ($(with_lib32ffi),yes)
+	dirs_ffid  += $(lib32)
+	files_ffid += $(lib32)/libffi.{a,so}
+endif
+ifeq ($(with_lib64ffi),yes)
+	dirs_ffid  += $(PF)/lib64
+	files_ffid += $(PF)/lib64/libffi.{a,so}
+endif
+
+$(binary_stamp)-libffi: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_ffi) $(d_ffid)
+	dh_installdirs -p$(p_ffi) $(dirs_ffi)
+	dh_installdirs -p$(p_ffid) $(dirs_ffid)
+
+	mv $(d)/$(gcc_lib_dir)/include/ffi*.h $(d)/$(PF)/include/.
+
+	DH_COMPAT=2 dh_movefiles -p$(p_ffi) $(files_ffi)
+	DH_COMPAT=2 dh_movefiles -p$(p_ffid) $(files_ffid)
+
+	cp -p $(buildlibdir)/libffi/.libs/libffi_convenience.a \
+		$(d_ffid)/$(PF)/lib/libffi_pic.a
+
+ifeq ($(with_lib64ffi),yes)
+	cp -p $(buildlibdir)/64/libffi/.libs/libffi_convenience.a \
+		$(d_ffid)/$(PF)/$(lib64)/libffi_pic.a
+endif
+ifeq ($(with_lib32ffi),yes)
+	cp -p $(buildlibdir)/32/libffi/.libs/libffi_convenience.a \
+		$(d_ffid)/$(lib32)/libffi_pic.a
+endif
+
+	cp -p $(srcdir)/libffi/README $(d_ffid)/$(docdir)/$(p_base)/libffi/
+	cp -p $(srcdir)/libffi/ChangeLog \
+		$(d_ffid)/$(docdir)/$(p_base)/libffi/changelog
+	cp -p $(srcdir)/libffi/ChangeLog.libgcj \
+		$(d_ffid)/$(docdir)/$(p_base)/libffi/changelog.libgcj
+
+	debian/dh_doclink -p$(p_ffi) $(p_base)
+	debian/dh_doclink -p$(p_ffid) $(p_base)
+
+	debian/dh_rmemptydirs -p$(p_ffi)
+	debian/dh_rmemptydirs -p$(p_ffid)
+
+	dh_strip -p$(p_ffi) -p$(p_ffid)
+	dh_compress -p$(p_ffi) -p$(p_ffid)
+	dh_fixperms -p$(p_ffi) -p$(p_ffid)
+	dh_makeshlibs -p$(p_ffi) -V '$(p_ffi) (>= $(DEB_FFI_SOVERSION))'
+	dh_shlibdeps -p$(p_ffi) -p$(p_ffid)
+	dh_gencontrol -p$(p_ffi) -p$(p_ffid) \
+		-- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_ffi) -p$(p_ffid)
+	dh_md5sums -p$(p_ffi) -p$(p_ffid)
+	dh_builddeb -p$(p_ffi) -p$(p_ffid)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+
+# ----------------------------------------------------------------------
+$(binary_stamp)-lib64ffi: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_l64ffi)
+	dh_installdirs -p$(p_l64ffi) \
+		$(PF)/lib64
+	DH_COMPAT=2 dh_movefiles -p$(p_l64ffi) \
+		$(PF)/lib64/libffi.so.*
+
+	debian/dh_doclink -p$(p_l64ffi) $(p_base)
+
+	dh_strip -p$(p_l64ffi)
+	dh_compress -p$(p_l64ffi)
+	dh_fixperms -p$(p_l64ffi)
+	dh_makeshlibs -p$(p_l64ffi) -V '$(p_l64ffi) (>= $(DEB_FFI_SOVERSION))'
+#	dh_shlibdeps -p$(p_l64ffi)
+	dh_gencontrol -p$(p_l64ffi) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_l64ffi)
+	dh_md5sums -p$(p_l64ffi)
+	dh_builddeb -p$(p_l64ffi)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+
+# ----------------------------------------------------------------------
+$(binary_stamp)-lib32ffi: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_l32ffi)
+	dh_installdirs -p$(p_l32ffi) \
+		$(lib32)
+	DH_COMPAT=2 dh_movefiles -p$(p_l32ffi) \
+		$(lib32)/libffi.so.*
+
+	debian/dh_doclink -p$(p_l32ffi) $(p_base)
+
+	dh_strip -p$(p_l32ffi)
+	dh_compress -p$(p_l32ffi)
+	dh_fixperms -p$(p_l32ffi)
+	dh_makeshlibs -p$(p_l32ffi) -V '$(p_l32ffi) (>= $(DEB_FFI_SOVERSION))'
+	dh_shlibdeps -p$(p_l32ffi)
+	dh_gencontrol -p$(p_l32ffi) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_l32ffi)
+	dh_md5sums -p$(p_l32ffi)
+	dh_builddeb -p$(p_l32ffi)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
--- gcj-4.2-4.2-20070707.orig/debian/rules.d/binary-libgcc.mk
+++ gcj-4.2-4.2-20070707/debian/rules.d/binary-libgcc.mk
@@ -0,0 +1,157 @@
+ifeq ($(with_libgcc),yes)
+  arch_binaries	:= $(arch_binaries) libgcc
+endif
+ifeq ($(with_lib64gcc),yes)
+  arch_binaries	:= $(arch_binaries) lib64gcc
+endif
+ifeq ($(biarch32),yes)
+  arch_binaries	:= $(arch_binaries) lib32gcc
+endif
+
+p_lgcc		= libgcc$(GCC_SONAME)
+d_lgcc		= debian/$(p_lgcc)
+
+p_l32gcc	= lib32gcc$(GCC_SONAME)
+d_l32gcc	= debian/$(p_l32gcc)
+
+p_l64gcc	= lib64gcc$(GCC_SONAME)
+d_l64gcc	= debian/$(p_l64gcc)
+
+# ----------------------------------------------------------------------
+$(binary_stamp)-libgcc: $(install_dependencies)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_lgcc)
+	dh_installdirs -p$(p_lgcc) \
+		$(docdir)/$(p_lgcc) \
+		$(libdir)
+
+ifeq ($(with_shared_libgcc),yes)
+	mv $(d)/$(PF)/lib/libgcc_s.so.$(GCC_SONAME) $(d_lgcc)/$(libdir)/.
+endif
+
+ifeq ($(with_standalone_gcj)-$(DEB_TARGET_ARCH),yes-hppa)
+	debian/dh_doclink -p$(p_lgcc) $(p_jbase)
+else
+	debian/dh_doclink -p$(p_lgcc) $(p_base)
+endif
+	debian/dh_rmemptydirs -p$(p_lgcc)
+	dh_strip -p$(p_lgcc)
+	dh_compress -p$(p_lgcc)
+	dh_fixperms -p$(p_lgcc)
+ifeq ($(with_shared_libgcc),yes)
+	dh_makeshlibs -p$(p_lgcc) -V '$(p_lgcc) (>= $(DEB_LIBGCC_SOVERSION))'
+	cat debian/$(p_lgcc)/DEBIAN/shlibs >> debian/shlibs.local
+endif
+	dh_shlibdeps -p$(p_lgcc)
+	dh_gencontrol -p$(p_lgcc) \
+		-- -v$(DEB_LIBGCC_VERSION) $(common_substvars)
+
+	mkdir -p $(d_lgcc)/usr/share/lintian/overrides
+	echo '$(p_lgcc): package-name-doesnt-match-sonames' \
+		> $(d_lgcc)/usr/share/lintian/overrides/$(p_lgcc)
+
+	dh_installdeb -p$(p_lgcc)
+	dh_md5sums -p$(p_lgcc)
+	dh_builddeb -p$(p_lgcc)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+
+# ----------------------------------------------------------------------
+$(binary_stamp)-lib64gcc: $(install_dependencies)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_l64gcc)
+	dh_installdirs -p$(p_l64gcc) \
+		$(docdir)/$(p_l64gcc) \
+		lib64
+
+ifeq ($(with_shared_libgcc),yes)
+	mv $(d)/$(PF)/lib64/libgcc_s.so.$(GCC_SONAME) $(d_l64gcc)/lib64/.
+endif
+
+	debian/dh_doclink -p$(p_l64gcc) $(p_base)
+	debian/dh_rmemptydirs -p$(p_l64gcc)
+	dh_strip -p$(p_l64gcc)
+	dh_compress -p$(p_l64gcc)
+	dh_fixperms -p$(p_l64gcc)
+ifeq ($(with_shared_libgcc),yes)
+	dh_makeshlibs -p$(p_l64gcc) \
+		-V '$(p_l64gcc) (>= $(DEB_LIBGCC_SOVERSION))'
+# this does not work ... shlibs.local doesn't distinguish 32/64 bit libs
+#	cat debian/$(p_l64gcc)/DEBIAN/shlibs >> debian/shlibs.local
+endif
+#	dh_shlibdeps -p$(p_l64gcc)
+#/usr/bin/ldd: line 1: /lib/ld64.so.1: cannot execute binary file
+#dpkg-shlibdeps: failure: ldd on `debian/lib64gcc1/lib64/libgcc_s.so.1' gave error exit status 1
+ifeq ($(DEB_TARGET_ARCH),s390)
+	echo 'shlibs:Depends=libc6-s390x (>= 2.3.1-1)' \
+		> debian/$(p_l64gcc).substvars
+endif
+ifeq ($(DEB_TARGET_ARCH),i386)
+	echo 'shlibs:Depends=libc6-amd64' \
+		> debian/$(p_l64gcc).substvars
+endif
+ifeq ($(DEB_TARGET_ARCH),sparc)
+	echo 'shlibs:Depends=libc6-sparc64 (>= 2.3.1-1)' \
+		> debian/$(p_l64gcc).substvars
+endif
+ifeq ($(DEB_TARGET_ARCH),powerpc)
+	# FIXME change dependency when lib64c6 exists
+	echo 'shlibs:Depends=libc6 (>= 0.1)' \
+		> debian/$(p_l64gcc).substvars
+endif
+	dh_gencontrol -p$(p_l64gcc) \
+		-- -v$(DEB_LIBGCC_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_l64gcc)
+	dh_md5sums -p$(p_l64gcc)
+	dh_builddeb -p$(p_l64gcc)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+
+# ----------------------------------------------------------------------
+
+$(binary_stamp)-lib32gcc: $(install_dependencies)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_l32gcc)
+
+	dh_installdirs -p$(p_l32gcc) \
+		$(docdir)/$(p_l32gcc) \
+		$(lib32)
+	mv $(d)/$(lib32)/libgcc_s.so.$(GCC_SONAME) \
+		$(d_l32gcc)/$(lib32)/.
+
+	debian/dh_doclink -p$(p_l32gcc) $(p_base)
+	debian/dh_rmemptydirs -p$(p_l32gcc)
+	dh_strip -p$(p_l32gcc)
+
+	dh_makeshlibs -p$(p_l32gcc) \
+		-V '$(p_l32gcc) (>= $(DEB_LIBGCC_SOVERSION))'
+ifeq ($(DEB_TARGET_ARCH),amd64)
+	echo 'shlibs:Depends=libc6-i386 | ia32-libs' \
+		> debian/$(p_l32gcc).substvars
+endif
+ifeq ($(DEB_TARGET_ARCH),ppc64)
+	echo 'shlibs:Depends=libc6-powerpc' \
+		> debian/$(p_l32gcc).substvars
+endif
+
+	dh_compress -p$(p_l32gcc)
+	dh_fixperms -p$(p_l32gcc)
+	dh_gencontrol -p$(p_l32gcc) \
+		-- -v$(DEB_LIBGCC_VERSION) $(common_substvars)
+ifeq (,$(findstring emul, $(lib32)))
+	rm -f debian/lib32gcc1.preinst
+endif
+	dh_installdeb -p$(p_l32gcc)
+	dh_md5sums -p$(p_l32gcc)
+	dh_builddeb -p$(p_l32gcc)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
--- gcj-4.2-4.2-20070707.orig/debian/rules.d/binary-objc-cross.mk
+++ gcj-4.2-4.2-20070707/debian/rules.d/binary-objc-cross.mk
@@ -0,0 +1,60 @@
+arch_binaries := $(arch_binaries) objc
+
+p_objc	= gobjc$(pkg_ver)$(cross_bin_arch)
+d_objc	= debian/$(p_objc)
+
+dirs_objc = \
+	$(docdir) \
+	$(gcc_lib_dir)
+
+files_objc = \
+	$(gcc_lib_dir)/cc1obj \
+	$(gcc_lib_dir)/include/objc \
+	$(gcc_lib_dir)/{libobjc*.a,libobjc*.la}
+
+$(binary_stamp)-objc: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	mv $(d)/$(PF)/$(DEB_TARGET_GNU_TYPE)/$(libdir)/libobjc*.{a,la} $(d)/$(gcc_lib_dir)/
+
+	rm -rf $(d_objc)
+	dh_installdirs -p$(p_objc) $(dirs_objc)
+	DH_COMPAT=2 dh_movefiles -p$(p_objc) $(files_objc)
+
+ifeq ($(with_lib64objc),yes)
+	mkdir -p $(d_objc)/$(gcc_lib_dir)/$(biarchsubdir)
+	mv $(d)/$(PF)/$(DEB_TARGET_GNU_TYPE)/lib64/libobjc*.{a,la} $(d_objc)/$(gcc_lib_dir)/$(biarchsubdir)/
+	dh_link -p$(p_objc) \
+	  /$(PF)/$(DEB_TARGET_GNU_TYPE)/lib64/libobjc.so.$(OBJC_SONAME) /$(gcc_lib_dir)/$(biarchsubdir)/libobjc.so
+endif
+ifeq ($(with_lib32objc),yes)
+	mkdir -p $(d_objc)/$(gcc_lib_dir)/$(biarchsubdir)
+	mv $(d)/$(DEB_TARGET_GNU_TYPE)/$(lib32)/libobjc*.{a,la} $(d_objc)/$(gcc_lib_dir)/$(biarchsubdir)/
+	dh_link -p$(p_objc) \
+	  /$(lib32)/$(DEB_TARGET_GNU_TYPE)/libobjc.so.$(OBJC_SONAME) /$(gcc_lib_dir)/$(biarchsubdir)/libobjc.so
+endif
+
+	dh_link -p$(p_objc) \
+	  /$(PF)/$(DEB_TARGET_GNU_TYPE)/$(libdir)/libobjc.so.$(OBJC_SONAME) /$(gcc_lib_dir)/libobjc.so
+ifeq ($(with_objc_gc),yes)
+	dh_link -p$(p_objc) \
+	  /$(PF)/$(DEB_TARGET_GNU_TYPE)/$(libdir)/libobjc_gc.so.$(OBJC_SONAME) \
+	  /$(gcc_lib_dir)/libobjc_gc.so
+endif
+
+	debian/dh_doclink -p$(p_objc) $(p_base)
+	debian/dh_rmemptydirs -p$(p_objc)
+
+	dh_strip -p$(p_objc)
+	dh_compress -p$(p_objc)
+
+	dh_fixperms -p$(p_objc)
+	dh_shlibdeps -p$(p_objc)
+	dh_gencontrol -p$(p_objc) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_objc)
+	dh_md5sums -p$(p_objc)
+	dh_builddeb -p$(p_objc)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
--- gcj-4.2-4.2-20070707.orig/debian/rules.d/binary-source.mk
+++ gcj-4.2-4.2-20070707/debian/rules.d/binary-source.mk
@@ -0,0 +1,28 @@
+indep_binaries := $(indep_binaries) gcc-source
+
+p_source = gcc$(pkg_ver)-source
+d_source= debian/$(p_source)
+
+$(binary_stamp)-gcc-source:
+	dh_testdir
+	dh_testroot
+
+	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/*
+	rm -rf debian/$(p_source)/usr/src/gcc$(pkg_ver)/patches/.svn
+	dh_install -p$(p_source) \
+	    debian/rules.defs debian/rules.patch debian/rules.source \
+	    debian/rules.unpack debian/multiarch.inc \
+		usr/src/gcc$(pkg_ver)
+
+	debian/dh_doclink -p$(p_source) $(p_base)
+
+	dh_fixperms -p$(p_source)
+	dh_gencontrol -p$(p_source) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_source)
+	dh_md5sums -p$(p_source)
+	dh_builddeb -p$(p_source)
+
+	touch $@
--- gcj-4.2-4.2-20070707.orig/debian/rules.d/binary-libssp.mk
+++ gcj-4.2-4.2-20070707/debian/rules.d/binary-libssp.mk
@@ -0,0 +1,121 @@
+arch_binaries  := $(arch_binaries) libssp
+ifeq ($(with_lib64ssp),yes)
+  arch_binaries  := $(arch_binaries) lib64ssp
+endif
+ifeq ($(with_lib32ssp),yes)
+  arch_binaries	:= $(arch_binaries) lib32ssp
+endif
+
+p_ssp	= libssp$(SSP_SONAME)
+p_ssp32	= lib32ssp$(SSP_SONAME)
+p_ssp64	= lib64ssp$(SSP_SONAME)
+p_sspd	= libssp$(SSP_SONAME)-dev
+
+d_ssp	= debian/$(p_ssp)
+d_ssp32	= debian/$(p_ssp32)
+d_ssp64	= debian/$(p_ssp64)
+d_sspd	= debian/$(p_sspd)
+
+dirs_ssp = \
+	$(docdir)/$(p_base) \
+	$(PF)/$(libdir)
+files_ssp = \
+	$(PF)/$(libdir)/libssp.so.*
+
+dirs_sspd = \
+	$(docdir) \
+	$(PF)/include \
+	$(PF)/$(libdir)
+files_sspd = \
+	$(gcc_lib_dir)/include/ssp \
+	$(PF)/$(libdir)/libssp.{a,so,la} \
+	$(PF)/$(libdir)/libssp_nonshared.{a,la}
+
+ifeq ($(with_lib32ssp),yes)
+	dirs_sspd  += $(lib32)
+	files_sspd += $(lib32)/libssp.{a,la,so}
+	files_sspd += $(lib32)/libssp_nonshared.{a,la}
+endif
+ifeq ($(with_lib64ssp),yes)
+	dirs_sspd  += $(PF)/lib64
+	files_sspd += $(PF)/lib64/libssp.{a,la,so}
+	files_sspd += $(PF)/lib64/libssp_nonshared.{a,la}
+endif
+
+$(binary_stamp)-libssp: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_ssp)
+	dh_installdirs -p$(p_ssp)
+
+	DH_COMPAT=2 dh_movefiles -p$(p_ssp) $(files_ssp)
+	debian/dh_doclink -p$(p_ssp) $(p_base)
+
+	debian/dh_rmemptydirs -p$(p_ssp)
+
+	dh_strip -p$(p_ssp)
+	dh_compress -p$(p_ssp)
+	dh_fixperms -p$(p_ssp)
+	dh_makeshlibs -p$(p_ssp) -V '$(p_ssp) (>= $(DEB_SOVERSION))'
+	dh_shlibdeps -p$(p_ssp)
+	dh_gencontrol -p$(p_ssp) \
+		-- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_ssp)
+	dh_md5sums -p$(p_ssp)
+	dh_builddeb -p$(p_ssp)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+
+# ----------------------------------------------------------------------
+$(binary_stamp)-lib64ssp: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_ssp64)
+	dh_installdirs -p$(p_ssp64) \
+		$(PF)/lib64
+	DH_COMPAT=2 dh_movefiles -p$(p_ssp64) \
+		$(PF)/lib64/libssp.so.*
+
+	debian/dh_doclink -p$(p_ssp64) $(p_base)
+
+	dh_strip -p$(p_ssp64)
+	dh_compress -p$(p_ssp64)
+	dh_fixperms -p$(p_ssp64)
+	dh_makeshlibs -p$(p_ssp64) -V '$(p_ssp64) (>= $(DEB_SOVERSION))'
+#	dh_shlibdeps -p$(p_ssp64)
+	dh_gencontrol -p$(p_ssp64) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_ssp64)
+	dh_md5sums -p$(p_ssp64)
+	dh_builddeb -p$(p_ssp64)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+
+# ----------------------------------------------------------------------
+$(binary_stamp)-lib32ssp: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_ssp32)
+	dh_installdirs -p$(p_ssp32) \
+		$(lib32)
+	DH_COMPAT=2 dh_movefiles -p$(p_ssp32) \
+		$(lib32)/libssp.so.*
+
+	debian/dh_doclink -p$(p_ssp32) $(p_base)
+
+	dh_strip -p$(p_ssp32)
+	dh_compress -p$(p_ssp32)
+	dh_fixperms -p$(p_ssp32)
+	dh_makeshlibs -p$(p_ssp32) -V '$(p_ssp32) (>= $(DEB_SOVERSION))'
+#	dh_shlibdeps -p$(p_ssp32)
+	dh_gencontrol -p$(p_ssp32) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_ssp32)
+	dh_md5sums -p$(p_ssp32)
+	dh_builddeb -p$(p_ssp32)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
--- gcj-4.2-4.2-20070707.orig/debian/rules.d/binary-nof.mk
+++ gcj-4.2-4.2-20070707/debian/rules.d/binary-nof.mk
@@ -0,0 +1,56 @@
+arch_binaries  := $(arch_binaries) nof
+
+p_nof  = gcc$(pkg_ver)-nof
+d_nof  = debian/$(p_nof)
+
+dirs_nof = \
+	$(docdir) \
+	$(PF)/$(libdir)/nof
+ifeq ($(with_cdev),yes)
+  dirs_nof += \
+	$(gcc_lib_dir)/nof
+endif
+
+ifeq ($(with_cdev),yes)
+  files_nof = \
+	$(libdir)/libgcc_s_nof.so.$(GCC_SONAME) \
+	$(gcc_lib_dir)/libgcc_s_nof.so \
+	$(PF)/$(libdir)/nof \
+	$(gcc_lib_dir)/nof
+else
+  files_nof = \
+	$(libdir)/libgcc_s_nof.so.$(GCC_SONAME)
+endif
+
+# ----------------------------------------------------------------------
+$(binary_stamp)-nof: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	mv $(d)/$(PF)/$(libdir)/libgcc_s_nof.so.$(GCC_SONAME) $(d)/$(libdir)/.
+	rm -f $(d)/$(PF)/$(libdir)/libgcc_s_nof.so
+	ln -sf /$(libdir)/libgcc_s_nof.so.$(GCC_SONAME) \
+		$(d)/$(gcc_lib_dir)/libgcc_s_nof.so
+
+	rm -rf $(d_nof)
+	dh_installdirs -p$(p_nof) $(dirs_nof)
+	DH_COMPAT=2 dh_movefiles -p$(p_nof) $(files_nof)
+	debian/dh_doclink -p$(p_nof) $(p_base)
+	dh_strip -p$(p_nof)
+	dh_compress -p$(p_nof)
+	dh_fixperms -p$(p_nof)
+	dh_shlibdeps -p$(p_nof)
+
+	dh_makeshlibs -p$(p_nof)
+	: # Only keep the shlibs file for the libgcc_s_nof library
+	fgrep libgcc_s_nof debian/$(p_nof)/DEBIAN/shlibs \
+		> debian/$(p_nof)/DEBIAN/shlibs.tmp
+	mv -f debian/$(p_nof)/DEBIAN/shlibs.tmp debian/$(p_nof)/DEBIAN/shlibs
+
+	dh_gencontrol -p$(p_nof) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_nof)
+	dh_md5sums -p$(p_nof)
+	dh_builddeb -p$(p_nof)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
--- gcj-4.2-4.2-20070707.orig/debian/rules.d/binary-treelang.mk
+++ gcj-4.2-4.2-20070707/debian/rules.d/binary-treelang.mk
@@ -0,0 +1,55 @@
+arch_binaries := $(arch_binaries) treelang
+
+p_tree	= treelang$(pkg_ver)
+d_tree	= debian/$(p_tree)
+
+dirs_tree = \
+	$(docdir)/$(p_base)/treelang \
+	$(gcc_lexec_dir) \
+	$(PF)/bin \
+	$(PF)/share/info
+
+files_tree = \
+	$(PF)/bin/gtreelang$(pkg_ver) \
+	$(gcc_lexec_dir)/tree1
+
+ifneq ($(GFDL_INVARIANT_FREE),yes)
+  files_tree += \
+	$(PF)/share/info/treelang*
+endif
+
+$(binary_stamp)-treelang: $(build_html_stamp) $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_tree)
+	dh_installdirs -p$(p_tree) $(dirs_tree)
+	DH_COMPAT=2 dh_movefiles -p$(p_tree) $(files_tree)
+
+	debian/dh_doclink -p$(p_tree) $(p_base)
+ifneq ($(GFDL_INVARIANT_FREE),yes)
+	dh_installdocs -p$(p_tree)
+	rm -f $(d_tree)/$(docdir)/$(p_base)/copyright
+	cp -p html/treelang.html $(d_tree)/$(docdir)/$(p_base)/treelang/
+endif
+	cp -p $(srcdir)/gcc/treelang/README \
+		$(d_tree)/$(docdir)/$(p_base)/treelang/.
+	cp -p $(srcdir)/gcc/treelang/ChangeLog \
+		$(d_tree)/$(docdir)/$(p_base)/treelang/changelog
+	cp -p debian/README.treelang \
+		$(d_tree)/$(docdir)/$(p_base)/treelang/README.Debian
+
+	debian/dh_rmemptydirs -p$(p_tree)
+
+	dh_strip -p$(p_tree)
+	dh_compress -p$(p_tree)
+
+	dh_fixperms -p$(p_tree)
+	dh_shlibdeps -p$(p_tree)
+	dh_gencontrol -p$(p_tree) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_tree)
+	dh_md5sums -p$(p_tree)
+	dh_builddeb -p$(p_tree)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
--- gcj-4.2-4.2-20070707.orig/debian/rules.d/binary-base.mk
+++ gcj-4.2-4.2-20070707/debian/rules.d/binary-base.mk
@@ -0,0 +1,23 @@
+arch_binaries := base $(arch_binaries)
+
+# ---------------------------------------------------------------------------
+# gcc-base
+
+$(binary_stamp)-base: $(install_dependencies)
+	dh_testdir
+	dh_testroot
+	rm -rf $(d_base)
+	dh_installdirs -p$(p_base)
+	dh_installdocs -p$(p_base)
+ifeq ($(with_base_only),yes)
+	dh_installchangelogs -p$(p_base)
+else
+	dh_installchangelogs -p$(p_base) $(srcdir)/ChangeLog
+endif
+	dh_compress -p$(p_base)
+	dh_fixperms -p$(p_base)
+	dh_gencontrol -p$(p_base) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_base)
+	dh_md5sums -p$(p_base)
+	dh_builddeb -p$(p_base)
+	touch $@
--- gcj-4.2-4.2-20070707.orig/debian/rules.d/binary-softfloat.mk
+++ gcj-4.2-4.2-20070707/debian/rules.d/binary-softfloat.mk
@@ -0,0 +1,33 @@
+arch_binaries  := $(arch_binaries) softfloat
+
+p_softfloat  = gcc$(pkg_ver)-soft-float
+d_softfloat  = debian/$(p_softfloat)
+
+dirs_softfloat = \
+	$(PF)/$(libdir)/soft-float \
+	$(gcc_lib_dir)/soft-float
+
+files_softfloat = \
+	$(PF)/$(libdir)/soft-float \
+	$(gcc_lib_dir)/soft-float
+
+# ----------------------------------------------------------------------
+$(binary_stamp)-softfloat: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_softfloat)
+	dh_installdirs -p$(p_softfloat) $(dirs_softfloat)
+	DH_COMPAT=2 dh_movefiles -p$(p_softfloat) $(files_softfloat)
+	debian/dh_doclink -p$(p_softfloat) $(p_base)
+	dh_strip -p$(p_softfloat) -Xlibgcj.a
+	dh_compress -p$(p_softfloat)
+	dh_fixperms -p$(p_softfloat)
+	dh_shlibdeps -p$(p_softfloat)
+	dh_gencontrol -p$(p_softfloat) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_softfloat)
+	dh_md5sums -p$(p_softfloat)
+	dh_builddeb -p$(p_softfloat)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
--- gcj-4.2-4.2-20070707.orig/debian/rules.d/binary-libgcc-cross.mk
+++ gcj-4.2-4.2-20070707/debian/rules.d/binary-libgcc-cross.mk
@@ -0,0 +1,158 @@
+ifeq ($(with_libgcc),yes)
+  arch_binaries	:= $(arch_binaries) libgcc
+endif
+ifeq ($(with_lib64gcc),yes)
+  arch_binaries	:= $(arch_binaries) lib64gcc
+endif
+ifeq ($(biarch32),yes)
+  arch_binaries	:= $(arch_binaries) lib32gcc
+endif
+
+p_lgcc		= libgcc$(GCC_SONAME)$(cross_lib_arch)
+d_lgcc		= debian/$(p_lgcc)
+
+p_l64gcc	= lib32gcc$(GCC_SONAME)$(cross_lib_arch)
+d_l64gcc	= debian/$(p_l32gcc)
+
+p_l64gcc	= lib64gcc$(GCC_SONAME)$(cross_lib_arch)
+d_l64gcc	= debian/$(p_l64gcc)
+
+# ----------------------------------------------------------------------
+$(binary_stamp)-libgcc: $(install_dependencies)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_lgcc)
+	dh_installdirs -p$(p_lgcc) \
+		$(docdir)/$(p_lgcc) \
+		$(PF)/$(DEB_TARGET_GNU_TYPE)/lib
+
+ifeq ($(with_shared_libgcc),yes)
+	mv $(d)/$(PF)/$(DEB_TARGET_GNU_TYPE)/lib/libgcc_s.so.$(GCC_SONAME) $(d_lgcc)/$(PF)/$(DEB_TARGET_GNU_TYPE)/lib/.
+endif
+
+	dh_installdocs -p$(p_lgcc)
+	dh_installchangelogs -p$(p_lgcc)
+
+	debian/dh_rmemptydirs -p$(p_lgcc)
+	PATH=/usr/share/dpkg-cross:$$PATH dh_strip -p$(p_lgcc)
+	dh_compress -p$(p_lgcc)
+	dh_fixperms -p$(p_lgcc)
+ifeq ($(with_shared_libgcc),yes)
+	dh_makeshlibs -p$(p_lgcc) -V '$(p_lgcc) (>= $(DEB_LIBGCC_SOVERSION))' -n
+	sed s/$(cross_lib_arch)//g < debian/$(p_lgcc)/DEBIAN/shlibs > debian/$(p_lgcc)/DEBIAN/shlibs.fixed
+	mv debian/$(p_lgcc)/DEBIAN/shlibs.fixed debian/$(p_lgcc)/DEBIAN/shlibs
+	cat debian/$(p_lgcc)/DEBIAN/shlibs >> debian/shlibs.local
+endif
+	ARCH=$(DEB_TARGET_ARCH) MAKEFLAGS="CC=something" dh_shlibdeps -p$(p_lgcc)
+	sed 's/\(lib[^ ]*\) /\1$(cross_lib_arch) /g' < debian/$(p_lgcc).substvars > debian/$(p_lgcc).substvars.new
+	mv debian/$(p_lgcc).substvars.new debian/$(p_lgcc).substvars
+	dh_gencontrol -p$(p_lgcc) \
+		-- -v$(DEB_LIBGCC_VERSION) $(common_substvars)
+	b=libgcc; v=$(GCC_SONAME); \
+	for ext in preinst postinst prerm postrm; do \
+	  if [ -f debian/$$b$$t.$$ext ]; then \
+	    cp -pf debian/$$b$$t.$$ext debian/$$b$$v$$t.$$ext; \
+	  fi; \
+	done
+	dh_installdeb -p$(p_lgcc)
+	dh_md5sums -p$(p_lgcc)
+	dh_builddeb -p$(p_lgcc)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+
+# ----------------------------------------------------------------------
+$(binary_stamp)-lib64gcc: $(install_dependencies)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_l64gcc)
+	dh_installdirs -p$(p_l64gcc) \
+		$(docdir)/$(p_l64gcc) \
+		$(PF)/$(DEB_TARGET_GNU_TYPE)/lib64
+
+ifeq ($(with_shared_libgcc),yes)
+	mv $(d)/$(PF)/$(DEB_TARGET_GNU_TYPE)/lib64/libgcc_s.so.$(GCC_SONAME) $(d_l64gcc)/$(PF)/$(DEB_TARGET_GNU_TYPE)/lib64/.
+endif
+
+	dh_installdocs -p$(p_l64gcc)
+	dh_installchangelogs -p$(p_l64gcc)
+
+	debian/dh_rmemptydirs -p$(p_l64gcc)
+	PATH=/usr/share/dpkg-cross:$$PATH dh_strip -p$(p_l64gcc)
+	dh_compress -p$(p_l64gcc)
+	dh_fixperms -p$(p_l64gcc)
+ifeq ($(with_shared_libgcc),yes)
+	dh_makeshlibs -p$(p_l64gcc) \
+		-V '$(p_l64gcc) (>= $(DEB_LIBGCC_SOVERSION))' -n
+	sed s/$(cross_lib_arch)//g < debian/$(p_l64gcc)/DEBIAN/shlibs > debian/$(p_l64gcc)/DEBIAN/shlibs.fixed
+	mv debian/$(p_l64gcc)/DEBIAN/shlibs.fixed debian/$(p_l64gcc)/DEBIAN/shlibs
+	cat debian/$(p_l64gcc)/DEBIAN/shlibs >> debian/shlibs.local
+endif
+	ARCH=$(DEB_TARGET_ARCH) MAKEFLAGS="CC=something" dh_shlibdeps -p$(p_l64gcc)
+	sed 's/\(lib[^ ]*\) /\1$(cross_lib_arch) /g' < debian/$(p_l64gcc).substvars > debian/$(p_l64gcc).substvars.new
+	mv debian/$(p_l64gcc).substvars.new debian/$(p_l64gcc).substvars
+	dh_gencontrol -p$(p_l64gcc) \
+		-- -v$(DEB_VERSION) $(common_substvars)
+	b=libgcc; v=$(GCC_SONAME); \
+	for ext in preinst postinst prerm postrm; do \
+	  if [ -f debian/$$b$$t.$$ext ]; then \
+	    cp -pf debian/$$b$$t.$$ext debian/$$b$$v$$t.$$ext; \
+	  fi; \
+	done
+	dh_installdeb -p$(p_l64gcc)
+	dh_md5sums -p$(p_l64gcc)
+	dh_builddeb -p$(p_l64gcc)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+
+# ----------------------------------------------------------------------
+
+$(binary_stamp)-lib32gcc: $(install_dependencies)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_l32gcc)
+	dh_installdirs -p$(p_l32gcc) \
+		$(docdir)/$(p_l32gcc) \
+		$(PF)/$(DEB_TARGET_GNU_TYPE)/lib32
+
+ifeq ($(with_shared_libgcc),yes)
+	mv $(d)/$(PF)/$(DEB_TARGET_GNU_TYPE)/lib32/libgcc_s.so.$(GCC_SONAME) $(d_l32gcc)/$(PF)/$(DEB_TARGET_GNU_TYPE)/lib32/.
+endif
+
+	dh_installdocs -p$(p_l32gcc)
+	dh_installchangelogs -p$(p_l32gcc)
+
+	debian/dh_rmemptydirs -p$(p_l32gcc)
+	PATH=/usr/share/dpkg-cross:$$PATH dh_strip -p$(p_l32gcc)
+	dh_compress -p$(p_l32gcc)
+	dh_fixperms -p$(p_l32gcc)
+ifeq ($(with_shared_libgcc),yes)
+	dh_makeshlibs -p$(p_l32gcc) \
+		-V '$(p_l32gcc) (>= $(DEB_LIBGCC_SOVERSION))' -n
+	sed s/$(cross_lib_arch)//g < debian/$(p_l32gcc)/DEBIAN/shlibs > debian/$(p_l32gcc)/DEBIAN/shlibs.fixed
+	mv debian/$(p_l32gcc)/DEBIAN/shlibs.fixed debian/$(p_l32gcc)/DEBIAN/shlibs
+	cat debian/$(p_l32gcc)/DEBIAN/shlibs >> debian/shlibs.local
+endif
+	ARCH=$(DEB_TARGET_ARCH) MAKEFLAGS="CC=something" dh_shlibdeps -p$(p_l32gcc)
+	sed 's/\(lib[^ ]*\) /\1$(cross_lib_arch) /g' < debian/$(p_l32gcc).substvars > debian/$(p_l32gcc).substvars.new
+	mv debian/$(p_l32gcc).substvars.new debian/$(p_l32gcc).substvars
+	dh_gencontrol -p$(p_l32gcc) \
+		-- -v$(DEB_VERSION) $(common_substvars)
+	b=libgcc; v=$(GCC_SONAME); \
+	for ext in preinst postinst prerm postrm; do \
+	  if [ -f debian/$$b$$t.$$ext ]; then \
+	    cp -pf debian/$$b$$t.$$ext debian/$$b$$v$$t.$$ext; \
+	  fi; \
+	done
+	dh_installdeb -p$(p_l32gcc)
+	dh_md5sums -p$(p_l32gcc)
+	dh_builddeb -p$(p_l32gcc)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+
+# ----------------------------------------------------------------------
--- gcj-4.2-4.2-20070707.orig/debian/rules.d/binary-gcc-cross.mk
+++ gcj-4.2-4.2-20070707/debian/rules.d/binary-gcc-cross.mk
@@ -0,0 +1,109 @@
+arch_binaries  := $(arch_binaries) gcc
+
+# gcc must be moved after g77 and g++
+# not all files $(PF)/include/*.h are part of gcc,
+# but it becomes difficult to name all these files ...
+
+dirs_gcc = \
+	$(PF)/bin \
+	$(gcc_lexec_dir) \
+	$(gcc_lib_dir)/include \
+	$(PF)/share/man/man1 $(libdir)
+
+files_gcc = \
+	$(PF)/bin/$(DEB_TARGET_GNU_TYPE)-gcc$(pkg_ver) \
+	$(PF)/share/man/man1/$(DEB_TARGET_GNU_TYPE)-gcc$(pkg_ver).1 \
+	$(gcc_lexec_dir)/collect2 \
+	$(gcc_lib_dir)/{libgcc*,*.o} \
+	$(gcc_lib_dir)/include/README \
+	$(gcc_lib_dir)/include/{float,iso646,limits,std*,syslimits,unwind,varargs}.h \
+	$(shell for d in asm bits gnu linux; do \
+		  test -e $(d)/$(gcc_lib_dir)/include/$$d \
+		    && echo $(gcc_lib_dir)/include/$$d; \
+		done) \
+	$(shell test -e $(d)/$(gcc_lib_dir)/SYSCALLS.c.X \
+	       && echo $(gcc_lib_dir)/SYSCALLS.c.X) \
+	$(shell for h in {,e,p,x}mmintrin.h mm3dnow.h mm_malloc.h; do \
+	         test -e $(d)/$(gcc_lib_dir)/include/$$h \
+	           && echo $(gcc_lib_dir)/include/$$h; \
+	       done) \
+
+
+ifeq ($(biarch),yes)
+    files_gcc += $(gcc_lib_dir)/$(biarchsubdir)/{libgcc*,*.o}
+endif
+ifeq ($(biarch32),yes)
+    files_gcc += $(gcc_lib_dir)/$(biarchsubdir)/{libgcc*,*.o}
+endif
+
+ifeq ($(DEB_TARGET_ARCH),ia64)
+    files_gcc += $(gcc_lib_dir)/include/ia64intrin.h
+endif
+
+ifeq ($(DEB_TARGET_ARCH),m68k)
+    files_gcc += $(gcc_lib_dir)/include/math-68881.h
+endif
+
+ifeq ($(DEB_TARGET_ARCH),$(findstring $(DEB_TARGET_ARCH),powerpc ppc64))
+    files_gcc += $(gcc_lib_dir)/include/{altivec.h,ppc-asm.h}
+endif
+
+usr_doc_files = debian/README.Bugs \
+	$(shell test -f $(srcdir)/FAQ && echo $(srcdir)/FAQ)
+ifeq ($(with_check),yes)
+  usr_doc_files += test-summary
+endif
+
+# ----------------------------------------------------------------------
+$(binary_stamp)-gcc: $(install_dependencies)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_gcc)
+	dh_installdirs -p$(p_gcc) $(dirs_gcc)
+
+	rm -f $(d)/$(PF)/$(libdir)/libgcc_s.so
+	ln -sf /$(PF)/$(DEB_TARGET_GNU_TYPE)/$(libdir)/libgcc_s.so.$(GCC_SONAME) $(d)/$(gcc_lib_dir)/libgcc_s.so
+ifeq ($(biarch),yes)
+	rm -f $(d)/$(PF)/$(lib64)/libgcc_s.so
+	dh_link -p$(p_gcc) \
+	  /$(PF)/$(DEB_TARGET_GNU_TYPE)/$(lib64)/libgcc_s.so.$(GCC_SONAME) /$(gcc_lib_dir)/libgcc_s_64.so \
+	  /$(PF)/$(DEB_TARGET_GNU_TYPE)/$(lib64)/libgcc_s.so.$(GCC_SONAME) /$(gcc_lib_dir)/$(biarchsubdir)/libgcc_s.so
+endif
+ifeq ($(biarch32),yes)
+	mkdir -p $(d_gcc)/$(gcc_lib_dir)
+	mv $(d)/$(gcc_lib_dir)/$(biarchsubdir) $(d_gcc)/$(gcc_lib_dir)/
+	dh_link -p$(p_gcc) \
+	  /$(PF)/$(DEB_TARGET_GNU_TYPE)/lib32/libgcc_s.so.$(GCC_SONAME)  /$(gcc_lib_dir)/libgcc_s_32.so \
+	  /$(PF)/$(DEB_TARGET_GNU_TYPE)/lib32/libgcc_s.so.$(GCC_SONAME)  /$(gcc_lib_dir)/$(biarchsubdir)/libgcc_s_32.so \
+	  /$(PF)/$(DEB_TARGET_GNU_TYPE)/lib32/libgcc_s.so.$(GCC_SONAME)  /$(gcc_lib_dir)/$(biarchsubdir)/libgcc_s.so
+endif
+
+	DH_COMPAT=2 dh_movefiles -p$(p_gcc) $(files_gcc)
+
+#	dh_installdebconf
+	debian/dh_doclink -p$(p_gcc) $(p_base)
+	debian/dh_rmemptydirs -p$(p_gcc)
+	PATH=/usr/share/dpkg-cross:$$PATH dh_strip -p$(p_gcc)
+	dh_compress -p$(p_gcc)
+	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
+	chmod 755 debian/$(p_gcc)/DEBIAN/{postinst,prerm}
+	dh_installdeb -p$(p_gcc)
+	dh_md5sums -p$(p_gcc)
+	dh_builddeb -p$(p_gcc)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+
+	: # remove empty directories, when all components are in place
+	for d in `find $(d) -depth -type d -empty 2> /dev/null`; do \
+	    while rmdir $$d 2> /dev/null; do d=`dirname $$d`; done; \
+	done
+
+	@echo "Listing installed files not included in any package:"
+	-find $(d) ! -type d
+
--- gcj-4.2-4.2-20070707.orig/debian/rules.d/binary-libobjc.mk
+++ gcj-4.2-4.2-20070707/debian/rules.d/binary-libobjc.mk
@@ -0,0 +1,119 @@
+ifeq ($(with_objcdev),yes)
+  arch_binaries := $(arch_binaries) libobjc
+endif
+ifeq ($(with_lib64objc),yes)
+  arch_binaries  := $(arch_binaries) lib64objc
+endif
+ifeq ($(with_lib32objc),yes)
+  arch_binaries	:= $(arch_binaries) lib32objc
+endif
+
+p_lobjc		= libobjc$(OBJC_SONAME)
+p_l32objc	= lib32objc$(OBJC_SONAME)
+p_l64objc	= lib64objc$(OBJC_SONAME)
+
+d_lobjc		= debian/$(p_lobjc)
+d_l32objc	= debian/$(p_l32objc)
+d_l64objc	= debian/$(p_l64objc)
+
+dirs_lobjc = \
+	$(docdir)/objc \
+	$(PF)/$(libdir)
+files_lobjc = \
+	$(PF)/$(libdir)/libobjc.so.*
+ifeq ($(with_objc_gc),yes)
+  files_lobjc += \
+	$(PF)/$(libdir)/libobjc_gc.so.*
+endif
+
+
+$(binary_stamp)-libobjc: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_lobjc)
+	dh_installdirs -p$(p_lobjc) $(dirs_lobjc)
+#	mv $(d)/$(gcc_lib_dir)/libobjc.so.* $(d)/$(PF)/$(libdir)/.
+#ifeq ($(with_objc_gc),yes)
+#	mv $(d)/$(gcc_lib_dir)/libobjc_gc.so.* $(d)/$(PF)/$(libdir)/.
+#endif
+	DH_COMPAT=2 dh_movefiles -p$(p_lobjc) $(files_lobjc)
+
+	debian/dh_doclink -p$(p_lobjc) $(p_base)
+
+	debian/dh_rmemptydirs -p$(p_lobjc)
+
+	dh_strip -p$(p_lobjc)
+	dh_compress -p$(p_lobjc)
+
+	dh_fixperms -p$(p_lobjc)
+	b=libobjc; \
+	for ext in preinst postinst prerm postrm; do \
+	  for t in '' -dev -dbg; do \
+	    v=$(OBJC_SONAME); \
+	    if [ -f debian/$$b$$t.$$ext ]; then \
+	      cp -pf debian/$$b$$t.$$ext debian/$$b$$v$$t.$$ext; \
+	    fi; \
+	  done; \
+	done
+	dh_makeshlibs -p$(p_lobjc) -V '$(p_lobjc) (>= $(DEB_SOVERSION))'
+	dh_shlibdeps -p$(p_lobjc)
+	dh_gencontrol -p$(p_lobjc) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_lobjc)
+	dh_md5sums -p$(p_lobjc)
+	dh_builddeb -p$(p_lobjc)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+
+# ----------------------------------------------------------------------
+$(binary_stamp)-lib64objc: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_l64objc)
+	dh_installdirs -p$(p_l64objc) \
+		$(PF)/lib64
+	DH_COMPAT=2 dh_movefiles -p$(p_l64objc) \
+		$(PF)/lib64/libobjc.so.*
+
+	debian/dh_doclink -p$(p_l64objc) $(p_base)
+
+	dh_strip -p$(p_l64objc)
+	dh_compress -p$(p_l64objc)
+	dh_fixperms -p$(p_l64objc)
+	dh_makeshlibs -p$(p_l64objc) -V '$(p_l64objc) (>= $(DEB_SOVERSION))'
+#	dh_shlibdeps -p$(p_l64objc)
+	dh_gencontrol -p$(p_l64objc) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_l64objc)
+	dh_md5sums -p$(p_l64objc)
+	dh_builddeb -p$(p_l64objc)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+
+# ----------------------------------------------------------------------
+$(binary_stamp)-lib32objc: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_l32objc)
+	dh_installdirs -p$(p_l32objc) \
+		$(lib32)
+	DH_COMPAT=2 dh_movefiles -p$(p_l32objc) \
+		$(lib32)/libobjc.so.*
+
+	debian/dh_doclink -p$(p_l32objc) $(p_base)
+
+	dh_strip -p$(p_l32objc)
+	dh_compress -p$(p_l32objc)
+	dh_fixperms -p$(p_l32objc)
+	dh_makeshlibs -p$(p_l32objc) -V '$(p_l32objc) (>= $(DEB_SOVERSION))'
+#	dh_shlibdeps -p$(p_l32objc)
+	dh_gencontrol -p$(p_l32objc) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_l32objc)
+	dh_md5sums -p$(p_l32objc)
+	dh_builddeb -p$(p_l32objc)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
--- gcj-4.2-4.2-20070707.orig/debian/rules.d/binary-libobjc-cross.mk
+++ gcj-4.2-4.2-20070707/debian/rules.d/binary-libobjc-cross.mk
@@ -0,0 +1,117 @@
+ifeq ($(with_objcdev),yes)
+  arch_binaries := $(arch_binaries) libobjc
+endif
+ifeq ($(with_lib64objc),yes)
+  arch_binaries  := $(arch_binaries) lib64objc
+endif
+ifeq ($(with_lib32objc),yes)
+  arch_binaries	:= $(arch_binaries) lib32objc
+endif
+
+p_lobjc		= libobjc$(OBJC_SONAME)$(cross_lib_arch)
+p_l32objc	= lib32objc$(OBJC_SONAME)$(cross_lib_arch)
+p_l64objc	= lib64objc$(OBJC_SONAME)$(cross_lib_arch)
+
+d_lobjc		= debian/$(p_lobjc)
+d_l32objc	= debian/$(p_l32objc)
+d_l64objc	= debian/$(p_l64objc)
+
+dirs_lobjc = \
+	$(docdir) \
+	$(PF)/$(DEB_TARGET_GNU_TYPE)/$(libdir)
+files_lobjc = \
+	$(PF)/$(DEB_TARGET_GNU_TYPE)/$(libdir)/libobjc.so.*
+ifeq ($(with_objc_gc),yes)
+  files_lobjc += \
+	$(PF)/$(DEB_TARGET_GNU_TYPE)/$(libdir)/libobjc_gc.so.*
+endif
+
+
+$(binary_stamp)-libobjc: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_lobjc)
+	dh_installdirs -p$(p_lobjc) $(dirs_lobjc)
+#	mv $(d)/$(gcc_lib_dir)/libobjc.so.* $(d)/$(PF)/$(libdir)/.
+#ifeq ($(with_objc_gc),yes)
+#	mv $(d)/$(gcc_lib_dir)/libobjc_gc.so.* $(d)/$(PF)/$(libdir)/.
+#endif
+	DH_COMPAT=2 dh_movefiles -p$(p_lobjc) $(files_lobjc)
+
+	dh_installdocs -p$(p_lobjc)
+	echo "See /$(docdir)/$(p_base) for more information" \
+		> $(d_lobjc)/$(docdir)/$(p_lobjc)/README.Debian
+	dh_installchangelogs -p$(p_lobjc)
+
+	debian/dh_rmemptydirs -p$(p_lobjc)
+
+	PATH=/usr/share/dpkg-cross:$$PATH dh_strip -p$(p_lobjc)
+	dh_compress -p$(p_lobjc)
+
+	dh_fixperms -p$(p_lobjc)
+	dh_makeshlibs -p$(p_lobjc) -V '$(p_lobjc) (>= $(DEB_SOEVERSION))' -n
+	sed s/$(cross_lib_arch)//g < debian/$(p_lobjc)/DEBIAN/shlibs > debian/$(p_lobjc)/DEBIAN/shlibs.fixed
+	mv debian/$(p_lobjc)/DEBIAN/shlibs.fixed debian/$(p_lobjc)/DEBIAN/shlibs
+	ARCH=$(DEB_TARGET_ARCH) MAKEFLAGS="CC=something" dh_shlibdeps -p$(p_lobjc)
+	sed 's/\(lib[^ ]*\) /\1$(cross_lib_arch) /g' < debian/$(p_lobjc).substvars > debian/$(p_lobjc).substvars.new
+	mv debian/$(p_lobjc).substvars.new debian/$(p_lobjc).substvars
+	dh_gencontrol -p$(p_lobjc) -- -v$(DEB_EVERSION) $(common_substvars)
+	dh_installdeb -p$(p_lobjc)
+	dh_md5sums -p$(p_lobjc)
+	dh_builddeb -p$(p_lobjc)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+
+# ----------------------------------------------------------------------
+$(binary_stamp)-lib64objc: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_l64objc)
+	dh_installdirs -p$(p_l64objc) \
+		$(PF)/lib64
+	DH_COMPAT=2 dh_movefiles -p$(p_l64objc) \
+		$(PF)/lib64/libobjc.so.*
+
+	debian/dh_doclink -p$(p_l64objc) $(p_base)
+
+	dh_strip -p$(p_l64objc)
+	dh_compress -p$(p_l64objc)
+	dh_fixperms -p$(p_l64objc)
+	dh_makeshlibs -p$(p_l64objc) -V '$(p_l64objc) (>= $(DEB_SOVERSION))'
+#	dh_shlibdeps -p$(p_l64objc)
+	dh_gencontrol -p$(p_l64objc) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_l64objc)
+	dh_md5sums -p$(p_l64objc)
+	dh_builddeb -p$(p_l64objc)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+
+# ----------------------------------------------------------------------
+$(binary_stamp)-lib32objc: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_l32objc)
+	dh_installdirs -p$(p_l32objc) \
+		$(lib32)
+	DH_COMPAT=2 dh_movefiles -p$(p_l32objc) \
+		$(lib32)/libobjc.so.*
+
+	debian/dh_doclink -p$(p_l32objc) $(p_base)
+
+	dh_strip -p$(p_l32objc)
+	dh_compress -p$(p_l32objc)
+	dh_fixperms -p$(p_l32objc)
+	dh_makeshlibs -p$(p_l32objc) -V '$(p_l32objc) (>= $(DEB_SOVERSION))'
+#	dh_shlibdeps -p$(p_l32objc)
+	dh_gencontrol -p$(p_l32objc) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_l32objc)
+	dh_md5sums -p$(p_l32objc)
+	dh_builddeb -p$(p_l32objc)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
--- gcj-4.2-4.2-20070707.orig/debian/rules.d/binary-libstdcxx.mk
+++ gcj-4.2-4.2-20070707/debian/rules.d/binary-libstdcxx.mk
@@ -0,0 +1,423 @@
+
+ifeq ($(with_libcxx),yes)
+  arch_binaries  := $(arch_binaries) libstdcxx
+endif
+ifeq ($(with_lib64cxx),yes)
+  arch_binaries  := $(arch_binaries) lib64stdcxx
+endif
+ifeq ($(with_lib64cxxdbg),yes)
+  arch_binaries	:= $(arch_binaries) lib64stdcxxdbg
+endif
+ifeq ($(with_lib32cxx),yes)
+  arch_binaries	:= $(arch_binaries) lib32stdcxx
+endif
+ifeq ($(with_lib32cxxdbg),yes)
+  arch_binaries	:= $(arch_binaries) lib32stdcxxdbg
+endif
+
+ifeq ($(with_cxxdev),yes)
+  arch_binaries  := $(arch_binaries) libstdcxx-dev
+  indep_binaries := $(indep_binaries) libstdcxx-doc
+endif
+
+libstdc_ext = -$(BASE_VERSION)
+
+p_lib	= libstdc++$(CXX_SONAME)
+p_lib64	= lib64stdc++$(CXX_SONAME)
+p_lib32	= lib32stdc++$(CXX_SONAME)
+p_dev	= libstdc++$(CXX_SONAME)$(libstdc_ext)-dev
+p_pic	= libstdc++$(CXX_SONAME)$(libstdc_ext)-pic
+p_dbg	= libstdc++$(CXX_SONAME)$(libstdc_ext)-dbg
+p_dbg64	= $(p_lib64)$(libstdc_ext)-dbg
+p_dbg32	= $(p_lib32)$(libstdc_ext)-dbg
+p_libd	= libstdc++$(CXX_SONAME)$(libstdc_ext)-doc
+
+d_lib	= debian/$(p_lib)
+d_lib64	= debian/$(p_lib64)
+d_lib32	= debian/$(p_lib32)
+d_dev	= debian/$(p_dev)
+d_pic	= debian/$(p_pic)
+d_dbg	= debian/$(p_dbg)
+d_dbg64	= debian/$(p_dbg64)
+d_dbg32	= debian/$(p_dbg32)
+d_libd	= debian/$(p_libd)
+
+dirs_dev = \
+	$(docdir)/$(p_base)/C++ \
+	$(PF)/$(libdir) \
+	$(gcc_lib_dir)/include \
+	$(cxx_inc_dir)
+
+files_dev = \
+	$(cxx_inc_dir)/ \
+	$(gcc_lib_dir)/libstdc++.{a,so} \
+	$(gcc_lib_dir)/libsupc++.a
+# Not yet...
+#	$(PF)/$(libdir)/lib{supc,stdc}++.la
+
+dirs_dbg = \
+	$(docdir) \
+	$(PF)/$(libdir)/debug \
+	$(gcc_lib_dir)
+files_dbg = \
+	$(PF)/$(libdir)/debug/libstdc++.*
+
+dirs_pic = \
+	$(docdir) \
+	$(gcc_lib_dir)
+files_pic = \
+	$(gcc_lib_dir)/libstdc++_pic.a
+
+# ----------------------------------------------------------------------
+
+gxx_baseline_dir = $(shell \
+			sed -n '/^baseline_dir *=/s,.*= *\(.*\)\$$.*$$,\1,p' \
+			    $(buildlibdir)/libstdc++-v3/testsuite/Makefile)
+gxx_baseline_file = $(gxx_baseline_dir)/baseline_symbols.txt
+
+debian/README.libstdc++-baseline:
+	cat debian/README.libstdc++-baseline.in \
+		> debian/README.libstdc++-baseline
+
+	baseline_name=`basename $(gxx_baseline_dir)`; \
+	baseline_parentdir=`dirname $(gxx_baseline_dir)`; \
+	compat_baseline_name=""; \
+	if [ -f "$(gxx_baseline_file)" ]; then \
+	  ( \
+	    echo "A baseline file for $$baseline_name was found."; \
+	    echo "Running the check-abi script ..."; \
+	    echo ""; \
+	    $(MAKE) -C $(buildlibdir)/libstdc++-v3/testsuite \
+		check-abi; \
+	  ) >> debian/README.libstdc++-baseline; \
+	else \
+	  ( \
+	    echo "No baseline file found for $$baseline_name."; \
+	    echo "Generating a new baseline file ..."; \
+	    echo ""; \
+	  ) >> debian/README.libstdc++-baseline; \
+	  mkdir -p $(gxx_baseline_dir); \
+	  $(MAKE) -C $(buildlibdir)/libstdc++-v3/testsuite new-abi-baseline; \
+	  cat $(gxx_baseline_file) >> debian/README.libstdc++-baseline; \
+	fi
+
+# ----------------------------------------------------------------------
+$(binary_stamp)-libstdcxx: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_lib)
+	dh_installdirs -p$(p_lib) \
+		$(docdir) \
+		$(PF)/$(libdir)
+
+	cp -a $(d)/$(PF)/$(libdir)/libstdc++.so.* \
+		$(d_lib)/$(PF)/$(libdir)/
+
+	debian/dh_doclink -p$(p_lib) $(p_base)
+	debian/dh_rmemptydirs -p$(p_lib)
+
+	dh_strip -p$(p_lib)
+	dh_compress -p$(p_lib)
+	dh_fixperms -p$(p_lib)
+	dh_makeshlibs -p$(p_lib) -V '$(p_lib) (>= $(DEB_STDCXX_SOVERSION))'
+	cat debian/$(p_lib)/DEBIAN/shlibs >> debian/shlibs.local
+	dh_shlibdeps \
+		-L$(p_lgcc) -l:$(d)/$(PF)/lib:$(d_lgcc)/lib:\
+		-p$(p_lib)
+	dh_gencontrol -p$(p_lib) -- -v$(DEB_VERSION) $(common_substvars)
+
+	dh_installdeb -p$(p_lib)
+	dh_md5sums -p$(p_lib)
+	dh_builddeb -p$(p_lib)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+
+# ----------------------------------------------------------------------
+$(binary_stamp)-lib64stdcxx: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_lib64)
+	dh_installdirs -p$(p_lib64) \
+		$(docdir) \
+		$(PF)/lib64
+
+	cp -a $(d)/$(PF)/lib64/libstdc++.so.* \
+		$(d_lib64)/$(PF)/lib64/.
+
+	dh_strip -p$(p_lib64)
+
+	debian/dh_doclink -p$(p_lib64) $(p_base)
+	debian/dh_rmemptydirs -p$(p_lib64)
+
+	dh_compress -p$(p_lib64)
+	dh_fixperms -p$(p_lib64)
+	dh_makeshlibs -p$(p_lib64) -V '$(p_lib64) (>= $(DEB_STDCXX_SOVERSION))'
+# pass explicit dependencies to dh_shlibdeps
+#	dh_shlibdeps -p$(p_lib64) -L $(p_l64gcc) -l $(d_l64gcc)/lib
+#/usr/bin/ldd: line 1: /lib/ld64.so.1: cannot execute binary file
+#dpkg-shlibdeps: failure: ldd on `debian/lib64gcc1/lib64/libgcc_s.so.1' gave error exit status 1
+	echo 'shlibs:Depends=$(p_l64gcc) (>= $(DEB_LIBGCC_SOVERSION))' \
+		> debian/$(p_lib64).substvars
+	dh_gencontrol -p$(p_lib64) -- -v$(DEB_VERSION) $(common_substvars)
+
+	dh_installdeb -p$(p_lib64)
+	dh_md5sums -p$(p_lib64)
+	dh_builddeb -p$(p_lib64)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+
+# ----------------------------------------------------------------------
+$(binary_stamp)-lib64stdcxxdbg: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_dbg64)
+	dh_installdirs -p$(p_dbg64) \
+		$(PF)/lib64
+
+	cp -a $(d)/$(PF)/lib64/libstdc++.so.* \
+		$(d_dbg64)/$(PF)/lib64/.
+	dh_strip -p$(p_dbg64) --keep-debug
+	rm -f $(d_dbg64)/$(PF)/lib64/libstdc++.so.*
+
+ifeq ($(with_debug),yes)
+	mv $(d)/$(PF)/lib64/debug $(d_dbg64)/$(PF)/lib64/.
+	rm -f $(d_dbg64)/$(PF)/lib64/debug/libstdc++_pic.a
+endif
+
+	debian/dh_doclink -p$(p_dbg64) $(p_base)
+	debian/dh_rmemptydirs -p$(p_dbg64)
+
+	dh_compress -p$(p_dbg64)
+	dh_fixperms -p$(p_dbg64)
+	dh_gencontrol -p$(p_dbg64) -- -v$(DEB_VERSION) $(common_substvars)
+
+	dh_installdeb -p$(p_dbg64)
+	dh_md5sums -p$(p_dbg64)
+	dh_builddeb -p$(p_dbg64)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+
+# ----------------------------------------------------------------------
+$(binary_stamp)-lib32stdcxx: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_lib32)
+
+	dh_installdirs -p$(p_lib32) \
+		$(docdir) \
+		$(lib32)
+
+	cp -a $(d)/$(lib32)/libstdc++.so.* \
+		$(d_lib32)/$(lib32)/.
+
+	debian/dh_doclink -p$(p_lib32) $(p_base)
+	debian/dh_rmemptydirs -p$(p_lib32)
+
+	dh_strip -p$(p_lib32)
+	dh_compress -p$(p_lib32)
+	dh_fixperms -p$(p_lib32)
+	dh_makeshlibs -p$(p_lib32) -V '$(p_lib32) (>= $(DEB_STDCXX_SOVERSION))'
+	dh_gencontrol -p$(p_lib32) -- -v$(DEB_VERSION) $(common_substvars)
+
+	dh_installdeb -p$(p_lib32)
+	dh_md5sums -p$(p_lib32)
+	dh_builddeb -p$(p_lib32)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+
+# ----------------------------------------------------------------------
+$(binary_stamp)-lib32stdcxxdbg: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_dbg32)
+	dh_installdirs -p$(p_dbg32) \
+		$(lib32)
+
+	cp -a $(d)/$(lib32)/libstdc++.so.* \
+		$(d_dbg32)/$(lib32)/.
+	dh_strip -p$(p_dbg32) --keep-debug
+	rm -f $(d_dbg32)/$(lib32)/libstdc++.so.*
+
+ifeq ($(with_debug),yes)
+	mv $(d)/$(lib32)/debug $(d_dbg32)/$(lib32)/.
+	rm -f $(d_dbg32)/$(lib32)/debug/libstdc++_pic.a
+endif
+
+	debian/dh_doclink -p$(p_dbg32) $(p_base)
+	debian/dh_rmemptydirs -p$(p_dbg32)
+
+	dh_compress -p$(p_dbg32)
+	dh_fixperms -p$(p_dbg32)
+	dh_gencontrol -p$(p_dbg32) -- -v$(DEB_VERSION) $(common_substvars)
+
+	dh_installdeb -p$(p_dbg32)
+	dh_md5sums -p$(p_dbg32)
+	dh_builddeb -p$(p_dbg32)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+
+# ----------------------------------------------------------------------
+libcxxdev_deps = $(install_stamp)
+ifeq ($(with_libcxx),yes)
+  libcxxdev_deps += $(binary_stamp)-libstdcxx
+endif
+ifeq ($(with_check),yes)
+  libcxxdev_deps += debian/README.libstdc++-baseline
+endif
+$(binary_stamp)-libstdcxx-dev: $(libcxxdev_deps)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_dev) $(d_pic)
+	dh_installdirs -p$(p_dev) $(dirs_dev)
+	dh_installdirs -p$(p_pic) $(dirs_pic)
+	dh_installdirs -p$(p_dbg) $(dirs_dbg)
+
+	: # - correct libstdc++-v3 file locations
+	mv $(d)/$(PF)/$(libdir)/libsupc++.a $(d)/$(gcc_lib_dir)/
+	mv $(d)/$(PF)/$(libdir)/libstdc++.{a,so} $(d)/$(gcc_lib_dir)/
+	ln -sf ../../../$(DEB_TARGET_GNU_TYPE)/libstdc++.so.$(CXX_SONAME) \
+		$(d)/$(gcc_lib_dir)/libstdc++.so
+	mv $(d)/$(PF)/$(libdir)/libstdc++_pic.a $(d)/$(gcc_lib_dir)/
+
+	rm -f $(d)/$(PF)/$(libdir)/debug/libstdc++_pic.a
+	rm -f $(d)/$(PF)/lib64/debug/libstdc++_pic.a
+
+	: # remove precompiled headers
+	-find $(d) -type d -name '*.gch' | xargs rm -rf
+
+	for i in $(d)/$(PF)/include/c++/$(GCC_VERSION)/*-linux; do \
+	  if [ -d $$i ]; then mv $$i $$i-gnu; fi; \
+	done
+
+	DH_COMPAT=2 dh_movefiles -p$(p_dev) $(files_dev)
+	DH_COMPAT=2 dh_movefiles -p$(p_pic) $(files_pic)
+ifeq ($(with_debug),yes)
+	DH_COMPAT=2 dh_movefiles -p$(p_dbg) $(files_dbg)
+endif
+
+	dh_link -p$(p_dev) \
+		/$(PF)/$(libdir)/libstdc++.so.$(CXX_SONAME) \
+		/$(gcc_lib_dir)/libstdc++.so \
+		/$(cxx_inc_dir) /$(PF)/include/c++/$(GCC_VERSION)
+
+	debian/dh_doclink -p$(p_dev) $(p_base)
+	debian/dh_doclink -p$(p_pic) $(p_base)
+	debian/dh_doclink -p$(p_dbg) $(p_base)
+	cp -p $(srcdir)/libstdc++-v3/ChangeLog \
+		$(d_dev)/$(docdir)/$(p_base)/C++/changelog.libstdc++
+ifeq ($(with_check),yes)
+	cp -p debian/README.libstdc++-baseline \
+		$(d_dev)/$(docdir)/$(p_base)/C++/README.libstdc++-baseline
+	if [ -f $(buildlibdir)/libstdc++-v3/testsuite/current_symbols.txt ]; \
+	then \
+	  cp -p $(buildlibdir)/libstdc++-v3/testsuite/current_symbols.txt \
+	    $(d_dev)/$(docdir)/$(p_base)/C++/libstdc++_symbols.txt; \
+	fi
+endif
+	cp -p $(buildlibdir)/libstdc++-v3/src/libstdc++-symbols.ver \
+		$(d_pic)/$(gcc_lib_dir)/libstdc++_pic.map
+
+	cp -a $(d)/$(PF)/$(libdir)/libstdc++.so.* \
+		$(d_dbg)/$(PF)/$(libdir)/
+	dh_strip -p$(p_dbg) --keep-debug
+	rm -f $(d_dbg)/$(PF)/$(libdir)/libstdc++.so.*
+
+	dh_strip -p$(p_dev) --dbg-package=$(p_lib)
+	dh_strip -p$(p_pic)
+
+ifeq ($(with_cxxdev),yes)
+	debian/dh_rmemptydirs -p$(p_dev)
+	debian/dh_rmemptydirs -p$(p_pic)
+	debian/dh_rmemptydirs -p$(p_dbg)
+endif
+
+	dh_compress -p$(p_dev) -p$(p_pic) -p$(p_dbg) -X.txt
+	dh_fixperms -p$(p_dev) -p$(p_pic) -p$(p_dbg)
+ifeq ($(biarch),yes)
+	dh_shlibdeps -p$(p_dev) -p$(p_pic) -p$(p_dbg) -Xlib64
+else
+	dh_shlibdeps -p$(p_dev) -p$(p_pic) -p$(p_dbg) -Xlib32/debug
+endif
+	dh_gencontrol -p$(p_dev) -p$(p_pic) -p$(p_dbg) \
+		-- -v$(DEB_VERSION) $(common_substvars)
+
+	dh_installdeb -p$(p_dev) -p$(p_pic) -p$(p_dbg)
+	dh_md5sums -p$(p_dev) -p$(p_pic) -p$(p_dbg)
+	dh_builddeb -p$(p_dev) -p$(p_pic) -p$(p_dbg)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+
+# ----------------------------------------------------------------------
+
+doxygen_doc_dir = $(buildlibdir)/libstdc++-v3/docs/doxygen
+
+doxygen-docs: $(build_doxygen_stamp)
+$(build_doxygen_stamp):
+	rm -rf $(doxygen_doc_dir)/html*
+	$(MAKE) -C $(buildlibdir)/libstdc++-v3 SHELL=/bin/bash doxygen
+	$(MAKE) -C $(buildlibdir)/libstdc++-v3 SHELL=/bin/bash doxygen-man
+	sed -e 's,http://gcc\.gnu\.org/onlinedocs/libstdc++,../html,g' \
+	    -e 's,<title>Main Page</title>,<title>libstdc++-v3 Source: Main Index</title>,' \
+	  $(doxygen_doc_dir)/html_user/index.html \
+	    > $(doxygen_doc_dir)/html_user/index.html.new
+	mv -f $(doxygen_doc_dir)/html_user/index.html.new \
+	    $(doxygen_doc_dir)/html_user/index.html
+
+	-find $(doxygen_doc_dir)/html_user -name 'struct*' -empty | xargs rm -f
+
+	touch $@
+
+$(binary_stamp)-libstdcxx-doc: $(install_stamp) doxygen-docs
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_libd)
+	dh_installdirs -p$(p_libd) \
+		$(docdir)/$(p_base)/libstdc++ \
+		$(PF)/share/man
+
+#	debian/dh_doclink -p$(p_libd) $(p_base)
+	dh_link -p$(p_libd) /usr/share/doc/$(p_base) /usr/share/doc/$(p_libd)
+	dh_installdocs -p$(p_libd)
+	rm -f $(d_libd)/$(docdir)/$(p_base)/copyright
+
+	cp -a $(srcdir)/libstdc++-v3/docs/html \
+		$(d_libd)/$(docdir)/$(p_base)/libstdc++/.
+	ln -sf documentation.html \
+		$(d_libd)/$(docdir)/$(p_base)/libstdc++/html/index.html
+	-find $(d_libd)/$(docdir)/$(p_base)/libstdc++/ -name CVS -type d \
+		| xargs rm -rf
+
+	cp -a $(doxygen_doc_dir)/html_user \
+		$(d_libd)/$(docdir)/$(p_base)/libstdc++/.
+	cp -a $(doxygen_doc_dir)/man/man3 \
+		$(d_libd)/$(PF)/share/man/.
+	cp -p $(srcdir)/libstdc++-v3/docs/doxygen/Intro.3 \
+		$(d_libd)/$(PF)/share/man/man3/C++Intro.3
+
+	mkdir -p $(d_libd)/usr/share/lintian/overrides
+	cp -p debian/$(p_libd).overrides \
+		$(d_libd)/usr/share/lintian/overrides/$(p_libd)
+
+	dh_compress -p$(p_libd) -Xhtml/17_intro -X.txt -X.tag
+	dh_fixperms -p$(p_libd)
+	dh_gencontrol -p$(p_libd) -- -v$(DEB_VERSION) $(common_substvars)
+
+	dh_installdeb -p$(p_libd)
+	dh_md5sums -p$(p_libd)
+	dh_builddeb -p$(p_libd)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
--- gcj-4.2-4.2-20070707.orig/debian/rules.d/binary-cxx.mk
+++ gcj-4.2-4.2-20070707/debian/rules.d/binary-cxx.mk
@@ -0,0 +1,112 @@
+ifneq (,$(filter yes, $(biarch) $(biarch32)))
+  arch_binaries  := $(arch_binaries) cxx-multi
+endif
+arch_binaries  := $(arch_binaries) cxx
+
+dirs_cxx = \
+	$(docdir)/$(p_base)/C++ \
+	$(PF)/bin \
+	$(PF)/share/info \
+	$(gcc_lexec_dir) \
+	$(PF)/share/man/man1
+files_cxx = \
+	$(PF)/bin/g++$(pkg_ver) \
+	$(gcc_lexec_dir)/cc1plus
+
+ifneq ($(GFDL_INVARIANT_FREE),yes)
+  files_cxx += \
+	$(PF)/share/man/man1/g++$(pkg_ver).1
+endif
+
+p_cxx_m	= g++$(pkg_ver)-multilib
+d_cxx_m	= debian/$(p_cxx_m)
+
+# ----------------------------------------------------------------------
+$(binary_stamp)-cxx: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_cxx)
+	dh_installdirs -p$(p_cxx) $(dirs_cxx)
+	DH_COMPAT=2 dh_movefiles -p$(p_cxx) $(files_cxx)
+
+	ln -sf g++$(pkg_ver) \
+	    $(d_cxx)/$(PF)/bin/$(DEB_TARGET_GNU_TYPE)-g++$(pkg_ver)
+	ln -sf g++$(pkg_ver) \
+	    $(d_cxx)/$(PF)/bin/$(TARGET_ALIAS)-g++$(pkg_ver)
+ifneq ($(GFDL_INVARIANT_FREE),yes)
+# g++ man page is a .so link
+	rm -f $(d_cxx)/$(PF)/share/man/man1/g++$(pkg_ver).1
+	ln -sf gcc$(pkg_ver).1.gz \
+		$(d_cxx)/$(PF)/share/man/man1/g++$(pkg_ver).1.gz
+	ln -sf g++$(pkg_ver).1.gz \
+	    $(d_cxx)/$(PF)/share/man/man1/$(DEB_TARGET_GNU_TYPE)-g++$(pkg_ver).1.gz
+	ln -sf g++$(pkg_ver).1.gz \
+	    $(d_cxx)/$(PF)/share/man/man1/$(TARGET_ALIAS)-g++$(pkg_ver).1.gz
+endif
+
+	debian/dh_doclink -p$(p_cxx) $(p_base)
+	cp -p debian/README.C++ $(d_cxx)/$(docdir)/$(p_base)/C++/
+	cp -p $(srcdir)/gcc/cp/ChangeLog \
+		$(d_cxx)/$(docdir)/$(p_base)/C++/changelog
+	debian/dh_rmemptydirs -p$(p_cxx)
+
+	dh_strip -p$(p_cxx)
+	dh_compress -p$(p_cxx)
+	dh_fixperms -p$(p_cxx)
+	dh_shlibdeps -p$(p_cxx)
+	dh_gencontrol -p$(p_cxx) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_cxx)
+	dh_md5sums -p$(p_cxx)
+	dh_builddeb -p$(p_cxx)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+
+# ----------------------------------------------------------------------
+$(binary_stamp)-cxx-multi: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_cxx_m)
+	dh_installdirs -p$(p_cxx_m) \
+		$(docdir) \
+		$(gcc_lib_dir)/$(biarchsubdir)
+
+ifeq ($(biarch),yes)
+	mv $(d)/$(PF)/lib64/lib*c++*.{a,so} $(d)/$(gcc_lib_dir)/$(biarchsubdir)/.
+endif
+ifeq ($(biarch32),yes)
+	mv $(d)/$(lib32)/lib*c++*.{a,so} $(d)/$(gcc_lib_dir)/$(biarchsubdir)/.
+endif
+
+	DH_COMPAT=2 dh_movefiles -p$(p_cxx_m) \
+		$(gcc_lib_dir)/$(biarchsubdir)/libstdc++.{a,so} \
+	        $(gcc_lib_dir)/$(biarchsubdir)/libsupc++.a \
+		$(gcc_lib_dir)/$(biarchsubdir)/libstdc++_pic.a
+
+ifeq ($(biarch),yes)
+	dh_link -p$(p_cxx_m) \
+		/$(PF)/lib64/libstdc++.so.$(CXX_SONAME) \
+		/$(gcc_lib_dir)/$(biarchsubdir)/libstdc++.so
+endif
+ifeq ($(biarch32),yes)
+	dh_link -p$(p_cxx_m) \
+		/$(lib32)/libstdc++.so.$(CXX_SONAME) \
+		/$(gcc_lib_dir)/$(biarchsubdir)/libstdc++.so
+endif
+
+	debian/dh_doclink -p$(p_cxx_m) $(p_base)
+	debian/dh_rmemptydirs -p$(p_cxx_m)
+
+	dh_strip -p$(p_cxx_m)
+	dh_compress -p$(p_cxx_m)
+	dh_fixperms -p$(p_cxx_m)
+	dh_shlibdeps -p$(p_cxx_m)
+	dh_gencontrol -p$(p_cxx_m) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_cxx_m)
+	dh_md5sums -p$(p_cxx_m)
+	dh_builddeb -p$(p_cxx_m)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
--- gcj-4.2-4.2-20070707.orig/debian/rules.d/binary-gcc.mk
+++ gcj-4.2-4.2-20070707/debian/rules.d/binary-gcc.mk
@@ -0,0 +1,314 @@
+ifneq (,$(filter yes, $(biarch) $(biarch32)))
+  arch_binaries  := $(arch_binaries) gcc-multi
+endif
+arch_binaries  := $(arch_binaries) gcc
+ifneq ($(GFDL_INVARIANT_FREE),yes)
+  indep_binaries := $(indep_binaries) gcc-doc
+endif
+ifeq ($(with_nls),yes)
+  indep_binaries := $(indep_binaries) gcc-locales
+endif
+
+# gcc must be moved after g77 and g++
+# not all files $(PF)/include/*.h are part of gcc,
+# but it becomes difficult to name all these files ...
+
+dirs_gcc = \
+	$(docdir)/$(p_base)/{gcc,libssp,gomp} \
+	$(PF)/bin \
+	$(gcc_lexec_dir) \
+	$(gcc_lib_dir)/include \
+	$(PF)/share/man/man1 $(libdir)
+
+files_gcc = \
+	$(PF)/bin/{gcc,gcov,gccbug}$(pkg_ver) \
+	$(PF)/share/man/man1/gccbug$(pkg_ver).1 \
+	$(gcc_lexec_dir)/collect2 \
+	$(gcc_lib_dir)/{libgcc*,libgcov.a,*.o} \
+	$(gcc_lib_dir)/include/README \
+	$(gcc_lib_dir)/include/{decfloat,float,iso646,limits,std*,syslimits,unwind,varargs}.h \
+	$(shell for d in asm bits gnu linux; do \
+		  test -e $(d)/$(gcc_lib_dir)/include/$$d \
+		    && echo $(gcc_lib_dir)/include/$$d; \
+		done) \
+	$(shell test -e $(d)/$(gcc_lib_dir)/SYSCALLS.c.X \
+		&& echo $(gcc_lib_dir)/SYSCALLS.c.X) \
+	$(shell for h in {,e,p,x}mmintrin.h mm3dnow.h mm_malloc.h; do \
+		  test -e $(d)/$(gcc_lib_dir)/include/$$h \
+		    && echo $(gcc_lib_dir)/include/$$h; \
+		done)
+
+ifneq ($(GFDL_INVARIANT_FREE),yes)
+    files_gcc += \
+	$(PF)/share/man/man1/{gcc,gcov}$(pkg_ver).1
+endif
+
+ifeq ($(with_libssp),yes)
+    files_gcc += $(gcc_lib_dir)/include/ssp
+endif
+ifeq ($(with_libgomp),yes)
+    files_gcc += $(gcc_lib_dir)/include/omp.h
+endif
+
+ifeq ($(DEB_HOST_ARCH),ia64)
+    files_gcc += $(gcc_lib_dir)/include/ia64intrin.h
+endif
+
+ifeq ($(DEB_HOST_ARCH),m68k)
+    files_gcc += $(gcc_lib_dir)/include/math-68881.h
+endif
+
+ifeq ($(DEB_TARGET_ARCH),$(findstring $(DEB_TARGET_ARCH),powerpc ppc64))
+    files_gcc += $(gcc_lib_dir)/include/{altivec.h,ppc-asm.h,spe.h}
+endif
+
+usr_doc_files = debian/README.Bugs \
+	$(shell test -f $(srcdir)/FAQ && echo $(srcdir)/FAQ) \
+	$(shell test -f test-summary && echo test-summary)
+
+p_loc	= gcc$(pkg_ver)-locales
+d_loc	= debian/$(p_loc)
+
+p_gcc_m	= gcc$(pkg_ver)-multilib
+d_gcc_m	= debian/$(p_gcc_m)
+
+# ----------------------------------------------------------------------
+$(binary_stamp)-gcc: $(install_dependencies)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_gcc)
+	dh_installdirs -p$(p_gcc) $(dirs_gcc)
+
+	rm -f $(d)/$(PF)/$(libdir)/libgcc_s.so
+	ln -sf /$(libdir)/libgcc_s.so.$(GCC_SONAME) $(d)/$(gcc_lib_dir)/libgcc_s.so
+
+ifeq ($(with_libgmath),yes)
+	rm -f $(d)/$(PF)/$(libdir)/libgcc-math.{la,so}
+	dh_link -p$(p_gcc) \
+	  /$(PF)/$(libdir)/libgcc-math.so.$(GCC_SONAME) /$(gcc_lib_dir)/libgcc-math.so
+	mv $(d)/$(PF)/$(libdir)/libgcc-math.a $(d)/$(gcc_lib_dir)/
+endif
+
+ifeq ($(with_libssp),yes)
+	mv $(d)/$(PF)/lib/libssp*.a $(d_gcc)/$(gcc_lib_dir)/
+	rm -f $(d)/$(PF)/lib/libssp*.{la,so}
+	dh_link -p$(p_gcc) \
+	  /$(PF)/lib/libssp.so.$(SSP_SONAME) /$(gcc_lib_dir)/libssp.so
+	cp -p $(srcdir)/libssp/ChangeLog \
+		$(d_gcc)/$(docdir)/$(p_base)/libssp/changelog
+endif
+ifeq ($(with_libgomp),yes)
+	mv $(d)/$(PF)/lib/libgomp*.{a,spec} $(d_gcc)/$(gcc_lib_dir)/
+	rm -f $(d)/$(PF)/lib/libgomp*.{la,so}
+	dh_link -p$(p_gcc) \
+	  /$(PF)/lib/libgomp.so.$(GOMP_SONAME) /$(gcc_lib_dir)/libgomp.so
+	cp -p $(srcdir)/libgomp/ChangeLog \
+		$(d_gcc)/$(docdir)/$(p_base)/gomp/changelog
+endif
+
+	cp -p debian/gccbug.1 $(d)/$(PF)/share/man/man1/gccbug$(pkg_ver).1
+
+	DH_COMPAT=2 dh_movefiles -p$(p_gcc) $(files_gcc)
+
+	ln -sf gcc$(pkg_ver) \
+	    $(d_gcc)/$(PF)/bin/$(DEB_TARGET_GNU_TYPE)-gcc$(pkg_ver)
+	ln -sf gcc$(pkg_ver) \
+	    $(d_gcc)/$(PF)/bin/$(TARGET_ALIAS)-gcc$(pkg_ver)
+ifneq ($(GFDL_INVARIANT_FREE),yes)
+	ln -sf gcc$(pkg_ver).1 \
+	    $(d_gcc)/$(PF)/share/man/man1/$(DEB_TARGET_GNU_TYPE)-gcc$(pkg_ver).1
+	ln -sf gcc$(pkg_ver).1 \
+	    $(d_gcc)/$(PF)/share/man/man1/$(TARGET_ALIAS)-gcc$(pkg_ver).1
+endif
+
+#	dh_installdebconf
+	debian/dh_doclink -p$(p_gcc) $(p_base)
+	cp -p $(usr_doc_files) $(d_gcc)/$(docdir)/$(p_base)/.
+	if [ -f testsuite-comparision ]; then \
+	  cp -p testsuite-comparision $(d_gcc)/$(docdir)/$(p_base)/. ; \
+	fi
+	cp -p debian/README.ssp $(d_gcc)/$(docdir)/$(p_base)/
+	cp -p debian/NEWS.gcc $(d_gcc)/$(docdir)/$(p_base)/NEWS
+	cp -p debian/NEWS.html $(d_gcc)/$(docdir)/$(p_base)/NEWS.html
+	cp -p $(srcdir)/gcc/ChangeLog \
+		$(d_gcc)/$(docdir)/$(p_base)/gcc/changelog
+	if [ -f $(builddir)/gcc/.bad_compare ]; then \
+	  ( \
+	    echo "The comparision of the stage2 and stage3 object files shows differences."; \
+	    echo "The Debian package was modified to ignore these differences."; \
+	    echo ""; \
+	    echo "The following files differ:"; \
+	    echo ""; \
+	    cat $(builddir)/gcc/.bad_compare; \
+	  ) > $(d_gcc)/$(docdir)/$(p_base)/BOOTSTRAP_COMPARISION_FAILURE; \
+	else \
+	  true; \
+	fi
+	debian/dh_rmemptydirs -p$(p_gcc)
+	dh_strip -p$(p_gcc)
+	dh_compress -p$(p_gcc) -X README.Bugs
+	dh_fixperms -p$(p_gcc)
+	dh_shlibdeps -p$(p_gcc)
+	dh_gencontrol -p$(p_gcc) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_gcc)
+	dh_md5sums -p$(p_gcc)
+	dh_builddeb -p$(p_gcc)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+
+	: # remove empty directories, when all components are in place
+	for d in `find $(d) -depth -type d -empty 2> /dev/null`; do \
+	    while rmdir $$d 2> /dev/null; do d=`dirname $$d`; done; \
+	done
+
+	@echo "Listing installed files not included in any package:"
+	-find $(d) ! -type d
+
+# ----------------------------------------------------------------------
+$(binary_stamp)-gcc-multi: $(install_dependencies)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_gcc_m)
+	dh_installdirs -p$(p_gcc_m) \
+		$(docdir) \
+		$(gcc_lib_dir)/$(biarchsubdir) \
+
+ifeq ($(biarch),yes)
+	DH_COMPAT=2 dh_movefiles -p$(p_gcc_m) \
+		$(gcc_lib_dir)/$(biarchsubdir)/{libgcc*,libgcov.a,*.o}
+	rm -f $(d)/$(PF)/$(lib64)/libgcc_s.so
+	dh_link -p$(p_gcc_m) \
+	  /$(lib64)/libgcc_s.so.$(GCC_SONAME) /$(gcc_lib_dir)/libgcc_s_64.so \
+	  /$(lib64)/libgcc_s.so.$(GCC_SONAME) /$(gcc_lib_dir)/$(biarchsubdir)/libgcc_s.so
+  ifeq ($(with_lib64gmath),yes)
+	rm -f $(d)/$(PF)/$(lib64)/libgcc-math.{la,so}
+	dh_link -p$(p_gcc_m) \
+	  /$(PF)/$(lib64)/libgcc-math.so.$(GCC_SONAME) /$(gcc_lib_dir)/$(biarchsubdir)/libgcc-math.so
+	mv $(d)/$(PF)/$(lib64)/libgcc-math.a $(d)/$(gcc_lib_dir)/$(biarchsubdir)/
+  endif
+endif
+ifeq ($(biarch32),yes)
+	DH_COMPAT=2 dh_movefiles -p$(p_gcc_m) \
+		$(gcc_lib_dir)/$(biarchsubdir)/{libgcc*,libgcov.a,*.o}
+	rm -f $(d)/$(lib32)/libgcc_s.so
+	dh_link -p$(p_gcc_m) \
+	  /$(lib32)/libgcc_s.so.$(GCC_SONAME)  /$(gcc_lib_dir)/libgcc_s_32.so \
+	  /$(lib32)/libgcc_s.so.$(GCC_SONAME)  /$(gcc_lib_dir)/$(biarchsubdir)/libgcc_s.so
+  ifeq ($(with_lib32gmath),yes)
+	rm -f $(d)/$(lib32)/libgcc-math.{la,so}
+	dh_link -p$(p_gcc_m) \
+	  /$(lib32)/libgcc-math.so.$(GCC_SONAME) /$(gcc_lib_dir)/$(biarchsubdir)/libgcc-math.so
+	mv $(d)/$(lib32)/libgcc-math.a $(d)/$(gcc_lib_dir)/$(biarchsubdir)/
+  endif
+endif
+
+ifeq ($(with_libssp),yes)
+  ifeq ($(biarch),yes)
+	mv $(d)/$(PF)/$(lib64)/libssp*.a $(d_gcc_m)/$(gcc_lib_dir)/$(biarchsubdir)/
+	rm -f $(d)/$(PF)/$(lib64)/$(biarchsubdir)/libssp*.{la,so}
+	dh_link -p$(p_gcc_m) \
+	  /$(PF)/$(lib64)/libssp.so.$(SSP_SONAME) /$(gcc_lib_dir)/$(biarchsubdir)/libssp.so
+  endif
+  ifeq ($(biarch32),yes)
+	mv $(d)/$(lib32)/libssp*.a $(d_gcc_m)/$(gcc_lib_dir)/$(biarchsubdir)/
+	rm -f $(d)/$(lib32)/$(biarchsubdir)/libssp*.{la,so}
+	dh_link -p$(p_gcc_m) \
+	  /$(lib32)/libssp.so.$(SSP_SONAME) /$(gcc_lib_dir)/$(biarchsubdir)/libssp.so
+  endif
+endif
+
+ifeq ($(with_libgomp),yes)
+  ifeq ($(biarch),yes)
+	mv $(d)/$(PF)/$(lib64)/libgomp*.a $(d_gcc_m)/$(gcc_lib_dir)/$(biarchsubdir)/
+	rm -f $(d)/$(PF)/$(lib64)/$(biarchsubdir)/libgomp*.{la,so}
+	dh_link -p$(p_gcc_m) \
+	  /$(PF)/$(lib64)/libgomp.so.$(GOMP_SONAME) /$(gcc_lib_dir)/$(biarchsubdir)/libgomp.so
+  endif
+  ifeq ($(biarch32),yes)
+	mv $(d)/$(lib32)/libgomp*.a $(d_gcc_m)/$(gcc_lib_dir)/$(biarchsubdir)/
+	rm -f $(d)/$(lib32)/$(biarchsubdir)/libgomp*.{la,so}
+	dh_link -p$(p_gcc_m) \
+	  /$(lib32)/libgomp.so.$(GOMP_SONAME) /$(gcc_lib_dir)/$(biarchsubdir)/libgomp.so
+  endif
+endif
+
+	debian/dh_doclink -p$(p_gcc_m) $(p_base)
+	debian/dh_rmemptydirs -p$(p_gcc_m)
+
+	dh_strip -p$(p_gcc_m)
+	dh_compress -p$(p_gcc_m)
+	dh_shlibdeps -p$(p_gcc_m)
+	dh_fixperms -p$(p_gcc_m)
+	dh_installdeb -p$(p_gcc_m)
+	dh_gencontrol -p$(p_gcc_m) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_md5sums -p$(p_gcc_m)
+	dh_builddeb -p$(p_gcc_m)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+
+# ----------------------------------------------------------------------
+$(binary_stamp)-gcc-locales: $(install_dependencies)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_loc)
+	dh_installdirs -p$(p_loc) \
+		$(docdir)
+	DH_COMPAT=2 dh_movefiles -p$(p_loc) \
+		$(PF)/share/locale/*/*/cpplib*.* \
+		$(PF)/share/locale/*/*/gcc*.*
+
+	debian/dh_doclink -p$(p_loc) $(p_base)
+	debian/dh_rmemptydirs -p$(p_loc)
+
+	dh_compress -p$(p_loc)
+	dh_fixperms -p$(p_loc)
+	dh_installdeb -p$(p_loc)
+	dh_gencontrol -p$(p_loc) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_md5sums -p$(p_loc)
+	dh_builddeb -p$(p_loc)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+
+# ----------------------------------------------------------------------
+$(binary_stamp)-gcc-doc: $(build_html_stamp) $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_doc)
+	dh_installdirs -p$(p_doc) \
+		$(docdir)/$(p_base) \
+		$(PF)/share/info
+	DH_COMPAT=2 dh_movefiles -p$(p_doc) \
+		$(PF)/share/info/gcc*
+	rm -f $(d_doc)/$(PF)/share/info/gccinst*
+
+ifeq ($(with_libgomp),yes)
+	$(MAKE) -C $(buildlibdir)/libgomp stamp-build-info
+	cp -p $(buildlibdir)/libgomp/libgomp$(pkg_ver).info $(d_doc)/$(PF)/share/info/
+else
+	rm -f debian/$(p_doc).doc-base.gomp
+endif
+
+	debian/dh_doclink -p$(p_doc) $(p_base)
+	dh_installdocs -p$(p_doc) html/gcc.html html/gccint.html
+ifeq ($(with_libgomp),yes)
+	cp -p html/libgomp.html $(d_doc)/usr/share/doc/$(p_doc)/
+endif
+	rm -f $(d_doc)/$(docdir)/$(p_base)/copyright
+	debian/dh_rmemptydirs -p$(p_doc)
+
+	dh_compress -p$(p_doc)
+	dh_fixperms -p$(p_doc)
+	dh_installdeb -p$(p_doc)
+	dh_gencontrol -p$(p_doc) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_md5sums -p$(p_doc)
+	dh_builddeb -p$(p_doc)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
--- gcj-4.2-4.2-20070707.orig/debian/rules.d/binary-hppa64.mk
+++ gcj-4.2-4.2-20070707/debian/rules.d/binary-hppa64.mk
@@ -0,0 +1,29 @@
+arch_binaries  := $(arch_binaries) hppa64
+
+# ----------------------------------------------------------------------
+$(binary_stamp)-hppa64: $(install_hppa64_stamp)
+	dh_testdir
+	dh_testroot
+
+#	dh_installdirs -p$(p_hppa64)
+
+	: # provide as and ld links
+	dh_link -p $(p_hppa64) \
+		/usr/bin/hppa64-linux-gnu-as \
+		/$(PF)/lib/gcc/hppa64-linux-gnu/$(GCC_VERSION)/as \
+		/usr/bin/hppa64-linux-gnu-ld \
+		/$(PF)/lib/gcc/hppa64-linux-gnu/$(GCC_VERSION)/ld
+
+	debian/dh_doclink -p$(p_hppa64) $(p_base)
+	debian/dh_rmemptydirs -p$(p_hppa64)
+
+	dh_strip -p$(p_hppa64) -X.o -Xlibgcc.a -Xlibgcov.a
+	dh_compress -p$(p_hppa64)
+	dh_fixperms -p$(p_hppa64)
+	dh_shlibdeps -p$(p_hppa64)
+	dh_gencontrol -p$(p_hppa64) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_hppa64)
+	dh_md5sums -p$(p_hppa64)
+	dh_builddeb -p$(p_hppa64)
+
+	touch $@
--- gcj-4.2-4.2-20070707.orig/debian/rules.d/binary-cxx-cross.mk
+++ gcj-4.2-4.2-20070707/debian/rules.d/binary-cxx-cross.mk
@@ -0,0 +1,42 @@
+arch_binaries  := $(arch_binaries) cxx
+
+dirs_cxx = \
+	$(docdir) \
+	$(PF)/bin \
+	$(gcc_lib_dir) \
+	$(PF)/share/man/man1
+files_cxx = \
+	$(PF)/bin/$(DEB_TARGET_GNU_TYPE)-g++$(pkg_ver) \
+	$(PF)/share/man/man1/$(DEB_TARGET_GNU_TYPE)-g++$(pkg_ver).1 \
+	$(gcc_lib_dir)/cc1plus
+
+# ----------------------------------------------------------------------
+$(binary_stamp)-cxx: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_cxx)
+	dh_installdirs -p$(p_cxx) $(dirs_cxx)
+	DH_COMPAT=2 dh_movefiles -p$(p_cxx) $(files_cxx)
+# g++ man page is a .so link
+	rm -f $(d_cxx)/$(PF)/share/man/man1/$(DEB_TARGET_GNU_TYPE)-g++$(pkg_ver).1
+	ln -sf $(DEB_TARGET_GNU_TYPE)-gcc$(pkg_ver).1.gz \
+		$(d_cxx)/$(PF)/share/man/man1/$(DEB_TARGET_GNU_TYPE)-g++$(pkg_ver).1.gz
+
+	debian/dh_doclink -p$(p_cxx) $(p_base)
+	debian/dh_rmemptydirs -p$(p_cxx)
+
+	dh_strip -p$(p_cxx)
+	dh_compress -p$(p_cxx)
+	dh_fixperms -p$(p_cxx)
+	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
+	chmod 755 debian/$(p_cxx)/DEBIAN/{postinst,prerm}
+	dh_md5sums -p$(p_cxx)
+	dh_builddeb -p$(p_cxx)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
--- gcj-4.2-4.2-20070707.orig/debian/rules.d/binary-ada.mk
+++ gcj-4.2-4.2-20070707/debian/rules.d/binary-ada.mk
@@ -0,0 +1,317 @@
+arch_binaries := $(arch_binaries) gnatbase ada
+ifneq ($(GFDL_INVARIANT_FREE),yes)
+  indep_binaries := $(indep_binaries) ada-doc
+endif
+
+ifeq ($(with_libgnat),yes)
+  arch_binaries := $(arch_binaries) libgnat
+endif
+
+p_gbase	= gnat-$(GNAT_VERSION)-base
+p_gnat	= gnat-$(GNAT_VERSION)
+p_lgnat	= libgnat-$(GNAT_VERSION)
+p_lgnat_dbg = $(p_lgnat)-dbg
+p_lgnatvsn = libgnatvsn$(GNAT_VERSION)
+p_lgnatvsn_dbg = $(p_lgnatvsn)-dbg
+p_lgnatprj = libgnatprj$(GNAT_VERSION)
+p_lgnatprj_dbg = $(p_lgnatprj)-dbg
+p_gnatd	= $(p_gnat)-doc
+
+d_gbase	= debian/$(p_gbase)
+d_gnat	= debian/$(p_gnat)
+d_lgnat	= debian/$(p_lgnat)
+d_lgnatvsn = debian/$(p_lgnatvsn)
+d_lgnatprj = debian/$(p_lgnatprj)
+d_gnatd	= debian/$(p_gnatd)
+
+GNAT_TOOLS = gnat gnatbind gnatbl gnatchop gnatclean gnatfind gnatkr gnatlink \
+		gnatls gnatmake gnatname gnatprep gnatxref \
+		gprmake
+
+dirs_gnat = \
+	$(PF)/bin \
+	$(PF)/share/man/man1 \
+	$(gcc_lib_dir) \
+	$(gcc_lexec_dir)
+
+files_gnat = \
+	$(gcc_lexec_dir)/gnat1 \
+	$(gcc_lib_dir)/{adalib,adainclude} \
+	$(foreach i,$(GNAT_TOOLS),$(PF)/bin/$(i))
+
+#	$(foreach i,$(GNAT_TOOLS),$(PF)/bin/$(i)-$(GNAT_VERSION))
+
+dirs_lgnat = \
+	$(docdir) \
+	$(PF)/lib
+files_lgnat = \
+	$(PF)/$(libdir)/lib{gnat,gnarl}-$(GNAT_SONAME).so.1
+
+$(binary_stamp)-gnatbase: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	dh_installdocs -p$(p_gbase) src/gcc/ada/ChangeLog debian/README.gnat \
+		debian/README.maintainers
+ifeq ($(PKGSOURCE),gnat-$(BASE_VERSION))
+  ifeq ($(with_check),yes)
+	dh_installdocs -p$(p_gbase) test-summary
+  endif
+endif
+ifeq ($(PKGSOURCE),gnat-$(BASE_VERSION))
+  ifeq ($(with_check),yes)
+	dh_installdocs -p$(p_gbase) test-summary
+  endif
+endif
+ifeq ($(PKGSOURCE),gnat-$(BASE_VERSION))
+  ifeq ($(with_check),yes)
+	dh_installdocs -p$(p_gbase) test-summary
+  endif
+endif
+	dh_installchangelogs -p$(p_gbase)
+	dh_compress -p$(p_gbase)
+	dh_fixperms -p$(p_gbase)
+	dh_gencontrol -p$(p_gbase) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_gbase)
+	dh_md5sums -p$(p_gbase)
+	dh_builddeb -p$(p_gbase)
+	touch $@
+
+
+$(binary_stamp)-libgnat: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	: # libgnat
+	rm -rf $(d_lgnat)
+	dh_installdirs -p$(p_lgnat) $(dirs_lgnat)
+
+	for lib in lib{gnat,gnarl}; do \
+	  vlib=$$lib-$(GNAT_SONAME); \
+	  mv $(d)/$(gcc_lib_dir)/adalib/$$vlib.so.1 $(d)/$(PF)/$(libdir)/. ; \
+	  rm -f $(d)/$(gcc_lib_dir)/adalib/$$lib.so.1; \
+	done
+	dh_movefiles -p$(p_lgnat) $(files_lgnat)
+
+	debian/dh_doclink -p$(p_lgnat) $(p_gbase)
+
+	debian/dh_rmemptydirs -p$(p_lgnat)
+
+	dh_strip -p$(p_lgnat) --dbg-package=$(p_lgnat)
+	dh_compress -p$(p_lgnat)
+	dh_fixperms -p$(p_lgnat)
+	b=libgnat; \
+	for ext in preinst postinst prerm postrm; do \
+	  for t in '' -dev -dbg; do \
+	    v=$(GNAT_VERSION); \
+	    if [ -f debian/$$b$$t.$$ext ]; then \
+	      cp -pf debian/$$b$$t.$$ext debian/$$b$$v$$t.$$ext; \
+	    fi; \
+	  done; \
+	done
+
+	dh_makeshlibs -p$(p_lgnat) -V '$(p_lgnat) (>= $(DEB_VERSION))'
+	cat debian/$(p_lgnat)/DEBIAN/shlibs >> debian/shlibs.local
+
+	mkdir -p $(d_lgnat)/usr/share/lintian/overrides
+	cp -p debian/$(p_lgnat).overrides \
+		$(d_lgnat)/usr/share/lintian/overrides/$(p_lgnat)
+
+	dh_shlibdeps -p$(p_lgnat)
+	dh_gencontrol -p$(p_lgnat) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_lgnat)
+	dh_md5sums -p$(p_lgnat)
+	dh_builddeb -p$(p_lgnat)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+
+
+$(binary_stamp)-libgnatdbg: $(binary_stamp)-libgnat
+	debian/dh_doclink -p$(p_lgnat_dbg) $(p_gbase)
+	dh_compress -p$(p_lgnat_dbg)
+	dh_fixperms -p$(p_lgnat_dbg)
+	dh_gencontrol -p$(p_lgnat_dbg) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_lgnat_dbg)
+	dh_md5sums -p$(p_lgnat_dbg)
+	dh_builddeb -p$(p_lgnat_dbg)
+	touch $@
+
+$(binary_stamp)-libgnatvsn:
+	: # libgnatvsn-dev
+	dh_movefiles -plibgnatvsn-dev usr/lib/ada/adalib/gnatvsn
+	dh_movefiles -plibgnatvsn-dev usr/share/ada/adainclude/gnatvsn
+	dh_install -plibgnatvsn-dev \
+	   debian/gnatvsn.gpr usr/share/ada/adainclude
+	dh_movefiles -plibgnatvsn-dev usr/lib/libgnatvsn.a
+	dh_link -plibgnatvsn-dev \
+	   usr/lib/libgnatvsn.so.$(GNAT_VERSION) \
+	   usr/lib/libgnatvsn.so
+	dh_strip -plibgnatvsn-dev -X.a --keep-debug
+	dh_fixperms -plibgnatvsn-dev
+	debian/dh_doclink -plibgnatvsn-dev $(p_gbase)
+	dh_gencontrol -plibgnatvsn-dev -- -v$(DEB_VERSION) $(common_substvars)
+	dh_md5sums -plibgnatvsn-dev
+	dh_builddeb -plibgnatvsn-dev
+
+	: # libgnatvsn
+	dh_movefiles -p$(p_lgnatvsn) usr/lib/libgnatvsn.so.$(GNAT_VERSION)
+	debian/dh_doclink -p$(p_lgnatvsn) $(p_gbase)
+	dh_strip -p$(p_lgnatvsn) --dbg-package=$(p_lgnatvsn)
+	dh_makeshlibs -p$(p_lgnatvsn) -V '$(p_lgnatvsn) (>= $(DEB_VERSION))'
+	cat debian/$(p_lgnatvsn)/DEBIAN/shlibs >> debian/shlibs.local
+	dh_shlibdeps -p$(p_lgnatvsn)
+	dh_gencontrol -p$(p_lgnatvsn) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_lgnatvsn)
+	dh_md5sums -p$(p_lgnatvsn)
+	dh_builddeb -p$(p_lgnatvsn)
+
+	touch $@
+
+$(binary_stamp)-libgnatvsndbg: $(binary_stamp)-libgnatvsn
+	debian/dh_doclink -p$(p_lgnatvsn_dbg) $(p_gbase)
+	dh_compress -p$(p_lgnatvsn_dbg)
+	dh_fixperms -p$(p_lgnatvsn_dbg)
+	dh_gencontrol -p$(p_lgnatvsn_dbg) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_lgnatvsn_dbg)
+	dh_md5sums -p$(p_lgnatvsn_dbg)
+	dh_builddeb -p$(p_lgnatvsn_dbg)
+	touch $@
+
+$(binary_stamp)-libgnatprj:
+	: # libgnatprj-dev
+	dh_movefiles -plibgnatprj-dev usr/lib/ada/adalib/gnatprj
+	dh_movefiles -plibgnatprj-dev usr/share/ada/adainclude/gnatprj
+	dh_install -plibgnatprj-dev \
+	   debian/gnatprj.gpr usr/share/ada/adainclude
+	dh_movefiles -plibgnatprj-dev usr/lib/libgnatprj.a
+	dh_link -plibgnatprj-dev \
+	   usr/lib/libgnatprj.so.$(GNAT_VERSION) \
+	   usr/lib/libgnatprj.so
+	dh_strip -plibgnatprj-dev -X.a --keep-debug
+	dh_fixperms -plibgnatprj-dev
+	debian/dh_doclink -plibgnatprj-dev $(p_gbase)
+	dh_gencontrol -plibgnatprj-dev -- -v$(DEB_VERSION) $(common_substvars)
+	dh_md5sums -plibgnatprj-dev
+	dh_builddeb -plibgnatprj-dev
+
+	: # libgnatprj
+	dh_movefiles -p$(p_lgnatprj) usr/lib/libgnatprj.so.$(GNAT_VERSION)
+	debian/dh_doclink -p$(p_lgnatprj) $(p_gbase)
+	dh_strip -p$(p_lgnatprj) --dbg-package=$(p_lgnatprj)
+	dh_makeshlibs -p$(p_lgnatprj) -V '$(p_lgnatprj) (>= $(DEB_VERSION))'
+	cat debian/$(p_lgnatprj)/DEBIAN/shlibs >> debian/shlibs.local
+	dh_shlibdeps -p$(p_lgnatprj)
+	dh_gencontrol -p$(p_lgnatprj) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_lgnatprj)
+	dh_md5sums -p$(p_lgnatprj)
+	dh_builddeb -p$(p_lgnatprj)
+
+	touch $@
+
+$(binary_stamp)-libgnatprjdbg: $(binary_stamp)-libgnatprj
+	debian/dh_doclink -p$(p_lgnatprj_dbg) $(p_gbase)
+	dh_compress -p$(p_lgnatprj_dbg)
+	dh_fixperms -p$(p_lgnatprj_dbg)
+	dh_gencontrol -p$(p_lgnatprj_dbg) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_lgnatprj_dbg)
+	dh_md5sums -p$(p_lgnatprj_dbg)
+	dh_builddeb -p$(p_lgnatprj_dbg)
+	touch $@
+
+ifeq ($(with_libgnat),yes)
+$(binary_stamp)-ada: $(install_stamp) $(binary_stamp)-libgnat $(binary_stamp)-libgnatdbg
+$(binary_stamp)-ada: $(binary_stamp)-libgnatvsn $(binary_stamp)-libgnatvsndbg
+$(binary_stamp)-ada: $(binary_stamp)-libgnatprj $(binary_stamp)-libgnatprjdbg
+else
+$(binary_stamp)-ada: $(install_stamp)
+endif
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+	: # gnat
+	rm -rf $(d_gnat)
+	dh_installdirs -p$(p_gnat) $(dirs_gnat)
+	dh_movefiles -p$(p_gnat) $(files_gnat)
+
+ifeq (0,1)
+ifeq ($(PKGSOURCE),gnat-$(BASE_VERSION))
+	mkdir -p $(d_gnat)/$(libexecdir)/gcc/$(TARGET_ALIAS)/$(BASE_VERSION)
+	ln -sf ../$(GCC_VERSION)/gnat1 \
+	  $(d_gnat)/$(libexecdir)/gcc/$(TARGET_ALIAS)/$(BASE_VERSION)/gnat1
+	mkdir -p $(d_gnat)/$(PF)/$(libdir)/gcc/$(TARGET_ALIAS)/$(BASE_VERSION)
+	ln -sf ../$(GCC_VERSION)/adalib \
+	  $(d_gnat)/$(PF)/$(libdir)/gcc/$(TARGET_ALIAS)/$(BASE_VERSION)/adalib
+	ln -sf ../$(GCC_VERSION)/adainclude \
+	  $(d_gnat)/$(PF)/$(libdir)/gcc/$(TARGET_ALIAS)/$(BASE_VERSION)/adainclude
+endif
+endif
+
+ifeq ($(with_libgnat),yes)
+	for lib in lib{gnat,gnarl}; do \
+	  vlib=$$lib-$(GNAT_SONAME); \
+	  dh_link -p$(p_gnat) \
+	    /$(PF)/$(libdir)/$$vlib.so.1 /$(PF)/$(libdir)/$$vlib.so \
+	    /$(PF)/$(libdir)/$$vlib.so.1 /$(PF)/$(libdir)/$$lib.so; \
+	done
+endif
+	debian/dh_doclink -p$(p_gnat) $(p_gbase)
+	for i in $(GNAT_TOOLS); do \
+	  case "$$i" in \
+	    gnat) cp -p debian/gnat.1 $(d_gnat)/$(PF)/share/man/man1/ ;; \
+	    *) ln -sf gnat.1 $(d_gnat)/$(PF)/share/man/man1/$$i.1; \
+	  esac; \
+	done
+
+	debian/dh_rmemptydirs -p$(p_gnat)
+
+	dh_strip -p$(p_gnat)
+	dh_compress -p$(p_gnat)
+	dh_fixperms -p$(p_gnat)
+	find $(d_gnat) -name '*.ali' | xargs chmod 444
+	dh_shlibdeps -p$(p_gnat)
+	dh_gencontrol -p$(p_gnat) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_gnat)
+	dh_md5sums -p$(p_gnat)
+	dh_builddeb -p$(p_gnat)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+
+
+ada_info_dir = $(d_gnatd)/$(PF)/share/info
+
+$(binary_stamp)-ada-doc: $(build_html_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_gnatd)
+	dh_installdirs -p$(p_gnatd) \
+		$(PF)/share/info
+
+	cd $(ada_info_dir) && \
+	    makeinfo -I $(srcdir)/gcc/doc/include -I $(srcdir)/gcc/ada \
+		-I $(builddir)/gcc \
+		-o gnat_ugn_unw-$(GNAT_VERSION).info \
+		$(builddir)/gcc/doc/gnat_ugn_unw.texi
+	cd $(ada_info_dir) && \
+	    makeinfo -I $(srcdir)/gcc/doc/include -I $(srcdir)/gcc/ada \
+		-I $(builddir)/gcc \
+		-o gnat_rm-$(GNAT_VERSION).info \
+		$(srcdir)/gcc/ada/gnat_rm.texi
+	cd $(ada_info_dir) && \
+	    makeinfo -I $(srcdir)/gcc/doc/include -I $(srcdir)/gcc/ada \
+		-I $(builddir)/gcc \
+		-o gnat-style-$(GNAT_VERSION).info \
+		$(srcdir)/gcc/ada/gnat-style.texi
+
+	dh_installdocs -p$(p_gnatd) \
+	    html/gnat_ugn_unw.html html/gnat_rm.html html/gnat-style.html
+	dh_installchangelogs -p$(p_gnatd)
+	dh_compress -p$(p_gnatd)
+	dh_fixperms -p$(p_gnatd)
+	dh_installdeb -p$(p_gnatd)
+	dh_gencontrol -p$(p_gnatd) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_md5sums -p$(p_gnatd)
+	dh_builddeb -p$(p_gnatd)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
--- gcj-4.2-4.2-20070707.orig/debian/rules.d/binary-pascal.mk
+++ gcj-4.2-4.2-20070707/debian/rules.d/binary-pascal.mk
@@ -0,0 +1,100 @@
+arch_binaries  := $(arch_binaries) pascal
+indep_binaries := $(indep_binaries) pascal-doc
+
+p_gpc	= gpc$(gpc_pkg_ver)
+p_gpcd	= gpc$(gpc_pkg_ver)-doc
+
+d_gpc	= debian/$(p_gpc)
+d_gpcd	= debian/$(p_gpcd)
+
+dirs_gpc = \
+	$(docdir)/$(p_base)/pascal \
+	$(PF)/bin \
+	$(gcc_lexec_dir) \
+	$(gcc_lib_dir)/{include,units} \
+	$(PF)/share/man/man1
+ifeq ($(with_gpidump),yes)
+  files_gpc = \
+	$(PF)/bin/{binobj,gpc,gpc-run,gpidump}$(gpc_pkg_ver) \
+	$(PF)/share/man/man1/{binobj,gpc,gpc-run,gpidump}$(gpc_pkg_ver).1 \
+	$(gcc_lexec_dir)/gpc1 \
+	$(gcc_lib_dir)/{libgpc.a,units} \
+	$(gcc_lib_dir)/include/gpc-in-c.h
+else
+  files_gpc = \
+	$(PF)/bin/{binobj,gpc,gpc-run}$(gpc_pkg_ver) \
+	$(PF)/share/man/man1/{binobj,gpc,gpc-run}$(gpc_pkg_ver).1 \
+	$(gcc_lexec_dir)/gpc1 \
+	$(gcc_lib_dir)/{libgpc.a,units} \
+	$(gcc_lib_dir)/include/gpc-in-c.h
+endif
+
+# ----------------------------------------------------------------------
+$(binary_stamp)-pascal: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_gpc)
+	dh_installdirs -p$(p_gpc) $(dirs_gpc)
+
+	rm -f $(d)/$(PF)/bin/pc $(d)/$(PF)/share/man/man1/pc.1
+	DH_COMPAT=2 dh_movefiles -p$(p_gpc) $(files_gpc)
+
+	debian/dh_doclink -p$(p_gpc) $(p_base)
+	cp -p $(srcdir)/gcc/p/{AUTHORS,FAQ,NEWS,README} \
+		$(d_gpc)/$(docdir)/$(p_base)/pascal/.
+	cp -p $(srcdir)/gcc/p/test/README \
+		$(d_gpc)/$(docdir)/$(p_base)/pascal/README.gpc-test
+	cp -p $(srcdir)/gcc/p/ChangeLog \
+		$(d_gpc)/$(docdir)/$(p_base)/pascal/changelog
+
+#	ln -sf ../$(p_gpc)/examples $(d_gpcd)/$(docdir)/$(p_gpcd)/examples
+#	ln -sf ../$(p_gpc)/docdemos $(d_gpcd)/$(docdir)/$(p_gpcd)/docdemos
+
+	dh_strip -p$(p_gpc)
+	dh_compress -p$(p_gpc)
+	dh_fixperms -p$(p_gpc)
+	dh_shlibdeps -p$(p_gpc)
+	dh_gencontrol -p$(p_gpc) -- -v$(DEB_GPC_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_gpc)
+	dh_md5sums -p$(p_gpc)
+	dh_builddeb -p$(p_gpc)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+
+# ----------------------------------------------------------------------
+$(binary_stamp)-pascal-doc: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_gpcd)
+	dh_installdirs -p$(p_gpcd) \
+		$(docdir)/$(p_base)/pascal \
+		$(PF)/share/info
+	DH_COMPAT=2 dh_movefiles -p$(p_gpcd) \
+		$(PF)/share/info/gpc*$(gpc_pkg_ver)*info*
+	debian/dh_doclink -p$(p_gpcd) $(p_base)
+	dh_installdocs -p$(p_gpcd) 
+	rm -f $(d_gpcd)/$(docdir)/$(p_base)/copyright
+	cp -p html/gpc.html html/gpcs.html \
+		$(d_gpcd)/$(docdir)/$(p_base)/pascal/
+	mv $(d)/$(PF)/doc/gpc/demos \
+		$(d_gpcd)/$(docdir)/$(p_base)/pascal/examples
+	mv $(d)/$(PF)/doc/gpc/docdemos \
+		$(d_gpcd)/$(docdir)/$(p_base)/pascal/.
+
+#	-$(MAKE) -C $(builddir)/gcc gpc.ps
+#	cp -p $(builddir)/gcc/gpc.ps $(d_gpcd)/$(docdir)/$(p_base)/pascal/.
+
+	debian/dh_rmemptydirs -p$(p_gpcd)
+
+	dh_compress -p$(p_gpcd)
+	dh_fixperms -p$(p_gpcd)
+	dh_installdeb -p$(p_gpcd)
+	dh_gencontrol -p$(p_gpcd) -- -v$(DEB_GPC_VERSION) $(common_substvars)
+	dh_md5sums -p$(p_gpcd)
+	dh_builddeb -p$(p_gpcd)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
--- gcj-4.2-4.2-20070707.orig/debian/rules.d/binary-libgccmath.mk
+++ gcj-4.2-4.2-20070707/debian/rules.d/binary-libgccmath.mk
@@ -0,0 +1,141 @@
+ifeq ($(with_libgmath),yes)
+  arch_binaries  := $(arch_binaries) libgmath
+endif
+#ifeq ($(with_libgmathdev),yes)
+#  arch_binaries  := $(arch_binaries) libgmathdev
+#endif
+ifeq ($(with_lib64gmath),yes)
+  arch_binaries  := $(arch_binaries) lib64gmath
+endif
+ifeq ($(with_lib32gmath),yes)
+  arch_binaries	:= $(arch_binaries) lib32gmath
+endif
+
+p_gmath		= libgccmath$(GCCMATH_SONAME)
+p_l32gmath	= lib32gccmath$(GCCMATH_SONAME)
+p_l64gmath	= lib64gccmath$(GCCMATH_SONAME)
+p_gmathd	= libgccmath$(GCCMATH_SONAME)-dev
+
+d_gmath		= debian/$(p_gmath)
+d_l32gmath	= debian/$(p_l32gmath)
+d_l64gmath	= debian/$(p_l64gmath)
+d_gmathd	= debian/$(p_gmathd)
+
+dirs_gmath = \
+	$(docdir) \
+	$(PF)/$(libdir)
+files_gmath = \
+	$(PF)/$(libdir)/libgcc-math.so.*
+
+dirs_gmathd = \
+	$(docdir)/$(p_base)
+ifeq ($(with_libgmath),yes)
+files_gmathd = \
+	$(PF)/$(libdir)/libgcc-math.{a,so,la}
+endif
+
+ifeq ($(with_lib32gmath),yes)
+	dirs_gmathd  += $(lib32)
+	files_gmathd += $(lib32)/libgcc-math.{a,so,la}
+endif
+ifeq ($(with_lib64gmath),yes)
+	dirs_gmathd  += $(PF)/lib64
+	files_gmathd += $(PF)/lib64/libgcc-math.{a,so,la}
+endif
+
+$(binary_stamp)-libgmath: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+	rm -rf $(d_gmath)
+	dh_installdirs -p$(p_gmath) $(dirs_gmath)
+	DH_COMPAT=2 dh_movefiles -p$(p_gmath) $(files_gmath)
+	debian/dh_doclink -p$(p_gmath) $(p_base)
+	debian/dh_rmemptydirs -p$(p_gmath)
+	dh_strip -p$(p_gmath)
+	dh_compress -p$(p_gmath)
+	dh_fixperms -p$(p_gmath)
+	dh_makeshlibs -p$(p_gmath) -V '$(p_gmath) (>= $(DEB_GCCMATH_SOVERSION))'
+	dh_shlibdeps -p$(p_gmath)
+	dh_gencontrol -p$(p_gmath) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_gmath)
+	dh_md5sums -p$(p_gmath)
+	dh_builddeb -p$(p_gmath)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+
+# ----------------------------------------------------------------------
+$(binary_stamp)-libgmathdev: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_gmathd)
+	dh_installdirs -p$(p_gmathd) $(dirs_gmathd)
+	DH_COMPAT=2 dh_movefiles -p$(p_gmathd) $(files_gmathd)
+	debian/dh_doclink -p$(p_gmathd) $(p_base)
+	cp -p $(srcdir)/libgcc-math/ChangeLog \
+		$(d_gmathd)/$(docdir)/$(p_base)/changelog.libgcc-math
+	debian/dh_rmemptydirs -p$(p_gmathd)
+	dh_strip -p$(p_gmathd)
+	dh_compress -p$(p_gmathd)
+	dh_fixperms -p$(p_gmathd)
+	dh_shlibdeps -p$(p_gmathd)
+	dh_gencontrol -p$(p_gmathd) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_gmathd)
+	dh_md5sums -p$(p_gmathd)
+	dh_builddeb -p$(p_gmathd)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+
+# ----------------------------------------------------------------------
+$(binary_stamp)-lib64gmath: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_l64gmath)
+	dh_installdirs -p$(p_l64gmath) \
+		$(PF)/lib64
+	DH_COMPAT=2 dh_movefiles -p$(p_l64gmath) \
+		$(PF)/lib64/libgcc-math.so.*
+
+	debian/dh_doclink -p$(p_l64gmath) $(p_base)
+
+	dh_strip -p$(p_l64gmath)
+	dh_compress -p$(p_l64gmath)
+	dh_fixperms -p$(p_l64gmath)
+	dh_makeshlibs -p$(p_l64gmath) -V '$(p_l64gmath) (>= $(DEB_GCCMATH_SOVERSION))'
+#	dh_shlibdeps -p$(p_l64gmath)
+	dh_gencontrol -p$(p_l64gmath) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_l64gmath)
+	dh_md5sums -p$(p_l64gmath)
+	dh_builddeb -p$(p_l64gmath)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+
+# ----------------------------------------------------------------------
+$(binary_stamp)-lib32gmath: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_l32gmath)
+	dh_installdirs -p$(p_l32gmath) \
+		$(lib32)
+	DH_COMPAT=2 dh_movefiles -p$(p_l32gmath) \
+		$(lib32)/libgcc-math.so.*
+
+	debian/dh_doclink -p$(p_l32gmath) $(p_base)
+
+	dh_strip -p$(p_l32gmath)
+	dh_compress -p$(p_l32gmath)
+	dh_fixperms -p$(p_l32gmath)
+	dh_makeshlibs -p$(p_l32gmath) -V '$(p_l32gmath) (>= $(DEB_GCCMATH_SOVERSION))'
+	dh_shlibdeps -p$(p_l32gmath)
+	dh_gencontrol -p$(p_l32gmath) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_l32gmath)
+	dh_md5sums -p$(p_l32gmath)
+	dh_builddeb -p$(p_l32gmath)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
--- gcj-4.2-4.2-20070707.orig/debian/rules.d/binary-proto.mk
+++ gcj-4.2-4.2-20070707/debian/rules.d/binary-proto.mk
@@ -0,0 +1,43 @@
+arch_binaries  := $(arch_binaries) proto
+
+p_proto	= protoize
+d_proto	= debian/$(p_proto)
+
+dirs_proto = \
+	$(docdir) \
+	$(PF)/share/man/man1 \
+	$(PF)/bin
+files_proto = \
+	$(PF)/bin/{protoize,unprotoize} \
+	$(PF)/share/man/man1/{protoize,unprotoize}.1
+
+# ----------------------------------------------------------------------
+$(binary_stamp)-proto: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_proto)
+	dh_installdirs -p$(p_proto) $(dirs_proto)
+
+ifeq ($(versioned_packages),yes)
+	: # rename versioned files back to unversioned ones.
+	for i in protoize unprotoize; do \
+	  mv $(d)/$(PF)/bin/$$i$(pkg_ver) $(d)/$(PF)/bin/$$i; \
+	done
+endif
+	$(IR) debian/protoize.1 $(d)/$(PF)/share/man/man1/
+	ln -sf protoize.1 $(d)/$(PF)/share/man/man1/unprotoize.1
+	DH_COMPAT=2 dh_movefiles -p$(p_proto) $(files_proto)
+
+	debian/dh_doclink -p$(p_proto) $(p_base)
+	dh_strip -p$(p_proto)
+	dh_compress -p$(p_proto)
+	dh_fixperms -p$(p_proto)
+	dh_shlibdeps -p$(p_proto)
+	dh_gencontrol -p$(p_proto) -- -v$(DEB_EVERSION) $(common_substvars)
+	dh_installdeb -p$(p_proto)
+	dh_md5sums -p$(p_proto)
+	dh_builddeb -p$(p_proto)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
--- gcj-4.2-4.2-20070707.orig/debian/rules.d/binary-cpp.mk
+++ gcj-4.2-4.2-20070707/debian/rules.d/binary-cpp.mk
@@ -0,0 +1,90 @@
+arch_binaries  := $(arch_binaries) cpp
+ifneq ($(GFDL_INVARIANT_FREE),yes)
+  indep_binaries := $(indep_binaries) cpp-doc
+endif
+
+dirs_cpp = \
+	$(docdir) \
+	$(PF)/share/man/man1 \
+	$(PF)/bin \
+	$(gcc_lexec_dir)
+
+files_cpp = \
+	$(PF)/bin/cpp$(pkg_ver) \
+	$(gcc_lexec_dir)/cc1
+
+ifneq ($(GFDL_INVARIANT_FREE),yes)
+  files_cpp += \
+	$(PF)/share/man/man1/cpp$(pkg_ver).1
+endif
+
+# ----------------------------------------------------------------------
+$(binary_stamp)-cpp: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_cpp)
+	dh_installdirs -p$(p_cpp) $(dirs_cpp)
+	DH_COMPAT=2 dh_movefiles -p$(p_cpp) $(files_cpp)
+
+ifeq ($(with_common_gcclibdir),yes)
+	ln -sf $(BASE_VERSION) \
+	    $(d_cpp)/$(subst /$(BASE_VERSION),/$(GCC_VERSION),$(gcc_lib_dir))
+  ifneq ($(gcc_lib_dir),$(gcc_lexec_dir))
+	ln -sf $(BASE_VERSION) \
+	    $(d_cpp)/$(subst /$(BASE_VERSION),/$(GCC_VERSION),$(gcc_lexec_dir))
+  endif
+endif
+
+	ln -sf cpp$(pkg_ver) \
+	    $(d_cpp)/$(PF)/bin/$(DEB_TARGET_GNU_TYPE)-cpp$(pkg_ver)
+	ln -sf cpp$(pkg_ver) \
+	    $(d_cpp)/$(PF)/bin/$(TARGET_ALIAS)-cpp$(pkg_ver)
+ifneq ($(GFDL_INVARIANT_FREE),yes)
+	ln -sf cpp$(pkg_ver).1 \
+	    $(d_cpp)/$(PF)/share/man/man1/$(DEB_TARGET_GNU_TYPE)-cpp$(pkg_ver).1
+	ln -sf cpp$(pkg_ver).1 \
+	    $(d_cpp)/$(PF)/share/man/man1/$(TARGET_ALIAS)-cpp$(pkg_ver).1
+endif
+
+	debian/dh_doclink -p$(p_cpp) $(p_base)
+	debian/dh_rmemptydirs -p$(p_cpp)
+
+	dh_strip -p$(p_cpp)
+	dh_compress -p$(p_cpp)
+	dh_fixperms -p$(p_cpp)
+	dh_shlibdeps -p$(p_cpp)
+	dh_gencontrol -p$(p_cpp) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_cpp)
+	dh_md5sums -p$(p_cpp)
+	dh_builddeb -p$(p_cpp)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
+
+# ----------------------------------------------------------------------
+$(binary_stamp)-cpp-doc: $(build_html_stamp) $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_cppd)
+	dh_installdirs -p$(p_cppd) \
+		$(docdir)/$(p_base) \
+		$(PF)/share/info
+	DH_COMPAT=2 dh_movefiles -p$(p_cppd) \
+		$(PF)/share/info/cpp*
+
+	debian/dh_doclink -p$(p_cppd) $(p_base)
+	dh_installdocs -p$(p_cppd) html/cpp.html html/cppinternals.html
+	rm -f $(d_cppd)/$(docdir)/$(p_base)/copyright
+	debian/dh_rmemptydirs -p$(p_cppd)
+
+	dh_compress -p$(p_cppd)
+	dh_fixperms -p$(p_cppd)
+	dh_installdeb -p$(p_cppd)
+	dh_gencontrol -p$(p_cppd) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_md5sums -p$(p_cppd)
+	dh_builddeb -p$(p_cppd)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
--- gcj-4.2-4.2-20070707.orig/debian/rules.d/binary-objcxx-cross.mk
+++ gcj-4.2-4.2-20070707/debian/rules.d/binary-objcxx-cross.mk
@@ -0,0 +1,35 @@
+arch_binaries := $(arch_binaries) objcxx
+
+p_objcx	= gobjc++$(pkg_ver)$(cross_bin_arch)
+d_objcx	= debian/$(p_objcx)
+
+dirs_objcx = \
+	$(docdir) \
+	$(gcc_lib_dir)
+
+files_objcx = \
+	$(gcc_lib_dir)/cc1objplus
+
+$(binary_stamp)-objcxx: $(install_stamp)
+	dh_testdir
+	dh_testroot
+	mv $(install_stamp) $(install_stamp)-tmp
+
+	rm -rf $(d_objcx)
+	dh_installdirs -p$(p_objcx) $(dirs_objcx)
+	DH_COMPAT=2 dh_movefiles -p$(p_objcx) $(files_objcx)
+
+	debian/dh_doclink -p$(p_objcx) $(p_base)
+	debian/dh_rmemptydirs -p$(p_objcx)
+
+	dh_strip -p$(p_objcx)
+	dh_compress -p$(p_objcx)
+
+	dh_fixperms -p$(p_objcx)
+	dh_shlibdeps -p$(p_objcx)
+	dh_gencontrol -p$(p_objcx) -- -v$(DEB_VERSION) $(common_substvars)
+	dh_installdeb -p$(p_objcx)
+	dh_md5sums -p$(p_objcx)
+	dh_builddeb -p$(p_objcx)
+
+	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
--- gcj-4.2-4.2-20070707.orig/debian/gij-BV.prerm
+++ gcj-4.2-4.2-20070707/debian/gij-BV.prerm
@@ -0,0 +1,12 @@
+#! /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@
+
+#DEBHELPER#
+
+exit 0
--- gcj-4.2-4.2-20070707.orig/debian/libstdc++CXX-BV-doc.doc-base
+++ gcj-4.2-4.2-20070707/debian/libstdc++CXX-BV-doc.doc-base
@@ -0,0 +1,13 @@
+Document: libstdc++@CXX@-@BV@-doc
+Title: The GNU Standard C++ Library v3 (gcc-@BV@)
+Author: Various
+Abstract: This package contains documentation files for the GNU stdc++ library.
+ One set is the distribution documentation, the other set is the
+ source documentation including a namespace list, class hierarchy,
+ alphabetical list, compound list, file list, namespace members,
+ compound members and file members.
+Section: Apps/Programming
+
+Format: html
+Index: /usr/share/doc/libstdc++@CXX@-@BV@-doc/libstdc++/html_user/index.html
+Files: /usr/share/doc/libstdc++@CXX@-@BV@-doc/libstdc++/html*/*
--- gcj-4.2-4.2-20070707.orig/debian/gcj-BV.overrides
+++ gcj-4.2-4.2-20070707/debian/gcj-BV.overrides
@@ -0,0 +1 @@
+gcj-@BV@: wrong-name-for-upstream-changelog
--- gcj-4.2-4.2-20070707.orig/debian/logwatch.sh
+++ gcj-4.2-4.2-20070707/debian/logwatch.sh
@@ -0,0 +1,104 @@
+#! /bin/sh
+
+# script to trick the build daemons and output something, if there is
+# still test/build activity
+
+# $1: primary file to watch. if there is activity on this file, we do nothing
+# $2+: files to watch to look for activity despite no output in $1
+#      if the files are modified or are newly created, then the message
+#      is printed on stdout.
+#      if nothing is modified, don't output anything (so the buildd timeout
+#      hits).
+
+pidfile=logwatch.pid
+timeout=3600
+message='\nlogwatch still running\n'
+
+usage()
+{
+    echo >&2 "usage: `basename $0` [-p <pidfile>] [-t <timeout>] [-m <message>]"
+    echo >&2 "           <logfile> [<logfile> ...]"
+    exit 1
+}
+
+while [ $# -gt 0 ]; do
+    case $1 in
+    -p)
+	pidfile=$2
+	shift
+	shift
+	;;
+    -t)
+	timeout=$2
+	shift
+	shift
+	;;
+    -m)
+	message="$2"
+	shift
+	shift
+	;;
+    -*)
+	usage
+	;;
+    *)
+	break
+    esac
+done
+
+[ $# -gt 0 ] || usage
+
+logfile="$1"
+shift
+otherlogs="$@"
+
+cleanup()
+{
+    rm -f $pidfile
+    exit 0
+}
+
+#trap cleanup 0 1 3 15
+
+echo $$ > $pidfile
+
+update()
+{
+    _logvar=$1
+    _othervar=$2
+
+    # logfile may not exist yet
+    if [ -r $logfile ]; then
+	_logtail="`tail -10 $logfile | md5sum` $f"
+    else
+	_logtail="does not exist: $logfile"
+    fi
+    eval $_logvar="'$_logtail'"
+
+    _othertails=''
+    for f in $otherlogs; do
+	if [ -r $f ]; then
+	    _othertails="$_othertails `tail -10 $f | md5sum` $f"
+	else
+	    _othertails="$_othertails does not exist: $f"
+	fi
+    done
+    eval $_othervar="'$_othertails'"
+}
+
+update logtail othertails
+while true; do
+    sleep $timeout
+    update newlogtail newothertails
+    if [ "$logtail" != "$newlogtail" ]; then
+	# there is still action in the primary logfile. do nothing.
+	logtail="$newlogtail"
+    elif [ "$othertails" != "$newothertails" ]; then
+	# there is still action in the other log files, so print the message
+	/bin/echo -e $message
+	othertails="$newothertails"
+    else
+	# nothing changed in the other log files. maybe a timeout ...
+	:
+    fi
+done
--- gcj-4.2-4.2-20070707.orig/debian/libgcjLGCJ.postrm
+++ gcj-4.2-4.2-20070707/debian/libgcjLGCJ.postrm
@@ -0,0 +1,9 @@
+#! /bin/sh -e
+
+case "$1" in
+    remove|purge)
+	rm -f /var/lib/gcj-@BV@/classmap.db
+	rmdir --ignore-fail-on-non-empty /var/lib/gcj-@BV@ 2>&1 || true
+esac
+
+#DEBHELPER#
--- gcj-4.2-4.2-20070707.orig/debian/lib64stdc++CXX.postinst
+++ gcj-4.2-4.2-20070707/debian/lib64stdc++CXX.postinst
@@ -0,0 +1,12 @@
+#! /bin/sh -e
+
+case "$1" in
+    configure)
+	docdir=/usr/share/doc/lib64stdc++@CXX@
+	if [ -d $docdir ] && [ ! -h $docdir ]; then
+	    rm -rf $docdir
+	    ln -s gcc-@BV@-base $docdir
+	fi
+esac
+
+#DEBHELPER#
--- gcj-4.2-4.2-20070707.orig/debian/cpp-BV-doc.postinst
+++ gcj-4.2-4.2-20070707/debian/cpp-BV-doc.postinst
@@ -0,0 +1,12 @@
+#! /bin/sh -e
+
+case "$1" in
+    configure)
+	install-info --quiet --section "Development" "Development" \
+	    /usr/share/info/cpp-@BV@.info.gz
+
+	install-info --quiet --section "Development" "Development" \
+	    /usr/share/info/cppinternals-@BV@.info.gz
+esac
+
+#DEBHELPER#
--- gcj-4.2-4.2-20070707.orig/debian/watch
+++ gcj-4.2-4.2-20070707/debian/watch
@@ -0,0 +1,2 @@
+version=2
+ftp://gcc.gnu.org/pub/gcc/releases/gcc-(4\.2[\d\.]*)	4.2.0	uupdate
--- gcj-4.2-4.2-20070707.orig/debian/README.gnat
+++ gcj-4.2-4.2-20070707/debian/README.gnat
@@ -0,0 +1,8 @@
+If you want to develop Ada programs and libraries on Debian, please
+read the Debian Policy for Ada:
+
+http://www.ada-france.org/debian/debian-ada-policy.html
+
+The default Ada compiler is and always will be the package `gnat'.
+Debian contains many programs and libraries compiled with it, which
+are all ABI-compatible.
--- gcj-4.2-4.2-20070707.orig/debian/gfortran-BV-doc.doc-base
+++ gcj-4.2-4.2-20070707/debian/gfortran-BV-doc.doc-base
@@ -0,0 +1,14 @@
+Document: gfortran-@BV@
+Title: The GNU Fortran Compiler 
+Author: Various
+Abstract: This manual documents how to run, install and port `gfortran',
+ as well as its new features and incompatibilities, and how to report bugs.
+Section: Apps/Programming
+
+Format: html
+Index: /usr/share/doc/gcc-@BV@-base/fortran/gfortran.html
+Files: /usr/share/doc/gcc-@BV@-base/fortran/gfortran.html
+
+Format: info
+Index: /usr/share/info/gfortran-@BV@.info.gz
+Files: /usr/share/info/gfortran-@BV@*
--- gcj-4.2-4.2-20070707.orig/debian/gpc-PV-BV-doc.doc-base.gpc
+++ gcj-4.2-4.2-20070707/debian/gpc-PV-BV-doc.doc-base.gpc
@@ -0,0 +1,15 @@
+Document: gpc-@PV@-@BV@-doc
+Title: The GNU Pascal Compiler
+Author: Various
+Abstract: This manual documents how to run, install and maintain the
+ GNU Pascal compiler (GPC), as well as its new features and
+ incompatibilities, and how to report bugs.
+Section: Apps/Programming
+
+Format: html
+Index: /usr/share/doc/gcc-@BV@-base/pascal/gpc.html
+Files: /usr/share/doc/gcc-@BV@-base/pascal/gpc.html
+
+Format: info
+Index: /usr/share/info/gpc-@PV@-@BV@.info.gz
+Files: /usr/share/info/gpc-@PV@-@BV@*
--- gcj-4.2-4.2-20070707.orig/debian/relink
+++ gcj-4.2-4.2-20070707/debian/relink
@@ -0,0 +1,74 @@
+#! /bin/sh
+#
+# Relink GNAT utilities using the shared library
+#
+
+set -e
+
+pwd=`pwd`
+
+# why?
+chmod a-w build/gcc/ada/rts/*.ali
+
+rm -rf tmp
+ln -s $pwd/build/gcc/ada/rts/libgnat.so.1 tmp/libgnat.so
+
+LD_LIBRARY_PATH=$pwd/tmp
+export LD_LIBRARY_PATH
+
+PATH=$pwd/debian:$pwd/tmp:$PATH
+export PATH
+
+echo "#! /bin/sh" > tmp/dgcc
+echo "$pwd/build/gcc/xgcc -B$pwd/build/gcc/ "'"$@"' >> tmp/dgcc
+chmod 755 tmp/dgcc
+
+echo "#! /bin/sh" > tmp/dgnatlink
+echo "$pwd/build/gcc/gnatlink --GCC=dgcc "'"$@"' >> tmp/dgnatlink
+chmod 755 tmp/dgnatlink
+
+GMCMD="$pwd/build/gcc/gnatmake -I- -Irts -I. -a -m --GNATBIND=$pwd/build/gcc/gnatbind --GNATLINK=dgnatlink --GCC=dgcc"
+
+#cd $pwd/build/gcc/ada
+#make CFLAGS="-O2" CC="../xgcc -B../" STAGE_PREFIX=../ a-link.o a-gmem.o
+#cd $pwd
+
+[ -f build/gcc/gnatmake.old ] || cp -p build/gcc/gnatmake build/gcc/gnatmake.old
+[ -f build/gcc/gnatlink.old ] || cp -p build/gcc/gnatlink build/gcc/gnatlink.old
+
+make -C build/gcc/ada \
+	CFLAGS='-gnatp -gnata -O2 ' \
+	ADA_INCLUDES="-I." \
+	CC="../xgcc -B../" \
+	STAGE_PREFIX=../ \
+    ../gnatmake ../gnatlink
+
+mv gnatmake bgnatmake
+mv gnatlink bgnatlink
+exit 0
+
+cd build/gcc/ada
+for i in ../gnatchop ../gnatcmd \
+    ../gnatkr ../gnatlbr \
+    ../gnatls ../gnatmake \
+    ../gnatprep ../gnatpsys \
+    ../gnatxref ../gnatfind
+do
+  rm -f $i
+  $GMCMD -O2 -gnatp -o $i `basename $i`.adb -largs -L..
+done
+
+rm -f ../gnatmem
+$GMCMD -O2 -gnatp -o ../gnatmem gnatmem.adb -largs -L.. a-gmem.o
+$GMCMD -O2 -gnatp -o ../gnatlink gnatlink -largs -L.. a-link.o
+rm -f ../gnatpsta
+
+make CFLAGS="-O2" CC="../xgcc -B../" a-gettty.o a-deftar.o
+$GMCMD -O2 -gnatp -o ../gnatpsta gnatpsta -largs -L.. a-gettty.o a-deftar.o
+rm -f ../gnatbl
+
+make CFLAGS="-O2" CC="../xgcc -B../" gnatbl.o
+../xgcc -B../ -o ../gnatbl gnatbl.o -L.. -lgnat
+rm -f ../bgnatmake ../bgnatlink ../debian/dgcc ../debian/dgnatlink
+
+chmod +w rts/*.ali
--- gcj-4.2-4.2-20070707.orig/debian/gcc-BV-hppa64.postinst
+++ gcj-4.2-4.2-20070707/debian/gcc-BV-hppa64.postinst
@@ -0,0 +1,13 @@
+#! /bin/sh -e
+
+prio=$(echo @BV@ | sed 's/\.//g')
+
+update-alternatives --quiet \
+	--install /usr/bin/hppa64-linux-gnu-gcc \
+		hppa64-linux-gnu-gcc \
+		/usr/bin/hppa64-linux-gnu-gcc-@BV@ \
+		$prio
+
+#DEBHELPER#
+
+exit 0
--- gcj-4.2-4.2-20070707.orig/debian/rules.defs
+++ gcj-4.2-4.2-20070707/debian/rules.defs
@@ -0,0 +1,1118 @@
+# -*- makefile -*-
+# definitions used in more than one Makefile / rules file
+
+SHELL		= /bin/bash -e	# brace expansion used in rules file
+PWD		:= $(shell pwd)
+srcdir		= $(PWD)/src
+builddir	= $(PWD)/build
+builddir_hppa64	= $(PWD)/build-hppa64
+builddir_ia6432	= $(PWD)/build-ia6432
+stampdir	= stamps
+distribution	:= $(shell lsb_release -is)
+
+# architecture dependent variables
+DEB_BUILD_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+DEB_HOST_ARCH		?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_GNU_CPU	?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
+DEB_HOST_GNU_SYSTEM	?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
+DEB_HOST_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+
+ifdef GCC_TARGET
+DEB_TARGET_ARCH = $(GCC_TARGET)
+else
+# allow debian/target to be used instead of GCC_TARGET - this was requested
+# by toolchain-source maintainer
+DEBIAN_TARGET_FILE := $(strip $(shell cat debian/target 2>/dev/null))
+ifneq ($(DEBIAN_TARGET_FILE),)
+DEB_TARGET_ARCH := $(DEBIAN_TARGET_FILE)
+else
+DEB_TARGET_ARCH = $(DEB_HOST_ARCH)
+endif
+endif
+
+ifdef DEB_TARGET_ARCH
+
+DEB_TARGET_ARCH		?= $(shell dpkg-architecture -f \
+			-a$(DEB_TARGET_ARCH) -qDEB_HOST_ARCH 2>/dev/null)
+DEB_TARGET_ARCH_OS	?= $(shell dpkg-architecture -f \
+			-a$(DEB_TARGET_ARCH) -qDEB_HOST_ARCH_OS 2>/dev/null)
+DEB_TARGET_ARCH_CPU	?= $(shell dpkg-architecture -f \
+			-a$(DEB_TARGET_ARCH) -qDEB_HOST_ARCH_CPU 2>/dev/null)
+
+DEB_TARGET_GNU_CPU	?= $(shell dpkg-architecture -f \
+			-a$(DEB_TARGET_ARCH) -qDEB_HOST_GNU_CPU 2>/dev/null)
+DEB_TARGET_GNU_SYSTEM	?= $(shell dpkg-architecture -f \
+			-a$(DEB_TARGET_ARCH) -qDEB_HOST_GNU_SYSTEM 2>/dev/null)
+DEB_TARGET_GNU_TYPE	?= $(shell dpkg-architecture -f \
+			-a$(DEB_TARGET_ARCH) -qDEB_HOST_GNU_TYPE 2>/dev/null)
+
+else ifdef DEB_TARGET_GNU_TYPE
+
+DEB_TARGET_ARCH		?= $(shell dpkg-architecture -f \
+			-t$(DEB_TARGET_GNU_TYPE) -qDEB_HOST_ARCH 2>/dev/null)
+DEB_TARGET_ARCH_OS	?= $(shell dpkg-architecture -f \
+			-t$(DEB_TARGET_GNU_TYPE) -qDEB_HOST_ARCH_OS 2>/dev/null)
+DEB_TARGET_ARCH_CPU	?= $(shell dpkg-architecture -f \
+			-t$(DEB_TARGET_GNU_TYPE) -qDEB_HOST_ARCH_CPU 2>/dev/null)
+
+DEB_TARGET_GNU_CPU	?= $(shell dpkg-architecture -f \
+			-t$(DEB_TARGET_GNU_TYPE) -qDEB_HOST_GNU_CPU 2>/dev/null)
+DEB_TARGET_GNU_SYSTEM	?= $(shell dpkg-architecture -f \
+			-t$(DEB_TARGET_GNU_TYPE) -qDEB_HOST_GNU_SYSTEM 2>/dev/null)
+DEB_TARGET_GNU_TYPE	?= $(shell dpkg-architecture -f \
+			-t$(DEB_TARGET_GNU_TYPE) -qDEB_HOST_GNU_TYPE 2>/dev/null)
+
+endif
+
+# ---------------------------------------------------------------------------
+# full canadian
+# typical cross-compiler
+# reverse cross (built to run on the target)
+# native
+#
+# build != host && host == target : reverse cross (REVERSE_CROSS == yes)
+# build == host && host != target : typical cross (DEB_CROSS == yes)
+# build != host && host != target : canadian (DEB_CROSS == yes)
+# build == host && host == target : native
+ifneq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+ ifneq ($(DEB_HOST_GNU_TYPE), $(DEB_TARGET_GNU_TYPE))
+	DEB_CROSS = yes
+ else
+ 	REVERSE_CROSS = yes
+ endif
+ else
+ ifneq ($(DEB_HOST_GNU_TYPE), $(DEB_TARGET_GNU_TYPE))
+	DEB_CROSS = yes
+ endif  
+endif
+
+# ---------------------------------------------------------------------------
+# which binary packages are built?
+
+# cross compiler support. If GCC_TARGET is set, then it's the architecture
+# we build for.
+
+ifeq ($(DEB_TARGET_ARCH),)
+$(error GCC_TARGET value "$(GCC_TARGET)" is not a valid Debian architecture)
+endif
+
+ifdef DEB_CROSS
+  # TP: Target Prefix. Used primarily as a prefix for cross tool
+  #     names (e.g. powerpc-linux-gcc).
+  # TS: Target Suffix. Used primarily at the end of cross compiler
+  #     package names (e.g. gcc-powerpc).
+  # LS: Library Suffix. Used primarily at the end of cross compiler
+  #     library package names (e.g. libgcc-powerpc-cross).
+  DEB_TARGET_ALIAS ?= $(DEB_TARGET_GNU_TYPE)
+  TP = $(DEB_TARGET_GNU_TYPE)-
+  TS = -$(DEB_TARGET_ALIAS)
+  LS = -$(DEB_TARGET_ARCH)-cross
+endif
+
+ifeq ($(DEB_CROSS),yes)
+  TARGET_ALIAS := $(DEB_TARGET_ALIAS)
+else
+  TARGET_ALIAS := $(DEB_TARGET_GNU_TYPE)
+
+  ifeq ($(TARGET_ALIAS),i386-gnu)
+    TARGET_ALIAS := i586-gnu
+  endif
+
+  #ifeq ($(TARGET_ALIAS),i486-linux-gnu)
+  #  TARGET_ALIAS := i686-linux-gnu
+  #endif
+
+  TARGET_ALIAS := $(subst i386,i486,$(TARGET_ALIAS))
+
+  # configure as linux-gnu, not linux
+  #ifeq ($(findstring linux,$(TARGET_ALIAS))/$(findstring linux-gnu,$(TARGET_ALIAS)),linux/)
+  #  TARGET_ALIAS := $(TARGET_ALIAS)-gnu
+  #endif
+
+  # configure as linux, not linux-gnu
+  #TARGET_ALIAS := $(subst linux-gnu,linux,$(TARGET_ALIAS))
+endif
+
+printarch:
+	@echo DEB_TARGET_ARCH: $(DEB_TARGET_ARCH)
+	@echo DEB_TARGET_ARCH_OS: $(DEB_TARGET_ARCH_OS)
+	@echo DEB_TARGET_ARCH_CPU: $(DEB_TARGET_ARCH_CPU)
+	@echo DEB_TARGET_ARCH_CPU: $(DEB_TARGET_ARCH_CPU)
+	@echo DEB_TARGET_GNU_SYSTEM: $(DEB_TARGET_GNU_SYSTEM)
+	@echo TARGET_ALIAS: $(TARGET_ALIAS)
+	@echo TP: $(TP)
+	@echo TS: $(TS)
+
+# The name of the source package
+PKGSOURCE := $(shell dpkg-parsechangelog | awk '/^Source:/ {print $$2;exit 0}')
+
+ifneq ($(PKGSOURCE),gcc-snapshot)
+  versioned_packages := yes
+endif
+
+ifdef DEB_CROSS
+  cross_bin_arch := -$(TARGET_ALIAS)
+  cross_lib_arch := -$(DEB_TARGET_ARCH)-cross
+endif
+
+ifndef DEB_CROSS
+  ifneq ($(PKGSOURCE),gcc-snapshot)
+    with_common_gcclibdir := yes
+  endif
+endif
+
+# Don't include docs with GFDL invariant sections --------------------
+GFDL_INVARIANT_FREE := yes
+ifeq ($(distribution),Ubuntu)
+  GFDL_INVARIANT_FREE=no
+endif
+GFDL_INVARIANT_FREE=no
+
+# --------------------
+# Configuration of components
+
+# common things --------------------
+# build common packages, where package names don't differ in different
+# gcc versions (fixincludes, libgcj-common) ...
+with_common_pkgs := yes
+
+# ... and some libraries, which do not change (libgcc1, libffi2, libg2c,
+# libmudflap, libssp0).
+with_common_libs := yes
+
+#ifeq ($(distribution),Debian)
+#  next_gcc_not_built := alpha m68k mips mipsel hurd-i386 kfreebsd-i386 kfreebsd-amd64
+#  ifneq (,$(filter $(DEB_TARGET_ARCH),$(next_gcc_not_built)))
+#    with_common_pkgs := yes
+#    with_common_libs := yes
+#  endif
+#endif
+#ifeq ($(distribution),Ubuntu)
+#  with_common_pkgs := yes
+#  with_common_libs := yes
+#endif
+
+with_gccbase := yes
+with_dev := yes
+
+with_source := no
+ifneq (,$(findstring gcc-4,$(PKGSOURCE)))
+  with_source := yes
+endif
+ifneq (,$(findstring source,$(WITHOUT_LANG)))
+  with_source := disabled by environment
+endif
+
+ifeq ($(PKGSOURCE),gcc-snapshot)
+  with_nls := no
+else
+  with_nls := yes
+endif
+
+ifeq (nls, $(findstring nls,$(WITHOUT_LANG)))
+  with_nls := disabled by environment
+endif
+
+ifneq ($(WITH_BOOTSTRAP),)
+  # "yes" is the default and causes a 3-stage bootstrap.
+  # "no" means to just build the first stage, and not create the stage1
+  # directory.
+  # "lean" means a lean 3-stage bootstrap, i.e. delete each stage when no
+  # longer needed.
+  with_bootstrap=$(WITH_BOOTSTRAP)
+endif
+
+# separate -base package for the cross compiler.
+ifeq ($(DEB_CROSS),yes)
+  with_gccxbase := yes
+endif
+
+#no_dummy_cpus := ia64 i386 hppa s390 sparc
+#with_base_only := yes
+#ifneq (, $(filter $(DEB_TARGET_ARCH_CPU),$(no_dummy_cpus)))
+#  with_base_only := no
+#  with_common_libs := yes
+#  with_common_pkgs := yes
+#else
+#  with_common_libs := no
+#  with_common_pkgs := no
+#  with_dev := no
+#endif
+
+# C --------------------
+enabled_languages := c
+# Build all packages needed for C development
+ifeq ($(with_base_only),yes)
+  with_cdev := no
+else
+  ifeq ($(with_dev),yes)
+    with_cdev := yes
+  else
+    with_cdev := no
+  endif
+endif
+
+# C++ --------------------
+ifeq ($(with_base_only),yes)
+  with_cxx := no
+else
+  with_cxx := yes
+endif
+no_cxx_cpus := avr
+ifneq (, $(filter $(DEB_TARGET_ARCH_CPU),$(no_cxx_cpus)))
+  with_cxx := disabled for architecture $(DEB_TARGET_ARCH_CPU)
+endif
+ifeq (c++, $(findstring c++,$(subst obj-c++,,$(WITHOUT_LANG))))
+  with_cxx := disabled by environment
+endif
+# Build all packages needed for C++ development
+ifeq ($(with_cxx)-$(with_dev),yes-yes)
+  with_cxxdev := yes
+  with_libcxxdbg := yes
+else
+  with_cxxdev := no
+  with_libcxxdbg := no
+endif
+
+ifeq ($(with_cxx),yes)
+  enabled_languages += c++
+endif
+
+ifeq ($(with_common_pkgs)-$(with_cxx),yes-yes)
+  with_libcxx := yes
+#  ifeq ($(DEB_TARGET_ARCH_CPU),arm)
+#    with_libcxx := no
+#  endif
+else
+  with_libcxx := no
+endif
+
+# debugging versions of libstdc++
+ifeq ($(with_cxxdev),yes)
+  with_debug := yes
+else
+  with_debug := no
+endif
+debug_no_cpus :=
+ifneq (, $(filter $(DEB_TARGET_ARCH_CPU),$(debug_no_cpus)))
+    with_debug := disabled for architecure $(DEB_TARGET_ARCH_CPU)
+endif
+ifeq (debug, $(findstring debug,$(WITHOUT_LANG)))
+  with_debug := disabled by environment
+endif
+
+# Java --------------------
+# - To build a standalone gcj package (with no corresponding gcc
+#   package): with_separate_libgcj=yes, with_standalone_gcj=yes
+# - To build the java packages from the gcc source package:
+#   with_separate_libgcj=no, with_standalone_gcj=no
+# - To build gcc and java from separate sources:
+#   with_separate_libgcj=yes, with_standalone_gcj=no
+
+with_separate_libgcj := yes
+with_standalone_gcj := no
+
+# java converted for V3 C++ ABI for some archs
+ifeq ($(with_base_only),yes)
+  with_java := no
+else
+  with_java := yes
+endif
+
+java_no_cpus := #mips mipsel
+java_no_arches := armel
+java_no_systems := hurd-i386 knetbsd-gnu netbsdelf-gnu
+gcj_native_archs = alpha amd64 i386 ia64 m68k mips mipsel powerpc s390 sparc
+
+ifneq (, $(filter $(DEB_TARGET_ARCH_CPU),$(java_no_cpus)))
+  with_java := disabled for architecture $(DEB_TARGET_ARCH_CPU)
+endif
+ifneq (, $(filter $(DEB_TARGET_GNU_SYSTEM),$(java_no_systems)))
+  with_java := disabled for $(DEB_TARGET_GNU_SYSTEM)
+endif
+ifneq (, $(filter $(DEB_TARGET_ARCH),$(java_no_arches)))
+  with_java := disabled for $(DEB_TARGET_ARCH)
+endif
+ifeq ($(DEB_TARGET_ARCH),hurd-i386)
+  java_no_systems += hurd-i386
+  with_java := disabled for architecure $(DEB_TARGET_ARCH_CPU)
+endif
+ifdef DEB_CROSS
+  with_java := disabled for cross compiler package
+endif
+ifeq (java, $(findstring java,$(WITHOUT_LANG)))
+  with_java := disabled by environment
+endif
+ifneq ($(with_cxx),yes)
+  with_java := disabled, because C++ disabled: $(with_cxx)
+endif
+
+ifneq (,$(filter $(DEB_TARGET_ARCH),hppa))
+  with_native_ecj := yes
+endif
+
+with_java_maintainer_mode := yes
+with_java_maintainer_mode := no
+
+# used as well in debian/rules.conf to determine the build deps
+java_awt_peers = gtk # qt # xlib
+
+with_libgcjbc := no
+ifeq ($(distribution),Ubuntu)
+  with_pkg_plugin := yes
+endif
+
+with_libgcj_doc := yes
+
+# Build all packages needed for Java development (gcj, libgcj-dev)
+ifeq ($(with_java)-$(with_dev),yes-yes)
+  with_javadev := yes
+  with_gcj := yes
+else
+  with_javadev := no
+endif
+
+ifeq ($(with_java),yes)
+  with_java_alsa := yes
+  with_java_plugin := yes
+  ifneq (,$(filter $(DEB_TARGET_GNU_SYSTEM), kfreebsd-gnu))
+    with_java_alsa := no
+  endif
+endif
+
+ifeq ($(with_java),yes)
+  enabled_languages += java
+  with_libgcj := yes
+else
+  with_libgcj := no
+endif
+
+# libmudflap -------------------
+with_libmudflap := yes
+ifeq (mudflap, $(findstring mudflap,$(WITHOUT_LANG)))
+  with_libmudflap := disabled by environment
+endif
+ifneq ($(with_common_libs),yes)
+  with_libmudflap := no
+endif
+
+# libssp -------------------
+with_ssp := yes
+ifdef DEB_CROSS
+  ssp_no_archs = arm armel alpha hppa ia64 m68k mips mipsel hurd-i386
+endif
+ssp_no_archs = alpha hppa ia64 m68k mips mipsel hurd-i386
+ifneq (, $(filter $(DEB_TARGET_ARCH),$(ssp_no_archs)))
+  with_ssp := not available on $(DEB_TARGET_ARCH)
+endif
+ifeq (ssp, $(findstring ssp,$(WITHOUT_LANG)))
+  with_ssp := disabled by environment
+endif
+
+ifeq ($(with_ssp),yes)
+  ifneq ($(distribution),Debian)
+    ifneq (,$(findstring gcc-4, $(PKGSOURCE)))
+      with_ssp_default := yes
+    endif
+  endif
+endif
+
+# do it here, the information is only available after gcc is configured
+ifeq ($(with_common_libs),yes)
+  ifeq ($(with_ssp),yes)
+    with_libssp := $(shell if grep -qs '^\#define TARGET_LIBC_PROVIDES_SSP 1' $(builddir)/gcc/auto-host.h; then echo 'libc provides ssp'; else echo 'yes'; fi)
+  endif
+endif
+
+# libffi -------------------
+ifeq ($(with_common_libs),yes)
+  with_libffi := yes
+  no_ffi_cpus :=
+  no_ffi_arches := armel
+  no_ffi_systems := netbsdelf-gnu
+  ifneq ($(with_java),yes)
+    ifneq (, $(filter $(DEB_TARGET_ARCH_CPU),$(no_ffi_cpus)))
+      with_libffi := disabled for architecure $(DEB_TARGET_ARCH_CPU)
+    endif
+    ifneq (, $(filter $(DEB_TARGET_ARCH),$(no_ffi_arches)))
+      with_libffi := disabled for architecure $(DEB_TARGET_ARCH)
+    endif
+    ifneq (, $(filter $(DEB_TARGET_GNU_SYSTEM),$(no_ffi_systems)))
+      with_libffi := disabled for $(DEB_TARGET_GNU_SYSTEM)
+    endif
+    ifeq (ffi, $(findstring ffi,$(WITHOUT_LANG)))
+      with_libffi := disabled by environment
+    endif
+  endif
+  ifdef DEB_CROSS
+    with_libffi := disabled for cross compiler package
+  endif
+endif
+
+# Fortran 95 --------------------
+ifeq ($(with_base_only),yes)
+  with_fortran := no
+else
+  with_fortran := yes
+endif
+
+f95_no_cpus :=
+ifneq (, $(filter $(DEB_TARGET_ARCH_CPU),$(f95_no_cpus)))
+    with_fortran := disabled for architecure $(DEB_TARGET_ARCH_CPU)
+endif
+ifdef DEB_CROSS
+  with_fortran := disabled for cross compiler package
+endif
+ifeq (f95, $(findstring f95,$(WITHOUT_LANG)))
+  with_fortran := disabled by environment
+endif
+ifeq (fortran, $(findstring fortran,$(WITHOUT_LANG)))
+  with_fortran := disabled by environment
+endif
+
+# Build all packages needed for Fortran development
+ifeq ($(with_fortran)-$(with_dev),yes-yes)
+  with_fdev := yes
+else
+  with_fdev := no
+endif
+
+ifeq ($(with_common_libs)-$(with_fortran),yes-yes)
+  with_libfortran := yes
+else
+  with_libfortran := no
+endif
+
+ifeq ($(with_fortran),yes)
+  enabled_languages += fortran
+endif
+
+# protoize --------------------
+ifeq ($(with_common_pkgs),yes)
+  with_proto := yes
+  ifdef DEB_CROSS
+    with_proto := disabled for cross compiler package
+  endif
+else
+  with_proto := no
+endif
+#ifeq ($(with_proto),yes)
+#  enabled_languages += proto
+#endif
+
+ifeq ($(with_common_pkgs),yes)
+  with_fixincl := yes
+  ifdef DEB_CROSS
+    with_fixincl := disabled for cross compiler package
+  endif
+else
+  with_fixincl := no
+endif
+
+# Pascal --------------------
+with_pascal := yes
+ifneq ($(with_dev),yes)
+  with_pascal := no
+endif
+
+#pascal_no_systems := netbsdelf-gnu
+#ifneq (, $(filter $(DEB_TARGET_GNU_SYSTEM),$(pascal_no_systems)))
+#  with_pascal := disabled for $(DEB_TARGET_GNU_SYSTEM)
+#endif
+ifneq ($(DEB_TARGET_ARCH),i386)
+  with_pascal := disabled for $(DEB_TARGET_ARCH)
+endif
+
+with_gpidump := yes
+ifneq (, $(filter $(DEB_TARGET_ARCH_CPU),mips mipsel))
+  with_gpidump := disabled for architecture $(DEB_TARGET_ARCH_CPU)
+endif
+pascal_version := 20030830
+ifeq (pascal, $(findstring pascal,$(WITHOUT_LANG)))
+  with_pascal := disabled by environment
+endif
+with_pascal := disabled for 4.2
+ifdef DEB_CROSS
+  with_pascal := disabled for cross compiler package
+endif
+ifeq ($(with_pascal),yes)
+  enabled_languages += pascal
+endif
+
+# ObjC --------------------
+ifeq ($(with_base_only),yes)
+  with_objc := no
+else
+  with_objc := yes
+endif
+# the ObjC runtime with garbage collection enabled needs the Boehm GC
+#with_objc_gc := yes
+
+# disable ObjC garbage collection library (needs libgc)
+libgc_no_cpus := avr #alpha amd64 arm armeb hppa i386 ia64 m68k mips mipsel powerpc s390 sparc
+libgc_no_systems := knetbsd-gnu
+ifneq (, $(filter $(DEB_TARGET_ARCH_CPU),$(libgc_no_cpus)))
+  with_objc_gc := disabled for architecture $(DEB_TARGET_ARCH_CPU)
+endif
+ifneq (, $(filter $(DEB_TARGET_GNU_SYSTEM),$(libgc_no_systems)))
+  with_objc_gc := disabled for $(DEB_TARGET_GNU_SYSTEM)
+endif
+ifdef DEB_CROSS
+  ifneq (objc, $(findstring objc,$(WITH_LANG)))
+    with_objc := disabled for cross compiler package
+  endif
+endif
+ifeq (objc, $(findstring objc,$(WITHOUT_LANG)))
+  with_objc := disabled by environment
+endif
+ifeq ($(DEB_TARGET_ARCH),armel)
+  with_objc := disabled for armel
+endif
+
+ifneq ($(with_objc),yes)
+  with_objc_gc := $(with_objc)
+endif
+
+# Build all packages needed for Objective-C development
+ifeq ($(with_objc)-$(with_dev),yes-yes)
+  with_objcdev := yes
+else
+  with_objcdev := no
+endif
+ifeq ($(with_common_libs)-$(with_objc),yes-yes)
+  with_libobjc := yes
+else
+  with_libobjc := no
+endif
+
+ifeq ($(with_objc),yes)
+  enabled_languages += objc
+endif
+
+# ObjC++ --------------------
+with_objcxx := yes
+ifeq (obj-c++, $(findstring obj-c++,$(WITHOUT_LANG)))
+  with_objcxx := disabled by environment
+endif
+ifeq ($(with_objcxx),yes)
+  ifneq ($(with_cxx)-$(with_objc),yes-yes)
+    with_objcxx := disabled, because C++ or ObjC disabled
+  endif
+endif
+
+ifeq ($(with_objcxx),yes)
+  enabled_languages += obj-c++
+endif
+
+# Ada --------------------
+with_separate_gnat := yes
+with_ada := yes
+ifneq ($(with_dev),yes)
+  with_ada := no
+endif
+
+ada_no_cpus := alpha arm armeb m32r m68k sh3 sh3eb sh4 sh4eb
+ada_no_systems := hurd-i386 knetbsd-gnu netbsdelf-gnu
+ifneq (, $(filter $(DEB_TARGET_ARCH_CPU),$(ada_no_cpus)))
+  with_ada := disabled for architecure $(DEB_TARGET_ARCH_CPU)
+endif
+ifneq (, $(filter $(DEB_TARGET_GNU_SYSTEM),$(ada_no_systems)))
+  with_ada := disabled for $(DEB_TARGET_GNU_SYSTEM)
+endif
+ifeq ($(DEB_TARGET_ARCH),hurd-i386)
+  with_ada := disabled for architecure $(DEB_TARGET_ARCH)
+endif
+ifeq (ada, $(findstring ada,$(WITHOUT_LANG)))
+  with_ada := disabled by environment
+endif
+ifdef DEB_CROSS
+  with_ada := disabled for cross compiler package
+endif
+#ifeq ($(PKGSOURCE),gcc-snapshot)
+#  with_ada := disabled for snapshot builds
+#endif
+ifneq (,$(findstring 4.2,$(PKGSOURCE)))
+  with_ada := disabled for gcc-4.2
+endif
+
+with_libgnat := $(with_ada)
+ifeq ($(with_ada),yes)
+  enabled_languages += ada
+  libada_shared_dual_cpus := hppa
+  ifneq (, $(filter $(DEB_TARGET_ARCH_CPU),$(libada_shared_dual_cpus)))
+    with_libgnat_shared_dual := yes
+  endif
+else
+  with_libgnat_shared_dual := no
+endif
+
+# treelang --------------------
+ifeq ($(with_base_only),yes)
+  with_treelang := no
+else
+  ifeq ($(with_dev),yes)
+    with_treelang := yes
+  else
+    with_treelang := no
+  endif
+endif
+#tl_no_cpus := powerpc
+ifneq (, $(filter $(DEB_TARGET_ARCH_CPU),$(tl_no_cpus)))
+    with_treelang := disabled for architecure $(DEB_TARGET_ARCH_CPU)
+endif
+ifdef DEB_CROSS
+  with_treelang := disabled for cross compiler package
+endif
+ifeq (treelang, $(findstring treelang,$(WITHOUT_LANG)))
+  with_treelang := disabled by environment
+endif
+#with_treelang := disabled for gcc-4.2
+
+ifeq ($(with_treelang),yes)
+  enabled_languages += treelang
+endif
+
+# Shared libgcc --------------------
+with_shared_libgcc := yes
+
+ifeq ($(with_common_libs),yes)
+  with_libgcc := yes
+else
+  with_libgcc := no
+  with_shared_libgcc := no
+endif
+
+# libgcc-math --------------------
+with_libgmath := no
+with_lib32gmath := no
+ifneq (,$(findstring i486,$(DEB_TARGET_ARCH)))
+  #with_gccmath := yes
+  #with_libgmath := yes
+  #with_libgmathdev := yes
+endif
+ifeq ($(DEB_TARGET_ARCH),amd64)
+  #with_gccmath := yes
+  #with_lib32gmath := yes
+  #with_libgmathdev := yes
+endif
+
+# libgomp --------------------
+with_libgomp := yes
+
+# hppa64 build --------------------
+with_hppa64 := no
+ifeq ($(DEB_TARGET_ARCH),hppa)
+  ifneq ($(DEB_CROSS),yes)
+    with_hppa64 := yes
+  endif
+  #ifeq ($(PKGSOURCE),gcc-snapshot)
+  #  with_hppa64 := disabled for snapshot build
+  #endif
+endif
+
+# run testsuite --------------------
+with_check := yes
+# If you don't want to run the gcc testsuite, set `with_check' to `no'
+#with_check := disabled by hand
+ifeq ($(with_base_only),yes)
+  with_check := no
+endif
+ifdef DEB_CROSS
+  with_check := disabled for cross compiler package
+endif
+ifdef REVERSE_CROSS
+  with_check := disabled for reverse cross build
+endif
+check_no_systems := hurd-i386
+ifneq (, $(filter $(DEB_TARGET_GNU_SYSTEM),$(check_no_systems)))
+  with_check := disabled for $(DEB_TARGET_GNU_SYSTEM)
+endif
+check_no_cpus := m68k
+ifeq ($(DEB_TARGET_ARCH_CPU), $(findstring $(DEB_TARGET_ARCH_CPU),$(check_no_cpus)))
+  with_check := disabled for architecure $(DEB_TARGET_ARCH_CPU)
+endif
+ifeq ($(DEB_TARGET_ARCH),hurd-i386)
+  with_check := disabled for architecure $(DEB_TARGET_ARCH)
+endif
+ifneq ($(WITHOUT_CHECK),)
+  with_check := disabled by environment
+endif
+
+locale_data = generate
+
+# powerpc nof libraries --------------------
+with_libnof := no
+
+# multiarch --------------------
+#with_multiarch_inc := yes
+#with_multiarch_lib := no
+
+all_enabled_languages := $(enabled_languages)
+languages_without_lang_opt := c++ objc obj-c++ proto
+
+ifeq ($(with_separate_libgcj),yes)
+  ifneq (,$(findstring gcc-4, $(PKGSOURCE)))
+    enabled_languages := $(filter-out java, $(all_enabled_languages))
+    debian_extra_langs = java
+    with_java := built from separate source
+    with_gcj := built from separate source
+    with_libgcj := built from separate source
+  endif
+  ifneq (,$(findstring gcj, $(PKGSOURCE)))
+    enabled_languages = c c++ java
+    debian_extra_langs := $(filter-out $(enabled_languages) $(languages_without_lang_opt), $(all_enabled_languages))
+    ifneq ($(with_standalone_gcj),yes)
+      with_libgcc := no
+    endif
+    with_libgccmath := no
+    with_cxx := no
+    with_cdev := no
+    with_cxxdev := no
+    with_fortran := no
+    with_proto := no
+    with_fixincl := no
+    with_pascal := no
+    with_libmudflap := no
+    with_libffi := no
+    with_libssp := no
+    with_libgomp := no
+    with_objc := no
+    with_libobjc := no
+    with_objcxx := no
+    with_ada := no
+    with_libgnat := no
+    with_treelang := no
+    with_hppa64 := no
+    with_libnof := no
+    with_debug := no
+    with_gccbase := no
+    ifeq ($(with_standalone_gcj),yes)
+      ifeq ($(DEB_TARGET_ARCH),hppa)
+        with_libgcc := yes
+      endif
+    endif
+  endif
+endif
+
+ifeq ($(with_separate_gnat),yes)
+  ifneq (,$(findstring gcc-4, $(PKGSOURCE)))
+    enabled_languages := $(filter-out ada, $(enabled_languages))
+    debian_extra_langs += ada
+    with_ada := built from separate source
+    with_libgnat := built from separate source
+  endif
+  ifneq (,$(findstring gnat, $(PKGSOURCE)))
+    enabled_languages = c ada
+    debian_extra_langs := $(filter-out $(enabled_languages) $(languages_without_lang_opt), $(all_enabled_languages))
+    with_ada := yes
+    with_libgnat := yes
+    with_libgcc := no
+    with_cxx := no
+    with_cdev := no
+    with_cxxdev := no
+    with_fortran := no
+    with_proto := no
+    with_fixincl := no
+    with_pascal := no
+    with_libmudflap := no
+    with_libffi := no
+    with_libssp := no
+    with_libgomp := no
+    with_objc := no
+    with_libobjc := no
+    with_objcxx := no
+    with_java := no
+    with_gcj := no
+    with_libgcj := no
+    with_treelang := no
+    with_hppa64 := no
+    with_libnof := no
+    with_debug := no
+    with_gccbase := no
+  endif
+endif
+
+debian_extra_langs := $(subst obj-c++,objcp,$(debian_extra_langs))
+export debian_extra_langs
+
+biarch := no
+
+with_lib64gcc		:= no
+with_lib64cxx		:= no
+with_lib64objc		:= no
+with_lib64ffi		:= no
+with_lib64gcj		:= no
+with_lib64fortran	:= no
+with_lib64mudflap	:= no
+with_lib64ssp		:= no
+
+biarch_map := i486=x86_64 powerpc=powerpc64 sparc=sparc64 s390=s390x \
+		x86_64=i486 powerpc64=powerpc
+biarch_cpu := $(patsubst $(DEB_TARGET_GNU_CPU)=%,%, \
+			 $(filter $(DEB_TARGET_GNU_CPU)=%,$(biarch_map)))
+
+biarch_archs := /i386/powerpc/sparc/s390/
+ifeq (biarch, $(findstring biarch,$(WITHOUT_LANG)))
+  biarch_archs :=
+endif
+ifneq (,$(findstring /$(DEB_TARGET_ARCH)/,$(biarch_archs)))
+  biarch := yes
+  biarchsubdir = $(biarch_cpu)-$(DEB_TARGET_GNU_SYSTEM)
+  biarchsubdir = 64
+  ifeq ($(with_libgcc),yes)
+    with_lib64gcc := yes
+  endif
+  ifeq ($(with_libcxx),yes)
+    with_lib64cxx := yes
+  endif
+  ifeq ($(with_libcxxdbg),yes)
+    with_lib64cxxdbg := yes
+  endif
+  ifeq ($(with_libobjc),yes)
+    with_lib64objc := yes
+  endif
+  ifeq ($(with_libfortran),yes)
+    with_lib64fortran := yes
+  endif
+  ifeq ($(with_libffi),yes)
+    with_lib64ffi := yes
+  endif
+  ifeq ($(with_libmudflap),yes)
+    with_lib64mudflap := yes
+  endif
+  ifeq ($(with_libssp),yes)
+    with_lib64ssp := yes
+  endif
+  ifeq ($(with_libgomp),yes)
+    with_lib64gomp:= yes
+  endif
+
+  biarch_multidir_names = libiberty libstdc++-v3 libgfortran libmudflap \
+	libssp libffi libobjc libgomp
+
+  ifeq ($(with_libgcj),yes)
+    # lib64asound2-dev needed
+    with_java_biarch_awt := yes
+    biarch_multidir_names += boehm-gc libjava zlib
+    #with_java64 := yes
+  endif
+
+  export biarch_multidir_names
+
+  TARGET32_MACHINE := $(TARGET_ALIAS)
+  TARGET64_MACHINE := $(strip $(subst $(DEB_TARGET_GNU_CPU),$(biarch_cpu), \
+					$(TARGET_ALIAS)))
+  export TARGET32_MACHINE
+  export TARGET64_MACHINE
+endif
+
+biarch32_archs := /amd64/ppc64/kfreebsd-amd64/
+ifeq (biarch, $(findstring biarch,$(WITHOUT_LANG)))
+  biarch32_archs :=
+endif
+ifneq (,$(findstring /$(DEB_TARGET_ARCH)/,$(biarch32_archs)))
+  biarch32 := yes
+  biarchsubdir = $(biarch_cpu)-$(DEB_TARGET_GNU_SYSTEM)
+  biarchsubdir = 32
+  ifeq ($(with_libgcc),yes)
+    with_lib32gcc := yes
+  endif
+  ifeq ($(with_libcxx),yes)
+    with_lib32cxx := yes
+  endif
+  ifeq ($(with_libcxxdbg),yes)
+    with_lib32cxxdbg := yes
+  endif
+  ifeq ($(with_libobjc),yes)
+    with_lib32objc := yes
+  endif
+  ifeq ($(with_libfortran),yes)
+    with_lib32fortran := yes
+  endif
+  ifeq ($(with_libffi),yes)
+    with_lib32ffi := yes
+  endif
+  ifeq ($(with_libmudflap),yes)
+    with_lib32mudflap := yes
+  endif
+  ifeq ($(with_libssp),yes)
+    with_lib32ssp := yes
+  endif
+  ifeq ($(with_libgomp),yes)
+    with_lib32gomp:= yes
+  endif
+
+  biarch_multidir_names = libiberty libstdc++-v3 libgfortran libmudflap \
+	libssp libffi libobjc libgomp zlib
+
+  ifeq ($(with_libgcj),yes)
+    # lib32asound2-dev needed
+    with_java_biarch_awt := yes
+    biarch_multidir_names += boehm-gc libjava zlib
+    with_java32 := yes
+  endif
+
+  export biarch_multidir_names
+
+  TARGET32_MACHINE := $(strip $(subst $(DEB_TARGET_GNU_CPU),$(biarch_cpu), \
+					$(TARGET_ALIAS)))
+  TARGET64_MACHINE := $(TARGET_ALIAS)
+  export TARGET32_MACHINE
+  export TARGET64_MACHINE
+endif
+
+multilib_archs = $(sort $(subst /, , $(biarch_archs) $(biarch32_archs)))
+
+#ifeq ($(DEB_TARGET_ARCH),ia64)
+#  biarch32 := yes
+#endif
+
+ifeq ($(PKGSOURCE),gcc-snapshot)
+  #ifeq ($(DEB_TARGET_ARCH),$(findstring $(DEB_TARGET_ARCH),sparc))
+    with_lib64gcc	:= no
+    with_lib64cxx	:= no
+    with_lib64objc	:= no
+    with_lib64ffi	:= no
+    with_lib64gcj	:= no
+    with_lib64fortran	:= no
+    with_lib64mudflap	:= no
+    with_lib64ssp	:= no
+
+    with_lib32gcc	:= no
+    with_lib32cxx	:= no
+    with_lib32objc	:= no
+    with_lib32ffi	:= no
+    with_lib32gcj	:= no
+    with_lib32fortran	:= no
+    with_lib32mudflap	:= no
+    with_lib32ssp	:= no
+
+    #biarch   	:= disabled for snapshot build
+    #biarch32 	:= disabled for snapshot build
+  #endif
+endif
+
+ifdef DEB_CROSS_NO_BIARCH
+  with_lib64gcc		:= no
+  with_lib64cxx		:= no
+  with_lib64objc	:= no
+  with_lib64ffi		:= no
+  with_lib64gcj		:= no
+  with_lib64fortran	:= no
+  with_lib64mudflap	:= no
+  with_lib64ssp		:= no
+
+  with_lib32gcc		:= no
+  with_lib32cxx		:= no
+  with_lib32objc	:= no
+  with_lib32ffi		:= no
+  with_lib32gcj		:= no
+  with_lib32fortran	:= no
+  with_lib32mudflap	:= no
+  with_lib32ssp		:= no
+
+  biarch   	:= disabled for cross build
+  biarch32 	:= disabled for cross build
+endif
+
+ifeq ($(biarch32),yes)
+  with_32bit_check := $(shell CC="gcc -m32" bash debian/runcheck.sh)
+endif
+
+ifeq ($(biarch),yes)
+  with_64bit_check := $(shell CC="gcc -m64" bash debian/runcheck.sh)
+endif
+
+# GNU locales
+force_gnu_locales := yes
+locale_no_systems := gnu knetbsd-gnu netbsdelf-gnu
+ifneq (, $(filter $(DEB_TARGET_GNU_SYSTEM),$(locale_no_systems)))
+  force_gnu_locales := disabled for $(DEB_TARGET_GNU_SYSTEM)
+endif
+
+gcc_tarpath		:= $(firstword $(wildcard gcc-*.tar.* /usr/src/gcc-4.2/gcc-*.tar.*))
+gcc_tarball		:= $(notdir $(gcc_tarpath))
+gcc_srcdir		:= $(shell echo $(gcc_tarball) | sed 's/\.tar.*//;s/-dfsg//')
+gcj_tarpath		:= $(firstword $(wildcard gcj-ecj-*.tar.* /usr/src/gcc-4.1/gcj-ecj-*.tar.*))
+gcj_tarball		:= $(notdir $(gcj_tarpath))
+
+ifeq ($(with_pascal),yes)
+  gpc_tarpath		:= $(firstword $(wildcard gpc-*.tar.* /usr/src/gcc-4.2/gpc-*.tar.*))
+  gpc_tarball		:= $(notdir $(gpc_tarpath)
+  gpc_srcdir		:= $(shell echo $(gpc_tarball) | sed 's/\.tar.*//')
+endif
+
+unpack_stamp		:= $(stampdir)/01-unpack-stamp
+patch_stamp		:= $(stampdir)/02-patch-stamp
+control_stamp		:= $(stampdir)/03-control-stamp
+configure_stamp		:= $(stampdir)/04-configure-stamp
+build_stamp		:= $(stampdir)/05-build-stamp
+build_html_stamp	:= $(stampdir)/05-build-html-stamp
+build_locale_stamp	:= $(stampdir)/05-build-locale-stamp
+build_doxygen_stamp	:= $(stampdir)/05-build-doxygen-stamp
+build_javadoc_stamp	:= $(stampdir)/05-build-javadoc-stamp
+check_stamp		:= $(stampdir)/06-check-stamp
+check_inst_stamp	:= $(stampdir)/06-check-inst-stamp
+install_stamp		:= $(stampdir)/07-install-stamp
+install_snap_stamp	:= $(stampdir)/07-install-snap-stamp
+binary_stamp		:= $(stampdir)/08-binary-stamp
+
+configure_dummy_stamp	:= $(stampdir)/04-configure-dummy-stamp
+build_dummy_stamp	:= $(stampdir)/05-build-dummy-stamp
+install_dummy_stamp	:= $(stampdir)/07-install-dummy-stamp
+
+configure_hppa64_stamp	:= $(stampdir)/04-configure-hppa64-stamp
+build_hppa64_stamp	:= $(stampdir)/05-build-hppa64-stamp
+install_hppa64_stamp	:= $(stampdir)/07-install-hppa64-stamp
+
+configure_ia6432_stamp	:= $(stampdir)/04-configure-ia6432-stamp
+build_ia6432_stamp	:= $(stampdir)/05-build-ia6432-stamp
+install_ia6432_stamp	:= $(stampdir)/07-install-ia6432-stamp
+
+configure_ia6432_stamp	:= $(stampdir)/04-configure-ia6432-stamp
+build_ia6432_stamp	:= $(stampdir)/05-build-ia6432-stamp
+install_ia6432_stamp	:= $(stampdir)/07-install-ia6432-stamp
+
+ifeq ($(PKGSOURCE),gcc-snapshot)
+    control_dependencies = $(patch_stamp)
+    configure_dependencies = $(configure_stamp)
+    build_dependencies = $(build_stamp)
+    ifeq ($(with_check),yes)
+      build_dependencies += check
+    endif
+    install_dependencies = $(install_snap_stamp)
+else
+  ifeq ($(with_base_only),yes)
+    control_dependencies = $(patch_stamp)
+    configure_dependencies = $(configure_dummy_stamp)
+    build_dependencies = $(build_dummy_stamp)
+    install_dependencies = $(install_dummy_stamp)
+  else
+    control_dependencies = $(patch_stamp)
+    configure_dependencies = $(configure_stamp)
+    build_dependencies = $(build_stamp)
+    ifeq ($(with_check),yes)
+      build_dependencies += check
+    endif
+    install_dependencies = $(install_stamp)
+  endif
+endif
+
+ifeq ($(with_hppa64),yes)
+  build_dependencies += $(build_hppa64_stamp)
+  ifneq ($(PKGSOURCE),gcc-snapshot)
+    install_dependencies += $(install_hppa64_stamp)
+  endif
+endif
+
+ifeq ($(with_ia6432),yes)
+  build_dependencies += $(build_ia6432_stamp)
+endif
+
+ifeq ($(with_ia6432),yes)
+  build_dependencies += $(build_ia6432_stamp)
+endif
+
+stamp-dir:
+	mkdir -p $(stampdir)
--- gcj-4.2-4.2-20070707.orig/debian/FAQ.gcj
+++ gcj-4.2-4.2-20070707/debian/FAQ.gcj
@@ -0,0 +1,494 @@
+The GCJ FAQ
+===========
+
+      The latest version of this document is always available at
+      http://gcc.gnu.org/java/faq.html.
+
+        General Questions
+
+            What license is used for libgcj?
+            How can I report a bug in libgcj?
+            How can I contribute to libgcj
+            Is libgcj part of GCC?
+            Will gcj and libgcj work on my machine?
+            How can I debug my Java program?
+            Can I interface byte-compiled and native java code?
+
+
+        Java Feature Support
+
+            What Java API's are supported? How complete is
+              the support?
+            Does GCJ support using straight C native methods
+              ala JNI?
+            Why does GCJ use CNI?
+            What is the state of AWT support?
+            How about support for Swing ?
+            What support is there for RMI ?
+            Can I use any code from other OpenSource projects
+              to supplement libgcj's current features ?
+            What features of the Java language are/arn't supported
+
+
+        Build Issues
+
+            I need something more recent than the last release; how
+                  should I build it?
+            Linker bug on Solaris
+            Can I configure/build in the source tree?
+            My libgcj build fails with "invalid use of undefined type
+                  struct sigcontext_struct"
+
+
+        Gcj Compile/Link Questions
+
+            Why do I get undefined reference to `main' errors?
+            Can GCJ only handle source code?
+            "gcj -C" Doesn't seem to work like javac/jikes. Whats going on?
+            Where does GCJ look for files?
+            How does gcj resolve wether to compile .class or .java files?
+            I'm getting link errors!
+            I'm getting 'undefined symbol: __dso_handle'
+
+
+        Runtime Questions
+
+            My program is dumping core! What's going on?
+            When I run the debugger I get a SEGV in the GC! What's going on?
+            I have just compiled and benchmarked my Java application
+            and it seems to be running slower than than XXX JIT JVM. Is there
+            anything I can do to make it go faster?
+            Can I profile Garbage Collection?
+            How do I increase the runtime's initial and maximum heap sizes?
+            How can I profile my application?
+            My program seems to hang and doesn't produce any output
+
+
+        Programming Issues
+
+            Are there any examples of how to use CNI?
+            Is it possible to invoke GCJ compiled Java code from a
+            C++ application?
+
+General Questions
+=================
+
+      1.1 What license is used for libgcj?
+
+          libgcj is distributed under the GPL, with the 'libgcc exception'.
+          This means that linking with libgcj does not by itself cause
+          your program to fall under the GPL.  See LIBGCJ_LICENSE in
+          the source tree for more details.
+
+      1.2 How can I report a bug in libgcj?
+
+          libgcj has a corresponding Gnats bug database which you can
+          browse. You can also submit new bug reports from the Gnats
+          page.
+
+      1.3 How can I contribute to libgcj?
+
+          You can send simple bug fixes in as patches. Please follow
+          the GCC guidelines for submitting patches. For more complex
+          changes, you must sign copyright over to the Free Software
+          Foundation. See the contribution page for details.
+
+      1.4 Is libgcj part of GCC?
+
+          Yes, libgcj is now part of GCC. It can be downloaded,
+          configured and built as one single tree.
+
+      1.5 Will gcj and libgcj work on my machine?
+
+          Gcj and libgcj are known to work more or less with IA-32 and
+          Sparc Solaris, Tru64 Unix, as well as IA-32, IA-64, Alpha,
+          and PowerPC Linux. They might work on other
+          systems. Generally speaking, porting to a new system should
+          not be hard. This would be a good way to volunteer.
+
+      1.6 How can I debug my Java program?
+
+          gdb 5.0 includes support for debugging gcj-compiled Java
+          programs. For more information please read Java Debugging
+          with gdb.
+
+      1.7 Can I interface byte-compiled and native java code
+
+          libgcj has a bytecode interpreter that allows you to mix
+          .class files with compiled code. It works pretty
+          transparently: if a compiled version of a class is not found
+          in the application binary or linked shared libraries, the
+          class loader will search for a bytecode version in your
+          classpath, much like a VM would. Be sure to build libgcj
+          with the --enable-interpreter option to enable this
+          functionality.
+
+          The program "gij" provides a front end to the interpreter
+          that behaves much like a traditional virtual machine. You
+          can even use "gij" to run a shared library which is compiled
+          from java code and contains a main method:
+
+          $ gcj -shared -o lib-HelloWorld.so HelloWorld.java
+          $ gij HelloWorld
+
+          This works because gij uses Class.forName, which knows how
+          to load shared objects.
+
+Java Feature Support
+====================
+
+      2.1 What Java API's are supported? How complete is
+        the support?
+
+          Matt Welsh writes:
+
+            Just look in the 'libjava' directory of libgcj and see
+            what classes are there. Most GUI stuff isn't there yet,
+            that's true, but many of the other classes are easy to add
+            if they don't yet exist.
+
+            I think it's important to stress that there is a big
+            difference between Java and the many libraries which Java
+            supports. Unfortunately, Sun's promise of "write once, run
+            everywhere" assumes much more than a JVM: you also need
+            the full set of JDK libraries. Considering that new Java
+            APIs come out every week, it's going to be impossible to
+            track everything.
+
+            To make things worse, you can't simply run Sun's JDK
+            classes on any old JVM -- they assume that a bunch of
+            native methods are also defined. Since this native method
+            requirement isn't defined by the JDK specs, you're
+            effectively constrained to using Sun's JVMs if you want to
+            use Sun's JDK libraries. Oh yes -- you could also
+            reimplement all of those native methods yourself, and make
+            sure they behave exactly as Sun's do. Note that they're
+            undocumented!
+
+      2.2 Does GCJ support using straight C native methods
+         ala JNI?
+
+          Yes. libgcj now has experimental support for JNI, in
+          addition to its native Compiled Native Interface (CNI). gcjh
+          will generate JNI stubs and headers using the "-jni"
+          option. However, we do prefer CNI: it is more efficient,
+          easier to write, and (at least potentially) easier to debug.
+
+      2.3 Why does GCJ use CNI?
+
+          Per Bothner explains:
+
+            We use CNI because we think it is a better solution,
+            especially for a Java implementation that is based on the
+            idea that Java is just another programming language that
+            can be implemented using standard compilation
+            techniques. Given that, and the idea that languages
+            implemented using Gcc should be compatible where it makes
+            sense, it follows that the Java calling convention should
+            be as similar as practical to that used for other
+            languages, especially C++, since we can think of Java as a
+            subset of C++. CNI is just a set of helper functions and
+            conventions built on the idea that C++ and Java have the
+            *same* calling convention and object layout; they are
+            binary compatible. (This is a simplification, but close
+            enough.)
+
+      2.4 What is the state of AWT support?
+
+          Work is in progress to implement AWT and Java2D. We intend
+          to support both GTK and xlib peers written using CNI. Some
+          components are already working atop the xlib peers.
+
+      2.5 How about support for Swing?
+
+          Once AWT support is working then Swing support can be
+          considered. There is at least one free-software partial
+          implementations of Swing that may be usable.
+
+      2.6 What support is there for RMI?
+
+         RMI code exists on the CVS trunk (aka gcc 3.1), but it has
+         not been heavily tested.  This code was donated by
+         Transvirtual Technologies.
+
+      2.7 Can I use any code from other OpenSource
+          projects to supplement libgcj's current features?
+
+           Certainly. However, in many cases, if you wanted to
+           contribute the code back into the official libgcj
+           distribution, we would require that the original author(s)
+           assign copyright to the Free Software Foundation.  As of
+           March 6, 2000, libgcj has been relicenced, and copyright
+           has been assigned to the FSF. This allows us to share and
+           merge much of the libgcj codebase with the Classpath
+           project.  Our eventual goal is for Classpath to be an
+           upstream source provider for libgcj, however it will be
+           some time before this becomes reality: libgcj and Classpath
+           have different implementations of many core java
+           classes. In order to merge them, we need to select the best
+           (most efficient, cleanest) implementation of each
+           method/class/package, resolve any conflicts created by the
+           merge, and test the final result.  Needless to say, this is
+           a lot of work. If you can help out, please let us know!
+
+      2.8 What features of the Java language are/aren't supported.
+
+          GCJ supports all Java language constructs as per the Java
+          language Specification.  Recent GCJ snapshots have added
+          support for most JDK1.1 (and beyond) language features,
+          including inner classes.
+
+Build Issues
+============
+
+      3.1 I need something more recent than the last release.
+          How should I build it?
+
+          Please read here: http://gcc.gnu.org/java/build-snapshot.html
+
+      3.2 Linker bug on Solaris
+
+          There is a known problem with the native Solaris linker when
+          using gcc/gcj. A good indication you've run into this
+          problem is if you get an error that looks like the following
+          when building libgcj:
+
+ld: warning: option -o appears more than once, first setting taken
+ld: fatal: file libfoo.so: cannot open file: No such file or directory
+ld: fatal: File processing errors. No output written to .libs/libfoo.so
+collect2: ld returned 1 exit status
+
+          A known workaround for this and other reported link problems
+          on the various releases of Solaris is to build gcc/gcj with
+          the latest GNU binutils instead of the native Solaris
+          ld. The most straightforward way to do this is to build and
+          install binutils, and then reference it in the configure for
+          gcc via --with-ld=/path_to_binutils_install/bin/ld
+          (--with-as may also be similarly specified but is not
+          believed to be required).
+
+          Please note, gcc/gcj must be built using GNU ld prior to
+          doing a clean build of libgcj!
+
+      3.3 Can I configure/build in the source tree?
+
+          No.  You cannot configure/build in the source tree.  If you
+          try, you'll see something like:
+
+              $ ./configure [...]
+              Configuring for a i686-pc-linux-gnu host.
+              *** Cannot currently configure in source tree.
+
+          Instead, you must build in another directory.  E.g.:
+
+              $ mkdir build
+              $ cd build
+              $ ../configure [...]
+
+      3.4 My libgcj build fails with "invalid use of undefined type
+          struct sigcontext_struct"
+
+          If you're using Linux, this probably means you need to
+          upgrade to a newwer, glibc (libc6) based Linux
+          distribution. libgcj does not support the older linux libc5.
+          It might be possible to get a working libgcj by changing
+          occurances of "sigcontext_struct" to "sigcontext", however
+          this has not been tested.  Even if it works, it is likely
+          that there are other issues with older libc versions that
+          would prevent libgcj from working correctly (threads bugs,
+          for example).
+
+Gcj Compile/Link Questions
+==========================
+
+      4.1 Why do I get undefined reference to `main' errors?
+
+          When using gcj to link a Java program, you must use the --main=
+          option to indicate the class that has the desired main method.
+          This is because every Java class can have a main method, thus
+          you have to tell gcj which one to use.
+
+      4.2 Can GCJ only handle source code?
+
+          GCJ will compile both source (.java) and bytecode (.class)
+          files. However, in many cases the native code produced by
+          compiling from source is better optimized than that compiled
+          from .class files.
+
+          Per Bothner explains:
+
+            The reason is that when you compile to bytecode you lose a
+            lot of information about program structure etc. That
+            information helps in generating better code. We can in
+            theory recover the information we need by analysing the
+            structure of the bytecodes, but it is sometimes difficult
+            - or sometimes it just that no-one has gotten around to
+            it.  Specific examples include loop structure (gcc
+            generates better code with explicit loops rather than with
+            the equivalent spaghetti code), array initializers, and
+            the JDK 1.1 `CLASS.class' syntax, all of which are
+            represented using more low-level constructs in bytecode.
+
+      4.3 "gcj -C" Doesn't seem to work like javac/jikes.  Whats going on?
+
+          The behavior of "gcj -C" is not at all like javac or jikes,
+          which will compile (not just scan) all .java's which are out
+          of date with regard to their .class's.
+
+      4.4 Where does GCJ look for files?
+
+          GCJ looks for classes to compile based on the CLASSPATH
+          environment variable. libgcj.jar and other files are found
+          relative to the path of the compiler itself, so it is safe
+          to move the entire compiler tree to a different path, and
+          there is no need to include libgcj.jar in your CLASSPATH.
+
+      4.5 How does gcj resolve whether to compile .class or .java files?
+
+          GCJ compiles only the files presented to it on the command
+          line. However, it also needs to scan other files in order to
+          determine the layout of other classes and check for errors
+          in your code.  For these dependencies, GCJ will favour
+          .class files if they are available because it is faster to
+          parse a class file than source code.
+
+      4.6 I'm getting link errors
+
+          If you get errors at link time that refer to 'undefined
+          reference to `java::lang::Object type_info function', verify
+          that you have compiled any CNI C++ files with the -fno-rtti
+          option. This is only required for versions of GCJ earlier
+          than 3.0.
+
+      4.7 I'm getting 'undefined symbol: __dso_handle'
+
+          Some versions of the GNU linker have broken support for the
+          '.hidden' directive, which results in problems with shared
+          libraries built with recent versions of gcc.
+
+          There are three solutions:
+
+            - downgrade to binutils that don't support .hidden at all,
+            - upgrade to a recent binutils, or
+            - undef the HAVE_GAS_HIDDEN definition in gcc's auto-host.h
+              (and rebuild gcc).
+
+Runtime Questions
+=================
+
+      5.1 My program is dumping core! What's going on?
+
+          It could be any number of things. One common mistake is
+          having your CLASSPATH environment variable pointing at a
+          third party's java.lang and friends. Either unset CLASSPATH,
+          or make sure it does not refer to core libraries other than
+          those found in libgcj.jar.Note that newwer versions of GCJ
+          will reject the core class library if it wasn't generated by
+          GCJ itself.
+
+      5.2 When I run the debugger I get a SEGV in the GC! What's going on?
+
+          This is "normal"; the Garbage Collector (GC) uses it to
+          determine stack boundaries. It is ordinarily caught and
+          handled by the GC -- you can see this in the debugger by
+          using cont to continue to the "real" segv.
+
+      5.3 I have just compiled and benchmarked my Java application
+          and it seems to be running slower than than XXX JIT JVM. Is there
+          anything I can do to make it go faster?
+
+        A few things:
+
+          - If your programs allocate many small, short lived objects,
+            the heap could be filling and triggering GC too
+            regularly. Try increasing the initial and maximum heap sizes
+            as per 5.5 How do I increase the runtime's initial and
+            maximum heap size?
+          - RE - array accesses. We have sub-optimal runtime checking
+            code, and the compiler is still not so smart about
+            automatically removing array checks. If your code is ready,
+            and it doesn't rely on them, try compiling with
+            --no-bounds-check.
+          - Try static linking.  On many platforms, dynamic (PIC)
+            function calls are more expensive than static ones. In
+            particular, the interaction with boehm-gc seems to incur
+            extra overhead when shared libraries are used.
+          - If your Java application doesn't need threads, try
+            building libgcj using --enable-threads=none. Portions of the
+            libgcj runtime are still more efficient when
+            single-threaded.
+
+       5.4 Can I profile Garbage Collection?
+
+          It is possible to turn on verbose GC output by supressing
+          the -DSILENT flag during build. One way to do this is to
+          comment out the line with #define SILENT 1 from
+          boehm-gc/configure before configuring libgcj.  The GC will
+          print collection statistics to stdout. (Rebuilding boehm-gc
+          alone without this flag doesn't seem to work.)
+
+      5.5 How do I increase the runtime's initial and maximum heap sizes?
+
+          Some programs that allocate many small, short-lived objects
+          can cause the default-sized heap to fill quickly and GC
+          often. With the 2.95.1 release there is no means to adjust
+          the heap at runtime. Recent snapshots provide the -ms and
+          -mx arguments to gij to specify the initial and maximum heap
+          sizes, respectively.
+
+      5.6 How can I profile my application?
+
+          Currently, only single threaded Java code may be used by the
+          profiler (gprof). POSIX threads seem to be incompatible with
+          the gmon stuff.  A couple of other tools that have been
+          mentioned on the GCJ mailing list are sprof and cprof.  The
+          former is part of GNU libc.
+
+      5.7 My program seems to hang and doesn't produce any output
+
+          Some versions had a bug in the iconv support. You can work
+          around it by setting LANG=en_US.UTF-8 at runtime, or give
+          the following option during compile time
+          -Dfile.encoding=UTF-8.  This problem should no longer occur
+          as of November 1, 2000.
+
+Programming Issues
+==================
+
+      6.1 Are there any examples of how to use CNI?
+
+          Glenn Chambers has created a couple of trivial examples for
+          version 2.95 and version 3.0.  As a comparison, here is the
+          same example as a JNI application using Kaffe.  The same
+          code will work with GCJ, as shown here.
+
+          Note that for version 2.95, you must compile the C++ files
+          used for CNI with the -fno-rtti option.  This constraint
+          does not apply in version 3.0 and later.
+
+          The primary source of documentation for CNI is at
+          http://gcc.gnu.org/java/papers/cni/t1.html
+
+      6.2 Is it possible to invoke GCJ compiled Java code from a
+          C++ application?
+
+          Yes, GCJ 3.1 supports a CNI-based invocation interface as
+          well as the traditional JNI invocation API.  See the GCJ
+          Manual for more details on how to use the CNI interface.
+
+Please send FSF & GNU inquiries & questions tognu@gnu.org.There are
+also other waysto contact the FSF.
+
+These pages are maintained by The GCC team.
+
+Please send comments on these web pages and GCC to our publicmailing
+list at gcc@gnu.org orgcc@gcc.gnu.org, send other questions to
+gnu@gnu.org.
+
+Copyright (C) Free Software Foundation, Inc.,
+59 Temple Place - Suite 330, Boston, MA  02111,  USA.
+
+Verbatim copying and distribution of this entire article is permitted
+in any medium, provided this notice is preserved.
+
+Last modified 2003-04-30
--- gcj-4.2-4.2-20070707.orig/debian/gnat-BV.overrides
+++ gcj-4.2-4.2-20070707/debian/gnat-BV.overrides
@@ -0,0 +1 @@
+gnat-@BV@: bad-permissions-for-ali-file
--- gcj-4.2-4.2-20070707.orig/debian/gcj-BV.prerm
+++ gcj-4.2-4.2-20070707/debian/gcj-BV.prerm
@@ -0,0 +1,18 @@
+#! /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 [ -f /usr/share/info/gcj-@BV@.info.gz ]; then
+  install-info --quiet --remove gcj-@BV@
+else
+  # GFDL invariant free
+  true
+fi
+
+#DEBHELPER#
--- gcj-4.2-4.2-20070707.orig/debian/protoize.1
+++ gcj-4.2-4.2-20070707/debian/protoize.1
@@ -0,0 +1,42 @@
+.TH PROTOIZE 1
+.\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection
+.\" other parms are allowed: see man(7), man(1)
+.SH NAME
+protoize, unprotoize \- create/remove ANSI prototypes from C code
+.SH SYNOPSIS
+.B protoize
+.I "[options] files ...." 
+.br
+.B unprotoize
+.I "[options] files ...." 
+.SH "DESCRIPTION"
+This manual page documents briefly the
+.BR protoize ,
+and
+.B unprotoize
+commands.
+This manual page was written for the Debian GNU/Linux distribution
+(but may be used by others), because the original program does not
+have a manual page.
+Instead, it has documentation in the GNU Info format; see below.
+.PP
+.B protoize
+is an optional part of GNU C.  You can use it to add prototypes to a
+program, thus converting the program to ANSI C in one respect.  The companion
+program `unprotoize' does the reverse: it removes argument types from
+any prototypes that are found.
+.PP
+When you run these programs, you must specify a set of source files
+as command line arguments.
+.SH OPTIONS
+These programs are non-trivial to operate, and it is neither possible nor
+desirable to properly summarize options in this man page.  Read the info
+documentation for more information.
+.SH "SEE ALSO"
+The programs are documented fully by
+.IR "Gcc: The use and the internals of the GNU compiler",
+available via the Info system.  The documentation for protoize/unprotoize
+can be found in the subsection "Invoking GCC", under "Running Protoize."
+.SH AUTHOR
+This manual page was written by Galen Hazelwood,
+for the Debian GNU/Linux system.
--- gcj-4.2-4.2-20070707.orig/debian/lib32gccLC.preinst
+++ gcj-4.2-4.2-20070707/debian/lib32gccLC.preinst
@@ -0,0 +1,8 @@
+#! /bin/sh -e
+
+if [ ! -h /usr/lib32 -a -d /usr/lib32 -a -d /emul/ia32-linux/usr/lib ]; then
+  rm -rf /usr/lib32
+  ln -s /emul/ia32-linux/usr/lib /usr/lib32
+fi
+
+#DEBHELPER#
--- gcj-4.2-4.2-20070707.orig/debian/rules.patch
+++ gcj-4.2-4.2-20070707/debian/rules.patch
@@ -0,0 +1,289 @@
+# -*- makefile -*-
+# rules to patch the unpacked files in the source directory
+# ---------------------------------------------------------------------------
+# various rules to unpack addons and (un)apply patches.
+# 	- patch / apply-patches
+#	- unpatch / reverse-patches
+
+.NOTPARALLEL:
+
+patchdir	?= debian/patches
+
+# which patches should be applied?
+
+#debian_patches = \
+#	svn-updates
+
+ifneq ($(GFDL_INVARIANT_FREE),yes)
+  debian_patches += \
+	rename-info-files
+#	svn-doc-updates
+endif
+
+debian_patches += \
+	gcc-version \
+	gcc-textdomain \
+	gcc-driver-extra-langs \
+	gcc-hash-style-both \
+	libstdc++-pic \
+	libstdc++-doclink \
+	gccbug \
+	gccbug-posix \
+	libstdc++-doxygen \
+	libjava-stacktrace \
+	libjava-subdir \
+	libjava-lib32subdir \
+	libjava-jnipath \
+	libjava-lib32-properties \
+	libjava-sjlj \
+	libjava-rpath \
+	libjava-examples \
+	libffi-configure \
+	pr20218 \
+	pr20218-mips \
+	pr28102 \
+	pr31868 \
+	alpha-no-ev4-directive \
+	arm-libffi \
+	arm-gij \
+	boehm-gc-nocheck \
+	note-gnu-stack \
+	arm-pr28516 \
+	arm-pr30486 \
+	arm-unbreak-eabi-armv4t \
+	m68k-save_pic \
+	m68k-dwarf \
+	m68k-limit_reload \
+	m68k-prevent-qipush \
+	m68k-return \
+	m68k-sig-unwind \
+	m68k-align-code \
+	m68k-align-stack \
+	m68k-secondary-addr-reload \
+	m68k-notice-move \
+	m68k-symbolic-operand \
+	m68k-bitfield-offset \
+	mips-libspec \
+
+#	m68k-peephole \
+#	m68k-split_shift \
+#	m68k-dwarf3 \
+#	m68k-fpcompare \
+
+#	svn-updates \
+#	classmap-path \
+
+#ifneq ($(GFDL_INVARIANT_FREE),yes)
+#  debian_patches += classpath-tooldoc
+#endif
+
+ifeq ($(with_ssp)-$(with_ssp_default),yes-yes)
+  debian_patches += gcc-ssp-default
+endif
+
+ifneq ($(distribution),Ubuntu)
+  ifeq ($(with_ssp),yes)
+    debian_patches += libssp-gnu
+  endif
+endif
+
+ifeq ($(with_multiarch_lib),yes)
+  debian_patches += multiarch-lib
+endif
+
+ifeq ($(with_java),yes)
+  debian_patches += mips-libjava-interp
+
+  ifeq ($(with_native_ecj),yes)
+    debian_patches += native-ecj
+  endif
+endif
+
+ifeq ($(with_proto),yes)
+  debian_patches += deb-protoize
+endif
+
+ifeq ($(with_ada),yes)
+  debian_patches += \
+	ada-driver-check \
+	ada-gcc-name \
+	ada-default-project-path \
+	ada-symbolic-tracebacks \
+	ada-acats
+
+  ifeq ($(with_libgnat),yes)
+    debian_patches += \
+	ada-gnatvsn \
+	ada-link-lib \
+	ada-libgnatvsn \
+	ada-libgnatprj
+  endif
+endif
+
+ifeq ($(with_pascal),yes)
+  debian_patches += gpc-gcc-4.x gpc-4.1 gpc-updates gpc-bison-2.2
+  debian_patches += gpc-names
+endif
+
+ifeq ($(DEB_TARGET_ARCH_OS),hurd)
+  debian_patches += hurd-changes
+endif
+
+ifeq ($(DEB_TARGET_ARCH),alpha)
+  debian_patches += alpha-ieee mudflap-nocheck
+  ifneq ($(GFDL_INVARIANT_FREE),yes)
+    debian_patches += alpha-ieee-doc
+  endif
+endif
+
+ifeq ($(DEB_TARGET_ARCH),arm)
+  debian_patches += arm-pragma-pack
+endif
+
+ifeq ($(DEB_TARGET_ARCH),m68k)
+  debian_patches += m68k-bitfield m68k-autoinc
+  debian_patches += m68k-dwarf2 m68k-peephole-note
+  debian_patches += m68k-prevent-swap m68k-reg-inc m68k-noautoinc-setjmp
+endif
+
+ifeq ($(DEB_TARGET_ARCH_OS),kfreebsd)
+  debian_patches += kbsd-gnu
+  debian_patches += kbsd-gnu-ada
+endif
+ifeq ($(DEB_TARGET_ARCH_OS),netbsd)
+  debian_patches += # netbsd-all-gcc netbsd-archs-gcc
+endif
+
+ifdef DEB_CROSS
+  debian_patches += cross-include cross-fixes
+endif
+
+#debian_patches += link-libs
+
+# all patches below this line are applied for gcc-snapshot builds as well
+
+ifeq ($(PKGSOURCE),gcc-snapshot)
+  debian_patches =
+  debian_patches += configure-updates-trunk cpu-default-i486-trunk pr32522
+else
+  debian_patches += cpu-default-i486
+endif
+
+debian_patches += reporting gcc-ice-hack multiarch-include
+ifeq ($(PKGSOURCE),gcc-snapshot)
+  debian_patches += libjava-disable-static-trunk ada-driver-check-trunk
+else
+  debian_patches += libjava-disable-static ada-driver-check
+endif
+
+ifeq ($(with_java_biarch_awt),yes)
+  debian_patches += libjava-biarch-awt
+endif
+
+ifeq ($(biarch),yes)
+  ifeq (,$(findstring libjava, $(biarch_multidir_names)))
+    debian_patches += disable-biarch-check
+  endif
+  ifeq ($(PKGSOURCE),gcc-snapshot)
+    debian_patches += config-ml-trunk
+  else
+    debian_patches += config-ml
+  endif
+    debian_patches += libjava-biarch-alsa
+
+  ifeq ($(DEB_TARGET_ARCH),powerpc)
+    debian_patches += powerpc-biarch
+  endif
+  ifeq ($(DEB_TARGET_ARCH),s390)
+    debian_patches += s390-biarch
+  endif
+  ifeq ($(DEB_TARGET_ARCH),sparc)
+      debian_patches += sparc-biarch
+  endif
+  ifeq ($(DEB_TARGET_ARCH),i386)
+    ifneq ($(PKGSOURCE),gcc-snapshot)
+      debian_patches += i386-biarch
+    endif
+  endif
+  ifneq ($(with_64bit_check),yes)
+    debian_patches += disable-configure-run-check
+  endif
+endif
+
+ifeq ($(biarch32),yes)
+  ifeq (,$(findstring libjava, $(biarch_multidir_names)))
+    debian_patches += disable-biarch-check
+  endif
+  ifeq ($(PKGSOURCE),gcc-snapshot)
+    debian_patches += config-ml-trunk
+  else
+    debian_patches += config-ml
+  endif
+  debian_patches += libjava-biarch-alsa
+
+  ifeq ($(DEB_TARGET_ARCH),amd64)
+    debian_patches += amd64-biarch
+  endif
+  ifeq ($(DEB_TARGET_ARCH),ppc64)
+    # FIXME: needed for 4.1?
+    debian_patches += ppc64-biarch ppc64-ada
+  endif
+  ifeq ($(DEB_TARGET_ARCH),kfreebsd-amd64)
+    debian_patches += amd64-biarch
+  endif
+  ifneq ($(with_32bit_check),yes)
+    debian_patches += disable-configure-run-check
+  endif
+endif
+
+
+firsthalf=true
+patch-to-specific: $(foreach patch, $(debian_patches),$(if $(firsthalf),$(if $(findstring $(PATCH_TO),$(patch)),$(eval firsthalf=),$(patch_stamp)-$(patch)),))
+
+patch: $(patch_stamp)
+$(patch_stamp): $(unpack_stamp) pre-patch \
+    $(foreach p,$(debian_patches),$(patch_stamp)-$(p))
+	echo -e "\nPatches that $(distribution) applied in this version:" > pxxx
+	for i in $(debian_patches); do \
+	  echo -e "\n$$i:" >> pxxx; \
+	  sed -n 's/^# *DP: */  /p' $(patchdir)/$$i.dpatch >> pxxx; \
+	done
+	mv -f pxxx $@
+
+pre-patch:
+	@if [ -x /usr/bin/automake-1.4 ]; then \
+	  : ; \
+	else \
+	  mkdir -p $(PWD)/bin; \
+	  ln -sf /usr/bin/automake $(PWD)/bin/automake-1.4; \
+	fi
+
+unpatch:
+	for stamp in none `ls -1t $(patch_stamp)-*`; do \
+	  case "$$stamp" in none|patched-stamp|patched-\*) continue; esac; \
+	  patch=`echo $$stamp | sed -e 's,$(patch_stamp)-,,'`; \
+	  echo "trying to revert patch $$patch ..."; \
+	  if [ -x $(patchdir)/$$patch.dpatch ]; then true; else \
+	    chmod +x $(patchdir)/$$patch.dpatch; fi; \
+	  if $(patchdir)/$$patch.dpatch -unpatch -d $(srcdir); then \
+	    echo "reverted $$patch patch."; \
+	    rm -f $$stamp; \
+	  else \
+	    echo "error in reverting $$patch patch."; \
+	    exit 1; \
+	  fi; \
+	done
+	rm -f patched-stamp
+
+# debian/rules.conf isn't yet sourced
+SOURCE_VERSION := $(shell dpkg-parsechangelog | awk '/^Version:/ {print $$NF}')
+DEB_VERSION := $(shell echo $(SOURCE_VERSION) | sed 's/ds[0-9]*//')
+
+$(patch_stamp)-%: $(patchdir)/%.dpatch
+	if [ -x $< ]; then true; else chmod +x $<; fi
+	if [ -f $@ ]; then \
+	  echo "$* patches already applied."; exit 1; \
+	fi
+	DEB_VERSION='$(DEB_VERSION)'; export DEB_VERSION; \
+	$< -patch -d $(srcdir)
+	echo "$* patches applied." > $@
--- gcj-4.2-4.2-20070707.orig/debian/gcj-BV.postinst
+++ gcj-4.2-4.2-20070707/debian/gcj-BV.postinst
@@ -0,0 +1,45 @@
+#! /bin/sh -e
+
+if [ -d /usr/share/doc/gcc-@BV@-base/java ] && [ ! -h /usr/share/doc/gcc-@BV@-base/java ]; then
+    rm -rf /usr/share/doc/gcc-@BV@-base/java
+    ln -s ../gcj-@BV@-base /usr/share/doc/gcc-@BV@-base/java
+fi
+
+prio=$(echo @BV@ | sed 's/\.//g')
+update-alternatives --quiet \
+    --install /usr/bin/javac javac /usr/bin/gcj-wrapper-@BV@ $prio \
+    @GFDL@--slave /usr/share/man/man1/javac.1.gz javac.1.gz /usr/share/man/man1/gcj-wrapper-@BV@.1.gz
+
+update-alternatives --quiet \
+    --install /usr/bin/jar jar /usr/bin/gjar-@BV@ $prio \
+    --slave /usr/share/man/man1/jar.1.gz jar.1.gz /usr/share/man/man1/gjar-@BV@.1.gz
+
+update-alternatives --quiet \
+    --install /usr/bin/jarsigner jarsigner /usr/bin/gjarsigner-@BV@ $prio \
+    --slave /usr/share/man/man1/jarsigner.1.gz jarsigner.1.gz /usr/share/man/man1/gjarsigner-@BV@.1.gz
+
+update-alternatives --quiet \
+    --install /usr/bin/javah javah /usr/bin/gjavah-@BV@ $prio \
+    --slave /usr/share/man/man1/javah.1.gz javah.1.gz /usr/share/man/man1/gjavah-@BV@.1.gz
+
+update-alternatives --quiet \
+    --install /usr/bin/native2ascii native2ascii /usr/bin/gnative2ascii-@BV@ $prio \
+    --slave /usr/share/man/man1/native2ascii.1.gz native2ascii.1.gz /usr/share/man/man1/gnative2ascii-@BV@.1.gz
+
+update-alternatives --quiet \
+    --install /usr/bin/rmic rmic /usr/bin/grmic-@BV@ $prio \
+    --slave /usr/share/man/man1/rmic.1.gz rmic.1.gz /usr/share/man/man1/grmic-@BV@.1.gz
+
+update-alternatives --quiet \
+    --install /usr/bin/tnameserv tnameserv /usr/bin/gtnameserv-@BV@ $prio \
+    --slave /usr/share/man/man1/tnameserv.1.gz tnameserv.1.gz /usr/share/man/man1/gtnameserv-@BV@.1.gz
+
+if [ -f /usr/share/info/gcj-@BV@.info.gz ]; then
+  install-info --quiet --section "Development" "Development" \
+	/usr/share/info/gcj-@BV@.info.gz
+else
+  # GFDL invariant free
+  :
+fi
+
+#DEBHELPER#
--- gcj-4.2-4.2-20070707.orig/debian/porting.html
+++ gcj-4.2-4.2-20070707/debian/porting.html
@@ -0,0 +1,30 @@
+<html lang="en">
+<head>
+<title>Porting libstdc++-v3</title>
+<meta http-equiv="Content-Type" content="text/html">
+<meta name="description" content="Porting libstdc++-v3">
+<meta name="generator" content="makeinfo 4.6">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<style type="text/css"><!--
+  pre.display { font-family:inherit }
+  pre.format  { font-family:inherit }
+  pre.smalldisplay { font-family:inherit; font-size:smaller }
+  pre.smallformat  { font-family:inherit; font-size:smaller }
+  pre.smallexample { font-size:smaller }
+  pre.smalllisp    { font-size:smaller }
+--></style>
+</head>
+<body>
+<h1 class="settitle">Porting libstdc++-v3</h1>
+<div class="node">
+<p><hr>
+Node:&nbsp;<a name="Top">Top</a>,
+Next:&nbsp;<a rel="next" accesskey="n" href="#Operating%20system">Operating system</a>,
+Up:&nbsp;<a rel="up" accesskey="u" href="#dir">(dir)</a>
+<br>
+</div>
+
+The documentation in this file was removed, because it is licencensed
+under a non DFSG conforming licencse.
+
+</body></html>
--- gcj-4.2-4.2-20070707.orig/debian/treelang-BV.doc-base
+++ gcj-4.2-4.2-20070707/debian/treelang-BV.doc-base
@@ -0,0 +1,15 @@
+Document: treelang-@BV@
+Title: The GNU Treelang Compiler
+Author: Tim Josling
+Abstract: This file documents the use and the internals of the GNU Treelang
+ compiler. At the moment this manual is not incorporated into the main
+ GCC manual as it is too incomplete.
+Section: Apps/Programming
+
+Format: html
+Index: /usr/share/doc/gcc-@BV@-base/treelang/treelang.html
+Files: /usr/share/doc/gcc-@BV@-base/treelang/treelang.html
+
+Format: info
+Index: /usr/share/info/treelang-@BV@.info.gz
+Files: /usr/share/info/treelang-@BV@*
--- gcj-4.2-4.2-20070707.orig/debian/rename-pkgs.sh
+++ gcj-4.2-4.2-20070707/debian/rename-pkgs.sh
@@ -0,0 +1,32 @@
+#! /bin/bash
+
+rename_pkg()
+{
+  src=$1
+  dest=$2
+  for ext in preinst postinst prerm postrm doc-base; do
+    if [ -f $src.$ext ]; then
+      if [ -f $dest.ext ]; then
+	echo already exists: $dest.$ext
+      else
+	echo "$src.$ext --> $dest.$ext"
+	svn rename $src.$ext $dest.$ext
+	#mv $src.$ext $dest.$ext
+      fi
+    fi
+  done
+}
+
+v_new=3.4
+v_old=3.3
+
+for p in chill cpp gcc g++ g77 gpc gij gcj gobjc protoize treelang; do
+  rename_pkg $p-$v_old $p-$v_new
+done
+
+for p in cpp gcc g77 gnat; do
+  rename_pkg $p-$v_old-doc $p-$v_new-doc
+done
+
+rename_pkg gcc-$v_old-base gcc-$v_new-base
+rename_pkg gcc-$v_old-sparc64 gcc-$v_new-sparc64
--- gcj-4.2-4.2-20070707.orig/debian/gcc-cross.prerm
+++ gcj-4.2-4.2-20070707/debian/gcc-cross.prerm
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+update-alternatives --quiet --remove cross-gcc /usr/bin/cross-gcc-ver
+
+exit 0
--- gcj-4.2-4.2-20070707.orig/debian/dh_doclink
+++ gcj-4.2-4.2-20070707/debian/dh_doclink
@@ -0,0 +1,12 @@
+#! /bin/sh
+
+pkg=`echo $1 | sed 's/^-p//'`
+target=$2
+
+[ -d debian/$pkg/usr/share/doc ] || mkdir -p debian/$pkg/usr/share/doc
+if [ -d debian/$pkg/usr/share/doc/$p -a ! -h debian/$pkg/usr/share/doc/$p ]
+then
+    echo "WARNING: removing doc directory  $pkg"
+    rm -rf debian/$pkg/usr/share/doc/$pkg
+fi
+ln -sf $target debian/$pkg/usr/share/doc/$pkg
--- gcj-4.2-4.2-20070707.orig/debian/rules.conf
+++ gcj-4.2-4.2-20070707/debian/rules.conf
@@ -0,0 +1,676 @@
+# -*- makefile -*-
+# rules.conf
+#	- used to build debian/control and debian/rules.parameters
+#	- assumes unpacked sources
+
+include debian/rules.defs
+
+SOURCE_VERSION := $(shell dpkg-parsechangelog | awk '/^Version:/ {print $$NF}')
+DEB_VERSION := $(shell echo $(SOURCE_VERSION) \
+	| sed -e 's/.*://' -e 's/ds[0-9]*//')
+# epoch used for gcc versions up to 3.3.x, now used for some remaining
+# libraries: libgcc1, libobjc1, libffi2, libffi2-dev, libg2c0
+EPOCH := 1
+DEB_EVERSION := $(EPOCH):$(DEB_VERSION)
+BASE_VERSION := $(shell echo $(DEB_VERSION) | sed -e 's/\([1-9]\.[0-9]\).*-.*/\1/')
+
+# The binutils version needed.
+# The oldest suitable versions for the various platforms can be found in
+# INSTALL/specific.html ; we take a tighter dependency if possible to be on
+# the safe side (something like newest( version in stable, versions for the
+# various platforms in INSTALL/specific.html) ).
+BINUTILSV = 2.17cvs20070426
+ifdef DEB_CROSS
+  BINUTILS_BUILD_DEP = binutils$(TS) (>= $(BINUTILSV))
+else
+  BINUTILS_BUILD_DEP = binutils (>= $(BINUTILSV)) | binutils-multiarch (>= $(BINUTILSV))
+endif
+
+# libc-dev dependencies
+libc_ver := 2.5
+ifeq ($(DEB_TARGET_ARCH_OS),linux)
+  ifneq (,$(findstring $(DEB_TARGET_ARCH),alpha ia64))
+    LIBC_DEP = libc6.1
+    LIBC_DEV_DEP = libc6.1-dev$(LS) (>= $(libc_ver))
+  else
+    LIBC_DEP = libc6
+    LIBC_DEV_DEP = libc6-dev$(LS) (>= $(libc_ver))
+  endif
+else
+  ifeq ($(DEB_TARGET_ARCH_OS),gnu)
+    LIBC_DEP = libc0.3
+    LIBC_DEV_DEP = libc0.3-dev$(LS)
+  endif
+  ifeq ($(DEB_TARGET_ARCH_OS),kfreebsd)
+    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 :=
+LIBC_BIARCH_DEV_DEP :=
+LIBCXX_BIARCH_DEP :=
+ifeq ($(biarch),yes)
+  ifeq ($(DEB_TARGET_ARCH),i386)
+    LIBC_BIARCH_DEP := libc6-amd64$(LS) (>= $(libc_ver))
+    LIBC_BIARCH_DEV_DEP := libc6-dev-amd64$(LS)
+  endif
+  ifeq ($(DEB_TARGET_ARCH),powerpc)
+    LIBC_BIARCH_DEP := libc6-ppc64$(LS) (>= $(libc_ver))
+    LIBC_BIARCH_DEV_DEP := libc6-dev-ppc64$(LS) (>= $(libc_ver))
+  endif
+  ifeq ($(DEB_TARGET_ARCH),sparc)
+    LIBC_BIARCH_DEP := libc6-sparc64$(LS) (>= $(libc_ver))
+    LIBC_BIARCH_DEV_DEP := libc6-dev-sparc64$(LS) (>= $(libc_ver))
+  endif
+  ifeq ($(DEB_TARGET_ARCH),s390)
+    LIBC_BIARCH_DEP := libc6-s390x$(LS) (>= $(libc_ver))
+    LIBC_BIARCH_DEV_DEP := libc6-dev-s390x$(LS) (>= $(libc_ver))
+  endif
+  LIBCXX_BIARCH_DEP = lib64stdc++$(CXX_SONAME)$(LS) (>= $${gcc:Version})
+  LIBCXX_BIARCH_DBG_DEP = lib64stdc++$(CXX_SONAME)-$(BASE_VERSION)-dbg
+endif
+ifeq ($(biarch32),yes)
+  ifeq ($(DEB_TARGET_ARCH),amd64)
+    LIBC_BIARCH_DEV_DEP := libc6-dev-i386$(LS) (>= $(libc_ver))
+    LIBC_BIARCH_DEP := libc6-i386$(LS) (>= $(libc_ver))
+  endif
+  ifeq ($(DEB_TARGET_ARCH),ppc64)
+    LIBC_BIARCH_DEP := libc6-powerpc$(LS) (>= $(libc_ver))
+    LIBC_BIARCH_DEV_DEP := libc6-dev-powerpc$(LS) (>= $(libc_ver))
+  endif
+  ifeq ($(DEB_TARGET_ARCH),kfreebsd-amd64)
+    LIBC_BIARCH_DEV_DEP := libc0.1-dev-i386$(LS) (>= $(libc_ver))
+    LIBC_BIARCH_DEP := libc0.1-i386$(LS) (>= $(libc_ver))
+  endif
+  LIBCXX_BIARCH_DEP = lib32stdc++$(CXX_SONAME)$(LS) (>= $${gcc:Version})
+  LIBCXX_BIARCH_DBG_DEP = lib32stdc++$(CXX_SONAME)-$(BASE_VERSION)-dbg
+endif
+
+LIBUNWIND_DEV_DEP :=
+ifeq ($(DEB_TARGET_ARCH),ia64)
+  LIBUNWIND_DEV_DEP := libunwind7-dev$(LS) (>= 0.98.5-6)
+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))
+JAVA_BUILD_DEP := libz-dev,
+
+ifneq (,$(java_awt_peers))
+  JAVA_BUILD_DEP += fastjar [java_no_archs], libmagic-dev [java_no_archs],
+  JAVA_BUILD_DEP += ecj (>= 3.2.1-6) [java_no_archs], zip [java_no_archs],
+  ifeq ($(with_java_maintainer_mode),yes)
+    # gcj-4.1 needed for gjavah-4.1.
+    JAVA_BUILD_DEP += gcj-4.1 [java_no_archs],
+  endif
+  JAVA_BUILD_DEP += libasound2-dev [java_no_archs !hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
+  JAVA_BUILD_DEP += lib32asound2-dev [amd64 ppc64], lib64asound2-dev [i386 powerpc sparc s390],
+  ifneq (,$(findstring gtk,$(java_awt_peers)))
+    JAVA_BUILD_DEP += libxtst-dev [java_no_archs], libxt-dev [java_no_archs], libgtk2.0-dev (>= 2.4.4-2) [java_no_archs], libart-2.0-dev [java_no_archs], libcairo2-dev [java_no_archs],
+  endif
+  ifneq (,$(findstring qt,$(java_awt_peers)))
+    JAVA_BUILD_DEP += libqt4-dev (>= 4.1.0) [java_no_archs],
+  endif
+  # plugin
+  JAVA_BUILD_DEP += libgconf2-dev [java_no_archs],
+  ifeq ($(distribution),Debian)
+    JAVA_BUILD_DEP += libxul-dev [java_no_archs],
+  else
+    JAVA_BUILD_DEP += firefox-dev [java_no_archs],
+  endif
+endif
+ifneq ($(with_standalone_gcj),yes)
+  ifeq ($(PKGSOURCE),gcj-$(BASE_VERSION))
+    JAVA_BUILD_DEP += gcc-4.2-source (>= 4.2-20070707), gcc-4.2-source (<< 4.2.0),
+  endif
+endif
+JAVA_BUILD_INDEP := gjdoc
+ifeq ($(with_separate_libgcj),yes)
+  ifeq ($(PKGSOURCE),gcc-$(BASE_VERSION))
+    JAVA_BUILD_DEP :=
+    JAVA_BUILD_INDEP :=
+  endif
+endif
+
+ifeq ($(PKGSOURCE),gcc-$(BASE_VERSION))
+  LIBSTDCXX_BUILD_INDEP = doxygen (>= 1.4.2), graphviz (>= 2.2), gsfonts-x11, texlive-latex-base
+  JAVA_BUILD_INDEP := , $(JAVA_BUILD_INDEP)
+endif
+
+ifeq ($(PKGSOURCE),gcc-$(BASE_VERSION))
+  ifneq ($(with_separate_gnat),yes)
+    # Build gnat as part of the combiled gcc-x.y source package.  Do not fail
+    # if gnat is not present on unsupported architectures; the build scripts
+    # will not use gnat anyway.
+    GNAT_BUILD_DEP := gnat (>= 4.1) [ada_no_archs],
+  endif
+else ifeq ($(PKGSOURCE),gcc-snapshot)
+  # Ditto, as part of the gcc-snapshot package.
+  GNAT_BUILD_DEP := gnat (>= 4.1) [ada_no_archs],
+else ifeq ($(PKGSOURCE),gnat-$(BASE_VERSION))
+  # Special source package just for gnat. Fail early if gnat is not present,
+  # rather than waste CPU cycles and fail later.
+  GNAT_BUILD_DEP := gnat (>= 4.1) | gnat-$(BASE_VERSION),
+  GNAT_BUILD_DEP += gcc-$(BASE_VERSION)-source (= $(SOURCE_VERSION)),
+  JAVA_BUILD_DEP :=
+  JAVA_BUILD_INDEP :=
+endif
+
+
+#PASCAL_BUILD_DEP := libncurses5-dev [pascal_no_archs], tetex-bin [pascal_no_archs], libgmp3-dev [pascal_no_archs], help2man [pascal_no_archs],
+
+LIBC_BIARCH_BUILD_DEP = 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],
+
+else
+# build cross compiler
+
+LIBC_BUILD_DEP := $(LIBC_DEV_DEP)
+
+ifneq ($(LIBC_BIARCH_DEV_DEP),)
+  LIBC_BIARCH_BUILD_DEP := $(LIBC_BIARCH_DEV_DEP),
+else
+  LIBC_BIARCH_BUILD_DEP :=
+endif
+
+ifneq ($(LIBUNWIND_DEV_DEP),)
+  LIBUNWIND_BUILD_DEP := $(LIBUNWIND_DEV_DEP),
+else
+  LIBUNWIND_BUILD_DEP := 
+endif
+
+ifeq ($(DEB_TARGET_ARCH),ia64)
+  LIBATOMIC_OPS_BUILD_DEP := libatomic-ops-dev$(LS),
+else
+  LIBATOMIC_OPS_BUILD_DEP :=
+endif
+
+JAVA_BUILD_DEP := libz-dev, lib64z1-dev [i386 powerpc sparc s390], lib32z1-dev [amd64 ppc64 kfreebsd-amd64],
+JAVA_BUILD_INDEP :=
+GNAT_BUILD_DEP :=
+
+endif # cross compiler
+
+GCC_VERSION := $(strip $(shell cat $(srcdir)/gcc/BASE-VER))
+
+# The numeric part of the gcc version number (x.yy.zz)
+NEXT_GCC_VERSION := $(shell echo $(GCC_VERSION) | \
+		awk -F. '{OFS="."; if (NF==2) $$3=1; else $$NF += 1; print}')
+# first version with a new path component in gcc_lib_dir (i.e. GCC_VERSION
+# or TARGET_ALIAS changes), or last version available for all architectures
+DEB_GCC_SOFT_VERSION := 4.2
+DEB_GCJ_SOFT_VERSION := 4.2
+ifeq ($(with_pascal),yes)
+GPC_DATE := $(shell sed -n 's/^.define GPC_VERSION_STRING "\(.*\)"/\1/p' $(srcdir)/gcc/p/version.h || true)
+DEB_GPC_VERSION := $(shell echo $(DEB_VERSION) \
+			   | sed 's/.*:\(.*\)-\(.*\)/2:\1.$(GPC_DATE)-\2/')
+endif
+
+# semiautomatic ...
+DEB_SOVERSION		:= $(DEB_VERSION)
+DEB_SOVERSION		:= 4.2-20070516
+DEB_SOEVERSION		:= $(EPOCH):4.2.0
+DEB_SOEVERSION		:= $(EPOCH):4.2-20070516
+DEB_SOVERSION		:= 4.2-20070208
+DEB_SOEVERSION		:= $(EPOCH):4.2-20070516
+DEB_STDCXX_SOVERSION	:= 4.2.0
+DEB_GCJ_SOVERSION	:= 4.2.0
+DEB_STDCXX_SOVERSION	:= 4.2-20070516
+DEB_GCJ_SOVERSION	:= 4.2-20070516
+DEB_FFI_SOVERSION	:= $(DEB_SOVERSION)
+DEB_GOMP_SOVERSION	:= $(DEB_SOVERSION)
+DEB_GCCMATH_SOVERSION	:= $(DEB_SOVERSION)
+
+DEB_GCC_VERSION := $(DEB_VERSION)
+DEB_GCJ_VERSION := $(DEB_VERSION)
+ifeq ($(with_separate_libgcj),yes)
+  ifeq ($(PKGSOURCE),gcj-$(BASE_VERSION))
+    DEB_GCC_VERSION := $(DEB_GCC_SOFT_VERSION)
+  endif
+endif
+
+DEB_GNAT_VERSION := $(DEB_VERSION)
+ifeq ($(with_separate_gnat),yes)
+  ifeq ($(PKGSOURCE),gnat-$(BASE_VERSION))
+    DEB_GCC_VERSION := $(DEB_GCC_SOFT_VERSION)
+  endif
+endif
+
+# manual ...
+ifeq ($(DEB_TARGET_GNU_CPU), $(findstring $(DEB_TARGET_GNU_CPU),hppa m68k))
+  ifeq ($(DEB_TARGET_ARCH),m68k)
+    GCC_SONAME := 2
+  endif
+  ifeq ($(DEB_TARGET_ARCH),hppa)
+    GCC_SONAME := 4
+  endif
+  DEB_LIBGCC_SOVERSION := $(DEB_SOVERSION)
+  DEB_LIBGCC_VERSION := $(DEB_VERSION)
+else
+  GCC_SONAME := 1
+  DEB_LIBGCC_SOVERSION := $(DEB_SOEVERSION)
+  DEB_LIBGCC_VERSION := $(DEB_EVERSION)
+endif
+
+LIBGCC_DEP := libgcc$(GCC_SONAME)$(LS) (>= $(DEB_LIBGCC_VERSION))
+LIBGCC_BIARCH_DEP := 
+ifeq ($(biarch),yes)
+  LIBGCC_BIARCH_DEP := lib64gcc$(GCC_SONAME)$(LS) (>= $(DEB_LIBGCC_VERSION))
+endif
+ifeq ($(biarch32),yes)
+  LIBGCC_BIARCH_DEP := lib32gcc$(GCC_SONAME)$(LS) (>= $(DEB_LIBGCC_VERSION))
+endif
+
+CXX_SONAME := $(strip $(shell awk -F= \
+			'/^libtool_VERSION/ {split($$2,v,":"); print v[1]}' \
+			$(srcdir)/libstdc++-v3/configure.ac))
+
+OBJC_SONAME := $(strip $(shell awk -F= '/^VERSION/ \
+					{split($$2,v,":"); print v[1]}' \
+				$(srcdir)/libobjc/configure.ac))
+
+FORTRAN_SONAME := $(strip $(shell tail -1 \
+					$(srcdir)/libgfortran/libtool-version \
+				  | awk -F: '{ print $$1 }' ))
+
+MUDFLAP_SONAME := $(strip $(shell tail -1 \
+					$(srcdir)/libmudflap/libtool-version \
+				  | awk -F: '{ print $$1 }' ))
+
+SSP_SONAME := $(strip $(shell tail -1 \
+					$(srcdir)/libssp/libtool-version \
+				  | awk -F: '{ print $$1 }' ))
+
+GCJ_SONAME := $(strip $(shell tail -1 $(srcdir)/libjava/libtool-version \
+				  | awk -F: '{ print $$1 }' ))
+
+FFI_SONAME := $(strip $(shell tail -1 $(srcdir)/libffi/libtool-version \
+				  | awk -F: '{ print $$1 }' ))
+
+GOMP_SONAME := $(strip $(shell awk -F= \
+			'/^libtool_VERSION/ {split($$2,v,":"); print v[1]}' \
+			$(srcdir)/libgomp/configure.ac))
+
+GCCMATH_SONAME := $(strip $(shell tail -1 $(srcdir)/libgcc-math/libtool-version \
+				  | awk -F: '{ print $$1 }' ))
+
+GNAT_SONAME := $(strip $(shell \
+		grep '[^_]Library_Version.*:' $(srcdir)/gcc/ada/gnatvsn.ads \
+		  | sed -e 's/.*"\([^"]*\)".*/\1/'))
+
+GNAT_VERSION := $(BASE_VERSION)
+
+LIBGNAT_DEP :=
+ifeq ($(with_libgnat),yes)
+  LIBGNAT_DEP := libgnat-$(GNAT_VERSION) (= $(DEB_VERSION))
+endif
+
+GPC_BASE_VERSION := 2.1
+
+pkg_ver := -$(BASE_VERSION)
+gpc_pkg_ver := -$(GPC_BASE_VERSION)$(pkg_ver)
+
+PKG_GCJ_EXT = $(subst 0,,$(GCJ_SONAME))
+PKG_LIBGCJ_EXT = $(PKG_GCJ_EXT)-0
+
+ctrl_flags = \
+	-DBINUTILSV=$(BINUTILSV) \
+	-DSRCNAME=$(PKGSOURCE) \
+	-D__$(DEB_TARGET_GNU_CPU)__ \
+	-DARCH=$(DEB_TARGET_ARCH) \
+	-DDIST=$(distribution)
+ifeq ($(with_objc)-$(with_objc_gc),yes-yes)
+  ctrl_flags +=	-DOBJC_GC
+endif
+
+ctrl_flags += \
+	-DLIBC_DEV_DEP="$(LIBC_DEV_DEP)" \
+	-DLIBC_BIARCH_BUILD_DEP="$(LIBC_BIARCH_BUILD_DEP)" \
+	-DGNAT_BUILD_DEP="$(GNAT_BUILD_DEP)" \
+	-DJAVA_BUILD_DEP="$(JAVA_BUILD_DEP)" \
+	-DJAVA_BUILD_INDEP="$(JAVA_BUILD_INDEP)" \
+	-DLIBSTDCXX_BUILD_INDEP="$(LIBSTDCXX_BUILD_INDEP)" \
+	-DPASCAL_BUILD_DEP="$(PASCAL_BUILD_DEP)" \
+	-DBINUTILS_BUILD_DEP="$(BINUTILS_BUILD_DEP)" \
+	-DLIBC_BUILD_DEP="$(LIBC_BUILD_DEP)" \
+	-DMULTILIB_ARCHS="$(multilib_archs)" \
+	-DTP=$(TP) \
+	-DTS=$(TS) \
+	-DLS=$(LS)
+
+ifdef DEB_CROSS
+  ctrl_flags += \
+	-DTARGET=$(DEB_TARGET_ARCH) \
+	-DLIBUNWIND_BUILD_DEP="$(LIBUNWIND_BUILD_DEP)" \
+	-DLIBATOMIC_OPS_BUILD_DEP="$(LIBATOMIC_OPS_BUILD_DEP)"
+else
+  # add '-DPRI=optional' to ctrl_flags if this is not the default compiler
+  # ctrl_flags += \
+  #     -DPRI=optional
+endif
+
+ifeq ($(with_base_only),yes)
+  ctrl_flags += \
+	-DBASE_ONLY=yes
+endif
+
+control: control-file parameters-file substvars-file versioned-files
+
+ifdef DEB_CROSS
+  languages = c c++ objc objpp
+  addons = libgcc lib64gcc libcxx lib64cxx cdev c++dev libobjc objcdev objppdev gccxbase
+else
+  languages = ada c c++ fortran java objc objpp treelang # pascal
+  addons = gccbase cdev c++dev fdev fixincl libcxx lib4gcc \
+	   libgcc libffi libfortran libgcj libgcjdev gcjdoc libgnat libobjc libs \
+	   lib64gcc lib64cxx lib64ffi lib64gcj lib64objc lib64gfortran \
+	   lib32objc lib32gfortran lib32gcj lib32gcc lib32cxx \
+	   objcdev proto mudflap source objppdev libgomp lib32gomp lib64gomp \
+	   multilib # libgmath libnof lib64gnat lib64gcj ssp
+#  ifneq (,$(findstring gtk, $(java_awt_peers)))
+#    addons += gtkpeer
+#  endif
+#  ifneq (,$(findstring qt, $(java_awt_peers)))
+#    addons += qtpeer
+#  endif
+  ifeq ($(with_separate_libgcj),yes)
+    ifeq ($(PKGSOURCE),gcc-$(BASE_VERSION))
+      languages := $(filter-out java,$(languages))
+      addons := $(filter-out gcj libgcj libgcjdev lib32gcj lib64gcj gcjdoc gtkpeer qtpeer,$(addons))
+    endif
+    ifeq ($(PKGSOURCE),gcj-$(BASE_VERSION))
+      languages = java
+      addons = gcj libgcj libgcjdev lib32gcj lib64gcj gcjdoc
+#      ifneq (,$(findstring gtk, $(java_awt_peers)))
+#        addons += gtkpeer
+#      endif
+#      ifneq (,$(findstring qt, $(java_awt_peers)))
+#        addons += qtpeer
+#      endif
+      ifeq ($(with_standalone_gcj),yes)
+	addons += libgcc lib4gcc lib64gcc lib32gcc
+      endif
+    endif
+  endif
+  ifeq ($(with_standalone_gcj),yes)
+    ifeq ($(PKGSOURCE),gcj-$(BASE_VERSION))
+      ctrl_flags += -DSTANDALONEJAVA
+    endif
+  endif
+  ifeq ($(with_separate_gnat),yes)
+    ifeq ($(PKGSOURCE),gcc-$(BASE_VERSION))
+      languages := $(filter-out ada,$(languages))
+      addons := $(filter-out libgnat,$(addons))
+    endif
+    ifeq ($(PKGSOURCE),gnat-$(BASE_VERSION))
+      languages = ada
+      addons = libgnat
+    endif
+  endif
+  ifneq ($(GFDL_INVARIANT_FREE),yes)
+    addons += gfdldoc
+  endif
+endif
+
+ifeq ($(distribution),DebianXXX)
+# use type-handling
+ada_no_archs := $(strip \
+	$(shell type-handling -n -r `echo $(ada_no_cpus) | tr ' ' ,` any) \
+	$(shell type-handling -n -r any `echo $(ada_no_systems) | tr ' ' ,`))
+java_no_archs := $(strip \
+	$(shell type-handling -n -r `echo $(java_no_cpus) | tr ' ' ,` any) \
+	$(shell type-handling -n -r any `echo $(java_no_systems) | tr ' ' ,`))
+pascal_no_archs := $(strip \
+	$(shell type-handling -n -r `echo $(pascal_no_cpus) | tr ' ' ,` any) \
+	$(shell type-handling -n -r any `echo $(pascal_no_systems) | tr ' ' ,`))
+fortran_no_archs := $(strip \
+	$(shell type-handling -n -r `echo $(fortran_no_cpus) | tr ' ' ,` any) \
+	$(shell type-handling -n -r any `echo $(fortran_no_systems) | tr ' ' ,`))
+libgc_no_archs := $(strip \
+	$(shell type-handling -n -r `echo $(libgc_no_cpus) | tr ' ' ,` any) \
+	$(shell type-handling -n -r any `echo $(libgc_no_systems) | tr ' ' ,`))
+check_no_archs := $(strip \
+	$(shell type-handling -n -r `echo $(check_no_cpus) | tr ' ' ,` any) \
+	$(shell type-handling -n -r any `echo $(check_no_systems) | tr ' ' ,`) \
+	!hurd-i386)
+locale_no_archs := $(strip \
+	$(shell type-handling -n -r `echo $(locale_no_cpus) | tr ' ' ,` any) \
+	$(shell type-handling -n -r any `echo $(locale_no_systems) | tr ' ' ,`))
+
+linux_gnu_archs := $(shell type-handling -r any linux-gnu)
+else
+# avoid it ...
+ada_no_archs    := $(strip $(foreach cpu,$(ada_no_cpus),!$(cpu)) \
+			!kfreebsd-amd64 !knetbsd-i386 !netbsd-i386 !hurd-i386)
+java_no_archs   := $(strip $(foreach cpu,$(java_no_cpus),!$(cpu)) \
+			!kfreebsd-amd64 !knetbsd-i386 !netbsd-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)
+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)
+linux_gnu_archs := !hurd-i386
+endif
+
+control-file:
+	echo "addons: $(addons)"; \
+	m4 $(ctrl_flags) \
+	  -DPV=$(pkg_ver) \
+	  -DGPC_PV=$(gpc_pkg_ver) \
+	  -DCXX_SO=$(CXX_SONAME) \
+	  -DGCC_SO=$(GCC_SONAME) \
+	  -DOBJC_SO=$(OBJC_SONAME) \
+	  -DFORTRAN_SO=$(FORTRAN_SONAME) \
+	  -DGCJ_SO=$(PKG_GCJ_EXT) \
+	  -DLIBGCJ_EXT=$(PKG_LIBGCJ_EXT) \
+	  -DGNAT_SO=$(GNAT_SONAME) \
+	  -DGNAT_V=$(GNAT_VERSION) \
+	  -DFFI_SO=$(FFI_SONAME) \
+	  -DGOMP_SO=$(GOMP_SONAME) \
+	  -DGCCMATH_SO=$(GCCMATH_SONAME) \
+	  -DMF_SO=$(MUDFLAP_SONAME) \
+	  -DSSP_SO=$(SSP_SONAME) \
+	  -Denabled_languages="$(languages) $(addons)" \
+	  -Dada_no_archs="$(ada_no_archs)" \
+	  -Djava_no_archs="$(java_no_archs)" \
+	  -Dpascal_no_archs="$(pascal_no_archs)" \
+	  -Dfortran_no_archs="$(fortran_no_archs)" \
+	  -Dlibgc_no_archs="$(libgc_no_archs)" \
+	  -Dcheck_no_archs="$(check_no_archs)" \
+	  -Dlocale_no_archs="$(locale_no_archs)" \
+	  -Dlinux_gnu_archs="$(linux_gnu_archs)" \
+	  -Dbiarch32_archs="$(strip $(subst /, ,$(biarch32_archs)))" \
+	  -Dbiarch64_archs="$(strip $(subst /, ,$(biarch_archs)))" \
+		debian/control.m4 > debian/control.tmp2
+	uniq debian/control.tmp2 | sed '/^Build/s/ *, */, /g' \
+		> debian/control.tmp
+	rm -f debian/control.tmp2
+	[ -e debian/control ] \
+	  && cmp -s debian/control debian/control.tmp \
+	  && rm -f debian/control.tmp && exit 0; \
+	  mv debian/control.tmp debian/control; touch $(control_stamp)
+
+substvars-file:
+	rm -f debian/substvars.local.tmp
+	( \
+		echo 'gcc:Version=$(DEB_GCC_VERSION)'; \
+		echo 'gcc:EpochVersion=$(DEB_EVERSION)'; \
+		echo 'gcc:SoftVersion=$(DEB_GCC_SOFT_VERSION)'; \
+		echo 'gpc:Version=$(DEB_GPC_VERSION)'; \
+		echo 'gcj:Version=$(DEB_GCJ_VERSION)'; \
+		echo 'gcj:SoftVersion=$(DEB_GCJ_SOFT_VERSION)'; \
+		echo 'gcj:BaseVersion=$(BASE_VERSION)'; \
+		echo 'gnat:Version=$(DEB_GNAT_VERSION)'; \
+		echo 'binutils:Version=$(BINUTILSV)'; \
+		echo 'dep:libgcc=$(LIBGCC_DEP)'; \
+		echo 'dep:libgccbiarch=$(LIBGCC_BIARCH_DEP)'; \
+		echo 'dep:libcdev=$(LIBC_DEV_DEP)'; \
+		echo 'dep:libcbiarch=$(LIBC_BIARCH_DEP)'; \
+		echo 'dep:libcbiarchdev=$(LIBC_BIARCH_DEV_DEP)'; \
+		echo 'dep:libunwinddev=$(LIBUNWIND_DEV_DEP)'; \
+		echo 'dep:libcxxbiarch=$(LIBCXX_BIARCH_DEP)'; \
+		echo 'dep:libcxxbiarchdbg=$(LIBCXX_BIARCH_DBG_DEP)'; \
+		echo 'dep:libgnat=$(LIBGNAT_DEP)'; \
+	) > debian/substvars.local.tmp
+ifneq (,$(filter $(DEB_TARGET_ARCH), $(multilib_archs)))
+	( \
+		echo 'gcc:multilib=gcc-$(BASE_VERSION)-multilib$(TS)'; \
+		echo 'gxx:multilib=g++-$(BASE_VERSION)-multilib$(TS)'; \
+		echo 'gobjc:multilib=gobjc-$(BASE_VERSION)-multilib$(TS)'; \
+		echo 'gobjcxx:multilib=gobjc++-$(BASE_VERSION)-multilib$(TS)'; \
+		echo 'gfortran:multilib=gfortran-$(BASE_VERSION)-multilib$(TS)'; \
+	) >> debian/substvars.local.tmp
+endif
+ifeq ($(with_libssp),yes)
+	echo 'dep:libssp=libssp$(SSP_SONAME) (>= $${gcc:Version})' \
+		>> debian/substvars.local.tmp
+endif
+ifeq ($(with_libgomp),yes)
+	echo 'dep:libgomp=libgomp$(GOMP_SONAME) (>= $${gcc:Version})' \
+		>> debian/substvars.local.tmp
+endif
+ifeq ($(with_lib32fortran),yes)
+	echo 'dep:libfortranbiarch=lib32gfortran$(FORTRAN_SONAME) (>= $${gcc:Version})' \
+		>> debian/substvars.local.tmp
+endif
+ifeq ($(with_lib32objc),yes)
+	echo 'dep:libobjcbiarch=lib32objc$(OBJC_SONAME) (>= $${gcc:Version})' \
+		>> debian/substvars.local.tmp
+endif
+ifeq ($(with_lib32ffi),yes)
+	echo 'sug:libffidev=lib32ffi$(FFI_SONAME)' \
+		>> debian/substvars.local.tmp
+endif
+ifeq ($(with_lib32mudflap),yes)
+	echo 'dep:libmudflapbiarch=lib32mudflap$(MUDFLAP_SONAME)' \
+		>> debian/substvars.local.tmp
+endif
+ifeq ($(with_lib32ssp),yes)
+	echo 'dep:libsspbiarch=lib32ssp$(SSP_SONAME) (>= $${gcc:Version})' \
+		>> debian/substvars.local.tmp
+endif
+ifeq ($(with_lib32gomp),yes)
+	echo 'dep:libgompbiarch=lib32gomp$(GOMP_SONAME) (>= $${gcc:Version})' \
+		>> debian/substvars.local.tmp
+endif
+ifeq ($(with_lib64fortran),yes)
+	echo 'dep:libfortranbiarch=lib64gfortran$(FORTRAN_SONAME) (>= $${gcc:Version})' \
+		>> debian/substvars.local.tmp
+endif
+ifeq ($(with_lib64objc),yes)
+	echo 'dep:libobjcbiarch=lib64objc$(OBJC_SONAME) (>= $${gcc:Version})' \
+		>> debian/substvars.local.tmp
+endif
+ifeq ($(with_lib64ffi),yes)
+	echo 'dep:libffidev=lib64ffi$(FFI_SONAME)' \
+		>> debian/substvars.local.tmp
+endif
+ifeq ($(with_lib64mudflap),yes)
+	echo 'dep:libmudflapbiarch=lib64mudflap$(MUDFLAP_SONAME)' \
+		>> debian/substvars.local.tmp
+endif
+ifeq ($(with_lib64ssp),yes)
+	echo 'dep:libsspbiarch=lib64ssp$(SSP_SONAME) (>= $${gcc:Version})' \
+		>> debian/substvars.local.tmp
+endif
+ifeq ($(with_lib64gomp),yes)
+	echo 'dep:libgompbiarch=lib64gomp$(GOMP_SONAME) (>= $${gcc:Version})' \
+		>> debian/substvars.local.tmp
+endif
+ifneq ($(with_standalone_gcj),yes)
+	echo 'dep:gcj=gcc$(pkg_ver) (>= $(DEB_GCC_SOFT_VERSION))' \
+		>> debian/substvars.local.tmp
+endif
+#ifneq (,$(findstring gtk, $(java_awt_peers)))
+#	echo 'pkg:gcjgtk=libgcj$(subst 0,,$(GCJ_SONAME))-awt-gtk (>= $(DEB_GCJ_VERSION))' \
+#		>> debian/substvars.local.tmp
+#endif
+#ifneq (,$(findstring qt, $(java_awt_peers)))
+#	echo 'pkg:gcjqt=libgcj$(subst 0,,$(GCJ_SONAME))-awt-qt (>= $(DEB_GCJ_VERSION))' \
+#		>> debian/substvars.local.tmp
+#endif
+ifeq ($(DEB_HOST_ARCH),hppa)
+	echo 'dep:prctl=prctl' >> debian/substvars.local.tmp
+endif
+ifeq ($(DEB_HOST_ARCH),hppa)
+	echo 'dep:prctl=prctl' >> debian/substvars.local.tmp
+endif
+	[ -e debian/substvars.local ] \
+	  && cmp -s debian/substvars.local debian/substvars.local.tmp \
+	  && rm -f debian/substvars.local.tmp && exit 0; \
+	  mv debian/substvars.local.tmp debian/substvars.local; \
+	  touch $(control_stamp)
+
+parameters-file:
+	rm -f debian/rules.parameters.tmp
+	( \
+		echo '# configuration parameters taken from upstream source files'; \
+		echo 'GCC_VERSION	:= $(GCC_VERSION)'; \
+		echo 'NEXT_GCC_VERSION	:= $(NEXT_GCC_VERSION)'; \
+		echo 'BASE_VERSION	:= $(BASE_VERSION)'; \
+		echo 'SOURCE_VERSION	:= $(SOURCE_VERSION)'; \
+		echo 'DEB_VERSION	:= $(DEB_VERSION)'; \
+		echo 'DEB_EVERSION	:= $(DEB_EVERSION)'; \
+		echo 'GPC_BASE_VERSION	:= $(GPC_BASE_VERSION)'; \
+		echo 'DEB_GPC_VERSION	:= $(DEB_GPC_VERSION)'; \
+		echo 'DEB_SOVERSION	:= $(DEB_SOVERSION)'; \
+		echo 'DEB_SOEVERSION	:= $(DEB_SOEVERSION)'; \
+		echo 'DEB_LIBGCC_SOVERSION	:= $(DEB_LIBGCC_SOVERSION)'; \
+		echo 'DEB_LIBGCC_VERSION	:= $(DEB_LIBGCC_VERSION)'; \
+		echo 'DEB_STDCXX_SOVERSION	:= $(DEB_STDCXX_SOVERSION)'; \
+		echo 'DEB_GCJ_SOVERSION	:= $(DEB_GCJ_SOVERSION)'; \
+		echo 'PKG_GCJ_EXT	:= $(PKG_GCJ_EXT)'; \
+		echo 'PKG_LIBGCJ_EXT	:= $(PKG_LIBGCJ_EXT)'; \
+		echo 'DEB_FFI_SOVERSION	:= $(DEB_FFI_SOVERSION)'; \
+		echo 'DEB_GOMP_SOVERSION	:= $(DEB_GOMP_SOVERSION)'; \
+		echo 'DEB_GCCMATH_SOVERSION	:= $(DEB_GCCMATH_SOVERSION)'; \
+		echo 'GCC_SONAME	:= $(GCC_SONAME)'; \
+		echo 'CXX_SONAME	:= $(CXX_SONAME)'; \
+		echo 'FORTRAN_SONAME	:= $(FORTRAN_SONAME)'; \
+		echo 'OBJC_SONAME	:= $(OBJC_SONAME)'; \
+		echo 'GCJ_SONAME	:= $(GCJ_SONAME)'; \
+		echo 'GNAT_VERSION	:= $(GNAT_VERSION)'; \
+		echo 'GNAT_SONAME	:= $(GNAT_SONAME)'; \
+		echo 'FFI_SONAME	:= $(FFI_SONAME)'; \
+		echo 'MUDFLAP_SONAME	:= $(MUDFLAP_SONAME)'; \
+		echo 'SSP_SONAME	:= $(SSP_SONAME)'; \
+		echo 'GOMP_SONAME	:= $(GOMP_SONAME)'; \
+		echo 'GCCMATH_SONAME	:= $(GCCMATH_SONAME)'; \
+		echo 'LIBC_DEP		:= $(LIBC_DEP)'; \
+	) > debian/rules.parameters.tmp
+	[ -e debian/rules.parameters ] \
+	  && cmp -s debian/rules.parameters debian/rules.parameters.tmp \
+	  && rm -f debian/rules.parameters.tmp && exit 0; \
+	  mv debian/rules.parameters.tmp debian/rules.parameters; \
+	  touch $(control_stamp)
+
+versioned-files:
+	fs=`echo debian/*-BV* debian/*GCJ* debian/*CXX* debian/*LC* debian/*FFI*|sort -u`; \
+	for f in $$fs; do \
+	  [ -f $$f ] || echo "CANNOT FIND $$f"; \
+	  [ -f $$f ] || continue; \
+	  f2=$$(echo $$f \
+		| sed 's/BV/$(BASE_VERSION)/;s/PV/$(GPC_BASE_VERSION)/;s/CXX/$(CXX_SONAME)/;s/LGCJ/$(PKG_LIBGCJ_EXT)/;s/GCJ/$(PKG_GCJ_EXT)/;s/LC/$(GCC_SONAME)/;s/FFI/$(FFI_SONAME)/'); \
+	  sed -e 's/@BV@/$(BASE_VERSION)/g' \
+	      -e 's/@PV@/$(GPC_BASE_VERSION)/g' \
+	      -e 's/@CXX@/$(CXX_SONAME)/g' \
+	      -e 's/@LGCJ@/$(PKG_LIBGCJ_EXT)/g' \
+	      -e 's/@GCJ@/$(PKG_GCJ_EXT)/g' \
+	      -e 's/@LC@/$(GCC_SONAME)/g' \
+	      -e 's/@FFI@/$(FFI_SONAME)/g' \
+	      -e 's/@GFDL@/$(if $(filter yes,$(GFDL_INVARIANT_FREE)),#)/g' \
+	    $$f > $$f2; \
+	  touch -r $$f $$f2; \
+	done
--- gcj-4.2-4.2-20070707.orig/debian/gcc-BV-doc.doc-base.gomp
+++ gcj-4.2-4.2-20070707/debian/gcc-BV-doc.doc-base.gomp
@@ -0,0 +1,15 @@
+Document: gcc-@BV@-gomp
+Title: The GNU OpenMP Implementation (for GCC @BV@)
+Author: Various
+Abstract: This manual documents the usage of libgomp, the GNU implementation
+ of the OpenMP Application Programming Interface (API) for multi-platform
+ shared-memory parallel programming in C/C++ and Fortran.
+Section: Apps/Programming
+
+Format: html
+Index: /usr/share/doc/gcc-@BV@-base/libgomp.html
+Files: /usr/share/doc/gcc-@BV@-base/libgomp.html
+
+Format: info
+Index: /usr/share/info/libgomp-@BV@.info.gz
+Files: /usr/share/info/libgomp-@BV@*
--- gcj-4.2-4.2-20070707.orig/debian/libgcjLGCJ.postinst
+++ gcj-4.2-4.2-20070707/debian/libgcjLGCJ.postinst
@@ -0,0 +1,12 @@
+#! /bin/sh -e
+
+case "$1" in
+    configure)
+	docdir=/usr/share/doc/libgcj@GCJ@
+	if [ -d $docdir ] && [ ! -h $docdir ]; then
+	  rm -rf /usr/share/doc/libgcj@GCJ@
+	  ln -s gcj-@BV@-base /usr/share/doc/libgcj@GCJ@
+	fi
+esac
+
+#DEBHELPER#
--- gcj-4.2-4.2-20070707.orig/debian/libstdc++CXX.postinst
+++ gcj-4.2-4.2-20070707/debian/libstdc++CXX.postinst
@@ -0,0 +1,12 @@
+#! /bin/sh -e
+
+case "$1" in
+    configure)
+	docdir=/usr/share/doc/libstdc++@CXX@
+	if [ -d $docdir ] && [ ! -h $docdir ]; then
+	    rm -rf $docdir
+	    ln -s gcc-@BV@-base $docdir
+	fi
+esac
+
+#DEBHELPER#
--- gcj-4.2-4.2-20070707.orig/debian/gij-wrapper-BV.1
+++ gcj-4.2-4.2-20070707/debian/gij-wrapper-BV.1
@@ -0,0 +1,22 @@
+.TH GIJ-WRAPPER 1 "August 11, 2001" gij-wrapper "Java User's Manual"
+.SH NAME
+gij-wrapper \- a wrapper around gij
+
+.SH SYNOPSIS
+gij-wrapper [\fB\s-1OPTION\s0\fR] ... \fI\s-1JARFILE\s0\fR [\fI\s-1ARGS\s0\fR...]
+.PP
+gij-wrapper [\fB\-jar\fR] [\fB\s-1OPTION\s0\fR] ... \fI\s-1CLASS\s0\fR [\fI\s-1ARGS\s0\fR...]
+
+.SH DESCRIPTION
+
+\fBgij-wrapper\fR is a wrapper around gij(1) to be called as the java
+interpreter. Options different for java(1) and gij(1) are translated,
+options unknown to gij(1) are silently ignored.
+
+.SH OPTIONS
+See gij-@BV@(1) for a list of options that gij understands.
+
+.SH "SEE ALSO"
+.BR gij-@BV@(1)
+,
+.BR java(1)
--- gcj-4.2-4.2-20070707.orig/debian/NEWS.html
+++ gcj-4.2-4.2-20070707/debian/NEWS.html
@@ -0,0 +1,494 @@
+  <?xml version="1.0" encoding="ISO-8859-1"?>
+  <!DOCTYPE html
+            PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+            "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+ 
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+
+     <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  
+  
+   <head>
+ 
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+    <link rev="made" href="mailto:gcc@gcc.gnu.org" />
+    <link rel="shortcut icon" href="http://gcc.gnu.org/favicon.ico" />
+    <link rel="stylesheet" type="text/css" href="/gnu.css" />
+    <link rel="stylesheet" type="text/css" href="http://gcc.gnu.org/gcc.css" />
+  
+ <title>
+GCC 4.2 Release Series &mdash; Changes, New Features, and Fixes
+- GNU Project - Free Software Foundation (FSF)</title>
+   </head>
+ 
+
+<!-- GCC maintainers, please do not hesitate to update/contribute entries
+     concerning those part of GCC you maintain!  2002-03-23, Gerald.
+-->
+
+<body bgcolor="#FFFFFF" text="#000000" link="#1F00FF" alink="#FF0000" vlink="#9900DD">
+
+
+
+<h1 align="center">
+GCC 4.2 Release Series<br />Changes, New Features, and Fixes
+</h1>
+
+<h2>Caveats</h2>
+
+<ul>
+  <li>GCC no longer accepts the <code>-fshared-data</code> option.
+      This option has had no effect in any GCC 4 release; the targets
+      to which the option used to apply had been removed before GCC 4.0.</li>
+</ul>
+
+<h2>General Optimizer Improvements</h2>
+
+<ul>
+  <li><p>New command-line options specify the possible relationships among
+    parameters and between parameters and global data.  For example,
+    <code>-fargument-noalias-anything</code> specifies that arguments
+    do not alias any other storage.</p>
+
+    <p>Each language will automatically use whatever option is required
+    by the language standard.  You should not need to use these options
+    yourself.</p></li>
+</ul>
+
+<h2>New Languages and Language specific improvements</h2>
+
+<ul>
+    <li><a href="../projects/gomp/">OpenMP</a> is now
+        supported for the C, C++ and Fortran compilers.</li>
+
+    <li>New command line options <code>-fstrict-overflow</code> and
+    <code>-Wstrict-overflow</code> have been added.
+    <code>-fstrict-overflow</code> tells the compiler that it may
+    assume that the program follows the strict signed overflow
+    semantics permitted for the language: for C and C++ this means
+    that the compiler may assume that signed overflow does not occur.
+    For example, a loop like
+    <pre>
+      for (i = 1; i > 0; i *= 2)
+    </pre>
+    is presumably intended to continue looping until <code>i</code>
+    overflows.  With <code>-fstrict-overflow</code>, the compiler may
+    assume that signed overflow will not occur, and transform this
+    into an infinite loop.  <code>-fstrict-overflow</code> is turned
+    on by default at <code>-O2</code>, and may be disabled via
+    <code>-fno-strict-overflow</code>.  The
+    <code>-Wstrict-overflow</code> option may be used to warn about
+    cases where the compiler assumes that signed overflow will not
+    occur.  It takes five different levels:
+    <code>-Wstrict-overflow=1</code> to <code>5</code>.  See the
+    <a href="http://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html">
+    documentation</a> for details.  <code>-Wstrict-overflow=1</code>
+    is enabled by <code>-Wall</code>.</li>
+
+    <li>The new command line option <code>-fno-toplevel-reorder</code>
+    directs GCC to emit top-level functions, variables, and
+    <code>asm</code> statements in the same order that they appear in
+    the input file.  This is intended to support existing code which
+    relies on a particular ordering (for example, code which uses
+    top-level <code>asm</code> statements to switch sections).  For
+    new code, it is generally better to use function and variable
+    attributes.  The <code>-fno-toplevel-reorder</code> option may be
+    used for most cases which currently use
+    <code>-fno-unit-at-a-time</code>.  The
+    <code>-fno-unit-at-a-time</code> option will be removed in some
+    future version of GCC.  If you know of a case which requires
+    <code>-fno-unit-at-a-time</code> which is not fixed by
+    <code>-fno-toplevel-reorder</code>, please <a
+    href="http://gcc.gnu.org/bugs.html">open a bug report</a>.</li>
+
+</ul>
+
+<h3>C family</h3>
+
+  <ul>
+    <li>The pragma <code>redefine_extname</code> will now 
+        macro expand its tokens for compatibility with 
+        SunPRO.</li>
+
+    <li>In the next release of GCC, 4.3, <code>-std=c99</code> or
+        <code>-std=gnu99</code> will direct GCC to handle inline
+        functions as specified in the C99 standard.  In preparation
+        for this, GCC 4.2 will warn about any use of non-static inline
+        functions in gnu99 or c99 mode.  This new warning may be
+        disabled with the new <code>gnu_inline</code> function
+        attribute or the new <code>-fgnu89-inline</code> command line
+        option.  Also, GCC 4.2 and later will define one of the
+        preprocessor macros <code>__GNUC_GNU_INLINE__</code> or
+        <code>__GNUC_STDC_INLINE__</code> to indicate the semantics of
+        inline functions in the current compilation.</li>
+
+    <li>A new command line option <code>-Waddress</code> has been
+        added to warn about suspicious uses of memory addresses as,
+        for example, using the address of a function in a conditional
+        expression, and comparisons against the memory address of a
+        string literal.  This warning is enabled by
+        <code>-Wall</code>.</li>
+
+  </ul>
+
+<h3>C++</h3>
+
+  <ul>
+    <li>
+      <p>C++ visibility handling has been overhauled.</p>
+
+      <p>Restricted visiblity is propagated from classes to members, from
+      functions to local statics, and from templates and template arguments
+      to instantiations, unless the latter has explicitly declared visibility.
+      </p>
+
+      <p>The visibility attribute for a class must come between the class-key
+      and the name, not after the closing brace.</p>
+
+      <p>Attributes are now allowed for enums and elaborated-type-specifiers
+      that only declare a type.</p>
+
+      <p>Members of the anonymous namespace are now local to a particular
+      translation unit, along with any other declarations which use them,
+      though they are still treated as having external linkage for language
+      semantics.</p>
+    </li>
+
+    <li>
+     The (undocumented) extension which permitted templates with
+     default arguments to be bound to template template parameters with
+     fewer parameters has been removed.  For example:
+
+      <pre>
+	template &lt;template &lt;typename&gt; class C&gt;
+	void f(C&lt;double&gt;) {}
+
+	template &lt;typename T, typename U = int&gt;
+	struct S {};
+
+	template void f(S&lt;double&gt;);
+      </pre>      
+
+     is no longer accepted by G++.  The reason this code is not
+     accepted is that <code>S</code> is a template with two parameters;
+     therefore, it cannot be bound to <code>C</code> which has only
+     one parameter.
+    </li>
+
+    <li>
+     The <code>&lt;?</code>, <code>&gt;?</code>, <code>&lt;?=</code>,
+     and <code>&gt;?=</code> operators,
+     deprecated in previous GCC releases, have been removed.
+    </li>
+
+    <li>
+     The command line option <code>-fconst-strings</code>, deprecated in
+     previous GCC releases, has been removed.
+    </li>
+
+    <li>
+     The configure variable <code>enable-__cxa_atexit</code> is now enabled by
+     default for more targets.  Enabling this variable is necessary in order for
+     static destructors to be executed in the correct order, but it depends upon
+     the presence of a non-standard C library in the target library in order to
+     work.  The variable is now enabled for more targets which are known to have
+     suitable C libraries.
+     </li>
+     <li>
+     <code>-Wextra</code> will produce warnings for <code>if</code> statements
+     with a semicolon as the only body, to catch code like:
+
+     <pre>
+         if (a);
+            return 1;
+         return 0;
+     </pre>
+
+     To suppress the warning in valid cases, use <code>{ }</code> instead.
+    </li>
+    <li>
+     The C++ frontend now also produces strict aliasing warnings when
+     <code>-fstrict-aliasing -Wstrict-aliasing</code> is in effect.
+    </li>
+  </ul> 
+
+  <h4>Runtime Library (libstdc++)</h4>
+  <ul>
+    <li>Added support for TR1 &lt;random&gt;, &lt;complex&gt;, and C
+    compatibility headers. In addition, a lock-free version of
+    <code>shared_ptr</code> was contributed as part of Phillip
+    Jordan's Google Summer of Code project on lock-free
+    containers. The implementation status for TR1 can be tracked in <a
+    href="http://gcc.gnu.org/onlinedocs/libstdc++/ext/tr1.html">tr1.html</a> 
+   </li>
+   <li>In association with the Summer of Code work on lock-free
+   containers, the interface for atomic builtins was adjusted,
+   creating simpler alternatives for non-threaded code paths. Also,
+   usage was consolidated and all elements were moved from
+   <code>namespace std</code> to
+   <code>namespace__gnu_cxx</code>. Affected interfaces are the
+   functions <code>__exchange_and_add</code>,
+   <code>__atomic_add</code>, and the objects <code>__mutex</code>,
+   <code>__recursive_mutex</code>, and
+   <code>__scoped_lock</code>. </li>
+   <li>Support for versioning weak symbol names via namespace
+   association was added. However, as this changes the names of
+   exported symbols, this is turned off by default in the current
+   ABI. Intrepid users can enable this feature by using 
+   <code>--enable-symvers=gnu-versioned-namespace</code> during configuration.
+   </li>
+   <li>Revised, simplified, and expanded policy-based associative
+   containers, including data types for tree and trie forms
+   (<code>basic_tree</code>, <code>tree</code>, <code>trie</code>),
+   lists (<code>list_update</code>), and both collision-chaining and
+   probing hash-based containers (<code>basic_hash_table</code>,
+   <code>cc_hash_table</code>, <code>gp_hash_table</code>). More details
+   per the <a href="http://gcc.gnu.org/onlinedocs/libstdc++/ext/pb_ds/index.html">documentation.</a>
+   </li>
+   <li>The implementation of the debug mode was modified, whereby the
+   debug namespaces were nested inside of <code>namespace std</code>
+   and <code>namespace __gnu_cxx</code> in order to resolve some long
+   standing corner cases involving name lookup. Debug
+   functionality from the policy-based data structures was
+   consolidated and enabled with the single macro,
+   <code>_GLIBCXX_DEBUG</code>. See PR 26142 for more
+   information.</li>
+   <li> Added extensions for type traits:
+   <code>__conditional_type</code>, <code>__numeric_traits</code>,
+   <code>__add_unsigned</code>, <code>__removed_unsigned</code>,
+   <code>__enable_if</code>. </li>
+   <li> Added a typelist implementation for compile-time
+   meta-programming. Elements for typelist construction and operation can be 
+   found within <code>namespace __gnu_cxx::typelist</code>.</li>
+   <li> Added a new allocator, <code>__gnu_cxx::throw_allocator</code>, for
+testing exception-safety.</li>
+   <li> Enabled library-wide visibility control, allowing
+   <code>-fvisibility</code> to be used.</li>
+   <li> Consolidated all nested namespaces and the
+   conversion of <code>__gnu_internal</code> implementation-private
+   details to anonymous namespaces whenever possible.</li>
+   <li>Implemented LWG resolutions DR 431 and DR 538.</li>
+  </ul>
+
+<h3>Fortran</h3>
+  <ul>
+    <li>Support for allocatable components has been added (TR 15581 and
+        Fortran 2003).</li>
+    <li>Support for the Fortran 2003 streaming IO extension has been
+        added.</li>
+    <li>The GNU Fortran compiler now uses 4-byte record markers by default
+    for unformatted files to be compatible with g77 and most other compilers.
+    The implementation allows for records greater than 2 GB and  is compatible
+    with several other compilers. Older versions of gfortran used 8-byte
+    record markers by default (on most systems). In order to change the length
+    of the record markers, e.g. to read unformatted files created by older
+    gfortran versions, the <code>
+    <a href="http://gcc.gnu.org/onlinedocs/gfortran/Runtime-Options.html"
+    >-frecord-marker=8</a></code> option can be used.</li>
+  </ul>
+
+
+<h3>Java (GCJ)</h3>
+
+  <ul>
+    <li>
+     A new command line option <code>-static-libgcj</code> has been
+     added for targets that use a linker compatible with GNU Binutils.
+     As its name implies, this causes libgcj to be linked statically.
+     In some cases this causes the resulting executable to start
+     faster and use less memory than if the shared version of libgcj
+     were used.  However caution should be used as it can also cause
+     essential parts of the library to be omitted.  Some of these issues are
+     discussed in:
+      <a href="http://gcc.gnu.org/wiki/Statically%20linking%20libgcj">
+	   http://gcc.gnu.org/wiki/Statically%20linking%20libgcj
+      </a>
+    </li>
+
+    <li><code>fastjar</code> is no longer bundled with GCC.  To build
+        libgcj, you will need either InfoZIP (both <code>zip</code>
+        and <code>unzip</code>) or an external <code>jar</code> program.
+        In the former case, the GCC build will install a <code>jar</code>
+        shell script that is based on InfoZIP and provides the same
+	functionality as <code>fastjar</code>.</li>
+  </ul>
+
+
+<h2>New Targets and Target Specific Improvements</h2>
+
+<h3>IA-32/x86-64</h3>
+  <ul>
+    <li><code>-mtune=generic</code> can now be used to generate code running
+        well on common x86 chips. This includes AMD Athlon,
+	AMD Opteron, Intel Pentium-M, Intel Pentium 4 and Intel Core 2.</li>
+    <li><code>-mtune=native</code> and <code>-march=native</code> will produce
+        code optimized for the host architecture as detected using the
+	<code>cpuid</code> instruction.</li>
+    <li>Added a new command line option <code>-fstackrealign</code> and
+        and <code>__attribute__ ((force_align_arg_pointer))</code>
+        to realign the stack at runtime.  This allows functions compiled
+        with a vector-aligned stack to be invoked from legacy objects
+        that keep only word-alignment.</li>
+  </ul>
+
+<h3>SPARC</h3>
+  <ul>
+    <li>The default CPU setting has been changed from V7 to V9 in 32-bit
+	mode on Solaris 7 and above.  This is already the case in 64-bit
+	mode.  It can be overridden by specifying <code>--with-cpu</code>
+	at configure time.</li>
+    <li>Back-end support of built-in functions for atomic memory access
+	has been implemented.</li>
+    <li>Support for the Sun UltraSPARC T1 (Niagara) processor has been
+	added.</li>
+  </ul>
+
+<h3>M32C</h3>
+  <ul>
+    <li>Various bug fixes have made some functions (notably, functions
+        returning structures) incompatible with previous releases.
+        Recompiling all libraries is recommended.  Note that code
+        quality has considerably improved since 4.1, making a
+        recompile even more beneficial.</li>
+  </ul>
+
+<h3>MIPS</h3>
+  <ul>
+    <li>Added support for the Broadcom SB-1A core.</li>
+  </ul>
+
+<h3>IA-64</h3>
+  <ul>
+    <li>Added support for IA-64 data and control speculation.  By default
+        speculation is enabled only during second scheduler pass.  A number of
+        machine flags was introduced to control the usage of speculation for both
+        scheduler passes.</li>
+  </ul>
+
+<h3>HPPA</h3>
+  <ul>
+    <li> Added Java language support (libffi and libjava) for 32-bit
+         HP-UX 11 target.</li>
+  </ul>
+
+
+<h2><a name="obsolete_systems">Obsolete Systems</a></h2>
+
+<h2>Documentation improvements</h2>
+
+<h3>PDF Documentation</h3>
+  <ul>
+    <li><p>A <code>make pdf</code> target has been added to the 
+        top-level makefile, enabling automated production of PDF
+        documentation files.  (Front-ends external to GCC should modify
+        their <code>Make-lang.in</code> file to add a <code>lang.pdf:</code>
+        target.)</p></li>
+  </ul>
+
+<h2>Other significant improvements</h2>
+
+<h3>Build system improvements</h3>
+  <ul>
+    <li><p>All the components of the compiler are now bootstrapped by
+        default.  This improves the resilience to bugs in the system
+        compiler or binary compatibility problems, as well as providing
+        better testing of GCC 4.2 itself.  In addition, if you build
+	the compiler from a combined tree, the assembler, linker, etc.
+	will also be bootstrapped (i.e. built with themselves).</p>
+
+        <p>You can disable this behavior, and go back to
+	the pre-GCC 4.2 set up, by configuring GCC with
+	<code>--disable-bootstrap</code>.</p></li>
+
+    <li><p>The rules that <code>configure</code> follows to find target tools
+        resemble more closely the locations that the built compiler
+        will search.  In addition, you can use the new configure option
+        <code>--with-target-tools</code> to specify where to find the
+        target tools used during the build, without affecting what the
+        built compiler will use.</p>
+
+        <p>This can be especially useful when building packages of
+        GCC.  For example, you may want to build GCC with
+        GNU <code>as</code> or <code>ld</code>, even if the resulting compiler
+        to work with the native assembler and linker.  To do so, you
+        can use <code>--with-target-tools</code> to point to the native
+        tools.</p></li>
+  </ul>
+
+<h3>Incompatible changes to the build system</h3>
+  <ul>
+    <li>Front-ends external to GCC should modify their
+	<code>Make-lang.in</code> file to replace double-colon rules (e.g.
+	<code>dvi::</code>) with normal rules (like <code>lang.dvi:</code>).
+	Front-end makefile hooks do not use double-colon rules anymore.</li>
+
+    <li>Up to GCC 4.1, a popular way to specify the target tools used
+        during the build was to create directories named <code>gas</code>,
+	<code>binutils</code>, etc. in the build tree, and create
+	links to the tools from there.	This does not work any more
+	when the compiler is bootstrapped.  The new configure option
+	<code>--with-target-tools</code> provides a better way to achieve
+	the same effect, and works for all native and cross settings.</li>
+  </ul>
+
+
+
+<!-- ==================================================================== -->
+
+<div class="copyright">
+
+<p>Please send FSF &amp; GNU inquiries &amp; questions to
+<a href="mailto:gnu@gnu.org">gnu@gnu.org</a>.
+There are also <a href="http://www.gnu.org/home.html#ContactInfo">other ways
+to contact</a> the FSF.</p>
+
+<p>These pages are maintained by
+<a href="http://gcc.gnu.org/about.html">the GCC team</a>.</p>
+
+<address>For questions related to the use of GCC, please consult these web
+pages and the <a href="http://gcc.gnu.org/onlinedocs/">GCC manuals</a>. If
+that fails, the <a href="mailto:gcc-help@gcc.gnu.org">gcc-help@gcc.gnu.org</a>
+mailing list might help.<br />
+Please send comments on these web pages and the development of GCC to our
+developer mailing list at <a href="mailto:gcc@gnu.org">gcc@gnu.org</a>
+or <a href="mailto:gcc@gcc.gnu.org">gcc@gcc.gnu.org</a>.  All of our lists
+have <a href="http://gcc.gnu.org/lists.html">public archives</a>.
+</address>
+
+<p>Copyright (C) Free Software Foundation, Inc.,
+51 Franklin St, Fifth Floor, Boston, MA 02110, USA.</p>
+<p>Verbatim copying and distribution of this entire article is
+permitted in any medium, provided this notice is preserved.</p>
+
+<table width="100%" border="0"><tr><td>
+  <!-- IGNORE DIFF -->Last modified 2007-05-12
+</td><td align="right" valign="bottom">
+  <a href="http://validator.w3.org/check/referer">
+      <img src="http://www.w3.org/Icons/valid-xhtml10"
+     alt="Valid XHTML 1.0" border="0" width="88" height="31" />
+   
+  </a>
+</td></tr></table>
+
+</div>
+
+<!-- ==================================================================== -->
+
+</body>
+     </html>
+  
+ 
--- gcj-4.2-4.2-20070707.orig/debian/fastjar.postinst
+++ gcj-4.2-4.2-20070707/debian/fastjar.postinst
@@ -0,0 +1,14 @@
+#! /bin/sh -e
+
+if [ -f /usr/share/info/fastjar.info.gz ]; then
+  install-info --quiet --section "Development" "Development" \
+	/usr/share/info/fastjar.info.gz
+else
+  # GFDL invariant free
+  true
+fi
+
+update-alternatives --quiet --install /usr/bin/jar jar /usr/bin/fastjar 40 \
+  --slave /usr/share/man/man1/jar.1.gz jar.1.gz /usr/share/man/man1/fastjar.1.gz
+
+#DEBHELPER#
--- gcj-4.2-4.2-20070707.orig/debian/libgcjGCJ-dev.overrides
+++ gcj-4.2-4.2-20070707/debian/libgcjGCJ-dev.overrides
@@ -0,0 +1 @@
+libgcj@GCJ@-dev: library-not-linked-against-libc
--- gcj-4.2-4.2-20070707.orig/debian/gfortran-BV-doc.prerm
+++ gcj-4.2-4.2-20070707/debian/gfortran-BV-doc.prerm
@@ -0,0 +1,5 @@
+#! /bin/sh -e
+
+install-info --quiet --remove gfortran-@BV@
+
+#DEBHELPER#
--- gcj-4.2-4.2-20070707.orig/debian/libgcj-doc.doc-base
+++ gcj-4.2-4.2-20070707/debian/libgcj-doc.doc-base
@@ -0,0 +1,10 @@
+Document: libgcj-doc
+Title: The GNU LibGCJ Classpath library
+Author: Various
+Abstract: Autogenerated documentation describing the libgcj
+ library (GCC 4.2), based on the classpath library.
+Section: Apps/Programming
+
+Format: html
+Index: /usr/share/doc/gcj-4.2-base/html/index.html
+Files: /usr/share/doc/gcj-4.2-base/html/*.html
--- gcj-4.2-4.2-20070707.orig/debian/gnat-BV-doc.doc-base.ug
+++ gcj-4.2-4.2-20070707/debian/gnat-BV-doc.doc-base.ug
@@ -0,0 +1,16 @@
+Document: gnat_ugn_unw-@BV@
+Title: GNAT User's Guide for Unix Platforms
+Author: Various
+Abstract: This guide describes the use of GNAT, a compiler and
+ software development toolset for the full Ada 95 programming language.
+ It describes the features of the compiler and tools, and details how
+ to use them to build Ada 95 applications.
+Section: Apps/Programming
+
+Format: html
+Index: /usr/share/doc/gnat-@BV@-doc/gnat_ugn_unw.html
+Files: /usr/share/doc/gnat-@BV@-doc/gnat_ugn_unw.html
+
+Format: info
+Index: /usr/share/info/gnat_ugn_unw-@BV@.info.gz
+Files: /usr/share/info/gnat_ugn_unw-@BV@*
--- gcj-4.2-4.2-20070707.orig/debian/compat
+++ gcj-4.2-4.2-20070707/debian/compat
@@ -0,0 +1 @@
+4
--- gcj-4.2-4.2-20070707.orig/debian/fixincludes.in
+++ gcj-4.2-4.2-20070707/debian/fixincludes.in
@@ -0,0 +1,8 @@
+#! /bin/sh
+
+PATH="/@LIBEXECDIR@/install-tools:$PATH"
+
+TARGET_MACHINE=`dpkg-architecture -qDEB_HOST_GNU_TYPE`
+export TARGET_MACHINE
+
+exec fixinc.sh "$@"
--- gcj-4.2-4.2-20070707.orig/debian/gij-BV.postrm
+++ gcj-4.2-4.2-20070707/debian/gij-BV.postrm
@@ -0,0 +1,10 @@
+#! /bin/sh -e
+
+case "$1" in
+    purge)
+	rm -f /var/lib/gcj-@BV@/classmap.db
+esac
+
+#DEBHELPER#
+
+exit 0
--- gcj-4.2-4.2-20070707.orig/debian/gnatprj.gpr
+++ gcj-4.2-4.2-20070707/debian/gnatprj.gpr
@@ -0,0 +1,37 @@
+--  Project file for use with GNAT 3.15p
+--  Copyright (c) 2005 Ludovic Brenta <ludovic@ludovic-brenta.org>
+--
+--  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 of the License, or
+--  (at your option) any later version.
+--
+--  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.
+--
+--  This project file is designed to help build applications that use
+--  GNAT project files.  Here is an example of how to use this project file:
+--
+--  with "/usr/share/ada/adainclude/gnatprj";
+--  project Example is
+--     for Object_Dir use "obj";
+--     for Exec_Dir use ".";
+--     for Main use ("example");
+--     package Linker renames Gnatprj.Linker;
+--     --  Alternatively, if you need additional switches:
+--     --  package Linker is
+--     --     for Default_Switches ("Ada") use (Gnatprj.Linker_Switches & ...)
+--     --  end Linker;
+--  end Example;
+
+with "gnatvsn.gpr";
+project Gnatprj is
+   for Source_Dirs use ("/usr/share/ada/adainclude/gnatprj");
+   for Object_Dir use "/usr/lib/ada/adalib/gnatprj";
+   Linker_Switches := "-lgnatprj";
+   package Linker is
+      for Default_Switches ("Ada") use (Linker_Switches);
+   end Linker;
+end Gnatprj;
--- gcj-4.2-4.2-20070707.orig/debian/lib32gcjGCJ-dev.overrides
+++ gcj-4.2-4.2-20070707/debian/lib32gcjGCJ-dev.overrides
@@ -0,0 +1 @@
+lib32gcj@GCJ@-dev: library-not-linked-against-libc
--- gcj-4.2-4.2-20070707.orig/debian/gij-wrapper-BV
+++ gcj-4.2-4.2-20070707/debian/gij-wrapper-BV
@@ -0,0 +1,98 @@
+#!/usr/bin/perl -w
+#
+# Starts the GNU Java interpreter.
+#
+# Command-line arguments should be in the style of Sun's Java runtime;
+# these will be converted to gij arguments before being passed to the
+# gij itself.
+#
+# The Debian JNI module directory and any other specified JNI
+# directories will be included on the JNI search path.
+#
+# Copyright (C) 2002-2003 by Ben Burton <bab@debian.org>
+# Based on the original gij-wrapper-3.2 shell script.
+
+use strict;
+
+# The real Java runtime:
+my $javaRuntime = '/usr/bin/gij-@BV@';
+
+# The debian JNI module directory:
+my $debianJNIDir = '/usr/lib/jni';
+
+# The command-line arguments to pass to the real Java runtime:
+my @commandLine;
+
+# The full JNI search path to use:
+my $JNIPath = '';
+
+# Build the command-line from the arguments given.
+my $parsingOptions = 1;
+
+# Flag used to copy argument to -classpath or -cp.
+my $copyNext = 0;
+foreach my $arg (@ARGV) {
+  if (not $parsingOptions) {
+    # We're done parsing options; just copy all remaining arguments directly.
+    push @commandLine, $arg;
+    next;
+  }
+  if ($copyNext) {
+    push @commandLine, $arg;
+    $copyNext = 0;
+    next;
+  }
+
+  # Try to interpret Sun-style options.
+  if ($arg eq '-version') {
+    push @commandLine, '--version';
+  } elsif ($arg eq '-h' or $arg eq '-help') {
+    push @commandLine, '--help';
+  } elsif ($arg eq '-cp' or $arg eq '--cp') {
+    push @commandLine, '-cp';
+    $copyNext = 1;
+  } elsif ($arg eq '-classpath' or $arg eq '--classpath') {
+    push @commandLine, '-classpath';
+    $copyNext = 1;
+  } elsif ($arg =~ /^-Djava.library.path=(.+)$/) {
+    # A component of the JNI search path has been given.
+    if ($JNIPath) {
+      $JNIPath = $JNIPath . ':' . $1;
+    } else {
+      $JNIPath = $1;
+    }
+  } elsif ($arg eq '-jar' or $arg =~ /^-D/) {
+    # Copy the argument directly.
+    push @commandLine, $arg;
+  } elsif ($arg =~ /^-/) {
+    # An unrecognised option has been passed - just drop it.
+  } else {
+    # Some non-option argument has been given.
+    # Stop parsing options at this point.
+    push @commandLine, $arg;
+    $parsingOptions = 0;
+  }
+}
+
+# Add the debian JNI module directory to the JNI search path if it's not
+# already there.
+if ($JNIPath !~ /(^|:)$debianJNIDir($|:)/) {
+  if ($JNIPath) {
+    $JNIPath = $JNIPath . ':' . $debianJNIDir;
+  } else {
+    $JNIPath = $debianJNIDir;
+  }
+}
+
+# Use environment variable $LTDL_LIBRARY_PATH to store the JNI path,
+# since gij uses libltdl to dlopen JNI modules.
+if ($ENV{LTDL_LIBRARY_PATH}) {
+    $ENV{LTDL_LIBRARY_PATH} = $ENV{LTDL_LIBRARY_PATH} . ':' . $JNIPath;
+} else {
+    $ENV{LTDL_LIBRARY_PATH} = $JNIPath;
+}
+
+# Call the real Java runtime.
+my @fullCommandLine = ( $javaRuntime );
+push @fullCommandLine, @commandLine;
+exec @fullCommandLine or exit(1);
--- gcj-4.2-4.2-20070707.orig/debian/README.Bugs
+++ gcj-4.2-4.2-20070707/debian/README.Bugs
@@ -0,0 +1,304 @@
+Reporting Bugs in the Debian/GNU GNU Compiler Setup
+===================================================
+
+Before reporting a bug, please
+------------------------------
+
+- Check that the behaviour really is a bug. Have a look into some
+  ANSI standards document.
+
+- Check the list of well known bugs: http://gcc.gnu.org/bugs.html#known
+
+- Try to reproduce the bug with a current GCC development snapshot. For
+  Debian GNU/Linux you can get a recent development snapshot from the
+  gcc-snapshot package in the unstable distribution.
+  See: http://packages.debian.org/gcc-snapshot
+
+- Try to find out if the bug is a regression (an older GCC version does
+  not show the bug).
+
+- Check if the bug is already reported in the bug tracking systems.
+
+    Debian:   http://bugs.debian.org/debian-gcc@lists.debian.org
+    Upstream: http://gcc.gnu.org/bugzilla/
+
+
+Where to report a bug
+---------------------
+
+Report bugs found in the packaging of GCC to the Debian bug tracking system.
+See http://www.debian.org/Bugs/ for instructions (or use the reportbug
+script).
+
+Debian's current policy is to closely follow the upstream development and
+only apply a minimal set of patches (which are summarized in the README.Debian
+document).
+
+If you think you have found an upstream bug, you did check the section
+above ("Before reporting a bug") and are able to provide a complete bug
+report (see below "How to report a bug"), then you may help the Debian
+GCC package maintainers, if you report the bug upstream and then submit
+a bug report to the Debian BTS and tell us the upstream report number.
+This way you are able to follow the upstream bug handling as well. If in
+doubt, report the bug to the Debian BTS (but read "How to report a bug"
+below.
+
+
+How to report a bug
+-------------------
+
+There are complete instructions in the gcc info manual (found in the
+gcc-doc package), section Bugs.
+
+The manual can be read using `M-x info' in Emacs, or if the GNU info
+program is installed on your system by `info --node "(gcc)Bugs"'. Or see
+the file BUGS included with the gcc source code.
+
+Online bug reporting instructions can be found at
+
+	http://gcc.gnu.org/bugs.html
+
+[Some paragraphs taken from the above URL]
+
+The main purpose of a bug report is to enable us to fix the bug. The
+most important prerequisite for this is that the report must be
+complete and self-contained, which we explain in detail below.
+
+Before you report a bug, please check the list of well-known bugs and,
+if possible in any way, try a current development snapshot.
+
+Summarized bug reporting instructions
+-------------------------------------
+
+What we need
+
+Please include in your bug report all of the following items, the
+first three of which can be obtained from the output of gcc -v:
+
+    * the exact version of GCC;
+    * the system type;
+    * the options given when GCC was configured/built;
+    * the complete command line that triggers the bug;
+    * the compiler output (error messages, warnings, etc.); and
+    * the preprocessed file (*.i*) that triggers the bug, generated by
+      adding -save-temps to the complete compilation command, or, in
+      the case of a bug report for the GNAT front end, a complete set
+      of source files (see below).
+
+What we do not want
+
+    * A source file that #includes header files that are left out
+      of the bug report (see above)
+    * That source file and a collection of header files.
+    * An attached archive (tar, zip, shar, whatever) containing all
+      (or some :-) of the above.
+    * A code snippet that won't cause the compiler to produce the
+      exact output mentioned in the bug report (e.g., a snippet with
+      just a few lines around the one that apparently triggers the
+      bug, with some pieces replaced with ellipses or comments for
+      extra obfuscation :-)
+    * The location (URL) of the package that failed to build (we won't
+      download it, anyway, since you've already given us what we need
+      to duplicate the bug, haven't you? :-)
+    * An error that occurs only some of the times a certain file is
+      compiled, such that retrying a sufficient number of times
+      results in a successful compilation; this is a symptom of a
+      hardware problem, not of a compiler bug (sorry)
+    * E-mail messages that complement previous, incomplete bug
+      reports. Post a new, self-contained, full bug report instead, if
+      possible as a follow-up to the original bug report
+    * Assembly files (*.s) produced by the compiler, or any binary files,
+      such as object files, executables, core files, or precompiled
+      header files
+    * Duplicate bug reports, or reports of bugs already fixed in the
+      development tree, especially those that have already been
+      reported as fixed last week :-)
+    * Bugs in the assembler, the linker or the C library. These are
+      separate projects, with separate mailing lists and different bug
+      reporting procedures
+    * Bugs in releases or snapshots of GCC not issued by the GNU
+      Project. Report them to whoever provided you with the release
+    * Questions about the correctness or the expected behavior of
+      certain constructs that are not GCC extensions. Ask them in
+      forums dedicated to the discussion of the programming language
+
+
+Known Bugs and Non-Bugs
+-----------------------
+
+[Please see /usr/share/doc/gcc/FAQ or http://gcc.gnu.org/faq.html first]
+
+
+C++ exceptions don't work with C libraries
+------------------------------------------
+
+[Taken from the closed bug report #22769] C++ exceptions don't work
+with C libraries, if the C code wasn't designed to be thrown through.
+A solution could be to translate all C libraries with -fexceptions.
+Mostly trying to throw an exception in a callback function (qsort,
+Tcl command callbacks, etc ...). Example:
+
+    #include <stdio.h>
+    #include <tcl.h>
+
+    class A {};
+
+    static
+    int SortCondition(void const*, void const*)
+    {
+        printf("throwing 'sortcondition' exception\n");
+        throw A();
+    }
+
+    int main(int argc, char *argv[])
+    {
+        int list[2];
+
+        try {
+            SortCondition(NULL,NULL);
+        } catch (A) {
+            printf("caught test-sortcondition exception\n");
+        }
+        try {
+            qsort(&list, sizeof(list)/sizeof(list[0]),sizeof(list[0]),
+                 &SortCondition);
+        } catch (A) {
+            printf("caught real-sortcondition exception\n");
+        }
+        return 0;
+}
+
+Andrew Macleod <amacleod@cygnus.com> responded:
+
+When compiled with the table driven exception handling, exception can only
+be thrown through functions which have been compiled with the table driven EH.
+If a function isn't compiled that way, then we do not have the frame
+unwinding information required to restore the registers when unwinding.
+
+I believe the setjmp/longjmp mechanism will throw through things like this, 
+but its produces much messier code.  (-fsjlj-exceptions)
+
+The C compiler does support exceptions, you just have to turn them on
+with -fexceptions.
+
+Your main options are to:
+  a) Don't use callbacks, or at least don't throw through them.
+  b) Get the source and compile the library with -fexceptions (You have to
+     explicitly turn on exceptions in the C compiler)
+  c) always use -fsjlj-exceptions (boo, bad choice :-)
+
+
+g++: "undefined reference" to static const array in class
+---------------------------------------------------------
+
+The following code compiles under GNU C++ 2.7.2 with correct results,
+but produces the same linker error with GNU C++ 2.95.2.
+Alexandre Oliva <oliva@lsd.ic.unicamp.br> responded:
+
+All of them are correct.  A static data member *must* be defined
+outside the class body even if it is initialized within the class
+body, but no diagnostic is required if the definition is missing.  It
+turns out that some releases do emit references to the missing symbol,
+while others optimize it away.
+
+#include <iostream>
+
+class Test
+{
+  public:
+    Test(const char *q);
+  protected:
+    static const unsigned char  Jam_signature[4]   = "JAM";
+};
+
+Test::Test(const char *q)
+{
+  if (memcmp(q, Jam_signature, sizeof(Jam_signature)) != 0)
+  cerr << "Hello world!\n";
+}
+
+int main(void)
+{
+  Test::Test("JAM");
+  return 0;
+}
+
+g++: g++ causes passing non const ptr to ptr to a func with const arg
+     to cause an error (not a bug)
+---------------------------------------------------------------------
+
+Example:
+
+#include <stdio.h>
+void test(const char **b){
+        printf ("%s\n",*b);
+}
+int main(void){
+        char *test1="aoeu";
+        test(&test1);
+}
+
+make const
+g++     const.cc   -o const
+const.cc: In function `int main()':
+const.cc:7: passing `char **' as argument 1 of `test(const char **)' adds cv-quals without intervening `const'
+make: *** [const] Error 1
+
+Answer from "Martin v. Loewis" <martin@loewis.home.cs.tu-berlin.de>:
+
+> ok... maybe I missed something.. I haven't really kept up with the latest in
+> C++ news.  But I've never heard anything even remotly close to passing a non
+> const var into a const arg being an error before.
+
+Thanks for your bug report. This is a not a bug in the compiler, but
+in your code. The standard, in 4.4/4, puts it that way
+
+# A conversion can add cv-qualifiers at levels other than the first in
+# multi-level pointers, subject to the following rules:
+# Two pointer types T1 and T2 are similar if there exists a type T and
+# integer n > 0 such that:
+#   T1 is cv(1,0) pointer to cv(1,1) pointer to ... cv(1,n-1)
+#   pointer to cv(1,n) T
+# and
+#   T2 is cv(2,0) pointer to cv(2,1) pointer to ... cv(2,n-1)
+#   pointer to cv(2,n) T
+# where each cv(i,j) is const, volatile, const volatile, or
+# nothing. The n-tuple of cv-qualifiers after the first in a pointer
+# type, e.g., cv(1,1) , cv(1,2) , ... , cv(1,n) in the pointer type
+# T1, is called the cv-qualification signature of the pointer type. An
+# expression of type T1 can be converted to type T2 if and only if the
+# following conditions are satisfied:
+#  - the pointer types are similar.
+#  - for every j > 0, if const is in cv(1,j) then const is in cv(2,j) ,
+#    and similarly for volatile.
+#  - if the cv(1,j) and cv(2,j) are different, then const is in every
+#    cv(2,k) for 0 < k < j.
+
+It is the last rule that your code violates. The standard gives then
+the following example as a rationale:
+
+# [Note: if a program could assign a pointer of type T** to a pointer
+# of type const T** (that is, if line //1 below was allowed), a
+# program could inadvertently modify a const object (as it is done on
+# line //2). For example,
+# int main() { 
+#   const char c = 'c'; 
+#   char* pc; 
+#   const char** pcc = &pc; //1: not allowed 
+#   *pcc = &c; 
+#   *pc = 'C'; //2: modifies a const object 
+# }
+# - end note]
+
+If you question this line of reasoning, please discuss it in one of
+the public C++ fora first, eg. comp.lang.c++.moderated, or
+comp.std.c++.
+
+
+cpp removes blank lines
+-----------------------
+
+With the new cpp, you need to add -traditional to the "cpp -P" args, else 
+blank lines get removed.
+
+[EDIT ME: scan Debian bug reports and write some nice summaries ...]
--- gcj-4.2-4.2-20070707.orig/debian/TODO
+++ gcj-4.2-4.2-20070707/debian/TODO
@@ -0,0 +1,36 @@
+(It is recommended to edit this file with emacs' todoo mode)
+Last updated: 2007-06-24
+
+* General
+
+- Clean up the sprawl of debian/rules.  I'm sure there are neater
+  ways to do some of it; perhaps split it up into some more files?
+  Partly done.
+
+- Make debian/rules control build the control file without unpacking
+  the sources or applying patches.  Currently, it unpacks the sources,
+  patches them, creates the control file, and a subsequent
+  dpkg-buildpackage deletes the sources, re-unpacks them, and
+  re-patches them.
+
+o [Ludovic Brenta] Ada
+
+- Done: Link the gnat tools with libgnat.so, instead of statically.
+
+- Done: Build libgnatvsn containing parts of the compiler (version
+  string, etc.) under GNAT-Modified GPL.  Link the gnat tools with it.
+
+- Done: Build libgnatprj containing parts of the compiler (the project
+  manager) under pure GPL.  Link the gnat tools with it.
+
+- Build both the zero-cost and setjump/longjump exceptions versions of
+  libgnat.  In particular, gnat-glade (distributed systems) works best
+  with SJLJ.  Currently, we only build the ZCX version.
+
+- Add support for building cross-compilers.
+
+- Add support for multilib.
+
+* Fortran
+
+- gfortran man page generation
--- gcj-4.2-4.2-20070707.orig/debian/acats-killer.sh
+++ gcj-4.2-4.2-20070707/debian/acats-killer.sh
@@ -0,0 +1,62 @@
+#! /bin/sh
+
+# on ia64 systems, the acats hangs in unaligned memory accesses.
+# kill these testcases.
+
+pidfile=acats-killer.pid
+
+usage()
+{
+    echo >&2 "usage: `basename $0` [-p <pidfile>] <ada logfile> <next logfile>"
+    exit 1
+}
+
+while [ $# -gt 0 ]; do
+    case $1 in
+    -p)
+	pidfile=$2
+	shift
+	shift
+	;;
+    -*)
+	usage
+	;;
+    *)
+	break
+    esac
+done
+
+[ $# -eq 2 ] || usage
+
+logfile=$1
+stopfile=$2
+interval=30
+
+echo $$ > $pidfile
+
+while true; do
+    if [ -f "$stopfile" ]; then
+	echo "`basename $0`: finished."
+	rm -f $pidfile
+	exit 0
+    fi
+    sleep $interval
+    if [ ! -f "$logfile" ]; then
+	continue
+    fi
+    pids=$(ps aux | awk '/testsuite\/ada\/acats\/tests/ { print $2 }')
+    if [ -n "$pids" ]; then
+	sleep $interval
+        pids2=$(ps aux | awk '/testsuite\/ada\/acats\/tests/ { print $2 }')
+	if [ "$pids" = "$pids2" ]; then
+	    #echo kill: $pids
+	    kill $pids
+	    sleep 1
+            pids2=$(ps aux | awk '/testsuite\/ada\/acats\/tests/ { print $2 }')
+	    if [ "$pids" = "$pids2" ]; then
+	        #echo kill -9: $pids
+	        kill -9 $pids
+	    fi
+	fi
+    fi
+done
--- gcj-4.2-4.2-20070707.orig/debian/gij-hppa
+++ gcj-4.2-4.2-20070707/debian/gij-hppa
@@ -0,0 +1,20 @@
+#! /bin/sh
+
+prctl=
+
+case "$(prctl --unaligned=)" in *signal)
+    echo >&2 "$(basename $0): ignore unaligned memory accesses"
+    prctl="prctl --unaligned=default"
+esac
+
+exec $prctl /usr/bin/gij-4.1.bin "$@"
+#! /bin/sh
+
+prctl=
+
+case "$(prctl --unaligned=)" in *signal)
+    echo >&2 "$(basename $0): ignore unaligned memory accesses"
+    prctl="prctl --unaligned=default"
+esac
+
+exec $prctl /usr/bin/gij-4.1.bin "$@"
--- gcj-4.2-4.2-20070707.orig/debian/reduce-test-diff.awk
+++ gcj-4.2-4.2-20070707/debian/reduce-test-diff.awk
@@ -0,0 +1,33 @@
+#! /usr/bin/gawk -f
+
+BEGIN {
+	skip=0
+	warn=0
+}
+
+/^-(FAIL|ERROR|UNRESOLVED|WARNING)/ {
+	next
+}
+
+# only compare gcc, g++, g77 and objc results
+/=== treelang tests ===/ {
+	skip=1
+}
+
+# omit extra files appended to test-summary
+/^\+Compiler version/ {
+	skip=1
+}
+
+skip == 0 {
+	print
+	next
+}
+
+/^\+(FAIL|ERROR|UNRESOLVED|WARNING)/ {
+	warn=1
+}
+
+END {
+	exit warn
+}
--- gcj-4.2-4.2-20070707.orig/debian/rules.parameters
+++ gcj-4.2-4.2-20070707/debian/rules.parameters
@@ -0,0 +1,33 @@
+# configuration parameters taken from upstream source files
+GCC_VERSION	:= 4.2.1
+NEXT_GCC_VERSION	:= 4.2.2
+BASE_VERSION	:= 4.2
+SOURCE_VERSION	:= 4.2-20070707-1ubuntu2
+DEB_VERSION	:= 4.2-20070707-1ubuntu2
+DEB_EVERSION	:= 1:4.2-20070707-1ubuntu2
+GPC_BASE_VERSION	:= 2.1
+DEB_GPC_VERSION	:= 
+DEB_SOVERSION	:= 4.2-20070208
+DEB_SOEVERSION	:= 1:4.2-20070516
+DEB_LIBGCC_SOVERSION	:= 1:4.2-20070516
+DEB_LIBGCC_VERSION	:= 1:4.2-20070707-1ubuntu2
+DEB_STDCXX_SOVERSION	:= 4.2-20070516
+DEB_GCJ_SOVERSION	:= 4.2-20070516
+PKG_GCJ_EXT	:= 8
+PKG_LIBGCJ_EXT	:= 8-0
+DEB_FFI_SOVERSION	:= 4.2-20070208
+DEB_GOMP_SOVERSION	:= 4.2-20070208
+DEB_GCCMATH_SOVERSION	:= 4.2-20070208
+GCC_SONAME	:= 1
+CXX_SONAME	:= 6
+FORTRAN_SONAME	:= 2
+OBJC_SONAME	:= 2
+GCJ_SONAME	:= 80
+GNAT_VERSION	:= 4.2
+GNAT_SONAME	:= 4.2
+FFI_SONAME	:= 4
+MUDFLAP_SONAME	:= 0
+SSP_SONAME	:= 0
+GOMP_SONAME	:= 1
+GCCMATH_SONAME	:= 
+LIBC_DEP		:= libc6
--- gcj-4.2-4.2-20070707.orig/debian/treelang-BV.postinst
+++ gcj-4.2-4.2-20070707/debian/treelang-BV.postinst
@@ -0,0 +1,15 @@
+#! /bin/sh -e
+
+case "$1" in
+    configure)
+	if [ -f /usr/share/info/treelang-@BV@.info.gz ]; then
+	    install-info --quiet --section "Development" "Development" \
+		--description="The GNU Treelang compiler." \
+		/usr/share/info/treelang-@BV@.info
+	else
+	    # GFDL invariant free
+	    true
+	fi
+esac
+
+#DEBHELPER#
--- gcj-4.2-4.2-20070707.orig/debian/libgnat-BV.overrides
+++ gcj-4.2-4.2-20070707/debian/libgnat-BV.overrides
@@ -0,0 +1 @@
+libgnat-@BV@: package-name-doesnt-match-sonames
--- gcj-4.2-4.2-20070707.orig/debian/dh_rmemptydirs
+++ gcj-4.2-4.2-20070707/debian/dh_rmemptydirs
@@ -0,0 +1,10 @@
+#! /bin/sh -e
+
+pkg=`echo $1 | sed 's/^-p//'`
+
+: # remove empty directories, when all components are in place
+for d in `find debian/$pkg -depth -type d -empty 2> /dev/null`; do \
+    while rmdir $d 2> /dev/null; do d=`dirname $d`; done; \
+done
+
+exit 0
--- gcj-4.2-4.2-20070707.orig/debian/libgccLC.postinst
+++ gcj-4.2-4.2-20070707/debian/libgccLC.postinst
@@ -0,0 +1,12 @@
+#! /bin/sh -e
+
+case "$1" in
+    configure)
+	docdir=/usr/share/doc/libgcc@LC@
+	if [ -d $docdir ] && [ ! -h $docdir ]; then
+	    rm -rf $docdir
+	    ln -s gcc-@BV@-base $docdir
+	fi
+esac
+
+#DEBHELPER#
--- gcj-4.2-4.2-20070707.orig/debian/libstdc++CXX-BV-doc.overrides
+++ gcj-4.2-4.2-20070707/debian/libstdc++CXX-BV-doc.overrides
@@ -0,0 +1,2 @@
+libstdc++@CXX@-@BV@-doc: extra-license-file
+libstdc++@CXX@-@BV@-doc: manpage-has-errors-from-man usr/share/man/man3/__gnu_internal.3.gz
--- gcj-4.2-4.2-20070707.orig/debian/gcjh-wrapper-BV.1
+++ gcj-4.2-4.2-20070707/debian/gcjh-wrapper-BV.1
@@ -0,0 +1,20 @@
+.TH GCJH-WRAPPER 1 "June 6, 2002" gcjh-wrapper "Java User's Manual"
+.SH NAME
+gcjh-wrapper \- a wrapper around gcjh
+
+.SH SYNOPSIS
+gcjh-wrapper [\fB\s-1OPTION\s0\fR] ... [\fI\s-1ARGS\s0\fR...]
+
+.SH DESCRIPTION
+
+\fBgcjh-wrapper\fR is a wrapper around gcjh(1) to be called as the java header
+compiler. Options different for javah(1) and gcjh(1) are translated,
+options unknown to gcjh(1) are silently ignored.
+
+.SH OPTIONS
+See gcjh-@BV@(1) for a list of options that gcj understands.
+
+.SH "SEE ALSO"
+.BR gcjh-@BV@(1)
+,
+.BR javah(1)
--- gcj-4.2-4.2-20070707.orig/debian/gcj-wrapper-BV.1
+++ gcj-4.2-4.2-20070707/debian/gcj-wrapper-BV.1
@@ -0,0 +1,20 @@
+.TH GCJ-WRAPPER 1 "June 6, 2002" gcj-wrapper "Java User's Manual"
+.SH NAME
+gcj-wrapper \- a wrapper around gcj
+
+.SH SYNOPSIS
+gcj-wrapper [\fB\s-1OPTION\s0\fR] ... [\fI\s-1ARGS\s0\fR...]
+
+.SH DESCRIPTION
+
+\fBgcj-wrapper\fR is a wrapper around gcj(1) to be called as the java
+compiler. Options different for javac(1) and gcj(1) are translated,
+options unknown to gcj(1) are silently ignored.
+
+.SH OPTIONS
+See gcj-@BV@(1) for a list of options that gcj understands.
+
+.SH "SEE ALSO"
+.BR gcj-@BV@(1)
+,
+.BR javac(1)
--- gcj-4.2-4.2-20070707.orig/debian/gcc-BV-doc.postinst
+++ gcj-4.2-4.2-20070707/debian/gcc-BV-doc.postinst
@@ -0,0 +1,12 @@
+#! /bin/sh -e
+
+install-info --quiet --section "Development" "Development" \
+	/usr/share/info/gcc-@BV@.info.gz
+
+install-info --quiet --section "Development" "Development" \
+	/usr/share/info/gccint-@BV@.info.gz
+
+install-info --quiet --section "Development" "Development" \
+	/usr/share/info/libgomp-@BV@.info.gz
+
+#DEBHELPER#
--- gcj-4.2-4.2-20070707.orig/debian/README.snapshot
+++ gcj-4.2-4.2-20070707/debian/README.snapshot
@@ -0,0 +1,36 @@
+Debian gcc-snapshot package
+===========================
+
+This package contains  a recent development SNAPSHOT of all files
+contained in the GNU Compiler Collection (GCC).
+
+DO NOT USE THIS SNAPSHOT FOR BUILDING DEBIAN PACKAGES!
+
+This package will NEVER hit the testing distribution. It's used for
+tracking gcc bugs submitted to the Debian BTS in recent development
+versions of gcc.
+
+To use this snapshot, you should set the following environment variables:
+
+	LD_LIBRARY_PATH=/usr/lib/gcc-snapshot/lib:$LD_LIBRARY_PATH
+	PATH=/usr/lib/gcc-snapshot/bin:$PATH
+
+You might also like to use a shell script to wrap up this 
+funcationality, e.g. 
+ 
+place in /usr/local/bin/gcc-snapshot and chmod +x it 
+ 
+----------- snip ----------
+#! /bin/sh
+LD_LIBRARY_PATH=/usr/lib/gcc-snapshot/lib:$LD_LIBRARY_PATH
+PATH=/usr/lib/gcc-snapshot/bin:$PATH
+gcc "$@"
+----------- snip ----------
+
+Make the same for g++, g77, gij, gcj, cpp, ...
+ 
+Don't forget the quotes around the $@ or gcc will not parse it's 
+command line correctly! 
+
+Unset these variables before building Debian packages destined for an
+upload to ftp-master.debian.org.
--- gcj-4.2-4.2-20070707.orig/debian/lib64gccLC.postinst
+++ gcj-4.2-4.2-20070707/debian/lib64gccLC.postinst
@@ -0,0 +1,12 @@
+#! /bin/sh -e
+
+case "$1" in
+    configure)
+	docdir=/usr/share/doc/lib64gcc@LC@
+	if [ -d $docdir ] && [ ! -h $docdir ]; then
+	    rm -rf $docdir
+	    ln -s gcc-@BV@-base $docdir
+	fi
+esac
+
+#DEBHELPER#
--- gcj-4.2-4.2-20070707.orig/debian/gccbug.1
+++ gcj-4.2-4.2-20070707/debian/gccbug.1
@@ -0,0 +1,178 @@
+.\" Automatically generated by Pod::Man v1.34, Pod::Parser v1.13
+.\"
+.\" Standard preamble:
+.\" ========================================================================
+.de Sh \" Subsection heading
+.br
+.if t .Sp
+.ne 5
+.PP
+\fB\\$1\fR
+.PP
+..
+.de Sp \" Vertical space (when we can't use .PP)
+.if t .sp .5v
+.if n .sp
+..
+.de Vb \" Begin verbatim text
+.ft CW
+.nf
+.ne \\$1
+..
+.de Ve \" End verbatim text
+.ft R
+.fi
+..
+.\" Set up some character translations and predefined strings.  \*(-- will
+.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
+.\" double quote, and \*(R" will give a right double quote.  | will give a
+.\" real vertical bar.  \*(C+ will give a nicer C++.  Capital omega is used to
+.\" do unbreakable dashes and therefore won't be available.  \*(C` and \*(C'
+.\" expand to `' in nroff, nothing in troff, for use with C<>.
+.tr \(*W-|\(bv\*(Tr
+.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
+.ie n \{\
+.    ds -- \(*W-
+.    ds PI pi
+.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
+.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
+.    ds L" ""
+.    ds R" ""
+.    ds C` ""
+.    ds C' ""
+'br\}
+.el\{\
+.    ds -- \|\(em\|
+.    ds PI \(*p
+.    ds L" ``
+.    ds R" ''
+'br\}
+.\"
+.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
+.\" entries marked with X<> in POD.  Of course, you'll have to process the
+.\" output yourself in some meaningful fashion.
+.if \nF \{\
+.    de IX
+.    tm Index:\\$1\t\\n%\t"\\$2"
+..
+.    nr % 0
+.    rr F
+.\}
+.\"
+.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
+.\" way too many mistakes in technical documents.
+.hy 0
+.if n .na
+.\"
+.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
+.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
+.    \" fudge factors for nroff and troff
+.if n \{\
+.    ds #H 0
+.    ds #V .8m
+.    ds #F .3m
+.    ds #[ \f1
+.    ds #] \fP
+.\}
+.if t \{\
+.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
+.    ds #V .6m
+.    ds #F 0
+.    ds #[ \&
+.    ds #] \&
+.\}
+.    \" simple accents for nroff and troff
+.if n \{\
+.    ds ' \&
+.    ds ` \&
+.    ds ^ \&
+.    ds , \&
+.    ds ~ ~
+.    ds /
+.\}
+.if t \{\
+.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
+.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
+.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
+.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
+.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
+.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
+.\}
+.    \" troff and (daisy-wheel) nroff accents
+.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
+.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
+.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
+.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
+.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
+.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
+.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
+.ds ae a\h'-(\w'a'u*4/10)'e
+.ds Ae A\h'-(\w'A'u*4/10)'E
+.    \" corrections for vroff
+.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
+.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
+.    \" for low resolution devices (crt and lpr)
+.if \n(.H>23 .if \n(.V>19 \
+\{\
+.    ds : e
+.    ds 8 ss
+.    ds o a
+.    ds d- d\h'-1'\(ga
+.    ds D- D\h'-1'\(hy
+.    ds th \o'bp'
+.    ds Th \o'LP'
+.    ds ae ae
+.    ds Ae AE
+.\}
+.rm #[ #] #H #V #F C
+.\" ========================================================================
+.\"
+.IX Title "GCCBUG 1"
+.TH GCCBUG 1 "2003-06-03" "gcc-3.4" "GNU"
+.SH "NAME"
+gccbug \- Reporting GCC Bugs
+.SH "SYNOPSIS"
+.IX Header "SYNOPSIS"
+gccbug
+       [ \fB\-\-cc\fR \fImail-address\fR ]
+       [ \fB\-\-version\fR ] | [ \fB\-\-help\fR ]
+.SH "DESCRIPTION"
+.IX Header "DESCRIPTION"
+\&\fBgccbug\fR is a version of \s-1GNU\s0 \s-1GNATS\s0 send-pr configured for \s-1GCC\s0 bug
+reporting.
+.PP
+Invoking \fBgccbug\fR calls the editor named in your environment
+variable \fB\s-1VISUAL\s0\fR or \fB\s-1EDITOR\s0\fR on a problem report template.
+.PP
+Your bug reports play an essential role in making \s-1GCC\s0 reliable. However
+since the maintainers are very overloaded, please first make sure that:
+.IP "\(bu" 4
+The problem is not already known.  See
+<\fBhttp://gcc.gnu.org/bugs.html#known\fR> for a list of known bugs.
+If it isn't known, then you should report the problem.
+.Sp
+You can browse the bug database for bugs reported at
+<\fBhttp://gcc.gnu.org/cgi\-bin/gnatsweb.pl\fR>.
+.IP "\(bu" 4
+You include the information that makes for fixing the bug. See
+<\fBhttp://gcc.gnu.org/bugs.html#report\fR> for bug reporting instructions.
+.SH "OPTIONS"
+.IX Header "OPTIONS"
+.IP "\fB\-\-cc\fR \fImail-address\fR" 4
+.IX Item "--cc mail-address"
+Specifies the mail-address to which the \s-1PR\s0 should be carbon\-copied.
+.IP "\fB\-\-version\fR" 4
+.IX Item "--version"
+Displays the \fBgccbug\fR version number and a usage summary.  No mail
+is sent.
+.IP "\fB\-\-help\fR" 4
+.IX Item "--help"
+Displays a usage summary for \fBgccbug\fR.  No mail is sent.
+.PP
+\&\fBgccbug\fR has more (undocumented) options, which may be
+unsupported by a future \s-1GCC\s0 bug tracking system.
+.SH "SEE ALSO"
+.IX Header "SEE ALSO"
+\&\fIgcc\fR\|(1), \fIsend\-pr\fR\|(1), \fIsend\-pr\fR\|(8), the info entries for \fIgcc\fR (node Bugs),
+and the online pages at <\fBhttp://gcc.gnu.org/bugs.html\fR>.
--- gcj-4.2-4.2-20070707.orig/debian/cpp-BV-doc.doc-base.cppint
+++ gcj-4.2-4.2-20070707/debian/cpp-BV-doc.doc-base.cppint
@@ -0,0 +1,17 @@
+Document: cppinternals-@BV@
+Title: The GNU C preprocessor (internals)
+Author: Various
+Abstract: This brief manual documents the internals of cpplib, and
+ explains some of the tricky issues.  It is intended that, along with
+ the comments in the source code, a reasonably competent C programmer
+ should be able to figure out what the code is doing, and why things
+ have been implemented the way they have.
+Section: Apps/Programming
+
+Format: html
+Index: /usr/share/doc/gcc-@BV@-base/cppinternals.html
+Files: /usr/share/doc/gcc-@BV@-base/cppinternals.html
+
+Format: info
+Index: /usr/share/info/cppinternals-@BV@.info.gz
+Files: /usr/share/info/cppinternals-@BV@*
--- gcj-4.2-4.2-20070707.orig/debian/rules.unpack
+++ gcj-4.2-4.2-20070707/debian/rules.unpack
@@ -0,0 +1,179 @@
+# -*- makefile -*-
+# rules to unpack the source tarballs in $(srcdir); if the source dir already
+# exists, the rule exits with an error to prevent deletion of modified
+# source files. It has to be deleted manually.
+
+tarballs = $(gcc_tarball) # $(gcj_tarball)
+ifeq ($(with_pascal),yes)
+  tarballs += $(gpc_tarball)
+endif
+
+unpack_stamps = $(foreach i,$(tarballs),$(unpack_stamp)-$(i))
+
+unpack: stamp-dir $(unpack_stamp) debian-chmod
+$(unpack_stamp): $(unpack_stamps)
+$(unpack_stamp): $(foreach p,$(debian_tarballs),unpacked-$(p))
+	echo -e "\nBuilt from Debian source package $(PKGSOURCE)-$(SOURCE_VERSION)" \
+		> pxxx
+	echo -e "Integrated upstream packages in this version:\n" >> pxxx
+	for i in $(tarballs); do echo "  $$i" >> pxxx; done
+	mv -f pxxx $@
+
+debian-chmod:
+	@chmod 755 debian/dh_*
+
+# ---------------------------------------------------------------------------
+
+gfdl_texinfo_files = \
+	gcc/doc/bugreport.texi \
+	gcc/doc/cfg.texi \
+	gcc/doc/collect2.texi \
+	gcc/doc/compat.texi \
+	gcc/doc/configfiles.texi \
+	gcc/doc/configterms.texi \
+	gcc/doc/contrib.texi \
+	gcc/doc/contribute.texi \
+	gcc/doc/cppenv.texi \
+	gcc/doc/cppinternals.texi \
+	gcc/doc/cppopts.texi \
+	gcc/doc/cpp.texi \
+	gcc/doc/c-tree.texi \
+	gcc/doc/extend.texi \
+	gcc/doc/fragments.texi \
+	gcc/doc/frontends.texi \
+	gcc/doc/gccint.texi \
+	gcc/doc/gcc.texi \
+	gcc/doc/gcov.texi \
+	gcc/doc/gnu.texi \
+	gcc/doc/gty.texi \
+	gcc/doc/headerdirs.texi \
+	gcc/doc/hostconfig.texi \
+	gcc/doc/implement-c.texi \
+	gcc/doc/install-old.texi \
+	gcc/doc/install.texi \
+	gcc/doc/interface.texi \
+	gcc/doc/invoke.texi \
+	gcc/doc/languages.texi \
+	gcc/doc/libgcc.texi \
+	gcc/doc/makefile.texi \
+	gcc/doc/md.texi \
+	gcc/doc/objc.texi \
+	gcc/doc/options.texi \
+	gcc/doc/passes.texi \
+	gcc/doc/portability.texi \
+	gcc/doc/rtl.texi \
+	gcc/doc/service.texi \
+	gcc/doc/sourcebuild.texi \
+	gcc/doc/standards.texi \
+	gcc/doc/tm.texi \
+	gcc/doc/tree-ssa.texi \
+	gcc/doc/trouble.texi \
+	gcc/doc/include/gcc-common.texi \
+	gcc/doc/include/funding.texi \
+	gcc/fortran/invoke.texi \
+	gcc/fortran/intrinsic.texi \
+	libstdc++-v3/docs/html/17_intro/porting.texi \
+
+gfdl_toplevel_texinfo_files = \
+	gcc/doc/gcc.texi \
+	gcc/java/gcj.texi \
+	gcc/ada/gnat-style.texi \
+	gcc/ada/gnat_rm.texi \
+	gcc/ada/gnat_ugn.texi \
+	gcc/fortran/gfortran.texi \
+	gcc/treelang/treelang.texi \
+	libgomp/libgomp.texi \
+
+gfdl_manpages = \
+	gcc/doc/cpp.1 \
+	gcc/doc/g++.1 \
+	gcc/doc/gcc.1 \
+	gcc/doc/gcj.1 \
+	gcc/doc/gcj-dbtool.1 \
+	gcc/doc/gcjh.1 \
+	gcc/doc/gcov.1 \
+	gcc/doc/gij.1 \
+	gcc/doc/gjnih.1 \
+	gcc/doc/grmic.1 \
+	gcc/doc/grmiregistry.1 \
+	gcc/doc/jcf-dump.1 \
+	gcc/doc/jv-convert.1 \
+	gcc/doc/jv-scan.1
+
+# ---------------------------------------------------------------------------
+$(unpack_stamp)-$(gcc_tarball): $(gcc_tarpath)
+	: # unpack gcc tarball
+	-mkdir $(stampdir)
+	if [ -d $(srcdir) ]; then \
+	  echo >&2 "Source directory $(srcdir) exists. Delete by hand"; \
+	  false; \
+	fi
+	rm -rf $(gcc_srcdir)
+	case $(gcc_tarball) in \
+	  *.bz2) tar -x --bzip2 -f $(gcc_tarpath);; \
+	  *.gz)  tar -x --gzip  -f $(gcc_tarpath);; \
+	  *)     false; \
+	esac
+	mv $(gcc_srcdir) $(srcdir)
+ifeq (0,1)
+	cd $(srcdir) && tar cfj ../gcc-4.1.1-doc.tar.bz2 \
+		$(gfdl_texinfo_files) \
+		$(gfdl_toplevel_texinfo_files) \
+		$(gfdl_manpages) \
+		libstdc++-v3/docs/html/17_intro/porting.html
+endif
+ifeq ($(GFDL_INVARIANT_FREE),yes)
+	rm -f $(srcdir)/gcc/doc/*.1
+	rm -f $(srcdir)/gcc/doc/*.info
+	for i in $(gfdl_texinfo_files); do \
+	  cp debian/dummy.texi $(srcdir)/$$i; \
+	done
+	for i in $(gfdl_toplevel_texinfo_files); do \
+	  n=$$(basename $$i .texi); \
+	  sed "s/@name@/$$n/g" debian/gcc-dummy.texi > $(srcdir)/$$i; \
+	done
+	cp debian/porting.* $(srcdir)/libstdc++-v3/docs/html/17_intro/
+endif
+	echo "$(gcc_tarball) unpacked." > $@
+
+# ---------------------------------------------------------------------------
+$(unpack_stamp)-$(gcj_tarball): $(gcj_tarpath) $(unpack_stamp)-$(gcc_tarball)
+	: # unpack gcj tarball
+	rm -rf $(srcdir)/gcc/java $(srcdir)/libjava
+	tar -x -C $(srcdir) -f $(gcj_tarpath)
+ifeq ($(GFDL_INVARIANT_FREE),yes)
+	rm -f $(srcdir)/gcc/java/*.1
+	rm -f $(srcdir)/gcc/java/*.info
+	for i in $(gfdl_texinfo_files); do \
+	  cp debian/dummy.texi $(srcdir)/$$i; \
+	done
+	for i in $(gfdl_toplevel_texinfo_files); do \
+	  n=$$(basename $$i .texi); \
+	  sed "s/@name@/$$n/g" debian/gcc-dummy.texi > $(srcdir)/$$i; \
+	done
+endif
+	echo "$(gcj_tarball) unpacked." > $@
+
+# ---------------------------------------------------------------------------
+$(unpack_stamp)-$(gpc_tarball): $(gpc_tarpath)
+	: # unpack gpc tarball
+	-mkdir $(stampdir)
+	if [ -d $(srcdir)/gcc/p ]; then \
+	  echo >&2 "Source directory $(srcdir)/gcc/p exists. Delete by hand";\
+	  false; \
+	fi
+	#rm -rf $(gpc_srcdir)
+	rm -rf p
+	case $(gpc_tarball) in \
+	  *.bz2) tar -x --bzip2 -f $(gpc_tarpath);; \
+	  *.gz)  tar -x --gzip  -f $(gpc_tarpath);; \
+	  *)     false; \
+	esac
+	if [ -d p ]; then \
+	  mv p $(srcdir)/gcc/. ; \
+	else \
+	  mv $(gpc_srcdir)/p $(srcdir)/gcc/. ; \
+	  rm -rf $(gpc_srcdir)/CVS; \
+	  rmdir $(gpc_srcdir); \
+	fi
+	echo "$(gpc_tarball) unpacked." > $@
--- gcj-4.2-4.2-20070707.orig/debian/gnat-BV-doc.postinst
+++ gcj-4.2-4.2-20070707/debian/gnat-BV-doc.postinst
@@ -0,0 +1,16 @@
+#! /bin/sh -e
+
+case "$1" in
+    configure)
+	install-info --quiet --section "Development" "Development" \
+	    --description="GNAT (GNU Ada) User's Guide for Unix Platforms." \
+	    /usr/share/info/gnat_ugn_unw-@BV@.info
+	install-info --quiet --section "Development" "Development" \
+	    --description="GNAT (GNU Ada) Reference Manual." \
+	    /usr/share/info/gnat_rm-@BV@.info
+	install-info --quiet --section "Development" "Development" \
+	    --description="GNAT Coding Style." \
+	    /usr/share/info/gnat-style-@BV@.info
+esac
+
+#DEBHELPER#
--- gcj-4.2-4.2-20070707.orig/debian/libgcj-common.postinst
+++ gcj-4.2-4.2-20070707/debian/libgcj-common.postinst
@@ -0,0 +1,12 @@
+#! /bin/sh -e
+
+case "$1" in
+    configure)
+	docdir=/usr/share/doc/libgcj-common
+	if [ -d $docdir ] && [ ! -h $docdir ]; then
+	    rm -rf $docdir
+	    ln -s gcj-@BV@-base $docdir
+	fi
+esac
+
+#DEBHELPER#
--- gcj-4.2-4.2-20070707.orig/debian/gnat-BV-doc.doc-base.style
+++ gcj-4.2-4.2-20070707/debian/gnat-BV-doc.doc-base.style
@@ -0,0 +1,16 @@
+Document: gnat-style-@BV@
+Title: GNAT Coding Style
+Author: Various
+Abstract: Most of GNAT is written in Ada using a consistent style to
+ ensure readability of the code.  This document has been written to
+ help maintain this consistent style, while having a large group of
+ developers work on the compiler.
+Section: Apps/Programming
+
+Format: html
+Index: /usr/share/doc/gnat-@BV@-doc/gnat-style.html
+Files: /usr/share/doc/gnat-@BV@-doc/gnat-style.html
+
+Format: info
+Index: /usr/share/info/gnat-style-@BV@.info.gz
+Files: /usr/share/info/gnat-style-@BV@*
--- gcj-4.2-4.2-20070707.orig/debian/lib32gccLC.postinst
+++ gcj-4.2-4.2-20070707/debian/lib32gccLC.postinst
@@ -0,0 +1,12 @@
+#! /bin/sh -e
+
+case "$1" in
+    configure)
+	docdir=/usr/share/doc/lib32gcc@LC@
+	if [ -d $docdir ] && [ ! -h $docdir ]; then
+	    rm -rf $docdir
+	    ln -s gcc-@BV@-base $docdir
+	fi
+esac
+
+#DEBHELPER#
--- gcj-4.2-4.2-20070707.orig/debian/control.m4
+++ gcj-4.2-4.2-20070707/debian/control.m4
@@ -0,0 +1,1408 @@
+divert(-1)
+
+define(`checkdef',`ifdef($1, , `errprint(`error: undefined macro $1
+')m4exit(1)')')
+define(`errexit',`errprint(`error: undefined macro `$1'
+')m4exit(1)')
+
+dnl The following macros must be defined, when called:
+dnl ifdef(`SRCNAME',	, errexit(`SRCNAME'))
+dnl ifdef(`PV',		, errexit(`PV'))
+dnl ifdef(`ARCH',		, errexit(`ARCH'))
+
+dnl The architecture will also be defined (-D__i386__, -D__powerpc__, etc.)
+
+define(`PN', `$1')
+ifdef(`PRI', `', `
+    define(`PRI', `$1')
+')
+define(`MAINTAINER', `Debian GCC Maintainers <debian-gcc@lists.debian.org>')
+
+define(`ifenabled', `ifelse(index(enabled_languages, `$1'), -1, `dnl', `$2')')
+
+divert`'dnl
+dnl --------------------------------------------------------------------------
+Source: SRCNAME
+Section: devel
+Priority: PRI(standard)
+ifelse(DIST,`Ubuntu',`dnl
+ifelse(regexp(SRCNAME, `gcc-snapshot\|gnat'),0,`dnl
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+', `dnl
+Maintainer: Ubuntu Core developers <ubuntu-devel-discuss@lists.ubuntu.com>
+')dnl SRCNAME
+XSBC-Original-Maintainer: MAINTAINER
+', `dnl
+Maintainer: MAINTAINER
+')dnl DIST
+Uploaders: Matthias Klose <doko@debian.org>
+Standards-Version: 3.7.2
+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, bzip2, BINUTILS_BUILD_DEP, debhelper (>= 5.0), bison (>= 1:2.3), flex, realpath (>= 1.9.12), lsb-release, make (>= 3.81)
+',`dnl native
+Build-Depends: dpkg-dev (>= 1.13.9), gcc-4.1-multilib [amd64 i386 powerpc ppc64 s390 sparc kfreebsd-amd64] | gcc-4.2-multilib [amd64 i386 powerpc ppc64 s390 sparc kfreebsd-amd64], LIBC_BUILD_DEP, LIBC_BIARCH_BUILD_DEP libunwind7-dev (>= 0.98.5-6) [ia64], libatomic-ops-dev [ia64], m4, autoconf, autoconf2.13, automake1.9, libtool, autogen, gawk, expect-tcl8.3 [check_no_archs], bzip2, BINUTILS_BUILD_DEP, binutils-hppa64 (>= BINUTILSV) [hppa], debhelper (>= 5.0), gperf (>= 3.0.1), bison (>= 1:2.3), flex, gettext, texinfo (>= 4.3), libmpfr-dev (>= 2.2.1) [fortran_no_archs], locales [locale_no_archs], procps [linux_gnu_archs], sharutils, PASCAL_BUILD_DEP JAVA_BUILD_DEP GNAT_BUILD_DEP realpath (>= 1.9.12), chrpath, lsb-release, make (>= 3.81)
+Build-Depends-Indep: LIBSTDCXX_BUILD_INDEP JAVA_BUILD_INDEP
+')dnl
+dnl Build-Conflicts: qt3-dev-tools
+
+ifelse(SRCNAME,gcc-snapshot,`dnl
+Package: gcc-snapshot
+Architecture: any
+Section: devel
+Priority: extra
+Depends: binutils`'TS (>= ${binutils:Version}), ${dep:libcdev}, ${dep:libunwinddev}, ${shlibs:Depends}
+Provides: c++abi2-dev
+Description: A SNAPSHOT of the GNU Compiler Collection
+ This package contains a recent development SNAPSHOT of all files
+ contained in the GNU Compiler Collection (GCC).
+ .
+ DO NOT USE THIS SNAPSHOT FOR BUILDING DEBIAN PACKAGES!
+ .
+ This package will NEVER hit the testing distribution. It is used for
+ tracking gcc bugs submitted to the Debian BTS in recent development
+ versions of gcc.
+',`dnl gcc-X.Y
+
+dnl default base package dependencies
+define(`BASETARGET', `')
+define(`BASEDEP', `gcc`'PV-base (= ${gcc:Version})')
+define(`SOFTBASEDEP', `gcc`'PV-base (>= ${gcc:SoftVersion})')
+
+dnl base, when building libgcc out of the gcj source; needed if new symbols
+dnl in libgcc are used in libgcj.
+ifelse(index(SRCNAME, `gcj'), 0, `
+define(`BASEDEP', `gcj`'PV-base (= ${gcj:Version})')
+define(`SOFTBASEDEP', `gcj`'PV-base (>= ${gcj:SoftVersion})')
+')
+
+ifdef(`TARGET', `', `
+ifenabled(`gccbase',`
+
+Package: gcc`'PV-base
+Architecture: any
+Section: libs
+Priority: PRI(required)
+Description: The GNU Compiler Collection (base package)
+ This package contains files common to all languages and libraries
+ contained in the GNU Compiler Collection (GCC).
+ifdef(`BASE_ONLY', `dnl
+ .
+ This version of GCC is not yet available for this architecture.
+ Please use the compilers from the gcc-snapshot package for testing.
+')`'dnl
+')`'dnl
+')`'dnl native
+
+ifenabled(`gccxbase',`
+dnl override default base package dependencies to cross version
+dnl This creates a toolchain that doesnt depend on the system -base packages
+define(`BASETARGET', `PV`'TS')
+define(`BASEDEP', `gcc`'BASETARGET-base (= ${gcc:Version})')
+define(`SOFTBASEDEP', `gcc`'BASETARGET-base (>= ${gcc:SoftVersion})')
+
+Package: gcc`'BASETARGET-base
+Architecture: any
+Section: devel
+Priority: PRI(required)
+Conflicts: gcc-3.5-base
+Replaces: gcc-3.5-base
+Description: The GNU Compiler Collection (base package)
+ This package contains files common to all languages and libraries
+ contained in the GNU Compiler Collection (GCC).
+')`'dnl
+
+ifenabled(`java',`
+Package: gcj`'PV-base
+Architecture: any
+Section: libs
+Priority: PRI(optional)
+Description: The GNU Compiler Collection (gcj base package)
+ This package contains files common to all java related packages
+ built from the GNU Compiler Collection (GCC).
+')`'dnl java
+
+ifenabled(`ada',`
+Package: gnat`'PV-base
+Architecture: any
+Section: libs
+Priority: PRI(optional)
+Description: The GNU Compiler Collection (gnat base package)
+ This package contains files common to all Ada related packages
+ built from the GNU Compiler Collection (GCC).
+')`'dnl ada
+
+ifenabled(`libgcc',`
+Package: libgcc1`'LS
+Architecture: ifdef(`TARGET',`all',`any')
+Section: ifdef(`TARGET',`devel',`libs')
+Priority: ifdef(`TARGET',`extra',required)
+Depends: BASEDEP, ${shlibs:Depends}
+ifdef(`TARGET',`Provides: libgcc1-TARGET-dcv1
+',`')`'dnl
+Description: GCC support library`'ifdef(`TARGET)',` (TARGET)', `')
+ Shared version of the support library, a library of internal subroutines
+ that GCC uses to overcome shortcomings of particular machines, or
+ special needs for some languages.
+ifdef(`TARGET', `dnl
+ .
+ This package contains files for TARGET architecture, for use in cross-compile
+ environment.
+')`'dnl
+
+Package: libgcc2`'LS
+Architecture: ifdef(`TARGET',`all',`m68k')
+Section: ifdef(`TARGET',`devel',`libs')
+Priority: ifdef(`TARGET',`extra',required)
+Depends: BASEDEP, ${shlibs:Depends}
+ifdef(`TARGET',`Provides: libgcc2-TARGET-dcv1
+',`')`'dnl
+Description: GCC support library`'ifdef(`TARGET)',` (TARGET)', `')
+ Shared version of the support library, a library of internal subroutines
+ that GCC uses to overcome shortcomings of particular machines, or
+ special needs for some languages.
+ifdef(`TARGET', `dnl
+ .
+ This package contains files for TARGET architecture, for use in cross-compile
+ environment.
+')`'dnl
+')`'dnl libgcc
+
+ifenabled(`lib4gcc',`
+Package: libgcc4`'LS
+Architecture: ifdef(`TARGET',`all',`hppa')
+Section: ifdef(`TARGET',`devel',`libs')
+Priority: ifdef(`TARGET',`extra',required)
+Depends: ifdef(`STANDALONEJAVA',`gcj`'PV-base (>= ${gcj:Version})',`BASEDEP'), ${shlibs:Depends}
+Description: GCC support library`'ifdef(`TARGET)',` (TARGET)', `')
+ Shared version of the support library, a library of internal subroutines
+ that GCC uses to overcome shortcomings of particular machines, or
+ special needs for some languages.
+ifdef(`TARGET', `dnl
+ .
+ This package contains files for TARGET architecture, for use in cross-compile
+ environment.
+')`'dnl
+')`'dnl lib4gcc
+
+ifenabled(`lib64gcc',`
+Package: lib64gcc1`'LS
+Architecture: ifdef(`TARGET',`all',`biarch64_archs')
+Section: ifdef(`TARGET',`devel',`libs')
+Priority: ifdef(`TARGET',`extra',PRI(optional))
+Depends: BASEDEP, ${dep:libcbiarch}
+ifdef(`TARGET',`Provides: lib64gcc1-TARGET-dcv1
+',`')`'dnl
+Conflicts: libgcc`'GCC_SO`'LS (<= 1:3.3-0pre9)
+Description: GCC support library`'ifdef(`TARGET)',` (TARGET)', `') (64bit)
+ Shared version of the support library, a library of internal subroutines
+ that GCC uses to overcome shortcomings of particular machines, or
+ special needs for some languages.
+ifdef(`TARGET', `dnl
+ .
+ This package contains files for TARGET architecture, for use in cross-compile
+ environment.
+')`'dnl
+')`'dnl lib64gcc
+
+ifdef(`TARGET', `', `dnl
+ifenabled(`lib32gcc',`
+Package: lib32gcc1`'LS
+Architecture: biarch32_archs
+Section: libs
+Priority: optional
+Depends: BASEDEP, ${dep:libcbiarch}
+ifdef(`TARGET',`Provides: lib32gcc1-TARGET-dcv1
+',`')`'dnl
+ifelse(DIST,`Ubuntu', `Replaces: ia32-libs-openoffice.org (<< 1ubuntu3)', `dnl')
+Description: GCC support library (32 bit Version)
+ Shared version of the support library, a library of internal subroutines
+ that GCC uses to overcome shortcomings of particular machines, or
+ special needs for some languages.
+')`'dnl
+')`'dnl
+
+ifdef(`TARGET', `', `
+ifenabled(`libgmath',`
+Package: libgccmath`'GCCMATH_SO
+Architecture: i386
+Section: libs
+Priority: PRI(optional)
+Depends: BASEDEP, ${shlibs:Depends}
+Description: GCC math support library
+ Support library for GCC.
+
+Package: lib32gccmath`'GCCMATH_SO
+Architecture: amd64
+Section: libs
+Priority: PRI(optional)
+Depends: BASEDEP, ${shlibs:Depends}
+Description: GCC math support library (32bit)
+ Support library for GCC.
+
+Package: lib64gccmath`'GCCMATH_SO
+Architecture: i386
+Section: libs
+Priority: PRI(optional)
+Depends: BASEDEP, ${shlibs:Depends}
+Description: GCC math support library (64bit)
+ Support library for GCC.
+')`'dnl
+')`'dnl native
+
+ifenabled(`cdev',`
+Package: gcc`'PV`'TS
+Architecture: any
+Section: devel
+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}, libmudflap`'MF_SO`'PV-dev`'LS (>= ${gcc:Version})
+Suggests: ${gcc:multilib}, gcc`'PV-doc (>= ${gcc:SoftVersion}), gcc`'PV-locales (>= ${gcc:SoftVersion})
+Provides: c-compiler`'TS
+Description: The GNU C compiler`'ifdef(`TARGET)',` (cross compiler for TARGET architecture)', `')
+ This is the GNU C compiler, a fairly portable optimizing compiler for C.
+ifdef(`TARGET', `dnl
+ .
+ This package contains C cross-compiler for TARGET architecture.
+')`'dnl
+
+ifenabled(`multilib',`
+Package: gcc`'PV-multilib`'TS
+Architecture: MULTILIB_ARCHS
+Section: devel
+Priority: ifdef(`TARGET',`extra',`PRI(optional)')
+Depends: BASEDEP, gcc`'PV`'TS (= ${gcc:Version}), ${dep:libcbiarchdev}, ${dep:libgccbiarch}, ${dep:libsspbiarch}, ${dep:libgompbiarch}, ${shlibs:Depends}
+Recommends: ${dep:libmudflapbiarch}
+Replaces: gcc-4.2 (<< 4.2-20061008)
+Description: The GNU C compiler (multilib files)`'ifdef(`TARGET)',` (cross compiler for TARGET architecture)', `')
+ This is the GNU C compiler, a fairly portable optimizing compiler for C.
+ .
+ On architectures with multilib support, the package contains files
+ and dependencies for the non-default multilib architecture(s).
+')`'dnl multilib
+')`'dnl cdev
+
+ifenabled(`cdev',`
+ifdef(`TARGET', `', `
+Package: gcc`'PV-hppa64
+Architecture: hppa
+Section: devel
+Priority: PRI(optional)
+Depends: BASEDEP, ${shlibs:Depends}
+Conflicts: gcc-3.3-hppa64 (<= 1:3.3.4-5), gcc-3.4-hppa64 (<= 3.4.1-3)
+Description: The GNU C compiler (cross compiler for hppa64)
+ This is the GNU C compiler, a fairly portable optimizing compiler for C.
+')`'dnl native
+')`'dnl cdev
+
+ifenabled(`cdev',`
+Package: cpp`'PV`'TS
+Architecture: any
+Section: ifdef(`TARGET',`devel',`interpreters')
+Priority: ifdef(`TARGET',`extra',`PRI(optional)')
+Depends: BASEDEP, ${shlibs:Depends}
+Suggests: gcc`'PV-locales (>= ${gcc:SoftVersion})
+Conflicts: cpp-4.2 (<< 4.2-20070307), gcc-4.2 (<< 4.2-20070307), g++-4.2 (<< 4.2-20070307), gobjc-4.2 (<< 4.2-20070307), gobjc++-4.2 (<< 4.2-20070307), gfortran-4.2 (<< 4.2-20070307), treelang-4.2 (<< 4.2-20070307), gcj-4.2 (<< 4.2-20070307), gcj-4.2 (<< 4.2-20070307), gcc-4.2-multilib (<< 4.2-20070307), g++-4.2-multilib (<< 4.2-20070307), gobjc-4.2-multilib (<< 4.2-20070307), gobjc++-4.2-multilib (<< 4.2-20070307), gfortran-4.2-multilib (<< 4.2-20070307)
+Description: The GNU C preprocessor
+ A macro processor that is used automatically by the GNU C compiler
+ to transform programs before actual compilation.
+ .
+ This package has been separated from gcc for the benefit of those who
+ require the preprocessor but not the compiler.
+ifdef(`TARGET', `dnl
+ .
+ This package contains preprocessor configured for TARGET architecture.
+')`'dnl
+
+ifdef(`TARGET', `', `
+ifenabled(`gfdldoc',`
+Package: cpp`'PV-doc
+Architecture: all
+Section: doc
+Priority: PRI(optional)
+Depends: gcc`'PV-base (>= ${gcc:SoftVersion})
+Description: Documentation for the GNU C preprocessor (cpp)
+ Documentation for the GNU C preprocessor in info `format'.
+')`'dnl gfdldoc
+')`'dnl native
+
+ifdef(`TARGET', `', `
+Package: gcc`'PV-locales
+Architecture: all
+Section: devel
+Priority: PRI(optional)
+Depends: SOFTBASEDEP, cpp`'PV (>= ${gcc:SoftVersion})
+Recommends: gcc`'PV (>= ${gcc:SoftVersion})
+Description: The GNU C compiler (native language support files)
+ Native language support for GCC. Lets GCC speak your language,
+ if translations are available.
+ .
+ Please do NOT submit bug reports in other languages than "C".
+ Always reset your language settings to use the "C" locales.
+')`'dnl native
+')`'dnl cdev
+
+ifenabled(`c++',`
+ifenabled(`c++dev',`
+Package: g++`'PV`'TS
+Architecture: any
+Section: devel
+Priority: ifdef(`TARGET',`extra',`PRI(optional)')
+Depends: BASEDEP, gcc`'PV`'TS (= ${gcc:Version}), libstdc++CXX_SO`'PV-dev`'LS (= ${gcc:Version}), ${shlibs:Depends}
+Provides: c++-compiler`'TS, c++abi2-dev
+Suggests: ${gxx:multilib}, gcc`'PV-doc (>= ${gcc:SoftVersion})
+Description: The GNU C++ compiler`'ifdef(`TARGET)',` (cross compiler for TARGET architecture)', `')
+ This is the GNU C++ compiler, a fairly portable optimizing compiler for C++.
+ifdef(`TARGET', `dnl
+ .
+ This package contains C++ cross-compiler for TARGET architecture.
+')`'dnl
+
+ifenabled(`multilib',`
+Package: g++`'PV-multilib`'TS
+Architecture: MULTILIB_ARCHS
+Section: devel
+Priority: ifdef(`TARGET',`extra',`PRI(optional)')
+Depends: BASEDEP, g++`'PV`'TS (= ${gcc:Version}), gcc`'PV-multilib`'TS (= ${gcc:Version}), ${dep:libcxxbiarch}, ${shlibs:Depends}
+Suggests: ${dep:libcxxbiarchdbg}
+Replaces: libstdc++6-4.2-dev (<< 4.2-20061008)
+Description: The GNU C++ compiler (multilib files)`'ifdef(`TARGET)',` (cross compiler for TARGET architecture)', `')
+ This is the GNU C++ compiler, a fairly portable optimizing compiler for C++.
+ .
+ On architectures with multilib support, the package contains files
+ and dependencies for the non-default multilib architecture(s).
+')`'dnl multilib
+')`'dnl c++dev
+')`'dnl c++
+
+ifdef(`TARGET', `', `
+ifenabled(`mudflap',`
+Package: libmudflap`'MF_SO
+Architecture: any
+Section: libs
+Priority: PRI(optional)
+Depends: BASEDEP, ${shlibs:Depends}
+Description: GCC mudflap shared support libraries
+ The libmudflap libraries are used by GCC for instrumenting pointer and array
+ dereferencing operations.
+
+Package: lib32mudflap`'MF_SO
+Architecture: biarch32_archs
+Section: libs
+Priority: PRI(optional)
+Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}
+Replaces: libmudflap0 (<< 4.1)
+Description: GCC mudflap shared support libraries (32bit)
+ The libmudflap libraries are used by GCC for instrumenting pointer and array
+ dereferencing operations.
+
+Package: lib64mudflap`'MF_SO
+Architecture: biarch64_archs
+Section: libs
+Priority: PRI(optional)
+Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}
+Replaces: libmudflap0 (<< 4.1)
+Description: GCC mudflap shared support libraries (64bit)
+ The libmudflap libraries are used by GCC for instrumenting pointer and array
+ dereferencing operations.
+
+Package: libmudflap`'MF_SO`'PV-dev
+Architecture: any
+Section: libdevel
+Priority: PRI(optional)
+Depends: BASEDEP, libmudflap`'MF_SO (>= ${gcc:Version}), ${dep:libcdev}, ${shlibs:Depends}
+Suggests: ${sug:libmudflapdev}
+Conflicts: libmudflap0-dev
+Description: GCC mudflap support libraries (development files)
+ The libmudflap libraries are used by GCC for instrumenting pointer and array
+ dereferencing operations.
+ .
+ This package contains the headers and the static libraries.
+')`'dnl
+')`'dnl native
+
+ifdef(`TARGET', `', `
+ifenabled(`ssp',`
+Package: libssp`'SSP_SO
+Architecture: any
+Section: libs
+Priority: PRI(optional)
+Depends: BASEDEP, ${shlibs:Depends}
+Description: GCC stack smashing protection library
+ GCC can now emit code for protecting applications from stack-smashing attacks.
+ The protection is realized by buffer overflow detection and reordering of
+ stack variables to avoid pointer corruption.
+
+Package: lib32ssp`'SSP_SO
+Architecture: biarch32_archs
+Section: libs
+Priority: PRI(optional)
+Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}
+Replaces: libssp0 (<< 4.1)
+Description: GCC stack smashing protection library (32bit)
+ GCC can now emit code for protecting applications from stack-smashing attacks.
+ The protection is realized by buffer overflow detection and reordering of
+ stack variables to avoid pointer corruption.
+
+Package: lib64ssp`'SSP_SO
+Architecture: biarch64_archs
+Section: libs
+Priority: PRI(optional)
+Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}
+Replaces: libssp0 (<< 4.1)
+Description: GCC stack smashing protection library (64bit)
+ GCC can now emit code for protecting applications from stack-smashing attacks.
+ The protection is realized by buffer overflow detection and reordering of
+ stack variables to avoid pointer corruption.
+')`'dnl
+')`'dnl native
+
+ifdef(`TARGET', `', `
+ifenabled(`libgomp',`
+Package: libgomp`'GOMP_SO
+Architecture: any
+Section: libs
+Priority: PRI(optional)
+Depends: BASEDEP, ${shlibs:Depends}
+Description: GCC OpenMP (GOMP) support library
+ GOMP is an implementation of OpenMP for the C, C++, and Fortran 95 compilers
+ in the GNU Compiler Collection.
+
+Package: lib32gomp`'GOMP_SO
+Architecture: biarch32_archs
+Section: libs
+Priority: PRI(optional)
+Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}
+Description: GCC OpenMP (GOMP) support library (32bit)
+ GOMP is an implementation of OpenMP for the C, C++, and Fortran 95 compilers
+ in the GNU Compiler Collection.
+
+Package: lib64gomp`'GOMP_SO
+Architecture: biarch64_archs
+Section: libs
+Priority: PRI(optional)
+Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}
+Description: GCC OpenMP (GOMP) support library (64bit)
+ GOMP is an implementation of OpenMP for the C, C++, and Fortran 95 compilers
+ in the GNU Compiler Collection.
+')`'dnl
+')`'dnl native
+
+ifenabled(`proto',`
+Package: protoize
+Architecture: any
+Priority: PRI(optional)
+Depends: BASEDEP, gcc`'PV (>= ${gcc:Version}), ${shlibs:Depends}
+Description: Create/remove ANSI prototypes from C code
+ "protoize" can be used to add prototypes to a program, thus converting
+ the program to ANSI C in one respect.  The companion program "unprotoize"
+ does the reverse: it removes argument types from any prototypes
+ that are found.
+')`'dnl proto
+
+ifenabled(`objpp',`
+ifenabled(`objppdev',`
+Package: gobjc++`'PV`'TS
+Architecture: any
+Priority: ifdef(`TARGET',`extra',`PRI(optional)')
+Depends: BASEDEP, gobjc`'PV`'TS (= ${gcc:Version}), g++`'PV`'TS (= ${gcc:Version}), ${shlibs:Depends}, libobjc`'OBJC_SO`'LS (>= ${gcc:Version})
+Suggests: ${gobjcxx:multilib}, gcc`'PV-doc (>= ${gcc:SoftVersion})
+Provides: objc++-compiler`'TS
+Description: The GNU Objective-C++ compiler
+ This is the GNU Objective-C++ compiler, which compiles
+ Objective-C++ on platforms supported by the gcc compiler. It uses the
+ gcc backend to generate optimized code.
+')`'dnl obcppdev
+
+ifenabled(`multilib',`
+Package: gobjc++`'PV-multilib`'TS
+Architecture: MULTILIB_ARCHS
+Section: devel
+Priority: ifdef(`TARGET',`extra',`PRI(optional)')
+Depends: BASEDEP, gobjc++`'PV`'TS (= ${gcc:Version}), g++`'PV-multilib`'TS (= ${gcc:Version}), gobjc`'PV-multilib`'TS (= ${gcc:Version}), ${shlibs:Depends}
+Description: The GNU Objective-C++ compiler (multilib files)
+ This is the GNU Objective-C++ compiler, which compiles Objective-C++ on
+ platforms supported by the gcc compiler.
+ .
+ On architectures with multilib support, the package contains files
+ and dependencies for the non-default multilib architecture(s).
+')`'dnl multilib
+')`'dnl obcpp
+
+ifenabled(`objc',`
+ifenabled(`objcdev',`
+Package: gobjc`'PV`'TS
+Architecture: any
+Priority: ifdef(`TARGET',`extra',`PRI(optional)')
+Depends: BASEDEP, gcc`'PV`'TS (= ${gcc:Version}), ${dep:libcdev}, ${shlibs:Depends}, libobjc`'OBJC_SO`'LS (>= ${gcc:Version})
+Suggests: ${gobjc:multilib}, gcc`'PV-doc (>= ${gcc:SoftVersion})
+Provides: objc-compiler`'TS
+ifdef(`OBJC_GC',`Recommends: libgc-dev', `dnl')
+ifdef(`__sparc__',`Conflicts: gcc`'PV-sparc64', `dnl')
+Description: The GNU Objective-C compiler
+ This is the GNU Objective-C compiler, which compiles
+ Objective-C on platforms supported by the gcc compiler. It uses the
+ gcc backend to generate optimized code.
+
+ifenabled(`multilib',`
+Package: gobjc`'PV-multilib`'TS
+Architecture: MULTILIB_ARCHS
+Section: devel
+Priority: ifdef(`TARGET',`extra',`PRI(optional)')
+Depends: BASEDEP, gobjc`'PV`'TS (= ${gcc:Version}), gcc`'PV-multilib`'TS (= ${gcc:Version}), ${dep:libobjcbiarch}, ${shlibs:Depends}
+Replaces: gobjc-4.2 (<< 4.2-20061008)
+Description: The GNU Objective-C compiler (multilib files)`'ifdef(`TARGET)',` (cross compiler for TARGET architecture)', `')
+ This is the GNU Objective-C compiler, which compiles Objective-C on platforms
+ supported by the gcc compiler.
+ .
+ On architectures with multilib support, the package contains files
+ and dependencies for the non-default multilib architecture(s).
+')`'dnl multilib
+')`'dnl objcdev
+
+ifenabled(`libobjc',`
+Package: libobjc`'OBJC_SO`'LS
+Section: ifdef(`TARGET',`devel',`libs')
+Architecture: any
+Priority: ifdef(`TARGET',`extra',`PRI(optional)')
+Depends: BASEDEP, ${shlibs:Depends}
+Description: Runtime library for GNU Objective-C applications
+ Library needed for GNU ObjC applications linked against the shared library.
+')`'dnl libobjc
+
+ifenabled(`lib64objc',`
+Package: lib64objc`'OBJC_SO
+Section: libs
+Architecture: biarch64_archs
+Priority: PRI(optional)
+Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}
+Description: Runtime library for GNU Objective-C applications (64bit)
+ Library needed for GNU ObjC applications linked against the shared library.
+')`'dnl lib64objc
+
+ifenabled(`lib32objc',`
+Package: lib32objc`'OBJC_SO
+Section: libs
+Architecture: biarch32_archs
+Priority: PRI(optional)
+Depends: gcc`'PV-base (>= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}
+Description: Runtime library for GNU Objective-C applications (32bit)
+ Library needed for GNU ObjC applications linked against the shared library.
+')`'dnl lib32objc
+')`'dnl objc
+
+ifenabled(`fortran',`
+ifenabled(`fdev',`
+Package: gfortran`'PV
+Architecture: any
+Priority: PRI(optional)
+Depends: BASEDEP, gcc`'PV (= ${gcc:Version}), libgfortran`'FORTRAN_SO (>= ${gcc:Version}), ${dep:libcdev}, ${shlibs:Depends}
+Provides: fortran95-compiler
+Suggests: ${gfortran:multilib}, gfortran`'PV-doc
+Replaces: libgfortran`'FORTRAN_SO-dev
+Description: The GNU Fortran 95 compiler
+ This is the GNU Fortran compiler, which compiles
+ Fortran 95 on platforms supported by the gcc compiler. It uses the
+ gcc backend to generate optimized code.
+
+ifenabled(`multilib',`
+Package: gfortran`'PV-multilib`'TS
+Architecture: MULTILIB_ARCHS
+Section: devel
+Priority: ifdef(`TARGET',`extra',`PRI(optional)')
+Depends: BASEDEP, gfortran`'PV`'TS (= ${gcc:Version}), gcc`'PV-multilib`'TS (= ${gcc:Version}), ${dep:libfortranbiarch}, ${shlibs:Depends}
+Replaces: gfortran-4.2 (<< 4.2-20061008)
+Description: The GNU Fortran 95 compiler (multilib files)`'ifdef(`TARGET)',` (cross compiler for TARGET architecture)', `')
+ This is the GNU Fortran compiler, which compiles Fortran 95 on platforms
+ supported by the gcc compiler.
+ .
+ On architectures with multilib support, the package contains files
+ and dependencies for the non-default multilib architecture(s).
+')`'dnl multilib
+
+ifenabled(`gfdldoc',`
+Package: gfortran`'PV-doc
+Architecture: all
+Section: doc
+Priority: PRI(optional)
+Depends: gcc`'PV-base (>= ${gcc:SoftVersion})
+Description: Documentation for the GNU Fortran compiler (gfortran)
+ Documentation for the GNU Fortran 95 compiler in info `format'.
+')`'dnl gfdldoc
+')`'dnl fdev
+
+ifenabled(`libfortran',`
+Package: libgfortran`'FORTRAN_SO
+Section: libs
+Architecture: any
+Priority: PRI(optional)
+Depends: BASEDEP, ${shlibs:Depends}
+Description: Runtime library for GNU Fortran applications
+ Library needed for GNU Fortran applications linked against the
+ shared library.
+')`'dnl libgfortran
+
+ifenabled(`lib64gfortran',`
+Package: lib64gfortran`'FORTRAN_SO
+Section: libs
+Architecture: biarch64_archs
+Priority: PRI(optional)
+Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}
+Description: Runtime library for GNU Fortran applications (64bit)
+ Library needed for GNU Fortran applications linked against the
+ shared library.
+')`'dnl lib64gfortran
+
+ifenabled(`lib32gfortran',`
+Package: lib32gfortran`'FORTRAN_SO
+Section: libs
+Architecture: biarch32_archs
+Priority: PRI(optional)
+Depends: BASEDEP, ${dep:libcbiarch}, ${shlibs:Depends}
+Description: Runtime library for GNU Fortran applications (32bit)
+ Library needed for GNU Fortran applications linked against the
+ shared library.
+')`'dnl lib32gfortran
+')`'dnl fortran
+
+ifenabled(`java',`
+ifenabled(`gcj',`
+Package: gcj`'PV
+Architecture: any
+Priority: PRI(optional)
+Depends: gcj`'PV-base (= ${gcj:Version}), ${dep:gcj}, ${dep:libcdev}, gij`'PV (= ${gcj:Version}), libgcj`'GCJ_SO-dev (= ${gcj:Version}), libgcj`'GCJ_SO-jar (>= ${gcj:SoftVersion}), ecj (>= 3.2.1-6), java-common, ${shlibs:Depends}
+Recommends: fastjar, ecj-gcj
+Suggests: java-gcj-compat-dev
+Provides: java-compiler
+Conflicts: cpp-4.1 (<< 4.1.1), gcc-4.1 (<< 4.1.1), java-gcj-compat-dev (<< 1.0.56-2)
+Description: The GNU compiler for Java(TM)
+ GCJ is a front end to the GCC compiler which can natively compile both
+ Java(tm) source and bytecode files. The compiler can also generate class
+ files.
+')`'dnl gcj
+
+ifenabled(`libgcj',`
+ifenabled(`libgcjcommon',`
+Package: libgcj-common
+Section: libs
+Architecture: all
+Priority: PRI(optional)
+Depends: gcj`'PV-base (>= ${gcj:SoftVersion})
+Conflicts: classpath (<= 0.04-4)
+Replaces: java-gcj-compat (<< 1.0.65-3), java-gcj-compat-dev (<< 1.0.65-3)
+Description: Java runtime library (common files)
+ This package contains files shared by classpath and libgcj libraries.
+')`'dnl libgcjcommon
+
+Package: gij`'PV
+Priority: optional
+Architecture: any
+Depends: gcj`'PV-base (= ${gcj:Version}), libgcj`'LIBGCJ_EXT (= ${gcj:Version}), ${dep:prctl}, ${shlibs:Depends}
+Recommends: libgcj`'LIBGCJ_EXT-awt (= ${gcj:Version})
+Suggests: fastjar, gcj`'PV (= ${gcj:Version}), java-gcj-compat
+Replaces: libgcj8
+Provides: java-virtual-machine, java2-runtime, java1-runtime, java-runtime
+Description: The GNU Java bytecode interpreter
+ GIJ is not limited to interpreting bytecode. It includes a class loader which
+ can dynamically load shared objects, so it is possible to give it the name
+ of a class which has been compiled and put into a shared library on the
+ class path.
+
+Package: libgcj`'LIBGCJ_EXT
+Section: libs
+Architecture: any
+Priority: PRI(optional)
+Depends: gcj`'PV-base (>= ${gcj:Version}), libgcj-common (>= 1:4.1.1-21), ${shlibs:Depends}
+Recommends: libgcj`'GCJ_SO-jar (>= ${gcj:SoftVersion}), libgcj`'LIBGCJ_EXT-awt (= ${gcj:Version})
+Suggests: libgcj`'GCJ_SO-dbg
+Conflicts: libgcj8
+Replaces: libgcj8, libgcj8-awt (<< 4.2-20060817)
+Description: Java runtime library for use with gcj
+ This is the runtime that goes along with the gcj front end to
+ gcc. libgcj includes parts of the Java Class Libraries, plus glue to
+ connect the libraries to the compiler and the underlying OS.
+ .
+ To show file names and line numbers in stack traces, the packages
+ libgcj`'GCJ_SO-dbg and binutils are required.
+
+Package: libgcj`'GCJ_SO-jar
+Section: libs
+Architecture: all
+Priority: PRI(optional)
+Depends: gcj`'PV-base (>= ${gcj:SoftVersion}), libgcj`'LIBGCJ_EXT (>= ${gcj:SoftVersion})
+Conflicts: libgcj7-common
+Replaces: libgcj7-common
+Description: Java runtime library for use with gcj (jar files)
+ This is the jar file that goes along with the gcj front end to gcc.
+
+ifenabled(`gcjbc',`
+Package: libgcj-bc
+Section: libs
+Architecture: any
+Priority: PRI(optional)
+Depends: gcj`'PV-base (>= ${gcj:Version}), libgcj`'LIBGCJ_EXT (>= ${gcj:Version})
+Description: Link time only library for use with gcj
+ A fake library that is used at link time only.  It ensures that
+ binaries built with the BC-ABI link against a constant SONAME.
+ This way, BC-ABI binaries continue to work if the SONAME underlying
+ libgcj.so changes.
+')`'dnl gcjbc
+
+Package: libgcj`'LIBGCJ_EXT-awt
+Section: libs
+Architecture: any
+Priority: PRI(optional)
+Depends: gcj`'PV-base (= ${gcj:Version}), libgcj`'LIBGCJ_EXT (= ${gcj:Version}), ${shlibs:Depends}
+Suggests: ${pkg:gcjqt}
+Replaces: libgcj8-awt-gtk (<< 4.2-20070210)
+Description: AWT peer runtime libraries for use with gcj
+ These are runtime libraries holding the AWT peer implementations
+ for libgcj (currently the GTK based peer library is required, the
+ QT bases library is not built).
+
+ifenabled(`gtkpeer',`
+Package: libgcj`'GCJ_SO-awt-gtk
+Section: libs
+Architecture: any
+Priority: PRI(optional)
+Depends: gcj`'PV-base (= ${gcj:Version}), libgcj`'LIBGCJ_EXT-awt (= ${gcj:Version}), ${shlibs:Depends}
+Description: AWT GTK peer runtime library for use with libgcj
+ This is the runtime library holding the GTK based AWT peer
+ implementation for libgcj.
+')`'dnl gtkpeer
+
+ifenabled(`qtpeer',`
+Package: libgcj`'GCJ_SO-awt-qt
+Section: libs
+Architecture: any
+Priority: PRI(optional)
+Depends: gcj`'PV-base (= ${gcj:Version}), libgcj`'LIBGCJ_EXT-awt (= ${gcj:Version}), ${shlibs:Depends}
+Description: AWT QT peer runtime library for use with libgcj
+ This is the runtime library holding the QT based AWT peer
+ implementation for libgcj.
+')`'dnl qtpeer
+
+Package: gappletviewer`'PV
+Section: utils
+Architecture: any
+Priority: PRI(optional)
+Depends: gcj`'PV-base (= ${gcj:Version}), gij`'PV (= ${gcj:Version}), libgcj`'LIBGCJ_EXT-awt (= ${gcj:Version}), ${shlibs:Depends}
+Description: Standalone application to execute Java (tm) applets
+ gappletviewer is a standalone application to execute Java (tm) applets.
+
+Package: gcjwebplugin`'PV
+Section: web
+Architecture: any
+Priority: PRI(optional)
+Depends: gcj`'PV-base (= ${gcj:Version}), gappletviewer`'PV (= ${gcj:Version}), ${shlibs:Depends}, firefox | mozilla-browser | epiphany-browser | galeon | konqueror
+Description: Web browser plugin to execute Java (tm) applets
+ gcjwebplugin is a little web browser plugin to execute Java (tm) applets.
+ It is targeted for Mozilla and compatible browsers that support the NPAPI.
+')`'dnl libgcj
+
+ifenabled(`lib64gcj',`
+Package: lib64gcj`'LIBGCJ_EXT
+Section: libs
+Architecture: biarch64_archs
+Priority: PRI(optional)
+Depends: gcj`'PV-base (= ${gcj:Version}), libgcj-common, ${shlibs:Depends}
+Description: Java runtime library for use with gcj (64bit)
+ This is the runtime that goes along with the gcj front end to
+ gcc. libgcj includes parts of the Java Class Libraries, plus glue to
+ connect the libraries to the compiler and the underlying OS.
+
+ifenabled(`gcjbc',`
+Package: lib64gcj-bc
+Section: libs
+Architecture: biarch64_archs
+Priority: PRI(optional)
+Depends: gcj`'PV-base (>= ${gcj:Version}), lib64gcj`'LIBGCJ_EXT (>= ${gcj:Version})
+Description: Link time only library for use with gcj (64bit)
+ A fake library that is used at link time only.  It ensures that
+ binaries built with the BC-ABI link against a constant SONAME.
+ This way, BC-ABI binaries continue to work if the SONAME underlying
+ libgcj.so changes.
+')`'dnl gcjbc
+')`'dnl lib64gcj
+
+ifenabled(`lib32gcj',`
+Package: lib32gcj`'LIBGCJ_EXT
+Section: libs
+Architecture: biarch32_archs
+Priority: PRI(optional)
+Depends: gcj`'PV-base (= ${gcj:Version}), libgcj-common, lib32stdc++`'CXX_SO`'LS, lib32z1
+Suggests: lib32gcj`'GCJ_SO-dbg
+Description: Java runtime library for use with gcj (32bit)
+ This is the runtime that goes along with the gcj front end to
+ gcc. libgcj includes parts of the Java Class Libraries, plus glue to
+ connect the libraries to the compiler and the underlying OS.
+ .
+ To show file names and line numbers in stack traces, the packages
+ libgcj`'GCJ_SO-dbg and binutils are required.
+
+ifenabled(`gcjbc',`
+Package: lib32gcj-bc
+Section: libs
+Architecture: biarch32_archs
+Priority: PRI(optional)
+Depends: gcj`'PV-base (>= ${gcj:Version}), lib32gcj`'LIBGCJ_EXT (>= ${gcj:Version})
+Description: Link time only library for use with gcj (32bit)
+ A fake library that is used at link time only.  It ensures that
+ binaries built with the BC-ABI link against a constant SONAME.
+ This way, BC-ABI binaries continue to work if the SONAME underlying
+ libgcj.so changes.
+')`'dnl gcjbc
+')`'dnl lib32gcj
+
+ifenabled(`libgcjdev',`
+Package: libgcj`'GCJ_SO-dev
+Section: libdevel
+Architecture: any
+Priority: PRI(optional)
+Depends: gcj`'PV-base (= ${gcj:Version}), gcj`'PV (= ${gcj:Version}), libgcj`'GCJ_SO-jar (>= ${gcj:SoftVersion}), libgcj`'LIBGCJ_EXT-awt (= ${gcj:Version}), libgcj-bc, ${pkg:gcjgtk}, ${pkg:gcjqt}, zlib1g-dev, ${shlibs:Depends}
+Suggests: libgcj-doc
+Description: Java development headers and static library for use with gcj
+ These are the development headers and static libraries that go along
+ with the gcj front end to gcc. libgcj includes parts of the Java Class
+ Libraries, plus glue to connect the libraries to the compiler and the
+ underlying OS.
+
+Package: lib32gcj`'GCJ_SO-dev
+Section: libdevel
+Architecture: biarch32_archs
+Priority: PRI(optional)
+Depends: gcj`'PV-base (= ${gcj:Version}), libgcj`'GCJ_SO-dev (= ${gcj:Version}), lib32gcj-bc, lib32gcj`'LIBGCJ_EXT (= ${gcj:Version}), lib32z1-dev, ${shlibs:Depends}
+Description: Java development and static library for use with gcj (32bit)
+ These are the development headers and static libraries that go along
+ with the gcj front end to gcc. libgcj includes parts of the Java Class
+ Libraries, plus glue to connect the libraries to the compiler and the
+ underlying OS.
+
+Package: libgcj`'GCJ_SO-dbg
+Section: libdevel
+Architecture: any
+Priority: extra
+Depends: gcj`'PV-base (= ${gcj:Version}), libgcj`'LIBGCJ_EXT (= ${gcj:Version})
+Recommends: binutils
+Description: Debugging symbols for libraries provided in libgcj`'GCJ_SO-dev
+ The package provides debugging symbols for the libraries provided
+ in libgcj`'GCJ_SO-dev.
+ .
+ binutils is required to show file names and line numbers in stack traces.
+
+Package: lib32gcj`'GCJ_SO-dbg
+Section: libdevel
+Architecture: biarch32_archs
+Priority: extra
+Depends: gcj`'PV-base (= ${gcj:Version}), lib32gcj`'LIBGCJ_EXT (= ${gcj:Version})
+Recommends: binutils
+Description: Debugging symbols for libraries provided in lib32gcj`'GCJ_SO-dev
+ The package provides debugging symbols for the libraries provided
+ in lib32gcj`'GCJ_SO-dev.
+ .
+ binutils is required to show file names and line numbers in stack traces.
+
+Package: libgcj`'GCJ_SO-src
+Section: libdevel
+Architecture: all
+Priority: PRI(optional)
+Depends: gcj`'PV-base (>= ${gcj:SoftVersion}), gcj`'PV (>= ${gcj:SoftVersion}), libgcj`'GCJ_SO-jar (= ${gcj:Version})
+Description: libgcj java sources for use in eclipse
+ These are the java source files packaged as a zip file for use in development
+ environments like eclipse.
+
+ifenabled(`gcjdoc',`
+Package: libgcj-doc
+Section: doc
+Architecture: all
+Priority: PRI(optional)
+Depends: gcj`'PV-base (>= ${gcj:SoftVersion})
+Enhances: libgcj`'GCJ_SO-dev
+Provides: classpath-doc
+Description: libgcj API documentation and example programs
+ Autogenerated documentation describing the API of the libgcj library.
+ Sources and precompiled example programs from the classpath library.
+')`'dnl gcjdoc
+')`'dnl libgcjdev
+')`'dnl java
+
+ifenabled(`libffi',`
+Package: libffi`'FFI_SO
+Section: libs
+Architecture: any
+Priority: PRI(optional)
+Depends: gcc`'PV`'-base (= ${gcc:Version}), ${shlibs:Depends}
+Description: Foreign Function Interface library runtime
+ A foreign function interface is the popular name for the interface that
+ allows code written in one language to call code written in another
+ language.
+
+Package: lib32ffi`'FFI_SO
+Section: libs
+Architecture: biarch32_archs
+Priority: PRI(optional)
+Depends: gcc`'PV`'-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}
+Replaces: libffi4 (<< 4.1)
+Description: Foreign Function Interface library runtime (32bit)
+ A foreign function interface is the popular name for the interface that
+ allows code written in one language to call code written in another
+ language.
+
+Package: lib64ffi`'FFI_SO
+Section: libs
+Architecture: biarch64_archs
+Priority: PRI(optional)
+Depends: gcc`'PV`'-base (= ${gcc:Version}), ${dep:libcbiarch}, ${shlibs:Depends}
+Replaces: libffi4 (<< 4.1)
+Description: Foreign Function Interface library runtime (64bit)
+ A foreign function interface is the popular name for the interface that
+ allows code written in one language to call code written in another
+ language.
+
+Package: libffi`'FFI_SO-dev
+Section: libdevel
+Architecture: any
+Priority: PRI(optional)
+Depends: gcc`'PV`'-base (= ${gcc:Version}), libffi`'FFI_SO (>= ${gcc:Version})
+Suggests: ${sug:libffidev}
+Provides: libffi-dev
+Conflicts: libffi1-dev, libffi2-dev, libffi3-dev, libffi-dev, libffi
+Description: Foreign Function Interface library (development files)
+ This package contains the headers and static library files necessary for
+ building programs which use libffi.
+ .
+ A foreign function interface is the popular name for the interface that
+ allows code written in one language to call code written in another
+ language.
+')`'dnl libffi
+
+ifenabled(`c++',`
+ifenabled(`libcxx',`
+Package: libstdc++CXX_SO`'LS
+Architecture: ifdef(`TARGET',`all',`any')
+Section: ifdef(`TARGET',`devel',`libs')
+Priority: ifdef(`TARGET',`extra',PRI(required))
+Depends: BASEDEP, ${shlibs:Depends}
+ifdef(`TARGET',`Provides: libstdc++CXX_SO-TARGET-dcv1
+',`')`'dnl
+Conflicts: scim (<< 1.4.2-1)
+Description: The GNU Standard C++ Library v3`'ifdef(`TARGET)',` (TARGET)', `')
+ This package contains an additional runtime library for C++ programs
+ built with the GNU compiler.
+ .
+ libstdc++-v3 is a complete rewrite from the previous libstdc++-v2, which
+ was included up to g++-2.95. The first version of libstdc++-v3 appeared
+ in g++-3.0.
+ifdef(`TARGET', `dnl
+ .
+ This package contains files for TARGET architecture, for use in cross-compile
+ environment.
+')`'dnl
+')`'dnl libcxx
+
+ifenabled(`lib32cxx',`
+Package: lib32stdc++CXX_SO`'LS
+Architecture: ifdef(`TARGET',`all',`biarch32_archs')
+Section: ifdef(`TARGET',`devel',`libs')
+Priority: ifdef(`TARGET',`extra',PRI(optional))
+Depends: BASEDEP, lib32gcc1`'LS
+ifdef(`TARGET',`Provides: lib32stdc++CXX_SO-TARGET-dcv1
+',`')`'dnl
+Description: The GNU Standard C++ Library v3 (32 bit Version)
+ This package contains an additional runtime library for C++ programs
+ built with the GNU compiler.
+ifdef(`TARGET', `dnl
+ .
+ This package contains files for TARGET architecture, for use in cross-compile
+ environment.
+')`'dnl
+')`'dnl lib32cxx
+
+ifenabled(`lib64cxx',`
+Package: lib64stdc++CXX_SO`'LS
+Architecture: ifdef(`TARGET',`all',`biarch64_archs')
+Section: ifdef(`TARGET',`devel',`libs')
+Priority: ifdef(`TARGET',`extra',PRI(optional))
+Depends: BASEDEP, ${shlibs:Depends}, lib64gcc1`'LS
+ifdef(`TARGET',`Provides: lib64stdc++CXX_SO-TARGET-dcv1
+',`')`'dnl
+Description: The GNU Standard C++ Library v3`'ifdef(`TARGET)',` (TARGET)', `') (64bit)
+ This package contains an additional runtime library for C++ programs
+ built with the GNU compiler.
+ .
+ libstdc++-v3 is a complete rewrite from the previous libstdc++-v2, which
+ was included up to g++-2.95. The first version of libstdc++-v3 appeared
+ in g++-3.0.
+ifdef(`TARGET', `dnl
+ .
+ This package contains files for TARGET architecture, for use in cross-compile
+ environment.
+')`'dnl
+')`'dnl lib64cxx
+
+ifenabled(`c++dev',`
+Package: libstdc++CXX_SO`'PV-dev`'LS
+Architecture: ifdef(`TARGET',`all',`any')
+Section: ifdef(`TARGET',`devel',`libdevel')
+Priority: ifdef(`TARGET',`extra',PRI(optional))
+Depends: BASEDEP, g++`'PV`'TS (= ${gcc:Version}), libstdc++CXX_SO`'LS (>= ${gcc:Version}), ${dep:libcdev}
+ifdef(`TARGET',`',`dnl native
+Conflicts: libg++27-dev, libg++272-dev (<< 2.7.2.8-1), libstdc++2.8-dev, libg++2.8-dev, libstdc++2.9-dev, libstdc++2.9-glibc2.1-dev, libstdc++2.10-dev (<< 1:2.95.3-2), libstdc++3.0-dev, libstdc++6-4.2-dev (<< 4.2-20070307), libgcj8-dev (<< 4.2-20070307)
+Suggests: libstdc++CXX_SO`'PV-doc
+')`'dnl native
+Provides: libstdc++-dev`'LS`'dnl
+ifdef(`TARGET',`, libstdc++-dev-TARGET-dcv1, libstdc++CXX_SO-dev-TARGET-dcv1
+',`
+')`'dnl
+Description: The GNU Standard C++ Library v3 (development files)`'ifdef(`TARGET)',` (TARGET)', `')
+ This package contains the headers and static library files necessary for
+ building C++ programs which use libstdc++.
+ .
+ libstdc++-v3 is a complete rewrite from the previous libstdc++-v2, which
+ was included up to g++-2.95. The first version of libstdc++-v3 appeared
+ in g++-3.0.
+ifdef(`TARGET', `dnl
+ .
+ This package contains files for TARGET architecture, for use in cross-compile
+ environment.
+')`'dnl
+
+Package: libstdc++CXX_SO`'PV-pic`'LS
+Architecture: ifdef(`TARGET',`all',`any')
+Section: ifdef(`TARGET',`devel',`libdevel')
+Priority: extra
+Depends: BASEDEP, libstdc++CXX_SO`'LS (>= ${gcc:Version}), libstdc++CXX_SO`'PV-dev`'LS (= ${gcc:Version})
+ifdef(`TARGET',`Provides: libstdc++CXX_SO-pic-TARGET-dcv1
+',`')`'dnl
+Description: The GNU Standard C++ Library v3 (shared library subset kit)`'ifdef(`TARGET)',` (TARGET)', `')
+ This is used to develop subsets of the libstdc++ shared libraries for
+ use on custom installation floppies and in embedded systems.
+ .
+ Unless you are making one of those, you will not need this package.
+ifdef(`TARGET', `dnl
+ .
+ This package contains files for TARGET architecture, for use in cross-compile
+ environment.
+')`'dnl
+
+Package: libstdc++CXX_SO`'PV-dbg`'LS
+Architecture: ifdef(`TARGET',`all',`any')
+Section: ifdef(`TARGET',`devel',`libdevel')
+Priority: extra
+Depends: BASEDEP, libstdc++CXX_SO`'LS (>= ${gcc:Version})
+ifdef(`TARGET',`Provides: libstdc++CXX_SO-dbg-TARGET-dcv1
+',`')`'dnl
+Recommends: libstdc++CXX_SO`'PV-dev`'LS (= ${gcc:Version})
+Conflicts: libstdc++5-dbg`'LS, libstdc++5-3.3-dbg`'LS, libstdc++6-dbg`'LS, libstdc++6-4.0-dbg`'LS, libstdc++6-4.1-dbg`'LS
+Description: The GNU Standard C++ Library v3 (debugging files)`'ifdef(`TARGET)',` (TARGET)', `')
+ This package contains the shared library of libstdc++ compiled with
+ debugging symbols.
+ifdef(`TARGET', `dnl
+ .
+ This package contains files for TARGET architecture, for use in cross-compile
+ environment.
+')`'dnl
+
+Package: lib32stdc++CXX_SO`'PV-dbg`'LS
+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})
+ifdef(`TARGET',`Provides: lib32stdc++CXX_SO-dbg-TARGET-dcv1
+',`')`'dnl
+Conflicts: lib32stdc++6-4.0-dbg`'LS, lib32stdc++6-4.1-dbg`'LS
+Description: The GNU Standard C++ Library v3 (debugging files)`'ifdef(`TARGET)',` (TARGET)', `')
+ This package contains the shared library of libstdc++ compiled with
+ debugging symbols.
+ifdef(`TARGET', `dnl
+ .
+ This package contains files for TARGET architecture, for use in cross-compile
+ environment.
+')`'dnl
+
+Package: lib64stdc++CXX_SO`'PV-dbg`'LS
+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})
+ifdef(`TARGET',`Provides: lib64stdc++CXX_SO-dbg-TARGET-dcv1
+',`')`'dnl
+Conflicts: lib64stdc++6-4.0-dbg`'LS, lib64stdc++6-4.1-dbg`'LS
+Description: The GNU Standard C++ Library v3 (debugging files)`'ifdef(`TARGET)',` (TARGET)', `')
+ This package contains the shared library of libstdc++ compiled with
+ debugging symbols.
+ifdef(`TARGET', `dnl
+ .
+ This package contains files for TARGET architecture, for use in cross-compile
+ environment.
+')`'dnl
+
+ifdef(`TARGET', `', `
+Package: libstdc++CXX_SO`'PV-doc
+Architecture: all
+Section: doc
+Priority: PRI(optional)
+Depends: gcc`'PV-base (>= ${gcc:SoftVersion})
+Conflicts: libstdc++5-doc, libstdc++5-3.3-doc, libstdc++6-doc, libstdc++6-4.0-doc, libstdc++6-4.1-doc
+Description: The GNU Standard C++ Library v3 (documentation files)
+ This package contains documentation files for the GNU stdc++ library.
+ .
+ One set is the distribution documentation, the other set is the
+ source documentation including a namespace list, class hierarchy,
+ alphabetical list, compound list, file list, namespace members,
+ compound members and file members.
+')`'dnl native
+')`'dnl c++dev
+')`'dnl c++
+
+ifenabled(`ada',`
+Package: gnat`'-GNAT_V
+Architecture: any
+Priority: PRI(optional)
+Depends: gnat`'PV-base (= ${gnat:Version}), gcc`'PV (>= ${gcc:Version}), ${dep:libgnat}, ${dep:libcdev}, ${shlibs:Depends}
+Suggests: gnat`'PV-doc, ada-reference-manual
+Provides: ada-compiler
+Conflicts: gnat (<< 4.1), gnat-3.1, gnat-3.2, gnat-3.3, gnat-3.4, gnat-3.5, gnat-4.0, gnat-4.1
+Description: The GNU Ada compiler
+ This is the GNU Ada compiler, which compiles Ada on platforms supported
+ by the gcc compiler. It uses the gcc backend to generate optimized code.
+
+ifenabled(`libgnat',`
+Package: libgnat`'-GNAT_V
+Section: libs
+Architecture: any
+Priority: PRI(optional)
+Depends: gnat`'PV-base (= ${gnat:Version}), ${shlibs:Depends}
+Description: Runtime library for GNU Ada applications
+ Library needed for GNU Ada applications linked against the shared library.
+
+Package: libgnat`'-GNAT_V-dbg
+Section: libdevel
+Architecture: any
+Priority: extra
+Depends: gnat`'PV-base (= ${gnat:Version}), libgnat`'-GNAT_V (= ${gnat:Version})
+Recommends: gnat-gdb (>= 6.4)
+Description: Runtime library for GNU Ada applications
+ Debugging symbols for the library needed for GNU Ada applications linked
+ against the shared library.
+
+Package: libgnatvsn-dev
+Section: libdevel
+Architecture: any
+Priority: PRI(optional)
+Depends: gnat`'PV-base (= ${gnat:Version}), gnat`'PV (= ${gnat:Version}), libgnatvsn`'GNAT_V (= ${gnat:Version})
+Description: GNU Ada compiler version library - development files
+ This library exports selected components of GNAT, the GNU Ada compiler, for use
+ in other packages, most notably ASIS and ASIS-based packages.  It is licensed
+ under the GNAT-Modified GPL, allowing to link proprietary programs with it.
+ .
+ This package contains the development files and static library.
+
+Package: libgnatvsn`'GNAT_V
+Architecture: any
+Priority: PRI(optional)
+Section: libs
+Depends: gnat`'PV-base (= ${gnat:Version}), libgnat`'-GNAT_V (= ${gnat:Version})
+Description: GNU Ada compiler version library
+ This library exports selected components of GNAT, the GNU Ada compiler, for use
+ in other packages, most notably ASIS and ASIS-based packages.  It is licensed
+ under the GNAT-Modified GPL, allowing to link proprietary programs with it.
+ .
+ This package contains the run-time shared library.
+
+Package: libgnatvsn`'GNAT_V-dbg
+Architecture: any
+Priority: extra
+Section: libdevel
+Depends: gnat`'PV-base (= ${gnat:Version}), libgnatvsn`'GNAT_V (= ${gnat:Version})
+Recommends: gnat-gdb (>= 6.4), libgnatvsn-dev (= ${gnat:Version})
+Description: GNU Ada compiler version library
+ This library exports selected components of GNAT, the GNU Ada compiler, for use
+ in other packages, most notably ASIS and ASIS-based packages.  It is licensed
+ under the GNAT-Modified GPL, allowing to link proprietary programs with it.
+ .
+ This package contains the debugging symbols for the run-time shared library.
+
+Package: libgnatprj-dev
+Section: libdevel
+Architecture: any
+Priority: PRI(optional)
+Depends: gnat`'PV-base (= ${gnat:Version}), gnat`'PV (= ${gnat:Version}), libgnatprj`'GNAT_V (= ${gnat:Version}), libgnatvsn-dev (= ${gnat:Version})
+Description: GNU Ada Project Manager development files
+ GNAT, the GNU Ada compiler, uses project files to organise source and object
+ files in large-scale development efforts.  Several other tools, such as
+ ASIS tools (package asis-programs) and GNAT Programming Studio (package
+ gnat-gps) also use project files.  This library contains the necessary
+ support; it was built from GNAT itself.  It is licensed under the pure GPL;
+ all programs that use it must also be distributed under the GPL, or not
+ distributed at all.
+ .
+ This package contains development files: install it to develop applications
+ that understand GNAT project files.
+
+Package: libgnatprj`'GNAT_V
+Architecture: any
+Priority: PRI(optional)
+Section: libs
+Depends: gnat`'PV-base (= ${gnat:Version}), libgnat`'-GNAT_V (= ${gnat:Version}), libgnatvsn`'GNAT_V (= ${gnat:Version})
+Description: GNU Ada Project Manager
+ GNAT, the GNU Ada compiler, uses project files to organise source and object
+ files in large-scale development efforts.  Several other tools, such as
+ ASIS tools (package asis-programs) and GNAT Programming Studio (package
+ gnat-gps) also use project files.  This library contains the necessary
+ support; it was built from GNAT itself.  It is licensed under the pure GPL;
+ all programs that use it must also be distributed under the GPL, or not
+ distributed at all.
+ .
+ This package contains the run-time shared library.
+
+Package: libgnatprj`'GNAT_V-dbg
+Architecture: any
+Priority: extra
+Section: libdevel
+Depends: gnat`'PV-base (= ${gnat:Version}), libgnatprj`'GNAT_V (= ${gnat:Version})
+Recommends: gnat-gdb (>= 6.4), libgnatprj-dev (= ${gnat:Version})
+Description: GNU Ada Project Manager
+ GNAT, the GNU Ada compiler, uses project files to organise source and object
+ files in large-scale development efforts.  Several other tools, such as
+ ASIS tools (package asis-programs) and GNAT Programming Studio (package
+ gnat-gps) also use project files.  This library contains the necessary
+ support; it was built from GNAT itself.  It is licensed under the pure GPL;
+ all programs that use it must also be distributed under the GPL, or not
+ distributed at all.
+ .
+ This package contains the debugging symbols for the run-time shared library.
+')`'dnl libgnat
+
+ifenabled(`lib64gnat',`
+Package: lib64gnat`'-GNAT_V
+Section: libs
+Architecture: biarch64_archs
+Priority: PRI(optional)
+Depends: gnat`'PV-base (= ${gnat:Version}), ${dep:libcbiarch}, ${shlibs:Depends}
+Description: Runtime library for GNU Ada applications
+ Library needed for GNU Ada applications linked against the shared library.
+')`'dnl libgnat
+
+ifenabled(`gfdldoc',`
+Package: gnat`'PV-doc
+Architecture: all
+Section: doc
+Priority: PRI(optional)
+Suggests: gnat`'PV
+Description: Documentation for the GNU Ada compiler (gnat)
+ Documentation for the GNU Ada compiler in info `format'.
+')`'dnl gfdldoc
+')`'dnl ada
+
+ifenabled(`pascal',`
+Package: gpc`'GPC_PV
+Architecture: any
+Priority: PRI(optional)
+Depends: BASEDEP, gcc`'PV (= ${gcc:Version}), ${dep:libcdev}, ${shlibs:Depends}
+Recommends: libgmp3-dev, libncurses5-dev
+Suggests: gpc`'GPC_PV-doc (>= ${gpc:Version})
+Provides: pascal-compiler
+Description: The GNU Pascal compiler
+ This is the GNU Pascal compiler, which compiles Pascal on platforms supported
+ by the gcc compiler. It uses the gcc backend to generate optimized code.
+ .
+ WARNING: the integration of gpc into gcc-4.x is still in an experimental
+ stage. For production use, please use gpc or gpc-2.1-3.4.
+
+Package: gpc`'GPC_PV-doc
+Architecture: all
+Section: doc
+Priority: PRI(optional)
+Depends: SOFTBASEDEP
+Replaces: gpc (<= 2.91.58-3)
+Suggests: gpc`'GPC_PV
+Description: Documentation for the GNU Pascal compiler (gpc)
+ Documentation for the GNU Pascal compiler in info `format'.
+ .
+ WARNING: the integration of gpc into gcc-4.x is still in an experimental
+ stage. For production use, please use gpc or gpc-2.1-3.4.
+')`'dnl pascal
+
+ifenabled(`treelang',`
+Package: treelang`'PV
+Architecture: any
+Priority: PRI(optional)
+Depends: BASEDEP, gcc`'PV (= ${gcc:Version}), ${shlibs:Depends}
+Description: The GNU Treelang compiler
+ Treelang is a sample language, useful only to help people understand how
+ to implement a new language front end to GCC. It is not a useful
+ language in itself other than as an example or basis for building a new
+ language. Therefore only language developers are likely to have an
+ interest in it.
+')`'dnl treelang
+
+ifdef(`TARGET',`',`dnl
+ifenabled(`libs',`
+Package: gcc`'PV-soft-float
+Architecture: arm armeb
+Priority: PRI(optional)
+Depends: BASEDEP, ifenabled(`cdev',`gcc`'PV (= ${gcc:Version}),') ${shlibs:Depends}
+Replaces: gcc-soft-float-ss
+Description: The soft-floating-point gcc libraries (arm)
+ These are versions of basic static libraries such as libgcc.a compiled
+ with the -msoft-float option, for CPUs without a floating-point unit.
+')`'dnl commonlibs
+')`'dnl
+
+ifenabled(`fixincl',`
+Package: fixincludes
+Architecture: any
+Priority: PRI(optional)
+Depends: BASEDEP, gcc`'PV (= ${gcc:Version}), ${shlibs:Depends}
+Description: Fix non-ANSI header files
+ FixIncludes was created to fix non-ANSI system header files. Many
+ system manufacturers supply proprietary headers that are not ANSI compliant.
+ The GNU compilers cannot compile non-ANSI headers. Consequently, the
+ FixIncludes shell script was written to fix the header files.
+ .
+ Not all packages with header files are installed on the system, when the
+ package is built, so we make fixincludes available at build time of other
+ packages, such that checking tools like lintian can make use of it.
+')`'dnl fixincl
+
+ifenabled(`cdev',`
+ifdef(`TARGET', `', `
+ifenabled(`gfdldoc',`
+Package: gcc`'PV-doc
+Architecture: all
+Section: doc
+Priority: PRI(optional)
+Depends: gcc`'PV-base (>= ${gcc:SoftVersion})
+Conflicts: gcc-docs (<< 2.95.2)
+Replaces: gcc (<=2.7.2.3-4.3), gcc-docs (<< 2.95.2)
+Description: Documentation for the GNU compilers (gcc, gobjc, g++)
+ Documentation for the GNU compilers in info `format'.
+')`'dnl gfdldoc
+')`'dnl native
+')`'dnl cdev
+
+ifdef(`TARGET',`',`dnl
+ifenabled(`libnof',`
+Package: gcc`'PV-nof
+Architecture: powerpc
+Priority: PRI(optional)
+Depends: BASEDEP, ${shlibs:Depends}ifenabled(`cdev',`, gcc`'PV (= ${gcc:Version})')
+Conflicts: gcc-3.2-nof
+Description: The no-floating-point gcc libraries (powerpc)
+ These are versions of basic static libraries such as libgcc.a compiled
+ with the -msoft-float option, for CPUs without a floating-point unit.
+')`'dnl libnof
+')`'dnl
+
+ifenabled(`source',`
+Package: gcc`'PV-source
+Architecture: all
+Priority: PRI(optional)
+Depends: gcc`'PV-base (>= ${gcc:SoftVersion}), make (>= 3.81)
+Description: Source of the GNU Compiler Collection
+ This package contains the sources and patches which are needed to
+ build the GNU Compiler Collection (GCC).
+')`'dnl source
+dnl
+')`'dnl gcc-X.Y
+dnl last line in file
--- gcj-4.2-4.2-20070707.orig/debian/gcj-BV.doc-base
+++ gcj-4.2-4.2-20070707/debian/gcj-BV.doc-base
@@ -0,0 +1,15 @@
+Document: gcj-@BV@
+Title: The GNU Ahead-of-time Compiler for the Java Language
+Author: Various
+Abstract: This manual describes how to use gcj, the GNU compiler for
+ the Java programming language.  gcj can generate both .class files and
+ object files, and it can read both Java source code and .class files.
+Section: Apps/Programming
+
+Format: html
+Index: /usr/share/doc/gcc-@BV@-base/java/gcj.html
+Files: /usr/share/doc/gcc-@BV@-base/java/gcj.html
+
+Format: info
+Index: /usr/share/info/gcj-@BV@.info.gz
+Files: /usr/share/info/gcj-@BV@*
--- gcj-4.2-4.2-20070707.orig/debian/gnat-BV-doc.doc-base.rm
+++ gcj-4.2-4.2-20070707/debian/gnat-BV-doc.doc-base.rm
@@ -0,0 +1,16 @@
+Document: gnat_rm-@BV@
+Title: GNAT (GNU Ada) Reference Manual
+Author: Various
+Abstract: This manual contains useful information in writing programs
+ using the GNAT compiler.  It includes information on implementation
+ dependent characteristics of GNAT, including all the information
+ required by Annex M of the standard.
+Section: Apps/Programming
+
+Format: html
+Index: /usr/share/doc/gnat-@BV@-doc/gnat_rm.html
+Files: /usr/share/doc/gnat-@BV@-doc/gnat_rm.html
+
+Format: info
+Index: /usr/share/info/gnat_rm-@BV@.info.gz
+Files: /usr/share/info/gnat_rm-@BV@*
--- gcj-4.2-4.2-20070707.orig/debian/multiarch.inc
+++ gcj-4.2-4.2-20070707/debian/multiarch.inc
@@ -0,0 +1,38 @@
+
+#if defined(__i486_linux_gnu__)
+  { "64",  "x86_64-linux-gnu"},
+#endif
+
+#if defined(__powerpc64_linux_gnu__)
+  { "32",  "powerpc-linux-gnu"},
+#endif
+
+#if defined(__x86_64_linux_gnu__)
+  { "32",  "i486-linux-gnu"},
+#endif
+
+#if defined(__powerpc_linux_gnu__)
+  { "64",  "powerpc64-linux-gnu"},
+#endif
+
+#if defined(__sparc_linux_gnu__)
+  { "64",  "sparc64-linux-gnu"},
+#endif
+
+#if defined(__s390_linux_gnu__)
+  { "64",  "s390x-linux-gnu"},
+#endif
+
+#if defined(__mips_linux_gnu__)
+  { "n32",  "mips64-linux-gnuabin32"},
+  { "64",  "mips64-linux-gnuabi64"},
+#endif
+
+#if defined(__mipsel_linux_gnu__)
+  { "n32",  "mipsel64-linux-gnuabin32"},
+  { "64",  "mipsel64-linux-gnuabi64"},
+#endif
+
+#if defined(__x86_64_kfreebsd_gnu__)
+  { "32",  "i486-kfreebsd-gnu"},
+#endif
--- gcj-4.2-4.2-20070707.orig/debian/lib32stdc++CXX.postinst
+++ gcj-4.2-4.2-20070707/debian/lib32stdc++CXX.postinst
@@ -0,0 +1,12 @@
+#! /bin/sh -e
+
+case "$1" in
+    configure)
+	docdir=/usr/share/doc/lib32stdc++@CXX@
+	if [ -d $docdir ] && [ ! -h $docdir ]; then
+	    rm -rf $docdir
+	    ln -s gcc-@BV@-base $docdir
+	fi
+esac
+
+#DEBHELPER#
--- gcj-4.2-4.2-20070707.orig/debian/gcj-wrapper-BV
+++ gcj-4.2-4.2-20070707/debian/gcj-wrapper-BV
@@ -0,0 +1,91 @@
+#!/usr/bin/perl -w
+#
+# Starts the GNU Java compiler.
+#
+# Command-line arguments should be in the style of Sun's Java compiler;
+# these will be converted to gcj arguments before being passed to the
+# gcj itself.
+#
+# Copyright (C) 2002-2003 by Ben Burton <bab@debian.org>
+# Based on the original gcj-wrapper-3.2 shell script.
+
+use strict;
+
+# The real Java compiler:
+my $javaCompiler = '/usr/bin/gcj-@BV@';
+
+# The command-line arguments to pass to the real Java compiler:
+my @commandLine;
+
+# The warning flags to pass to the GNU Java compiler:
+my $warnings = '-Wall';
+
+# Build the command-line from the arguments given.
+my $parsingOptions = 1;
+my $copyNextArg = 0;
+my $ignoreNextArg = 0;
+my $appendNextArg = '';
+foreach my $arg (@ARGV) {
+    # See if we already know what to do with this argument.
+    if ($ignoreNextArg) {
+        # Throw it away.
+        $ignoreNextArg = 0;
+        next;
+    } elsif ($copyNextArg or not $parsingOptions) {
+        # Copy it directly.
+        push @commandLine, $arg;
+        $copyNextArg = 0;
+        next;
+    } elsif ($appendNextArg) {
+        # Append it to $appendNextArg and then copy directly.
+        push @commandLine, ($appendNextArg . $arg);
+        $appendNextArg = '';
+        next;
+    }
+
+    # Try to interpret Sun-style options.
+    if ($arg eq '-version') {
+        push @commandLine, '--version';
+    } elsif ($arg eq '-h' or $arg eq '-help') {
+        push @commandLine, '--help';
+    } elsif ($arg eq '-classpath' or $arg eq '--classpath' or $arg eq '--cp') {
+        $appendNextArg = '--classpath=';
+    } elsif ($arg eq '-encoding' or $arg eq '-bootclasspath' or
+             $arg eq '-extdirs') {
+        $appendNextArg = '-' . $arg . '=';
+    } elsif ($arg eq '-d') {
+        push @commandLine, '-d';
+        $copyNextArg = 1;
+    } elsif ($arg eq '-nowarn') {
+        $warnings = '';
+    } elsif ($arg =~ /^-g/) {
+        # Some kind of debugging option - just switch debugging on.
+        push @commandLine, '-g' if ($arg ne '-g:none');
+    } elsif ($arg eq '-O') {
+        push @commandLine, '-O2';
+    } elsif ($arg eq '-Xss') {
+        push @commandLine, $arg;
+    } elsif ($arg =~ /^-X/) {
+        # An extended Sun option (which we don't support).
+        push @commandLine, '--help' if ($arg eq '-X');
+    } elsif ($arg eq '-source' or $arg eq '-sourcepath' or $arg eq '-target') {
+        # An unsupported option with a following argument.
+        $ignoreNextArg = 1;
+    } elsif ($arg =~ /^-/) {
+        # An unsupported standalone option.
+    } else {
+        # Some non-option argument has been given.
+        # Stop parsing options at this point.
+        push @commandLine, $arg;
+        $parsingOptions = 0;
+    }
+}
+
+# Was there a partial argument that was never completed?
+push @commandLine, $appendNextArg if ($appendNextArg);
+
+# Call the real Java compiler.
+my @fullCommandLine = ( $javaCompiler, '-C' );
+push @fullCommandLine, $warnings if ($warnings);
+push @fullCommandLine, @commandLine;
+exec @fullCommandLine or exit(1);
--- gcj-4.2-4.2-20070707.orig/debian/cpp-BV-doc.prerm
+++ gcj-4.2-4.2-20070707/debian/cpp-BV-doc.prerm
@@ -0,0 +1,6 @@
+#! /bin/sh -e
+
+install-info --quiet --remove cpp-@BV@
+install-info --quiet --remove cppinternals-@BV@
+
+#DEBHELPER#
--- gcj-4.2-4.2-20070707.orig/debian/README.cross
+++ gcj-4.2-4.2-20070707/debian/README.cross
@@ -0,0 +1,144 @@
+Building cross-compiler Debian packages
+---------------------------------------
+
+It is possible to build C and C++ cross compilers and support libraries
+from gcc-4.0 source package. This document describes how to do so.
+Cross-compiler build support is not perfect yet, please send fixes
+and improvements to debian-gcc@lists.debian.org and 
+debian-embedded@lists.debian.org
+
+Before you start, you should probably check available pre-built
+cross-toolchain debs. Available at http://www.emdebian.org
+
+Old patches could be reached at
+  http://zigzag.lvk.cs.msu.su/~nikita/debian/
+  
+If they are no longer there, you may check EmDebian web site at
+  http://www.emdebian.org/
+or ask debian-embedded@lists.debian.org for newer location.
+
+Please check http://bugs.debian.org/391445 if you are about building
+gcc-4.2 or above.
+
+Most of them has been merged with gcc debian sources.
+
+0. What's wrong with toolchain-source approach
+
+Package toolchain-source contains sources for binutils and gcc, as well as
+some support scripts to build cross-compiler packages. They seem to work.
+
+However, there is one fundamental problem with this approach.
+Gcc package is actively maintained and frequently updated. These updates
+do contain bug fixes and improvements, especially for non-x86 architectures.
+Cross-compilers built using toolchain-source will not get those fixes unless
+toolchain-source package is updated after each binutils and gcc update.
+The later is not hapenning in real life. For example, toolchain-source
+was upgraded from gcc-3.2 to gcc-3.3 half a year later than gcc-3.3 became
+Debian default compiler.
+
+Keeping toolchain-source package up-to-date requires lots of work, and seems
+to be a waste of time. It is much better to build cross-compilers directly
+from gcc source package.
+
+
+1. What is needed to build a cross-compiler from gcc-4.2 source
+
+1.1. dpkg-cross package
+
+Dpkg-cross package contains several tools to manage cross-compile environment.
+
+It can convert native debian library and lib-dev packages for the target
+architecture to binary-all packages that keep libraries and headers under
+/usr/$(TARGET)/.
+
+Also it contains helper tools for cross-compiling debian packages. Some of
+these tools are used while building libgcc1 and libstdc++ library packages.
+The resulting library packages follow the same convensions as library packages
+converted by dpkg-cross.
+
+Currently, at least version 1.18 of dpkg-cross is needed for cross-gcc
+package build. Version 1.32 of dpkg-cross is needed in order to build gcc-4.2.
+
+1.2. cross-binutils for the target
+
+You need cross-binutils for your target to build cross-compiler.
+Binutils-multiarch package will not work because it does not provide cross-
+assemblers.
+
+If you don't want to use pre-built cross-binutils packages, you may build
+your own from binutils debian source package, using patches posted to
+bug #231707. Please use the latest of patch versions available there.
+
+Alternatively, you may use toolchain-source package to build cross-binutils
+(but in this case you will probably also want to use toolchain-source
+to build cross-compiler itself). However, multilib'ed cross-compilers may
+not build or work with these binutils.
+
+1.3. libc for target
+
+You also need libc library and development packages for the target
+architecture installed.
+
+To get those, download linux-kernel-headers, libc6, and libc6-dev binary
+debs for your target, convert those using dpkg-cross -b, and install
+resulting -arch-cross debs. Consult dpkg-cross manual page for more
+information.
+
+Building with/for alternative libc's is not supported yet (but this is in
+TODO).
+
+Note that if you plan to use your cross-toolchain to develop kernel drivers
+or similar low-level things, you will probably also need kernel headers
+for the exact kernel version that your target hardware uses.
+
+
+2. Building cross-compiler packages
+
+Get gcc-4.2 source package.
+
+Unpack it using dpkg-source -x, and cd to the package directory.
+
+Set GCC_TARGET environment variable to the target architectire name. Note
+that currently you should use debian architecture name (i.e 'powerpc' or 'arm'),
+not GNU system type (i.e. 'powerpc-linux' or 'arm-linux'). Setting GCC_TARGET
+to GNU system type will cause cross-compiler build to fail.
+
+Instead of setting GCC_TARGET, target architecture name may be put into
+debian/target file. If both GCC_TARGET is defined and debian/target file
+exists, GCC_TARGET is used.
+
+Run debian/rules control. This will change debian/control file,
+adjusting build-depends.  By default, the packages will not depend on the
+system -base package. A variable DEB_CROSS_INDEPENDENT has been merged with DEB_CROSS variable.
+
+You can then build with either
+
+$ GCC_TARGET=[arch] dpkg-buildpackage -rfakeroot
+
+3. Using crosshurd
+
+Jeff Bailey <jbailey@raspberryginger.com> suggests alternate way to setup
+environment to build cross-compiler, using 'crosshurd' package. 
+Crosshurd is like debootstrap but cross-arch, and works on the Hurd,
+Linux and FreeBSD.  (The name is historical).
+
+If you setup your environment with crosshurd, you will need to fix symlinks
+in lib and usr/lib to be relative instead of absolute. For example:
+
+lrwxrwxrwx    1 root     root           20 2004-05-06 23:02 libcom_err.so -> /lib/libcom_err.so.2
+
+Needs to be changed to:
+
+lrwxrwxrwx    1 root     root           20 2004-05-06 23:02 libcom_err.so -> ../../lib/libcom_err.so.2
+
+Also, if you choose this method, set the environment variable 'with_sysroot'
+to point to the ABSOLUTE PATH where the crosshurd was done.
+
+Note however that build-depends of cross-gcc and dependencies in generated
+libgcc1 and libstdc++ packages assume that you use dpkg-cross to set up
+your environment, and may be wrong or incomplete if you use alternate methods.
+But probably you don't care.
+
+--
+Nikita V. Youshchenko <yoush@debian.org> - Jun 2004
+Hector Oron Martinez  <hector.oron@gmail.com> - Oct 2006
--- gcj-4.2-4.2-20070707.orig/debian/NEWS.gcc
+++ gcj-4.2-4.2-20070707/debian/NEWS.gcc
@@ -0,0 +1,386 @@
+GCC 4.2 Release Series - Changes, New Features, and Fixes
+=========================================================
+
+
+Caveats
+=======
+
+GCC no longer accepts the -fshared-data option.  This option has had
+no effect in any GCC 4 release; the targets to which the option used
+to apply had been removed before GCC 4.0.
+
+
+General Optimizer Improvements
+==============================
+
+- New command-line options specify the possible relationships among
+  parameters and between parameters and global data.  For example,
+  -fargument-noalias-anything specifies that arguments do not alias
+  any other storage.
+
+- Each language will automatically use whatever option is required by
+  the language standard.  You should not need to use these options
+  yourself.
+
+
+New Languages and Language specific improvements
+================================================
+
+- OpenMP is now supported for the C, C++ and Fortran compilers.
+
+- New command line options -fstrict-overflow and -Wstrict-overflow
+  have been added.  -fstrict-overflow tells the compiler that it may
+  assume that the program follows the strict signed overflow semantics
+  permitted for the language: for C and C++ this means that the
+  compiler may assume that signed overflow does not occur.  For
+  example, a loop like
+
+      for (i = 1; i > 0; i *= 2)
+
+  is presumably intended to continue looping until i overflows.  With
+  -fstrict-overflow, the compiler may assume that signed overflow will
+  not occur, and transform this into an infinite loop.
+  -fstrict-overflow is turned on by default at -O2, and may be
+  disabled via -fno-strict-overflow.  The -Wstrict-overflow option may
+  be used to warn about cases where the compiler assumes that signed
+  overflow will not occur.  It takes five different levels:
+  -Wstrict-overflow=1 to 5.  See the documentation for details.
+  -Wstrict-overflow=1 is enabled by -Wall.
+
+- The new command line option -fno-toplevel-reorder directs GCC to
+  emit top-level functions, variables, and asm statements in the same
+  order that they appear in the input file.  This is intended to
+  support existing code which relies on a particular ordering (for
+  example, code which uses top-level asm statements to switch
+  sections).  For new code, it is generally better to use function and
+  variable attributes.  The -fno-toplevel-reorder option may be used
+  for most cases which currently use -fno-unit-at-a-time.  The
+  -fno-unit-at-a-time option will be removed in some future version of
+  GCC.  If you know of a case which requires -fno-unit-at-a-time which
+  is not fixed by -fno-toplevel-reorder, please open a bug report.
+
+
+C family
+--------
+
+- The pragma redefine_extname will now macro expand its tokens for
+  compatibility with SunPRO.
+
+- In the next release of GCC, 4.3, -std=c99 or -std=gnu99 will direct
+  GCC to handle inline functions as specified in the C99 standard.  In
+  preparation for this, GCC 4.2 will warn about any use of non-static
+  inline functions in gnu99 or c99 mode.  This new warning may be
+  disabled with the new gnu_inline function attribute or the new
+  -fgnu89-inline command line option.  Also, GCC 4.2 and later will
+  define one of the preprocessor macros __GNUC_GNU_INLINE__ or
+  __GNUC_STDC_INLINE__ to indicate the semantics of inline functions
+  in the current compilation.
+
+- A new command line option -Waddress has been added to warn about
+  suspicious uses of memory addresses as, for example, using the
+  address of a function in a conditional expression, and comparisons
+  against the memory address of a string literal.  This warning is
+  enabled by -Wall.
+
+
+C++
+---
+
+- C++ visibility handling has been overhauled.
+
+  Restricted visiblity is propagated from classes to members, from
+  functions to local statics, and from templates and template
+  arguments to instantiations, unless the latter has explicitly
+  declared visibility.
+
+  The visibility attribute for a class must come between the class-key
+  and the name, not after the closing brace.
+
+  Attributes are now allowed for enums and elaborated-type-specifiers
+  that only declare a type.
+
+  Members of the anonymous namespace are now local to a particular
+  translation unit, along with any other declarations which use them,
+  though they are still treated as having external linkage for
+  language semantics.
+
+- The (undocumented) extension which permitted templates with default
+  arguments to be bound to template template parameters with fewer
+  parameters has been removed.  For example:
+
+	template <template <typename> class C>
+	void f(C<double>) {}
+
+	template <typename T, typename U = int>
+	struct S {};
+
+	template void f(S<double>);
+
+  is no longer accepted by G++.  The reason this code is not accepted
+  is that S is a template with two parameters; therefore, it cannot be
+  bound to C which has only one parameter.
+
+- The <?, >?, <?=, and >?= operators, deprecated in previous GCC
+  releases, have been removed.
+
+- The command line option -fconst-strings, deprecated in previous GCC
+  releases, has been removed.
+
+- The configure variable enable-__cxa_atexit is now enabled by default
+  for more targets.  Enabling this variable is necessary in order for
+  static destructors to be executed in the correct order, but it
+  depends upon the presence of a non-standard C library in the target
+  library in order to work.  The variable is now enabled for more
+  targets which are known to have suitable C libraries.
+
+- -Wextra will produce warnings for if statements with a semicolon as
+  the only body, to catch code like:
+
+         if (a);
+            return 1;
+         return 0;
+
+  To suppress the warning in valid cases, use { } instead.
+
+- The C++ frontend now also produces strict aliasing warnings when
+  -fstrict-aliasing -Wstrict-aliasing is in effect.
+
+
+Runtime Library (libstdc++)
+---------------------------
+
+- Added support for TR1 <random>, <complex>, and C compatibility
+  headers. In addition, a lock-free version of shared_ptr was
+  contributed as part of Phillip Jordan's Google Summer of Code
+  project on lock-free containers.  The implementation status for TR1
+  can be tracked in tr1.html.
+
+- In association with the Summer of Code work on lock-free containers,
+  the interface for atomic builtins was adjusted, creating simpler
+  alternatives for non-threaded code paths.  Also, usage was
+  consolidated and all elements were moved from namespace std to
+  namespace__gnu_cxx.  Affected interfaces are the functions
+  __exchange_and_add, __atomic_add, and the objects __mutex,
+  __recursive_mutex, and __scoped_lock.
+
+- Support for versioning weak symbol names via namespace association
+  was added. However, as this changes the names of exported symbols,
+  this is turned off by default in the current ABI.  Intrepid users can
+  enable this feature by using
+  --enable-symvers=gnu-versioned-namespace during configuration.
+
+- Revised, simplified, and expanded policy-based associative
+  containers, including data types for tree and trie forms
+  (basic_tree, tree, trie), lists (list_update), and both
+  collision-chaining and probing hash-based containers
+  (basic_hash_table, cc_hash_table, gp_hash_table).  More details per
+  the documentation.
+
+- The implementation of the debug mode was modified, whereby the debug
+  namespaces were nested inside of namespace std and namespace
+  __gnu_cxx in order to resolve some long standing corner cases
+  involving name lookup.  Debug functionality from the policy-based
+  data structures was consolidated and enabled with the single macro,
+  _GLIBCXX_DEBUG. See PR 26142 for more information.
+
+- Added extensions for type traits: __conditional_type,
+  __numeric_traits, __add_unsigned, __removed_unsigned, __enable_if.
+
+- Added a typelist implementation for compile-time
+  meta-programming.  Elements for typelist construction and operation
+  can be found within namespace __gnu_cxx::typelist.
+
+- Added a new allocator, __gnu_cxx::throw_allocator, for testing
+  exception-safety.  Enabled library-wide visibility control, allowing
+  -fvisibility to be used.
+
+- Consolidated all nested namespaces and the conversion of
+  __gnu_internal implementation-private details to anonymous namespaces
+  whenever possible.
+
+- Implemented LWG resolutions DR 431 and DR 538.
+
+
+Fortran
+-------
+
+- Support for allocatable components has been added (TR 15581 and
+  Fortran 2003).
+
+- Support for the Fortran 2003 streaming IO extension has been added.
+
+- The GNU Fortran compiler now uses 4-byte record markers by default
+  for unformatted files to be compatible with g77 and most other
+  compilers.  The implementation allows for records greater than 2 GB
+  and is compatible with several other compilers. Older versions of
+  gfortran used 8-byte record markers by default (on most systems).  In
+  order to change the length of the record markers, e.g. to read
+  unformatted files created by older gfortran versions, the
+  -frecord-marker=8 option can be used.
+
+
+Java (GCJ)
+----------
+
+- A new command line option -static-libgcj has been added for targets
+  that use a linker compatible with GNU Binutils.  As its name
+  implies, this causes libgcj to be linked statically.  In some cases
+  this causes the resulting executable to start faster and use less
+  memory than if the shared version of libgcj were used.  However
+  caution should be used as it can also cause essential parts of the
+  library to be omitted.  Some of these issues are discussed in:
+  http://gcc.gnu.org/wiki/Statically%20linking%20libgcj
+
+- fastjar is no longer bundled with GCC.  To build libgcj, you will
+  need either InfoZIP (both zip and unzip) or an external jar program.
+  In the former case, the GCC build will install a jar shell script
+  that is based on InfoZIP and provides the same functionality as
+  fastjar.
+
+
+New Targets and Target Specific Improvements
+============================================
+
+IA-32/x86-64
+------------
+
+- -mtune=generic can now be used to generate code running well on
+  common x86 chips. This includes AMD Athlon, AMD Opteron, Intel
+  Pentium-M, Intel Pentium 4 and Intel Core 2.
+
+- -mtune=native and -march=native will produce code optimized for the
+  host architecture as detected using the cpuid instruction.
+
+- Added a new command line option -fstackrealign and and __attribute__
+  ((force_align_arg_pointer)) to realign the stack at runtime.  This
+  allows functions compiled with a vector-aligned stack to be invoked
+  from legacy objects that keep only word-alignment.
+
+
+SPARC
+-----
+
+- The default CPU setting has been changed from V7 to V9 in 32-bit
+  mode on Solaris 7 and above.  This is already the case in 64-bit
+  mode.  It can be overridden by specifying --with-cpu at configure
+  time.
+
+- Back-end support of built-in functions for atomic memory access
+  has been implemented.
+
+- Support for the Sun UltraSPARC T1 (Niagara) processor has been added.
+
+
+M32C
+----
+
+- Various bug fixes have made some functions (notably, functions
+  returning structures) incompatible with previous releases.
+  Recompiling all libraries is recommended.  Note that code quality
+  has considerably improved since 4.1, making a recompile even more
+  beneficial.
+
+
+MIPS
+----
+
+- Added support for the Broadcom SB-1A core.
+
+
+IA-64
+-----
+
+- Added support for IA-64 data and control speculation.  By default
+  speculation is enabled only during second scheduler pass.  A number
+  of machine flags was introduced to control the usage of speculation
+  for both scheduler passes.
+
+
+HPPA
+----
+
+- Added Java language support (libffi and libjava) for 32-bit HP-UX 11
+  target.
+
+
+Obsolete Systems
+================
+
+
+Documentation improvements
+==========================
+
+PDF Documentation
+-----------------
+
+- A make pdf target has been added to the top-level makefile, enabling
+  automated production of PDF documentation files.  (Front-ends
+  external to GCC should modify their Make-lang.in file to add a
+  lang.pdf: target.)
+
+
+Other significant improvements
+==============================
+
+Build system improvements
+-------------------------
+
+- All the components of the compiler are now bootstrapped by default.
+  This improves the resilience to bugs in the system compiler or
+  binary compatibility problems, as well as providing better testing
+  of GCC 4.2 itself.  In addition, if you build the compiler from a
+  combined tree, the assembler, linker, etc. will also be bootstrapped
+  (i.e. built with themselves).
+
+  You can disable this behavior, and go back to the pre-GCC 4.2 set
+  up, by configuring GCC with --disable-bootstrap.
+
+- The rules that configure follows to find target tools resemble more
+  closely the locations that the built compiler will search.  In
+  addition, you can use the new configure option --with-target-tools
+  to specify where to find the target tools used during the build,
+  without affecting what the built compiler will use.
+
+  This can be especially useful when building packages of GCC.  For
+  example, you may want to build GCC with GNU as or ld, even if the
+  resulting compiler to work with the native assembler and linker.  To
+  do so, you can use --with-target-tools to point to the native tools.
+
+
+Incompatible changes to the build system
+----------------------------------------
+
+- Front-ends external to GCC should modify their Make-lang.in file to
+  replace double-colon rules (e.g. dvi::) with normal rules (like
+  lang.dvi:). Front-end makefile hooks do not use double-colon rules
+  anymore.
+
+  Up to GCC 4.1, a popular way to specify the target tools used during
+  the build was to create directories named gas, binutils, etc. in the
+  build tree, and create links to the tools from there.  This does not
+  work any more when the compiler is bootstrapped.  The new configure
+  option --with-target-tools provides a better way to achieve the same
+  effect, and works for all native and cross settings.
+
+
+
+------------------------------------------------------------------------------
+Please send FSF & GNU inquiries & questions to gnu@gnu.org. There are
+also other ways to contact the FSF.
+
+These pages are maintained by the GCC team.
+
+For questions related to the use of GCC, please consult these web
+pages and the GCC manuals. If that fails, the gcc-help@gcc.gnu.org
+mailing list might help.  Please send comments on these web pages and
+the development of GCC to our developer mailing list at gcc@gnu.org or
+gcc@gcc.gnu.org.  All of our lists have public archives.
+
+
+Copyright (C) Free Software Foundation, Inc.,
+51 Franklin St, Fifth Floor, Boston, MA 02110, USA.
+
+Verbatim copying and distribution of this entire article is
+permitted in any medium, provided this notice is preserved.
+
+Last modified 2007-05-12
--- gcj-4.2-4.2-20070707.orig/debian/source.lintian-overrides
+++ gcj-4.2-4.2-20070707/debian/source.lintian-overrides
@@ -0,0 +1 @@
+gcc-4.0: invalid-arch-string-in-source-relation
--- gcj-4.2-4.2-20070707.orig/debian/gcc-BV-base.postinst
+++ gcj-4.2-4.2-20070707/debian/gcc-BV-base.postinst
@@ -0,0 +1,15 @@
+#! /bin/sh -e
+
+case "$1" in
+    configure)
+	# see #355439, packaging error in 4.0.2-9*
+	docdir=/usr/share/doc/gcc-@BV@-base
+	if [ ! -f $docdir/copyright ]; then
+	    ln $docdir/.copyright $docdir/copyright
+	fi
+	if [ ! -f $docdir/changelog.Debian.gz ]; then
+	    ln $docdir/.changelog.Debian.gz $docdir/changelog.Debian.gz
+	fi
+esac
+
+#DEBHELPER#
--- gcj-4.2-4.2-20070707.orig/debian/gij-BV.postinst
+++ gcj-4.2-4.2-20070707/debian/gij-BV.postinst
@@ -0,0 +1,52 @@
+#! /bin/sh -e
+
+prio=$(echo @BV@ | sed 's/\.//g')
+
+update-alternatives --quiet \
+    --install /usr/bin/java java /usr/bin/gij-@BV@ $prio \
+    @GFDL@--slave /usr/share/man/man1/java.1.gz java.1.gz /usr/share/man/man1/gij-@BV@.1.gz
+
+update-alternatives --quiet \
+    --install /usr/bin/rmiregistry rmiregistry /usr/bin/grmiregistry-@BV@ $prio \
+    --slave /usr/share/man/man1/rmiregistry.1.gz rmiregistry.1.gz /usr/share/man/man1/grmiregistry-@BV@.1.gz
+
+update-alternatives --quiet \
+    --install /usr/bin/keytool keytool /usr/bin/gkeytool-@BV@ $prio \
+    --slave /usr/share/man/man1/keytool.1.gz keytool.1.gz /usr/share/man/man1/gkeytool-@BV@.1.gz
+
+update-alternatives --quiet \
+    --install /usr/bin/orbd orbd /usr/bin/gorbd-@BV@ $prio \
+    --slave /usr/share/man/man1/orbd.1.gz orbd.1.gz /usr/share/man/man1/gorbd-@BV@.1.gz
+
+update-alternatives --quiet \
+    --install /usr/bin/rmid rmid /usr/bin/grmid-@BV@ $prio \
+    --slave /usr/share/man/man1/rmid.1.gz rmid.1.gz /usr/share/man/man1/grmid-@BV@.1.gz
+
+update-alternatives --quiet \
+    --install /usr/bin/serialver serialver /usr/bin/gserialver-@BV@ $prio \
+    --slave /usr/share/man/man1/serialver.1.gz serialver.1.gz /usr/share/man/man1/gserialver-@BV@.1.gz
+
+case "$1" in
+configure)
+    if [ ! -f /var/lib/gcj-@BV@/classmap.db ]; then
+	uname=$(uname -m)
+	mkdir -p /var/lib/gcj-@BV@
+	if gcj-dbtool-@BV@ -n /var/lib/gcj-@BV@/classmap.db; then
+	    case "$uname" in arm*|m68k|parisc*)
+	        echo >&2 "gcj-dbtool succeeded unexpectedly"
+	    esac
+	else
+	    case "$uname" in
+	    arm*|m68k|parisc*)
+	        echo >&2 "ERROR: gcj-dbtool did fail; known problem on $uname";;
+	    *)
+		exit 2
+	    esac
+	    touch /var/lib/gcj-@BV@/classmap.db
+	fi
+    fi
+esac
+
+#DEBHELPER#
+
+exit 0
--- gcj-4.2-4.2-20070707.orig/debian/gcjwebplugin-BV.prerm
+++ gcj-4.2-4.2-20070707/debian/gcjwebplugin-BV.prerm
@@ -0,0 +1,17 @@
+#!/bin/sh -e
+
+PLUGINPTH=/usr/lib/gcj-@BV@/libgcjwebplugin.so
+
+update-alternatives --quiet --remove \
+    mozilla-javaplugin.so \
+    $PLUGINPTH
+
+update-alternatives --quiet --remove \
+    firefox-javaplugin.so \
+    $PLUGINPTH
+
+update-alternatives --quiet --remove \
+    mozilla-snapshot-javaplugin.so \
+    $PLUGINPTH
+
+#DEBHELPER#
--- gcj-4.2-4.2-20070707.orig/debian/treelang-BV.prerm
+++ gcj-4.2-4.2-20070707/debian/treelang-BV.prerm
@@ -0,0 +1,10 @@
+#! /bin/sh -e
+
+if [ -f /usr/share/info/treelang-@BV@.info.gz ]; then
+  install-info --quiet --remove treelang-@BV@
+else
+  # GFDL invariant free
+  true
+fi
+
+#DEBHELPER#
--- gcj-4.2-4.2-20070707.orig/debian/gnatvsn.gpr
+++ gcj-4.2-4.2-20070707/debian/gnatvsn.gpr
@@ -0,0 +1,36 @@
+--  Project file for use with GNAT
+--  Copyright (c) 2005 Ludovic Brenta <ludovic@ludovic-brenta.org>
+--
+--  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 of the License, or
+--  (at your option) any later version.
+--
+--  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.
+--
+--  This project file is designed to help build applications that use
+--  GNAT project files.  Here is an example of how to use this project file:
+--
+--  with "/usr/share/ada/adainclude/gnatvsn";
+--  project Example is
+--     for Object_Dir use "obj";
+--     for Exec_Dir use ".";
+--     for Main use ("example");
+--     package Linker renames Gnatvsn.Linker;
+--     --  Alternatively, if you need additional switches:
+--     --  package Linker is
+--     --     for Default_Switches ("Ada") use (Gnatvsn.Linker_Switches & ...)
+--     --  end Linker;
+--  end Example;
+
+project Gnatvsn is
+   for Source_Dirs use ("/usr/share/ada/adainclude/gnatvsn");
+   for Object_Dir use "/usr/lib/ada/adalib/gnatvsn";
+   Linker_Switches := "-lgnatvsn";
+   package Linker is
+      for Default_Switches ("Ada") use (Linker_Switches);
+   end Linker;
+end Gnatvsn;
--- gcj-4.2-4.2-20070707.orig/debian/changelog
+++ gcj-4.2-4.2-20070707/debian/changelog
@@ -0,0 +1,6364 @@
+gcj-4.2 (4.2-20070707-1ubuntu2) gutsy; urgency=low
+
+  * debian/patches/disable-configure-run-check.dpatch: Update.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat,  7 Jul 2007 23:18:10 +0200
+
+gcc-4.2 (4.2-20070707-1ubuntu1) gutsy; urgency=low
+
+  * Merge with Debian; remaining changes:
+    - Regenerate the control file.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat,  7 Jul 2007 12:17:19 +0200
+
+gcj-4.2 (4.2-20070707-1) unstable; urgency=low
+
+  * Upload as gcj-4.2.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 07 Jul 2007 11:28:08 +0200
+
+gcc-4.2 (4.2-20070707-1) unstable; urgency=low
+
+  [Matthias Klose]
+  * Update to SVN 20070707 from the ubuntu/gcc-4_2-branch.
+    - debian/patches/libjava-soname.dpatch: Remove.
+    - debian/patches/disable-configure-run-check.dpatch: Update.
+  * Only suggest multilib packages on multilib architectures.
+  * Point ICE messages to the 4.2 docdir.
+  * Explicitely use fastjar to build gcj-4.1. Addresses: #416001.
+  * Configure with --enable-libgcj on m32r (Kazuhiro Inaoka).
+  * Include the hppa64 cross compiler on hppa snapshot builds.
+  * debian/patches/arm-libffi.dpatch: Update.
+  * libgcj-doc: Include the generated documentation.
+  * Fix building the libjava/classpath examples.
+  * Support reverse cross builds (Neil Williams). Closes: #431086.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 07 Jul 2007 10:59:26 +0200
+
+gcc-4.2 (4.2-20070627-1) unstable; urgency=high
+
+  [Matthias Klose]
+  * Update to SVN gcc-4_2-branch/20070626.
+  * Update to SVN trunk/20070626 (gcc/java, libjava, libffi, boehm-gc).
+  * On mips*-linux, always imply -lpthread for -pthread (Thiemo Seufer).
+    Addresses: #428741.
+  * Fix libstdc++ cross builds (Arthur Loiret). Closes: #430395.
+  * README.Debian: Point to debian-toolchain for general toolchain topics.
+  * Use the generated locales for the libstdc++ build to fix the setting
+    of the gnu locale model. Closes: #428926, #429660.
+  * For ix86 lpia targets, configure --with-tune=i586.
+  * Make build dependency on gcc-4.1-multilib architecture specific.
+  * Do not ignore bootstrap comparision failure on ia64.
+
+  [Ludovic Brenta]
+  * ada-link-lib.dpatch: update to apply cleanly on GCC 4.2.
+  * ada-libgnat{vsn,prj}.dpatch: adjust to GCC 4.2.  Reenable in rules.patch.
+  * rules.conf: do not build libgomp as part of gnat-4.2.
+  * rules.conf, control.m4: build-depend on libz-dev, lib32z-dev or
+    lib64-dev only when building Java.
+  * rules2, rules.defs: $(with_mudflap): remove, use $(with_libmudflap) only.
+  * config.m4, binary-ada.mk: tighten dependencies; no Ada package depends
+    on gcc-4.2-base anymore.
+  * TODO: rewrite.
+  * README.gnat: include in gnat-4.2-base.  Remove outdated information.
+  * README.maintainers: new.  Include in gnat-4.2-base.
+
+  [Hector Oron]
+  * Merge DEB_CROSS_INDEPENDENT with DEB_CROSS.
+  * Disables libssp0 for arm and armel targets when cross compiling.
+  * Updates README.cross.
+  * Fixes linker mapping problem on binary-libstdcxx-cross.mk. Closes: #430688.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 27 Jun 2007 21:54:08 +0200
+
+gcc-4.2 (4.2-20070609-1) unstable; urgency=low
+
+  * Update to SVN gcc-4_2-branch/20070609.
+    - Remove patches integrated upstream: pr30052, hppa-caller-save-pic-tls.
+  * Update to SVN trunk/20070609 (gcc/java, libjava, libffi, boehm-gc).
+    - Remove patches integrated upstream: libjava-qt-peer,
+      classpath-config-guess.
+  * Do not build with --enable-java-maintainer-mode.
+  * debian/rules.patch: Comment out m68k-peephole, requires m68k-split_shift.
+  * Add target to apply patches up to a specific patch (Wouter Verhelst).
+    Closes: #424855.
+  * libstdc++6-4.2-*: Add conflicts with 4.1 packages. Closes: #419511.
+  * Apply proposed fix for PR target/28102. Closes: #426905.
+  * Fix build failure for cross compiler builds (Jiri Palecek). Closes: #393897.
+  * Update build macros for kfreebsd-amd64. Closes: #424693.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat,  9 Jun 2007 06:54:13 +0200
+
+gcc-4.2 (4.2-20070528-1) unstable; urgency=low
+
+  * Update to SVN gcc-4_2-branch/20070528.
+  * Add backport for PR middle-end/20218.
+  * Add proposed PTA solver backport, PR tree-optimization/30052.
+  * Add backport for PR target/31868.
+  * Reenable the testsuite for arm, mips, mipsel.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 28 May 2007 09:03:04 +0200
+
+gcc-4.2 (4.2-20070525-1) unstable; urgency=low
+
+  * Update to SVN gcc-4_2-branch/20070525.
+  * Update to SVN trunk/20070520 (gcc/java, libjava, libffi, boehm-gc).
+  * Do not explicitely configure for __cxa_atexit.
+  * libstdc++6-4.2-doc: Conflict with libstdc++6-4.1-doc. Closes: #424896.
+  * Update m68k patches:
+    - Remove patches applied upstream: m68k-jumptable, m68k-gc, 
+    - Reenable patches: m68k-save_pic, m68k-dwarf, m68k-limit_reload,
+      m68k-prevent-qipush, m68k-peephole, m68k-return, m68k-sig-unwind,
+      m68k-align-code m68k-align-stack, m68k-symbolic-operand,
+      m68k-bitfield-offset.
+    - Update: m68k-return, m68k-secondary-addr-reload, m68k-notice-move
+      m68k-secondary-addr-reload, m68k-notice-move.
+    - TODO: m68k-split_shift, m68k-dwarf3, m68k-fpcompare.
+  * Update the kfreebsd and arm patches (Aurelien Jarno). Closes: #425011.
+  * Temporarily disable the testsuite on slow architectures to get the
+    package built soon.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 25 May 2007 07:14:36 +0200
+
+gcc-4.2 (4.2-20070516-1) unstable; urgency=low
+
+  * Update to SVN gcc-4_2-branch/20070516.
+  * Update to SVN trunk/20070516 (gcc/java, libjava, libffi, boehm-gc).
+  * Merge changes from gcc-4.1_4.1.2-7.
+  * Update NEWS files.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 16 May 2007 02:33:57 +0200
+
+gcc-4.2 (4.2-20070502-1) unstable; urgency=low
+
+  * Update to SVN gcc-4_2-branch/20070502.
+    - Remove pr11953 patch, integrated upstream.
+  * Update to SVN trunk/20070502 (gcc/java, libjava, libffi, boehm-gc).
+  * Adjust tetex/tex-live build dependency.
+  * Fix gobjc-4.2's, gobjc++-4.2's dependency on libobjc2.
+  * Tighten (build) dependency on binutils. Addresses: #421197.
+  * gfortran-4.2: Depend on libgfortran2, provide the libgfortran.so
+    symlink. Adresses: #421362.
+  * Build-depend on gcc-multilib [amd64 i386 powerpc ppc64 s390 sparc].
+  * (Build-) depend on glibc (>= 2.5) for all architectures.
+  * Remove libssp packages from the control file.
+
+ -- Matthias Klose <doko@debian.org>  Wed,  2 May 2007 18:46:57 +0200
+
+gcc-4.2 (4.2-20070405-1) experimental; urgency=low
+
+  * Update to SVN gcc-4_2-branch/20070405.
+  * Update to SVN trunk/20070405 (gcc/java, libjava, libffi, boehm-gc).
+  * gcc-4.2-hppa64: Don't depend on libc6-dev.
+  * Robustify setting of make's -j flag. Closes: #410919.
+  * gcc-snapshot: Use the install_snap_stamp target for installation.
+
+ -- Matthias Klose <doko@debian.org>  Thu,  5 Apr 2007 23:56:35 +0200
+
+gcc-4.2 (4.2-20070307-1) experimental; urgency=low
+
+  * Update to SVN gcc-4_2-branch/20070307.
+  * Update to SVN trunk/20070307 (gcc/java, libjava, libffi, boehm-gc).
+  * Build gnat from separate sources.
+  * Merge changes from gcc-4.1-4.1.2-1.
+  * Install into /usr/lib/gcc/<target_alias>/4.2, to ease upgrades
+    between subminor versions.
+  * Configure --with-gxx-include-dir=/usr/include/c++/4.2
+
+ -- Matthias Klose <doko@debian.org>  Thu,  8 Mar 2007 02:52:00 +0100
+
+gcc-4.2 (4.2-20070210-1) experimental; urgency=low
+
+  * Merge Java backport from Ubuntu:
+    - Update to SVN gcc-4_2-branch/20070210.
+    - Update to SVN trunk/20070210 (gcc/java, libjava).
+    - Backout trunk specific gcc/java changes.
+    - Build-depend on gcj-4.1 and ecj-bootstrap.
+    - gcj-4.2: Depend on ecj-bootstrap, recommend ecj-bootstrap-gcj.
+    - Merge libgcj8-awt-gtk back into libgcj8-awt; the Qt peers
+      are disabled by upstream again.
+    - Generate manual pages for the classpath tools from the classpath
+      documentation.
+    - Adopt packaging for the merged libjava.
+    - Update patches for the merged libjava: libjava-lib32-properties,
+      i386-biarch, reporting, libjava-soname, libjava-subdir,
+      libjava-lib32subdir.
+    - Remove obsolete patches: libjava-plugin-binary, libjava-ia32fix,
+      libstdc++-docfixes.
+
+  * Set priority of development packages to optional.
+  * debian/libgcjGCJ.postrm: Don't fail on purge when directories
+    don't exist anymore. Closes: #406017.
+  * debian/patches/gcc-textdomain.dpatch: Update for 4.2.
+  * Generate and install libgomp docs into gcc-4.2-doc.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 10 Feb 2007 16:53:11 +0100
+
+gcc-4.2 (4.2-20070105-1) experimental; urgency=low
+
+  * Update to SVN 20070105.
+  * Add tetex-extra to Build-Depend-Indep (libstd++ doxygen docs),
+    fix doxygen build (libstdc++-docfixes.dpatch).
+  * Enable parallel build by default on SMP machines.
+
+ -- Matthias Klose <doko@debian.org>  Fri,  5 Jan 2007 22:42:18 +0100
+
+gcc-4.2 (4.2-20061217-1) experimental; urgency=low
+
+  * Update to SVN 20061217.
+  * Merge changes from gcc-4.1_4.1.1-16 to gcc-4.1_4.1.1-21.
+  * Update patches to the current branch.
+  * Add multilib packages for gcc, g++, gobjc, gobjc++, gfortran.
+  * Link using --hash-style=gnu (alpha, amd64, ia64, i386, powerpc, ppc64,
+    s390, sparc).
+
+ -- Matthias Klose <doko@debian.org>  Sun, 17 Dec 2006 15:54:54 +0100
+
+gcc-4.2 (4.2-20061003-1) experimental; urgency=low
+
+  * libgcj.postinst: Remove /var/lib/gcj-4.2 on package removal.
+  * Don't install backup files in the doc directory, only one gcc-4.1
+    upgrade was broken. Closes: #389366.
+  * Merge gcc-biarch-generic.dpatch into i386-biarch.dpatch.
+  * Update link-libs.dpatch.
+  * Merge libgfortran2-dev into gfortran-4.2.
+
+ -- Matthias Klose <doko@debian.org>  Tue,  3 Oct 2006 16:26:38 +0000
+
+gcc-4.2 (4.2-20060923-1) experimental; urgency=low
+
+  * Update to SVN 20060923.
+  * Remove patches applied upstream: kbsd-gnu-java, kbsd-gnu.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 23 Sep 2006 15:11:36 +0200
+
+gcc-4.2 (4.2-20060905-1) experimental; urgency=low
+
+  * Update to SVN 20060905.
+  * Merge changes from gcc-4.1 (4.1.1-10 - 4.1.1-12).
+  * Move gomp development files into gcc and gfortran.
+  * Build-depend on binutils (>= 2.17).
+
+ -- Matthias Klose <doko@debian.org>  Tue,  5 Sep 2006 03:33:00 +0200
+
+gcc-4.2 (4.2-20060818-1) experimental; urgency=low
+
+  * Update to SVN 20060818.
+    - libjava-libgcjbc.dpatch: Remove, applied upstream. 
+  * Merge changes from the Ubuntu gcj-4.2 package:
+    - libjava-soname.dpatch: Remove, applied upstream.
+    - libjava-native-libdir.dpatch: update.
+    - libffi-without-libgcj.dpatch: Remove, new libffi-configure to
+      enable --disable-libffi.
+    - Changes required for the classpath-0.92 update:
+      - New packages gappletviewer-4.2, gcjwebplugin-4.2.
+      - gij-4.2: Add keytool alternative.
+      - gcj-4.2: Add jarsigner alternative.
+    - libgcj8-dev: Remove conflicts with older libgcjX-dev packages.
+    - lib32gcj8: Populate the /usr/lib32/gcj-4.2 directory.
+    - libjava-library-path.dpatch:
+      - When running the i386 binaries on amd64, look in
+        /usr/lib32/gcj-x.y and /usr/lib32/jni instead.
+      - Add /usr/lib/jni to java.library.path. Adresses: #364820.
+    - Add more debugging symbols to libgcj8-dbg. Adresses: #383705.
+    - Fix and renable the biarch build for sparc.
+  * Disable gnat for alpha, fails to build.
+  * Configure without --enable-objc-gc, fails to build.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 19 Aug 2006 18:25:50 +0200
+
+gcc-4.2 (4.2-20060709-1) experimental; urgency=low
+
+  * Test build, SVN trunk 20060709.
+  * Merge libssp0-dev into gcc-4.1 (-fstack-protector is a common option).
+  * Rename libmudflap0-dev to libmudflap0-4.2-dev.
+  * Ignore compiler warnings when checking whether compiler driver understands
+    Ada fails.
+  * Merge changes from the gcc-4.1 package.
+
+ -- Matthias Klose <doko@debian.org>  Sun,  9 Jul 2006 14:28:03 +0200
+
+gcc-4.2 (4.2-20060617-1) experimental; urgency=low
+
+  * Test build, SVN trunk 20060617.
+
+  [Matthias Klose]
+  * Configure using --enable-objc-gc, using the internal boehm-gc.
+  * Build-depend on bison (>= 1:2.3).
+  * Build the QT based awt peer library, not yet the same functionality
+    as the GTK based peer library.
+  * Update libjava-* patches.
+
+  [Ludovic Brenta]
+  * Do not provide the symbolic link /usr/bin/gnatgcc; this will now
+    be provided by package gnat from the source package gcc-defaults.
+  * debian/control.m4, debian/control (gnat): conflict with gnat (<< 4.1),
+    not all versions of gnat, since gcc-defaults will now provide gnat (= 4.1)
+    which depends on gnat-4.1.
+
+  [Bastian Blank]
+  * Make it possible to overwrite arch per DEB_TARGET_ARCH and
+    DEB_TARGET_GNU_TYPE.
+  * Disable biarch only on request for cross builds.
+  * Use correct source directory for tarballs.
+  * Produce correct multiarch.inc for source builds.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 17 Jun 2006 19:02:01 +0200
+
+gcc-4.2 (4.2-20060606-1) experimental; urgency=low
+
+  * Test build, SVN trunk 20060606.
+  * Remove obsolete patches, update patches for 4.2.
+  * Update the biarch-include patches to work with mips-triarch.
+  * Disable Ada, not yet updated.
+  * New packages: libgomp*.
+  * Remove fastjar, not included upstream anymore.
+
+ -- Matthias Klose <doko@debian.org>  Tue,  6 Jun 2006 10:52:28 +0200
+
+gcc-4.1 (4.1.2-12) unstable; urgency=high
+
+  * i386-biarch.dpatch: Update for the backport for PR target/31868.
+    Closes: #427185.
+  * m68k-libffi2.dpatch: Update. Closes: #425399.
+
+ -- Matthias Klose <doko@debian.org>  Mon,  4 Jun 2007 23:53:23 +0200
+
+gcc-4.1 (4.1.2-11) unstable; urgency=low
+
+  * Update to SVN 20070601.
+  * Build the libmudflap0-dev package again.
+  * Don't build libffi, when the packages are not built.
+
+ -- Matthias Klose <doko@debian.org>  Fri,  1 Jun 2007 23:55:22 +0200
+
+gcc-4.1 (4.1.2-10) unstable; urgency=low
+
+  * Regenerate the control file.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 30 May 2007 00:29:29 +0200
+
+gcc-4.1 (4.1.2-9) unstable; urgency=low
+
+  * Update to SVN 20070528.
+  * Don't build packages now built from the gcc-4.2 source (arm, m68k,
+    mips, mipsel).
+  * Add backport for PR middle-end/20218.
+  * Add backport for PR target/31868.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 29 May 2007 00:01:12 +0200
+
+gcc-4.1 (4.1.2-8) unstable; urgency=low
+
+  * Update to SVN 20070518.
+  * Don't build packages now built from the gcc-4.2 source.
+
+  [ Aurelian Jarno ]
+  * Update libffi patch for ARM. Closes: #425011.
+  * arm-pr30486, arm-pr28516, arm-unbreak-eabi-armv4t: New.
+  * Disable FFI, Java, ObjC for armel.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 20 May 2007 10:31:24 +0200
+
+gcc-4.1 (4.1.2-7) unstable; urgency=low
+
+  * Update to SVN 20070514.
+  * Link using --hash-style=both on supported architectures. Addresses: #421790.
+  * On hppa, build ecjx as a native binary.
+  * note-gnu-stack.dpatch: Fix ARM comment marker (Daniel Jacobowitz).
+    Closes: #422978.
+  * Add build dependency on libxul-dev for *-freebsd. Closes: #422995.
+  * Update config.guess/config.sub and build gcjwebplugin on GNU/kFreeBSD
+    (Aurelian Jarno). Closes: #422995.
+  * Disable ssp on hurd-i386. Closes: #423757.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 14 May 2007 08:40:08 +0200
+
+gcc-4.1 (4.1.2-6) unstable; urgency=low
+
+  * Update libjava from the gcc-4.1 Fedora branch 20070504.
+  * gfortran-4.1: Fix the target of the libgfortran.so symlink.
+    Closes: #421362.
+  * Build-depend on gcc-multilib [amd64 i386 powerpc ppc64 s390 sparc].
+  * Readd build dependency on binutils on arm.
+  * (Build-) depend on glibc (>= 2.5) for all architectures.
+  * Remove libssp packages from the control file.
+  * Fix wrong code generation on hppa when TLS variables are used.
+    Closes: #422421.
+
+ -- Matthias Klose <doko@debian.org>  Sun,  6 May 2007 10:00:23 +0200
+
+gcc-4.1 (4.1.2-5) unstable; urgency=low
+
+  * Update to SVN 20070429.
+  * Update libjava from the gcc-4.1 Fedora branch 20070428.
+  * Update m68k patches:
+    - Remove pr25514, pr27736, applied upstream.
+    - Update m68k-java.
+  * Link using --hash-style=gnu/both.
+  * Tighten (build) dependency on binutils. Closes: #421197.
+  * gij-4.1: Add a conflict with java-gcj-compat (<< 1.0.69).
+  * gfortran-4.1: Depend on libgfortran1, provide the libgfortran.so
+    symlink. Closes: #421362.
+  * gcc-4.1, gcc-4.1-multilib: Fix compatibility symlinks. Closes: #421382.
+  * Temporarily remove build dependency on locales on arm, hppa, m68k, mipsel.
+  * Temporarily remove build dependency on binutils on arm.
+  * Fix FTBFS on GNU/kFreeBSD (Aurelian Jarno). Closes: #421423.
+  * gij-4.1 postinst: Create /var/lib/gcj-4.1. Closes: #421526.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 30 Apr 2007 08:13:32 +0200
+
+gcc-4.1 (4.1.2-4) unstable; urgency=medium
+
+  * Update to SVN 20070423.
+    - Remove pr11953, applied upstream.
+    - Fix ld version detection in libstdc++v3.
+  * Update libjava from the gcc-4.1 Fedora branch 20070423.
+  * Merge libgfortran1-dev into gfortran-4.1.
+  * Add multilib packages for gcc, g++, gobjc, gobjc++, gfortran.
+  * Don't link using --hash-style=gnu/both; loosen dependency on binutils.
+  * Don't revert the patch to fix PR c++/27227.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 23 Apr 2007 23:13:14 +0200
+
+gcc-4.1 (4.1.2-3) experimental; urgency=low
+
+  * Update to SVN 20070405.
+  * Update libjava from the gcc-4.1 Fedora branch 20070405.
+  * Robustify setting of make's -j flag. Closes: #414316.
+  * Only build the libssp packages, when building the common libraries.
+  * gcc-4.1-hppa64: Don't depend on libc6-dev.
+
+ -- Matthias Klose <doko@debian.org>  Fri,  6 Apr 2007 00:28:29 +0200
+
+gcc-4.1 (4.1.2-2) experimental; urgency=low
+
+  * Update to SVN 20070306.
+  * Update libjava from the gcc-4.1 Fedora branch 20070306.
+
+  [Matthias Klose]
+  * Don't install gij-wrapper anymore, directly register gij as a java
+    alternative.
+  * Don't install gcjh-wrapper anymore.
+  * Don't use exact versioned dependencies on gcj-base for libgcj and
+    libgcj-awt.
+  * Fix glibc build dependency for alpha.
+  * Support -ffast-math on hurd-i386 (Samuel Thibault). Closes: #413342.
+  * Update kfreebsd-amd64 patches (Aurelien Jarno). Closes: #406015.
+  * gij: Consistently use $(dbexecdir) to reference the gcj sub dir.
+  * Install into /usr/lib/gcc/<target_alias>/4.1, to ease upgrades
+    between minor versions.
+    Add compatibility symlinks in <target_alias>/4.1.2 to build gnat-4.1
+    and gcj-4.1 from separate sources.
+
+ -- Matthias Klose <doko@debian.org>  Wed,  7 Mar 2007 03:51:47 +0100
+
+gcc-4.1 (4.1.2-1) experimental; urgency=low
+
+  [Matthias Klose]
+  * Update to gcc-4.1.2.
+  * Update libjava backport patches, split out boehm-gc-backport patch.
+  * Enable the cpu-default-generic patch (i386, amd64), backport from 4.2.
+  * Correct mfctl instruction syntax (hppa), backport from the trunk.
+  * Backport PR java/9861 (name mangling updates).
+  * gcc.c (main): Call expandargv (backport from 4.2).
+  * Apply gcc dwarf2 unwinding patches from the trunk.
+  * Apply backport for PR 20208 on amd64 i386 powerpc ppc64 sparc s390.
+  * Apply patches from the 4.1 branch for PR rtl-optimization/28772,
+    PR middle-end/30313, PR middle-end/30473, PR c++/30536, PR debug/30189,
+    PR fortran/30478, PR rtl-optimization/30787, PR tree-optimization/30823,
+    PR rtl-optimization/28173, PR ada/30684, bug in pointer dependency test,
+    PR rtl-optimization/30931, PR fortran/25392, PR fortran/30400,
+    PR libgfortran/30910, PR libgfortran/30918, PR fortran/29441,
+    PR target/30634.
+  * Update NEWS files.
+  * Include a backport of the ecj+generics java updates as
+    gcj-ecj-20070215.tar.bz2. Install it into the gcc-4.1-source package.
+  * Do not build fastjar anymore from this source.
+  * debian/control.m4: Move expect-tcl8.3 before dejagnu.
+  * Work around firefox/icewhatever dropping plugin dependencies on xpcom.
+  * Refactor naming of libgcj packages in the build files.
+  * Make libstdc++-doc's build dependencies depending on the source package.
+  * Do not build packages on architectures, which are already built by gcc-4.2.
+
+  * Merge the gcj generics backport from Ubuntu:
+
+    - Merge the Java bits (eclipse based compiler, 1.5 compatibility,
+      classpath generics) from the gcc-4.1 Fedora branch.
+    - Drop all previous patches from the classpath-0.93 merge, keep
+      the boehm-gc backport (splitted out as a separate patch).
+    - Add a gcj-ecj-generics.tar.bz2 tarball, containing gcc/java, libjava,
+      config/unwind_ipinfo.m4, taken from the Fedora branch.
+    - Drop the libjava-hppa, libjava-plugin-binary, pr29362, pr29805 patches
+      integrated in the backport.
+    - Update patches for the merge: reporting, libjava-subdir, i386-biarch,
+      classpath-tooldoc, pr26885
+    - Add libjava-dropped, libjava-install; dropped chunks from the merge.
+    - Add pr9861-nojava mangling changes, non-java parts for PR 9861.
+    - Add gcc-expandv, expand `@' parameters on the commandline; backport
+      from the trunk.
+    - Disable the m68k-gc patch, needs update for the merge.
+    - Configure --with-java-home set for 1.5.0.
+    - Configure with --enable-java-maintainer-mode to build the header
+      and class files on the fly.
+    - Add build dependency on ecj-bootstrap, configure --with-ecj-jar.
+    - Build an empty libgcj-doc package; gjdoc currently cannot handle
+      generics.
+    - Apply gcc dwarf2 unwinding patches from the trunk, allowing the Events
+      testcase to pass.
+      - Tighten dependencies on shared libraries.
+    - Use /usr/lib/gcj-4-1-71 as private gcj subdir.
+    - Bump the libgcj soversion to 71, rename the libgcj7-0 package
+      to libgcj7-1, rename the libgcj7-awt package to libgcj7-1-awt.
+    - gij-4.1: Add and provide alternatives for gorbd, grmid, gserialver.
+    - gcj-4.1: Remove gcjh, gcjh-wrapper, gjnih.
+    - gcj-4.1: Add and provide alternatives for jar, javah, native2ascii,
+      tnameserv.
+    - gcj-4.1: Add dependency on ecj-bootstrap, recommend fastjar,
+      ecj-bootstrap-gcj.
+    - Add build dependency on ecj-bootstrap version providing the GCCMain
+      class.
+    - libgcj7-1: Recommend libgcj7-1-awt.
+    - Add build dependency on libmagic-dev.
+    - Build-depend on gcj-4.1; build our own ecj1 and gjdoc before
+      starting the build.
+    - Make ecj1 available when running the testsuite.
+    - Fix build failure on sparc-linux.
+    - Fix gjavah compatibility problems (PR cp-tools/3070[67]).
+    - Fixed driver issue source files (PR driver/30714).
+    - Add (rudimentary) manual pages for classpath tools.
+
+  [Kevin Brown]
+  * debian/control.m4, debian/rules.d/binary-ada.mk: provide new packages
+    containing debugging symbols for Ada libraries: libgnat-4.1-dbg,
+    libgnatprj4.1-dbg, and libgnatvsn4.1-dbg.  Adresses: #401385.
+
+ -- Matthias Klose <doko@debian.org>  Sat,  3 Mar 2007 23:12:08 +0100
+
+gcc-4.1 (4.1.1ds2-30) experimental; urgency=low
+
+  * Update to SVN 20070106.
+  * Do not revert the fixes for PR 25878, PR 29138, PR 29408.
+  * Don't build the packages built by gcc-4.2 source.
+  * debian/patches/note-gnu-stack.dpatch: Add .note.GNU-stack sections
+    for gcc's crt files, libffi and boehm-gc. Taken from FC. Closes: #382741.
+  * Merge from Ubuntu:
+    - Backport g++ visibility patches from the FC gcc-4_1-branch.
+    - Update the long-double patches; require glibc-2.4 as a build dependency
+      on alpha, powerpc, sparc, s390. Bump the shlibs dependencies to
+      require 4.1.1-21.
+    - On powerpc-linux configure using --enable-secureplt. Closes: #382748.
+    - When using the cpu-default-generic patch, build for generic x86-64
+      on amd64 and i386 biarch.
+    - Link using --hash-style=both (alpha, amd64, ia64, i386, powerpc, ppc64,
+      s390, sparc).
+  * gij-4.1: Recommends libgcj7-awt instead of suggesting it. Closes: #394917.
+  * Split the gcc-long-double patch into a code and doc part.
+  * Set priority of development packages to optional.
+  * Add support for kfreebsd-amd64 (Aurelian Jarno). Closes: #406015.
+
+ -- Matthias Klose <doko@debian.org>  Sat,  6 Jan 2007 10:35:42 +0100
+
+gcc-4.1 (4.1.1ds2-22) unstable; urgency=high
+
+  * Enable -pthread for GNU/Hurd (Michael Banck). Closes: #400031.
+  * Update the m68k-fpcompare patch (Roman Zippel). Closes: #401585.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 10 Dec 2006 12:35:06 +0100
+
+gcc-4.1 (4.1.1ds2-20) unstable; urgency=low
+
+  [Matthias Klose]
+  * Update to SVN 20061115.
+    - Fix PR tree-optimization/27891, ICE in tree_split_edge.
+      Closes: #370248, #391657, #394630.
+    - Fix PR tree-optimization/9814, duplicate of PR tree-optimization/29797.
+      Closes: #181096.
+  * Apply the libjava/net backport from the redhat/gcc-4_1-branch.
+  * Apply proposed patch for PR java/29805.
+
+  [Roman Zippel]
+  * Build the ObjC and ObjC++ compilers in cross builds.
+  * debian/patches/m68k-symbolic-operand.dpatch: Better recognize
+    symbolic operands in addresses.
+  * debian/patches/m68k-bitfield-offset.dpatch: Only use constant offset
+    for register bitfields (combine expects shifts, but does a rotate).
+  * debian/patches/m68k-bitfield-offset.dpatch: Update and apply.
+
+  [Daniel Jacobowitz]
+  * Don't try to use _Unwind_Backtrace on SJLJ targets.
+    See bug #387875, #388505, GCC PR 29206.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 15 Nov 2006 08:59:53 -0800
+
+gcc-4.1 (4.1.1ds2-19) unstable; urgency=low
+
+  * Fix typo in arm-pragma-pack.dpatch.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 28 Oct 2006 11:04:00 +0200
+
+gcc-4.1 (4.1.1ds2-18) unstable; urgency=medium
+
+  [Matthias Klose]
+  * Update to SVN 20061028.
+  * Fix #pragma pack on ARM (Paul Brook). Closes: #394703.
+  * Revert PR c++/29138, PR c++/29408. Closes: #392559.
+  * Revert PR c++/25878. Addresses: #387989.
+  * fastjar: Provide jar. Closes: #395397.
+
+  [Ludovic Brenta]
+  * debian/control.m4 (libgnatprj-dev): depend on libgnatvsn-dev.
+    debian/gnatprj.gpr: with gnatvsn.gpr. Closes: #395000.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 26 Oct 2006 23:51:10 +0200
+
+gcc-4.1 (4.1.1ds2-17) unstable; urgency=low
+
+  [Matthias Klose]
+  * Update to SVN 20061020.
+    - Fix PR debug/26881, ICE in dwarf2out_finish. Closes: #377613.
+    - Fix PR PR c++/29408, parse error for valid code. Closes: #392327, #393010.
+    - Fix PR c++/29435, segfault with sizeof and templates. Closes: #393071.
+    - Fix PR target/29338, segfault with -finline-limit on arm. Closes: 390620.
+    - Fix 3.4/4.0 backwards compatibility problem in libstdc++.
+  * Fix PR classpath/29362, taken from the redhat/gcc-4_1-branch.
+  * Remove the INSTALL directory from the source tarball. Closes: #392974.
+  * Disable building the static libgcj; non-functional, and cutting
+    down build times.
+  * libgcj7-0: Tighten dependency on libgcj-common.
+  * libgcj7-dev: Install .pc file as libgcj-4.1.pc.
+  * README.cross: Updated (Hector Oron). Addresses: #380251.
+  * config-ml.dpatch: Use *-linux-gnu as *_GNU_TYPE. Closes: #394034.
+
+  [Nikita V. Youshchenko]
+  * Fix typo in the cross build scripts.  Closes: #391445.
+
+  [Falk Hueffner]
+  * alpha-no-ev4-directive.dpatch: Fix kernel build failure.
+
+  [Roman Zippel]
+  * debian/patches/m68k-align-code.dpatch: Use "move.l %a4,%a4" to advance
+    within code.
+  * debian/patches/m68k-align-stack.dpatch: Try to keep the stack word aligned.
+  * debian/patches/m68k-dwarf3.dpatch: Emit correct dwarf info for cfa offset
+    and register with -fomit-frame-pointer.
+  * debian/patches/m68k-fpcompare.dpatch: Bring fp compare early to its
+    desired form to relieve reload. Closes: #390879.
+  * debian/patches/m68k-prevent-swap.dpatch: Don't swap operands
+    during reloads.
+  * debian/patches/m68k-reg-inc.dpatch: Reinsert REG_INC notes after splitting
+    an instruction.
+  * debian/patches/m68k-secondary-addr-reload.dpatch: Add secondary reloads
+    to allow reload to get byte values into addr regs. Closes: #385327.
+  * debian/patches/m68k-symbolic-operand.dpatch: Better recognize symbolic
+    operands in addresses.
+  * debian/patches/m68k-limit_reload.dpatch: Remove, superseded by
+    m68k-secondary-addr-reload.dpatch.
+  * debian/patches/m68k-notice-move.dpatch: Apply, was checked in in -16.
+  * debian/patches/m68k-autoinc.dpatch: Updated, don't attempt to increment
+    the register, if it's used multiple times in the instruction .
+
+ -- Matthias Klose <doko@debian.org>  Sat, 21 Oct 2006 00:25:05 +0200
+
+gcc-4.1 (4.1.1ds1-16) unstable; urgency=low
+
+  [Matthias Klose]
+  * Update to SVN 20061008.
+    - Fix PR c++/29226, ICE in make_decl_rtl. Closes: #388263.
+  * libgcj7-0: Fix package removal. Closes: #390874.
+  * Configure with --disable-libssp on architectures that don't
+    support it (alpha, hppa, ia64, m68k, mips, mipsel).
+  * On hppa, remove build-dependency on dash.
+  * gij/gcj: Do not install slave links for the non DFSG manpages.
+    Closes: #390425, #390532.
+  * libgcj-common: rebuild-gcj-db: Don't do anything, if no classmap
+    files are found. Closes: #390966.
+  * Fix PR libstdc++/11953, extended for all linux architectures.
+    Closes: #391268.
+  * libffi4-dev: Conflict with libffi. Closes: #387561.
+  * Backport PR target/27880 to the gcc-4_1-branch. Patch by Steve Ellcey.
+    Closes: #390693.
+  * On ia64, don't use _Unwind_GetIPInfo in libjava and libstdc++.
+  * Add a README.ssp with minimal documentation about stack smashing
+    protection. Closes: #366094.
+  * Do not build libgcj-common from the gcc-4.1/gcj-4.1 sources anymore.
+
+  [Roman Zippel]
+  * debian/patches/m68k-notice-move.dpatch: Don't set cc_status
+    for fp move without fp register.
+
+ -- Matthias Klose <doko@debian.org>  Sun,  8 Oct 2006 02:21:49 +0200
+
+gcc-4.1 (4.1.1ds1-15) unstable; urgency=medium
+
+  * Update to SVN 20060927.
+    - Fix PR debug/29132, exception handling on mips. Closes: #389468, #390042.
+    - Fix typo in gcc documentation. Closes: #386180.
+    - Fix PR target/29230, wrong code generation on arm. Closes: #385505.
+  * libgcj-common: Ignore exit value of gcj-dbtool in rebuild-gcj-db on
+    arm, m68k, hppa. Adresses: #388505.
+  * libgcj-common: Replaces java-gcj-compat-dev and java-gcj-compat.
+    Closes: #389539.
+  * libgcj-common: /usr/share/gcj/debian_defaults: Define gcj_native_archs.
+  * Update the java backport from the redhat/gcc-4_1-branch upto 2006-09-27;
+    remove libjava-str2double.dpatch, pr28661.dpatch.
+  * Disable ssp on hppa, not supported.
+  * i386-biarch.dpatch: Avoid warnings about macro redefinitions.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 29 Sep 2006 22:32:41 +0200
+
+gcc-4.1 (4.1.1ds1-14) unstable; urgency=medium
+	
+  [Matthias Klose]
+  * Update to SVN 20060920.
+    - Fix PR c++/26957. Closes: #373257, #386910.
+    - Fix PR rtl-optimization/28243. Closes: #378325.
+  * Remove patch for PR rtl-optimization/28634, applied upstream.
+  * Fix FTBFS on GNU/kFreeBSD (fallout from the backport of classpath-0.92).
+    (Petr Salinger). Closes: #385974.
+  * Merge from Ubuntu:
+    - Do not encode the subminor version in the jar files.
+    - Fix typo for the versioned gcj subdirectory in lib32gcj-0.
+    - When running the i386 binaries on amd64, adjust the properties
+      java.home, gnu.classpath.home.url, sun.boot.class.path,
+      gnu.gcj.precompiled.db.path.
+    - Configure the 32bit build on amd64 
+      --with-java-home=/usr/lib32/jvm/java-1.4.2-gcj-4.1-1.4.2.0/jre.
+    - Configure --with-long-double-128 for glibc-2.4 on alpha, powerpc, ppc64,
+      s390, s390x, sparc, sparc64.
+    - Update the java backport from the redhat/gcc-4_1-branch upto 2006-09-20.
+      - Fix PR java/29013, invalid byte code generation. Closes: #386926.
+    - debian/patches/gcc-pfrs-2.dpatch: Apply a fix for a regression in the
+      backport of PR 28946 from the trunk (H.J. Lu).
+  * Backport PR classpath/28661 from the trunk.
+  * Don't ship the .la files for the java modules. Closes: #386228.
+  * gcj-4.1: Remove dangling symlink. Closes: #386430.
+  * gij: Suggest java-gcj-compat, gcj: Suggest java-gcj-compat-dev.
+    Closes: #361942.
+  * Fix infinite loop in string-to-double conversion on 64bit targets.
+    Closes: #348792.
+  * gij-4.1: Ignore exit value of gcj-dbtool in postinst. Adresses: #388505.
+  * libgcj-common: Move rebuild-gcj-db from java-gcj-compat into libgcj-common.
+  * On hppa, install a wrapper around gij-4.1 to ignore unaligned memory
+    accesses. Works around buildd configurations enabling this check by
+    default. Addresses: #364819.
+
+  [Ludovic Brenta]
+  * debian/patches/ada-libgnatprj.dpatch: Build mlib-tgt-linux.adb instead of
+    mlib-tgt.adb.  Closes: #387826.
+  * debian/patches/ada-pr15802.dpatch: Backport from the trunk.
+    Closes: #246384.
+  * debian/control.m4 (gnat-4.1): do not provide gnat (supplied by
+    gcc-defaults instead); conflict with gnat-4.2 which will soon be in
+    unstable.
+
+  [Roman Zippel]
+  * debian/patches/m68k-dwarf2.dpatch: Recognize stack adjustments also
+    in the src of an instruction.
+  * debian/patches/m68k-jumptable.dpatch: Don't force byte offset when
+    accessing the jumptable, gas can generate the correct offset size instead.
+  * debian/patches/m68k-peephole.dpatch: Convert some text peepholes to rtl
+    peepholes, so the correct DWARF2 information can be generated for stack
+    manipulations (Keep a few peepholes temporarily disabled).
+  * debian/patches/m68k-peephole-note.dpatch: Don't choke on notes while
+    reinserting REG_EH_REGION notes.
+  * debian/patches/m68k-return.dpatch: Don't use single return if fp register
+    have to be restored. Closes: #386864.
+  * debian/patches/m68k-sig-unwind.dpatch: Add support for unwinding over
+    signal frames.
+  * Fix PR rtl-optimization/27736, backport from the trunk.
+  * Add java support for m68k. Closes: #312830, #340874, #381022.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 24 Sep 2006 19:36:31 +0200
+
+gcc-4.1 (4.1.1ds1-13) unstable; urgency=medium
+
+  * Update to SVN 20060901; remove patches applied upstream:
+    - PR target/24367.
+    - PR c++/26670.
+  * Apply proposed patch for PR fortran/28908.
+  * Fix biarch symlinks in lib64stdc++ for cross builds.
+  * Fix biarch symlinks in lib32objc on amd64.
+
+ -- Matthias Klose <doko@debian.org>  Fri,  1 Sep 2006 00:04:05 +0200
+
+gcc-4.1 (4.1.1ds1-12) unstable; urgency=medium
+
+  [Matthias Klose]
+  * Update to SVN 20060830.
+  * Add backport of PR other/26208, bump libgcc1 shlibs dependency.
+  * Add backport of PR c++/26670. Closes: #356548.
+  * Apply proposed patch for PR target/24367 (s390).
+  * Add /usr/lib/jni to the libjava dlsearch path. Closes: #364820.
+  * Build without GFDL licensed docs. Closes: #384036.
+    - debian/patches/{svn-doc-updates,pr25524-doc,pr26885-doc}.dpatch:
+      Split out -doc specific patches.
+    - debian/*.texi, debian/porting.html: Add dummy documentation.
+    - debian/rules.unpack, debian/rules.patch: Update for non-gfdl build.
+    - fastjar.texi: Directly define the gcctabopt and gccoptlist macros.
+
+  * Merge from Ubuntu:
+    - Backport the classpath-0.92, libjava, gcc/java merge from the
+      redhat/gcc-4_1-branch branch.
+    - Apply the proposed patch for PR libgcj/28698.
+    - Change the libgcj/libgij sonames. Rename libgcj7 to libgcj7-0.
+    - Do not remove the rpath from libjvm.so and libjawt.so. Some
+      configure scripts rely on being able to link that libraries
+      directly.
+    - When running the i386 binaries on amd64, look in
+      /usr/lib32/gcj-x.y and /usr/lib32/jni instead.
+    - Add /usr/lib/jni to java.library.path. Closes: #364820.
+    - Add debugging symbols for more binary packages to libgcj7-dbg.
+      Closes: #383705.
+    - libgcj7-dev: Remove conflicts with older libgcjX-dev packages.
+    - Do not build the libgcj-bc and lib32gcj-bc packages anymore from
+      the gcj-4.1 source.
+
+  [Roman Zippel]
+  * debian/patches/m68k-limit_reload.dpatch: Correctly limit reload class.
+    Closes: #375522.
+  * debian/patches/m68k-split_shift.dpatch: Use correct predicates for long long
+    shifts and use more splits. Closes: #381572.
+  * debian/patches/m68k-prevent-qipush.dpatch: Prevent combine from creating
+    a byte push on the stack (invalid on m68k). Closes: #385021.
+  * debian/patches/m68k-autoinc.dpatch: Recognize a few more autoinc possibilities.
+  * debian/patches/pr25514.dpatch: Backport from the trunk.
+  * debian/patches/m68k-gc.dpatch: Change STACKBOTTOM to LINUX_STACKBOTTOM
+    so it works with 2.6 kernels.
+  * Other m68k bug reports fixed in 4.1.1-11 and 4.1.1-12:
+    Closes: #378599, #345574, #344041, #323426, #340293.
+  * Build the stage1 compiler using -g -O2; saves a few hours build time
+    and apparently is working at the moment.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 29 Aug 2006 21:37:28 +0200
+
+gcc-4.1 (4.1.1-11) unstable; urgency=low
+
+  * The "Our priority are our users, remove the documentation!" release.
+
+  [Matthias Klose]
+  * Fix build failure building the hppa->hppa64 cross compiler.
+  * Update to SVN 20060814.
+    - Fix directory traversal vulnerability in fastjar. Closes: #368397.
+      CVE-2006-3619.
+    - Fix PR rtl-optimization/23454, ICE in invert_exp_1 on sparc.
+      Closes: #321215.
+    - Fix PR c++/26757, C++ front-end producing two DECLs with the same UID.
+      Closes: #356569.
+  * Remove patch for PR rtl-optimization/28075, applied upstream.
+  * Apply proposed patch for PR rtl-optimization/28634, rounding problem with
+    -fdelayed-branch on hppa/mips. Closes: #381710.
+  * Fixed at least in 4.1.1-10: boost::date_time build failure.
+    Closes: #382352.
+  * Build-depend on make (>= 3.81), add make (>= 3.81) as dependency to
+    gcc-4.1-source. Closes: #381117.
+  * Backport of libffi from the trunk; needed for the java backport in
+    experimental.
+  * libffi4-dev: Install the libffi_convenience library as libffi_pic.a.
+  * When building a package without the GFDL'd documentation, don't create
+    the alternative's slave links for manual pages for the java tools.
+  * Do not build the -doc packages and derived manual pages licensed under
+    the GFDL with invariant sections or cover texts.
+  * Only build the libssp package, if the target libc doesn't provide
+    ssp support.
+  * Run the complete testsuite, when building a standalone gcj package.
+
+  [Roman Zippel]
+  * debian/patches/m68k-fjump.dpatch:
+    Always use as fjcc pseudo op, we rely heavily on as to generate the
+    right size for the jump instructions. Closes: #359281.
+  * debian/patches/m68k-gc.dpatch:
+    The thread suspend handler has to save all registers.
+    Reenable MPROTECT_VDB, it should work, otherwise it's probably a kernel bug.
+  * debian/patches/m68k-save_pic.dpatch:
+    Correctly save the pic register, when not done by reload().
+    (fixes _Unwind_RaiseException and thus exception handling).
+  * debian/patches/m68k-libffi.dpatch: Add support for closures.
+  * debian/patches/m68k-bitfield.dpatch: Avoid propagation of mem expression
+    past a zero_extract lvalue.
+  * debian/patches/m68k-dwarf.dpatch: Correct the dwarf frame information,
+    but preserve compatibility.
+
+  [Christian Aichinger]
+  * Fix building a cross compiler targeted for ia64. Closes: #382627.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 15 Aug 2006 00:41:00 +0200
+
+gcc-4.1 (4.1.1-10) unstable; urgency=low
+
+  * Update to SVN 20060729.
+    - Fix PR c++/28225, segfault in type_dependent_expression_p.
+      Closes: #376148.
+  * Apply proposed patch for PR rtl-optimization/28075.
+    Closes: #373820.
+  * Apply proposed backport and proposed patch for PR rtl-optimization/28221.
+    Closes: #376084.
+  * libgcj7-jar: Loosen dependency on gcj-4.1-base.
+  * Add ssp header files to the private gcc includedir.
+  * Do not build the Ada packages from the gcc-4.1 source, introducing
+    a new gnat-4.1 source package.
+  * Build libgnat on alpha and s390 as well.
+  * Do not build the gnat-4.1-doc package (GFDL with invariant sections or
+    cover texts).
+  * Remove references to the stl-manual package. Closes: #378698.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 29 Jul 2006 22:08:59 +0200
+
+gcc-4.1 (4.1.1-9) unstable; urgency=low
+
+  * Update to SVN 20060715.
+    - Fix PR c++/28016, do not emit uninstantiated static data members.
+      Closes: #373895, #376871.
+  * Revert the patch to fix PR c++/27227. Closes: #378321.
+  * multiarch-include.dpatch: Renamed from biarch-include.dpatch;
+    apply for all architectures.
+  * Do not build the java compiler in gcc-4.1 package, just include the
+    options and specs in the gcc driver.
+  * Remove gnat-4.0 as an alternative build dependency.
+  * Add a patch to enable -fstack-protector by default for C, C++, ObjC, ObjC++.
+    The patch is disabled by default.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 15 Jul 2006 17:07:29 +0200
+
+gcc-4.1 (4.1.1-8) unstable; urgency=medium
+
+  * Update to SVN 20060708.
+    - Fix typo in gcov documentation. Closes: #375140.
+    - Fix typo in gccint documentation. Closes: #376412.
+    - [alpha], Fix -fvisibility-inlines-hidden segfaults on reference to
+      static method. PR target/27082. Closes: #369642.
+
+  * Fix ppc64 architecture string in debian/multiarch.inc. Closes: #374535.
+  * Fix conflict, replace and provide libssp0-dev for cross compilers.
+    Closes: #377012.
+  * Ignore compiler warnings when checking whether compiler driver understands
+    Ada fails. Closes: #376660.
+  * Backport fix for PR libmudflap/26864 from the trunk. Closes: #26864.
+  * README.C++: Remove non-existing URL. Closes: #347601.
+  * gij-4.1: Provide java2-runtime. Closes: #360906.
+
+  * Closed reports reported against gcc-3.0 and fixed in gcc-4.1:
+    - C++
+      + PR libstdc++/13943, call of overloaded `llabs(int)' is ambiguous.
+        Closes: #228645.
+    - Java
+      + Fixed segmentation fault on compiling bad program. Closes: #165635
+  * Closed reports reported against gcc-3.3 and fixed in gcc-4.1:
+    - Stack protector available. Closes: #213994, #233208.
+    - Better documentation of -finline-limit option. Closes: #296047.
+  * Closed reports reported against gcc-3.4 and fixed in gcc-4.1:
+    - General
+      + Fixed [unit-at-a-time] Using -O2 cannot detect missing return
+        statement in a function. Closes: #276843.
+    - C++
+      + PR13943, call of overloaded `llabs(int)' is ambiguous. Closes: #228645.
+      + PR c++/21280, #pragma interface, templates, and "inline function used
+        but never defined". Closes: #364412.
+    - Architecture specific:
+      - m68k
+        + Segfault building glibc. Closes: #353618.
+        + ICE when trying to build boost. Closes: #321486.
+  * Closed reports reported against gcc-4.0 and fixed in gcc-4.1:
+    - General
+      + Handling of #pragma GCC visibility for builtin functions.
+        Closes: #330279.
+      + gettext interpretation the two conditional strings as one.
+        Closes: #227193.
+      + ICE due to if-conversion. Closes: #335078.
+      + Fix unaligned accesses with __attribute__(packed) and memcpy.
+        Closes: #355297.
+      + Fix ICE in expand_expr_real_1, at expr.c. Closes: #369817.
+    - Ada
+      + Link error not finding -laddr2line. Closes: #322849.
+      + ICE on invalid code. Closes: #333564.
+    - C++
+      + libstdc++: bad thousand separator with fr_FR.UTF-8. Closes: #351786.
+      + The Compiler uses less memory than 4.0. Closes: #336225.
+      + Fix "fails to compare reverse map iterators". Closes: #362840.
+      + Fix "fail to generate code for base destructor defined inline with
+        pragma interface". Closes: #356435.
+      + Fix ICE in cp_expr_size, at cp/cp-objcp-common.c. Closes: #317455.
+      + Fix wrong warning: control may reach end of non-void function.
+        Closes: #319309.
+      + Fix bogus warning "statement has no effect" with template and
+        statement-expression. Closes: #336915.
+      + Fixed segfault on syntax error. Closes: #349087.
+      + Fix ICE with __builtin_constant_p in template argument.
+        Closes: #353366.
+      + Implement DR280 (fixing "no operator!= for const_reverse_iterator").
+        Closes: #244894.
+    - Fortran
+      + Fix wrong behaviour in unformatted writing. Closes: #369547.
+    - Java
+      + Fixed segfault on -fdump-tree-all-all. Closes: #344265.
+      + Fixed ant code completion in eclipse generating a nullpointer
+        exception. Closes: #337510.
+      + Fixed abort in gnu_java_awt_peer_gtk_GtkImage.c. Closes: #343112.
+      + Fixed assertion failure in gij with rhdb-explain. Closes: #335650.
+      + Fixed assertion failure when calling JTabbedPane.addTab(null, ...).
+        Closes: #314704.
+      + Fixed error when displaying empty window with bound larger than the
+        displayed content. Closes: #324502.
+      + Fixed: Exception in JComboBox.removeAllItems(). Closes: #314706.
+      + Fixed assertian error in gnu_java_awt_peer_gtk_GtkImage.c.
+        Closes: #333733.
+    - libmudflap
+      + PR libmudflap/23170, libmudflap should not use functions marked
+        obsolescent by POSIX/SUS. Closes: #320398.
+    - Architecture specific:
+      - m68k
+        + FTBFS building tin. Closes: #323016.
+        + ICE with -g -fomit-frame-pointer. Closes: #331150.
+        + ICE in instantiate_virtual_regs_lossage. Closes: #333536.
+        + Wrong code generation with loop unrolling. Closes: #342121.
+        + ICEs while building gst-ffmpeg. Closes: #343692.
+      - mips
+        + Fix gjdoc build failure. Closes: #344986.
+        + Fix link failure for static libs and object files when xgot
+          needs to be used. Closes: #274942.
+  * gnat bug reports fixed since gnat-3.15p:
+    - GNAT miscounts UTF8 characters in string with -gnaty. Closes: #66175.
+    - Bug box from "with Text_IO" when compiling optimized. Closes: #243795.
+    - Nonconforming parameter lists not detected. Closes: #243796.
+    - Illegal use clause not detected. Closes: #243797.
+    - Compiler enters infinite loop on illegal program with tagged records.
+      Closes: #243799.
+    - Compiler crashes on illegal program (missing discriminant, unconstrained
+      parent). Closes: #243800.
+    - Bug box at sinfo.adb:1215 on illegal program. Closes: #243801.
+    - Bug box at sinfo.adb:1651 on illegal program. Closes: #243802.
+    - Illegal program not detected (entry families). Closes: #243803.
+    - Illegal program not detected, RM 10.1.1(14). Closes: #243807.
+    - Bug box at exp_ch9.adb:7254 on illegal code. Closes: #243812.
+    - Illegal program not detected, RM 4.1.4(14). Closes: #243816.
+    - Bug box in Gigi, code=116, on legal program. Closes: #244225.
+    - Illegal program not detected, 12.7(10) (generic parameter is visible,
+      shouldn't be). Closes: #244483.
+    - Illegal program not detected, ambiguous aggregate. Closes: #244496.
+    - Bug box at sem_ch3.adb:8003. Closes: #244940.
+    - Bug box in Gigi, code=103, on illegal program. Closes: #244945.
+    - Legal program rejected, overloaded procedures. Closes: #246188.
+    - Bug box in Gigi, code=999, on legal program. Closes: #246388.
+    - Illegal program not detected, RM 10.1.6(3). Closes: #246389.
+    - Illegal program not detected, RM 3.10.2(24). Closes: #247014.
+    - Illegal program not detected, RM 3.9(17). Closes: #247015.
+    - Legal program rejected. Closes: #247016.
+    - Legal program rejected. Closes: #247021.
+    - Illegal program not detected, RM 4.7(3). Closes: #247022.
+    - Illegal program not detected, RM 3.10.2(27). Closes: #247562.
+    - Legal program rejected, "limited type has no stream attributes".
+      Closes: #247563.
+    - Wrong output from legal program. Closes: #247565.
+    - Compiler enters infinite loop on illegal program. Closes: #247567.
+    - Illegal program not detected, RM 8.6(31). Closes: #247568.
+    - Legal program rejected, visible declaration not seen. Closes: #247572.
+    - Illegal program not detected, RM 8.2(9). Closes: #247573.
+    - Wrong output from legal program, dereferencing access all T'Class.
+      Closes: #248171.
+    - Compiler crashes on illegal program, RM 5.2(6). Closes: #248174.
+    - Cannot find generic package body, RM 1.1.3(4). Closes: #248677.
+    - Illegal program not detected, RM 3.4.1(5). Closes: #248679.
+    - Compiler ignores legal override of abstract subprogram. Closes: #248686.
+    - Bug box, Assert_Failure at sinfo.adb:2365 on illegal program.
+      Closes: #251266.
+    - Ada.Numerics.Generic_Elementary_Functions.Log erroneout with -gnatN.
+      Closes: #263498.
+    - Bug box, Assert_Failure at atree.adb:2906 or Gigi abort, code=102
+      with -gnat -gnatc. Closes: #267788.
+    - Bug box in Gigi, code=116, 'Unrestricted_Access of a protected
+      subprogram. Closes: #269775.
+    - Stack overflow on illegal program, AI-306. Closes: #276225.
+    - Illegal program not detected, RM B.1(24). Closes: #276226.
+    - Wrong code generated with -O -fPIC. Closes: #306833.
+    - Obsolete: bashism's in debian/rules file. Closes: #370681.
+    - Supports more debian architectures. Closes: #171477.
+
+ -- Matthias Klose <doko@debian.org>  Sat,  8 Jul 2006 16:24:47 +0200
+
+gcc-4.1 (4.1.1-7) unstable; urgency=low
+
+  * Prefer gnat-4.1 over gnat-4.0 as a build dependency.
+  * libssp0: Set priority to standard.
+
+ -- Matthias Klose <doko@debian.org>  Sun,  2 Jul 2006 10:22:50 +0000
+
+gcc-4.1 (4.1.1-6) unstable; urgency=low
+
+  [Ludovic Brenta]
+  * Do not provide the symbolic link /usr/bin/gnatgcc; this will now
+    be provided by package gnat from the source package gcc-defaults.
+  * debian/control.m4, debian/control (gnat): conflict with gnat (<< 4.1),
+    not all versions of gnat, since gcc-defaults will now provide gnat (= 4.1)
+    which depends on gnat-4.1.
+
+  [Matthias Klose]
+  * libjava: Change the default for enable_hash_synchronization_default
+    on PA-RISC. Tighten the libgcj7 shlibs version on hppa.
+  * Update to SVN 20060630.
+  * Apply proposed patch for PR 26991.
+  * Don't use the version for the libstdc++ shlibs dependency for the libgcj
+    shlibs dependency.
+  * Merge from Ubuntu edgy:
+    - Fix %g7 usage in TLS, add patch sparc-g7.dpatch, fixes glibc-2.4 build
+      failure on sparc (Fabio M. Di Nitto).
+    - Merge libssp0-dev into gcc-4.1 (-fstack-protector is a common option).
+    - Run the testsuite with -fstack-protector as well.
+
+  [Bastian Blank]
+  * Make it possible to overwrite arch per DEB_TARGET_ARCH and DEB_TARGET_GNU_TYPE.
+  * Disable biarch only on request for cross builds.
+  * Use correct source directory for tarballs.
+  * Produce correct multiarch.inc for source builds.
+
+ -- Matthias Klose <doko@debian.org>  Sat,  1 Jul 2006 01:49:55 +0200
+
+gcc-4.1 (4.1.1-5) unstable; urgency=low
+
+  * Fix build error running with dpkg-buildpackage -rsudo.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 14 Jun 2006 01:54:13 +0200
+
+gcc-4.1 (4.1.1-4) unstable; urgency=low
+
+  * Really do not backout the fix for PR c++/26068.
+    Closes: #372152, #372559.
+  * Update fastjar version string to 4.1.
+  * Disable pascal again.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 12 Jun 2006 20:29:57 +0200
+
+gcc-4.1 (4.1.1-3) unstable; urgency=low
+
+  * Update to SVN 20060608, do not revert the fix for PR c++/26068.
+    Closes: #372152, #372559.
+  * Fix build failures for Pascal, enable Pascal on all architectures.
+  * Fix another build failure on GNU/kFreeBSD (Aurelien Jarno).
+    Closes: #370661.
+  * Fix build fauilure in gcc/p with parallel make.
+  * Remove cross-configure patch (Kazuhiro Inaoka). Closes: #370649.
+  * Only build the gcc-4.1-source package, when building from the gcc-4.1
+    source.
+  * Fix upgrade problem from standalone gcj-4.1.
+  * Fix build error using bison-2.2, build-depend on bison (>= 2.3).
+    Closes: #372605.
+  * Backport PR libstdc++/25524 from the trunk, update the biarch-include
+    patch. mips triarch support can be added more easily.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 12 Jun 2006 00:23:45 +0200
+
+gcc-4.1 (4.1.1-2) unstable; urgency=low
+
+  * Update to SVN 20060604.
+    - Fix PR c++/26757, C++ front-end producing two DECLs with the same UID.
+      Closes: #356569.
+    - Fix PR target/27158, ICE in extract_insn with -maltivec.
+      Closes: #362307.
+  * Revert PR c++/26068 to work around PR c++/27884 (Martin Michlmayr).
+    Closes: #370308.
+  * Mention Ada in copyright, update copyright file (Ludovic Brenta).
+    Closes: #366744.
+  * Fix kbsd-gnu-java.dpatch (Petr Salinger). Closes: #370320.
+  * Don't include version control files in gcc-4.1-source.
+
+ -- Matthias Klose <doko@debian.org>  Sun,  4 Jun 2006 19:13:37 +0000
+
+gcc-4.1 (4.1.1-1) unstable; urgency=low
+
+  [Matthias Klose]
+  * Update to SVN 20060601.
+  * Reenable the gpc build.
+  * PR libgcj/26483, libffi patch for IA-64 denorms, taken from trunk.
+  * Disable Ada for m32r targets. Closes: #367595.
+  * lib32gfortran1: Do not create empty directory /usr/lib32. Closes: #367999.
+  * gcc-4.1: Add a conflict to the gcj-4.1 version with a different
+    gcc_libdir.
+  * Build gij/gcj for GNU/k*BSD. Closes: #367166.
+  * Update hurd-changes patch (Michael Banck). Closes: #369690.
+  * debian/copyright: Add exception for the gpc runtime library.
+  * Update gpc/gpc-doc package descriptions.
+
+  [Ludovic Brenta]
+  * patches/ada-libgnatprj.dpatch: add prj-pars.ad[bs] and sfn_scan.ad[bs]
+    to libgnatprj; remove them from gnatmake.
+
+ -- Matthias Klose <doko@debian.org>  Thu,  1 Jun 2006 20:35:54 +0200
+
+gcc-4.1 (4.1.0-4) unstable; urgency=low
+
+  [Ludovic Brenta]
+  * Fix a stupid bug whereby fname.ad{b,s} would be included in both
+    libgnatvsn-dev and libgnatprj-dev, preventing use of gnatprj.gpr.
+    Closes: #366733.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 11 May 2006 04:34:50 +0200
+
+gcc-4.1 (4.1.0-3) unstable; urgency=low
+
+  * Update to SVN 20060507.
+  * debian/rules.d/binary-java.mk: Use $(lib32) everywhere. Closes: #365388.
+  * Always configure hppa64-linux-gnu with
+    --includedir=/usr/hppa64-linux-gnu/include.
+  * Make libgnatvsn4.1 and libgnatprj4.1 priority optional. Closes: #365900.
+  * Call autoconf2.13 explicitely in the Ada patches, build-depend on
+    autoconf2.13. Closes: #365780.
+  * Fix libgnatprj-dev and libgnatvsn-dev dependencies on their shared
+    libraries.
+  * Deduce softfloat and vfp (ARM) configure options (Pjotr Kourzanov).
+  * Update proposed patch for PR26885 (May 2 version).
+  * Build the libxxstdc++-dbg packages, when not building the library pacakges.
+  * Do not include the _pic library in the libxxstdc++-dbg packages.
+
+ -- Matthias Klose <doko@debian.org>  Sun,  7 May 2006 15:29:53 +0200
+
+gcc-4.1 (4.1.0-2) unstable; urgency=medium
+
+  * Update to SVN 20060428.
+  * Apply proposed patches for PR26885.
+
+  * Keep libffi doc files in its own directory. Closes: #360466.
+  * Update ppc64 patches for 4.1 (Andreas Jochens). Closes: #360498.
+  * Fix PR tree-optimization/26763, wrong-code, taken from the 4.1 branch.
+    Closes: #356896. CVE-2006-1902.
+  * hppa-cbranch, hppa-cbranch2 patches: Fix for PR target/26743,
+    PR target/11254, PR target/10274, backport from trunk (Randolph Chung).
+  * Let libgccN provide -dcv1 when cross-compiling (Pjotr Kourzanov).
+    Closes: #363289.
+  * (Build-)depend on glibc-2.3.6-7. Closes: #360895, #361904.
+  * Fix a pedantic report about a package description. Add a hint that
+    we do not like bug reports with locales other than "C". Closes: #361409.
+  * Enable the libjava interpreter on mips/mipsel.
+  * gcc-4.1-source: Depend on gcc-4.1-base.
+  * gnat-4.1: Fix permissions of .ali files.
+  * Build lib32gcj7 on amd64.
+  * debian/patches/ada-gnatvsn.dpatch: New.  Apply proposed fix for
+    PR27194.
+
+  [Ludovic Brenta]
+  * debian/patches/ada-default-project-path.dpatch: new.  Change the
+    default search path for project files to the one specified
+    by the Debian Policy for Ada: /usr/share/ada/adainclude.
+  * debian/patches/ada-symbolic-tracebacks.dpatch: new.  Enable support for
+    symbolic tracebacks in exceptions.
+  * debian/patches/ada-missing-lib.dpatch: remove, superseded by the above.
+  * debian/patches/ada-link-lib.dpatch: changed.
+    - Instead of building libada as a target library only, build it as
+      both a host and, if different, target library.
+    - Build the GNAT tools in their top-level directory; do not use
+      recursive makefiles.
+    - Link the GNAT tools dynamically against libgnat.
+    - Apply proposed fix for PR27300.
+    - Rerun autoconf (Matthias Klose).
+  * debian/patches/ada-libgnatvsn.dpatch: new.
+    - Introduce a new shared library named libgnatvsn, containing
+      common components of GNAT under the GNAT-Modified GPL, for
+      use in GNAT tools, ASIS, GLADE and GPS.
+    - Link the gnat tools against this new library.
+    - Rerun autoconf (Matthias Klose).
+  * debian/patches/ada-libgnatprj.dpatch: new.
+    - Introduce a new shared library named libgnatprj, containing the
+      GNAT Project Manager, i.e. the parts of GNAT that parses project
+      files (*.gpr).  Licensed under pure GPL; for use in GLADE and GPS.
+    - Link the gnat tools against this new library.
+    - Rerun autoconf (Matthias Klose).
+  * debian/patches/ada-acats.dpatch: new.
+     - When running the ACATS, look for the gnat tools in their new
+       directory (build/gnattools), and for the shared libraries in
+       build/gcc/ada/rts, build/libgnatvsn and build/libgnatprj.
+  * debian/gnatvsn.gpr, debian/gnatprj.gpr: new.
+  * debian/rules.d/binary-ada.mk, debian/control.m4: new binary packages:
+    libgnatvsn-dev, libgnatvsn4.1, libgnatprj-dev, libgnatprj4.1. Place
+    the *.gpr files in their respective -dev packages.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 29 Apr 2006 00:32:09 +0200
+
+gcc-4.1 (4.1.0-1) unstable; urgency=low
+
+  * libstdc++CXX-BV-dev.preinst: Remove (handling of c++ include dir for 4.0).
+  * libgcj-common: Move removal of docdir from preinst into postinst.
+  * libgcj7: Move removal of docdir from preinst into postinst.
+  * Drop alternative build dependency on gnat-3.4, not built anymore.
+  * Fix PR libgcj/26103, wrong exception thrown (4.1 branch).
+  * debian/patches/libjava-stacktrace.dpatch: Add support to print file names
+    and line numbers in stacktraces.
+  * Add debugging symbols for libgcjawt and lib-gnu-java-awt-peer-gtk
+    in the libgcj7-dbg and lib32gcj7-dbg packages.
+  * Remove dependency of the libgcj-dbg packages on the libgcj-dev packages,
+    add recommendations on binutils and libgcj-dev. Mention the requirement
+    of binutils for the stacktraces.
+  * Fix upgrade from version 4.0.2-9, loosing the Debian changelog.
+    Closes: #355439.
+  * gij/gcj: Install one alternative for each command, do not use slave
+    links for rmiregistry, javah, rmic. Ubuntu #26781. Closes: #342557.
+  * Fix for PR tree-optimization/26587, taken from the 4.1 branch.
+  * Fix PR libstdc++/26526 (link failure when _GLIBCXX_DEBUG is defined).
+  * Configure with --enable-clocale=gnu, even if not building C++ packages.
+  * Remove runtime path from biarch libraries as well.
+  * PR middle-end/26557 (ice-on-vaild-code, regression), taken from
+    the gcc-4_1-branch. Closes: #349083.
+  * PR tree-optimization/26672 (ice-on-vaild-code, regression), taken from
+    the gcc-4_1-branch. Closes: #356231.
+  * PR middle-end/26004 (rejects-vaild-code, regression), taken from
+    the gcc-4_1-branch.
+  * When building as standalone gcj, build libgcc4 (hppa only) and fastjar.
+  * Configure --with-cpu=v8 on sparc.
+  * debian/patches/libjava-hppa.dpatch: pa/pa32-linux.h
+    (CRT_CALL_STATIC_FUNCTION): Define when CRTSTUFFS_O is defined.
+    (John David Anglin). Closes: #353346.
+  * Point to the 4.1 version of README.Bugs (closes: #356230).
+  * Disable the libmudflap testsuite on alpha (getting killed).
+
+ -- Matthias Klose <doko@debian.org>  Sat, 18 Mar 2006 23:00:39 +0100
+
+gcc-4.1 (4.1.0-0) experimental; urgency=low
+
+  * GCC 4.1.0 final release.
+  * Build the packages for the Java language from a separate source.
+  * Update NEWS.html, NEWS.gcc.
+  * libgcj-doc: Auto generated API documentation for libgcj7, classpath
+    example programs.
+  * Add gjdoc to Build-Depends-Indep.
+  * On amd64, build-depend on libc6-dev-i386 instead of ia32-libs-dev.
+  * Internal ssp headers now installed in the gcc libdir.
+  * Do not build gcj-4.1-base when building the gcc-4.1 packages.
+  * When building as gcj-4.1, use the tarball from the gcc-4.1-source
+    package.
+
+  [Ludovic Brenta]
+  * Allow to enable and disable NLS and bootstrapping from the environment.
+    - Adding "nls" to WITHOUT_LANG disables NLS support.
+    - If WITH_BOOTSTRAP is set, debian/rules2 calls configure
+      --enable-bootstrap=$(WITH_BOOTSTRAP) and just "make".  If
+      WITH_BOOTSTRAP is unset, it calls configure without a bootstrapping
+      option and calls "make profiledbootstrap" or "make bootstrap-lean"
+      depending on the target CPU.
+      Currently overwritten to default to "bootstrap".
+
+ -- Matthias Klose <doko@debian.org>  Thu,  2 Mar 2006 00:03:45 +0100
+
+gcc-4.1 (4.1ds9-0exp9) experimental; urgency=low
+
+  * Update to GCC 4.1.0 release candidate 1 (gcc-4.1.0-20060219 tarball).
+  * Update gcc-version patch for gcc-4.1.
+  * libgccN, libstdc++N*: Fix upgrade of /usr/share/doc symlinks.
+  * libjava awt & swing update, taken from trunk 2006-02-16.
+  * libgcj7-dev: Suggest libgcj-doc, built from a separate source package.
+  * Shorten build-dependency line (work around buildd problems
+    on arm* and mips*).
+  * New patch gcc-ice-hack (saving the preprocessed source on an ICE),
+    taken from Fedora.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 20 Feb 2006 10:07:23 +0100
+
+gcc-4.1 (4.1ds8-0exp8) experimental; urgency=low
+
+  * Update to SVN 20060212, taken from the 4.1 release branch.
+  * libgccN: Fix upgrade of /usr/share/doc/libgccN symlink.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 12 Feb 2006 19:48:31 +0000
+
+gcc-4.1 (4.1ds7-0exp7) experimental; urgency=low
+
+  * Update to SVN 20060127, taken from the 4.1 release branch.
+    - On hppa, bump the libgcc soversion to 4.
+  * Add an option not to depend on the system -base package for cross compiler
+    (Ian Wienand). Closes: #347484.
+  * Remove workaround increasing the stack size limit for some architectures,
+    not needed anymore on ia64.
+  * On amd64, build-depend on libc6-dev-i386, depend on libc6-i386, where
+    available.
+  * libstdc++6: Properly upgrade the doc directory. Closes: #346171.
+  * libstdc++6: Add a conflict to scim (<< 1.4.2-1). Closes: #343313.
+  * Set default 32bit ix86 architecture to i486.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 27 Jan 2006 22:23:22 +0100
+
+gcc-4.1 (4.1ds6-0ubuntu6) experimental; urgency=low
+
+  * Update to SVN 20060107, taken from the 4.1 release branch.
+    - Remove fix for PR ada/22533, fixed by patch for PR c++/23171.
+  * Remove binary packages from the control file, which aren't built
+    yet on any architecture.
+  * gcc-hppa64: Use /usr/hppa64-linux-gnu/include as location for the glibc
+    headers, tighten glibc (build-)dependency.
+  * libffi [arm]: Add support for closures, libjava [arm]: enable the gij
+    interpreter (Phil Blundell). Addresses: #337263.
+  * For the gcj standalone build, include cc1 into the gcj-4.1 package,
+    needed for linking java programs compiled to native code.
+
+ -- Matthias Klose <doko@debian.org>  Sat,  7 Jan 2006 03:36:33 +0100
+
+gcc-4.1 (4.1ds4-0exp4) experimental; urgency=low
+
+  * Update to SVN 20051210, taken from the 4.1 release branch.
+  * Prepare to build the java packages from it's own source (merged
+    from Ubuntu).
+    - Build the java packages from the gcc-4.1 source, as long as packages
+      are prepared for experimental.
+    - When built as gcj, run only the libjava testsuite, don't build the
+      libstdc++ debug packages, don't package the gcc source.
+    - Loosen package dependencies, when java packages are built from
+      separate sources.
+    - Fix gcj hppa build, when java packages are built from separate sources.
+    - gij-4.1: Install test-summary, when doing separate builds.
+    - Allow java packages be installed independent from other packages built
+      from the source package.
+    - Rename libgcj7-common to libgcj7-jar.
+    - Introduce a gcj-4.1-base package to completely separate the two and not
+      duplicate the changelog in each gcj/gij package.
+  * Java related changes:
+    - libjava-xml-transform: Update from classpath trunk, needed for
+      eclipse (Michael Koch), applied upstream.
+    - Fix java wrapper scripts to point to 4.1 (closes: #341710).
+    - Reenable java on mips and mipsel.
+    - Fix libgcj6 dependency. Ubuntu #19935.
+    - Add libxt-dev as a java build dependency. autoconf explicitely checks
+      for X11/Intrinsic.h.
+  * Ada related changes:
+    - Apply proposed fix for PR ada/22533, reenable ada on alpha, powerpc,
+      mips, mipsel and s390.
+    - Add Ada support for GNU/kFreeBSD (Aurelien Jarno). Closes: #341356.
+    - Remove ada bootstrap workaround for alpha.
+  * Build a separate gcc-4.1-source package (Bastian Blank). Closes: #333922.
+  * Remove obsolete patch: libstdc++-automake.
+  * Remove patch integrated upstream: libffi-mips.
+  * Fix the installation of the hppa64 compiler in snapshot builds.
+  * Rename libgfortran0* to libgfortran1* (upstream soversion change).
+  * Add a dependency on libc-dev for all compilers / -dev packages except
+    gcc (which can be used for kernel builds without libc-dev).
+  * libffi4-dev: Fix package description.
+  * On amd64, install 32bit libraries into /emul/ia32-linux/usr/lib.
+    Addresses: #341147.
+  * Fix installation of biarch libstdc++ headers on amd64.
+  * Configure --with-tune=i686 on ix86 architectures (on Ubuntu with
+    -mtune=pentium4). Remove the cpu-default-* patches.
+  * debian/control.m4: Fix libxxgcc package names.
+  * Update the build infrastructure to build cross compilers
+    (Nikita V. Youshchenko).
+  * Tighten binutils (build-)dependency. Closes: #342484.
+  * Symlink more doc directories.
+  * debian/control.m4: Explicitely set Architecture for biarch packages.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 10 Dec 2005 16:56:45 +0100
+
+gcc-4.1 (4.1ds1-0ubuntu1) UNRELEASED; urgency=low
+
+  * Build Java packages only.
+  * Update to SVN 20051121, taken from the 4.1 release branch.
+    - Remove libjava-saxdriver-fix patch, applied upstream.
+    - Remove ada-gnat-version patch, applied upstream.
+  * Fix FTBFS in biarch builds on 32bit kernels.
+  * Update libstdc++-doc doc-base file (closes: #339046).
+  * Remove obsolete patch: gcc-alpha-ada_fix.
+  * Fix installation of biarch libstdc++ headers (Ubuntu #19655).
+  * Fix sparc and s390 biarch patches to build the 64bit libffi.
+  * Work around biarch build failure in libjava/classpath/native/jni/midi-alsa.
+  * Install spe.h header on powerpc.
+  * Add libasound build dependencies.
+  * libgcj: Fix installation of libgjsmalsa library.
+  * Remove patches not used anymore: libjava-no-rpath, i386-config-ml-nomf,
+    libobjc, multiarch-include, disable-biarch-check-mf, gpc-profiled,
+    gpc-no-gpidump, libgpc-shared, acats-expect.
+  * Fix references to manuals in gnat(1). Ubuntu #19772.
+  * Remove build dependency on xlibs-dev, add libxtst-dev.
+  * Do not configure with --disable-werror.
+  * Merge *-config-ml patches into one config-ml patch, configure the biarch
+    libs in debian/rules.defs.
+  * debian/gcj-wrapper: Accept -Xss.
+  * Do not build biarch java on Debian (missing biarch libasound).
+  * Do not build the java packages from this source package, avoiding
+    dependencies on X.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 21 Nov 2005 20:29:43 +0100
+
+gcc-4.1 (4.1ds0-0exp0) experimental; urgency=low
+
+  * Configure libstdc++ using the default allocator.
+  * Update to 20051112, taken from the svn trunk.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 12 Nov 2005 23:47:01 +0100
+
+gcc-4.1 (4.1ds0-0ubuntu0) breezy; urgency=low
+
+  * UNRELEASED
+  * First snapshot of gcc-4.1 (CVS 20051019).
+    - adds SSP support (closes: #213994, #233208).
+  * Remove patches applied upstream/not needed anymore.
+  * Update patches for 4.1: link-libs, gcc-textdomain, libjava-dlsearch-path,
+    rename-info-files, reporting, classmap-path, i386-biarch, sparc-biarch,
+    libjava-biarch-awt, ada-gcc-name.
+  * Disable patches:
+    - 323016, m68k, necessary for 4.1?
+  * debian/copyright: Update for 4.1.
+  * debian/control, debian/control.m4, debian/rules.defs, debian/rules.conf:
+    Update for 4.1, add support for Obj-C++ and SSP.
+  * Fix generation of Ada docs in info format.
+  * Set Ada library version to 4.1.
+  * Drop gnat-3.3 as an alternative build dependency.
+  * Use fortran instead of f95 for the build files.
+  * Update build support for awt peer libs.
+  * Add packaging support for SSP library.
+  * Add packaging support for Obj-C++.
+  * Run the testsuite for -march=i686 on i386 and amd64 as well.
+  * Fix generation of Pascal docs in html format.
+  * Update config-ml patches to build libssp biarch.
+  * Disable libssp for hppa64 build.
+  * libgcj7-dev: Install jni_md.h.
+  * Disable gnat for powerpc, currently fails to build.
+  * Add biarch runtime lib packages for ssp, mudflap, ffi.
+  * Do not explicitely configure with --enable-java-gc=boehm, which is the
+    default.
+  * libjava-saxdriver-fix: Fix a problem in the Aelfred2 SAX parser.
+  * libstdc++6-4.0-dev: Depend on the libc-dev package. Ubuntu #18885.
+  * Build-depend on expect-tcl8.3 on all architectures.
+  * Build-depend on lib32z1-dev on amd64 and ppc64, drop build dependency on
+    amd64-libs.
+  * Disable ada on alpha mips mipsel powerpc s390, currently broken.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 19 Oct 2005 11:02:31 +0200
+
+gcc-4.0 (4.0.2-3) unstable; urgency=low
+
+  * Update to CVS 20051015, taken from the gcc-4_0-branch.
+    - gcc man page fixes (closes: #327254, #330099).
+    - PR java/19870, PR java/20338, PR java/21844, PR java/21540:
+      Remove Debian patches.
+    - Applied libjava-echo-fix patch.
+    - Fix PR target/24284, ICE (Segmentation fault) on sparc-linux.
+      Closes: #329840.
+    - Fix PR c++/23797, ICE on typename outside template. Closes: #325545.
+    - Fix PR c++/22551, ICE in tree_low_cst. Closes: #318932.
+  * libstdc++6: Tighten libstdc++ shlibs version to 4.0.2-3 (new symbol).
+  * Update generated Ada files.
+  * Fix logic to disable mudflap and Obj-C++ via the environment.
+  * Remove f77 build bits.
+  * gij-4.0: Remove /var/lib/gcj-4.0/classmap.db on purge (closes: #330800).
+  * Let gcj-4.0 depend on libgcj6-dev, instead of recommending it. This is
+    not necessary for byte-code compilations, but for compilations to native
+    code. For compilations to byte-code, use a better compiler like ecj
+    for now (found in the ecj-bootstrap package).
+  * Disable biarch setup in cross compilers (Josh Triplett). Closes: #333952.
+  * Fix with_libnof logic for cross-compilations (Josh Triplett).
+    Closes: #333951.
+  * Depend on binutils (>= 2.16.1cvs20050902-1) on the alpha architecture.
+    Closes: #333954.
+  * On i386, build-depend on libc6-dev-amd64. Closes: #329108.
+  * (Build-)depend on glibc 2.3.5-5.
+
+ -- Matthias Klose <doko@debian.org>  Sun,  2 Oct 2005 14:25:54 +0200
+
+gcc-4.0 (4.0.2-2) unstable; urgency=low
+
+  * Update to CVS 20051001, taken from the gcc-4_0-branch. Includes the
+    changes between 4.0.2 RC3 and the final 4.0.2 release, missing from
+    the upstream tarball. Remove patches applied upstream (gcc-c-decl,
+    pr23182, pr23043, pr23367, pr23891, pr21418, pr24018).
+  * On ix86 architectures run the testsuite for -march=i686 as well.
+  * Build libffi on the Hurd (closes: #328705).
+  * Add big-endian arm (armeb) support (Lennert Buytenhek). Closes: #330730.
+  * Update libjava xml to classpath CVS HEAD 20050930 (Michael Koch).
+  * Reapply patch to make -mieee the default on alpha-linux. Closes: #330826.
+  * Add workaround not to make libmudflap _start/_end not small data on
+    mips/mipsel, taken from CVS HEAD.
+  * Don't build the nof libraries on powerpc.
+  * Number crunching time on m68k, reenable gfortran on m68k-linux-gnu.
+
+ -- Matthias Klose <doko@debian.org>  Sat,  1 Oct 2005 15:42:10 +0200
+
+gcc-4.0 (4.0.2-1) unstable; urgency=low
+
+  * GCC 4.0.2 release.
+  * lib64stdc++6: Set priority to optional.
+  * Fix bug in StreamSerializer, seen with eclipse-3.1 (Ubuntu 12744).
+    Backport from CVS HEAD, Michael Koch.
+  * Apply java patches, proposed for the 4.0 branch: PR java/24018,
+    PR libgcj/23182, PR java/19870, PR java/21844, PR libgcj/23367,
+    PR java/20338.
+  * Update the expect/pty test to actually call expect directly, rather
+    than test for the existence of PTYs, since a working expect is what
+    we really care about, not random device files (Adam Conrad).
+    Closes: #329715.
+  * Add build dependencies on lib64z1-dev.
+  * gcc-c-decl.dpatch: Fix C global decl handling regression in 4.0.2 from
+    4.0.1
+
+ -- Matthias Klose <doko@debian.org>  Thu, 29 Sep 2005 19:50:08 +0200
+
+gcc-4.0 (4.0.1-9) unstable; urgency=low
+
+  * Update to CVS 20050922, taken from the gcc-4_0-branch (4.0.2 RC3).
+  * Apply patches:
+    - Fix PR java/21418: Order of source files matters when compiling,
+      backported from mainline.
+    - Fix for PR 23043, backported form mainline.
+    - Proposed patch for #323016 (m68k only). Patch by Roman Zippel.
+  * libstdc++6: Tighten libstdc++ shlibs version to 4.0.1-9 (new symbol).
+  * Fail the build early, if the system doesn't have any pty devices
+    created in /dev. Needed for running the testsuite.
+  * Update hurd changes again (closes: #328973).
+
+ -- Matthias Klose <doko@debian.org>  Thu, 22 Sep 2005 07:28:18 +0200
+
+gcc-4.0 (4.0.1-8) unstable; urgency=medium
+
+  * Update to CVS 20050917, taken from the gcc-4_0-branch.
+    - Fix FTBFS for boost, introduced in 4.0.1-7 (closes: #328684).
+  * Fix PR java/23891, eclipse bootstrap.
+  * Set priority of gcc-4.0-hppa64 package to standard.
+  * Bump standards version to 3.6.2.
+  * Fix java wrapper script, mishandles command line options with arguments.
+    Patch from Olly Betts. Closes: #296456.
+  * Bump epoch of the lib32gcc1 package to the same epoch as for the the
+    libgcc1 and lib64gcc1 packages.
+  * Fix some lintian warnings.
+  * Build libffi on the Hurd (closes: #328705).
+  * For biarch builds, disable the testsuite for the non-default architecture
+    for runtime libraries, which are not built by default (libjava).
+  * Add gsfonts-x11 to Build-Depends-Indep to avoid warnings from doxygen.
+  * Install Ada .ali files read-only.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 17 Sep 2005 10:35:23 +0200
+
+gcc-4.0 (4.0.1-7) unstable; urgency=low
+
+  * Update to CVS 20050913, taken from the gcc-4_0-branch.
+    - Fix PR c++/19004, ICE in uses_template_parms (closes: #284777).
+    - Fix PR rtl-optimization/23454, ICE in invert_exp_1 on sparc.
+      Closes: #321215.
+    - Fix PR libstdc++/23417, make bits/stl_{list,tree}.h -Weffc++ clean.
+      Closes: ##322170.
+  * Install 'altivec.h' on ppc64 (closes: #323945).
+  * Install locale data with the versioned package name (closes: #321591).
+  * Fix fastjar build without building libjava.
+  * On hppa, don't build using gcc-3.3 when ada is disabled.
+  * On m68k, don't build the stage1 compiler using -O.
+
+  * Ludovic Brenta <ludovic@ludovic-brenta.org>
+    - Allow the choice whether or not to build with NLS.
+    - Fix a typo whereby libffi was always enabled on i386.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 13 Sep 2005 23:23:11 +0200
+
+gcc-4.0 (4.0.1-6) unstable; urgency=low
+
+  * Update to CVS 20050821, taken from the gcc-4_0-branch.
+    - debian/patches/pr21562.dpatch: Removed, applied upstream.
+    - debian/patches/libjava-awt-name.dpatch: Updated.
+    - debian/patches/classpath-20050618.dpatch: Updated.
+  * Use all available CPU's for the check target, unless USE_NJOBS == no.
+  * debian/patches/biarch-include.dpatch: Include
+    /usr/local/include/<arch>-linux-gnu before including /usr/local/include.
+  * Fix biarch system include directories for the non-default architecture.
+  * Prefer gnat-4.0 over gnat-3.4 over gnat-3.3 as a build-dependency.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 18 Aug 2005 18:36:23 +0200
+
+gcc-4.0 (4.0.1-5) unstable; urgency=low
+
+  * Update to CVS 20050816, taken from the gcc-4_0-branch.
+    - Fix PR middle-end/23369, wrong code generation for funcptr comparison
+      on hppa. Closes: #321785.
+    - Fix PR fortran/23368 ICE with NAG routines (closes: #322912).
+  * Build-depend on libcairo2-dev (they say, that's the final package name ...)
+  * libgcj: Search /usr/lib/gcj-4.0 for dlopened libraries, place a copy
+    of the .la files in the libgcj6 package into this directory.
+    Closes: #322576.
+  * Tighten the dependencies between the compiler packages to the same
+    version and release. Use some substitution variables for control file
+    generation.
+  * Remove build dependencies for gpc.
+  * Don't use '/emul/ia32-linux' on ppc64 (closes: #322890).
+  * Synchronize with Ubuntu.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 16 Aug 2005 22:45:47 +0200
+
+gcc-4.0 (4.0.1-4ubuntu1) breezy; urgency=low
+
+  * Jeff Bailey <jbailey@ubuntu.com>
+
+    Enable i386 biarch using biarch glibc (not yet enabled for unstable).
+    - debian/rules.d/binary-libgcc.mk: Make i386 lib64gcc1 depend on
+      libc6-amd64
+    - debian/control.m4: Suggest libc6-amd64 rather than amd64-libs.
+    - debian/rules.conf: Build-Dep on libc6-dev-amd64 [i386]
+      Build-Dep on binutils >= 2.16.1-2ubuntu3
+    - debian/rules2: Enable biarch build in Ubuntu.
+
+  * Matthias Klose <doko@ubuntu.com>
+
+    - Add shlibs file and dependency information for the lib32gcc1 package.
+    - debian/patches/gcc-textdomain.dpatch: Update (closes: #321591).
+    - Set priority of gcc-4.0-base and libstdc++6 packages to `required'.
+      Closes: #321016.
+    - libffi-hppa.dpatch: Remove, applied upstream.
+
+ -- Matthias Klose <doko@debian.org>  Mon,  8 Aug 2005 19:39:02 +0200
+
+gcc-4.0 (4.0.1-4) unstable; urgency=low
+
+  * Enable the biarch compiler for powerpc (closes: #268023).
+  * Update to CVS 20050806, taken from the gcc-4_0-branch.
+  * Build depend on libcairo0.6.0-dev (closes: #321540).
+  * Fix Ada build on the hurd (closes: #321350).
+  * Update libffi for mips (Thiemo Seufer). Closes: #321100.
+  * Fix segfault on 64bit archs in the AWT Gtk peer library (Dan Frazier).
+    Closes: #320915.
+  * Add libXXgcc1 build dependencies for biarch builds.
+
+ -- Matthias Klose <doko@debian.org>  Sun,  7 Aug 2005 07:01:59 +0000
+
+gcc-4.0 (4.0.1-3) unstable; urgency=medium
+
+  * Update to CVS 20050725, taken from the gcc-4_0-branch.
+    - Fix ICE with -O and -mno-ieee-fp/-ffast-math (closes: #319087).
+  * Synchronize with Ubuntu.
+  * Fix applying hurd specific patches for the hurd build (closes: #318443).
+  * Do not build-depend on libmpfr-dev on architectures, where fortran
+    is not built.
+  * Apply biarch include patch on ppc64 as well (closes: #318603).
+  * Correct libstdc++-dev package description (closes: #319082).
+  * debian/rules.defs: Replace DEB_TARGET_GNU_CPU with DEB_TARGET_ARCH_CPU.
+  * gcc-4.0-hppa64: Rename hppa64-linux-gcc to hppa64-linux-gnu-gcc.
+    Closes: #319818.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 25 Jul 2005 10:43:06 +0200
+
+gcc-4.0 (4.0.1-2ubuntu3) breezy; urgency=low
+
+  * Update to CVS 20050720, taken from the gcc-4_0-branch.
+    - Fix PR22278, volatile issues, seen when building xorg.
+  * Build against new libcairo1-dev (0.5.2).
+
+ -- Matthias Klose <doko@debian.org>  Wed, 20 Jul 2005 12:29:50 +0200
+
+gcc-4.0 (4.0.1-2ubuntu2) breezy; urgency=low
+
+  * Acknowledge that i386 biarch builds still need to be fixed for glibc-2.3.5.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 19 Jul 2005 08:29:30 +0000
+
+gcc-4.0 (4.0.1-2ubuntu1) breezy; urgency=low
+
+  * Synchronize with Debian.
+  * Update to CVS 20050718, taken from the gcc-4_0-branch.
+    - Fix PR c++/22132 (closes: #318488), upcasting a const class pointer
+      to struct the class derives from generates wrong code.
+  * Build biarch runtime libraries for Fortran and ObjC.
+  * Apply proposed patch for PR22309 (crash with mt_allocator if libstdc++
+    is dlclosed). Closes: #293466.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 18 Jul 2005 17:10:18 +0200
+
+gcc-4.0 (4.0.1-2) unstable; urgency=low
+
+  * Don't apply the patch to make -mieee the default on alpha-linux-gnu.
+    Causes the bootstrap to fail on alpha-linux-gnu.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 12 Jul 2005 00:14:12 +0200
+
+gcc-4.0 (4.0.1-1) unstable; urgency=high
+
+  * GCC 4.0.1 final release.  See /usr/share/doc/gcc-4.0/NEWS.{gcc,html}.
+  * Build fastjar on mips/mipsel, fix fastjar build without building java.
+  * Disable the comparision check on unstable/ia64. adaint.o differs,
+    currently cannot be reproduced with glibc-2.3.5 and binutils-2.16.1.
+  * libffi/hppa: Fix handling of 3 and 5-7 byte struct returns.
+  * amd64: Fix libgcc symlinks to point to /usr/lib32, instead of /lib32.
+  * On powerpc, don't build with -j >1, apparently doesn't succeeds
+    on the Debian buildd.
+  * Apply revised patch to make -mieee the default on alpha-linux,
+    and add -mieee-disable switch to turn the default off (Tyson Whitehead).
+  * Disable multiarch-includes; redo biarch-includes to include the paths
+    for the non-default biarch, when called with -m32/-m64.
+  * Move new java headers from libstdc++-dev to libgcj-dev, add replaces
+    line.
+  * Update classpath patch to work with cairo-0.5.1. Patch provided by
+    Michael Koch.
+  * Further classpath updates for gnu.xml and javax.swing.text.html.
+    Patch provided by Michael Koch.
+  * Require binutils (>= 2.16.1) as a build dependency and a dependency.
+  * On i386, require amd64-libs-dev (>= 1.2).
+  * Update debian/NEWS.{html,gcc}.
+
+  * Closing bug reports reported against older gcc versions (some of them
+    still present in Debian, but not anymore as the default compiler).
+    Usually, forwarded bug reports are linked to
+        http://gcc.gnu.org/PR<upstream bug number>
+    The upstream bug number usually can be found in the Debian reports.
+
+  * Closed reports reported against gcc-3.3 and fixed in gcc-3.4:
+    - General:
+      + PR rtl-optimization/2960: Duplicate loop conditions even with -Os
+        Closes: #94701.
+      + PR optimization/3995: i386 optimisation: joining tests.
+        Closes: #105309.
+      + PR rtl-optimization/11635: Unnecessary store onto stack, more
+        curefully expand union cast (closes: #202016).
+      + PR target/7618: vararg disallowed in virtual function. Closes: #205404.
+      + Large array problem on 64 bit platforms (closes: #209152).
+      + Mark more strings as translatable (closes: #227129).
+      + PR gcc/14711: ICE when compiling a huge source file Closes: #234711.
+      + Better code generation for if(!p) return NULL;return p;
+        Closes: #242318.
+      + PR rtl-optimization/16152: Perl ftbfs on {ia64,arm,m68k}-linux.
+        Closes: #255801.
+      + ICE (segfault) while compiling Linux 2.6.9 (closes: #277206).
+      + Link error building memtest (closes: #281445).
+    - Ada:
+      + PR ada/12450: Constraint error for valid input (closes: #210844).
+      + PR ada/13620: miscompilation of array initializer with
+        -O3 -fprofile-arcs. Closes: #226244.
+    - C:
+      + PR c/6897: Code produced with -fPIC reserves EBX, but compiles
+        bad __asm__ anyway (closes: #73065).
+      + PR c/9209: On i386, gcc-3.0 allows $ in indentifiers but not the asm.
+        Closes: #121282.
+      + PR c/11943: Accepts invalid declaration "int x[2, 3];" in C99 mode.
+        Closes: #177303.
+      + PR c/11942: restrict keyword broken in C99 mode. Closes: #187091.
+      + PR other/11370: -Wunreachable-code gives false complaints.
+        Closes: #196600.
+      + PR c/11369: Too relaxed checking with -Wstrict-prototypes.
+        Closes: #197504.
+      + PR c/11445: False positive warning with -Wunreachable-code.
+        Closes: #200140.
+      + PR c/11459: -stdc=c90 -pedantic warns about C90's non long-long
+         support when in C99 mode. Closes: #200392.
+      + PR c/456: Handling of constant expressions. Closes: #225935.
+      + ICE on invalid #define with -traditional (closes: #242916).
+      + No warning when initializing a variable with itself, new option
+        -Winit-self (closes: #293957).
+    - C++:
+      + C++ parse error (closes: #42946).
+      + PR libstdc++/9073: Replacement for __STL_ASSERTIONS (libstdc++v3
+        debug mode). Closes: #128993.
+      + Parse errors in nested constructor calls (closes: #138561).
+      + PR optimization/1823: -ftrapv aborts with pointer difference due to
+        division optimization. Closes: #169862.
+      + ICE on invalid code (closes: #176101).
+      + PR c++/10199: ICE handling method parametrized by template.
+        Closes: #185604.
+      + High memory usage building packages OpenOffice.org and MythTV.
+        Closes: #194345, #194513.
+      + Improved documentation of std::lower_bound (closes: #196380).
+      + ICE in regenerate_decl_from_template (closes: #197674).
+      + PR c++/11444: Function fails to propagate up class tree
+        (template-related).  Closes: #198042.
+      + ICE when using namespaced typedef of primitive type as struct.
+        Closes: #198261.
+      + Bug using streambuf / iostream to read from a named pipe.
+        Closes: #216105.
+      + PR c++/11437: ICE in lookup_name_real (closes: #200011).
+      + Add large file support (LFS) in libstdc++ (closes: #220000).
+      + PR c++/13621: ICE compiling a statement expression returning type
+        string (closes: #224413).
+      + g++ doesn't find inherited inner class after template instantiation.
+        Closes: #227518.
+      + PR libstdc++/13928: Add whatis info in man pages generated by doxygen.
+        Closes: #229642.
+      + Missing symbol _M_setstate in libstdc++ (closes: #232709).
+      + Unable to parse declaration of inline constructor explicit
+        specialization (closes: #234709).
+      + ICE (segfault) on invalid C++ code (closes: #246031).
+      + ICE in lookup_tempate_function (closes: #262441).
+      + Undefined symbols in libstdc++, when using specials char_traits.
+        Closes: #266110.
+      + PR libstdc++/16011: Outputting numbers with ostream in the locale fr_BE
+        causes infinite recursion (closes: #270795).
+      + ICE in tree_low_cst (closes: #276291).
+      + ICE in in expand_call (closes: #283503).
+      + typeof operator is misparsed in a template function (closes: #288555).
+      + ICE in tree_low_cs (closes: #291374).
+      + Improve uninformative error messages (closes: #292961, #293076).
+      + ICE on array initialization (closes: #294560).
+      + Failure to build xine-lib with -finline-functions (closes: #306854).
+    - Java:
+      + Fix error finding files in subdirectories (closes: #195480).
+      + Implement java.text.CollationElementIterator lacks getOffset().
+        Closes: #259789.
+    - Treelang:
+      + Pointer truncation on 64bit architectures (closes: #308367).
+    - Architecture specific:
+      - alpha
+        + PR debug/10695: ICE on alpha while building agistudio.
+          Closes: #192568.
+        + ICE when building fceu (closes: #228018, #252764).
+      - amd64
+        + Miscompilation of Objective-C code (closes: #250174).
+        + g++ hangs compiling k3d on amd64 (closes: #285364).
+      - arm
+        + PR target/19008: gcc -O3 -fPIC produces wrong code via auto inlining.
+          Closes: #285238.
+      - i386
+        + PR target/4106: i386 -fPIC asm ebx clobber no error.
+          Closes: #153472.
+        + PR target/10984: x86/sse2 ICEs on vector intrinsics. Closes: #166940.
+        + Wrong code generation on at least ix86 (closes: #275655).
+      - m68k
+        + PR target/9201: ICE compiling octave-2.1 (closes: #175478).
+        + ICE in verify_initial_elim_offsets (closes: #204407, #257012).
+        + g77 generates invalid assembly code (closes: #225621).
+        + ICE in verify_local_live_at_start (closes #245584).
+      - powerpc
+        + PR optimization/12828: -floop-optimize is unstable on PowerPC (float
+          to int conversion problem). Closes: #218219.
+        + PR target/13619: ICE building altivec code in ffmpeg.
+          Closes: #226148.
+        + PR target/20046: Miscompilation of bind 9.3.0. Closes: #292958.
+      - sparc
+        + ICE (segfault) while building atlas3 on sparc32 (closes: #249108).
+        + Wrong optimization on sparc32 when building linux kernel.
+          Closes: #254626.
+
+  * Closed reports reported against gcc-3.3 or gcc-3.4 and fixed in gcc-4.0:
+    - General:
+      + PR rtl-optimization/6901: Optimizer improvement (removing unused
+        local variables). Closes: #67206.
+      + PR middle-end/179: Failure to detect use of unitialized variable
+        with -O -Wall. Closes: #117765.
+      + ICE building glibc's nptl on amd64 (closes: #260710, #307993).
+      + PR middle-end/17827: ICE in make_decl_rtl. Closes: #270854.
+      + PR middle-end/21709: ICE on compile-time complex NaN. Closes: #305344.
+    - Ada:
+      + PR ada/10889: Convention Fortran matrices mishandled in generics.
+        Closes: #192135.
+      + PR ada/13897: Implement tasking on powerpc. Closes: #225346.
+    - C:
+      + PR c/13072: Bogus warning with VLA in switch. Closes: #218803.
+      + PR c/13519: typeof(nonconst+const) is const. Closes: #208981.
+      + PR c/12867: Incorrect warning message (void format, should be void*
+        format). Closes: #217360.
+      + PR c/16066: PR 16066] i386 loop strength reduction bug.
+        Closes: #254659.
+    - C++:
+      + PR c++/13518: -Wnon-virtual-dtor doesn't always work. Closes: #212260.
+      + PR translation/16025: ICE with unsupported locale(closes: #242158).
+      + PR c++/15125: -Wformat doesn't warn for different types in fprintf.
+        Closes: #243507.
+      + PR c++/15214: Warn only if the dtor is non-private or the class has
+        friends. (closes: #246639).
+      + PR libstdc++/17218: Unknown subjects in generated libstdc++ manpages.
+        Closes: #262934.
+      + PR libstdc++/17223: Missing .so references in generated libstdc++
+        manpages. Closes: #262956.
+      + libstdc++-doc: Improve man pages (closes: #280910).
+      + PR c++/19006: ICE in tree_low_cst. Closes: #285692.
+      + g++ does not check arguments to fprintf. Closes: #281847.
+    - Java:
+      + PR java/7304: gcj ICE (closes: #152501).
+      + PR libgcj/7305: Installation of headers not directly in /usr/include.
+        Closes: #195483.
+      + PR libgcj/11941: libgcj timezone handling (closes: #203212).
+      + PR java/14709: gcj fails to wait for its child processes on exec().
+        Closes: #238432.
+      + PR libgcj/21703: gcj hangs when rapidly calling String.intern().
+        Closes: #275547.
+      + SocketChannel.get(ByteBuffer) returns 0 at EOF. Closes: #281602.
+      + PR java/19711: gcj segfaults instead of reporting the ambiguous
+        expression. Closes: #286715.
+      + Static libgcj contains repeated archive members (closes: #298263).
+    - Architecture specific:
+      - alpha
+        + Unaligned accesses with ?-operator (closes: #301983).
+      - arm
+        + Compilation error of glibc-2.3.4 on arm (closes: #298508).
+      - m68k
+        + ICE in add_insn_before (closes: #248432).
+      - mips
+        + Fix o32 ABI breakage in gcc 3.3/3.4 (closes: #270620).
+      - powerpc
+        + ICE in extract_insn (closes: #311128).
+
+  * Closing bug reports as wontfix:
+    - g++ defines _GNU_SOURCE when using the libstdc++ header files.
+      Behaviour did change since 3.0. Closes: #126703, #164872.
+
+ -- Matthias Klose <doko@debian.org>  Sat,  9 Jul 2005 17:10:54 +0000
+
+gcc-4.0 (4.0.0ds2-12) unstable; urgency=high
+
+  * Update to CVS 20050701, taken from the gcc-4_0-branch.
+  * Apply proposed patch for MMAP configure fix; aka PR 19877. Backport
+    from mainline.
+  * Disable Fortran on m68k. Currently FTBFS.
+  * Split multiarch-include/lib patches. Update multiarch-include patch.
+  * Fix FTBFS of the hppa64-linux cross compiler. Don't add the
+    multiarch include dirs when cross compiling.
+  * Configure --with-java-home, as used by java-gcj-compat.
+    Closes: #315646.
+  * Make libgcj-dbg packages priority extra.
+  * Set the path of classmap.db to /var/lib/gcj-@gcc_version@.
+  * On m68k, do not create the default classmap.db in the gcj postinst.
+    See #312830.
+  * On amd64, install the 32bit libraries into /emul/ia32-linux/usr/lib.
+    Restore the /usr/lib32 symlink.
+  * On amd64, don't reference lib64, but instead lib (lib64 is a symlink
+    to lib). Closes: #293050.
+  * Remove references to build directories from the .la files.
+  * Make cpp-X.Y conflict with earlier versions of gcc-X.Y, g++-X.Y, gobjc-X.Y,
+    gcj-X.Y, gfortran-X.Y, gnat-X.Y, treelang-X.Y, if a path component in
+    the gcc library path changes (i.e. version or target alias).
+  * Disable Ada for sh3 sh3eb sh4 sh4eb.
+  * For gcj-4.0, add a conflict to libgcj4-dev and libgcj5-dev.
+    Closes: #316499.
+
+ -- Matthias Klose <doko@debian.org>  Sat,  2 Jul 2005 11:04:35 +0200
+
+gcc-4.0 (4.0.0ds1-11) unstable; urgency=low
+
+  * debian/rules.defs: Disable Ada for alpha.
+  * debian/rules.conf: Fix typo in type-handling replacement code.
+  * Don't ship an empty libgcj6-dbg package.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 23 Jun 2005 09:03:21 +0200
+
+gcc-4.0 (4.0.0ds1-10) unstable; urgency=medium
+
+  * debian/patches/libstdc++-api-compat.dpatch: Apply proposed patch
+    to fix libstdc++ 3.4.5/4.0 compatibility.
+  * type-handling output became insane. Don't use it anymore.
+  * Drop the reference to the stl-manual package (closes: #314983).
+  * Disable java on GNU/kFreeBSD targets, requested by Robert Millan.
+    Closes: #315140.
+  * Terminate the acats-killer process, even if the build is aborted
+    by the user (closes: #314405).
+  * debian/rules.defs: Define DEB_TARGET_ARCH_{OS,CPU}.
+  * Start converting the use of DEB_*_GNU_* to DEB_*_ARCH_* in the build
+    files.
+  * Do not configure with --enable-gtk-cairo. Needs newer gtk. Drop
+    build dependency on libcairo-dev.
+  * Fix setting of the system header directory for the hurd (Michael Banck).
+    Closes: #315386.
+  * Fix FTBFS on hurd-i386: MAXPATHLEN issue (Michael Banck). Closes: #315384.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 22 Jun 2005 19:45:50 +0200
+
+gcc-4.0 (4.0.0ds1-9ubuntu2) breezy; urgency=low
+
+  * Fix version number in libgcj shlibs file.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sun, 19 Jun 2005 10:34:02 +0200
+
+gcc-4.0 (4.0.0ds1-9ubuntu1) breezy; urgency=low
+
+  * Update to 4.0.1, release candidate 2.
+  * libstdc++ shlibs file: Require 4.0.0ds1-9ubuntu1 as minimum version.
+  * Rename libawt to libgcjawt to avoid conflicts with other
+    libawt implementations (backport from HEAD).
+  * Update classpath awt, swing and xml parser for HTML support in swing.
+    Taken from classpath CVS HEAD 2005-06-18. Patch provided by Michael Koch.
+  * Remove the libgcj-buffer-strategy path, part of the classpath update.
+  * libgcj shlibs file: Require 4.0.0ds1-9ubuntu1 as minimum version.
+  * Require cairo-0.5 as build dependency.
+  * gij-4.0: Provide java1-runtime.
+  * gij-4.0: Provide an rmiregistry alternative (using grmiregistry-4.0).
+  * gcj-4.0: Provide an rmic alternative (using grmic-4.0).
+  * libgcj6-dev conflicts with libgcj5-dev, libgcj4-dev, not libgcj6.
+    Closes: #312741.
+  * libmudflap-entry-point.dpatch: Correct name of entry point on mips/mipsel.
+  * Apply proposed patch for PR 18421 and PR 18719 (m68k only).
+  * Apply proposed path for PR 21562.
+  * Add build dependency on dpkg (>= 1.13.7).
+  * On linux systems, configure for <cpu>-linux-gnu.
+  * Configure the hppa64 cross compiler to target hppa64-linux-gnu.
+  * (Build-)depend on binutils-2.16.1.
+  * libstdc{32,64}++6-4.0-dbg: Depend on libstdc++6-4.0-dev.
+  * gnat-4.0: only depend on libgnat, when a shared libgnat is built.
+  * gfortran-4.0: Depend on libgmp3c2 | libgmp3.
+  * On hppa, explicitely use gcc-3.3 as a build dependency in the case
+    that Ada is disabled.
+  * libmudflap: Always build the library for the non-default biarch
+    architecture, or else the test results show link failures.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat, 18 Jun 2005 00:42:55 +0000
+
+gcc-4.0 (4.0.0-9) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 25 May 2005 19:02:20 +0200
+
+gcc-4.0 (4.0.0-8ubuntu3) breezy; urgency=low
+
+  * debian/control: Regenerate.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat,  4 Jun 2005 10:56:27 +0200
+
+gcc-4.0 (4.0.0-8ubuntu2) breezy; urgency=low
+
+  * Fix powerpc-config-ml patch.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri,  3 Jun 2005 15:47:52 +0200
+
+gcc-4.0 (4.0.0-8ubuntu1) breezy; urgency=low
+
+  * powerpc biarch support:
+    - Enable powerpc biarch support, build lib64gcc1 on powerpc.
+    - Add patch to disable libstdc++'s configure checking, if it can't run
+      64bit binaries on 32bit kernels (Sven Luther).
+    - Apply the same patch to the other runtime librararies as well.
+    - Run the testsuite with -m64, if we can execute 64bit binaries.
+    - Add libc6-dev-ppc64 as build dependency for powerpc.
+  * 32bit gcj libs for amd64.
+  * debian/logwatch.sh: Don't remove logwatch pid file on exit (suggested
+    by Ryan Murray).
+  * Update to CVS 20050603, taken from the gcc-4_0-branch.
+  * g++-4.0 provides c++abi2-dev.
+  * Loosen dependencies on packages of architecture `all' to not break
+    binary only uploads.
+  * Build libgfortran for biarch as well, else the testsuite will fail.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri,  3 Jun 2005 13:38:19 +0200
+
+gcc-4.0 (4.0.0-8) experimental; urgency=low
+
+  * Synchronize with Ubuntu.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 23 May 2005 01:56:28 +0000
+
+gcc-4.0 (4.0.0-7ubuntu7) breezy; urgency=low
+
+  * Fix build failures for builds with disabled testsuite.
+  * Adjust debian/rules conditionals to work with all dpkg versions.
+  * Build separate lib32stdc6-4.0-dbg/lib64stdc6-4.0-dbg packages.
+  * Add the debugging symbols of the optimzed libstdc++ build in the
+    lib*stdc++6-dbg packages as well.
+  * Build a libgcj6-dbg package.
+  * Update to CVS 20050522, taken from the gcc-4_0-branch.
+  * Add Ada support for the ppc64 architecture (Andreas Jochens):
+    * debian/patches/ppc64-ada.dpatch
+      - Add gcc/ada/system-linux-ppc64.ads, which has been copied from
+        gcc/ada/system-linux-ppc.ads and changed to use 'Word_Size' 64
+        instead of 32.
+      - gcc/ada/Makefile.in: Use gcc/ada/system-linux-ppc64.ads on powerpc64.
+    * debian/rules.patch
+      - Use ppc64-ada patch on ppc64.
+    * debian/rules.d/binary-ada.mk
+      Place the symlinks libgnat.so, libgnat-4.0.so, libgnarl.so,
+      libgnarl-4.0.so in '/usr/lib' instead of '<gcc_lib_dir>/adalib'.
+    Closes: #308948.
+  * Add libc6-dev-i386 as an alternative build dependency for amd64.
+    Closes: #305690.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sun, 22 May 2005 22:14:20 +0200
+
+gcc-4.0 (4.0.0-7ubuntu6) breezy; urgency=low
+
+  * Don't trust dpkg-architecture (1.13.4), it "hurds" ...
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 18 May 2005 11:36:38 +0200
+
+gcc-4.0 (4.0.0-7ubuntu5) breezy; urgency=low
+
+  * libgcj6-dev: Don't provide libgcj-dev.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 18 May 2005 00:30:32 +0000
+
+gcc-4.0 (4.0.0-7ubuntu4) breezy; urgency=low
+
+  * Update to CVS 20050517, taken from the gcc-4_0-branch.
+  * Apply proposed patch for PR21293.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 17 May 2005 23:05:40 +0000
+
+gcc-4.0 (4.0.0-7ubuntu2) breezy; urgency=low
+
+  * Update to CVS 20050515, taken from the gcc-4_0-branch.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sun, 15 May 2005 23:48:00 +0200
+
+gcc-4.0 (4.0.0-7ubuntu1) breezy; urgency=low
+
+  * Synchronize with Debian.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon,  9 May 2005 19:35:29 +0200
+
+gcc-4.0 (4.0.0-7) experimental; urgency=low
+
+  * Update to CVS 20050509, taken from the gcc-4_0-branch.
+  * Remove the note from the fastjar package description, stating, that
+    fastjar is incomplete compared to the "standard" jar utility.
+  * Fix typo in build depends. dpkg-checkbuilddeps doesn't like a comma
+    inside [].
+  * Tighten shlibs dependencies to require the current version.
+
+ -- Matthias Klose <doko@debian.org>  Mon,  9 May 2005 19:02:03 +0200
+
+gcc-4.0 (4.0.0-6) experimental; urgency=low
+
+  * Update to CVS 20050508, taken from the gcc-4_0-branch.
+
+ -- Matthias Klose <doko@debian.org>  Sun,  8 May 2005 14:08:28 +0200
+
+gcc-4.0 (4.0.0-5ubuntu1) breezy; urgency=low
+
+  * Temporarily disable the i386 biarch build. Remove the amd64-libs-dev
+    build dependency, add (build-)conflict (<= 1.1ubuntu1).
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat,  7 May 2005 16:56:21 +0200
+
+gcc-4.0 (4.0.0-5) breezy; urgency=low
+
+  * gnat-3.3 and gnat-4.0 are alternative build dependencies (closes: #308002).
+  * Update to CVS 20050507, taken from the gcc-4_0-branch.
+  * gcj-4.0: Install gjnih.
+  * Add libgcj buffer strategy framework (Thomas Fitzsimmons), needed for OOo2.
+    Backport from 4.1.
+  * Fix all lintian errors and most of the warnings.
+
+ -- Matthias Klose <doko@ubuntu.com>  Sat,  7 May 2005 12:26:15 +0200
+
+gcc-4.0 (4.0.0-4) breezy; urgency=low
+
+  * Still prefer gnat-3.3 over gnat-4.0 as a build dependency.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri,  6 May 2005 22:30:43 +0200
+
+gcc-4.0 (4.0.0-3) breezy; urgency=low
+
+  * Update to CVS 20050506, taken from the gcc-4_0-branch.
+  * Update priority of java alternatives to 40.
+  * Move gcj-dbtool to gij package, move the default classmap.db to
+    /var/lib/gcj-4.0/classmap.db. Create it in the postinst.
+  * Fix gcc-4.0-hppa64 postinst (closes: #307762).
+  * Fix gcc-4.0-hppa64, gij-4.0 and gcj-4.0 postinst, to not ignore errors
+    from update-alternatives.
+  * Fix gcc-4.0-hppa64, fastjar, gij-4.0 and gcj-4.0 prerm,
+    to not ignore errors from update-alternatives.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri,  6 May 2005 17:50:58 +0200
+
+gcc-4.0 (4.0.0-2) experimental; urgency=low
+
+  * GCC 4.0.0 release.
+  * Update to CVS 20050503, taken from the gcc-4_0-branch.
+  * Add gnat-4.0 as an alternative build dependency (closes: #305690).
+
+ -- Matthias Klose <doko@debian.org>  Tue,  3 May 2005 15:41:26 +0200
+
+gcc-4.0 (4.0.0-1) experimental; urgency=low
+
+  * GCC 4.0.0 release.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 24 Apr 2005 11:28:42 +0200
+
+gcc-4.0 (4.0ds11-0pre11) breezy; urgency=low
+
+  * CVS 20050413, taken from the gcc-4_0-branch.
+  * Add proposed patches for PR20126, PR20490, PR20929.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 13 Apr 2005 09:43:00 +0200
+
+gcc-4.0 (4.0ds10-0pre10) experimental; urgency=low
+
+  * gcc-4.0.0-20050410 release candidate 1, built from the prerelease tarball.
+    - C++ fix for "optimizer breaks function inlining". Closes: #302989.
+  * Append the GCC version to the fastjar/grepjar version string.
+  * Use short file names in the libstdc++ docs (closes: #301140).
+  * Fix libstdc++-dbg dependencies (closes: #303866).
+
+ -- Matthias Klose <doko@debian.org>  Mon, 11 Apr 2005 13:16:01 +0200
+
+gcc-4.0 (4.0ds9-0pre9) experimental; urgency=low
+
+  * CVS 20050326, taken from the gcc-4_0-branch.
+  * Reenable Ada on ia64.
+  * Build libgnat on hppa, sparc, s390 again.
+  * ppc64 support (Andreas Jochens):
+    * debian/control.m4
+      - Add libc6-dev-powerpc [ppc64] to the Build-Depends.
+      - Change the Description for lib32gcc1: s/ia32/32 bit Version/
+    * debian/rules.defs
+      - Define 'biarch_ia32' for ppc64 to use the same 32 bit multilib
+        facilities as amd64.
+    * debian/rules.d/binary-gcc.mk
+      - Correct an error in the 'files_gcc' definition for biarch_ia32
+        (replace '64' by '32').
+    * debian/rules2
+      - Do not use '--disable-multilib' on powerpc64-linux.
+        Use '--disable-nof --disable-softfloat' instead.
+    * debian/rules.d/binary-libstdcxx.mk
+      - Put the 32 bit libstdc++ files in '/usr/lib32'.
+    * debian/rules.patch
+      - Apply 'ppc64-biarch' patch on ppc64.
+    * debian/patches/ppc64-biarch.dpatch
+      - MULTILIB_OSDIRNAMES: Use /lib for native 64 bit libraries and
+        /lib32 for 32 bit libraries.
+      - Add multilib handling to src/config-ml.in (taken from
+        amd64-biarch.dpatch).
+  * Rename biarch_ia32 to biarch32, as suggsted by Andreas.
+  * Use /bin/dash on hppa.
+  * Reenable the build of the hppa64 compiler.
+  * Enable parallel builds by defaults (set environment variale USE_NJOBS=no
+    or USE_NJOBS=<number> to modify the default, which is to use the
+    number of available processors).
+
+ -- Matthias Klose <doko@debian.org>  Sat, 26 Mar 2005 19:07:30 +0100
+
+gcc-4.0 (4.0ds8-0pre8) experimental; urgency=low
+
+  * CVS 20050322, taken from the gcc-4_0-branch.
+    - Add proposed fix for PR19406.
+  * Configure --with-gtk-cairo only if version 0.3.0 is found.
+  * Split out gcc-4.0-locales package. Better chance of getting
+    bug reports in english language.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 22 Mar 2005 14:20:24 +0100
+
+gcc-4.0 (4.0ds7-0pre7) experimental; urgency=low
+
+  * CVS 20050304, taken from the gcc-4_0-branch.
+  * Build the treelang compiler.
+
+ -- Matthias Klose <doko@debian.org>  Fri,  4 Mar 2005 21:29:56 +0100
+
+gcc-4.0 (4.0ds6-0pre6ubuntu6) hoary; urgency=low
+
+  * Fix lib32gcc1 symlink on amd64. Ubuntu #7099.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu,  3 Mar 2005 00:17:26 +0100
+
+gcc-4.0 (4.0ds6-0pre6ubuntu5) hoary; urgency=low
+
+  * Add patch from PR20160, avoid creating archives with components
+    that have duplicate basenames.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed,  2 Mar 2005 14:22:04 +0100
+
+gcc-4.0 (4.0ds6-0pre6ubuntu4) hoary; urgency=low
+
+  * CVS 20050301, taken from the gcc-4_0-branch.
+    Test builds on i386, amd64, powerpc, ia64, check libgcc_s.so.1.
+  * Add fastjar-4.0 binary and manpage. Some java packages append it
+    for all java related tools.
+  * Add libgcj6-src package for source code availability in IDE's.
+  * On hppa, disable the build of the hppa64 cross compiler, disable
+    java, disable running the testsuite (request by Lamont).
+  * On amd64, lib32gcc1 replaces ia32-libs.openoffice.org (<< 1ubuntu3).
+  * Build-Depend on libcairo1-dev, configure with --enable-gtk-cairo.
+    Work around libtool problems install libjawt.
+    Install jawt header files in libgcj6-dev.
+  * Add workaround for PR debug/19769.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue,  1 Mar 2005 11:26:19 +0100
+
+gcc-4.0 (4.0ds5-0pre6ubuntu3) hoary; urgency=low
+
+  * Drop libgmp3-dev (<< 4.1.4-3) as an alterntative build dependency.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 10 Feb 2005 15:16:27 +0100
+
+gcc-4.0 (4.0ds5-0pre6ubuntu2) hoary; urgency=low
+
+  * Disable Ada for powerpc.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed,  9 Feb 2005 16:47:07 +0100
+
+gcc-4.0 (4.0ds5-0pre6ubuntu1) hoary; urgency=low
+
+  * Avoid build dependency on type-handling.
+  * Install 32bit libs on amd64 in /lib32 and /usr/lib32.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed,  9 Feb 2005 08:27:21 +0100
+
+gcc-4.0 (4.0ds5-0pre6) experimental; urgency=low
+
+  * gcc-4.0 snapshot, taken from the HEAD branch CVS 20050208.
+  * Build-depend on graphviz (moved to main), remove the pregenerated
+    libstdc++ docs from the diff.
+  * Fix PR19162, libobjc build failure on arm-linux (closes: #291497).
+
+ -- Matthias Klose <doko@debian.org>  Tue,  8 Feb 2005 11:47:31 +0000
+
+gcc-4.0 (4.0ds4-0pre5) experimental; urgency=low
+
+  * gcc-4.0 snapshot, taken from the HEAD branch CVS 20050125.
+  * Call the 4.0 gcx versions in the java wrappers (closes: #291075).
+  * Correctly install libgij (closes: #291077).
+  * libgcj6-dev: Add conflicts to other libgcj-dev packages (closes: #290950).
+
+ -- Matthias Klose <doko@debian.org>  Mon, 24 Jan 2005 23:59:54 +0100
+
+gcc-4.0 (4.0ds3-0pre4) experimental; urgency=low
+
+  * gcc-4.0 snapshot, taken from the HEAD branch CVS 20050115.
+  * Update cross build patches (Nikita V. Youshchenko).
+  * Enable Ada on i386, amd64, mips, mipsel, powerpc, sparc, s390.
+    Doesn't yet bootstrap on alpha, hppa, ia64.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 15 Jan 2005 18:44:03 +0100
+
+gcc-4.0 (4.0ds2-0pre3) experimental; urgency=low
+
+  * gcc-4.0 snapshot, taken from the HEAD branch CVS 20041224.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 22 Dec 2004 00:31:44 +0100
+
+gcc-4.0 (4.0ds1-0pre2) experimental; urgency=low
+
+  * gcc-4.0 snapshot, taken from the HEAD branch CVS 20041205.
+  * Lot's of merges and updates from the gcc-3.4 packages.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 04 Dec 2004 12:14:51 +0100
+
+gcc-4.0 (4.0ds0-0pre1) experimental; urgency=low
+
+  * gcc-4.0 snapshot, taken from the HEAD branch CVS 20041114.
+    - Addresses many issues with the libstdc++ man pages (closes: #278549).
+  * Disable Ada on hppa, ia64, mips, mipsel, powerpc, s390 and sparc, at least
+    these are known to be broken at the time of the snapshot.
+  * Minor kbsd.gnu build fixes (Robert Millan). Closes: #273004.
+  * For amd64, add missing libstdc++ files to 'libstdc++6-dev' package.
+    (Andreas Jochens). Fixes: #274362.
+  * Update libffi-mips patch (closes: #274096).
+  * Updated i386-biarch patch. Don't build 64bit libstdc++, ICE.
+  * Update sparc biarch patch.
+  * Fix symlinks for gfortran manpage (closes: #278548).
+  * Update cross build patches (Nikita V. Youshchenko).
+  * Update Ada patches (Ludovic Brenta).
+
+ -- Matthias Klose <doko@debian.org>  Sat, 13 Nov 2004 10:38:25 +0100
+
+gcc-4.0 (4.0-0pre0) experimental; urgency=low
+
+  * gcc-4.0 snapshot, taken from the HEAD branch CVS 20040912.
+
+  * Matthias Klose <doko@debian.org>
+
+    - Integrate accumulated packaging patches from gcc-3.4.
+    - Rename libstdc++6-* packages to libstdc++6-4-* (closes: #261693).
+    - libffi4-dev: conflict with libffi3-dev (closes: #265939).
+
+  * Robert Millan <rmh@debian.org>
+
+    * control.m4: 
+      - s/locale_no_archs !hurd-i386/locale_no_archs/g 
+        (This is now handled in rules.defs. [1]) 
+      - s/procps [check_no_archs]/procps [linux_gnu_archs]/g [2] 
+      - Add type-handling to build-deps. [3] 
+    * rules.conf: 
+      - Don't require (>= $(libc_ver)) for libc0.1-dev. [4] 
+      - Generate *_no_archs variables with type-handling and use them for 
+        for m4's -D parameters. [3] 
+    * rules.defs: 
+      - use filter instead of findstring [1]. 
+      - s/netbsd-elf-gnu/netbsdelf-gnu/g [5]. 
+      - enable java for kfreebsd-gnu [6] 
+      - enable ffi for kfreebsd-gnu and knetbsd-gnu [6] 
+      - enable libgc for kfreebsd-gnu [6] 
+      - enable checks for kfreebsd-gnu and knetbsd-gnu [7] 
+      - enable locales for kfreebsd-gnu and gnu [1] [8]. 
+    * Closes: #264025.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 12 Sep 2004 12:52:56 +0200
+
+gcc-3.5 (3.5ds1-0pre1) experimental; urgency=low
+
+  * gcc-3.5 snapshot, taken from the HEAD branch CVS 20040724.
+  * Install locale data with versioned package name (closes: #260497).
+  * Fix libgnat symlinks.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 24 Jul 2004 21:26:23 +0200
+
+gcc-3.5 (3.5-0pre0) experimental; urgency=low
+
+  * gcc-3.5 snapshot, taken from the HEAD branch CVS 20040718.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 18 Jul 2004 12:26:00 +0200
+
+gcc-3.4 (3.4.1-1) experimental; urgency=low
+
+  * gcc-3.4.1 final release.
+    - configured wth --enable-libstdcxx-allocator=mt.
+  * Fixes for generating cross compiler packages (Jeff Bailey).
+
+ -- Matthias Klose <doko@debian.org>  Fri,  2 Jul 2004 22:49:05 +0200
+
+gcc-3.4 (3.4.0-4) experimental; urgency=low
+
+  * gcc-3.4.1 release candidate 1.
+  * Add logic to build biarch compiler on powerpc (disabled, needs lib64c).
+  * Don't build the libg2c0 package on mipsel-linux (no clear answer on
+    debian-mips, if the libg2c0's built by gcc-3.3 and gcc-3.4 are compatible
+    (post-sarge issue).
+  * Don't use gcc-2.95 as bootstrap compiler on m68k anymore.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 26 Jun 2004 22:40:20 +0200
+
+gcc-3.4 (3.4.0-3) experimental; urgency=low
+
+  * Update to gcc-3.4 CVS 20040613.
+  * On sparc, set the the build target to sparc64-linux, build with
+    switch defaulting to code generation for v7. To generate code for
+    sparc64, use the -m64 switch.
+  * Add missing doc-base files to -doc packages.
+  * Add portability patches and kbsd-gnu patch (Robert Millan).
+    Closes: #251293, #251294.
+  * Apply fixes for cross build (Nikita V. Youshchenko).
+  * Do not include the precompiled libstdc++ header files into the -dev
+    package (still experimental). Closes: #251707.
+  * Reflect renaming of Ada user's guide.
+  * Move AWT peer libraries for libgcj into it's own package (fixes: #247791).
+
+ -- Matthias Klose <doko@debian.org>  Mon, 14 Jun 2004 00:03:18 +0200
+
+gcc-3.4 (3.4.0-2) experimental; urgency=low
+
+  * Update to gcc-3.4 CVS 20040516.
+  * Do not provide the /usr/hppa64-linux/include in the gcc-hppa64 package,
+    migrated to libc6-dev. Adjust dependencies.
+  * Integrate gpc test results into the GCC test summary.
+  * gnatchop calls gcc-3.4 (closes: #245438).
+  * debian/locale-gen.sh: Update for recent libstdc+++ testsuite.
+  * debian/copyright: Add libstdc++-v3's exception clause.
+  * Add libffi update for mips (Thiemo Seufer).
+  * Reference Debian specific bug reporting instructions.
+  * Update README.Bugs.
+  * Fix FTBFS for libstdc++-doc.
+  * Update libjava patch for hppa (Randolph Chung).
+  * Fix installation of ffitarget.h header file.
+  * On amd64-linux, configure --without-multilib, disable Ada.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 16 May 2004 07:53:39 +0200
+
+gcc-3.4 (3.4.0-1) experimental; urgency=low
+
+  * gcc-3.4.0 final release.
+
+  * Why experimental?
+    - Do not interfer with packages currently built from gcc-3.3 sources,
+      i.e. libgcc1, libobjc1, libffi2, libffi2-dev, libg2c0.
+    - Biarch sparc compiler doesn't built yet.
+    - Use of configure flags affecting binary ABI's not yet determined.
+    - Several ABI bugs have been fixed. Unfortunately, these changes will break
+      binary compatibility with earlier releases on several architectures:
+      alpha, mips, sparc, 
+    - hppa and m68k changed sjlj based exception handling to dwarf2 based
+      exception handling.
+
+      See NEWS.html or http://gcc.gnu.org/gcc-3.4/changes.html for more
+      specific information.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 20 Apr 2004 20:54:56 +0200
+
+gcc-3.4 (3.4ds3-0pre4) experimental; urgency=low
+
+  * Update to gcc-3.4 CVS 20040403.
+  * Add gpc tarball, gpc patches for 3.4 (Waldek Hebisch).
+  * Reenable sparc-biarch patches (closes: #239856).
+  * Build the shared libgnat library, needed to fix FTBFS for some
+    Ada library packages (Ludovic Brenta).
+    Currently enabled for hppa, i386, ia64.
+
+ -- Matthias Klose <doko@debian.org>  Sat,  3 Apr 2004 08:47:55 +0200
+
+gcc-3.4 (3.4ds1-0pre2) experimental; urgency=low
+
+  * Update to gcc-3.4 CVS 20040320.
+  * For libstdc++6-doc, add a conflict to libstdc++5-3.3-doc (closes: #236560).
+  * For libstdc++6-dbg, add a conflict to libstdc++5-3.3-dbg (closes: #236798).
+  * Reenable s390-biarch patches.
+  * Update the cross compiler build files (Nikita V. Youshchenko).
+
+ -- Matthias Klose <doko@debian.org>  Sat, 20 Mar 2004 09:15:10 +0100
+
+gcc-3.4 (3.4ds0-0pre1) experimental; urgency=low
+
+  * Start gcc-3.4 packaging, get rid of the epoch for most of the
+    packages.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 22 Feb 2004 16:00:03 +0100
+
+gcc-3.3 (1:3.3.3ds6-6) unstable; urgency=medium
+
+  * Update to gcc-3_3-branch CVS 20040401.
+    - Fixed ICE in emit_move_insn_1 on legal code (closed: #223215).
+    - Fix PR 14755, miscompilation of loops with bitfield counter.
+      Closes: #241255.
+    - Fix PR 16040, crash in function initializing const data with
+      reinterpret_cast-ed pointer-to-member function crashes (closes: #238621).
+    - Remove patches integrated upstream.
+  * Reenable build of gpidump on powerpc and s390.
+
+ -- Matthias Klose <doko@debian.org>  Thu,  1 Apr 2004 23:51:54 +0200
+
+gcc-3.3 (1:3.3.3ds6-5) unstable; urgency=medium
+
+  * Update to gcc-3_3-branch CVS 20040321.
+    - Fix PR target/13889 (ICE on valid code on m68k).
+  * Fix FTFBS on s390. Do not build gpc's gpidump on s390.
+  * Reenable gpc on arm.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 22 Mar 2004 07:37:26 +0100
+
+gcc-3.3 (1:3.3.3ds6-4) unstable; urgency=low
+
+  * Update to gcc-3_3-branch CVS 20040320.
+    - Revert patch for PR14640 (with this, at least mozilla-firefox was
+      miscompiled on x86 (closes: #238621).
+  * Update the gpc tarball (there were two releases with the same name ...).
+  * Reenable gpc on alpha and ia64.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 20 Mar 2004 07:39:24 +0100
+
+gcc-3.3 (1:3.3.3ds5-3) unstable; urgency=low
+
+  * Update to gcc-3_3-branch CVS 20040314.
+    - Fixes miscompilation with -O -funroll-loops on powerpc (closes: #229567).
+    - Fix ICE in dwarf-2 on code using altivec (closes: #203835).
+  * Update hurd-changes patch.
+  * Add libgcj4-dev as a recommendation for gcj (closes: #236547).
+  * debian/copyright: Added exemption to static linking of libgcc.
+
+  * Phil Blundell:
+    - debian/patches/arm-ldm.dpatch, debian/patches/arm-gotoff.dpatch: Update.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 14 Mar 2004 09:56:06 +0100
+
+gcc-3.3 (1:3.3.3ds5-2) unstable; urgency=low
+
+  * Update to gcc-3_3-branch CVS 20040306.
+    - Fixes bootstrap comparision error on ia64.
+    - Allows ghc build with gcc-3.3.
+    - On amd64, don't imply 3DNow! for -m64 by default.
+    - Some arm specific changes
+    - Fix C++/13944: exception in constructor of a class to be thrown is not
+      caught. Closes: #228099.
+  * Enable the build of gcc-3.3-hppa64 on hppa.
+    Add symlinks for as and ld to point to hppa64-linux-{as,ld}.
+  * gcj-3.3 depends on g++-3.3, recommends gij-3.3. gij-3.3 suggests gcj-3.3.
+  * Fix libgc2c-pic compatibility links (closes: #234333).
+    The link will be removed for gcc-3.4.
+  * g77-3.3: Conflict with other g77-x.y packages.
+  * Tighten shlibs dependencies to latest released versions.
+
+  * Phil Blundell:
+    - debian/patches/arm-233633.dpatch: New  Fixes problems with half-word
+      loads on ARMv3 architecture.  (Closes: #233633)
+    - debian/patches/arm-ldm.dpatch: New.  Avoids inefficient epilogue for
+      leaf functions in PIC code on ARM.
+
+ -- Matthias Klose <doko@debian.org>  Sat,  6 Mar 2004 10:57:14 +0100
+
+gcc-3.3 (1:3.3.3ds5-1) unstable; urgency=medium
+
+  * gcc-3.3.3 final release.
+    See /usr/share/doc/gcc-3.3/NEWS.{gcc,html}.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 16 Feb 2004 08:59:52 +0100
+
+gcc-3.3 (1:3.3.3ds4-0pre4) unstable; urgency=low
+
+  * Update to gcc-3.3.3 CVS 20040214 (2nd gcc-3.3.3 prerelease).
+  * Fix title of libstdc++'s html main index (closes: #196381).
+  * Move libg2c libraray files out of the gcc specific libdir to /usr/lib.
+    For g77-3.3 add conflicts to other g77 packages. Closes: #224848.
+  * Update the stack protector patch to 3.3-7, but don't apply it by default.
+    Closes: #230338.
+  * On arm, use arm6 as the cpu default (backport from mainline, PR12527).
+  * Add libffi and libjava support for hppa (Randolph Chung). Closes: #232615.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 14 Feb 2004 09:26:15 +0100
+
+gcc-3.3 (1:3.3.3ds3-0pre3) unstable; urgency=low
+
+  * Update to gcc-3.3.3 CVS 20040125.
+    - Fixed PR11350, undefined labels with -Os -fPIC (closes: #195911).
+    - Fixed PR11793, ICE in extract_insn, at recog.c (closes: #203835).
+    - Fixed PR13544, removed backport for PR12862.
+    - Integrated backport for PR12441.
+  * Fixed since 3.3: java: not implemented interface methods of abstract
+    classes not found (closes: #225438).
+  * Disable pascal on arm architecture (currently broken).
+  * Update the build files to build a cross compiler (Nikita V. Youshchenko).
+    See debian/README.cross in the source package.
+  * Apply revised patch to make -mieee the default on alpha-linux,
+    and add -mieee-disable switch to turn the default off (closes: #212912).
+    (Tyson Whitehead)
+
+ -- Matthias Klose <doko@debian.org>  Sun, 25 Jan 2004 17:41:04 +0100
+
+gcc-3.3 (1:3.3.3ds2-0pre2) unstable; urgency=medium
+
+  * Update to gcc-3.3.3 CVS 20040110.
+    - Fixes compilation not terminating at -O1 on hppa (closes: #207516).
+  * Add backport to fix PR12441 (closes: #224576).
+  * Revert backport to 3.3 branch to fix PR12862, which introduced another
+    regression (PR13544). Closes: #225663.
+  * Tighten dependency of gnat-3.3 on gcc-3.3 (closes: #226273).
+  * Disable treelang build for cross compiler build.
+  * Disable pascal on alpha and ia64 architectures (currently broken).
+
+ -- Matthias Klose <doko@debian.org>  Sat, 10 Jan 2004 12:33:59 +0100
+
+gcc-3.3 (1:3.3.3ds1-0pre1) unstable; urgency=low
+
+  * Update to gcc-3.3.3 CVS 20031229.
+    - Fixes bootstrap error on ia64-linux.
+    - Fix -pthread on mips{,el}-linux (closes: #224875).
+    - Fix -Wformat for C++ (closes: #217075).
+  * Backport from mainline: Preserve inline-ness when redeclaring
+    a function template (closes: #195264).
+  * Add missing intrinsics headers on ix86 (closes: #224593).
+  * Fix location of libg2c libdir in libg2c.la file (closes: #224848).
+
+ -- Matthias Klose <doko@debian.org>  Mon, 29 Dec 2003 10:36:29 +0100
+
+gcc-3.3 (1:3.3.3ds0-0pre0.1) unstable; urgency=high
+
+   * NMU
+   * Fixed mips(el) spec file for -pthread: (Closes: #224875)
+   * [debian/patches/mips-pthread.dpatch] New.
+   * [debian/rules.patch] Added it to debian_patches.
+
+ -- J.H.M. Dassen (Ray) <jdassen@debian.org>  Sat, 27 Dec 2003 15:51:47 +0100
+
+gcc-3.3 (1:3.3.3ds0-0pre0) unstable; urgency=low
+
+  * Update to gcc-3.3.3 CVS 20031206.
+    - Fixes ICE in verify_local_live_at_start (hppa). Closes: #201550.
+    - Fixes miscompilation of linux-2.6/sound/core/oss/rate.c.
+      Closes: #219949.
+  * Add missing unwind.h to gcc package (closes: #220846).
+  * Regenerate control file to fix build dependencies for m68k.
+  * More gpc only patches to fix test failures on m68k.
+  * Reenable gpc for the Hurd (closes: #189851).
+
+ -- Matthias Klose <doko@debian.org>  Sat,  6 Dec 2003 10:29:07 +0100
+
+gcc-3.3 (1:3.3.2ds5-4) unstable; urgency=low
+
+  * Update libffi-dev package description (closes: #219508).
+  * For gij and libgcj fix dependency on the libstdc++ package, if
+    the latter isn't installed during the build.
+  * Apply patch to emit .note.GNU-stack section on linux arches
+    which by default need executable stack.
+  * Prefer gnat-3.3 over gnat-3.2 as a build dependency.
+  * Update the pascal tarball (different version released with the
+    same name).
+  * Add pascal patches to address various gpc testsuite failures.
+    On alpha and ia64, build gpc from the 20030830 version. Reenable
+    the build on m68k.
+    Remove the 20030507 gpc version from the tarball.
+  * Apply patch to build the shared ada libs and link the ada tools
+    against the shared libs. Not enabled by default, because gnat
+    and gnatlib are rebuilt during install. (Ludovic Brenta)
+
+ -- Matthias Klose <doko@debian.org>  Sun,  9 Nov 2003 22:34:33 +0100
+
+gcc-3.3 (1:3.3.2ds4-3) unstable; urgency=low
+
+  * Fix rules to omit inclusion of gnatpsta in mips(el) gnat package.
+
+ -- Matthias Klose <doko@debian.org>  Sun,  2 Nov 2003 14:29:59 +0100
+
+gcc-3.3 (1:3.3.2ds4-2) unstable; urgency=medium
+
+  * s390-ifcvt patch added. Fixes gcl miscompilation (closes: #217240).
+    (Gerhard Tonn)
+  * Fix an infinite loop in g++ compiling lufs, regression from 3.3.1.
+  * Fix a wrong code generation bug on alpha.
+    (Falk Hueffner)
+  * Update NEWS files.
+  * Add Falk Hueffner to the Debian GCC maintainers.
+  * Enable ada on mips and mipsel, but don't build the gnatpsta tool.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 29 Oct 2003 00:12:37 +0100
+
+gcc-3.3 (1:3.3.2ds4-1) unstable; urgency=medium
+
+  * Update to gcc-3.3.2.
+  * Update NEWS files.
+  * Miscompilation in the pari package at -O3 fixed (closes: #198172).
+  * On alpha-linux, revert -mieee as the default (Falk Hueffner).
+    Reopens: #212912.
+  * Add ia64-unwind patch (Jeff Bailey).
+  * Closed reports reported against gcc-2.96 (ia64), fixed at least in gcc-3.3:
+    - ICE in verify_local_live_at_start, at flow.c:2733 (closes: #135404).
+    - Compilation failure of stlport (closes: #135224).
+    - Infinite loop compiling cssc's pfile.cc with -O2 (closes: #115390).
+    - Added missing some string::compare() members (closes: #141199).
+    - <cmath> header declares std::pow (closes: #161853).
+    - <vector> does have at() method (closes: #59776).
+    - Fixed error in stl_deque.h (closes: #69530).
+    - Fixed problem with bastring (closes: #75759, #96539).
+    - bad_alloc and std:: namespace problem (closes: #75120).
+    - Excessive warnings from headers with -Weffc++ (closes: #76827).
+
+ -- Matthias Klose <doko@debian.org>  Fri, 17 Oct 2003 08:07:01 +0200
+
+gcc-3.3 (1:3.3.2ds3-0pre5) unstable; urgency=low
+
+  * Update to gcc-3.3.2 CVS 20031005.
+    - Fixes cpp inserting a spurious newline (closes: #210478, #210482).
+    - Fixes generation of unrecognizable insn compiling kernel source
+      on alpha (closes: #202762).
+    - Fixes ICE in add_abstract_origin_attribute (closes: #212406).
+    - Fixes forward declaration in libstdc++ (closes: #209386).
+    - Fixes ICE in in extract_insn, at recog.c on alpha (closes: #207564).
+  * Make libgcj-common architecture all (closes: #211909).
+  * Build depend on: flex-old | flex (<< 2.5.31).
+  * Fix spec linking libraries with -pthread on powerpc (closes: #211054).
+  * debian/patches/arm-gotoff.dpatch: fix two kinds of PIC lossage.
+    (Phil Blundell)
+  * debian/patches/arm-common.dpatch: fix excessive alignment of common
+    blocks causing binutils testsuite failures.
+    (Phil Blundell)
+  * Update priorities in debian/control to match the archive.
+    (Ryan Murray)
+  * s390-nonlocal-goto patch added. Fixes some pascal testcase failures. 
+    (Gerhard Tonn)
+  * On alpha-linux, make -mieee default and add -mieee-disable switch
+    to turn default off (closes: #212912).
+    (Tyson Whitehead)
+  * Add gpc upstream patch for memory corruption fix.
+
+ -- Matthias Klose <doko@debian.org>  Sun,  5 Oct 2003 19:53:49 +0200
+
+gcc-3.3 (1:3.3.2ds2-0pre4) unstable; urgency=low
+
+  * Add gcc-unsharing_lhs patch (closes: #210848)
+
+ -- Ryan Murray <rmurray@debian.org>  Fri, 19 Sep 2003 22:51:19 -0600
+
+gcc-3.3 (1:3.3.2ds2-0pre3) unstable; urgency=low
+
+  * Update to gcc-3.3.2 CVS 20030908.
+  * PR11716 (Michael Eager, Dan Jacobowitz):
+    Make GCC think that the maximum length of a short branch is
+    64K instead of 128K.  It's a big hammer, but it works.
+    Closes: #207915.
+  * Downgrade gpc to 20030507 on alpha and ia64 (closes: #208717).
+
+ -- Matthias Klose <doko@debian.org>  Mon,  8 Sep 2003 21:49:52 +0200
+
+gcc-3.3 (1:3.3.2ds1-0pre2) unstable; urgency=low
+
+  * Update to gcc-3.3.2 CVS 20030831.
+    - Fix java NullPointerException detection with 2.6 kernels.
+      Closes: #206377.
+    - Fix bug in C++ typedef handling (closes: #205402).
+    - Fix -Wunreachable-code giving false complaints (closes: #196600).
+  * Update to gpc-20030830.
+  * Don't include /usr/share/java/repository into the class path according
+    to the new version of th Debian Java policy (closes: #205643).
+  * Build-Depend/Depend on libgc-dev.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 31 Aug 2003 08:56:53 +0200
+
+gcc-3.3 (1:3.3.2ds0-0pre1) unstable; urgency=low
+
+  * Remove the build dependency on locales for now.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 15 Aug 2003 07:48:18 +0200
+
+gcc-3.3 (1:3.3.2ds0-0pre0) unstable; urgency=medium
+
+  * Update to gcc-3.3.2 CVS 20030812.
+    - Fixes generation of wrong code for XDM-AUTHORIZATION-1 key generation
+      and/or validation. Closes: #196090.
+  * Update NEWS files.
+  * Change ix86 default CPU type for code generation:
+    - i386-linux       -> i486-linux
+    - i386-gnu         -> i586-gnu
+    - i386-freebsd-gnu -> i486-freebsd-gnu
+    Use -march=i386 to target i386 CPUs.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 12 Aug 2003 10:31:28 +0200
+
+gcc-3.3 (1:3.3.1ds3-1) unstable; urgency=low
+
+  * gcc-3.3.1 (taken from CVS 20030805).
+    - C++: Fix declaration conflicts (closes: #203351).
+    - Fix ICE on ia64 (closes: #203840).
+
+ -- Matthias Klose <doko@debian.org>  Tue,  5 Aug 2003 20:38:02 +0200
+
+gcc-3.3 (1:3.3.1ds2-0rc2) unstable; urgency=low
+
+  * Update to gcc-3.3.1 CVS 20030728.
+    - Fix ICE in extract_insn, at recog.c:2148 on m68k.
+      Closes: #177840, #180375, #190818.
+    - Fix ICE while building libquicktime on alpha (closes: #192576).
+    - Fix failure to deal with using and private inheritance (closes: #202696).
+  * On sparc, /usr/lib was added to the library search path. Fix it.
+  * Closed reports reported against gcc-3.2.x and fixed in gcc-3.3:
+    - Fix error building the gcl package on arm (closes: #199835).
+
+ -- Matthias Klose <doko@debian.org>  Mon, 28 Jul 2003 20:39:07 +0200
+
+gcc-3.3 (1:3.3.1ds1-0rc1) unstable; urgency=low
+
+  * Update to gcc-3.3.1 CVS 20030722 (3.3.1 release candidate 1).
+    - Fix ICE in copy_to_mode_reg on 64-bit targets (closes: #189365).
+    - Remove documentation about multi-line strings (closes: #194391).
+    - Correctly document -falign-* parameters (closes: #198269).
+    - out-of-class specialization of a private nested template class.
+      Closes: #193830.
+    - Tighten shlibs dependency due to new symbols in libgcc.
+  * README.Debian for libg2c0, describing the need for g77-x.y when
+    working with the g2c header and library (closes: #189059).
+  * Call make with -j<number of CPU's>, if USE_NJOBS is set and non-empty
+    in the environment.
+  * Add another two m68k patches, partly replacing the workarounds provided
+    by Roman Zippel.
+  * Add the stack protector patch, but don't apply it by default. Edit
+    debian/rules.patch to apply it (closes: #171699, #189494).
+  * Remove wrong symlinks from gnat package (closes: #201882).
+  * Closed reports reported against gcc-2.95 and fixed in newer versions:
+    - SMP kernel compilation on alpha (closes: #134197, #146883).
+    - ICE on arm while building imagemagick (closes: #173475).
+  * Closed reports reported against gcc-3.2.x and fixed in gcc-3.3:
+    - Miscompilation of octave2.1 on hppa (closes: #192296, #193804).
+
+ -- Matthias Klose <doko@debian.org>  Sun, 13 Jul 2003 10:26:30 +0200
+
+gcc-3.3 (1:3.3.1ds0-0pre0) unstable; urgency=medium
+
+  * Update to gcc-3.3.1 CVS 20030626.
+    - Fix ICE on arm compiling xfree86 (closes: #195424).
+    - Fix ICE on arm compiling fftw (closes: #186185).
+    - Fix ICE on arm in change_address_1, affecting a few packages.
+      Closes: #197099.
+    - Fix ICE in merge_assigned_reloads building Linux 2.4.2x sched.c.
+      Closes: #195237.
+    - Do not warn about failing to inline functions declared in system headers.
+      Closes: #193049.
+    - Fix ICE on mips{,el} in propagate_one_insn (closes: #194330, #196091).
+    - Fix ICE on m68k in reg_overlap_mentioned_p (closes: #194749).
+    - Build crtbeginT.o on m68k (closes: #197613).
+  * Fix g++ man page symlink (closes: #196271).
+  * mips/mipsel: Depend on binutils (>= 2.14.90.0.4). Closes: #196744.
+  * Disable treelang on powerpc (again). Closes: #196915.
+  * Pass -encoding in gcj-wrapper.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 27 Jun 2003 00:14:43 +0200
+
+gcc-3.3 (1:3.3ds9-3) unstable; urgency=low
+
+  * Closing more reports, fixed in 3.2/3.3:
+    - ICE building texmacs on m68k (closes: #177433).
+    - libstdc++: <cmath> doesn't define trunc(...) (closes: #105285).
+    - libstdc++: setw is ignored for strings output (closes: #52382, #76645).
+  * Add build support to omit the manual pages and info docs from the
+    packages, disabled by default. Wait for a Debian statement, which can
+    be cited. Adresses: #193787.
+  * Reenable the m68k-const patch, don't run the g77 testsuite on m68k.
+    Addresses ICEs (#177840, #190818).
+  * Update arm-xscale patch.
+  * libstdc++: use __attribute__(__unknown__), instead of (unknown).
+    Closes: #195796.
+  * Build-Depend on glibc (>= 2.3.1) to prevent incorrect builds on woody.
+    Request from Adrian Bunk.
+  * Add treelang-update patch (Tim Josling), reenable treelang on powerpc.
+  * Add <GNU_TYPE>-{cpp,gcc,g++,gcj,g77} symlinks (addresses: #189466).
+  * Make sure not to build using binutils-2.14.90.0.[12].
+
+ -- Matthias Klose <doko@debian.org>  Mon,  2 Jun 2003 22:35:45 +0200
+
+gcc-3.3 (1:3.3ds9-2) unstable; urgency=medium
+
+  * Correct autoconf-related snafu in newly added ARM patches (Phil Blundell).
+  * Correct libgcc1 dependency (closes: #193689).
+  * Work around ldd/dpkg-shlibs failure on s390x.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 18 May 2003 09:40:15 +0200
+
+gcc-3.3 (1:3.3ds9-1) unstable; urgency=low
+
+  * gcc-3.3 final release.
+    See /usr/share/doc/gcc-3.3/NEWS.{gcc,html}.
+  * First merge of i386/x86-64 biarch support (Arnd Bergmann).
+    Disabled by default. Closes: #190066.
+  * New gpc-20030507 version.
+  * Upstream gpc update to fix netbsd build failure (closes: #191407).
+  * Add arm-xscale.dpatch, arm-10730.dpatch, arm-tune.dpatch, copied
+    from gcc-3.2 (Phil Blundell).
+  * Closing bug reports reported against older gcc versions (some of them
+    still present in Debian, but not anymore as the default compiler).
+    Usually, forwarded bug reports are linked to
+        http://gcc.gnu.org/PR<upstream bug number>
+    The upstream bug number usually can be found in the Debian reports.
+
+  * Closed reports reported against gcc-3.1.x, gcc-3.2.x and fixed in gcc-3.3:
+    - General:
+      + GCC accepts multi-line strings without \ or " " &c (closes: #2910).
+      + -print-file-name sometimes fails (closes: #161615).
+      + ICE: reporting routines re-entered (closes: #179597, #180937).
+      + Misplaced paragraph in gcc documentation (closes: #179363).
+      + Error: suffix or operands invalid for `div' (closes: #150558).
+      + builtin memcmp() could be optimised (closes: #85535).
+    - Ada:
+      + Preelaborate, exceptions, and -gnatN (closes: #181679).
+    - C:
+      + Duplicate loop conditions even with -Os (closes: #94701).
+      + ICE (signal 11) (closes: #65686).
+    - C++:
+      + C++ error on virtual function which uses ... (closes: #165829).
+      + ICE when warning about cleanup nastiness in switch statements
+        (closes: #184108).
+      + Fails to compile virtual inheritance with variable number of
+        argument method (closes: #151357).
+      + xmmintrin.h broken for c++ (closes: #168310).
+      + Stack corruption with variable-length automatic arrays and virtual
+        destructors (closes: #188527).
+      + ICE on illegal code (closes: #184862).
+      + _attribute__((unused)) is ignored in C++ (closes: #45440).
+      + g++ handles &(void *)foo bizzarely (closes: #79225).
+      + ICE (with wrong code, though) (closes: #81122).
+    - Java:
+      + Broken zip file handling (closes: #180567).
+    - ObjC:
+      + @protocol forward definitions do not work (closes: #80468).
+    - Architecture specific:
+      - alpha
+        + va_start is off by one (closes: #186139).
+        + ICE while building kseg/ddd (closes: #184753).
+        + g++ -O2 optimization error (closes: #70743).
+      - arm
+        + ICE with -O2 in change_address_1 (closes: #180750).
+        + gcc optimization error with -O2, affecting bison (closes: #185903).
+      - hppa
+        + ICE in insn_default_length (closes: #186447).
+      - ia64
+        + gcc-3.2 fails w/ optimization (closes: #178830).
+      - i386
+        + unnecessary generation of instruction cwtl (closes: #95318).
+        + {athlon} ICE building mplayer (closes: #184800).
+        + {pentium4} ICE while compiling mozilla with -march=pentium4
+          (closes: #187910).
+        + i386 optimisation: joining tests (closes: #105309).
+      - m68k
+        + ICE in instantiate_virtual_regs_1 (closes: #180493).
+        + gcc optimizer bug on m68k (closes: #64832).
+      - powerpc
+        + ICE in extract_insn, at recog.c:2175 building php3 (closes: #186299).
+        + ICE with -O -Wunreachable-code (closes: #189702).
+      - s390
+        + Operand out of range at assembly time when using -O2
+          (closes: #178596).
+      - sparc
+        + gcc-3.2 regression (wrong code) (closes: #176387).
+        + ICE in mem_loc_descriptor when optimizing (closes: #178909).
+        + ICE in gen_reg_rtx when optimizing (closes: #178965).
+        + Optimisation leads to unaligned access in memcpy (closes: #136659).
+
+  * Closed reports reported against gcc-3.0 and fixed in gcc-3.2.x:
+    - General:
+      + Use mkstemp instead of mktemp (closed: #127802).
+    - Preprocessor:
+      + Fix redundant error message from cpp (closed: #100722).
+    - C:
+      + Optimization issue on ix86 (pointless moving) (closed: #97904).
+      + Miscompilation of allegro on ix86 (closed: #105741).
+      + Fix generation of ..ng references for static aliases (alpha-linux).
+        (closed: #108036).
+      + ICE compiling pari on hppa (closed: #111613).
+      + ICE on ia64 in instantiate_virtual_regs_1 (closed: #121668).
+      + ICE in c-typeck.c (closed: #123687).
+      + ICE in gen_subprogram_die on alpha (closed: #127890).
+      + SEGV in initialization of flexible char array member (closed: #131399).
+      + ICE on arm compiling lapack (closed: #135967).
+      + ICE in incomplete_type_error (closed: #140606).
+      + Fix -Wswitch (also part of -Wall) (closed: #140995).
+      + Wrong code in mke2fs on hppa (closed: #150232).
+      + sin(a) * sin(b) gives wrong result (closed: #164135).
+    - C++:
+      + Error in std library headers on arm (closed: #107633).
+      + ICE nr. 19970302 (closed: #119635).
+      + std::wcout does not perform encoding conversions (closed: #128026).
+      + SEGV, when compiling iostream.h with -fPIC (closed: #134315).
+      + Fixed segmentation fault in included code for <rope> (closed: #137017).
+      + Fix with exception handling and -O (closed: #144232).
+      + Fix octave-2.1 build failure on ia64 (closed: #144584).
+      + nonstandard overloads in num_get facet (closed: #155900).
+      + ICE in expand_end_loop with -O (closed: #158371).
+    - Fortran:
+      + Fix blas build failure on arm (closed: #137959).
+    - Java:
+      + Interface members are public by default (closed: #94974).
+      + Strange message with -fno-bounds-check in combination with -W.
+        (closed: #102353).
+      + Crash in FileWriter using IOException (closed: #116128).
+      + Fix ObjectInputStream.readObject() calling constructors.
+        (closed: #121636).
+      + gij: better error reporting on `class not found' (closed: #125649).
+      + Lockup during .java->.class compilation (closed: #141899).
+      + Compile breaks using temporary inner class instance (closed: #141900).
+      + Default constructor for inner class causes broken bytecode.
+        (closed: #141902).
+      + gij-3.2 linked against libgcc1 (closed: #165180).
+      + gij-wrapper understands -classpath parameter (closed: #146634).
+      + gij-3.2 doesn't ignore -jar when run as "java" (closed: #167673).
+    - ObjC:
+      + ICE on alpha (closed: #172353).
+
+  * Closed reports reported against gcc-2.95 and fixed in newer versions:
+    - General:
+      + Undocumented option -pthread (closes: #165110).
+      + stdbool.h broken (closes: #167439).
+      + regparm/profiling breakage (closes: #20695).
+      + another gcc optimization error (closes: #51456).
+      + ICE in `output_fix_trunc' (closes: #55967).
+      + Fix "Unable to generate reloads for" (closes: #58219, #131890).
+      + gcc -c -MD x/y.c -o x/y.o leaves y.d in cwd (closes: #59232).
+      + Compiler error with -O2 (closes: #67631).
+      + ICE (unrecognizable insn) compiling php4 (closes: #83550, #84969).
+      + Another ICE (closes: #90666).
+      + man versus info inconsistency (-W and -Wall) (closes: #93708).
+      + ICE on invalid extended asm (closes: #136630).
+      + ICE in `emit_no_conflict_block' compiling perl (closes: #154599).
+      + ICE in `gen_tagged_type_instantiation_die'(closes: #166766).
+      + ICE on __builtin_memset(s, 0, -1) (closes: #170994).
+      + -Q option to gcc appears twice in the documentation (closes: #137382).
+      + New options for specifying targets:- -MQ and -MT (closes: #27878).
+      + Configure using --enable-nls (closes: #51651).
+      + gcc -dumpspecs undocumented (closes: #65406).
+    - Preprocessor:
+      + cpp fails to parse macros with varargs correctly(closes: #154767).
+      + __VA_ARGS__ stringification crashes preprocessor if __VA_ARGS__ is
+        empty (closes: #152709).
+      + gcc doesn't handle empty args in macro function if there is only
+        one arg(closes: #156450).
+    - C:
+      + Uncaught floating point exception causes ICE (closes: #33786).
+      + gcc -fpack-struct doesn't pack structs (closes: #64628).
+      + ICE in kernel (matroxfb) code (closes: #151196).
+      + gcc doesn't warn about unreachable code (closes: #158704).
+      + Fix docs for __builtin_return_address(closes: #165992).
+      + C99 symbols in limits.h not defined (closes: #168346).
+      + %zd printf spec generates warning, even in c9x mode (closes: #94891).
+      + Update GCC attribute syntax (closes: #12253, #43119).
+    - C++ & libstdc++-v3:
+      + template and virtual inheritance bug (closes: #152315).
+      + g++ has some troubles with nested templates (closes: #21255).
+      + vtable thunks implementation is broken (closes: #34876, #35477).
+      + ICE for templated friend (closes: #42662).
+      + ICE compiling mnemonic (closes: #42989).
+      + Deprecated: result naming doesn't work for functions defined in a
+        class (closes: #43170).
+      + volatile undefined ... (closes: #50529).
+      + ICE concerning templates (closes: #53698).
+      + Program compiled -O3 -malign-double segfaults in ofstream::~ofstream
+        (closes: #56867).
+      + __attribute__ ((constructor)) doesn't work with C++ (closes: #61806).
+      + Another ICE (closes: #65687).
+      + ICE in `const_hash' (closes: #72933).
+      + ICE on illegal code (closes: #83221).
+      + Wrong code with -O2 (closes: #83363).
+      + ICE on template class (closes: #85934).
+      + No warning for missing return in non-void member func (closes: #88260).
+      + Not a bug/fixed in libgcc1: libgcc.a symbols end up exported by
+        shared libraries (closes: #118670).
+      + ICE using nested templates (closes: #118781).
+      + Another ICE with templates (closes: #127489).
+      + More ICEs (closes: #140427, #141797).
+      + ICE when template declared after use(closes: #148603).
+      + template function default arguments are not handled (closes: #157292).
+      + Warning when including stl.h (closes: #162074).
+      + g++ -pedantic-errors -D_GNU_SOURCE cannot #include <complex>
+        (closes: #151671).
+      + c++ error message improvement suggestion (closes: #46181).
+      + Compilation error in stl_alloc.h with -fhonor-std (closes: #59005).
+      + libstdc++ has no method at() in stl_= (closes: #68963).
+    - Fortran:
+      + g77 crash (closes: #130415).
+    - ObjC:
+      + ICE: program cc1obj got fatal signal 11 (closes: #62309).
+      + Interface to garbage collector is undocumented. (closes: #68987).
+    - Architecture specific:
+      - alpha
+        + Can't compile with define gnu_source with stdio and curses
+          (closes: #97603).
+        + Header conflicts on alpha (closes: #134558).
+        + lapack-dev: cannot link on alpha (closes: #144602).
+        + ICE `fixup_var_refs_1' (closes: #43001).
+        + Mutt segv on viewing list of attachments (closes: #47981).
+        + ICE building open-amulet (closes: #48530).
+        + ICE compiling hatman (closes: #55291).
+        + dead code removal in switch() broken (closes: #142844).
+      - arm
+        + Miscompilation using -fPIC on arm (closes: #90363).
+        + infinite loop with -O on arm (closes: #151675).
+      - i386
+        + ICE when using -mno-ieee-fp and -march=i686 (closes: #87540).
+      - m68k
+        + Optimization (-O2) broken on m68k (closes: #146006).
+      - mips
+        + g++ exception catching does not work... (closes: #105569).
+        + update-menus gets Bus Error (closes: #120333).
+      - mipsel
+        + aspell: triggers ICE on mipsel (closes: #128367).
+      - powerpc
+        + -O2 produces wrong code (gnuchess example) (closes: #131454).
+      - sparc
+        + Misleading documentation for -malign-{jump,loop,function}s
+          (closes: #114029).
+        + Sparc GCC issue with -mcpu=ultrasparc (closes: #172956).
+        + flightgear: build failure on sparc (closes: #88694).
+
+ -- Matthias Klose <doko@debian.org>  Fri, 16 May 2003 07:13:57 +0200
+
+gcc-3.3 (1:3.3ds8-0pre9) unstable; urgency=high
+
+  * gcc-3.3 second prerelease.
+    - Fixing exception handling on s390 (urgency high).
+  * Reenabled gpc build (I had it disabled ...). Closes: #192347.
+
+ -- Matthias Klose <doko@debian.org>  Fri,  9 May 2003 07:32:14 +0200
+
+gcc-3.3 (1:3.3ds8-0pre8) unstable; urgency=low
+
+  * gcc-3.3 prerelease.
+    - Fixes gcj ICE (closes: #189545).
+  * For libstdc++ use the i486 atomicity implementation, introduced with
+    0pre6, left out in 0pre7 (closes: #191684).
+  * Add README.Debian for treelang (closes: #190812).
+  * Apply NetBSD changes (Joel Baker). Closes: #191551.
+  * New symbols in libgcc1, tighten the shlibs dependency.
+  * Disable testsuite run on mips/mipsel because of an outdated libc-dev
+    package.
+  * Do not build libffi with debug information, although configuring
+    with --enable-debug.
+
+ -- Matthias Klose <doko@debian.org>  Tue,  6 May 2003 06:53:49 +0200
+
+gcc-3.3 (1:3.3ds7-0pre7) unstable; urgency=low
+
+  * gcc-3.3 prerelease taken from the gcc-3_3-branch (CVS 20030429).
+  * Revert upstream libstdc++ change (closes: #191145, #191147, #191148,
+    #191149, #149159, #149151, and other reports).
+    Sorry for not detecting this before the upload, seems to be
+    broken on i386 "only".
+  * hurd-i386: Use /usr/include, not /include.
+  * Disable gpc on hurd-i386 (closes: #189851).
+  * Disable building the debug version of libstdc++ on powerpc-linux
+    (fixes about 200 java test cases).
+  * Install libstdc++v3 man pages (closes: #127263).
+
+ -- Matthias Klose <doko@debian.org>  Tue, 29 Apr 2003 23:28:44 +0200
+
+gcc-3.3 (1:3.3ds6-0pre6) unstable; urgency=high
+
+  * gcc-3.3 prerelease taken from the gcc-3_3-branch (CVS 20030426).
+  * libstdc++-doc: Fix index.html link (closes: #189424).
+  * Revert back to the i486 atomicity implementation, that was used
+    for gcc-3.2 as well. Reopens: #184446, #185662. Closes: #189983.
+    For this reason, tighten the libstdc++5 shlibs dependency. See
+    http://lists.debian.org/debian-devel/2003/debian-devel-200304/msg01895.html
+    Don't build the ix86 specfic libstdc++ libs anymore.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 27 Apr 2003 19:47:54 +0200
+
+gcc-3.3 (1:3.3ds5-0pre5) unstable; urgency=low
+
+  * gcc-3.3 prerelease taken from the gcc-3_3-branch (CVS 20030415).
+  * Disable treelang on powerpc.
+  * Disable gpc on m68k.
+  * Install locale data. Conflict with gcc-3.2 (<= 1:3.2.3-0pre8).
+  * Fix generated bits/atomicity.h (closes: #189183).
+  * Tighten libgcc1 shlibs dependency (new symbol _Unwind_Backtrace).
+
+ -- Matthias Klose <doko@debian.org>  Wed, 16 Apr 2003 00:37:05 +0200
+
+gcc-3.3 (1:3.3ds4-0pre4) unstable; urgency=low
+
+  * gcc-3.3 prerelease taken from the gcc-3_3-branch (CVS 20030412).
+  * Avoid sparc64 dependencies for libgcc1 on sparc (Clint Adams).
+  * Make the default sparc 32bit target v8 instead of v7. This mainly
+    enables hardmul, which should speed up v8 and v9 systems by a large
+    margin (Ben Collins).
+  * Tighten binutils dependency for sparc.
+  * On i386, build libstdc++ optimized for i486 and above. The library
+    in /usr/lib is built for i386. Closes: #184446, #185662.
+  * Add gpc build (from gcc-snapshot package).
+  * debian/control: Include all packages, that _can_ be built from
+    this source package (except the cross packages).
+  * Add m68k patches: m68k-const, m68k-subreg, m68k-loop.
+  * Run the 3.3 testsuite a second time with the installed gcc-3.2
+    to check for regressions (promised, only this time, and for the
+    final release ;). Add build dependencies (gobjc-3.2, g77-3.2, g++-3.2).
+
+ -- Matthias Klose <doko@debian.org>  Sat, 12 Apr 2003 10:11:11 +0200
+
+gcc-3.3 (1:3.3ds3-0pre3) unstable; urgency=low
+
+  * gcc-3.3 prerelease taken from the gcc-3_3-branch (CVS 20030331).
+  * Reenable java on arm.
+  * Build-Depend on binutils-2.13.90.0.18-1.3 on m68k. Fixes all
+    bprob/gcov testsuite failures.
+  * Enable C++ build on arm.
+  * Enable the sparc64 build.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 31 Mar 2003 23:24:54 +0200
+
+gcc-3.3 (1:3.3ds2-0pre2) unstable; urgency=low
+
+  * gcc-3.3 prerelease taken from the gcc-3_3-branch (CVS 20030317).
+  * Disable building the gcc-3.3-nof package.
+  * Disable Ada on mips and mipsel.
+  * Remove the workaround to build Ada on powerpc.
+  * Add GNU Free documentation license to copyright file.
+  * Update the sparc64 build patches (Clint Adams). Not yet enabled.
+  * Disable C++ on arm (Not yet tested).
+  * Add fix for ICE on powerpc (see: #184684).
+
+ -- Matthias Klose <doko@debian.org>  Sun, 16 Mar 2003 21:40:57 +0100
+
+gcc-3.3 (1:3.3ds1-0pre1) unstable; urgency=low
+
+  * gcc-3.3 prerelease taken from the gcc-3_3-branch (CVS 20030310).
+  * Add gccbug manpage.
+  * Don't build libgnat package (no shared library).
+  * Configure with --enable-sjlj-exceptions on hppa and m68k for
+    binary compatibility with libstdc++ built with gcc-3.2.
+  * Disable Java on arm-linux (never seen it sucessfully bootstrap).
+  * Install non-conflicting baseline README.
+  * multilib *.so and *.a moved to /usr/lib/gcc-lib/... , so that several
+    compiler versions can be installed concurrently.
+  * Remove libstdc++-incdir patch applied upstream.
+  * libstdc++ 64 bit development files now handled in -dev target.
+    (Gerhard Tonn)
+  * Drop build dependencies for gpc (tetex-bin, help2man, libncurses5-dev).
+  * Add libstdc++5-3.3-dev confict to libstdc++5-dev (<= 1:3.2.3-0pre3).
+  * Enable builds on m68k (all but C++ for the moment). gcc-3.3 bootstraps,
+    while gcc-3.2 doesn't.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 10 Mar 2003 23:41:00 +0100
+
+gcc-3.3 (1:3.3ds0-0pre0) unstable; urgency=low
+
+  * First gcc-3.3 package, built for s390 only. All other architectures
+    build the gcc-3.3-base package only.
+    To build the package on other architectures, edit debian/rules.defs
+    (macro no_dummy_archs).
+  * gcc-3.3 prerelease taken from the gcc-3_3-branch (CVS 20030301).
+  * Don't include the gcc locale files (would conflict with 3.2).
+  * Remove libffi-install-fix patch.
+  * Fix netbsd-i386 patches.
+  * Change priority of libstdc++5 and gcc-3.2-base to important.
+  * Install gcjh-wrapper for javah.
+  * gij suggests fastjar, gcj recommends fastjar.
+  * Allow builds using automake1.4 | automake (<< 1.5).
+  * Backport fix for to output more correct line numbers.
+  * Add help2man to build dependencies needed for some gpc man pages.
+  * gpc: Install binobj and gpidump binaries and man pages.
+  * Apply cross compilation patches submitted by Bastian Blank.
+  * Replace s390-biarch patch and copy s390-config-ml patch from 3.2
+    (Gerhard Tonn).
+  * Configure using --enable-debug.
+  * Add infrastructure to only build a subset of binary packages.
+  * Rename libstdc++-{dev,dbg,pic,doc} packages.
+  * Build treelang compiler.
+
+ -- Matthias Klose <doko@debian.org>  Sat,  1 Mar 2003 12:56:42 +0100
+
+gcc-3.2 (1:3.2.3ds2-0pre3) unstable; urgency=low
+
+  * gcc-3.2.3 prerelease (CVS 20030228)
+    - Fixes bootstrap failure on alpha-linux.
+    - Fixes ICE on m68k (closes: #177016).
+  * Build Pascal with -O1 on powerpc, disable Pascal on arm, m68k and
+    sparc (due to wrong code generation for fwrite in glibc,
+    see PR optimization/9279).
+  * Apply cross compilation patches submitted by Bastian Blank.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 28 Feb 2003 20:26:30 +0100
+
+gcc-3.2 (1:3.2.3ds1-0pre2) unstable; urgency=medium
+
+  * gcc-3.2.3 prerelease (CVS 20030221)
+    - Fixes ICE on hppa (closes: #181813).
+  * Patch for ffitest in s390-java.dpatch deleted, since already fixed
+    upstream. (Gerhard Tonn)
+  * Build crtbeginT.o on m68k-linux (closes: #179807).
+  * Install gcjh-wrapper for javah (closes: #180218).
+  * gij suggests fastjar, gcj recommends fastjar (closes: #179298).
+  * Allow builds using automake1.4 | automake (<< 1.5) (closes: #180048).
+  * Backport fix for to output more correct line numbers (closes: #153965).
+  * Add help2man to build dependencies needed for some gpc man pages.
+  * gpc: Install binobj and gpidump binaries and man pages.
+  * Disable gpc on arm due to wrong code generation for fwrite in
+    glibc (see PR optimization/9279).
+
+ -- Matthias Klose <doko@debian.org>  Sat, 22 Feb 2003 19:58:20 +0100
+
+gcc-3.2 (1:3.2.3ds0-0pre1) unstable; urgency=low
+
+  * gcc-3.2.3 prerelease (CVS 20030210)
+    - Fixes long millicode calls on hppa (closes: #180520)
+  * New gpc-20030209 version.  Remove gpc-update.dpatch and gpc-testsuite.dptch
+    as they are no longer needed.
+  * Fix netbsd-i386 patches (closes: #180129, #179931)
+  * m68k-bootstrap.dpatch: backport gcse.c changes from 3.3/MAIN to 3.2
+  * Change priority of libstdc++5 and gcc-3.2-base to important.
+
+ -- Ryan Murray <rmurray@debian.org>  Tue, 11 Feb 2003 06:18:09 -0700
+
+gcc-3.2 (1:3.2.2ds8-1) unstable; urgency=low
+
+  * gcc-3.2.2 release.
+    - Fixes ICE, regression from 2.95 (closes: #176117).
+    - Fixes ICE, regression from 2.95 (closes: #179161).
+  * libstdc++ for biarch installs now upstream to usr/lib64,
+    therefore mv usr/lib/64 usr/lib64 no longer necessary. (Gerhard Tonn)
+
+ -- Ryan Murray <rmurray@debian.org>  Wed,  5 Feb 2003 01:35:29 -0700
+
+gcc-3.2 (1:3.2.2ds7-0pre8) unstable; urgency=low
+
+  * gcc-3.2.2 prerelease (CVS 20030130).
+  * update s390 libffi patch
+  * debian/control: add myself to uploaders and change libc12-dev depends to
+    libc-dev on i386 (closes: #179128)
+  * Build-Depend on procps so that ps is available for logwatch
+
+ -- Ryan Murray <rmurray@debian.org>  Fri, 31 Jan 2003 04:00:15 -0700
+
+gcc-3.2 (1:3.2.2ds6-0pre7) unstable; urgency=low
+
+  * gcc-3.2.2 prerelease (CVS 20030128).
+    - Update needed for hppa.
+    - Fixes ICE on arm, regression from 2.95.x (closes: #168086).
+    - Can use default bison (1.875).
+  * Apply netbsd build patches (closes: #177674, #178328, #178325,
+    #178326, #178327).
+  * Run the logwatch script on "slow" architectures (arm, m68k) only.
+  * autoreconf.dpatch: Only update libtool.m4, which is newer conceptually
+    than libtool 1.4 (Ryan Murray).
+  * Apply autoreconf patch universally (Ryan Murray).
+  * More robust gij/gcj wrapper scripts, include /usr/lib/jni in default
+    JNI search path (Ben Burton). Closes: #167932.
+  * Build crtbeginT.o on m68k (closes: #177036).
+  * Fixed libc-dev source dependency (closes: #178602).
+  * Tighten shlib dependency to the current package version; should be
+    1:3.2.2-1 for the final release (closes: #178867).
+
+ -- Matthias Klose <doko@debian.org>  Tue, 28 Jan 2003 21:59:30 +0100
+
+gcc-3.2 (1:3.2.2ds5-0pre6) unstable; urgency=low
+
+  * gcc-3.2 snapshot taken from the gcc-3_2-branch (CVS 20030123).
+  * Build locales needed by the libstdc++ testsuite.
+  * Update config.{guess,sub} files from autotools-dev (closes: #177674).
+  * Disable Ada and Java on netbsd-i386 (closes: #177679).
+  * gnat: Add suggests for gnat-doc and ada-reference-manual.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 23 Jan 2003 22:16:53 +0100
+
+gcc-3.2 (1:3.2.2ds4-0pre5.1) unstable; urgency=low
+
+  * Readd build dependency `locales' on arm.  locales is now installable
+  * Add autoreconf patch for mips{,el}. (closes: #176311)
+
+ -- Ryan Murray <rmurray@debian.org>  Wed, 22 Jan 2003 14:31:14 -0800
+
+gcc-3.2 (1:3.2.2ds4-0pre5) unstable; urgency=low
+
+  * Remove build dependency `libc6-dev-sparc64 [sparc]' for now.
+  * Remove build dependency `locales' on arm. locales is uninstallable
+    on arm due to the missing glibc-2.3.
+  * Use bison-1.35. bison-1.875 causes an hard error on the reduce/reduce
+    conflict in objc-parse.y.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 10 Jan 2003 10:10:43 +0100
+
+gcc-3.2 (1:3.2.2ds4-0pre4) unstable; urgency=low
+
+  * Try building with gcc-2.95 on m68k-linux. Building gcc-3.2 with gcc-3.2
+    does not work for me. m68k-linux doesn't look good at all ...
+  * Fix s390 build error.
+  * Add locales to build dependencies. A still unsolved issue is the
+    presence of the locales de_DE, en_PH, en_US, es_MX, fr_FR and it_IT,
+    or else some tests in the libstdc++ testsuite will fail.
+  * Put all -nof files in the -nof package (closes: #175253).
+  * Correctly exit logwatch script (closes: #175251).
+  * Install linker-map.gnu file for libstdc++_pic (closes: #175144).
+  * Install versioned gpcs docs only (closes: #173844).
+  * Include gpc test results in gpc package.
+  * Link local libstdc++ documentation to local source-level documentation.
+  * Clarify libstdc++ description (so version and library version).
+    Closes: #175799.
+  * Include library in libstdc++-dbg package (closes: #176005).
+
+ -- Matthias Klose <doko@debian.org>  Wed,  8 Jan 2003 23:39:50 +0100
+
+gcc-3.2 (1:3.2.2ds3-0pre3) unstable; urgency=low
+
+  * gcc-3.2 snapshot taken from the gcc-3_2-branch (CVS 20021231).
+    - Fix loop count computation for preconditioned unrolled loops.
+      Closes: #162919.
+    - Fix xmmintrin.h (_MM_TRANSPOSE4_PS) CVS 20021027 (closes: #163647).
+    - Fix [PR 8601] strlen/template interaction causes ICE CVS 20021201.
+      Closes: #166143.
+  * Watch the log files, which are written during the testsuite runs and print
+    out a message, if there is still activity. No more buildd timeouts on arm
+    and m68k ...
+  * Remove gpc's reference to librx1g-dev package (closes: #172953).
+  * Remove trailing dots on package descriptions.
+  * Fix external reference to cpp.info in gcc.info (closes: #174598).
+
+ -- Matthias Klose <doko@debian.org>  Tue, 31 Dec 2002 13:47:52 +0100
+
+gcc-3.2 (1:3.2.2ds2-0pre2) unstable; urgency=medium
+
+  * Friday, 13th upload, so what do you expect ...
+  * gcc-3.2 snapshot taken from the gcc-3_2-branch (CVS 20021212).
+  * Fix gnat build (autobuild maintainers: please revert back to gnat-3.2
+    (<= 1:3.2.1ds6-1) for building gnat-3.2, if the build fails building
+    gnatlib and gnattools).
+  * Really disable sparc64 support.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 13 Dec 2002 00:26:37 +0100
+
+gcc-3.2 (1:3.2.2ds1-0pre1) unstable; urgency=low
+
+  * A candidate for the transition ...
+  * gcc-3.2 snapshot taken from the gcc-3_2-branch (CVS 20021210).
+    - doc/invoke.texi: Remove last reference to -a (closes: #171748).
+  * Disable sparc64 support. For now please use egcs64 to build sparc64
+    kernels.
+  * Disable Pascal on the sparc architecture (doesn't bootstrap).
+
+ -- Matthias Klose <doko@debian.org>  Tue, 10 Dec 2002 22:33:13 +0100
+
+gcc-3.2 (1:3.2.2ds0-0pre0) unstable; urgency=low
+
+  * gcc-3.2 snapshot taken from the gcc-3_2-branch (CVS 20021202).
+    - Should fix _Pragma expansion within macros (closes: #157416).
+  * New gpc-20021128 version. Run check using EXTRA_TEST_PFLAGS=-g0
+  * Add tetex-bin to build dependencies (gpc needs it). Closes: #171203.
+
+ -- Matthias Klose <doko@debian.org>  Tue,  3 Dec 2002 08:22:33 +0100
+
+gcc-3.2 (1:3.2.1ds6-1) unstable; urgency=low
+
+  * gcc-3.2.1 final release.
+  * Build gpc-20021111 for all architectures. hppa and i386 are
+    known to work. For the other architectures, send the usual FTBFS ...
+    WARNING: this gpc version is an alpha version, especially debug info
+    doesn't work well, so use -g0 for compiling. If you need a stable
+    gpc compiler, use gpc-2.95.
+  * Encode the gpc upstream version in the package name, the gpc release
+    date in the version number (requested by gpc upstream).
+  * Added libncurses5-dev and libgmp3-dev as build dependencies for the
+    gpc tests and runtime.
+  * Clean CVS files as well (closes: #169101).
+  * s390-biarch.dpatch added, backported from CVS (Gerhard Tonn).
+  * s390-config-ml.dpatch added, disables biarch for java,
+    libffi and boehm-gc on s390. They need a 64 bit runtime
+    during build which is not yet available on s390 (Gerhard Tonn).
+  * Biarch support for packaging adapted (Gerhard Tonn).
+    biarch variable added and with-sparc64 variable substituted in
+    most places by biarch.
+    dh_shlibdeps is applied only to 32 bit libraries on s390, since
+    ldd for 64 bit libraries don't work on 32 bit runtime.
+    Build dependency to libc6-dev-s390x added.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 20 Nov 2002 00:20:58 +0100
+
+gcc-3.2 (1:3.2.1ds5-0pre6) unstable; urgency=medium
+
+  * gcc-3.2.1 prerelease.
+  * Removed arm patch integrated upstream.
+  * Adjust gnat build dependency (closes: #167116).
+  * Always configure with --enable-clocale=gnu. The autobuilders do have
+    locales installed, but not generated the "de_DE" locale needed for
+    the autoconf test in libstdcc++-v3/aclocal.m4.
+  * libstdc++ documentaion: Don't compresss '*.txt' referenced by html pages.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 12 Nov 2002 07:19:44 +0100
+
+gcc-3.2 (1:3.2.1ds4-0pre5) unstable; urgency=medium
+
+  * gcc-3.2.1 snapshot (CVS 20021103).
+  * sparc64-build.dpatch: Updated. Lets sparc boostrap again.
+  * s390-loop.dpatch removed, already fixed upstream (Gerhard Tonn).
+  * bison.dpatch: Removed, patch submitted upstream.
+  * backport-java-6865.dpatch: Apply again during build.
+  * Tighten glibc dependency (closes: #166703).
+
+ -- Matthias Klose <doko@debian.org>  Sun,  3 Nov 2002 12:22:02 +0100
+
+gcc-3.2 (1:3.2.1ds3-0pre4) unstable; urgency=high
+
+  * gcc-3.2.1 snapshot (CVS 20021020).
+    - Expansion of _Pragma within macros fixed (closes: #157416).
+  * FTBFS: With the switch to bison-1.50 (and 1.75), gcc-3.2 fails to build from
+    source on Debian unstable systems. This is fixed in gcc HEAD, but not on
+    the current release branch.
+    HELP NEEDED:
+    - check what is missing from the patches in debian/patches/bison.dpatch.
+      This is a backport of the bison related patches, but showing regressions
+      in the gcc testsuite, so it cannot be applied.
+    - build gcc using byacc (bootstrap currently fails using byacc).
+    - build bison-1.35 in it's own package (the current 1.35-3 package fails
+      to build form source).
+    - and finally ask upstream to backport the patch to the branch. It's not
+      helpful not beeing able to follow the stable branch. Maybe we should
+      just switch to gcc HEAD as BSD does ...
+    As a terrible workaround, build the sources from CVS first on a machine,
+    with bison-1.35 installed, then package the tarball, so the bison
+    generated files are not rebuilt.
+
+  * re-add lost patch: configure with --enable-__cxa_atexit (closes: #163422),
+    Therefore urgency high.
+  * gcj-wrapper, gij-wrapper: Accept names starting with `.' (closes: #163172,
+    #164009).
+  * Point g++ manpage to correct g++ version (closes: #162843).
+  * Support for i386-freebsd-gnu (closes: #163883).
+  * s390-java.dpatch replaced with backport from cvs head (Gerhard Tonn).
+  * Disable the testsuite run on the Hurd (closes: #159650).
+  * s390-loop.dpatch added, fixes runtime problem (Gerhard Tonn).
+  * debian/patches/bison.dpatch: Backport for bison-1.75 compatibility.
+    Don't use it due to regressions.
+  * debian/patches/backport-java-6865.dpatch: Directly applied in the
+    included tarball because of bison problems.
+  * Make fixincludes priority optional, so linda can depend on it.
+  * Tighten binutils dependency.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 20 Oct 2002 10:52:49 +0200
+
+gcc-3.2 (1:3.2.1ds2-0pre3) unstable; urgency=low
+
+  * gcc-3.2.1 snapshot (CVS 20020923).
+  * Run the libstdc++ check-abi script. Results are put into the file
+    /usr/share/doc/libstdc++5/README.libstdc++-baseline in the libstdc++5-dev
+    package. This file contains a new baseline, if no baseline for this
+    architecture is included in the gcc sources.
+  * gcj-wrapper: Accept files starting with an underscore, accept
+    path names (closes: #160859, #161517).
+  * Explicitely call automake-1.4 when rebuilding Makefiles (closes: #161438).
+  * Let installed fixincludes script find files in /usr/lib/fixincludes.
+  * debian/rules.patch: Add .NOTPARALLEL as target, so that patches are
+    applied sequentially (closes: #159395).
+
+ -- Matthias Klose <doko@debian.org>  Tue, 24 Sep 2002 07:36:56 +0200
+
+gcc-3.2 (1:3.2.1ds1-0pre2) unstable; urgency=low
+
+  * gcc-3.2.1 snapshot (CVS 20020913). Welcome back m68k in bootstrap land!
+  * Fix arm-tune.dpatch (closes: #159354).
+  * Don't overwrite LD_LIBRARY_PATH in build (closes: #158459).
+  * --disable-__cxa_atexit on NetBSD (closes: #159620).
+  * Reenable installation of message catalogs (disabled in 3.2-0pre2).
+    Closes: #160175.
+  * Ben Collins
+    - Re-enable sparc64 build. This time, it's part of the default compiler.
+      I have disabled 64/alt libraries as they are too much overhead. All
+      libraries build 64bit, but currently only libgcc/libstdc++ include the
+      64bit libraries.
+    Closes: #160404.
+  * Depend on autoconf2.13, instead of autoconf.
+  * Phil Blundell
+    - debian/patches/arm-update.dpatch: Fix python2.2 build failure.
+
+ -- Matthias Klose <doko@debian.org>  Sat,  7 Sep 2002 08:05:02 +0200
+
+gcc-3.2 (1:3.2.1ds0-0pre1) unstable; urgency=medium
+
+  * gcc-3.2.1 snapshot (CVS 20020829).
+    New g++ option -Wabi:
+      Warn when G++ generates code that is probably not compatible with the
+      vendor-neutral C++ ABI.  Although an effort has been made to warn about
+      all such cases, there are probably some cases that are not warned about,
+      even though G++ is generating incompatible code.  There may also be
+      cases where warnings are emitted even though the code that is generated
+      will be compatible.
+    The current version of the ABI is 102, defined by the __GXX_ABI_VERSION
+    macro.
+  * debian/NEWS.*: Updated.
+  * Fix libstdc++-dev dependency on libc-dev for the Hurd (closes: #157004).
+  * Add versioned expect build dependency.
+  * Tighten binutils dependency to 2.13.90.0.4.
+  * debian/patches/arm-tune.dpatch: Increase stack limit for configure.
+  * 3.2-0pre4 did build gnat-3.2 compilers for all architectures. Build-Depend
+    on gnat-3.2 now (closes: #156734).
+  * Remove bashism's in gcj-wrapper (closes: #157982).
+  * Add -cp and -classpath options to gij(1). Backport from HEAD (#146634).
+  * Add fastjar documentation.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 30 Aug 2002 10:35:00 +0200
+
+gcc-3.2 (1:3.2ds0-0pre4) unstable; urgency=low
+
+  * Correct build dependency on gnat-3.1.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 12 Aug 2002 01:21:58 +0200
+
+gcc-3.2 (1:3.2ds0-0pre3) unstable; urgency=low
+
+  * gcc-3.2 upstream prerelease.
+  * Disable all configure options, which are standard:
+    --enable-threads=posix --enable-long-long, --enable-clocale=gnu
+
+ -- Matthias Klose <doko@debian.org>  Fri,  9 Aug 2002 21:59:08 +0200
+
+gcc-3.2 (1:3.2ds0-0pre2) unstable; urgency=low
+
+  * gcc-3.2 snapshot (CVS 20020802).
+  * Fix g++-include dir.
+  * Don't install the locale files (temporarily, until we don't build
+    gcc-3.1 anymore).
+  * New package libgcj-common to avoid conflict with classpath package.
+
+ -- Matthias Klose <doko@debian.org>  Sat,  3 Aug 2002 09:08:34 +0200
+
+gcc-3.2 (1:3.2ds0-0pre1) unstable; urgency=low
+
+  * gcc-3.2 snapshot (CVS 20020729).
+
+ -- Matthias Klose <doko@debian.org>  Mon, 29 Jul 2002 20:36:54 +0200
+
+gcc-3.1 (1:3.1.1ds3-1) unstable; urgency=low
+
+  * gcc-3.1.1 release. Following this release we will have a gcc-3.2
+    release soon, which is gcc-3.1.1 plus some C++ ABI changes. Once
+    gcc-3.2 hits the archives, gcc-3.1.1 will go away.
+  * Don't build the sparc64 compiler. The packaging/patches are
+    currently broken.
+  * Add missing headers on m68k and powerpc.
+  * Install libgcc_s_nof on powerpc.
+  * Install libffi's copyright and doc files (closes: #152198).
+  * Remove dangling symlink (closes: #149002).
+  * libgcj3: Add a conflict to the classpath package (closes: #148664).
+  * README.C++: Fix URLs.
+  * libstdc++-dbg: Install into /usr/lib/debug, document it.
+  * backport-java-6865.dpatch: backport from HEAD.
+  * Fix typo in gcj docs (closes: #148890).
+  * Change libstdc++ include dir: /usr/include/c++/3.1.
+  * libstdc++-codecvt.dpatch: New patch (closes: #149776).
+  * Build libstdc++-pic package.
+  * Move 64bit libgcc in its own package libgcc1-64 (closes: #147249).
+  * Tighten glibc dependency.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 29 Jul 2002 00:34:49 +0200
+
+gcc-3.1 (1:3.1.1ds2-0pre3) unstable; urgency=low
+
+  * Updated to CVS 2002-06-06 (gcc-3_1-branch).
+  * Updated s390-java patch (Gerhard Tonn).
+  * Don't use -O in STAGE1_FLAGS on m68k.
+  * Fix `-classpath' option in gcj-wrapper script (closes: #150142).
+  * Remove g++-cxa-atexit patch, use --enable-__cxa_atexit configure option.
+
+ -- Matthias Klose <doko@debian.org>  Wed,  3 Jul 2002 23:52:58 +0200
+
+gcc-3.1 (1:3.1.1ds1-0pre2) unstable; urgency=low
+
+  * Updated to CVS 2002-06-06 (gcc-3_1-branch), fixing an ObjC regression.
+  * Welcome m68k to bootstrap land (thanks to Andreas Schwab).
+  * Add javac wrapper for gcj-3.1 (Michael Koch).
+  * Remove dangling symlink in /usr/share/doc/gcc-3.1 (closes: #149002).
+
+ -- Matthias Klose <doko@debian.org>  Fri,  7 Jun 2002 00:26:05 +0200
+
+gcc-3.1 (1:3.1.1ds0-0pre1) unstable; urgency=low
+
+  * Updated to CVS 2002-05-31 (gcc-3_1-branch).
+  * Change priorities from fastjar and gij-wrapper-3.1 from 30 to 31.
+  * Update arm-tune patch.
+  * Install xmmintrin.h header on i386 (closes: #148181).
+  * Install altivec.h header on powerpc.
+  * Call correct gij in gij-wrapper (closes: #148662, #148682).
+
+ -- Matthias Klose <doko@debian.org>  Wed, 29 May 2002 22:47:40 +0200
+
+gcc-3.1 (1:3.1ds2-2) unstable; urgency=low
+
+  * Tighten binutils dependency.
+  * Fix libstdc include dir for multilibs (Dan Jacobowitz).
+
+ -- Matthias Klose <doko@debian.org>  Tue, 21 May 2002 08:03:49 +0200
+
+gcc-3.1 (1:3.1ds2-1) unstable; urgency=low
+
+  * GCC 3.1 release.
+  * Ada cannot be built by the autobuilders for the first time. Do it by hand.
+    gnatgcc and gnatbind need to be in the PATH.
+  * Build with CC=gnatgcc, when building the Ada compiler.
+  * Hurd fixes.
+  * Don't build the sparc64 compiler; the hack isn't up to date and glibc
+    isn't converted to use /lib64 and /usr/lib64.
+  * m68k-linux shows bootstrap comparision failures. If you want to build
+    the compiler anyway and ignore the bootstrap comparision failure, edit
+    debian/rules.patch and uncomment the patch to ignore the failure. See
+    /usr/share/doc/gcc-3.1/BOOTSTRAP_COMPARISION_FAILURE for the differences.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 15 May 2002 09:53:00 +0200
+
+gcc-3.1 (1:3.1ds1-0pre6) unstable; urgency=low
+
+  * Build from the "final prerelease" tarball (gcc-3.1-20020508.tar.gz).
+  * Build gnat-3.1-doc package.
+  * Build fastjar package without building java packages.
+  * Hurd fixes.
+  * Updated sparc64-build patch.
+  * Add s390-ada patch (Gerhard Tonn).
+  * Undo the dwarf2 support for hppa from -0pre5.
+
+ -- Matthias Klose <doko@debian.org>  Thu,  9 May 2002 17:21:09 +0200
+
+gcc-3.1 (1:3.1ds0-0pre5) unstable; urgency=low
+
+  * Use /usr/include/g++-v3-3.1 as C++ include dir.
+  * Update s390-java patch (Gerhard Tonn).
+  * Tighten binutils dependency (gas patch for m68k-linux).
+  * Use gnat-3.1 as the gnat package name (as found in gcc/ada/gnatvsn.ads).
+  * dwarf2 support hppa: a snapshot of the gcc/config/pa directory
+    from the trunk dated 2002-05-02.
+
+ -- Matthias Klose <doko@debian.org>  Fri,  3 May 2002 22:51:37 +0200
+
+gcc-3.1 (1:3.1ds0-0pre4) unstable; urgency=low
+
+  * Use gnat-5.00w as the gnat package name (as found in gcc/ada/gnatvsn.ads).
+  * Don't build the shared libgnat library. It assumes an existing shared
+    libiberty library.
+  * Don't install the libgcjgc library.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 25 Apr 2002 08:48:04 +0200
+
+gcc-3.1 (1:3.1ds0-0pre3) unstable; urgency=low
+
+  * Build fastjar on all architectures.
+  * Update m68k patches.
+  * Update s390-java patch (Gerhard Tonn).
+
+ -- Matthias Klose <doko@debian.org>  Sun, 14 Apr 2002 15:34:47 +0200
+
+gcc-3.1 (1:3.1ds0-0pre2) unstable; urgency=low
+
+  * Add Ada support. To successfully build, a working gnatbind and gcc
+    driver with Ada support is needed.
+  * Apply needed arm patches from 3.0.4.
+
+ -- Matthias Klose <doko@debian.org>  Sat,  6 Apr 2002 13:17:08 +0200
+
+gcc-3.1 (1:3.1ds0-0pre1) unstable; urgency=low
+
+  * First try for gcc-3.1.
+
+ -- Matthias Klose <doko@debian.org>  Mon,  1 Apr 2002 23:39:30 +0200
+
+gcc-3.0 (1:3.0.4ds3-6) unstable; urgency=medium
+
+  * Second try at fixing sparc build problems.
+
+ -- Phil Blundell <pb@debian.org>  Sun, 24 Mar 2002 14:49:26 +0000
+
+gcc-3.0 (1:3.0.4ds3-5) unstable; urgency=medium
+
+  * Enable java on ARM.
+  * Create missing directory to fix sparc build.
+
+ -- Phil Blundell <pb@debian.org>  Fri, 22 Mar 2002 20:21:59 +0000
+
+gcc-3.0 (1:3.0.4ds3-4) unstable; urgency=low
+
+  * Link with system zlib (closes: #136359).
+
+ -- Matthias Klose <doko@debian.org>  Tue, 12 Mar 2002 20:47:59 +0100
+
+gcc-3.0 (1:3.0.4ds3-3) unstable; urgency=low
+
+  * Build libf2c (pic and non-pic) with -mieee on alpha-linux.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 10 Mar 2002 00:37:24 +0100
+
+gcc-3.0 (1:3.0.4ds3-2) unstable; urgency=medium
+
+  * Apply hppa-build patch (Randolph Chung). Closes: #136731.
+  * Make libgcc1 conflict/replace with libgcc1-sparc64. Closes: #135709.
+  * gij-3.0 provides the `java' command. Closes: #128947.
+  * Depend on binutils (>= 2.11.93.0.2-2), allows stripping of libgcj.a
+    again. Closes: #99307.
+  * Update README.cross pointing to the README of the toolchain-source
+    package.
+
+ -- Matthias Klose <doko@debian.org>  Wed,  6 Mar 2002 21:53:34 +0100
+
+gcc-3.0 (1:3.0.4ds3-1) unstable; urgency=low
+
+  * Final gcc-3.0.4 release.
+  * debian/rules.d/binary-java.mk: Fix dormant typo, exposed by removing the
+    duplicate libgcj dependency and adding the gij-3.0 package.
+    Closes: #134005.
+  * New patch by Phil Blundell to fix scalapack build error on m68k.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 20 Feb 2002 23:59:43 +0100
+
+gcc-3.0 (1:3.0.4ds2-0pre020210) unstable; urgency=low
+
+  * Make the base package dependent on the binary-arch target. Closes: #133433.
+  * Get libstdc++ on arm woring (define _GNU_SOURCE). Closes: #133435.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 11 Feb 2002 20:31:12 +0100
+
+gcc-3.0 (1:3.0.4ds2-0pre020209) unstable; urgency=high
+
+  * Update to CVS sources (20020209 gcc-3_0-branch).
+  * Apply patch to fix bootstrap error on arm-linux (submitted upstream
+    by Phil Blundell). Closes: #130422.
+  * Make base package architecture any.
+  * Decouple versioned shlib dependencies from release number for
+    libobjc as well.
+
+ -- Matthias Klose <doko@debian.org>  Sat,  9 Feb 2002 01:30:11 +0100
+
+gcc-3.0 (1:3.0.4ds1-0pre020203) unstable; urgency=medium
+
+  * One release critical bug outstanding:
+    - bootstrap error on arm.
+  * Update to CVS sources (20020203 gcc-3_0-branch).
+  * Fixed upstream: PR c/3504: Correct documentation of __alignof__.
+    Closes: #85445.
+  * Remove libgcc-powerpc patch, integrated upstream (closes: #131977).
+  * Tighten binutils build dependency (to address #126162).
+  * Move jv-convert to gcj package (closes: #131985).
+
+ -- Matthias Klose <doko@debian.org>  Sun,  3 Feb 2002 14:47:14 +0100
+
+gcc-3.0 (1:3.0.4ds0-0pre020127) unstable; urgency=low
+
+  * Two release critical bugs outstanding:
+    - bootstrap error on arm.
+    - bus errors for C++ and java executables on sparc (see the testsuite
+      results).
+  * Update to CVS sources (20020125 gcc-3_0-branch).
+  * Enable java support for s390 architecture (patch from Gerhard Tonn).
+  * Updated NEWS file for 3.0.3.
+  * Disable building the gcc-sparc64, but build a multilibbed compiler
+    for sparc as the default.
+  * Disabled the subreg-byte patch for sparc (request from Ben Collins).
+  * Fixed reference to libgcc1 package in README (closes: #126218).
+  * Do recommend libc-dev, not depend on it. For low-end or embedded systems
+    the dependency on libc-dev can make the difference between
+    having enough or having too little space to build a kernel.
+  * README.cross: Updated by Hakan Ardo.
+  * Decouple versioned shlib dependencies from release number. Closes: #118391.
+  * Fix diversions for gcc-3.0-sparc64 package (closes: #128178),
+    unconditionally remove `sparc64-linux-gcc' alternative.
+  * g77/README.libg2c.Debian: New file mentioning `libg2c-pic'. The next
+    g77 version (3.1) does build a static and shared library (closes: #104250).
+  * Fix formatting errors in the synopsis of the java man pages. Maybe the
+    reason for #127571. Closes: #127571.
+  * fastjar: Fail for the (currently incorrect) -u option. Addresses: #116145.
+    Add alternative for `jar' using priority 30 (closes: #118648).
+  * jv-convert: Add --help option and man page. Backport from HEAD branch.
+  * libgcj2-dev: Remove duplicate dependency (closes: #127805).
+  * Giving up and make just another new package gij-X.Y with only the gij-X.Y
+    binary for policy conformance (closes: #127111).
+  * gij: Provides an alternative for `java' (priority 30) using a wrapper
+    script (Stephen Zander) (closes: #128974). Added simple manpage.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 27 Jan 2002 13:33:41 +0100
+
+gcc-3.0 (1:3.0.3ds3-1) unstable; urgency=low
+
+  * Final gcc-3.0.3 release.
+  * Do not compress .txt files in libstdc++ docs referenced from html
+    pages (closes: #124136).
+  * libstdc++-dev suggests libstdc++-doc.
+  * debian/patches/gcc-ia64-NaT.dpatch: Update (closes: #123685).
+
+ -- Matthias Klose <doko@debian.org>  Fri, 21 Dec 2001 02:54:11 +0100
+
+gcc-3.0 (1:3.0.3ds2-0pre011215) unstable; urgency=low
+
+  * Update to CVS sources (011215).
+  * libstdc++ documentation updated upstream (closes: #123790).
+  * debian/patches/gcc-ia64-NaT.dpatch: Disable. Fixes bootstrap error
+    on ia64 (#123685).
+
+ -- Matthias Klose <doko@debian.org>  Sat, 15 Dec 2001 14:43:21 +0100
+
+gcc-3.0 (1:3.0.3ds1-0pre011210) unstable; urgency=medium
+
+  * Update to CVS sources (011208).
+  * Supposed to fix powerpc build error (closes: #123155).
+
+ -- Matthias Klose <doko@debian.org>  Thu, 13 Dec 2001 07:26:05 +0100
+
+gcc-3.0 (1:3.0.3ds0-0pre011209) unstable; urgency=medium
+
+  * Update to CVS sources (011208). Frozen for upstream 3.0.3 release.
+  * Apply contrib/PR3145.patch, a backport of Nathan Sidwell's patch to
+    fix PR c++/3145, the infamous "virtual inheritance" bug. This affected
+    especially KDE2 (eg. artsd). Franz Sirl <Franz.Sirl-kernel@lauterbach.com>
+  * cc1plus segfault in strength reduction fixed upstream. Closes: #122547.
+  * debian/patches/gcc-ia64-NaT.dpatch: Add patch to avoid a bug that can
+    cause miscompiled userapps to crash the kernel. Closes: #121924.
+  * Reenable shared libgcc for powerpc. Fixed upstream.
+    http://gcc.gnu.org/ml/gcc-patches/2001-11/msg00340.html
+    debian/patches/libgcc-powerpc.dpatch: New patch.
+  * Add upstream changelogs.
+  * Remove gij alternative. Move to gij package.
+
+ -- Matthias Klose <doko@debian.org>  Sun,  9 Dec 2001 09:36:48 +0100
+
+gcc-3.0 (1:3.0.2ds4-4) unstable; urgency=medium
+
+  * Disable building of libffi on mips and mipsel.
+    (closes: #117503).
+  * Enable building of shared libgcc on s390
+    (closes: #120452).
+
+ -- Christopher C. Chimelis <chris@debian.org>  Sat, 1 Dec 2001 06:15:29 -0500
+
+gcc-3.0 (1:3.0.2ds4-3) unstable; urgency=medium
+
+  * Fix logic to build libffi without java (closes: #117503).
+
+ -- Matthias Klose <doko@debian.org>  Sun,  4 Nov 2001 14:34:50 +0100
+
+gcc-3.0 (1:3.0.2ds4-2) unstable; urgency=medium
+
+  * Enable java for ia64 (Jeff Licquia). Closes: #116798.
+  * Allow building of libffi without gcj (Jeff Licquia).
+    New libffi packages for arm hurd-i386 mips mipsel,
+    still missing: hppa, s390.
+  * debian/NEWS.gcc: Add 3.0.2 release notes.
+  * debian/patches/hppa-align.dpatch: New patch from Alan Modra,
+    submitted by Randolph Tausq.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 25 Oct 2001 23:59:31 +0200
+
+gcc-3.0 (1:3.0.2ds4-1) unstable; urgency=medium
+
+  * Final gcc-3.0.2 release. The source tarball is not the released
+    tarball, but taken from CVS 011024).
+  * Remove patch for s390, included upstream.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 24 Oct 2001 00:49:40 +0200
+
+gcc-3.0 (1:3.0.2ds3-0pre011014) unstable; urgency=low
+
+  * Update to CVS sources (011014). Frozen for upstream 3.0.2 release.
+    Closes: #109351, #114099, #114216, #105741 (allegro3938).
+  * Added debian/patches/fastjar.dpatch, which makes fastjar extract
+    filenames correctly (previously, some had incorrect names on extract).
+    Closes: #113236.
+  * Priorities fixed in the past (closes: #94404).
+
+ -- Matthias Klose <doko@debian.org>  Sun, 14 Oct 2001 13:19:43 +0200
+
+gcc-3.0 (1:3.0.2ds2-0pre010923) unstable; urgency=low
+
+  * Bootstraps on powerpc again (closes: #112777).
+
+ -- Matthias Klose <doko@debian.org>  Sun, 23 Sep 2001 01:32:11 +0200
+
+gcc-3.0 (1:3.0.2ds2-0pre010922) unstable; urgency=low
+
+  * Update to CVS sources (010922).
+  * Fixed upstream (closes: #111801). #105569 on hppa.
+  * Update hppa patch (Matt Taggart).
+  * Fix libstdc++-dev package description (closes: #112758).
+  * debian/rules.d/binary-objc.mk: Fix build error (closes: #112462).
+  * Make gobjc-3.0 conflict with gcc-3.0-sparc64 (closes: #111772).
+
+ -- Matthias Klose <doko@debian.org>  Sat, 22 Sep 2001 09:34:49 +0200
+
+gcc-3.0 (1:3.0.2ds1-0pre010908) unstable; urgency=low
+
+  * Update to CVS sources (010908).
+  * Update hppa patch (Matt Taggart).
+  * Depend on libgc6-dev, not libgc5-dev, which got obsolete (during
+    the freeze ...). However adds s390 support (closes: #110189).
+  * debian/patches/m68k-reload.dpatch: New patch (Roman Zippel).
+    Fixes #89023.
+  * debian/patches/gcc-sparc.dpatch: New patch ("David S. Miller").
+    Fixes libstdc++ testsuite failures on sparc.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 8 Sep 2001 14:26:20 +0200
+
+gcc-3.0 (1:3.0.2ds0-0pre010826) unstable; urgency=low
+
+  * gcc-3.0-nof: Fix symlink to gcc-3.0-base doc directory.
+  * debian/patches/gcj-without-rpath: New patch.
+  * Remove self dependency on libgcj package.
+  * Handle diversions for upgrades from 3.0 and 3.0.1 -> 3.0.2
+    in gcc-3.0-sparc64 package.
+  * Build libg2c.a with -fPIC -DPIC and name the result libg2c-pic.a.
+    Link with this library to avoid linking with non-pic code.
+    Use this library when building dynamically loadable objects (python
+    modules, gimp plugins, ...), which need to be linked against g2c or
+    a library which is linked against g2c (i.e. lapack).
+    Packages needing '-lg2c-pic' must have a build dependency on
+    'g77-3.0 (>= 1:3.0.2-0pre010826).
+
+ -- Matthias Klose <doko@debian.org>  Sun, 26 Aug 2001 13:59:03 +0200
+
+gcc-3.0 (1:3.0.2ds0-0pre010825) unstable; urgency=low
+
+  * Update to CVS sources (010825).
+  * Add libc6-dev-sparc64 to gcc-3.0-sparc64 and to sparc build dependencies.
+  * Remove conflicts on egcc package (closes: #109718).
+  * Fix gcc-3.0-nof dependency.
+  * s390 patches against gcc-3.0.1 (Gerhard Tonn).
+  * debian/control: Require binutils (>= 2.11.90.0.27)
+
+ -- Matthias Klose <doko@debian.org>  Sat, 25 Aug 2001 10:59:15 +0200
+
+gcc-3.0 (1:3.0.1ds3-1) unstable; urgency=low
+
+  * Final gcc-3.0.1 release.
+  * Changed upstream: default of -flimit-inline is 600 (closes: #106716).
+  * Add fastjar man page (submitted by "The Missing Man Pages Project",
+    http://www.netmeister.org/misc/m2p2i/) (closes: #103051).
+  * Fixed in last upload as well: #105246.
+  * debian/patches/cpp-memory-leak.dpatch: New patch
+  * Disable installation of shared libgcc on s390 (Gerhard Tonn).
+
+ -- Matthias Klose <doko@debian.org>  Mon, 20 Aug 2001 20:47:13 +0200
+
+gcc-3.0 (1:3.0.1ds2-0pre010811) unstable; urgency=high
+
+  * Update to CVS sources (010811). Includes s390 support.
+  * Add xlibs-dev to Build-Depends (libgcj).
+  * Enable java for powerpc, disable java for ia64.
+  * Enable ObjC garbage collection for all archs, which have a libgc5-dev
+    package.
+  * New patch libstdc++-codecvt (Michael Piefel) (closes: #104614).
+  * Don't strip static libgcj library (work around binutils bug #107812).
+  * Handle diversions for upgrade 3.0 -> 3.0.1 in gcc-3.0-sparc64 package
+    (closes: #107569).
+
+ -- Matthias Klose <doko@debian.org>  Sat, 11 Aug 2001 20:42:15 +0200
+
+gcc-3.0 (1:3.0.1ds1-0pre010801) unstable; urgency=high
+
+  * Update to CVS sources (010801). (closes: #107012).
+  * Remove build dependency on non-free graphviz and include pregenerated
+    docs (closes: #107124).
+  * Fixed in 3.0.1 (closes: #99307).
+  * Updated m68k-updates patch (Roman Zippel).
+  * Another fix for ia64 packaging bits (Randolph Chung).
+
+ -- Matthias Klose <doko@debian.org>  Tue, 31 Jul 2001 21:52:55 +0200
+
+gcc-3.0 (1:3.0.1ds0-0pre010727) unstable; urgency=high
+
+  * Update to CVS sources (010727).
+  * Add epoch to source version. Change '.dsx' to 'dsx', so that
+    3.1.1ds0 gt 3.1ds7 (closes: #106538).
+
+ -- Matthias Klose <doko@debian.org>  Sat, 28 Jul 2001 09:56:29 +0200
+
+gcc-3.0 (3.0.1.ds0-0pre010723) unstable; urgency=high
+
+  * ia64 packaging bits (Randolph Chung) (closes: #106252).
+
+ -- Matthias Klose <doko@debian.org>  Mon, 23 Jul 2001 23:02:03 +0200
+
+gcc-3.0 (3.0.1.ds0-0pre010721) unstable; urgency=high
+
+  * Update to CVS sources (010721).
+    - Remove patches applied upstream: libstdc++-limits.dpatch,
+      objc-data-references
+    - Updated other patches.
+  * Fix gij alternative (closes: #103468, #103883).
+  * Patch to fix bootstrap on sparc (closes: #103568).
+  * Corrected (closes: #105371) and updated README.Debian.
+  * m68k patches for sucessful bootstrap (Roman Zippel).
+  * Add libstdc++v3 porting hints to README.Debian and README.C++.
+  * m68k md fix (#105622) (Roman Zippel).
+  * debian/rules2: Disable non-functional ulimit on Hurd (#105884).
+  * debian/control: Require binutils (>= 2.11.90.0.24)
+  * Java is enabled for alpha (closes: #87300).
+
+ -- Matthias Klose <doko@debian.org>  Sun, 22 Jul 2001 08:24:04 +0200
+
+gcc-3.0 (3.0.ds9-4) unstable; urgency=high
+
+  * Move this version to testing ASAP. testing still has a prerelease
+    version with now incompatible ABI's. If sparc doesn't build,
+    then IMHO it's better to remove it from testing.
+  * debian/control.m4: Set uploaders field. Adjust description of
+    gcc-3.0 (binary) package (closes: #102271, #102620).
+  * Separate gij.1 in it's own pseudo man page (closes: #99523).
+  * debian/patches/java-manpages.dpatch: New patch.
+  * libgcj: Install unversioned gij.
+
+ -- Matthias Klose <doko@debian.org>  Tue,  3 Jul 2001 07:38:08 +0200
+
+gcc-3.0 (3.0.ds9-3) unstable; urgency=high
+
+  * Reenable configuration with posix threads on i386 (lost in hurd-i386
+    merge).
+
+ -- Matthias Klose <doko@debian.org>  Sun, 24 Jun 2001 22:21:45 +0200
+
+gcc-3.0 (3.0.ds9-2) unstable; urgency=medium
+
+  * Move this version to testing ASAP. testing still has a prerelease
+    version with now incompatible ABI's.
+  * Add libgcc0 and libgcc300 to the build conflicts (#102041).
+  * debian/README.FIRST: Removed (#101534).
+  * Updated subreg-byte patch (doc files).
+  * Disable java for the Hurd, mips and mipsel (#101570).
+  * Patch for building on the Hurd (#101708) (Jeff Bailey <jbailey@nisa.net>).
+  * Packaging fixes for the Hurd (#101711) (Jeff Bailey <jbailey@nisa.net>).
+  * Include pregenerated doxygen (1.2.6) docs for libstdc++-v3 (#101557).
+    The current doxygen-1.2.8.1 segaults.
+  * C++: Enable -fuse-cxa-atexit by default (#101901).
+  * Correct mail address in gccbug (#101743).
+  * Make rules resumable after failure in binary-xxx targets (#101637).
+
+ -- Matthias Klose <doko@debian.org>  Sun, 24 Jun 2001 16:04:53 +0200
+
+gcc-3.0 (3.0.ds9-1) unstable; urgency=low
+
+  * Final 3.0 release.
+  * Update libgcc version number (#100983, #100988, #101069, #101115, #101328).
+  * Updated hppa-build patch (Matt Taggart <taggart@carmen.fc.hp.com>).
+  * Disable java for hppa.
+  * Updated subreg-byte patch for sparc (Ben Collins).
+
+ -- Matthias Klose <doko@debian.org>  Mon, 18 Jun 2001 18:26:04 +0200
+
+gcc-3.0 (3.0.ds8-0pre010613) unstable; urgency=low
+
+  * Update patches for recent (010613 23:13 +0200) CVS sources.
+  * Fix packaging bugs (#100459, #100447, #100483).
+  * Build-Depend on gawk, mawk doesn't work well with test_summary.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 13 Jun 2001 23:13:38 +0200
+
+gcc-3.0 (3.0.ds7-0pre010609) unstable; urgency=low
+
+  * Fix build dependency for the hurd (#99164).
+  * Update patches for recent (010609) CVS sources.
+  * Disable java on powerpc (link error in libjava).
+  * gcc-3.0-base.postinst: Don't prompt for non-interactive installs (#100110).
+
+ -- Matthias Klose <doko@debian.org>  Sun, 10 Jun 2001 09:45:57 +0200
+
+gcc-3.0 (3.0.ds6-0pre010526) unstable; urgency=high
+
+  * Urgency "high" for replacing the gcc-3.0 snapshots in testing, which
+    now are incompatile due to the changed ABIs.
+  * Upstream begins tagging with "gcc-3_0_pre_2001mmdd".
+  * Tighten dependencies to install only binary packages derived from
+    one source (#98851). Tighten libc6-dev dependency to match libc6.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 27 May 2001 11:35:31 +0200
+
+gcc-3.0 (3.0.ds6-0pre010525) unstable; urgency=low
+
+  * ATTENTION: The ABI (exception handling) changed. No upgrade path from
+    earlier snapshots (you had been warned in the postinst ...)
+    Closing #93597, #94576, #96448, #96461.
+    You have to rebuild
+  * HELP is appreciated for scanning the Debian BTS and sending followups
+    to bug reports!!!
+  * Should we name debian gcc uploads? What about a "still seeking
+    g++ maintainer" upload?
+  * Fixed in gcc-3.0: #97030
+  * Update patches for recent (010525) CVS sources.
+  * Make check depend on build target (fakeroot problmes).
+  * debian/rules.d/binary-libgcc.mk: new file, build first.
+  * Free memory detection on the hurd for running the testsuite.
+  * Update debhelper build dependency.
+  * libstdc++-doc: Include doxygen generated docs.
+  * Fix boring packaging bugs, too tired for appropriate changelogs ...
+    #93343, #96348, #96262, #97134, #97905, #96451, #95812, #93157
+  * Fixed bugs: #87000.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 26 May 2001 23:10:42 +0200
+
+gcc-3.0 (3.0.ds5-0pre010510) unstable; urgency=low
+
+  * Update patches for recent (010506) CVS sources.
+  * New version of source, as of 2001-05-10
+  * New version of gpc source, as of 2001-05-06 (disabled by default).
+  * Make gcc-3.0-sparc64 provide an alternative for sparc64-linux-gcc,
+    since it can build kernels just fine (it seems)
+  * Add hppa patch from Matt Taggart
+  * Fix objc info inclusion...now merged with gcc info
+  * Do not install the .la for libstdc++, since it confuses libtool linked
+    applications when libstdc++3-dev and libstdc++2.10-dev are both
+    installed (closes #97905).
+  * Fixed gcc-base and libgcc section/prio to match overrides
+
+ -- Ben Collins <bcollins@debian.org>  Mon,  7 May 2001 00:08:52 +0200
+
+gcc-3.0 (3.0.ds5-0pre010427) unstable; urgency=low
+
+  * Fixed priority for fastjar from optional to extra
+  * New version of source, as of 2001-04-27
+  * Fix description of libgcj-dev
+  * libffi-install: Make libffi installable
+  * Add libffi and libffi-dev packages. libffi is only enabled for java
+    targets right now. Perhaps more will be enabled later.
+  * Fixes to build cross compiler package (for avr)
+    (Hakan Ardo <hakan@debian.org>).
+  * Better fixincludes description (#93157).
+  * Remove all remnants of libg++
+  * Remove all hacks around libstdc++ version. Since we are strictly v3 now,
+    we can treat it like a normal shared lib, and not worry about all those
+    ABI changes.
+  * Remove all cruft control scripts. Note, debhelper will create scripts
+    that it needs to. It will do the doc link stuff and the ldconfig stuff
+    explicitly.
+  * Clean up the SONAME parsing stuff, make it a little more cleaner over
+    all the lib packages
+  * Make libffi install when built (IOW, whenever java is enabled). This
+    should obsolete the libffi package, which is old and broken
+  * Revert to normal sonames, except for ia64 (for now)
+  * Remove all references to dh_testversion, since they are deprecated for
+    Build-Depends
+  * Fix powerpc nof build
+  * Remove all references to the MULTILIB stuff, since the arches are
+    using specialized builds anyway (nof, softfloat).
+  * Added 64bit sparc64 package (gcc-3.0-sparc64, libgcc0-sparc64)
+  * Removed obsolete shlibs.local file
+
+ -- Ben Collins <bcollins@debian.org>  Sun, 15 Apr 2001 21:33:15 -0400
+
+gcc-3.0 (3.0.ds4-0pre010403) unstable; urgency=low
+
+  * debian/README: Updated for gcc-3.0
+  * debian/rules.patch: Added subreg-byte patch for sparc
+  * debian/rules.unpack: Update to current CVS for gcc tarball name
+  * debian/patches/subreg-byte.dpatch: sparc subreg-byte support
+  * debian/patches/gcc-rawhide.dpatch: Removed
+    debian/patches/gpc-2.95.dpatch: Removed
+    debian/patches/sparc32-rfi.dpatch: Removed
+    debian/patches/temporary.dpatch: Removed
+  * Moving to unstable now
+  * debian/patches/gcc-ppc-disable-shared-libgcc.dpatch: New patch,
+    disables shared libgcc for powerpc target, since it isn't compatible
+    with the EABI objects.
+  * Create $(with_shared_libgcc) var
+  * debian/rules.d/binary-gcc.mk: Use this new variable to determine if
+    the libgcc package actually has any files
+
+ -- Ben Collins <bcollins@debian.org>  Tue,  3 Apr 2001 23:00:55 -0400
+
+gcc-3.0 (3.0.ds2-0pre010223) experimental; urgency=low
+
+  * New snapshot. Use distinct shared object names for shared libraries:
+    we don't know if binary API's still change until the final release.
+  * Versioned package names.
+  * debian/control.m4: New file. Add gcc-base, libgcc0, libobjc1,
+    libstdc++-doc, libgcj1, libgcj1-dev, fastjar, fixincludes packages.
+    Remove gcc-docs package.
+  * debian/gcov.1: Remove.
+  * debian/*: Remove 2.95.x support. Prepare for 3.0.
+  * debian/patches: Remove 2.95.x patches.
+  * Changed source package name. It's not allowed anymore to overwrite
+    source packages with different content. Introducing a 'debian source
+    element' (.ds<num>), which is stripped again from the version number
+    for the binary packages.
+  * Fixed bugs and added functionality:
+    #26436, #27878, #33786, #34876, #35477, #42662, #46181, #42989,
+    #47981, #48530, #50529, #51227, #51456, #51651, #52382, #53698,
+    #55291, #55967, #56867, #58219, #59005, #59232, #59776, #64628,
+    #65687, #67631, #68632, #68963, #68987, #69530, #72933, #75120,
+    #75759, #76645, #76827, #83221, #87540
+  * libgcj fixes: 42894, #51266, #68560, #71187, #79984
+
+ -- Matthias Klose <doko@debian.org>  Sat, 24 Feb 2001 13:41:11 +0100
+
+gcc-2.95 (2.95.3-2.001222) experimental; urgency=low
+
+  * New upstream version 2.95.3 experimental (CVS 20001222).
+  * debian/control.in: Versioned package names, removal of snapshot logic.
+    Remove fake gcc-docs package.
+  * Reserve -1 release numbers for woody.
+  * Updated to gpc-20001218.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 22 Dec 2000 19:53:03 +0100
+
+gcc (2.95.2-20) unstable; urgency=low
+
+    * Apply patch from gcc-2_95-branch; remove ulimit for make check.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 10 Dec 2000 17:01:13 +0100
+
+gcc (2.95.2-19) unstable; urgency=low
+
+  * Added testsuite-20001207 from current snapshots. We'll need results
+    for 2.95.2 to make sure there are no regressions against that release.
+    Dear build daemons and porters to other architectures, please send an
+    email to gcc-testresults@gcc.gnu.org.
+    You can do this by running "debian/rules mail-summary".
+  * Updated to gpc-20001206.
+  * Added S/390 patch prepared by Chu-yeon Park <kokids@debian.org> (#78983).
+  * debian/patches/libio.dpatch: Fix iostream doc (fixes #77647).
+  * debian/patches/gcc-doc.dpatch: Update URL (fixes #77542).
+  * debian/patches/gcc-reload1.dpatch Patch from the gcc-bug list which
+    fixes a problem in "long long" on i[345]86 (i686 was not affected).
+
+ -- Matthias Klose <doko@debian.org>  Sat,  9 Dec 2000 12:30:32 +0100
+
+gcc (2.95.2-18) unstable; urgency=low
+
+  * debian/control.in: Fix syntax errors (fixes #76146, #76458).
+    Disable gpc on the hurd by request (#75686).
+  * debian/patches/arm-various.dpatch: Patches from Philip Blundell
+    for ARM arch (fixes #75801).
+  * debian/patches/gcc-alpha-mi-thunk.dpatch: Patches from Chris Chimelis
+    for alpha arch.
+  * debian/patches/g77-docs.dpatch: Adjust g77 docs (fixes #72594).
+  * Update gpc to gpc-20001118.
+  * Reenable gpc for alpha.
+  * debian/README.C++: Merge debian/README.libstdc++ and C++ FAQ information
+    provided by Matt Zimmermann.
+  * Build gcj only on architectures, where libgcj-2.95.1 can be built as well.
+    Probably needs some adjustments ...
+  * Conditionalize for chill, fortran, java, objc and chill.
+
+  * NOT APPLIED:
+    debian/patches/libstdc++-bastring.dpatch: Apply fix (fixes #75759).
+
+ -- Matthias Klose <doko@debian.org>  Sun, 19 Nov 2000 10:40:41 +0100
+
+gcc (2.95.2-17) unstable; urgency=low
+
+  * Disable gpc for alpha.
+  * Include gpc-cpp in gpc package (fixes #74492).
+  * Don't build gcc-docs compatibility package anymore.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 11 Oct 2000 06:16:53 +0200
+
+gcc (2.95.2-16) unstable; urgency=low
+
+  * Applied the emdebian/cross compiler patch and documentation
+    (Frank Smith <smith@amirix.com>).
+  * Applied patch for avr target (Hakan Ardo <hakan@debian.org>).
+  * debian/control.in: Add awk to Build-Depends.
+    Tighten libc6-dev dependency for libstdc++-dev (fixes #73031,
+    #72531, #72534).
+  * Disable libobjc_gc for m68k again (fixes #74380).
+  * debian/patches/arm-namespace.dpatch: Apply patch from Philip
+    Blundell <pb@futuretv.com> to fix name space pollution on arm
+    (fixes #70937).
+  * Fix more warnings in STL headers (fixes #69352, #71943).
+
+ -- Matthias Klose <doko@debian.org>  Mon,  9 Oct 2000 21:51:41 +0200
+
+gcc (2.95.2-15) unstable; urgency=low
+
+  * debian/control.in: Add libgc5-dev to build depends (fixes #67015).
+  * debian/rules.def: Build GC enabled ObjC runtime for sparc.
+  * Bug #58741 fixed (in some version since 2.95.2-5).
+  * debian/control.in: Recommend librx1g-dev, libgmp2-dev, libncurses5-dev
+    (unit dependencies).
+  * Patches from Marcus Brinkmann for the hurd (fixes #67763):
+    - debian/rules.defs: Disable objc_gc on hurd-i386.
+      Disable libg++ on GNU systems.
+    - debian/rules2: Set correct names of libstdc++/libg++
+      libraries on GNU systems.
+      Write out correct shlibs and shlibs.local file content.
+    - Keep _G_config.h for the Hurd.
+  * Apply patch for ObjC linker warnings.
+  * Don't apply gcj backport patch for sparc.
+  * Apply libio compatability patch
+  * debian/glibcver.sh: generate appropriate version for glibc
+  * debian/rules.conf: for everything after glibc 2.1, we always append
+    "-glibc$(ver)" to the C++ libs for linux.
+  * Back down gpc to -13 version (-14 wont compile on anything but i386
+    and m68k becuase of gpc).
+  * Remove extraneous and obsolete sparc64 patches/files from debian/*
+
+ -- Ben Collins <bcollins@debian.org>  Thu, 21 Sep 2000 08:08:35 -0400
+
+gcc-snapshot (20000901-2.2) experimental; urgency=low
+
+  * New snapshot.
+  * debian/rules2: Move tradcpp0 to cpp package.
+
+ -- Matthias Klose <doko@debian.org>  Sat,  2 Sep 2000 01:14:28 +0200
+
+gcc-snapshot (20000802-2.1) experimental; urgency=low
+
+  * New snapshot.
+  * debian/rules2: Fixes. tradcpp0 is in gcc package, not cpp.
+
+ -- Matthias Klose <doko@debian.org>  Thu,  3 Aug 2000 07:40:05 +0200
+
+gcc-snapshot (20000720-2) experimental; urgency=low
+
+  * New snapshot.
+  * Enable libstdc++-v3.
+  * debian/rules2: Don't use -D for /usr/bin/install.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 20 Jul 2000 22:33:37 +0200
+
+gcc (2.95.2-14) unstable; urgency=low
+
+  * Update gpc patch.
+
+ -- Matthias Klose <doko@debian.org>  Wed,  5 Jul 2000 20:51:16 +0200
+
+gcc (2.95.2-13) frozen unstable; urgency=low
+
+  * Update debian/README: document how to compile 2.0.xx kernels; don't
+    register gcc272 as an alternative for gcc (closes #62419).
+    Clarify compiler setup (closes #65548).
+  * debian/control.in: Make libstdc++-dev depend on current version of g++.
+  * Undo CVS update from release -8 (problems on alpha, #55263).
+
+ -- Matthias Klose <doko@debian.org>  Mon, 19 Jun 2000 23:06:48 +0200
+
+gcc (2.95.2-12) frozen unstable; urgency=low
+
+  * debian/gpc.postinst: Correct typo introduced with -11 (fixes #64193).
+  * debian/patches/gcc-rs600.dpatch: ppc codegen fix (fixes #63933).
+
+ -- Matthias Klose <doko@debian.org>  Sun, 21 May 2000 15:56:05 +0200
+
+gcc (2.95.2-11) frozen unstable; urgency=medium
+
+  * Upload to unstable again (fixes critical #63784).
+  * Fix doc-base files (fixes important #63810).
+  * gpc wasn't built in -10 (fixes #63977).
+  * Make /usr/bin/pc an alternative (fixes #63888).
+  * Add SYSCALLS.c.X to gcc package.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 14 May 2000 22:17:44 +0200
+
+gcc (2.95.2-10) frozen; urgency=low
+
+  * debian/control.in: make gcc conflict on any version of egcc
+    (slink to potato upgrade problem, fixes grave #62084).
+  * Build protoize programs, separate out in new package (fixes #59436,
+    #62911).
+  * Create dummy gcc-docs package for smooth update from slink (fixes #62537).
+  * Add doc-base support for all -doc packages (fixes #63380).
+
+ -- Matthias Klose <doko@debian.org>  Mon,  1 May 2000 22:24:28 +0200
+
+gcc (2.95.2-9) frozen unstable; urgency=low
+
+  * Disable the sparc-bi-arch.dpatch (patch from Ben Collins, built
+    for sparc as NMU 8.1) (fixes critical #61529 and #61511).
+    "Seems that when you compile gcc 2.95.x for sparc64-linux and compile
+     sparc32 programs, the code is not the same as sparc-linux compile for
+     sparc32 (this is a bug, and is fixed in gcc 2.96 CVS)."
+  * debian/patches/gcj-vs-iconv.dpatch: Option '--encoding' for
+    encoding of input files. Patch from Tom Tromey  <tromey@cygnus.com>
+    backported to 2.95.2 (fixes #42895).
+    Compile a Latin-1 encoded file with `gcj --encoding=Latin1 ...'.
+  * debian/control.in: gcc, g++ and gobjc suggest their corresponding
+    task packages (fixes #59623).
+
+ -- Matthias Klose <doko@debian.org>  Sat,  8 Apr 2000 20:19:15 +0200
+
+gcc (2.95.2-8) frozen unstable; urgency=low
+
+  * Post-2.95.2 CVS updates of the gcc-2_95-branch until 20000313.
+  * debian/rules2: configure with --enable-java-gc=no for sparc. Fixes
+    gcj side of #60535.
+  * debian/rules.patch: Disable gcc-emit-rtl patch for all archs but
+    alpha. Disable g++-is-tree patch ("just for 2.95.1").
+  * debian/README: Update for gcc-2.95.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 27 Mar 2000 00:03:16 +0200
+
+gcc (2.95.2-7) frozen unstable; urgency=low
+
+  * debian/patches/gcc-empty-struct-init.dpatch; Apply patch from
+    http://gcc.gnu.org/ml/gcc-patches/2000-02/msg00637.html. Fixes
+    compilation of 2.3.4x kernels.
+  * debian/patches/gcc-emit-rtl.dpatch: Apply patch from David Huggins-Daines
+    <dhuggins@linuxcare.com> (backport from 2.96 CVS to fix #55263).
+  * debian/patches/gcc-pointer-arith.dpatch: Apply patch from Jim Kingdon
+    <kingdon@redhat.com> (backport from 2.96 CVS to fix #54951).
+
+ -- Matthias Klose <doko@debian.org>  Thu,  2 Mar 2000 23:16:43 +0100
+
+gcc (2.95.2-6) frozen unstable; urgency=low
+
+  * Post-2.95.2 CVS updates of the gcc-2_95-branch until 20000220.
+  * Remove dangling symlink probably left over from libstdc++2.9
+    package (fixes #53661).
+  * debian/patches/gcc-alpha-complex-float.dpatch: Fixed patch by
+    David Huggins-Daines (fixes #58486).
+  * debian/g++.{postinst,prerm}: Remove outdated g++FAQ registration
+    (fixes #58253).
+  * debian/control.in: gcc-doc replaces gcc-docs (fixes #58108).
+  * debian/rules2: Include some fixed headers (asm, bits, linux, ...).
+  * debian/patches/{gcc-alpha-ev5-fix,libstdc++-valarray}.dpatch: Remove.
+    Applied upstream.
+  * debian/patches/libstdc++-bastring.dpatch: Add patch from
+    sicard@bigruth.solsoft.fr (fixes #56715).
+
+ -- Matthias Klose <doko@debian.org>  Sun, 20 Feb 2000 15:08:13 +0100
+
+gcc (2.95.2-5) frozen unstable; urgency=low
+
+  * Post-2.95.2 CVS updates of the gcc-2_95-branch until 20000116.
+  * Add more build dependencies (fixes #53204).
+  * debian/patches/gcc-alpha-complex-float.dpatch: Patch from
+    Joel Klecker <jk@espy.org> to compile glibc correctly on alpha.
+    "Should fix the g77 problems too."
+  * debian/patches/{libio,libstdc++-wall2}.dpatch. Remove patches
+    applied upstream.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 16 Jan 2000 19:16:54 +0100
+
+gcc (2.95.2-4) unstable; urgency=low
+
+  * debian/patches/libio.dpatch: Patch from Martin v. Loewis.
+    (fixes: #35628).
+  * debian/patches/libstdc++-deque.dpatch: Patch from Martin v. Loewis.
+    (fixes: #52689).
+  * debian/control.in: Updated Build-Depends, removed outdated README.build.
+    Fixes #51246.
+  * Tighten dependencies to cpp (>= 2.95.2-4) (closes: #50294).
+  * debian/rules.patch: Really do not apply patches/gcj-backport.dpatch.
+    Fixes #51636.
+  * Apply updated sparc-bi-arch.dpatch from Ben Collins.
+  * libstdc++: Define wstring type, if __ENABLE_WSTRING is defined. Request
+    from the author of the War FTP Daemon for Linux ("Jarle Aase"
+    <jgaa@jgaa.com>).
+  * debain/g++.preinst: Remove dangling sysmlinks (fixes #52359).
+
+ -- Matthias Klose <doko@debian.org>  Sun, 19 Dec 1999 21:53:48 +0100
+
+gcc (2.95.2-3) unstable; urgency=low
+
+  * debian/rules2: Don't install $(gcc_lib_dir)/include/asm; these are
+    headers fixed for glibc-1.x (closes: #49434).
+  * debian/patches/cpp-dos-newlines.dpatch: Keep CR's without
+    following LF (closes: #49186).
+  * Bug #37358 (internal compiler errors when building vdk_0.6.0-5)
+    fixed in gcc-2.95.? (closes: #37358).
+  * Apply patch gcc-alpha-ev5-fix from Richard Henderson <rth@cygnus.com>
+    (should fix #48527 and #46963).
+  * debian/README.Bugs: Documented non bug #44554.
+  * Applied patch from Alexandre Oliva to fix gpc boostrap on alpha.
+    Reenabled gpc on all architectures.
+  * Post-2.95.2 CVS updates of the gcc-2_95-branch until 19991108.
+  * Explicitely generate postinst/prerm chunks for usr/doc transition.
+    debhelper currently doesn't handle generation for packages with
+    symlinked directories.
+  * debian/patches/libstdc++-wall3.dpatch: Fix warnings in stl_deque.h
+    and stl_rope.h (closes: #46444, #46720).
+  * debian/patches/gcj-backport.dpatch: Add file, don't apply (yet).
+
+ -- Matthias Klose <doko@debian.org>  Wed, 10 Nov 1999 18:58:45 +0100
+
+gcc (2.95.2-2) unstable; urgency=low
+
+  * New gpc-19991030 snapshot.
+  * Post-2.95.2 CVS updates of the gcc-2_95-branch until 19991103.
+  * Reintegrated sparc patches (bcollins@debian.org), which were lost
+    in 2.95.2-1.
+  * debian/rules2: Only install $(gcc_lib_dir)/include/asm, when existing.
+  * debian/patches/gpc-2.95.{dpatch,diff}: updated patch to drop
+    initialization in stor-layout.c.
+  * debian/NEWS.gcc: Updated for gcc-2.95.2.
+  * debian/bugs/bug-...: Removed testcases for fixed bugs.
+  * debian/patches/...dpatch: Removed patches applied upstream.
+  * debian/{rules2,g++.postinst,g++.prerm}: Handle c++ alternative.
+  * debian/changelog: Merged gcc272, egcs and snapshot changelogs.
+
+ -- Matthias Klose <doko@debian.org>  Tue,  2 Nov 1999 23:09:23 +0200
+
+gcc (2.95.2-1.1) unstable; urgency=low
+
+  * Most of the powerpc patches have been applied upstream.  Remove all
+    but ppc-ice, ppc-andrew-dwarf-eh, and ppc-descriptions.
+  * mulilib-install.dpatch was definitely a bad idea.  Fix it properly
+    by using install -D.
+  * Also, don't make directories before installing any more.  Simplifies
+    rules a (tiny) bit.
+  * Do not build with LDFLAGS=-s.  Everything gets stripped out anyway by
+    dh_strip -a -X_debug; so leave the binaries in the build tree with
+    debugging symbols for simplified debugging of the packages.
+
+ -- Daniel Jacobowitz <dan@debian.org>  Sat, 30 Oct 1999 12:40:12 -0400
+
+gcc (2.95.2-1) unstable; urgency=low
+
+  * gcc-2.95.2 release (taken from the CVS archive). -fstrict-aliasing
+    is disabled upstream.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 25 Oct 1999 10:26:19 +0200
+
+gcc (2.95.2-0pre4) unstable; urgency=low
+
+  * Updated to cvs updates of the gcc-2_95-branch until 19991021.
+  * Updated gpc to gpc-19991018 snapshot (closes: #33037, #47453).
+    Enable gpc for all architectures ...
+  * Document gcc exit codes (closes: #43863).
+  * According to the bug submitter (Sergey V Kovalyov <sqk0316@scires.nyu.edu>)
+    the original source of these CERN librarties is outdated now. The latest
+    version of cernlibs compiles and works fine with slink (closes #31546).
+  * According to the bug submitter (Gergely Madarasz <gorgo@sztaki.hu>),
+    the problem triggered on i386 cannot be reproduced with the current
+    jade and php3 versions anymore (closes: #35215).
+  * Replace corrupted m68k-pic.dpatch (from Roman Hodek and Andreas Schwab
+    <Roman.Hodek@informatik.uni-erlangen.de> <schwab@suse.de> and apply to
+    all architectures (closes: #48011).
+  * According to the bug submitter (Herbert Xu <herbert@gondor.apana.org.au>)
+    this bug "probably has been fixed". Setting it to severity "fixed"
+    (fixes: #39616), will close it later ...
+  * debian/README.Bugs: Document throwing C++ exceptions "through" C
+    libraries (closes: #22769).
+
+ -- Matthias Klose <doko@debian.org>  Fri, 22 Oct 1999 20:33:00 +0200
+
+gcc (2.95.2-0pre3) unstable; urgency=low
+
+  * Updated to cvs updates of the gcc-2_95-branch until 19991019.
+  * Apply NMU patches (closes: #46217).
+  * debian/control.in: Fix egcs64 conflict-dependency for sparc
+    architecture (closes: #47088).
+  * debian/rules2: dbg-packages share doc dir with lib packages
+    (closes #45067).
+  * debian/patches/gcj-debian-policy.dpatch: Patch from Stephane
+    Bortzmeyer to conform to Debian policy (closes: #44463).
+  * debian/bugs/bug-*: Added test cases for new bug reports.
+  * debian/patches/libstdc++-bastring.dpatch: Patch by Richard Kettlewell
+    (closes #46550).
+  * debian/rules.patch: Apply libstdc++-wall2 patch (closes #46609).
+  * debian/README: Fix typo (closes: #45253).
+  * debian/control.in: Remove primary/secondary distinction;
+    dbg-packages don't provide their normal counterparts (closes #45206).
+  * debian/rules.patch: gcc-combine patch applied upstream.
+  * debian/rules2: Only use mail if with_check is set (off by default).
+  * debian/rules.conf: Tighten binutils dependency to 2.9.5.0.12.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 19 Oct 1999 20:33:00 +0200
+
+gcc (2.95.2-0pre2.0.2) unstable; urgency=HIGH (for m68k)
+
+  * Binary-only NMU for m68k as quick fix for another bug; the patch
+    is in CVS already, too.
+  * Applied another patch by Andreas Schwab to fix %a5 restauration in
+    some cases.
+
+ -- Roman Hodek <Roman.Hodek@informatik.uni-erlangen.de>  Thu, 30 Sep 1999 16:09:15 +0200
+
+gcc (2.95.2-0pre2.0.1) unstable; urgency=HIGH (for m68k)
+
+  * Binary-only NMU for m68k as quick fix for serious bugs; the patches
+    are already checked into gcc CVS and should be in the next official
+    version, too.
+  * Applied two patches by Andreas Schwab to fix -fpic and loop optimization.
+
+ -- Roman Hodek <Roman.Hodek@informatik.uni-erlangen.de>  Mon, 27 Sep 1999 15:32:49 +0200
+
+gcc (2.95.2-0pre2) unstable; urgency=low
+
+  * Fixed in 2.95.2 (closes: #43478).
+  * Previous version had Pascal examples missing in doc directory.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 8 Sep 1999 22:18:17 +0200
+
+gcc (2.95.2-0pre1) unstable; urgency=low
+
+  * Updated to cvs updates of the gcc-2_95-branch until 19990828.
+  * Apply work around memory corruption (just for 2.95.1)  by
+    Daniel Jacobowitz <dan@debian.org>.
+  * debian/patches/libstdc++-wall2.dpatch: Patch from Franck Sicard
+    <sicard@miniruth.solsoft.fr> to fix some warnings (closes: #44670).
+  * debian/patches/libstdc++-valarray.dpatch: Patch from Hideaki Fujitani
+    <fjtani@flab.fujitsu.co.jp> to fix a bug in valarray_array.h.
+  * Applied NMU from Jim Pick minus the jump.c and fold-const.c patches
+    already in the gcc-2_95-branch (closes: #44690).
+  * Conform to debian-java policy (closes: #44463).
+  * Move docs to /usr/share/doc (closes: #44782).
+  * Remove debian/patches/gcc-align.dpatch applied upstream.
+  * debian/*.postinst: Call install-info only, when configuring.
+  * debian/*.{postinst,prerm}: Add #DEBHELPER# comments to handle
+    /usr/doc -> /usr/share/doc transition.
+
+ -- Matthias Klose <doko@debian.org>  Wed,  8 Sep 1999 22:18:17 +0200
+
+gcc (2.95.1-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * ARM platform no longer needs library-prefix patch.
+  * Updated patches from Philip Blundell.
+
+ -- Jim Pick <jim@jimpick.com>  Wed,  8 Sep 1999 20:14:07 -0700
+
+gcc (2.95.1-2) unstable; urgency=low
+
+  * debian/gcc.{postinst,prerm}: gcc provides an alternative for
+    sparc64-linux-gcc.
+  * Applied patch from Ben Collins to enable bi-architecture (32/64)
+    support for sparc.
+  * Rebuild debian/control and debian/rules.parameters after unpacking.
+  * debian/rules2: binary-indep. Conditionalize on with_pascal.
+
+ -- Matthias Klose <doko@debian.org>  Sat,  4 Sep 1999 13:47:30 +0200
+
+gcc (2.95.1-1) unstable; urgency=low
+
+  * Updated to release gcc-2.95.1 and cvs updates of the gcc-2_95-branch
+    until 19990828.
+  * debian/README.gcc: Updated NEWS file to include 2.95 and 2.95.1 news.
+  * debian/README.java: New file.
+  * debian/rules.defs: Disabled gpc for alpha, arm. Disabled ObjC-GC
+    for alpha.
+  * debian/rules [clean]: Remove debian/rules.parameters.
+  * debian/rules2 [binary-arch]: Call dh_shlibdeps with LD_LIBRARY_PATH set
+    to installation dir of libstdc++. Why isn't this the default?
+  * debian/control.in: *-dev packages do not longer conflict with
+    libg++272-dev package.
+  * Apply http://egcs.cygnus.com/ml/gcc-patches/1999-08/msg00599.html.
+  * Only define BAD_THROW_ALLOC, when using exceptions (fixes #43462).
+  * For ObjC (when configured with GC) recommend libgc4-dev, not libgc4.
+  * New version of 68060 build patch.
+  * debian/rules.conf: For m68k, depend on binutils version 2.9.1.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 28 Aug 1999 18:16:31 +0200
+
+gcc (2.95.1-0pre2) unstable; urgency=medium
+
+  * gpc is back again (fixes grave #43022).
+  * debian/patches/gpc-updates.dpatch: Patches sent to upstream authors.
+  * Work around the fatal dependtry assertion failure bug in dpkg (hint
+    from "Antti-Juhani Kaijanaho" <ajk@debian.org>, fixes important #43072).
+
+ -- Matthias Klose <doko@debian.org>  Mon, 16 Aug 1999 19:34:14 +0200
+
+gcc (2.95.1-0pre1) unstable; urgency=low
+
+  * Updated to cvs 19990815 gcc-2_95-branch; included install docs and
+    FAQ from 2.95 release; upload source package as well.
+  * Source package contains tarballs only (gcc, libg++, installdocs).
+  * debian/rules: Splitted into debian/rules{,.unpack,.patch,.conf,2}.
+  * debian/gcc.postinst: s/any key/RETURN; warn only when upgrading from
+    pre 2.95 version; reference /usr/doc, not /usr/share/doc.
+  * Checked syntax for attributes of functions; checked for #35068;
+    checked for bad gmon.out files (at least with libc6 2.1.2-0pre5 and
+    binutils 2.9.1.0.25-2 the problem doesn't show up anymore).
+  * debian/patches/cpp-macro-doc.dpatch: Document macro varargs in cpp.texi.
+  * gcc is primary compiler for all platforms but m68k. Setting
+    severity of #22513 to fixed.
+  * debian/patches/gcc-default-arch.dpatch: New patch to enable generation
+    of i386 instruction as default (fixes #42743).
+  * debian/rules: Removed outdated gcc NEWS file (fixes #42742).
+  * debian/patches/libstdc++-out-of-mem.dpatch: Throw exception instead
+    of aborting when out of memory (fixes #42622).
+  * debian/patches/cpp-dos-newlines.dpatch: Handle ibackslashes after
+    DOS newlines (fixes #29240).
+  * Fixed in gcc-2.95.1: #43001.
+  * Bugs closed in this version:
+    Closes: #11525, #12253, #22513, #29240, #35068, #36182, #42584, #42585,
+    #42602, #42622, #42742 #42743, #43001, #43002.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 15 Aug 1999 10:31:50 +0200
+
+gcc (2.95-3) unstable; urgency=high
+
+  * Provide /lib/cpp again (fixes important bug #42524).
+  * Updated to cvs 19990805 gcc-2_95-branch.
+  * Build with the default scheduler.
+  * Apply install-multilib patch from Dan Jacobowitz.
+  * Apply revised cpp-A- patch from Dan Jacobowitz.
+
+ -- Matthias Klose <doko@debian.org>  Fri,  6 Aug 1999 07:25:19 +0200
+
+gcc (2.95-2) unstable; urgency=low
+
+  * Remove /lib/cpp. This driver uses files from /usr/lib/gcc-lib anyway.
+  * The following bugs are fixed (compared to egcs-1.1.2).
+    Closes: #4429, #20889, #21122, #26369, #28417, #28261, #31416, #35261,
+    #35900, #35906, #38246, #38872, #39098, #39526, #40659, #40991, #41117,
+    #41290, #41302, #41313.
+  * The following by Joel Klecker:
+    - Adopt dpkg-architecture variables.
+    - Go back to SHELL = bash -e or it breaks where /bin/sh is not bash.
+    - Disabled the testsuite, it is not included in the gcc 2.95 release.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 31 Jul 1999 18:00:42 +0200
+
+gcc (2.95-1) unstable; urgency=low
+
+  * Update for official gcc-2.95 release.
+  * Built without gpc.
+  * debian/rules: Remove g++FAQ from rules, which is outdated.
+    For ix86, build for i386, not i486.
+  * Apply patch from Jim Pick for building multilib package on arm.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 31 Jul 1999 16:38:21 +0200
+
+gcc (2.95-0pre10) unstable; urgency=low
+
+  * Use ../builddir-gcc-$(VER) by default instead of ./builddir; upstream
+    strongly advises configuring outside of the source tree, and it makes
+    some things much easier.
+  * Add patch to prevent @local branches to weak symbols on powerpc (fixes
+    apt compilation).
+  * Add patch to make cpp -A- work as expected.
+  * Renamed debian/patches/ppc-library-prefix.dpatch to library-prefix.dpatch;
+    apply on all architectures.
+  * debian/control.in: Remove snapshot dependencies.
+  * debian/*.postinst: Reflect use of /usr/share/{info,man}.
+
+ -- Daniel Jacobowitz <dan@debian.org>  Thu, 22 Jul 1999 19:27:12 -0400
+
+gcc (2.95-0pre9) unstable; urgency=low
+
+  * The following bugs are fixed (compared to egcs-1.1.2): #4429, #20889,
+    #21122, #26369, #28417, #28261, #35261, #38246, #38872, #39526, #40659,
+    #40991, #41117, #41290.
+  * Updated to CVS gcc-19990718 snapshot.
+  * debian/control.in: Removed references to egcs in descriptions.
+    Changed gcj's Recommends libgcj-dev to Depends.
+  * debian/rules: Apply ppc-library-prefix for alpha as well.
+  * debian/patches/arm-config.dpatch: Updated patch sent by Jim Pick.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 18 Jul 1999 12:21:07 +0200
+
+gcc (2.95-0pre8) unstable; urgency=low
+
+  * Updated CVS.
+  * debian/copyright: s%doc/copyright%share/common-licenses%
+  * debian/README.Bugs: s/egcs.cygnus.com/gcc.gnu.org/ s/egcs-bugs/gcc-bugs/
+  * debian/patches/reporting.dpatch: Remake diff for current sources.
+  * debian/libstdc++-dev.postinst: It's /usr/share/info/iostream.info.
+  * debian/rules: Current dejagnu snapshot reports a framework version
+    of 1.3.1.
+
+ -- Joel Klecker <espy@debian.org>  Sun, 18 Jul 1999 02:09:57 -0700
+
+gcc-snapshot (19990714-0pre6) experimental; urgency=low
+
+  * Updated to CVS gcc-19990714 snapshot.
+  * Applied ARM patch (#40515).
+  * Converted DOS style linefeeds in debian/patches/ppc-* files.
+  * debian/rules: Reflect change in gcc/version.c; use sh -e as shell:
+    for some obscure reason, bash -e doesn't work.
+  * Reflect version change for libstdc++ (2.10). Remove libg++-name
+    patch; libg++ now has version 2.8.1.3. Removed libc version from
+    the package name.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 14 Jul 1999 18:43:57 +0200
+
+gcc-snapshot (19990625-0pre5.1) experimental; urgency=low
+
+  * Non-maintainer upload.
+  * Added ARM specific patch.
+
+ -- Jim Pick <jim@jimpick.com>  Tue, 29 Jun 1999 22:36:08 -0700
+
+gcc-snapshot (19990625-0pre5) experimental; urgency=low
+
+  * Updated to CVS gcc-19990625 snapshot.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 25 Jun 1999 16:11:53 +0200
+
+gcc-snapshot (19990609-0pre4.1) experimental; urgency=low
+
+  * Added and re-added a few last PPC patches.
+
+ -- Daniel Jacobowitz <dan@debian.org>  Sat, 12 Jun 1999 16:48:01 -0500
+
+gcc-snapshot (19990609-0pre4) experimental; urgency=low
+
+  * Updated to CVS egcs-19990611 snapshot.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 11 Jun 1999 10:20:09 +0200
+
+gcc-snapshot (19990609-0pre3) experimental; urgency=low
+
+  * CVS gcc-19990609 snapshot.
+  * New gpc-19990607 snapshot.
+
+ -- Matthias Klose <doko@debian.org>  Wed,  9 Jun 1999 19:40:44 +0200
+
+gcc-snapshot (19990524-0pre1) experimental; urgency=low
+
+  * egcs-19990524 snapshot.
+  * First snapshot of the gcc-2_95-branch. egcs-1.2 is renamed to gcc-2.95,
+    which is now the "official" successor to gcc-2.8.1. The full version
+    name is: gcc-2.95 19990521 (prerelease).
+  * debian/control.in: Changed maintainers to `Debian GCC maintainers'.
+  * Moved all version numbers to epoch 1.
+  * debian/rules: Major changes. The support for secondary compilers
+    was already removed for the egcs-1.2 snapshots. Many fixes by
+    Joel Klecker <espy@debian.org>.
+    - Send mail to Debian maintainers for successful builds.
+    - Fix VER and VERNO sed expressions.
+    - Replace remaining GNUARCH occurrences.
+  * New gpc snapshot (but don't build).
+  * debian/patches/valarray.dpatch: Backport from libstdc++-v3.
+  * debian/gcc-doc.*: Info is now gcc.info* (Joel Klecker <espy@debian.org>).
+  * Use cpp driver provided by the package.
+  * New script c89 (fixes #28261).
+
+ -- Matthias Klose <doko@debian.org>  Sat, 22 May 1999 16:10:36 +0200
+
+egcs (1.1.2-2) unstable; urgency=low
+
+  * Integrate NMU's for arm and sparc (fixes #37582, #36857).
+  * Apply patch for the Hurd (fixes #37753).
+  * Describe open bugs in TODO.Debian. Please have a look if you can help.
+  * Update README / math functions section (fixes #35906).
+  * Done by J.H.M. Dassen (Ray) <jdassen@wi.LeidenUniv.nl>:
+    - At Richard Braakman's request, made -dbg packages for libstdc++
+      and libg++.
+    - Provide egcc(1) (fixes lintian error).
+
+ -- Matthias Klose <doko@debian.org>  Sun, 16 May 1999 14:30:56 +0200
+
+egcs-snapshot (19990502-1) experimental; urgency=low
+
+  * New snapshot.
+
+ -- Matthias Klose <doko@debian.org>  Thu,  6 May 1999 11:51:02 +0200
+
+egcs-snapshot (19990418-2) experimental; urgency=low
+
+  * Merged Rays changes to build debug packages.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 21 Apr 1999 16:54:56 +0200
+
+egcs-snapshot (19990418-1) experimental; urgency=low
+
+  * New snapshot.
+  * Disable cpplib.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 19 Apr 1999 11:32:19 +0200
+
+egcs (1.1.2-1.2) unstable; urgency=low
+
+  * NMU for arm
+  * Added arm-optimizer.dpatch with optimizer workaround for ARM
+
+ -- Jim Pick <jim@jimpick.com>  Mon, 19 Apr 1999 06:17:13 -0700
+
+egcs (1.1.2-1.1) unstable; urgency=low
+
+  * NMU for sparc
+  * Included dpatch to modify the references to gcc/crtstuff.c so that
+    __register_frame_info is not a weak reference. This allows potato to
+    remain binary compatible with slink, while still retaining compatibility
+    with other sparc/egcs1.1.2 distributions. Diff in .dpatch format has
+    been sent to the maintainer with a note it may not be needed for 1.1.3.
+
+ -- Ben Collins <bcollins@debian.org>  Tue, 27 Apr 1999 10:15:03 -0600
+
+egcs (1.1.2-1) unstable; urgency=low
+
+  * Final egcs-1.1.2 release built for potato as primary compiler
+    for all architectures except m68k.
+
+ -- J.H.M. Dassen (Ray) <jdassen@wi.LeidenUniv.nl>  Thu,  8 Apr 1999 13:14:29 +0200
+
+egcs-snapshot (19990321-1) experimental; urgency=low
+
+  * New snapshot.
+  * Disable gpc.
+  * debian/rules: Simplified (no secondary compiler, bumped all versions
+    to same epoch, libapi patch is included upstream).
+  * Separated out cpp documentation to cpp-doc package.
+  * Fixed in this version: #28417.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 23 Mar 1999 02:11:18 +0100
+
+egcs (1.1.2-0slink2) stable; urgency=low
+
+  * Applied H.J.Lu's egcs-19990315.linux patch.
+  * Install faq.html and egcs-1.1.2 announcment.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 23 Mar 1999 01:14:54 +0100
+
+egcs (1.1.2-0slink1) stable; urgency=low
+
+  * Final egcs-1.1.2 release; compiled with glibc-2.0 for slink on i386.
+  * debian/control.in: gcc provides egcc, when FIRST_PRIMARY defined.
+  * Fixes #30767, #32278, #34252, #34352.
+  * Don't build the libstdc++.so.2.9 library on architectures, which have
+    switched to glibc-2.1.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 17 Mar 1999 12:55:59 +0100
+
+egcs (1.1.1.63-2.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Incorporate patch from Joel Klecker to fix snapshot packages
+    by moving/removing the application of libapi.
+  * Disable the new libstdc++-dev-config and the postinst message in
+    glibc 2.1 versions.
+
+ -- Daniel Jacobowitz <dan@debian.org>  Mon, 12 Mar 1999 14:16:02 -0500
+
+egcs (1.1.1.63-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Compile with glibc 2.1 release version.
+  * New upstream version egcs-1.1.2 pre3.
+  * Miscellaneous rules updates (see changelog.snapshot).
+  * New set of powerpc-related patches from Franz Sirl,
+    <fsirl@kernel.crashing.org>.
+  * Disable libgcc.dpatch (new solution implemented upstream).  Remove it.
+  * Also pass $target to config.if.
+  * Enable Dwarf2 EH for powerpc.  Bump the C++ binary version.  No
+    loss in -backwards- compatibility as far as I can tell, so add a
+    compatibility symlink, and add to shlibs file.
+  * Add --no-backup-if-mismatch to the debian/patches/*.dpatch files,
+    to prevent bogus .orig's in diffs.
+  * Merged with (unreleased) 1.1.1.62-1 and 1.1.1.63-{1,2} packages from
+    Matthias Klose <doko@debian.org>.
+  * Stop adding a backwards compatibility link for egcs-nof on powerpc.
+    To my knowledge, nothing uses it.  Do add the libstdc++ API change
+    link, though.
+
+ -- Daniel Jacobowitz <dan@debian.org>  Mon, 8 Mar 1999 14:24:01 -0500
+
+egcs (1.1.1.63-2) stable; urgency=low
+
+  * Provide a libstdc++ with a shared object name, which is compatible
+    to other distributions. Documented the change in README.Debian,
+    the libstdc++-2.9.postinst and the libstdc++-dev-config script.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 12 Mar 1999 00:36:20 +0100
+
+egcs (1.1.1.63-1.1) unstable; urgency=low
+
+  * Non-Maintainer release.
+  * Build against glibc 2.1.
+  * Make egcs the primary compiler on i386.
+  * Also confilct with egcc (<< FIRST_PRIMARY)
+    if FIRST_PRIMARY is defined.
+    (this tells dpkg that gcc completely obsoletes egcc)
+  * Remove hjl-12 patch again, HJL says it should not be
+    necessary with egcs 1.1.2.
+    (as per forwarded reply from Christopher Chimelis)
+  * Apply libapi patch in clean target before regenerating debian/control
+    and remove the patch afterward. Otherwise, the libstdc++ and libg++
+    package names are generated wrong on a glibc 2.1 system.
+
+ -- Joel Klecker <espy@debian.org>  Tue,  9 Mar 1999 15:31:02 -0800
+
+egcs (1.1.1.63-1) unstable; urgency=low
+
+  * New upstream version egcs-1.1.1-pre3.
+  * Applied improved libstdc++ warning patch from Rob Browning.
+
+ -- Matthias Klose <doko@debian.org>  Tue,  9 Mar 1999 16:14:07 +0100
+
+egcs (1.1.1.62-1) unstable; urgency=low
+
+  * New upstream version egcs-1.1.1-pre2.
+  * New upstream version libg++-2.8.1.3.
+  * Readded ARM support
+  * Readded hjl-12 per request from Christopher C Chimelis
+    <chris@classnet.med.miami.edu>
+
+ -- Matthias Klose <doko@debian.org>  Fri, 26 Feb 1999 09:54:01 +0100
+
+egcs-snapshot (19990224-0.1) experimental; urgency=low
+
+  * New snapshot.
+  * Add the ability to disable CPPLIB by setting CPPLIB=no in
+    the environment.
+  * Disable gpc for powerpc; I spent a long time getting it to
+    make correctly, and then it goes and ICEs.
+
+ -- Daniel Jacobowitz <dan@debian.org>  Tue, 24 Feb 1999 23:34:12 -0500
+
+egcs (1.1.1.61-1) unstable; urgency=low
+
+  * New upstream version egcs-1.1.1-pre1.
+  * debian/control.in: Applied patch from bug report #32987.
+  * Split up H.J.Lu's hjl-19990115-linux patch into several small
+    chunks: libapi, arm-mips, libgcc, hjl-other. The changelog.Linux
+    aren't included in the separate chunks. Please refer to the
+    unmodified hjl-19990115-linux patch file in the egcs source pkg.
+  * Apply warning patch to fix the annoying spew you get if you try to
+    use ropes or deques with -Wall (which makes -Wall mostly useless for
+    spotting errors in your own code). Fixes #32996.
+  * debian/rules: Unapply patches in the exact reverse order they were
+    applied.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 20 Feb 1999 22:06:21 +0100
+
+egcs (1.1.1-5) frozen unstable; urgency=medium
+
+  * Move libgcc.map file to g++ package, where gcc is the secondary
+    compiler (fixes #32329, #32605, #32631).
+  * Prepare to rename libstdc++2.9 package for glibc-2.1 (fixes #32148).
+  * Apply NMU patch for arm architecure (fixes #32367).
+  * Don't apply hjl-12 patch for alpha architectures (requested by the
+    alpha developers, Christopher C Chimelis <chris@classnet.med.miami.edu>).
+  * Call makeinfo with --no-validate to fix obscure build failure on alpha.
+  * Build gpc info files in doc subdirectory.
+  * Remove c++filt diversion (C++ name demangling patch is now in binutils,
+    fixes #30820 and #32502).
+
+ -- Matthias Klose <doko@debian.org>  Sun, 31 Jan 1999 23:19:35 +0100
+
+egcs (1.1.1-4.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Pascal doesn't build for ARM.
+
+ -- Jim Pick <jim@jimpick.com>  Sun, 24 Jan 1999 16:13:34 -0800
+
+egcs (1.1.1-4) frozen unstable; urgency=high
+
+  * Don't strip compiler libraries libgcc.a libobjc.a libg2c.a libgpc.a
+  * Move Pascal examples to the right place (fixes #32149, part 1).
+  * Add dependencies for switching from secondary to primary compiler,
+    if FIRST_PRIMARY is defined (fixes #32149, part 2).
+
+ -- Matthias Klose <doko@debian.org>  Wed, 20 Jan 1999 16:51:30 +0100
+
+egcs (1.1.1-3) frozen unstable; urgency=low
+
+  * Updated with the H.J.Lu's hjl-19990115-linux patch (fixes the
+    __register_frame_info problems, mips and arm port included).
+  * Update gpc to 19990118 (beta release candidate).
+  * Strip static libraries (fixes #31247 and #31248).
+  * Changed maintainer address.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 19 Jan 1999 16:34:28 +0100
+
+egcs (1.1.1-2) frozen unstable; urgency=low
+
+  * Moved egcs-docs, g77-doc and gpc-doc packages to doc section.
+  * Downgraded Recommends: egcs-docs to Suggests: egcs-docs dependencies
+    (for archs, where egcs is the primary compiler).
+  * Add 'Suggests: stl-manual' dependency to libstdc++2.9-dev.
+  * Applied one more alpha patch:
+    ftp://ftp.yggdrasil.com/private/hjl/egcs/1.1.1/egcs-1.1.1.diff.12.gz
+  * Applied PPro optimization patch.
+  * Apply emit-rtl-nan patch.
+  * Upgraded to libg++-2.8.1.2a-19981218.tar.gz.
+  * Upgraded to gpc-19981218.
+  * Make symlinks for gobjc, libstdc++2.9-dev and libg++2.8.2 doc directories.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 23 Dec 1998 18:04:53 +0200
+
+egcs-snapshot (19981211-1) experimental; urgency=low
+
+  * New snapshot.
+  * Adapted gpc to egcs-2.92.x (BOOT_CFLAGS must include -g).
+  * New libg++-2.8.1.2a-19981209.tar.gz.
+  * debian/rules: new target mail-summary.
+
+ -- Matthias Klose <doko@debian.org>  Fri, 11 Dec 1998 18:14:53 +0200
+
+egcs (1.1.1-1) frozen unstable; urgency=high
+
+  * Final egcs-1.1.1 release.
+  * The last version depended on a versioned libc6 again.
+  * Add lost dependency for libg++ on libstdc++.
+  * Added debian-libstdc++.sh script to generate a libstdc++ on a Linux
+    system, which doesn't use the libapi patch.
+
+ -- Matthias Klose <doko@cs.tu-berlin.de>  Wed,  2 Dec 1998 12:06:15 +0200
+
+egcs (1.1.0.91.59-2) frozen unstable; urgency=high
+
+  * Fixes bugs from libc6 2.0.7u-6 upload without dependency line
+    Conflicts: libstdc++-2.9 (<< 2.91.59): #30019, #30066, #30078.
+  * debian/copyright: Updated URLs.
+  * gcc --help now mentions /usr/doc/debian/bug-reporting.txt.
+  * Install README.Debian and include information about patches applied.
+  * Depend on unversioned libc6 on i386, such that libstdc++2.9 can be used
+    on a hamm system.
+
+ -- Matthias Klose <doko@cs.tu-berlin.de>  Fri, 27 Nov 1998 18:32:02 +0200
+
+egcs (1.1.0.91.59-1) frozen unstable; urgency=low
+
+  * This is egcs-1.1.1 prerelease #3, compiled with libc6 2.0.7u-6.
+  * Added dependency for libstdc++2.9-dev on g++ (fixes #29631).
+  * Package g77 provides f77 (fixes #29817).
+  * Already fixed in earlier egcs-1.1 releases: #2493, #25271, #10620.
+  * Bugs reported for gcc-2.7.x and fixed in the egcs version of gcc:
+    #2493, #4430, #4954, #5367, #6047, #10612, #12375, #20606, #24788, #26100.
+  * Upgraded libg++ to libg++-2.8.1.2a-19981114.
+  * Upgraded gpc to gpc-19981124.
+  * Close #25869: egcs and splay maintainers are unable to reproduce this
+    bug with the current Debian packages. Bug submitter doesn't respond.
+  * Close #25407: egcs maintainer cannot reproduce this bug with the current
+    Debian compiler. Bug submitter doesn't respond.
+  * Use debhelper 1.2.7 for building.
+  * Replace the libstdc++ and libg++ compatibility links with fake libraries.
+
+ -- Matthias Klose <doko@cs.tu-berlin.de>  Wed, 25 Nov 1998 12:11:42 +0200
+
+egcs (1.1.0.91.58-5) frozen unstable; urgency=low
+
+  * Applied patch to build on the m68060.
+  * Added c++filt and c++filt.1 to the g++ package.
+  * Updated gpc to gpc-981105; fixes some regressions compared to egcs-1.1.
+  * Separated out g77 and gpc doumentation to new packages g77-doc and gpc-doc.
+  * Closed bugs (#22158).
+  * Close #20248; on platforms where gas and gld are the default versions,
+    it makes no difference to configure with or without enable-ld.
+  * Close #24349. The bugs are in the amulet source.
+    See http://www.cs.cmu.edu/afs/cs/project/amulet/www/FAQ.html#GCC28x
+  * Rename gcc.info* files to egcs.info* (fixes #24088).
+  * Documented known bugs (and workarounds) in BUGS.Debian.
+  * Fixed demangling of C++ names (fixes #28787).
+  * Applied patch form aspell to libstdc++/stl/stl_rope.h.
+  * Updated from cvs 16 Nov 1998.
+
+ -- Matthias Klose <doko@cs.tu-berlin.de>  Tue, 17 Nov 1998 09:41:24 +0200
+
+egcs-snapshot (19981115-2) experimental; urgency=low
+
+  * New snapshot. Disabled gpc.
+  * New packages g77-doc and gpc-doc.
+
+ -- Matthias Klose <doko@debian.org>  Mon, 16 Nov 1998 12:48:09 +0200
+
+egcs (1.1.0.91.58-3) frozen unstable; urgency=low
+
+  * Previous version installed in potato, not slink.
+  * Updated from cvs 3 Nov 1998.
+
+ -- Matthias Klose <doko@cs.tu-berlin.de>  Tue, 3 Nov 1998 18:34:44 +0200
+
+egcs (1.1.0.91.58-2) unstable; urgency=low
+
+  * [debian/rules]: added targets to apply and unapply patches.
+  * [debian/README.patches]: New file.
+  * Moved patches dir to debian/patches. debian/rules has to select
+    the patches to apply.
+  * Manual pages for genclass and gcov (fixes #5995, #20950, #22196).
+  * Apply egcs-1.1-reload patch needed for powerpc architecture.
+  * Fixed bugs (#17768, #20252, #25508, #27788).
+  * Reapplied alpha patch (#20875).
+  * Fixes first part of #22513, extended README.Debian (combining C & C++).
+  * Already fixed in earlier egcs-1.1 releases: #17963, #20252, #20524,
+    #20640, #22450, #24244, #24288, #28520.
+
+ -- Matthias Klose <doko@cs.tu-berlin.de>  Fri, 30 Oct 1998 13:41:45 +0200
+
+egcs (1.1.0.91.58-1) experimental; urgency=low
+
+  * New upstream version. That's the egcs-1.1.1 prerelease plus patches from
+    the cvs archive upto 29 Oct 1998.
+  * Merged files from the egcs and snapshot packages.
+  * Updated libg++ to libg++-2.8.1.2 (although the Debian package name is still
+    2.8.2).
+  * Moved patches dir to patches-1.1.
+  * Dan Jacobowitz:
+    * This is a snapshot from the egcs_1_1_branch, with
+      libapi, reload, builtin-apply, and egcs patches from
+      the debian/patches/ dir applied, along with the egcs-gpc-patches
+      and gcc/p/diffs/gcc-egcs-2.91.55.diff.
+    * Conditionalize gcj and chill (since they aren't in this branch).
+    * Fake snapshots drop the -snap-main.
+
+ -- Matthias Klose <doko@cs.tu-berlin.de>  Thu, 29 Oct 1998 15:15:19 +0200
+
+egcs-snapshot (1.1-19981019-5.1) experimental; urgency=low
+
+  * This is a snapshot from the egcs_1_1_branch, with
+    libapi, reload, builtin-apply, and egcs patches from
+    the debian/patches/ dir applied, along with the egcs-gpc-patches
+    and gcc/p/diffs/gcc-egcs-2.91.55.diff.
+  * Conditionalize gcj and chill (since they aren't in this
+    branch).
+  * Fake snapshots drop the -snap-main.
+
+ -- Daniel Jacobowitz <dan@debian.org>  Mon, 19 Oct 1998 22:19:23 -0400
+
+egcs (1.1b-5) unstable; urgency=low
+
+  * [debian/control.in] Fixed typo in dependencies (#28076, #28087, #28092).
+
+ -- J.H.M. Dassen (Ray) <jdassen@wi.LeidenUniv.nl>  Sun, 18 Oct 1998 22:56:51 +0200
+
+egcs (1.1b-4) unstable; urgency=low
+
+  * Strengthened g++ dependency on libstdc++_LIB_SO_-dev from
+    `Recommends' to `Depends'.
+  * Updated README.Debian for egcs-1.1.
+  * Updated TODO.
+
+ -- Matthias Klose <doko@cs.tu-berlin.de>  Thu, 15 Oct 1998 12:38:47 +0200
+
+egcs-snapshot (19981005-0.1) experimental; urgency=low
+
+  * Make libstdc++2.9-snap-main and libg++-snap-main provide
+    their mainstream equivalents and put those equivalents into
+    their shlibs file.
+  * Package gcj, the GNU Compiler for Java(TM).
+
+  * New upstream version of egcs (The -regcs_latest_snapshot branch).
+  * Build without libg++ entirely.
+  * Leave out gpc for now - the internals are sufficiently different
+    that it does not trivially compile.
+  * Include an experimental reload patch for powerpc - this is,
+    in the words of its author, not release quality, but it allows
+    powerpc linuxthreads to function.
+  * On architectures where we are the primary compiler, let snapshots
+    build with --prefix=/usr and conflict with the stable versions.
+  * Package chill, a front end for the language Chill.
+  * Other applied patches from debian/patches/: egcs-patches and
+    builtin-apply-patch.
+  * Use reload.c revision 1.43 to avoid a nasty bug.
+
+ -- Daniel Jacobowitz <dan@debian.org>  Wed,  7 Oct 1998 00:27:42 -0400
+
+egcs (1.1b-3.1) unstable; urgency=low
+
+  * NMU to fix the egcc -> gcc link once and for all
+
+ -- Christopher C. Chimelis <chris@classnet.med.miami.edu>  Tue, 22 Sep 1998 16:11:19 -0500
+
+egcs (1.1b-3) unstable; urgency=low
+
+  * Oops. The egcc -> gcc link on archs where gcc is egcc was broken.
+    Thanks to Chris Chimelis for pointing this out.
+
+ -- J.H.M. Dassen (Ray) <jdassen@wi.LeidenUniv.nl>  Mon, 21 Sep 1998 20:51:35 +0200
+
+egcs (1.1b-2) unstable; urgency=low
+
+  * New upstream spellfix release (Debian revision is 2 as the internal
+    version numbers didn't change).
+  * Added egcc -> gcc symlink on architectures where egcc is the primary C
+    compiler. Thus, maintainers of packages that require egcc, can now
+    simply use "egcc" without conditionals.
+  * Porters: we hope/plan to make egcs's gcc the default C compiler on all
+    platforms once the 2.2.x kernels are available. Please test this version
+    thoroughly, and give us a GO / NO GO for your architecture.
+  * Some symbols cpp used to predefine were removed upstream in order to clean
+    up the cpp namespace, but imake requires them for determining the proper
+    settings for LinuxMachineDefines (see /usr/X11R6/lib/X11/{Imake,linux}.cf),
+    thus we put them back. Thanks to Paul Slootman for reporting his imake
+    problems on Alpha.
+    * [gcc/config/alpha/linux.h] Added -D__alpha to CPP_PREDEFINES .
+      Thanks to Chris Chimelis for the alpha-only 1.1a-1.1 NMU which fixed
+      this already.
+    * [gcc/config/i386/linux.h] Added -D__i386__ to CPP_PREDEFINES .
+    * [gcc/config/sparc/linux.h] Has -Dsparc in CPP_PREDEFINES .
+    * [gcc/config/sparc/linux64.h] Has -Dsparc in CPP_PREDEFINES .
+    * [gcc/config/m68k/linux.h] Has -Dmc68000 in CPP_PREDEFINES .
+    * [gcc/config/rs6000/linux.h] Has -Dpowerpc in CPP_PREDEFINES .
+    * [gcc/config/arm/linux.h] Has -Darm in CPP_PREDEFINES .
+    * [gcc/config/i386/gnu.h] Has -Di386 in CPP_PREDEFINES .
+  * Small fixes and updates in README.
+  * Changes affecting the source package only:
+    * [gcc/Makefile.in, gcc/cp/Make-lang.in, gcc/p/Make-lang.in]
+      Daniel Jacobowitz: Ugly hacks of various kinds to make cplib2.txt get
+      properly regenerated with multilib.
+    * [debian/TODO] Created.
+    * [INSTALL/index.html] Fixed broken link.
+
+ -- J.H.M. Dassen (Ray) <jdassen@wi.LeidenUniv.nl>  Sun, 20 Sep 1998 14:05:15 +0200
+
+egcs (1.1a-1) unstable; urgency=low
+
+  * New upstream release.
+  * Added README.libstdc++ .
+  * Updated Standards-Version.
+  * Matthias:
+    * Downgraded gobjc dependency on egcs-docs from Recommends: to Suggests: .
+    * [libg++/Makefile.in] Patched not to rely on a `-f' flag of `ln'.
+
+ -- J.H.M. Dassen (Ray) <jdassen@wi.LeidenUniv.nl>  Wed,  2 Sep 1998 19:57:43 +0200
+
+egcs (1.1-1) unstable; urgency=low
+
+  * egcs-1.1 prerelease (from the last Debian package only the version file
+    changed).
+  * "Final" gpc Beta 2.1 gpc-19980830.
+  * Included libg++ and gpc in the .orig tarball. so that diffs are getting
+    smaller.
+  * debian/control.in: Changed maintainer address to galenh-egcs@debian.org.
+  * debian/copyright: Updated URLs.
+
+ -- Matthias Klose <doko@cs.tu-berlin.de>  Mon, 31 Aug 1998 12:43:13 +0200
+
+egcs (1.0.99.56-0.1) unstable; urgency=low
+
+  * New upstream snapshot 19980830 from CVS (called egcs-1.1 19980830).
+  * New libg++ snapshot 980828.
+  * Put all patches patches subdirectory; see patches/README in the source.
+  * debian/control.in: readded for libg++2.8.2-dev:
+    Replaces: libstdc++2.8-dev (<= 2.90.29-0.5)
+  * Renamed libg++2.9 package to libg++2.8.2.
+  * gcc/p/gpc-decl.c: Fix from Peter@Gerwinski.de; fixes optimization errors.
+  * patches/gpc-patch2: Fix from Peter@Gerwinski.de; fixes alpha errors.
+  * debian/rules: New configuration flag for building with and without
+    libstdc++api patch; untested without ...
+
+ -- Matthias Klose <doko@cs.tu-berlin.de>  Sun, 30 Aug 1998 12:04:22 +0200
+
+egcs (1.0.99-0.6) unstable; urgency=low
+
+  * PowerPC fixes.
+  * On powerpc, generate the -msoft-float libs and package them
+    as egcs-nof.
+  * Fix signed char error in gpc.
+  * Create a libg++.so.2.9 compatibility symlink.
+
+ -- Daniel Jacobowitz <dan@debian.org>  Tue, 25 Aug 1998 11:44:09 -0400
+
+egcs (1.0.99-0.5) unstable; urgency=low
+
+  * New upstream snapshot 19980824.
+  * New gpc snapshot gpc-980822; reenabled gpc for alpha.
+
+ -- Matthias Klose <doko@cs.tu-berlin.de>  Tue, 25 Aug 1998 01:21:08 +0200
+
+egcs (1.0.99-0.4) unstable; urgency=low
+
+  * New upstream snapshot 19980819. Should build glibc 2.0.9x on PPC.
+
+ -- Matthias Klose <doko@cs.tu-berlin.de>  Wed, 19 Aug 1998 14:18:07 +0200
+
+egcs (1.0.99-0.3) unstable; urgency=low
+
+  * New upstream snapshot 19980816.
+  * debian/rules: build correct debian/control and debian/*.shlibs
+  * Enabled Haifa scheduler for ix86.
+
+ -- Matthias Klose <doko@cs.tu-berlin.de>  Mon, 17 Aug 1998 16:29:35 +0200
+
+egcs (1.0.99-0.2) unstable; urgency=low
+
+  * New upstream snapshot: egcs-19980812, minor changes only.
+  * Fixes for building on `primary' targets.
+  * Disabled gpc on `alpha' architecture.
+  * Uses debhelper 1.1.6
+  * debian/control.in: Replace older snapshot versions in favor of newer
+    normal versions.
+  * debian/rules: Fixes building of binary-arch target only.
+
+ -- Matthias Klose <doko@cs.tu-berlin.de>  Thu, 13 Aug 1998 11:59:41 +0200
+
+egcs (1.0.99-0.1) unstable; urgency=low
+
+  * New upstream version: pre egcs-1.1 version.
+  * Many changes ... for details see debian/changelog.snapshot in the
+    source package.
+  * New packages libstdc++2.9 and libstdc++2.9-dev.
+  * New libg++ snapshot 980731: new packages libg++2.9 and libg++2.9-dev.
+  * New gpc snapshot gpc-980729: new package gpc.
+  * Uses debhelper 1.1
+
+ -- Matthias Klose <doko@cs.tu-berlin.de>  Mon, 10 Aug 1998 13:00:27 +0200
+
+egcs-snapshot (19980803-4) experimental; urgency=low
+
+  * rebuilt debian/control.
+
+ -- Matthias Klose <doko@debian.org>  Wed,  5 Aug 1998 08:51:47 +0200
+
+egcs-snapshot (19980803-3) experimental; urgency=low
+
+  * debian/rules: fix installation locations of NEWS, header and
+    `undocumented' files.
+  * man pages aren't compressed for the snapshot package.
+
+ -- Matthias Klose <doko@debian.org>  Tue,  4 Aug 1998 17:34:31 +0200
+
+egcs-snapshot (19980803-2) experimental; urgency=low
+
+  * debian/rules: Uses debhelper. Old in debian/rules.old.
+    renamed postinst, prerm files for use with debhelper.
+  * debian/{libg++2.9,libstdc++2.9}/postinst: call ldconfig only,
+    when called for configure.
+  * egcs-docs is architecture independent package.
+  * new libg++ snapshot 980731.
+  * installed libstdc++ api patch (still buggy).
+
+ -- Matthias Klose <doko@debian.org>  Mon,  3 Aug 1998 13:20:59 +0200
+
+egcs-snapshot (19980729-1) experimental; urgency=low
+
+  * New snapshot version 19980729 from CVS archive.
+  * New gpc snapshot gpc-980729.
+  * Let gcc/configure decide about using the Haifa scheduler.
+  * Remove -DDEBIAN. That was needed for the security improvements with
+    regard to the /tmp problem. egcs-1.1 chooses another approach.
+  * Save test-protocol and extract gpc errors to gpc-test-summary.
+  * Tighten binutils dependency to 2.9.1.
+  * debian/rules: new build-info target
+  * debian/{control.in,rules}: _SO_ and BINUTILSV substitution.
+  * debian/rules: add dependency for debian/control.
+  * debian/rules: remove bin/c++filt
+  * TODO: next version will use debhelper; the unorganized moving of
+    files becomes unmanageable ...
+  * TODO: g++ headers in stdc++ package? check!
+
+ -- Matthias Klose <doko@debian.org>  Thu, 30 Jul 1998 12:10:20 +0200
+
+egcs-snapshot (19980721-1) experimental; urgency=low
+
+  * Unreleased. Infinite loops in executables made by gpc.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 22 Jul 1998 18:07:20 +0200
+
+egcs-snapshot (19980715-1) experimental; urgency=low
+
+  * New snapshot version from CVS archive.
+  * New gpc snapshot gpc-980715.
+  * New libg++ version libg++-2.8.2-980708. Changed versioning
+    schema for library. The major versions of libc, libstdc++ and the
+    g++ interface are coded in the library name. Use this new schema,
+    but provide a symlink to our previous schema, since the library
+    seems to be binary compatible.
+  * [debian/rules]: Fixed bug in build target, when bootstrap returns
+    with an error
+
+ -- Matthias Klose <doko@debian.org>  Wed, 15 Jul 1998 10:55:05 +0200
+
+egcs-snapshot (19980701-1) experimental; urgency=low
+
+  * New snapshot version from CVS archive.
+    Two check programs in libg++ had to be manually killed to finish the
+    testsuite (tBag and tSet).
+  * New gpc snapshot gpc-980629.
+  * Incorporated debian/rules changes from egcs-1.0.3a-0.5 (but don't remove
+    gcc/cp/parse.c gcc/c-parse.c gcc/c-parse.y gcc/objc/objc-parse.c
+    gcc/objc/objc-parse.y, since these files are part of the release).
+  * Disable the -DMKTEMP_EACH_FILE -DHAVE_MKSTEMP -DDEBIAN flags for the
+    snapshot. egcs-1.1 will have another solution.
+  * Don't bootstrap the snapshot with -fno-force-mem. Internal compiler
+    error :-(
+  * libf2c.a and f2c.h have changed names to libg2c.a and g2c.h and
+    have moved again into the gcc-lib dir. They are installed under
+    libg2c.a and g2c.h. Is it necessary to provide links f2c -> g2c ?
+  * debian/rules: reflect change of build dir of libraries.
+
+ -- Matthias Klose <doko@debian.org>  Wed,  2 Jul 1998 13:15:28 +0200
+
+egcs-snapshot (19980628-0.1) experimental; urgency=low
+
+  * New upstream snapshot version.
+  * Non-maintainer upload; Matthias appears to be absent currently.
+  * Updated shlibs.
+  * Merged changes from regular egcs:
+    * [debian/control] Tightened dependency on binutils to 2.8.1.0.23 or
+      newer, as according to INSTALL/SPECIFIC PowerPC (and possibly Sparc)
+      need this.
+    * [debian/rules] Clean up some generated files outside builddir,
+      so the .diff.gz becomes smaller.
+    * [debian/rules] Partial sync/update with the one for the regular egcs
+      version.
+  * [debian/rules] Make gcc/p/configure executable.
+
+ -- J.H.M. Dassen (Ray) <jdassen@wi.LeidenUniv.nl>  Wed,  1 Jul 1998 07:12:15 +0200
+
+egcs (1.0.3a-0.6) frozen unstable; urgency=low
+
+  * Some libg++ development files were in libstdc++2.8-dev rather than
+    libg++2.8-dev. Fixed this and dealt with upgrading from the earlier
+    versions (fixes #23908; this bug is not marked release-critical, but
+    is annoying and can be quite confusing for users. Therefore, I think
+    this fix should go in 2.0).
+
+ -- J.H.M. Dassen (Ray) <jdassen@wi.LeidenUniv.nl>  Tue, 30 Jun 1998 11:10:14 +0200
+
+egcs (1.0.3a-0.5) frozen unstable; urgency=low
+
+  * Fixed location of .hP files (Fixes #23448).
+  * [debian/rules] simplified extraction of the files for libg++2.8-dev.
+
+ -- J.H.M. Dassen (Ray) <jdassen@wi.LeidenUniv.nl>  Wed, 17 Jun 1998 09:33:41 +0200
+
+egcs (1.0.3a-0.4) frozen unstable; urgency=low
+
+  * [gcc/gcc.c] There is one call to choose_temp_base for determining the
+    tempdir to be used only; #ifdef HAVE_MKSTEMP delete the tempfile created
+    as a side effect. (fixes #23123 for egcs).
+  * [gcc/collect2.c] There's still a vulnerability here; I don't see how
+    I can fix it without leaving behind tempfiles though.
+  * [debian/control] Tightened dependency on binutils to 2.8.1.0.23 or
+    newer, as according to INSTALL/SPECIFIC PowerPC (and possibly Sparc)
+    need this.
+  * [debian/rules] Clean up some generated files outside builddir, so the
+    .diff.gz becomes smaller.
+
+ -- J.H.M. Dassen (Ray) <jdassen@wi.LeidenUniv.nl>  Sat, 13 Jun 1998 09:06:52 +0200
+
+egcs-snapshot (19980608-1) experimental; urgency=low
+
+  * New snapshot version.
+
+ -- Matthias Klose <doko@debian.org>  Tue,  9 Jun 1998 14:07:44 +0200
+
+egcs (1.0.3a-0.3) frozen unstable; urgency=high (security fixes)
+
+  * [gcc/toplev.c] set flag_force_mem to 1 at optimisation level 3 or higher.
+    This works around #17768 which is considered release-critical.
+  * Changes by Matthias:
+    * [debian/README] Documentation of the compiler situation for Objective C.
+    * [debian/rules, debian/control.*] Generate control file from a master
+      file.
+    * [debian/rules] Updates for Pascal and Fortran parts; brings it in sync
+      with the one for the egcs snapshots.
+  * Use the recommended settings LDFLAGS=-s CFLAGS= BOOT_CFLAGS='-O2'.
+  * Really compile -DMKTEMP_EACH_FILE -DHAVE_MKSTEMP (really fixes #19453
+    for egcs).
+  * [gcc/gcc.c] A couple of temp files weren't marked for deletion.
+
+ -- J.H.M. Dassen (Ray) <jdassen@wi.LeidenUniv.nl>  Sun, 31 May 1998 22:56:22 +0200
+
+egcs (1.0.3a-0.2) frozen unstable; urgency=high (security fixes)
+
+  * Security improvements with regard to the /tmp problem
+    (gcc opens predictably named files in TMPDIR which can be abused via
+    symlinks)  (Fixes #19453 for egcs).
+    * Compile -DMKTEMP_EACH_FILE to ensure the %u name is generated randomly
+      every time; affects gcc/gcc.c .
+    * [gcc/choose-temp.c, libiberty/choose-temp.c]: use mktemp(3) if compiled
+      -DUSE_MKSTEMP .
+    * Security improvements: don't use the result of choose_temp_base in a
+      predictable fashion.
+      [gcc/gcc.c]:
+      * @c, @objective-c: use random name rather then tempbasename.i for
+        intermediate preprocessor output (%g.i -> %d%u).
+      * @c, @objective-c: use random name rather then tempbasename.s for
+        intermediate compiler output (%g.s -> %d%u).
+      * @c, @objective-c, @cpp-output, @assembler-with-cpp: switched
+        "as [-o output file] <input file>" to
+        "as <input file> [-o output file]".
+      * @c, @objective-c, @assembler-with-cpp: use previous random name
+        (cc1|cpp output) rather then tempbasename.s for intermediate assembler
+        input (%g.s -> %U)
+      [gcc/f/lang-specs.h]:
+      * @f77-cpp-input: use random name rather then tempbasename.i for
+        intermediate cpp output (%g.i -> %d%u).
+      * @f77-cpp-input: use previous random name (cpp output) rather than
+        tempbasename.i for f771 input (%g.i -> %U).
+      * @f77-cpp-input: switched
+        "as [-o output file] <input file>" to
+        "as <input file> [-o output file]".
+      * @f77-cpp-input: use random name rather then tempbasename.s for
+        intermediate compiler output (%g.s -> %d%u).
+      * @ratfor: use random name rather then tempbasename.i for
+        intermediate ratfor output (%g.f -> %d%u).
+      * @ratfor: use previous random name (ratfor output) rather than
+        tempbasename.i for f771 input (%g.f -> %U).
+      * @ratfor: use random name rather then tempbasename.s for
+        intermediate compiler output (%g.s -> %d%u).
+      * @ratfor: switched
+        "as [-o output file] <input file>" to
+        "as <input file> [-o output file]".
+      * @ratfor: use previous random name
+        (ratfor output) rather then tempbasename.s for intermediate assembler
+        input (%g.s -> %U).
+      * @f77: use random name rather then tempbasename.s for
+        intermediate ratfor output (%g.f -> %d%u).
+      * @ratfor: use previous random name (ratfor output) rather than
+        tempbasename.i for f771 input (%g.f -> %U).
+      * @ratfor: use random name rather then tempbasename.s for
+        intermediate compiler output (%g.s -> %d%u).
+      * @ratfor: switched
+        "as [-o output file] <input file>" to
+        "as <input file> [-o output file]".
+      * @ratfor: use previous random name
+        (ratfor output) rather then tempbasename.s for intermediate assembler
+        input (%g.s -> %U).
+      * @f77: use random name rather then tempbasename.s for
+        intermediate compiler output (%g.s -> %d%u).
+      * @f77: switched
+        "as [-o output file] <input file>" to
+        "as <input file> [-o output file]".
+      * @ratfor: use random name rather then tempbasename.s for
+        intermediate compiler output (%g.s -> %U).
+  * Run the testsuite (this requires the dejagnu package in experimental;
+    unfortunately, it is difficult to distinguish this version from the one
+    in frozen).
+    if possible, and log the results in warn_summary and bootstrap-summary.
+  * [gcc/choose-temp.c, libiberty/choose-temp.c]: s|returh|return| in
+    comment.
+  * Added notes on the Debian compiler setup [debian/README] to the
+    development packages.
+  * Matthias:
+    * [libg++/etc/lf/Makefile.in] Replaced "-ltermcap" by "-lncurses".
+    * [debian/rules] Updated so it can be used for both egcs releases and
+      snapshots easily; added support for the GNU Pascal Compiler gpc.
+    * [contrib/test_summary, contrib/warn_summary] Added from CVS.
+    * Run compiler checks and include results in /usr/doc/<package>.
+    * Updates to the README.
+    * [debian/rules] Use assignments to speed up startup.
+  * [debian/rules] Show the important variables at the start of the build
+    process.
+  * [debian/control.secondary] Added a dependency of gobjc on egcc on
+    architectures where egcs provides the secondary compiler, as
+    /usr/bin/egcc is the compiler driver for gobjc. (Fixes #22829).
+  * [debian/control.*] Bumped Standards-Version; used shorter version
+    numbers in the dependency relationships (esthetic difference only);
+    fixed typo.
+
+ -- J.H.M. Dassen (Ray) <jdassen@wi.LeidenUniv.nl>  Tue, 26 May 1998 21:47:41 +0200
+
+egcs-snapshot (19980525-1) experimental; urgency=low
+
+  * New snapshot version.
+
+ -- Matthias Klose <doko@debian.org>  Tue, 26 May 1998 18:04:06 +0200
+
+egcs-snapshot (19980517-1) experimental; urgency=low
+
+  * "Initial" release of the egcs-snapshot package; many debian/* files
+    derived from the egcs-1.0.3a-0.1 package (maintained by Galen Hazelwood
+    <galenh@micron.net>, NMU's by J.H.M. Dassen (Ray) <jdassen@wi.LeidenUniv.nl>)
+  * The egcs-snapshot packages can coexist with the packages of the
+    egcs release. Package names have a '-ss' appended.
+  * All packages are installed in a separate tree (/usr/lib/egcs-ss following
+    the FHSS).
+  * Made all snapshot packages extra, all snapshot packages conflict
+    with correspondent egcs packages, which are newer than the snapshot.
+  * Included libg++-2.8.1-980505.
+  * Included GNU Pascal (gpc-980511).
+  * Haifa scheduler enabled for all snapshot packages.
+  * Run compiler checks and include results in /usr/doc/<package>.
+  * Further information in /usr/doc/<package>/README.snapshot.
+
+ -- Matthias Klose <doko@debian.org>  Wed, 20 May 1998 11:14:06 +0200
+
+egcs (1.0.3a-0.1) frozen unstable; urgency=low
+
+  * New upstream release egcs-2.90.29 980515 (egcs-1.0.3 release)
+    (we were using 1.0.3-prerelease).  This includes the Haifa patches
+    we had since 1.0.3-0.2 and the gcc/objc/thr-posix.c patch we had
+    since 1.0.3-0.1; the differences with 1.0.3-prerelease + patches
+    we had is negligable.
+  * iostream info documentation was in the wrong package (libg++2.8-dev).
+    Now it's in libstdc++2.8-dev. (Thanks to Jens Rosenboom for bringing
+    this to my attention). As 1.0.3-0.3 didn't make it out of Incoming,
+    I'm not adding "Replaces:" for this; folks who had 1.0.3-0.3 installed
+    already know enough to use --force-overwrite.
+  * [gcc/objc/objc-act.c] Applied patch Matthias Klose supplied me with that
+    demangles Objective C method names in gcc error messages.
+  * Explicitly disable Haifa scheduling on Alpha, to make it easier to use
+    this package's diff with egcs snapshots, which may turn on Haifa
+    scheduling even though it is still unstable. (Requested by Chris Chimelis)
+  * Don't run "configure" again if builddir already exists (makes it faster
+    to restart builds in case one is hacking internals). Requested by
+    Johnnie Ingram.
+  * [gcc/gbl-ctors.h] Don't use extern declaration for atexit on glibc 2.1
+    and higher (the prototype has probably changed; having the declaration
+    broke Sparc compiles).
+  * [debian/rules] Determine all version number automatically (from the
+    version string in gcc/version.c).
+  * [debian/copyright] Updated FTP locations; added text about libg++ (fixes
+    #22465).
+
+ -- J.H.M. Dassen (Ray) <jdassen@wi.LeidenUniv.nl>  Sat, 16 May 1998 17:41:44 +0200
+
+egcs (1.0.3-0.3) frozen unstable; urgency=low
+
+  * Made an "egcs-doc" package containing documentation for egcs (e)gcc,
+    g++, gobjc, so that administrators can choose whether to have this
+    documenation or the documentation that comes with the GNU gcc package.
+    Dependency on this is Recommends: on architectures where egcs provides
+    the primary C compiler; Suggests: on the others (where GNU gcc is still
+    the primary C compiler).
+  * Use the g++ FAQ from gcc/cp rather than libg++, as that version is more
+    up to date.
+  * Added iostream info documentation to libstdc++2.8-dev.
+
+ -- J.H.M. Dassen (Ray) <jdassen@wi.LeidenUniv.nl>  Wed, 13 May 1998 08:46:10 +0200
+
+egcs (1.0.3-0.2) frozen unstable; urgency=low
+
+  * Added libg++ that works with egcs, found at
+    ftp://ftp.yggdrasil.com/private/hjl/libg++-2.8.1-980505.tar.gz
+    (fixes #20587 (Severity: important)).
+  * The "libg++" and "libg++-dev" virtual packages now refer to the GNU
+    extensions.
+  * Added the g++ FAQ that comes with libg++ to the g++ package.
+  * libg++/Makefile.in: added $(srcdir) to rule for g++FAQ.info so that it
+    builds OK in builddir.
+  * Added -D__i386__ to the cpp predefines on intel.
+  * Patches Matthias supplied me with:
+    * Further 1.0.3 prerelease patches from CVS.
+      This includes patches to the Haifa scheduler. Alpha porters, please
+      check if this makes the Haifa scheduler OK again.
+    * Objective C patches from CVS.
+
+ -- J.H.M. Dassen (Ray) <jdassen@wi.LeidenUniv.nl>  Fri,  8 May 1998 14:43:20 +0200
+
+egcs (1.0.3-0.1) frozen unstable; urgency=low (high for maintainers that use objc)
+
+  * bug fixes only in new upstream version
+  * Applied patches from egcs CVS archive (egcs_1_03_prerelease)
+    (see gcc/ChangeLog in the egcs source package).
+  * libstdc++2.8-dev no longer Provides: libg++-dev (fixes #21153).
+  * libstdc++2.8-dev now Conflicts: libg++27-dev (bo),
+    libg++272-dev (hamm) [regular packages] rather than
+    Conflicts: libg++-dev [virtual package] to prepare the way for "libg++"
+    to be used as a virtual package for a new libg++ package (i.e. an up to
+    date one, which not longer contains libstdc++, but only the GNU
+    extensions) that is compatible with the egcs g++ packages. Such a package
+    isn't available yet. Joel Klecker tried building libg++2.8.1.1a within
+    egcs's libstdc++ setup, but it appears to need true gcc 2.8.1 .
+  * Filed Severity: important bugs against wxxt1-dev (#21707) because these
+    still depend on libg++-dev, which is removed in this version.
+    A fixed libsidplay1-dev has already been uploaded.
+  * libstdc++2.8 is now Section: base and Priority: required (as dselect is
+    linked against it).
+  * Disabled Haifa scheduling on Alpha again; Chris Chimelis reported
+    that this caused problems on some machines.
+  * [gcc/extend.texi]
+    ftp://maya.idiap.ch/pub/tmb/usenix88-lexic.ps.Z is no longer available;
+    use http://master.debian.org/~karlheg/Usenix88-lexic.pdf .
+    (fixes the egcs part of #20002).
+  * Updated Standards-Version.
+  * Changed chmod in debian/rules at Johnie Ingram's request.
+  * Rather than hardwire the Debian part of the packages' version number,
+    extract it from debian/changelog .
+  * Use gcc/objc/thr-posix.c from 980418 egcs snapshot to make objc work.
+    (Fixes #21192).
+  * Applied workaround for the GNUstep packages on sparc systems.
+    See README.sparc (on sparc packages only) in the doc directory.
+    This affects the other compilers as well.
+  * Already done in 1.0.2-0.7: the gobjc package now provides a virtual
+    package objc-compiler.
+
+ -- J.H.M. Dassen (Ray) <jdassen@wi.LeidenUniv.nl>  Tue, 28 Apr 1998 12:05:28 +0200
+
+egcs (1.0.2-0.7) frozen unstable; urgency=low
+
+  * Separated out Objective-C compiler.
+  * Applied patch from http://www.cygnus.com/ml/egcs/1998-Apr/0614.html
+
+ -- Matthias Klose <doko@debian.org>  Fri, 17 Apr 1998 10:25:48 +0200
+
+egcs (1.0.2-0.6) frozen unstable; urgency=low
+
+  * Due to upstream changes (libg++ is now only the GNU specific C++
+    classes, and is no longer maintained; libstdc++ contains the C++
+    standard library, including STL), the virtual "libg++-dev"
+    package's meaning has become confusing. Therefore, new or updated
+    packages should no longer use the virtual "libg++-dev" package.
+  * Corrected g++'s Recommends to libstdc++2.8-dev (>=2.90.27-0.1).
+    The previous version had Recommends: libstdc++-dev (>=2.90.27-0.1)
+    which doesn't work, as libstc++-dev is a virtual package.
+  * Bumped Standards-Version.
+
+ -- J.H.M. Dassen (Ray) <jdassen@wi.LeidenUniv.nl>  Tue, 14 Apr 1998 11:52:08 +0200
+
+egcs (1.0.2-0.5) frozen unstable; urgency=low (high for maintainers of packages that use libstdc++)
+
+  * Modified shlibs file for libstdc++ to generate versioned dependencies,
+    as it is not link compatible with the 1.0.1-x versions in
+    project/experimental. (Fixes #20247, #20033)
+    Packages depending on libstd++ should be recompiled to fix their
+    dependencies.
+  * Strenghtened g++'s Recommends: libstdc++-dev to the 1.0.2 version or
+    newer.
+  * Fixed problems with the unknown(7) symlink for gcov.
+  * Reordering links now works.
+
+ -- Adam Heath <adam.heath@usa.net>  Sun, 12 Apr 1998 13:09:30 -0400
+
+egcs (1.0.2-0.4) frozen unstable; urgency=low
+
+  * Unreleased. This is the version Adam Heath received from me.
+  * Replaces: gcc (<= 2.7.2.3-3) so that the overlap with the older gcc
+    packages (including bo's gcc_2.7.2.1-8) is handled properly
+    (fixes #19931, #19672, #20217, #20593).
+  * Alpha architecture (fixes #20875):
+    * Patched gcc/config/alpha/linux.h for the gmon functions to operate
+      properly.
+    * Made egcs the primary C compiler.
+    * Enabled Hafia scheduling.
+  * Lintian-detected problems:
+    * E: libstdc++2.8: ldconfig-symlink-before-shlib-in-deb usr/lib/libstdc++.so.2.8
+    * E: egcc: binary-without-manpage gcov
+      Reported as wishlist bug; added link to undocumented(7).
+    * W: libstdc++2.8: non-standard-executable-perm usr/lib/libstdc++.so.2.8.0 0555
+    * E: libstdc++2.8: shlib-with-executable-bit usr/lib/libstdc++.so.2.8.0 0555
+
+ -- J.H.M. Dassen (Ray) <jdassen@wi.LeidenUniv.nl>  Fri, 10 Apr 1998 14:46:46 +0200
+
+egcs (1.0.2-0.3) frozen unstable; urgency=low
+
+  * Really fixed dependencies.
+
+ -- J.H.M. Dassen (Ray) <jdassen@wi.LeidenUniv.nl>  Mon, 30 Mar 1998 11:30:26 +0200
+
+egcs (1.0.2-0.2) frozen unstable; urgency=low
+
+  * Fixed dependencies.
+
+ -- J.H.M. Dassen (Ray) <jdassen@wi.LeidenUniv.nl>  Sat, 28 Mar 1998 13:58:58 +0100
+
+egcs (1.0.2-0.1) frozen unstable; urgency=low
+
+  * New upstream version; it now has -Di386 in CPP_PREDEFINES.
+  * Only used the debian/* patches from 1.0.1-2; the rest of it appears
+    to be in 1.0.2 already.
+
+ -- J.H.M. Dassen (Ray) <jdassen@wi.LeidenUniv.nl>  Fri, 27 Mar 1998 11:47:14 +0100
+
+egcs (1.0.1-2) unstable; urgency=low
+
+  * Integrated pre-release 1.0.2 patches
+  * Split out g++
+  * egcs may now provide either the primary or secondary C compiler
+
+ -- Galen Hazelwood <galenh@micron.net>  Sat, 14 Mar 1998 14:15:32 -0700
+
+egcs (1.0.1-1) unstable; urgency=low
+
+  * New upstream version
+  * egcs is now the standard Debian gcc!
+  * gcc now provides c-compiler (#15248 et al.)
+  * g77 now provides fortran77-compiler
+  * g77 dependencies now correct (#16991)
+  * /usr/doc/gcc/changelog.gz now has correct permissions (#16139)
+
+ -- Galen Hazelwood <galenh@micron.net>  Sat,  7 Feb 1998 19:22:30 -0700
+
+egcs (1.0-1) experimental; urgency=low
+
+  * First official release
+
+ -- Galen Hazelwood <galenh@micron.net>  Thu,  4 Dec 1997 16:30:11 -0700
+
+egcs (970917-1) experimental; urgency=low
+
+  * New upstream snapshot (There's a lot of stuff here as well, including
+    a new libstdc++, but it _still_ won't build...)
+  * eg77 driver now works properly
+
+ -- Galen Hazelwood <galenh@micron.net>  Wed, 17 Sep 1997 20:44:29 -0600
+
+egcs (970904-1) experimental; urgency=low
+
+  * New upstream snapshot
+
+ -- Galen Hazelwood <galenh@micron.net>  Sun,  7 Sep 1997 18:25:06 -0600
+
+egcs (ss-970814-1) experimental; urgency=low
+
+  * Initial packaging (of initial snapshot!)
+
+ -- Galen Hazelwood <galenh@micron.net>  Wed, 20 Aug 1997 00:36:28 +0000
+
+gcc272 (2.7.2.3-12) unstable; urgency=low
+
+  * Compiled on a glibc-2.0 based system.
+  * Reflect move of manpage to /usr/share in gcc.postinst as well.
+  * Moved gcc272-docs to section doc, priority optional.
+
+ -- Matthias Klose <doko@cs.tu-berlin.de>  Sat, 28 Aug 1999 13:42:13 +0200
+
+gcc272 (2.7.2.3-11) unstable; urgency=low
+
+  * Follow Debian policy for GNU system type (fixes #42657).
+  * config/i386/linux.h: Remove %[cpp_cpu] from CPP_SPEC. Stops gcc-2.95
+    complaining about obsolete spec operators (using gcc -V 2.7.2.3).
+    Patch suggested by Zack Weinberg <zack@bitmover.com>.
+
+ -- Matthias Klose <doko@cs.tu-berlin.de>  Sun, 15 Aug 1999 20:12:21 +0200
+
+gcc272 (2.7.2.3-10) unstable; urgency=low
+
+  * Renamed source package to gcc272. The egcs source package is renamed
+    to gcc, because it's now the "official" GNU C compiler.
+  * Changed maintainer address to "Debian GCC maintainers".
+  * Install info and man stuff to /usr/share.
+
+ -- Matthias Klose <doko@cs.tu-berlin.de>  Thu, 27 May 1999 12:29:23 +0200
+
+gcc (2.7.2.3-9) unstable; urgency=low
+
+  * debian/{postinst,prerm}-doc: handle gcc272.info, not gcc.info.
+    Fixes #36306.
+
+ -- Matthias Klose <doko@cs.tu-berlin.de>  Tue, 20 Apr 1999 07:32:58 +0200
+
+gcc (2.7.2.3-8) unstable; urgency=low
+
+  * Make gcc-2.7 the secondary compiler. Rename gcc package to gcc272.
+    On i386, sparc and m68k, this package is compiled against glibc2.0.
+  * The cpp package is built from the egcs source package.
+
+ -- Matthias Klose <doko@cs.tu-berlin.de>  Mon, 29 Mar 1999 22:48:50 +0200
+
+gcc (2.7.2.3-7) frozen unstable; urgency=low
+
+  * Separated out ObjC compiler to gobjc27 package.
+  * Changed maintainer address.
+  * Synchronized README.Debian with egcs-1.1.1-3.
+
+ -- Matthias Klose <doko@cs.tu-berlin.de>  Tue, 29 Dec 1998 19:05:26 +0100
+
+gcc (2.7.2.3-6) frozen unstable; urgency=low
+
+  * Link with -lc on i386, m68k, sparc, when building shared libraries
+    (fixes #25122).
+
+ -- Matthias Klose <doko@cs.tu-berlin.de>  Thu,  3 Dec 1998 12:12:12 +0200
+
+gcc (2.7.2.3-5) frozen unstable; urgency=low
+
+  * Updated maintainer info.
+  * Updated Standards-Version; made lintian-clean.
+  * gcc-docs can coexist with the latest egcs-docs, so added (<= version) to
+    the Conflicts.
+  * Updated the README and renamed it to README.Debian .
+  * Put a reference to /usr/doc/gcc/README.Debian in the info docs.
+  * Updated description of g++272 .
+  * Clean up generated info files, to keep the diff small.
+
+ -- J.H.M. Dassen (Ray) <jdassen@wi.LeidenUniv.nl>  Tue, 17 Nov 1998 20:05:59 +0100
+
+gcc (2.7.2.3-4.8) frozen unstable; urgency=high
+
+  * Non-maintainer release
+  * Fix type in extended description
+  * Removed wrong test in postinst
+  * Add preinst to clean up some stuff from an older gcc package properly
+    and stop man complaining about dangling symlinks
+
+ -- Wichert Akkerman <wakkerma@debian.org>  Fri, 17 Jul 1998 18:48:32 +0200
+
+gcc (2.7.2.3-4.7) frozen unstable; urgency=high
+
+  * Really fixed gcc-docs postinst (Fixes #23470), so that `gcc-docs'
+    becomes installable.
+
+ -- J.H.M. Dassen (Ray) <jdassen@wi.LeidenUniv.nl>  Mon, 15 Jun 1998 07:53:40 +0200
+
+gcc (2.7.2.3-4.6) frozen unstable; urgency=high
+
+  * [gcc.c] There is one call to choose_temp_base for determining the
+    tempdir to be used only;
+    #ifdef HAVE_MKSTEMP delete the tempfile created as a side effect.
+    (fixes #23123 for gcc).
+  * gcc-docs postinst was broken (due to a broken line) (fixes #23391, #23401).
+  * [debian/control] description for gcc-docs said `egcs' where it should have
+    said `gcc' (fixes #23396).
+
+ -- J.H.M. Dassen (Ray) <jdassen@wi.LeidenUniv.nl>  Thu, 11 Jun 1998 12:48:50 +0200
+
+gcc (2.7.2.3-4.5) frozen unstable; urgency=high
+
+  * The previous version left temporary files behind, as they were not
+    marked for deletion afterwards.
+
+ -- J.H.M. Dassen (Ray) <jdassen@wi.LeidenUniv.nl>  Sun, 31 May 1998 22:49:14 +0200
+
+gcc (2.7.2.3-4.4) frozen unstable; urgency=high (security fixes)
+
+  * Security improvements with regard to the /tmp problem
+    (gcc opens predictably named files in TMPDIR which can be abused via
+    symlinks)  (Fixes #19453 for gcc):
+    * Compile -DMKTEMP_EACH_FILE to ensure the %u name is generated randomly
+      every time; affects gcc/gcc.c .
+    * [cp/g++.c, collect2.c, gcc.c] If compiled -DHAVE_MKSTEMP use mkstemp(3)
+      rather than mktemp(3).
+    * Security improvements: don't use the result of choose_temp_base in a
+      predictable fashion.
+      [gcc.c]:
+      * @c, @objective-c: use random name rather then tempbasename.i for
+        intermediate preprocessor output (%g.i -> %d%u).
+      * @c, @objective-c: use random name rather then tempbasename.s for
+        intermediate compiler output (%g.s -> %d%u).
+      * @c, @objective-c, @cpp-output, @assembler-with-cpp: switched
+        "as [-o output file] <input file>" to
+        "as <input file> [-o output file]".
+      * @c, @objective-c, @assembler-with-cpp: use previous random name
+        (cc1|cpp output) rather then tempbasename.s for intermediate assembler
+        input (%g.s -> %U)
+      [f/lang-specs.h]:
+      * @f77-cpp-input: use random name rather then tempbasename.i for
+        intermediate cpp output (%g.i -> %d%u).
+      * @f77-cpp-input: use previous random name (cpp output) rather than
+        tempbasename.i for f771 input (%g.i -> %U).
+      * @f77-cpp-input: switched
+        "as [-o output file] <input file>" to
+        "as <input file> [-o output file]".
+      * @f77-cpp-input: use random name rather then tempbasename.s for
+        intermediate compiler output (%g.s -> %d%u).
+      * @ratfor: use random name rather then tempbasename.i for
+        intermediate ratfor output (%g.f -> %d%u).
+      * @ratfor: use previous random name (ratfor output) rather than
+        tempbasename.i for f771 input (%g.f -> %U).
+      * @ratfor: use random name rather then tempbasename.s for
+        intermediate compiler output (%g.s -> %d%u).
+      * @ratfor: switched
+        "as [-o output file] <input file>" to
+        "as <input file> [-o output file]".
+      * @ratfor: use previous random name
+        (ratfor output) rather then tempbasename.s for intermediate assembler
+        input (%g.s -> %U).
+      * @f77: use random name rather then tempbasename.s for
+        intermediate ratfor output (%g.f -> %d%u).
+      * @ratfor: use previous random name (ratfor output) rather than
+        tempbasename.i for f771 input (%g.f -> %U).
+      * @ratfor: use random name rather then tempbasename.s for
+        intermediate compiler output (%g.s -> %d%u).
+      * @ratfor: switched
+        "as [-o output file] <input file>" to
+        "as <input file> [-o output file]".
+      * @ratfor: use previous random name
+        (ratfor output) rather then tempbasename.s for intermediate assembler
+        input (%g.s -> %U).
+      * @f77: use random name rather then tempbasename.s for
+        intermediate compiler output (%g.s -> %d%u).
+      * @f77: switched
+        "as [-o output file] <input file>" to
+        "as <input file> [-o output file]".
+      * @ratfor: use random name rather then tempbasename.s for
+        intermediate compiler output (%g.s -> %U).
+
+ -- J.H.M. Dassen (Ray) <jdassen@wi.LeidenUniv.nl>  Sat, 30 May 1998 17:27:03 +0200
+
+gcc (2.7.2.3-4.3) frozen unstable; urgency=high
+
+  * The "alpha" patches from -4 affected a lot more than alpha support,
+    and in all likeliness broke compilation of libc6 2.0.7pre3-1
+    and 2.0.7pre1-4 . I removed them by selective application of the
+    diff between -4 and -4. (should fix #22292).
+  * Fixed reference to the trampolines paper (fixes #20002 for Debian;
+    this still needs to be forwarded).
+  * This is for frozen too. (obsoletes #22390 (request to move -4.2 to
+    frozen)).
+  * Split of gcc-docs package, so that the gcc can be succesfully installed
+    on systems that have egcs-docs installed.
+  * Added the README on the compiler situation that's already in the egcs
+    packages.
+  * Use the recommended settings LDFLAGS=-s CFLAGS= BOOT_CFLAGS='-O2'.
+
+ -- J.H.M. Dassen (Ray) <jdassen@wi.LeidenUniv.nl>  Thu, 28 May 1998 20:03:59 +0200
+
+gcc (2.7.2.3-4.2) unstable; urgency=low
+
+  * Still for unstable, as I have received no feedback about the g++272
+    package yet.
+  * gcc now Provides: objc-compiler .
+  * Clean up /etc/alternatives/{g++,g++.1.gz} if they are dangling.
+    (fixes #19765, #20563)
+
+ -- J.H.M. Dassen (Ray) <jdassen@wi.LeidenUniv.nl>  Wed, 22 Apr 1998 12:40:45 +0200
+
+gcc (2.7.2.3-4.1) unstable; urgency=low
+
+  * Bumped Standards-Version.
+  * Forked off a g++272 package (e.g. for code that uses the GNU extensions
+    in libg++); for now this is in "unstable" only; feedback appreciated.
+  * Some cleanup (lintian): permissions, absolute link, gzip manpage.
+
+ -- J.H.M. Dassen (Ray) <jdassen@wi.LeidenUniv.nl>  Fri, 17 Apr 1998 13:05:25 +0200
+
+gcc (2.7.2.3-4) unstable; urgency=low
+
+  * Added alpha patches
+  * Only build C and objective-c compilers, split off g++
+
+ -- Galen Hazelwood <galenh@micron.net>  Sun,  8 Mar 1998 21:16:39 -0700
+
+gcc (2.7.2.3-3) unstable; urgency=low
+
+  * Added patches for m68k
+  * Added patches for sparc (#13968)
+
+ -- Galen Hazelwood <galenh@micron.net>  Fri, 17 Oct 1997 18:25:21 -0600
+
+gcc (2.7.2.3-2) unstable; urgency=low
+
+  * Added g77 support (g77 0.5.21)
+
+ -- Galen Hazelwood <galenh@micron.net>  Wed, 10 Sep 1997 18:44:54 -0600
+
+gcc (2.7.2.3-1) unstable; urgency=low
+
+  * New upstream version
+  * Now using pristine source
+  * Removed misplaced paragraph in cpp.texi (#10877)
+  * Fix security bug for temporary files (#5298)
+  * Added Suggests: libg++-dev (#12335)
+  * Patched objc/thr-posix.c to support conditions (#12502)
+
+ -- Galen Hazelwood <galenh@micron.net>  Mon,  8 Sep 1997 12:20:07 -0600
+
+gcc (2.7.2.2-7) unstable; urgency=low
+
+  * Made cc and c++ managed through alternates mechanism (for egcs)
+
+ -- Galen Hazelwood <galenh@micron.net>  Tue, 19 Aug 1997 22:37:03 +0000
+
+gcc (2.7.2.2-6) unstable; urgency=low
+
+  * Tweaked Objective-C thread support (#11069)
+
+ -- Galen Hazelwood <galenh@micron.net>  Wed,  9 Jul 1997 11:56:57 -0600
+
+gcc (2.7.2.2-5) unstable; urgency=low
+
+  * More updated m68k patches
+  * Now conflicts with libc5-dev (#10006, #10112)
+  * More strict Depends: cpp, prevents version mismatch (#9954)
+
+ -- Galen Hazelwood <galenh@micron.net>  Thu, 19 Jun 1997 01:29:02 -0600
+
+gcc (2.7.2.2-4) unstable; urgency=low
+
+  * Moved to unstable
+  * Temporarily removed fortran support (waiting for new g77)
+  * Updated m68k patches
+
+ -- Galen Hazelwood <galenh@micron.net>  Fri,  9 May 1997 13:35:14 -0600
+
+gcc (2.7.2.2-3) experimental; urgency=low
+
+  * Built against libc6 (fixes bug #8511)
+
+ -- Galen Hazelwood <galenh@micron.net>  Fri, 4 Apr 1997 13:30:10 -0700
+
+gcc (2.7.2.2-2) experimental; urgency=low
+
+  * Fixed configure to build crt{begin,end}S.o on i386
+
+ -- Galen Hazelwood <galenh@micron.net>  Tue, 11 Mar 1997 16:15:02 -0700
+
+gcc (2.7.2.2-1) experimental; urgency=low
+
+  * Built for use with libc6-dev (experimental purposes only!)
+  * Added m68k patches from Andreas Schwab
+
+ -- Galen Hazelwood <galenh@micron.net>  Fri, 7 Mar 1997 12:44:17 -0700
+
+gcc (2.7.2.1-7) unstable; urgency=low
+
+  * Patched to support g77 0.5.20
+
+ -- Galen Hazelwood <galenh@micron.net>  Thu, 6 Mar 1997 22:20:23 -0700
+
+gcc (2.7.2.1-6) unstable; urgency=low
+
+  * Added (small) manpage for protoize/unprotoize (fixes bug #6904)
+  * Removed -lieee from specs file (fixes bug #7741)
+  * No longer builds aout-gcc
+
+ -- Galen Hazelwood <galenh@micron.net>  Mon, 3 Mar 1997 11:10:20 -0700
+
+gcc (2.7.2.1-5) unstable; urgency=low
+
+  * debian/control now lists cpp in section "interpreters"
+  * Re-added Objective-c patches for unstable
+
+ -- Galen Hazelwood <galenh@micron.net>  Wed, 22 Jan 1997 10:27:52 -0700
+
+gcc (2.7.2.1-4) stable unstable; urgency=low
+
+  * Changed original source file so dpkg-source -x works
+  * Removed Objective-c patches (unsafe for stable)
+  * Built against rex's libc, so fixes placed in -3 are available to
+    those still using rex
+
+ -- Galen Hazelwood <galenh@micron.net>  Tue, 21 Jan 1997 11:11:53 -0700
+
+gcc (2.7.2.1-3) unstable; urgency=low
+
+  * New (temporary) maintainer
+  * Updated to new standards and source format
+  * Integrated aout-gcc into gcc source package
+  * Demoted aout-gcc to Priority "extra"
+  * cpp package description more clear (fixes bug #5428)
+  * Removed cpp "Replaces: gcc" (fixes bug #5762)
+  * Minor fix to invoke.texi (fixes bug #2909)
+  * Added latest Objective-C patches for GNUstep people (fixes bug #4657)
+
+ -- Galen Hazelwood <galenh@micron.net>  Sun, 5 Jan 1997 09:57:36 -0700