diff -Nru gcc-4.4-4.4.5/debian/changelog gcc-4.4-4.4.6/debian/changelog
--- gcc-4.4-4.4.5/debian/changelog	2011-05-26 17:12:59.000000000 +0000
+++ gcc-4.4-4.4.6/debian/changelog	2011-05-26 17:13:03.000000000 +0000
@@ -1,10 +1,72 @@
-gcc-4.4 (4.4.5-15ubuntu1) natty; urgency=low
+gcc-4.4 (4.4.6-3natty3) natty; urgency=low
 
-  * Merge with Debian.
-  * Build with multiarch defaults for natty.
+  * Build for Ubuntu 10.04 LTS.
+  * Disable the build from the Linaro branch (didn't exist for lucid).
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 26 May 2011 18:32:52 +0200
+
+gcc-4.4 (4.4.6-3ubuntu1) oneiric; urgency=low
+
+  * Update to SVN 20110523 from the gcc-4_4-branch (r174066).
+    - Fix PR fortran/48894, PR rtl-optimization/48932,
+      PR rtl-optimization/45593, PR tree-optimization/48837, PR c++/40975,
+      PR c++/48873, PR c++/48936.
+  * Check for large file support (backport from 4.6).
+  * Add some conditionals to build the package on older releases.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 23 May 2011 15:31:57 +0200
+
+gcc-4.4 (4.4.6-3) unstable; urgency=low
+
+  * Update to SVN 20110504 from the gcc-4_4-branch (r173386).
+    - Fix PR target/48774, PR tree-optimization/48809, PR middle-end/48597,
+      PR target/48288, PR target/48366, PR target/48605, PR c++/42687,
+      PR c++/48594, PR other/48639.
+
+  [ Matthias Klose ]
+  * debian/patches/ada-bug601133.diff: Don't use the subminor version number.
+
+  [ Thorsten Glaser ]
+  * Re-enable common pkgs and libs on m68k for lack of gcc-4.[56].
+
+ -- Matthias Klose <doko@debian.org>  Wed, 04 May 2011 19:54:47 +0200
+
+gcc-4.4 (4.4.6-2ubuntu1) oneiric; urgency=low
+
+  * debian/patches/ada-bug601133.diff: Don't use the subminor version number.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 22 Apr 2011 16:31:10 +0200
+
+gcc-4.4 (4.4.6-2) unstable; urgency=low
+
+  * debian/rules (clean): Revert the previous change, breaks the clean target.
+  * Update the Linaro support for 4.4.6.
+  * Only apply armhf-triplet-backport when building with Linaro support.
+  * Adjust (build)-dependency to new libgmp-dev name.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 17 Apr 2011 12:20:44 +0200
+
+gcc-4.4 (4.4.6-1) unstable; urgency=low
+
+  * GCC 4.4.6 release.
+
+  [ Matthias Klose ]
   * libjava-jnipath.diff: Add /usr/lib/<multiarch>/jni as jnipath too.
+  * Fix gdc build for multiarch.
+  * Fix gdc build with the Linaro branch.
+  * Fix D system include dir for multiarch locations.
+  * Add patch armhf-triplet-backport, support for arm-linux-*eabi* backported
+    from a patch sent on the upstream mailing-list. Closes: #621083.
+
+  [Nicolas Boulenguez]
+  * debian/rules.d/binary-ada.mk: add gnathtml to the package gnat-4.4.
+  * debian/gnat.1: remove the version number of GCC.  Mention gnathtml.
+  * debian/rules (clean): remove debian/rules.parameters.
+
+  [Ludovic Brenta]
+  * debian/patches/ada-bug601133.diff: new.  Closes: #601133.
 
- -- Matthias Klose <doko@ubuntu.com>  Wed, 30 Mar 2011 23:47:22 +0200
+ -- Matthias Klose <doko@debian.org>  Sat, 16 Apr 2011 12:38:08 +0200
 
 gcc-4.4 (4.4.5-15) unstable; urgency=low
 
@@ -93,20 +155,6 @@
 
  -- Matthias Klose <doko@debian.org>  Wed, 16 Feb 2011 21:05:04 +0100
 
-gcc-4.4 (4.4.5-11ubuntu2) natty; urgency=low
-
-  * debian/patches/gcc-default-ssp.patch:
-    - do not ignore -fstack-protector-all (LP: #691722)
-    - do not enable -fstack-protector with -ffreestanding.
-
- -- Kees Cook <kees@ubuntu.com>  Mon, 21 Feb 2011 10:38:33 -0800
-
-gcc-4.4 (4.4.5-11ubuntu1) natty; urgency=low
-
-  * Merge with Debian.
-
- -- Matthias Klose <doko@ubuntu.com>  Tue, 15 Feb 2011 15:17:50 +0100
-
 gcc-4.4 (4.4.5-11) unstable; urgency=low
 
   * Update to SVN 20110215 from the gcc-4_4-branch (r170176).
@@ -136,33 +184,6 @@
 
  -- Matthias Klose <doko@debian.org>  Tue, 15 Feb 2011 15:02:30 +0100
 
-gcc-4.4 (4.4.5-10ubuntu2) natty; urgency=low
-
-  * Update to SVN 20110111 from the gcc-4_4-branch (r168688).
-    - Fix PR target/43309, PR target/45447, PR target/46915,
-      PR target/40468, PR preprocessor/39213.
-  * Update the Linaro support to the 4.4 2011.01 release.
-
- -- Matthias Klose <doko@ubuntu.com>  Wed, 12 Jan 2011 05:11:35 +0100
-
-gcc-4.4 (4.4.5-10ubuntu1) natty; urgency=low
-
-  * Update to SVN 20101214 from the gcc-4_4-branch (r167799).
-    - Fix PR fortran/46753, PR libgomp/45240, PR target/22224,
-      PR middle-end/46534, PR tree-optimization/46663, PR c++/46538,
-      PR fortran/46794, PR fortran/45081, PR fortran/46753.
-
-  [ Marcin Juszkiewicz ]
-  * Apply ARM target configure options for stage1/stage2 cross builds.
-    LP: #684625.
-  * Allow to build only the -source package, and include the version
-    in the package name. LP: #682333.
-
-  [ Matthias Klose ]
-  * Update the Linaro support to the 4.4 2011.01 release.
-
- -- Matthias Klose <doko@ubuntu.com>  Tue, 14 Dec 2010 15:36:39 +0100
-
 gcc-4.4 (4.4.5-10) unstable; urgency=low
 
   * Update cell branch to apply on top of SVN 20101129.
@@ -196,13 +217,6 @@
 
  -- Matthias Klose <doko@debian.org>  Sun, 14 Nov 2010 08:33:27 +0100
 
-gcc-4.4 (4.4.5-7ubuntu1) natty; urgency=low
-
-  * Update to SVN 20101112 from the gcc-4_4-branch (r166584).
-    - Fix PR middle-end/43690, PR tree-optimization/46107, PR libgfortran/46373.
-
- -- Matthias Klose <doko@ubuntu.com>  Fri, 12 Nov 2010 16:52:07 +0100
-
 gcc-4.4 (4.4.5-7) unstable; urgency=low
 
   * Update to SVN 20101111 from the gcc-4_4-branch (r166584).
@@ -231,24 +245,51 @@
 
  -- Matthias Klose <doko@debian.org>  Fri, 29 Oct 2010 22:45:07 +0200
 
-gcc-4.4 (4.4.5-2ubuntu1) natty; urgency=low
+gcc-4.4 (4.4.5-5) unstable; urgency=medium
 
-  * Update to SVN 20100924 from the gcc-4_4-branch (r164607, 4.4.5 release
-   - Fix PR target/45820, PR target/45843, PR target/44575,
-     PR libfortran/45710, PR bootstrap/44621, PR libffi/45677.
-   - Remove patches applied in the gcc-4_4-branch.
+  * Update to SVN 20101021 from the gcc-4_4-branch (r165755).
+    Fix PR fortran/42169, PR middle-end/46019 (wrong code), PR fortran/33595.
+
+  [ Thorsten Glaser ]
+  * Add preliminary m68k support. Closes: #600835.
+  * debian/patches/gcc-multiarch.diff: Add m68k support.
+  * debian/rules2: Disable multi{arch,lib} on m68k for now.
+  * debian/patches/pr41302.diff: new, backported from trunk.
+  * debian/patches/pr43804.diff: new, taken from GCC BZ.
+  * debian/rules.patch: Add pr41302, pr43804 on m68k.
+
+  [ Matthias Klose ]
+  * ARM: Fix Thumb-1 reload ICE with nested functions (Julian Brown),
+    taken from the trunk.
+  * Fix earlyclobbers on some arm.md DImode shifts (may miscompile "x >> 1"),
+    taken from the trunk. Closes: #600888.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 21 Oct 2010 11:46:36 +0200
+
+gcc-4.4 (4.4.5-4) unstable; urgency=medium
+
+  * Fix dangling libmudflap.so symlink. Closes: #600161.
+
+ -- Matthias Klose <doko@debian.org>  Sat, 16 Oct 2010 03:44:07 +0200
+
+gcc-4.4 (4.4.5-3) unstable; urgency=medium
+
+  * Update to SVN 20101011 from the gcc-4_4-branch (r164607).
+    - Fix PR target/45820, PR target/45843, PR target/44575,
+      PR libfortran/45710, PR bootstrap/44621, PR libffi/45677.
+    - Remove patches applied in the gcc-4_4-branch.
 
   [ Matthias Klose ]
   * Don't use gcc-snapshot for the gnat bootstrap on armel.
   * Update the Linaro support to the 4.4 2010.10 release.
-  * On linux targets pass --no-add-needed to the linker.
+  * For uploads to experimental, pass --no-add-needed to the linker.
 
   [ Ludovic Brenta ]
   * debian/patches/ada-bug589164.diff: new.  Addresses: #589164.
   * debian/patches/ada-symbolic-tracebacks.diff: adjust to GCC 4.3
     (belatedly).  Addresses: #582452.
 
- -- Matthias Klose <doko@ubuntu.com>  Mon, 11 Oct 2010 15:24:22 +0200
+ -- Matthias Klose <doko@debian.org>  Mon, 11 Oct 2010 17:33:55 +0200
 
 gcc-4.4 (4.4.5-2) unstable; urgency=low
 
@@ -315,62 +356,6 @@
 
  -- Matthias Klose <doko@debian.org>  Fri, 17 Sep 2010 23:16:42 +0200
 
-gcc-4.4 (4.4.4-14ubuntu5) maverick; urgency=low
-
-  * Avoid include paths starting with a double slash. LP: #635840.
-
- -- Matthias Klose <doko@ubuntu.com>  Mon, 27 Sep 2010 16:00:29 +0200
-
-gcc-4.4 (4.4.4-14ubuntu4) maverick; urgency=low
-
-   * Fix spu build failure on powerpc, introduced by changing the
-     order of applying the svn and linaro patches.
-
- -- Matthias Klose <doko@ubuntu.com>  Wed, 15 Sep 2010 02:37:30 +0200
-
-gcc-4.4 (4.4.4-14ubuntu3) maverick; urgency=low
-
-  * Build from the Linaro 4.4-2010.09 release (no code changes compared
-    to 4.4.4-14ubuntu2).
-
-  * The package version identifier specified with --with-pkg-version, e.g.
-        gcc-4.4 (Ubuntu/Linaro 4.4.4-14ubuntu3) 4.4.5
-    changes with every upload of this package and should not be used
-    to define any ABI or API version in other package builds.
-
-  [ Matthias Klose ]
-  * Remove non-existing URL's in README.c++ (Osamu Aoki). Closes: #596406.
-  * Don't provide c++abi2-dev for g++ cross builds.
-
-  [ Iain Buclaw ]
-  * Add copyrights and licenses for the gdc and libphobos.
-  * Updates from the gdc branch up to 20100912.
-
- -- Matthias Klose <doko@ubuntu.com>  Tue, 14 Sep 2010 15:49:17 +0200
-
-gcc-4.4 (4.4.4-14ubuntu2) maverick; urgency=low
-
-  [ Matthias Klose ]
-  * Build from the Linaro 4.4-2010.09-0 release tag.
-  * gcc-4.4: Include the Linaro changelog.
-
-  [ Marcin Juszkiewicz ]
-  * Fix priorities and sections for some cross packages.
-
-  [ Kees Cook ]
-  * Push glibc stack traces into stderr when building the package.
-
- -- Matthias Klose <doko@ubuntu.com>  Fri, 10 Sep 2010 18:03:45 +0200
-
-gcc-4.4 (4.4.4-14ubuntu1) maverick; urgency=medium
-
-  * Merge with Debian; remaining changes:
-    - Build from VCS, including GFDL documents.
-    - Build from the Linaro 4.4-2010.08-0 release on amd64, armel, i386
-      and powerpc.
-
- -- Matthias Klose <doko@ubuntu.com>  Thu, 09 Sep 2010 22:38:47 +0200
-
 gcc-4.4 (4.4.4-14) unstable; urgency=medium
 
   * Update to SVN 20100909 from the gcc-4_4-branch (r164128).
@@ -385,37 +370,16 @@
 
  -- Matthias Klose <doko@debian.org>  Thu, 09 Sep 2010 22:19:45 +0200
 
-gcc-4.4 (4.4.4-13ubuntu2) maverick; urgency=low
-
-  * Revert the (temporary) build dependency on g++-4.5.
-
- -- Matthias Klose <doko@ubuntu.com>  Sun, 05 Sep 2010 10:03:41 +0200
-
-gcc-4.4 (4.4.4-13ubuntu1) maverick; urgency=low
-
-  * Merge with Debian; remaining changes:
-    - Build from VCS, including GFDL documents.
-    - Include and build with the Linaro changes.
-
- -- Matthias Klose <doko@ubuntu.com>  Sat, 04 Sep 2010 13:32:11 +0200
-
 gcc-4.4 (4.4.4-13) unstable; urgency=low
 
   * Always add dependencies on multilib library packages in *-multilib
     packages.
   * Fix installation of libgcc_s.so on architectures when libgcc_s.so is
     a linker script, not a symlink (Steve Langasek). Closes: #595474.
+  * Remove the lib32gcc1 preinst script. Closes: #595495.
 
  -- Matthias Klose <doko@debian.org>  Sat, 04 Sep 2010 12:35:25 +0200
 
-gcc-4.4 (4.4.4-12ubuntu1) maverick; urgency=low
-
-  * Merge with Debian; remaining changes:
-    - Build from VCS, including GFDL documents.
-    - Include and build with the Linaro changes.
-
- -- Matthias Klose <doko@ubuntu.com>  Fri, 03 Sep 2010 14:18:49 +0200
-
 gcc-4.4 (4.4.4-12) unstable; urgency=low
 
   * Update to SVN 20100902 from the gcc-4_4-branch (r163781).
@@ -488,36 +452,6 @@
 
  -- Matthias Klose <doko@debian.org>  Fri, 27 Aug 2010 22:36:10 +0200
 
-gcc-4.4 (4.4.4-9ubuntu2) maverick; urgency=low
-
-  * Update to SVN 20100824 from the gcc-4_4-branch (r163521).
-    - Fix PR rtl-optimization/44691, PR rtl-optimization/42246,
-      PR rtl-optimization/42389, PR rtl-optimization/42388,
-      PR rtl-optimization/42294, PR rtl-optimization/39453,
-      PR rtl-optimization/42246, PR middle-end/42245,
-      PR rtl-optimization/42249, PR rtl-optimization/41697,
-      PR rtl-optimization/41697, PR rtl-optimization/40101,
-      PR target/45296, PR c++/45315.
-
-  [ Marcin Juszkiewicz ]
-  * Fix building intermediate stages for cross builds. LP: #613401, #613404.
-
-  [ Iain Buclaw ]
-  * Update gdc to upstream HG 20100824.
-
-  [ Matthias Klose ]
-  * Integrate and extend bi/tri-arch cross builds patches (Al Viro).
-
- -- Matthias Klose <doko@ubuntu.com>  Thu, 26 Aug 2010 00:23:09 +0200
-
-gcc-4.4 (4.4.4-9ubuntu1) maverick; urgency=low
-
-  * Fix the version information (using the --with-pkgversion style).
-  * Merge with Debian; remaining changes:
-    - Build from VCS, including GFDL documents.
-
- -- Matthias Klose <doko@ubuntu.com>  Tue, 17 Aug 2010 10:01:27 +0200
-
 gcc-4.4 (4.4.4-9) unstable; urgency=medium
 
   * Update to SVN 20100816 from the gcc-4_4-branch (r163287).
@@ -555,48 +489,6 @@
 
  -- Matthias Klose <doko@debian.org>  Tue, 17 Aug 2010 02:14:08 +0200
 
-gcc-4.4 (4.4.4-8ubuntu2) maverick; urgency=low
-
-  * Update to the Linaro 4.4-2010.08-0 release on amd64, armel, i386
-    and powerpc.
-  * Update to SVN 20100813 from the gcc-4_4-branch (r163226).
-    - Fix PR middle-end/45262, PR middle-end/41551, PR target/44805,
-      PR tree-optimization/45109, PR boehm-gc/34544, PR target/44942,
-      PR fortran/31588, PR fortran/43954 (closes: #576864), PR fortran/44660.
-
-  [ Matthias Klose ]
-  * Allow overwriting of the PF macro used in the build from the environment
-    (Jim Heck). Closes: #588381.
-  * Fix libc-dbg build dependency for java enabled builds. Addresses: #591424.
-  * gnat-snapshot-build-fix.diff: Let gnat-4.4 build with gnat snapshots
-    from the trunk (20100803).
-  * gcj: Align data in .rodata.jutf8.* sections, patch taken from the trunk.
-  * Add the complete packaging to the -source package. LP: #608650.
-  * Drop the gcc-ix86-asm-generic32.diff patch.
-
-  [ Steve Langasek ]
-  * s,/lib/,/$(libdir)/, throughout debian/rules*; a no-op in the current
-    case, but required for us to find the libraries when building for
-    multiarch
-  * Don't append multiarch paths to any multilib paths except for the default;
-    our biarch (multilib) builds need to remain independent of multiarch in
-    the near term, so we want to make sure we can find /usr/lib32 without
-    /usr/lib/i486-linux-gnu being available.
-  * debian/control.m4, debian/rules.conf: conditionally set packages to be
-    Multi-Arch: yes when MULTIARCH is defined.
-
-  [ Marcin Juszkiewicz ]
-  * Allow building intermediate stages for cross builds. LP: #603497.
-
- -- Matthias Klose <doko@ubuntu.com>  Sat, 14 Aug 2010 18:07:52 +0200
-
-gcc-4.4 (4.4.4-8ubuntu1) maverick; urgency=low
-
-  * Merge with Debian.
-  * Apply proposed fix for PR c++/45112. LP: #604874.
-
- -- Matthias Klose <doko@ubuntu.com>  Sat, 31 Jul 2010 18:17:57 +0200
-
 gcc-4.4 (4.4.4-8) unstable; urgency=medium
 
   * Update to SVN 20100728 from the gcc-4_4-branch (r162660).
@@ -619,42 +511,6 @@
 
  -- Matthias Klose <doko@debian.org>  Sat, 31 Jul 2010 18:05:32 +0200
 
-gcc-4.4 (4.4.4-7ubuntu3) maverick; urgency=low
-
-  * Build from the Linaro 4.4-2010.07-0 release on amd64, armel, i386.
-  * Update to SVN 20100723 from the gcc-4_4-branch (r162447).
-    - Fix PR target/44942, PR target/42869.
-
-  [ Marcin Juszkiewicz ]
-  * Copy all debian/rules* files in the -source package.
-
-  [ Matthias Klose ]
-  * Fix versioned build dependency on gcc-4.x-source package for cross builds.
-    LP: #609060.
-
- -- Matthias Klose <doko@ubuntu.com>  Fri, 23 Jul 2010 10:27:51 +0200
-
-gcc-4.4 (4.4.4-7ubuntu2) maverick; urgency=low
-
-  * Don't explicitly fail the build on ia64 and sparc.
-  * Don't build Ada from the Linaro release.
-
- -- Matthias Klose <doko@ubuntu.com>  Wed, 21 Jul 2010 01:00:32 +0200
-
-gcc-4.4 (4.4.4-7ubuntu1) maverick; urgency=low
-
-  * Update to SVN 20100720 from the gcc-4_4-branch (r162340).
-  * Build from the Linaro 4.4-2010.07-0 release on armel.
-
-  [ Marcin Juszkiewicz ]
-  * Fix dependencies on cross library packages.
-
-  [ Matthias Klose ]
-  * Add descriptions for patches, where missing.
-  * Rebuild to depend on libmpfr4.
-
- -- Matthias Klose <doko@ubuntu.com>  Tue, 20 Jul 2010 16:58:49 +0200
-
 gcc-4.4 (4.4.4-7) unstable; urgency=low
 
   * Update to SVN 20100712 from the gcc-4_4-branch (r162081).
@@ -681,28 +537,6 @@
 
  -- Matthias Klose <doko@debian.org>  Mon, 12 Jul 2010 20:12:29 +0200
 
-gcc-4.4 (4.4.4-6ubuntu2) maverick; urgency=low
-
-  [ Marcin Juszkiewicz ]
-  * cross-fixes.diff: Remove sh part.
-  * debian/rules2: Merge rules.d includes.
-  * Properly -name -dbg packages for cross builds.
-  * Various cross build fixes.
-  * Build libmudflap packages for cross builds.
-  * Merge debian/rules.conf bits for generating the control file
-  * Fix generation of maintainer scripts for cross packages.
-
-  [ Matthias Klose ]
-  * Fix build failure on armel, updating libstdc++-arm-no-check.diff.
-
- -- Matthias Klose <doko@ubuntu.com>  Sat, 26 Jun 2010 00:08:13 +0200
-
-gcc-4.4 (4.4.4-6ubuntu1) maverick; urgency=low
-
-  * Merge with Debian.
-
- -- Matthias Klose <doko@ubuntu.com>  Fri, 25 Jun 2010 15:04:36 +0200
-
 gcc-4.4 (4.4.4-6) unstable; urgency=low
 
   * Update to SVN 20100622 from the gcc-4_4-branch (r161235).
@@ -737,7 +571,7 @@
     Closes: #584308.
   * Export long double versions of "C" math library for arm-linux-gnueabi,
     m68k-linux-gnu (ColdFire), mips*-linux-gnu (o32 ABI), sh*-linux-gnu
-    (not 32 bit). Merge the libstdc++-*-ldbl-compat.diff patches.
+    (32 bit). Merge the libstdc++-*-ldbl-compat.diff patches.
   * Remove the backport for the plugin support.
 
   [ Aurelien Jarno ]
@@ -745,13 +579,7 @@
     versions of "C" math functions in libstdc++ as we need to keep the
     ABI. Closes: #584610.
 
- -- Matthias Klose <doko@debian.org>  Sat, 12 Jun 2010 13:28:34 +0200
-
-gcc-4.4 (4.4.4-4ubuntu1) maverick; urgency=low
-
-  * Merge with Debian.
-
- -- Matthias Klose <doko@ubuntu.com>  Wed, 02 Jun 2010 23:48:47 +0200
+ -- Matthias Klose <doko@debian.org>  Sat, 12 Jun 2010 16:13:21 +0200
 
 gcc-4.4 (4.4.4-4) unstable; urgency=medium
 
@@ -769,23 +597,6 @@
 
  -- Matthias Klose <doko@debian.org>  Wed, 02 Jun 2010 23:41:12 +0200
 
-gcc-4.4 (4.4.4-3ubuntu3) maverick; urgency=low
-
-  * Fix build failure on armel running the libstdc++-v3 testsuite against
-    the installed lib.
-
- -- Matthias Klose <doko@ubuntu.com>  Sat, 29 May 2010 02:40:14 +0200
-
-gcc-4.4 (4.4.4-3ubuntu1) maverick; urgency=low
-
-  * Merge with Debian.
-  * debian/locale-gen: Update locales needed for the libstdc++-v3 testsuite.
-  * If libstdc++6 is built from newer gcc-4.x source, run the libstdc++-v3
-    testsuite against the installed lib too.
-  * Apply proposed powerpc backport for PR target/44169.
-
- -- Matthias Klose <doko@ubuntu.com>  Thu, 27 May 2010 17:26:49 +0200
-
 gcc-4.4 (4.4.4-3) unstable; urgency=low
 
   * Update to SVN 20100527 from the gcc-4_4-branch (r159909).
@@ -809,21 +620,6 @@
 
  -- Matthias Klose <doko@debian.org>  Thu, 27 May 2010 08:45:06 +0200
 
-gcc-4.4 (4.4.4-2ubuntu2) maverick; urgency=low
-
-  * Re-add the 4.4.3 symlink in gcc_lib_dir to build the gnat-4.4 package
-    on the buildd.
-  * Don't run the testsuite for this otherwise unchanged upload.
-
- -- Matthias Klose <doko@ubuntu.com>  Wed, 19 May 2010 16:34:57 +0200
-
-gcc-4.4 (4.4.4-2ubuntu1) maverick; urgency=low
-
-  * Merge with Debian.
-  * On i386 set the target alias to i686-linux-gnu.
-
- -- Matthias Klose <doko@ubuntu.com>  Tue, 18 May 2010 11:14:27 +0200
-
 gcc-4.4 (4.4.4-2) unstable; urgency=low
 
   [ Matthias Klose ]
@@ -833,7 +629,7 @@
       PR documentation/44016, PR target/43744, PR debug/43370,
       PR middle-end/43671, PR fortran/44036, PR fortran/44135.
   * Update cell branch to 20100518.
-  * Update configury to target i686 instead of i486 on i386.
+  * Update configury to be able to target i686 instead of i486 on i386.
   * Ubuntu only:
     - Configure --with-arch-32=i686.
     - Pass --hash-style=gnu instead of --hash-style=both to the linker.
@@ -867,24 +663,6 @@
 
  -- Matthias Klose <doko@debian.org>  Tue, 18 May 2010 10:31:15 +0200
 
-gcc-4.4 (4.4.4-1ubuntu2) maverick; urgency=low
-
-  * Update to SVN 20100514 from the gcc-4_4-branch (r159388).
-    - Fix PR c/43893, PR other/43620, PR middle-end/44085,
-      PR documentation/44016, PR target/43744, PR debug/43370,
-      PR middle-end/43671, PR fortran/44036.
-  * Configure --with-arch-32=i686 on i386.
-  * Pass --hash-style=gnu instead of --hash-style=both to the linker.
-  * Don't build packages built from the gcc-4.5 sources.
-
- -- Matthias Klose <doko@ubuntu.com>  Fri, 14 May 2010 09:24:49 +0200
-
-gcc-4.4 (4.4.4-1ubuntu1) maverick; urgency=low
-
-  * Merge with Debian.
-
- -- Matthias Klose <doko@ubuntu.com>  Sat, 01 May 2010 14:20:09 +0200
-
 gcc-4.4 (4.4.4-1) unstable; urgency=low
 
   * GCC 4.4.4 release. Fixes compared to last upload:
@@ -952,42 +730,6 @@
 
  -- Matthias Klose <doko@debian.org>  Sun, 21 Mar 2010 23:39:36 +0100
 
-gcc-4.4 (4.4.3-4ubuntu5) lucid; urgency=low
-
-  * Revert the change for PR middle-end/42233 from the last upload,
-    import the the fix for PR c/43385 from the 4.4 branch.
-  * Import fix for PR libfortran/43517.
-
- -- Matthias Klose <doko@ubuntu.com>  Fri, 26 Mar 2010 17:57:06 +0100
-
-gcc-4.4 (4.4.3-4ubuntu4) lucid; urgency=low
-
-  * Revert PR middle-end/42233 for arm, armel, ia64, sparc; causing
-    testsuite regressions in eglibc.
-  * Update to SVN 20100323 from the gcc-4_4-branch (r157680).
-    - Fix PR libgomp/42942, PR target/43348, PR tree-optimization/43415,
-      PR rtl-optimization/43438, PR c++/43116, PR target/43305,
-      PR middle-end/43419, PR middle-end/42718.
-  * gcc-4.4-plugin-dev: Include missing header.
-
- -- Matthias Klose <doko@ubuntu.com>  Wed, 24 Mar 2010 16:53:39 +0100
-
-gcc-4.4 (4.4.3-4ubuntu2) lucid; urgency=low
-
-  * Fix build failure on ia64, don't apply pr43348 twice.
-  * Fix build failures building cross compilers configured --with-ld.
-
- -- Matthias Klose <doko@ubuntu.com>  Sun, 21 Mar 2010 21:42:20 +0100
-
-gcc-4.4 (4.4.3-4ubuntu1) lucid; urgency=low
-
-  * Merge with Debian.
-  * Upstream changes compared to 4.4.3-3ubuntu3:
-    - Fix PR libfortran/43265, PR rtl-optimization/43360, PR target/43348,
-      PR middle-end/43323.
-
- -- Matthias Klose <doko@ubuntu.com>  Sun, 21 Mar 2010 09:01:29 +0100
-
 gcc-4.4 (4.4.3-4) unstable; urgency=low
 
   * Update to SVN 20100320 from the gcc-4_4-branch (r157597).
@@ -1010,32 +752,6 @@
 
  -- Matthias Klose <doko@debian.org>  Sun, 21 Mar 2010 08:15:43 +0100
 
-gcc-4.4 (4.4.3-3ubuntu3) lucid; urgency=low
-
-  * Fix logic to build the gcc-4.4-plugin-dev package.
-
- -- Matthias Klose <doko@ubuntu.com>  Thu, 11 Mar 2010 23:01:00 +0100
-
-gcc-4.4 (4.4.3-3ubuntu2) lucid; urgency=low
-
-  * Update to SVN 20100311 from the gcc-4_4-branch (r157382).
-    - Fix PR c/43248, PR middle-end/42233, PR bootstrap/43121,
-      PR tree-optimization/43220, PR ada/42253, PR fortran/43303,
-      PR fortran/43228.
-  * gcj-4.4-jre-headless: Stop providing java-virtual-machine.
-  * libstdc++-arm-ldbl-compat.diff: On ARM provide the long double versions
-    of "C" math functions in libstdc++; these are dropped when built
-    against glibc-2.11.
-  * ARM: Backport rev148072 from the trunk.
-
- -- Matthias Klose <doko@ubuntu.com>  Thu, 11 Mar 2010 12:55:04 +0100
-
-gcc-4.4 (4.4.3-3ubuntu1) lucid; urgency=low
-
-  * Merge with Debian.
-
- -- Matthias Klose <doko@ubuntu.com>  Fri, 26 Feb 2010 04:52:00 +0100
-
 gcc-4.4 (4.4.3-3) unstable; urgency=low
 
   * Update to SVN 20100226 from the gcc-4_4-branch (r157081).
@@ -1043,31 +759,12 @@
       PR debug/43010, PR middle-end/42995, PR tree-optimization/42462,
       PR rtl-optimization/42952, PR c++/43024, PR c++/43033,
       PR target/40887, PR libstdc++/21769.
-    - Fix out-of-range branches in Thumb-2 mode. LP: #522717.
+    - Fix out-of-range branches in Thumb-2 mode.
   * Don't call dh_makeshlibs with -V for shared libraries with
     symbol files.
 
  -- Matthias Klose <doko@debian.org>  Fri, 26 Feb 2010 04:37:36 +0100
 
-gcc-4.4 (4.4.3-2ubuntu2) lucid; urgency=low
-
-  * Update to SVN 20100218 from the gcc-4_4-branch (r156863).
-    - Fix PR tree-optimization/42871, PR tree-optimization/42705,
-      PR debug/43010, PR middle-end/42995, PR tree-optimization/42462,
-      PR rtl-optimization/42952, PR c++/43024, PR c++/43033,
-      PR target/40887.
-    - Backport ARM patches from the trunk.
-  * Don't call dh_makeshlibs with -V for shared libraries with
-    symbol files.
-
- -- Matthias Klose <doko@ubuntu.com>  Thu, 18 Feb 2010 17:16:13 +0100
-
-gcc-4.4 (4.4.3-2ubuntu1) lucid; urgency=low
-
-  * Merge with Debian.
-
- -- Matthias Klose <doko@ubuntu.com>  Sun, 31 Jan 2010 22:30:43 +0100
-
 gcc-4.4 (4.4.3-2) unstable; urgency=low
 
   * Update to SVN 20100131 from the gcc-4_4-branch (r156416).
@@ -1083,25 +780,6 @@
 
  -- Matthias Klose <doko@debian.org>  Sun, 31 Jan 2010 22:26:57 +0100
 
-gcc-4.4 (4.4.3-1ubuntu2) lucid; urgency=low
-
-  * Update to SVN 20100127 from the gcc-4_4-branch (r156293).
-    - Fix PR fortran/42866, PR target/42841, PR target/38697,
-      PR bootstrap/42786.
-  * ada-arm-eabi.diff: system-linux-armel.ads (Stack_Check_Probes): Set
-    to True. Taken from the trunk.
-  * Fix PR c++/42748, do not warn about changes to mangling of va_list
-    in system headers; revert the temporary workaround building with
-    -Wno-abi.
-
- -- Matthias Klose <doko@ubuntu.com>  Wed, 27 Jan 2010 17:55:17 +0100
-
-gcc-4.4 (4.4.3-1ubuntu1) lucid; urgency=low
-
-  * GCC 4.4.3 release.
-
- -- Matthias Klose <doko@ubuntu.com>  Thu, 21 Jan 2010 17:33:22 +0100
-
 gcc-4.4 (4.4.3-1) unstable; urgency=low
 
   * GCC 4.4.3 release. Fixes compared to last upload:
@@ -1116,38 +794,6 @@
 
  -- Matthias Klose <doko@debian.org>  Thu, 21 Jan 2010 16:53:42 +0100
 
-gcc-4.4 (4.4.2-9ubuntu4) lucid; urgency=low
-
-  * Update to 4.4.3 rc1, SVN 20100116 from the gcc-4_4-branch (r155960).
-    - Fixes PR middle-end/42760, PR rtl-optimization/42691,
-      PR middle-end/42674, PR c++/42608, PR c/42721, PR middle-end/42667,
-      PR middle-end/40281, PR debug/42662, PR c++/42655, PR libjava/40859.
-  * Update the gnat patch for arm from the trunk.
-  * Temporary workaround: On arm-linux-gnueabi run the libstdc++v3 testsuite
-    with -Wno-abi.
-
- -- Matthias Klose <doko@ubuntu.com>  Sat, 16 Jan 2010 19:09:40 +0100
-
-gcc-4.4 (4.4.2-9ubuntu3) lucid; urgency=low
-
-  * Revert last patch. Instead unconditionally provide the long double
-    compat functions in libstdc++6.
-
- -- Matthias Klose <doko@ubuntu.com>  Sat, 09 Jan 2010 15:52:05 +0100
-
-gcc-4.4 (4.4.2-9ubuntu2) lucid; urgency=low
-
-  * Fix build error on armel; the long double versions of the math
-    functions are now provided by libc6 2.11.
-
- -- Matthias Klose <doko@ubuntu.com>  Sat, 09 Jan 2010 15:40:32 +0100
-
-gcc-4.4 (4.4.2-9ubuntu1) lucid; urgency=low
-
-  * Merge with Debian.
-
- -- Matthias Klose <doko@ubuntu.com>  Fri, 08 Jan 2010 08:47:20 +0100
-
 gcc-4.4 (4.4.2-9) unstable; urgency=low
 
   [ Matthias Klose ]
@@ -1175,28 +821,6 @@
 
  -- Matthias Klose <doko@debian.org>  Fri, 08 Jan 2010 08:40:35 +0100
 
-gcc-4.4 (4.4.2-8ubuntu2) lucid; urgency=low
-
-  * Update to SVN 20100105 from the gcc-4_4-branch (r155642).
-    - Fixes PR tree-optimization/42337, PR target/42448, PR middle-end/42099,
-      PR target/42549 (closes: #560812), PR tree-optimization/41956,
-      PR target/42503, PR other/42611 (LP: #501921).
-  * libgcj10: Move .so symlinks into gcj-4.4-jdk. Addresses: #563280.
-  * Don't use expect-tcl8.3 on hppa anymore.
-  * Merge gnat-4.4 changes back from 4.4.2-5.
-  * Default to v9a (ultrasparc) on sparc*-linux.
-  * gcj-4.4-jdk: Include /usr/lib/jvm-exports.
-  * Use 4.4.3 as the upstream version (we'll end up with this version
-    for the next release anyway).
-
- -- Matthias Klose <doko@ubuntu.com>  Tue, 05 Jan 2010 11:22:11 +0100
-
-gcc-4.4 (4.4.2-8ubuntu1) lucid; urgency=low
-
-  * Merge with Debian.
-
- -- Matthias Klose <doko@ubuntu.com>  Tue, 29 Dec 2009 00:41:52 +0100
-
 gcc-4.4 (4.4.2-8) unstable; urgency=medium
 
   * Update to SVN 20091228 from the gcc-4_4-branch (r155494).
@@ -1229,13 +853,6 @@
 
  -- Matthias Klose <doko@debian.org>  Sat, 26 Dec 2009 10:12:35 +0100
 
-gcc-4.4 (4.4.2-6ubuntu1) lucid; urgency=low
-
-  * Don't call install-info directly, depend on dpkg | install-info instead.
-  * On ARM, pass --hash-style=both to ld.
-
- -- Matthias Klose <doko@ubuntu.com>  Mon, 21 Dec 2009 13:50:05 +0100
-
 gcc-4.4 (4.4.2-6) unstable; urgency=low
 
   * Update to SVN 20091220 from the gcc-4_4-branch (r155367).
@@ -1257,12 +874,6 @@
 
  -- Matthias Klose <doko@debian.org>  Sun, 20 Dec 2009 10:20:19 +0100
 
-gcc-4.4 (4.4.2-5ubuntu1) lucid; urgency=low
-
-  * Merge with Debian.
-
- -- Matthias Klose <doko@ubuntu.com>  Sun, 13 Dec 2009 10:28:26 +0100
-
 gcc-4.4 (4.4.2-5) unstable; urgency=low
 
   * Update to SVN 20091212 from the gcc-4_4-branch (r155122).
@@ -1285,19 +896,6 @@
 
  -- Matthias Klose <doko@debian.org>  Sun, 13 Dec 2009 10:28:19 +0100
 
-gcc-4.4 (4.4.2-4ubuntu2) lucid; urgency=low
-
-  * Fix typo in PR libstdc++/40133 to do the link tests.
-  * Disable biarch testsuite runs for libffi (broken and unused).
-
- -- Matthias Klose <doko@ubuntu.com>  Fri, 11 Dec 2009 05:51:10 +0100
-
-gcc-4.4 (4.4.2-4ubuntu1) lucid; urgency=low
-
-  * Merge with Debian.
-
- -- Matthias Klose <doko@ubuntu.com>  Thu, 10 Dec 2009 19:06:10 +0100
-
 gcc-4.4 (4.4.2-4) unstable; urgency=low
 
   * Update to SVN 20091210 from the gcc-4_4-branch (r155122), Fixes:
@@ -1322,24 +920,6 @@
 
  -- Matthias Klose <doko@debian.org>  Thu, 10 Dec 2009 04:29:36 +0100
 
-gcc-4.4 (4.4.2-3ubuntu2) lucid; urgency=low
-
-  * Update to SVN 20091203 from the gcc-4_4-branch (r154951), Fixes:
-    PR middle-end/42049, PR c++/42234, PR fortran/41278.
-  * PR target/42263, fix wrong code bugs in SMP support on ARM, backport from
-    the trunk. LP: #491872 .
-  * Pass -mimplicit-it=thumb to as by default on ARM. LP: #488302.
-
- -- Matthias Klose <doko@ubuntu.com>  Fri, 04 Dec 2009 10:06:17 +0100
-
-gcc-4.4 (4.4.2-3ubuntu1) lucid; urgency=low
-
-  * Update to SVN 20091128 from the gcc-4_4-branch (r154725).
-    Fix PR target/42165, PR target/42113, PR libgfortran/42090.
-  * gcc-arm-thumb2-sched.diff: Don't restrict reloads to LO_REGS for Thumb-2.
-
- -- Matthias Klose <doko@ubuntu.com>  Sat, 28 Nov 2009 16:13:19 +0100
-
 gcc-4.4 (4.4.2-3) unstable; urgency=low
 
   * Update to SVN 20091118 from the gcc-4_4-branch (r154294).
@@ -1362,30 +942,6 @@
 
  -- Matthias Klose <doko@debian.org>  Wed, 18 Nov 2009 08:37:18 -0600
 
-gcc-4.4 (4.4.2-2ubuntu1) lucid; urgency=low
-
-  * Merge with Debian; remaining changes:
-    - Build from VCS, including GFDL documents.
-    - Don't build the GC enabled libobjc on armel (build failure with -mthumb).
-    - Build --with-arch=armv7-a --with-fpu=vfpv3-d16 on armel.
-  * Update to SVN 20091115 from the gcc-4_4-branch (r154188).
-    Fix PR PR c++/9381, PR c++/21008, PR c++/35067, PR c++/36912, PR c++/37037,
-    PR c++/37093, PR c++/38699, PR c++/39786, c++/36959, PR c++/41754,
-    PR c++/41876, PR c++/41967, PR c++/41972, PR c++/41994,
-    PR fortran/41772, PR fortran/41850, PR fortran/41909,
-    PR middle-end/40946, PR middle-end/41317, R tree-optimization/41643,
-    PR target/41900, PR rtl-optimization/41917, PR middle-end/41963,
-    PR middle-end/42029.
-  * Snapshot builds:
-    - patch updates.
-  * Configure with --disable-libstdcxx-pch on hppa.
-  * Backport armel patches form the trunk:
-    - Fix PR objc/41848 - workaround ObjC and -fsection-anchors.
-    - Enable scheduling for Thumb-2, including the fix for PR target/42031.
-    - Fix PR target/41939, EABI violation in accessing values below the stack.
-
- -- Matthias Klose <doko@ubuntu.com>  Sun, 15 Nov 2009 17:04:41 +0100
-
 gcc-4.4 (4.4.2-2) unstable; urgency=low
 
   * Update to SVN 20091031 from the gcc-4_4-branch (r153603).
@@ -1407,52 +963,6 @@
 
  -- Matthias Klose <doko@debian.org>  Sat, 31 Oct 2009 14:16:03 +0100
 
-gcc-4.4 (4.4.2-1ubuntu4) lucid; urgency=low
-
-  * Update to SVN 20091109 from the gcc-4_4-branch (r154036).
-    Fix PR middle-end/41963, PR tree-optimization/41643,
-    PR c++/36912, PR c++/9381, PR c++/41967, PR c++/35067i, PR fortran/41909.
-
- -- Matthias Klose <doko@ubuntu.com>  Mon, 09 Nov 2009 15:31:34 +0100
-
-gcc-4.4 (4.4.2-1ubuntu3) lucid; urgency=low
-
-  * Don't build the GC enabled libobjc on armel (build failure with -mthumb).
-
- -- Matthias Klose <doko@ubuntu.com>  Thu, 05 Nov 2009 12:13:23 +0100
-
-gcc-4.4 (4.4.2-1ubuntu2) lucid; urgency=low
-
-  * Update to SVN 20091104 from the gcc-4_4-branch (r153898).
-    Fix PR c++/36959, PR c++/41876, PR c++/39786, PR c++/37093, PR c++/41754,
-    PR fortran/41772, PR fortran/41850, PR target/41900, PR c++/38699,
-    PR rtl-optimization/41917.
-  * build --with-mode=thumb on armel.
-  * Configure with --disable-libstdcxx-pch on hppa.
-
- -- Matthias Klose <doko@ubuntu.com>  Wed, 04 Nov 2009 16:04:17 +0100
-
-gcc-4.4 (4.4.2-1ubuntu1) lucid; urgency=low
-
-  * Update to SVN 20091027 from the gcc-4_4-branch (r153603).
-    - Fix PR debug/40521, PR target/40913, PR middle-end/22072,
-      PR target/41665, PR c++/38798, PR c++/40092, PR c++/37875,
-      PR c++/37204, PR fortran/41755, PR libstdc++/40654, PR libstdc++/40826,
-      PR target/41702, PR c/41842.
-  * Snapshot builds:
-    - Configure with --enable-plugin, disable the gcjwebplugin by a patch.
-      Addresses: #551200.
-    - Proposed patch for PR lto/41652, compile lto-plugin with
-      -D_FILE_OFFSET_BITS=64
-    - Allow disabling the ada build via DEB_BUILD_OPTIONS nolang=ada.
-  * Fixes for reverse cross builds.
-  * On sparc default to v9 in 32bit mode.
-  * Fix __stack_chk_fail check for cross builds configured --with-headers.
-  * Apply some fixes for uClibc cross builds (Jonas Meyer, Hector Oron).
-  * Build --with-arch=armv7-a --with-fpu=vfpv3-d16 on armel.
-
- -- Matthias Klose <doko@ubuntu.com>  Fri, 30 Oct 2009 01:19:28 +0100
-
 gcc-4.4 (4.4.2-1) unstable; urgency=low
 
   * GCC 4.4.2 release.
@@ -1470,84 +980,59 @@
 
  -- Matthias Klose <doko@debian.org>  Sun, 18 Oct 2009 02:31:32 +0200
 
-gcc-4.4 (4.4.1-4ubuntu8) karmic; urgency=low
-
-  * Apply patch for proposed backport for PR debug/40521.
-  * Fix build failures building a host == build != target compiler.
-
- -- Matthias Klose <doko@ubuntu.com>  Wed, 14 Oct 2009 10:56:54 +0200
+gcc-4.4 (4.4.1-6) unstable; urgency=low
 
-gcc-4.4 (4.4.1-4ubuntu7) karmic; urgency=low
-
-  * PR debug/40521: LP: #440172.
+  * Snapshot builds:
+    - Add build dependency on libelfg0-dev (>= 0.8.12).
+    - Add build dependency on binutils-gold where available.
+    - Suggest binutils-gold; not perfect, it is required when using
+      -use-linker-plugin.
+    - Work around installation failure in the lto-plugin (PR lto/41569).
+    - Install java home symlinks in /usr/lib/jvm.
+    - Revert the dwarf2cfi_asm workaround, obsoleted by PR debug/40521.
+  * PR debug/40521:
     - Apply patch for PR debug/40521, taken from the trunk.
     - Revert the dwarf2cfi_asm workaround, obsoleted by PR debug/40521.
-    - (Build-) depend on binutils (>= 2.19.91.20091005).
+    - Depend on binutils (>= 2.19.91.20091005).
+  * Update to SVN 20091005 from the gcc-4_4-branch (r152450).
+    - Fixes PR fortran/41479.
   * In the test summary, add more information about package versions
     used for the build.
 
- -- Matthias Klose <doko@ubuntu.com>  Tue, 06 Oct 2009 23:18:42 +0200
+ -- Matthias Klose <doko@debian.org>  Wed, 07 Oct 2009 02:12:56 +0200
 
-gcc-4.4 (4.4.1-4ubuntu6) karmic; urgency=low
+gcc-4.4 (4.4.1-5) unstable; urgency=medium
 
-  * Rebuild against current glibc (needed for armel).
   * Update to SVN 20091003 from the gcc-4_4-branch (r152174).
-    - Fixes PR debug/40521, PR fortran/41515.
-    - Remove the patch for PR debug/40521 from the trunk.
+    - Fixes PR target/22093, PR c/39779, PR libffi/40242, PR target/40473, 
+      PR debug/40521, PR c/41049, PR debug/41065, PR ada/41100,
+      PR tree-optimization/41101, PR libgfortran/41328, PR libffi/41443,
+      PR fortran/41515.
+  * Updates for snapshot builds:
+    - Fix build dependency on automake for snapshot builds.
+    - Update patches pr40134-snap and libjava-nobiarch-check-snap.
+  * Fix lintian errors in libstdc++ packages and lintian warnings in the
+    source package.
+  * Add debian/README.source.
+  * Don't apply PR libstdc++/39491 for the trunk anymore.
+  * Install java home symlinks for snapshot builds in /usr/lib/jvm,
+    including javac. Depend on ecj. Addresses #536102.
+  * Fix build failure on armel with -mfloat-abi=softfp.
+  * Don't pessimize the code for newer armv6 and armv7 processors.
+  * libjava: Use atomic builtins For Linux ARM/EABI, backported from the
+    trunk.
+  * Proposed patch to fix wrong-code on powerpc (Alan Modra). LP: #432222.
   * Link against -ldl instead of -lcloog -lppl. Exit with an error when using
     the Graphite loop transformation infrastructure without having the
     libcloog-ppl0 package installed (patch taken from Fedora). Packages
     using these optimizations should build-depend on libcloog-ppl0.
     gcc-4.4: Suggest the cloog runtime libraries.
-    Reduces the size of the CD images by 1.7MB (gzip2 compressed).
   * Install a hook _Unwind_DebugHook, called during unwinding. Intended as
     a hook for a debugger to intercept exceptions. CFA is the CFA of the
     target frame.  HANDLER is the PC to which control will be transferred
     (patch taken from Fedora).
 
- -- Matthias Klose <doko@ubuntu.com>  Sat, 03 Oct 2009 15:14:04 +0200
-
-gcc-4.4 (4.4.1-4ubuntu5) karmic; urgency=low
-
-  * Update to SVN 20091001 from the gcc-4_4-branch (r152174).
-    - PR target/22093, PR libffi/40242, PR libffi/41443.
-  * Apply patch for PR debug/40521, taken from the trunk (armel).
-
- -- Matthias Klose <doko@ubuntu.com>  Thu, 01 Oct 2009 18:32:46 +0200
-
-gcc-4.4 (4.4.1-4ubuntu4) karmic; urgency=low
-
-  * Disable the build of neon optimized runtime libs on armel.
-  * libjava: Use atomic builtins For Linux ARM/EABI, backported from the
-    trunk.
-  * Proposed patch to fix wrong-code on powerpc (Alan Modra). LP: #432222.
-  * Update to SVN 20090925 from the gcc-4_4-branch (r152174).
-    - Fixes PR target/40473.
-
- -- Matthias Klose <doko@ubuntu.com>  Thu, 24 Sep 2009 14:16:41 +0200
-
-gcc-4.4 (4.4.1-4ubuntu3) karmic; urgency=low
-
-  * Remove trailing whitespace in libstdc++ rules file..
-
- -- Matthias Klose <doko@ubuntu.com>  Wed, 23 Sep 2009 19:27:37 +0200
-
-gcc-4.4 (4.4.1-4ubuntu2) karmic; urgency=low
-
-  * Update to SVN 20090923 from the gcc-4_4-branch (r152070).
-    - Fixes PR tree-optimization/41101, PR c/41049, PR libgfortran/41328,
-      PR c/39779, PR debug/41065.
-  * Fix libffi build failure on armel with -mfloat-abi=softfp.
-  * Don't pessimize the code for newer armv6 and armv7 processors.
-
- -- Matthias Klose <doko@ubuntu.com>  Wed, 23 Sep 2009 18:45:58 +0200
-
-gcc-4.4 (4.4.1-4ubuntu1) karmic; urgency=low
-
-  * Merge with Debian; remaining changes:
-    - Build from VCS, including GFDL documents.
-
- -- Matthias Klose <doko@ubuntu.com>  Sat, 12 Sep 2009 03:24:16 +0200
+ -- Matthias Klose <doko@debian.org>  Sat, 03 Oct 2009 13:33:05 +0100
 
 gcc-4.4 (4.4.1-4) unstable; urgency=low
 
@@ -1580,29 +1065,6 @@
 
  -- Matthias Klose <doko@debian.org>  Sat, 12 Sep 2009 03:18:17 +0200
 
-gcc-4.4 (4.4.1-3ubuntu3) karmic; urgency=low
-
-  * Fix PR target/41184.
-
- -- Matthias Klose <doko@ubuntu.com>  Sun, 30 Aug 2009 08:35:42 +0200
-
-gcc-4.4 (4.4.1-3ubuntu2) karmic; urgency=low
-
-  * On armel, configure --with-arch=armv6 --with-tune=cortex-a8
-    --with-float=softfp --with-fpu=vfp.
-  * Update to SVN 20090828 from the gcc-4_4-branch (r151159).
-    - Fixes PR target/34412, PR middle-end/41094, PR target/40718,
-      PR fortran/41062, PR libstdc++/41005.
-
- -- Matthias Klose <doko@ubuntu.com>  Fri, 28 Aug 2009 14:11:56 +0200
-
-gcc-4.4 (4.4.1-3ubuntu1) karmic; urgency=low
-
-  * Merge with Debian; remaining changes:
-    - Build from VCS, including GFDL documents.
-
- -- Matthias Klose <doko@ubuntu.com>  Sun, 23 Aug 2009 12:55:18 +0200
-
 gcc-4.4 (4.4.1-3) unstable; urgency=low
 
   * Update to SVN 20090822 from the gcc-4_4-branch (r151011).
@@ -1657,35 +1119,6 @@
 
  -- Matthias Klose <doko@ubuntu.com>  Sat, 08 Aug 2009 10:17:39 +0200
 
-gcc-4.4 (4.4.1-1ubuntu3) karmic; urgency=low
-
-  * Fix build failure on armel, disabling profiled bootstrap build.
-
- -- Matthias Klose <doko@ubuntu.com>  Thu, 06 Aug 2009 00:07:39 +0200
-
-gcc-4.4 (4.4.1-1ubuntu2) karmic; urgency=low
-
-  * Update to SVN 20090805 from the gcc-4_4-branch (r150484).
-    - Fixes PR build/40010, PR fortran/40727, PR build/40010,
-      PR rtl-optimization/40924, PR c/39902, PR middle-end/40943,
-      PR target/40577, PR c++/39987, PR debug/39706, PR c++/40948,
-      PR c++/40749, PR fortran/40851, PR fortran/40878.
-  * Build-depend on binutils 2.19.51.20090805, needed at least for armel.
-  * Merge enough of the gnat-4.4 changes back to allow a combined build
-    from the gcc-4.4 source.
-  * Build libgnatprj for armel.
-
- -- Matthias Klose <doko@ubuntu.com>  Wed, 05 Aug 2009 16:52:49 +0200
-
-gcc-4.4 (4.4.1-1ubuntu1) karmic; urgency=low
-
-  * GCC-4.4.1 release.
-  * Update to SVN 20090723 from the gcc-4_4-branch (r149997).
-    - Fixes PR target/40832, PR rtl-optimization/40710,
-      PR tree-optimization/40321.
-
- -- Matthias Klose <doko@ubuntu.com>  Thu, 23 Jul 2009 13:33:46 +0200
-
 gcc-4.4 (4.4.1-1) unstable; urgency=low
 
   * GCC 4.4.1 release.
@@ -1700,26 +1133,6 @@
 
  -- Matthias Klose <doko@debian.org>  Wed, 22 Jul 2009 13:24:39 +0200
 
-gcc-4.4 (4.4.0-11ubuntu2) karmic; urgency=low
-
-  * Update to SVN 20090721 from the gcc-4_4-branch (r149854).
-    - Fixes PR target/39943, PR tree-optimization/40792, PR c++/40780,
-      PR middle-end/40747, PR libstdc++/40691, PR libfortran/40714.
-  * Apply proposed patch for PR tree-optimization/40813, causing OpenJDK
-    build failure on sparc.
-  * Apply proposed patch for PR target/39429, an ARM wrong-code error.
-  * Fix a typo in the arm back-end (proposed patch).
-
- -- Matthias Klose <doko@ubuntu.com>  Tue, 21 Jul 2009 16:34:30 +0200
-
-gcc-4.4 (4.4.0-11ubuntu1) karmic; urgency=low
-
-  * Upload corresponding to the 4.4.1 release candidate.
-  * Merge with Debian; remaining changes:
-    - Build from VCS, including FDL documents.
-
- -- Matthias Klose <doko@ubuntu.com>  Wed, 15 Jul 2009 11:49:07 -0400
-
 gcc-4.4 (4.4.0-11) unstable; urgency=medium
 
   [ Matthias Klose ]
@@ -1773,23 +1186,6 @@
 
  -- Matthias Klose <doko@debian.org>  Wed, 24 Jun 2009 23:46:02 +0200
 
-gcc-4.4 (4.4.0-8ubuntu2) karmic; urgency=low
-
-  * Update to SVN 20090622 from the gcc-4_4-branch (r148821). 
-    - Fix PR objc/28050 (LP: #362217). 
-  * Enable SSP on arm and armel, run the testsuite with -fstack-protector. 
-    LP: #375189. 
-
- -- Matthias Klose <doko@ubuntu.com>  Tue, 23 Jun 2009 00:57:50 +0200
-
-gcc-4.4 (4.4.0-8ubuntu1) karmic; urgency=low
-
-  * Merge with Debian; remaining changes:
-    - Build from VCS, including FDL documents.
-    - Remove conflicts with libc6-i386 (<< 2.9-17).
-
- -- Matthias Klose <doko@ubuntu.com>  Sat, 20 Jun 2009 19:31:00 +0200
-
 gcc-4.4 (4.4.0-8) unstable; urgency=medium
 
   * Let all 32bit libs conflict with libc6-i386 (<< 2.9-17). Closes: #533767.
@@ -1811,19 +1207,6 @@
 
  -- Matthias Klose <doko@debian.org>  Fri, 19 Jun 2009 01:36:00 +0200
 
-gcc-4.4 (4.4.0-6ubuntu2) karmic; urgency=low
-
-  * Fix build failure building the gcc-4.4-source package.
-
- -- Matthias Klose <doko@ubuntu.com>  Fri, 12 Jun 2009 18:41:02 -0400
-
-gcc-4.4 (4.4.0-6ubuntu1) karmic; urgency=low
-
-  * Merge with Debian; remaining changes:
-    - Build from VCS, including FDL documents.
-
- -- Matthias Klose <doko@ubuntu.com>  Fri, 12 Jun 2009 15:45:50 -0400
-
 gcc-4.4 (4.4.0-6) unstable; urgency=low
 
   [ Matthias Klose ]
@@ -1865,23 +1248,6 @@
 
  -- Matthias Klose <doko@debian.org>  Fri, 12 Jun 2009 18:34:13 +0200
 
-gcc-4.4 (4.4.0-5ubuntu1) karmic; urgency=low
-
-  * Merge with Debian; remaining changes:
-    - Build from VCS, including FDL documents.
-  * Update to SVN 20090529 from the gcc-4_4-branch (r147976).
-    - Fixes PR c++/38064, PR c++/40139, PR target/40017, PR target/40266,
-      PR bootstrap/40027, PR tree-optimization/40087, PR target/39856,
-      PR rtl-optimization/40105, PR target/39942, PR middle-end/40204,
-      PR debug/40109, PR tree-optimization/39999, PR libfortran/37754,
-      PR fortran/22423, PR libfortran/39667, PR libfortran/39782,
-      PR libfortran/38668, PR libfortran/39665, PR libfortran/39702,
-      PR libfortran/39709, PR libfortran/39665i, PR libgfortran/39664,
-      PR fortran/38654, PR libfortran/37754, PR libfortran/37754,
-      PR libfortran/25561, PR libfortran/37754.
-
- -- Matthias Klose <doko@ubuntu.com>  Fri, 29 May 2009 16:38:23 +0200
-
 gcc-4.4 (4.4.0-5) unstable; urgency=medium
 
   * Update to SVN 20090517 from the gcc-4_4-branch (r147630).
@@ -1933,63 +1299,6 @@
 
  -- Matthias Klose <doko@debian.org>  Wed, 06 May 2009 15:10:36 +0200
 
-gcc-4.4 (4.4.0-3ubuntu5) karmic; urgency=low
-
-  * Remove two more symbols from the libstdc++6 symbols file for armel,
-    gone with disabling of the exception propagation support.
-
- -- Matthias Klose <doko@ubuntu.com>  Sat, 16 May 2009 02:51:36 +0200
-
-gcc-4.4 (4.4.0-3ubuntu4) karmic; urgency=low
-
-  * Update to SVN 20090514 from the gcc-4_4-branch (r147544).
-    - Fixes PR tree-optimization/40062, PR middle-end/39986,
-      PR middle-end/40057, PR fortran/39879, PR libstdc++/40038,
-      PR middle-end/40035, PR target/37179, PR middle-end/39666,
-      PR tree-optimization/40074, PR fortran/40018, PR fortran/38863,
-      PR middle-end/40147.
-  * Update libstdc++ symbols files.
-  * Update libgcc, libobjc, libstdc++ symbols files for armel.
-  * Fix version symlink in gcc_lib_dir. Closes: #527837.
-  * Fix symlinks for javac and header files in /usr/lib/jvm.
-    Closes: #528084.
-  * Don't build the stage1 compiler with -O turned on.
-  * Revert doing link tests to check for the atomic builtins, disabling
-    exception propagation support in libstdc++ on armel. See PR40133, PR40134.
-    LP: #375334.
-  * Don't apply the patch for atom support from the intel/gcc-4_4-branch.
-    Configure --with-arch=pentium-m --with-tune=i586 on lpia. LP: #376499.
-
- -- Matthias Klose <doko@ubuntu.com>  Fri, 15 May 2009 00:01:41 +0200
-
-gcc-4.4 (4.4.0-3ubuntu3) karmic; urgency=medium
-
-  * Fix PR libstdc++/40038, missing ceill/tanhl symbols in libstdc++.
-
- -- Matthias Klose <doko@ubuntu.com>  Wed, 06 May 2009 15:03:06 +0200
-
-gcc-4.4 (4.4.0-3ubuntu2) karmic; urgency=medium
-
-  * Update to SVN 20090506 from the gcc-4_4-branch (r147161).
-    - Fixes PR rtl-optimization/39914, PR testsuite/39776,
-      PR tree-optimization/40022, PR libstdc++/39909.
-  * On armel, link the shared libstdc++ with both -lgcc_s and -lgcc.
-  * Update libstdc++ symbol files for armel and hppa, adding symbols
-    for exception propagation support.
-  * gcc-4.4-source: Don't depend on gcc-4.4-base, depend on quilt
-    and patchutils.
-  * Add ARM EABI symbols to libstdc++ symbol files for armel.
-  * Add libobjc symbols file for armel.
-
- -- Matthias Klose <doko@ubuntu.com>  Wed, 06 May 2009 11:53:00 +0200
-
-gcc-4.4 (4.4.0-3ubuntu1) karmic; urgency=low
-
-  * Merge with Debian; remaining changes:
-    - Build from VCS, including FDL documents.
-
- -- Matthias Klose <doko@ubuntu.com>  Mon, 04 May 2009 11:11:49 +0200
-
 gcc-4.4 (4.4.0-3) unstable; urgency=low
 
   * libstdc++-doc: Install the man pages again.
@@ -2047,91 +1356,50 @@
 
  -- Matthias Klose <doko@debian.org>  Thu, 30 Apr 2009 00:30:20 +0200
 
-gcc-4.4 (4.4.0-0ubuntu6) karmic; urgency=low
-
-  * On lpia configure --with-arch=atom instead of --with-cpu=atom.
-
- -- Matthias Klose <doko@ubuntu.com>  Wed, 29 Apr 2009 23:03:37 +0200
-
-gcc-4.4 (4.4.0-0ubuntu5) karmic; urgency=low
-
-  * Update to SVN 20090425 from the gcc-4_4-branch.
-  * Configure java enabled builds with --enable-java-home.
-  * Integrate the bits previously found in java-gcj-compat.
-  * Rename the packages using the naming schema used for OpenJDK:
-    gcj-X.Y-{jre-headless,jre,jre-lib,jdk,source}.  The packages
-    {gij,gcj,gappletviewer}-X.Y and libgcjN-{jar,source} are gone.
-  * Don't use profiled bootstrap when building the gcj source.
-  * Apply proposed patch for PR target/39856.
-  * Fix some lintian warnings.
-
- -- Matthias Klose <doko@ubuntu.com>  Sun, 26 Apr 2009 14:58:39 +0200
-
-gcc-4.4 (4.4.0-0ubuntu4) karmic; urgency=low
-
-  * lib*stdc++6-{dbg,doc}: Add conflicts to the corresponding 4.3 packages.
-  * Configure again --with-arch-32=i486 on amd64, i386.
-
- -- Matthias Klose <doko@ubuntu.com>  Fri, 24 Apr 2009 12:37:21 +0200
-
-gcc-4.4 (4.4.0-0ubuntu3) jaunty; urgency=low
+gcc-4.4 (4.4.0-1~exp2) experimental; urgency=low
 
   * Update to SVN 20090423 from the gcc-4_4-branch.
-  * Fix powerpc build failure.
-  * Install gjdoc man page.
-  * Fix java configuration with --enable-java-home and include symlinks
-    for JAVA_HOME in /usr/lib/jvm.
-  * Apply proposed fix for PR middle-end/39794.
-  * Install libstdc++ man pages with suffix .3cxx instead of .3.
-    Closes: #525244.
-
- -- Matthias Klose <doko@ubuntu.com>  Thu, 23 Apr 2009 17:05:39 +0200
 
-gcc-4.4 (4.4.0-0ubuntu2) jaunty; urgency=low
+  [ Aurelien Jarno ]
+  * kbsd-gnu.diff: remove parts merged upstream.
 
+  [ Matthias Klose ]
   * Remove conflicts/replaces for *-spu packages.
   * Configure the spu cross compiler without --with-sysroot and
     --enable-multiarch.
   * Fix and reenable the gfortran-spu build.
   * Work around build failures with missing libstdc++ baseline files.
-  * Build again libgfortran for the non-default multilib configuration.
-  * Restore missing chunks in note-gnu-stack.diff, lost during the conversion
-    to quilt.
-  * Revert on armel: --with-float=softfp --with-fpu=vfp.
+  * Install gjdoc man page.
+  * Fix java configuration with --enable-java-home and include symlinks
+    for JAVA_HOME in /usr/lib/jvm.
+  * Apply proposed fix for PR middle-end/39794.
+  * Install libstdc++ man pages with suffix .3cxx instead of .3.
+    Closes: #525244.
+  * lib*stdc++6-{dbg,doc}: Add conflicts to the corresponding 4.3 packages.
 
- -- Matthias Klose <doko@ubuntu.com>  Wed, 22 Apr 2009 13:41:21 +0200
+ -- Matthias Klose <doko@debian.org>  Thu, 23 Apr 2009 18:11:49 +0200
 
-gcc-4.4 (4.4.0-0ubuntu1) jaunty; urgency=low
+gcc-4.4 (4.4.0-1~exp1) experimental; urgency=low
 
   * Final GCC 4.4.0 release.
 
-  * Apply proposed patch for PR libstdc++/39491, missing symbol in libstdc++
-    on hppa.
-  * Remove unsused soft-fp functions in the 64bit libgcc on powerpc (PR39828).
-  * Update NEWS files for 4.4.
-  * Update the atom patch from the ix86/gcc-4_4-branch (20090421).
-
- -- Matthias Klose <doko@ubuntu.com>  Tue, 21 Apr 2009 16:41:29 +0200
-
-gcc-4.4 (4.4-20090418-1ubuntu2) jaunty; urgency=low
-
   * Don't build the Fortran SPU cross compiler, currently broken.
-  * Configure --with-arch-32=i586 on amd64, i386, and kfreebsd-{amd64,i386},
+  * spu cross build: Build without spucache and spumea64.
+  * Configure --with-arch-32=i486 on amd64, i386, and kfreebsd-{amd64,i386},
     --with-arch-32=i586 on hurd-i386, --with-cpu=atom on lpia.
-  * Configure --with-float=softfp --with-fpu=vfp on armel.
   * Build using profiled bootstrap.
   * Remove the gcc-4.4-base.postinst. Addresses: #524708.
   * Update debian/copyright: Include runtime library exception, remove
     D and Phobas license.
+  * Apply proposed patch for PR libstdc++/39491, missing symbol in libstdc++
+    on hppa.
+  * Remove unsused soft-fp functions in the 64bit libgcc on powerpc (PR39828).
+  * Update NEWS files for 4.4.
+  * Build again libgfortran for the non-default multilib configuration.
+  * Restore missing chunks in note-gnu-stack.diff, lost during the conversion
+    to quilt.
 
- -- Matthias Klose <doko@ubuntu.com>  Mon, 20 Apr 2009 16:20:12 +0200
-
-gcc-4.4 (4.4-20090418-1ubuntu1) jaunty; urgency=low
-
-  * Merge with Debian; remaining changes:
-    - Build from VCS, including FDL documents.
-
- -- Matthias Klose <doko@ubuntu.com>  Mon, 20 Apr 2009 00:29:25 +0200
+ -- Matthias Klose <doko@debian.org>  Wed, 22 Apr 2009 00:53:16 +0200
 
 gcc-4.4 (4.4-20090418-1) experimental; urgency=low
 
@@ -2188,9 +1456,6 @@
   * debian/rules.d/binary-source.mk: Don't build and install an embedded
     copy or autoconf2.59 in gcc-4.4-source.
   * debian/copyright.in: New.
-  * debian/control.in: New.
-  * debian/control.m4: Remove.
-  * Regenerate control file.
 
   [ Matthias Klose ]
   * Build gcj on hppa.
@@ -2218,17 +1483,11 @@
   * Remove: patches/kbsd-gnu-ada.dpatch (merged upstream).
   * kbsd-gnu.diff: add fix for stuff broken by upstream.
 
- -- Matthias Klose <doko@debian.org>  Mon, 30 Mar 2009 01:53:04 +0200
-
-gcc-4.4 (4.4-20090317-0ubuntu1) jaunty; urgency=low
-
-  * Fix java build failures, fix java build dependencies.
-
- -- Matthias Klose <doko@ubuntu.com>  Tue, 17 Mar 2009 15:08:43 +0100
+ -- Matthias Klose <doko@debian.org>  Mon, 20 Apr 2009 01:34:26 +0200
 
-gcc-4.4 (4.4-20090316-0ubuntu1) jaunty; urgency=low
+gcc-4.4 (4.4-20090317-1) experimental; urgency=low
 
-  * Initial upload of GCC-4.4, based on trunk 20090315 (r144880).
+  * Initial upload of GCC-4.4, based on trunk 20090317 (r144904).
 
   [Matthias Klose]
   * Branch from the gcc-4.3 packaging.
@@ -2250,7 +1509,6 @@
   * debian/rules.conf: Update for 4.4.
   * Fix build dependencies and configure options for 4.4, which were applied
     for snapshot builds only.
-  * Build java from the gcc-4.4 source for uploads to experimental.
 
   [Arthur Loiret]
   * Update patches from debian/patches:
@@ -2268,7 +1526,7 @@
   * debian/rules.patch: Update.
   * debian/symbols/libgomp1.symbols.common: Add new symbols from OpenMP 3.0.
 
- -- Matthias Klose <doko@ubuntu.com>  Mon, 16 Mar 2009 13:28:58 +0100
+ -- Matthias Klose <doko@debian.org>  Tue, 17 Mar 2009 02:28:01 +0100
 
 gcc-4.3 (4.3.3-5) unstable; urgency=low
 
diff -Nru gcc-4.4-4.4.5/debian/control gcc-4.4-4.4.6/debian/control
--- gcc-4.4-4.4.5/debian/control	2011-05-26 17:12:59.000000000 +0000
+++ gcc-4.4-4.4.6/debian/control	2011-05-26 17:13:03.000000000 +0000
@@ -5,7 +5,7 @@
 XSBC-Original-Maintainer: Debian GCC Maintainers <debian-gcc@lists.debian.org>
 Uploaders: Matthias Klose <doko@debian.org>, Arthur Loiret <aloiret@debian.org>
 Standards-Version: 3.9.1
-Build-Depends: dpkg-dev (>= 1.16.0~ubuntu4), debhelper (>= 5.0.62), g++-multilib [amd64 i386 mips mipsel powerpc ppc64 s390 sparc kfreebsd-amd64], libc6.1-dev (>= 2.13-0ubuntu6) [alpha ia64] | libc0.3-dev (>= 2.13-0ubuntu6) [hurd-i386] | libc0.1-dev (>= 2.13-0ubuntu6) [kfreebsd-i386 kfreebsd-amd64] | libc6-dev (>= 2.13-0ubuntu6), libc6-dev-amd64 [i386], libc6-dev-sparc64 [sparc], libc6-dev-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], libc6-dev-mips64 [mips mipsel], libc6-dev-mipsn32 [mips mipsel], m4, libtool, autoconf2.59, automake1.9, libunwind7-dev (>= 0.98.5-6) [ia64], libatomic-ops-dev [ia64], zlib1g-dev, gawk, lzma, xz-utils, patchutils, binutils (>= 2.20.1-15~) | binutils-multiarch (>= 2.20.1-15~), binutils-hppa64 (>= 2.20.1-15~) [hppa], gperf (>= 3.0.1), bison (>= 1:2.3), flex, gettext, texinfo (>= 4.3), locales [!knetbsd-i386 !knetbsd-alpha], procps, sharutils, binutils-spu (>= 2.20.1-15~) [powerpc ppc64], newlib-spu (>= 1.16.0) [powerpc ppc64], libcloog-ppl-dev (>= 0.15.9-2~), libmpfr-dev, libgmp3-dev, dejagnu [!m68k !hurd-i386 !hurd-alpha], autogen, realpath (>= 1.9.12), chrpath, lsb-release, make (>= 3.81), quilt
+Build-Depends: dpkg-dev (>= 1.16.0~ubuntu4), debhelper (>= 5.0.62), g++-multilib [amd64 i386 mips mipsel powerpc ppc64 s390 sparc kfreebsd-amd64], libc6.1-dev (>= 2.13-0ubuntu6) [alpha ia64] | libc0.3-dev (>= 2.13-0ubuntu6) [hurd-i386] | libc0.1-dev (>= 2.13-0ubuntu6) [kfreebsd-i386 kfreebsd-amd64] | libc6-dev (>= 2.13-0ubuntu6), libc6-dev-amd64 [i386], libc6-dev-sparc64 [sparc], libc6-dev-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], libc6-dev-mips64 [mips mipsel], libc6-dev-mipsn32 [mips mipsel], m4, libtool, autoconf2.59, automake1.9, libunwind7-dev (>= 0.98.5-6) [ia64], libatomic-ops-dev [ia64], zlib1g-dev, gawk, lzma, xz-utils, patchutils, binutils (>= 2.20.1-15~) | binutils-multiarch (>= 2.20.1-15~), binutils-hppa64 (>= 2.20.1-15~) [hppa], gperf (>= 3.0.1), bison (>= 1:2.3), flex, gettext, texinfo (>= 4.3), locales [!knetbsd-i386 !knetbsd-alpha], procps, sharutils, binutils-spu (>= 2.20.1-15~) [powerpc ppc64], newlib-spu (>= 1.16.0) [powerpc ppc64], libcloog-ppl-dev (>= 0.15.8-1~), libmpfr-dev, libgmp3-dev, dejagnu [!m68k !hurd-i386 !hurd-alpha], autogen, realpath (>= 1.9.12), chrpath, lsb-release, make (>= 3.81), quilt
 Build-Depends-Indep: doxygen (>= 1.4.2), graphviz (>= 2.2), gsfonts-x11, texlive-latex-base, 
 Homepage: http://gcc.gnu.org/
 Vcs-Browser: http://svn.debian.org/viewsvn/gcccvs/branches/sid/gcc-4.4/
diff -Nru gcc-4.4-4.4.5/debian/cpp-4.4-i586-linux-gnu.preinst gcc-4.4-4.4.6/debian/cpp-4.4-i586-linux-gnu.preinst
--- gcc-4.4-4.4.5/debian/cpp-4.4-i586-linux-gnu.preinst	1970-01-01 00:00:00.000000000 +0000
+++ gcc-4.4-4.4.6/debian/cpp-4.4-i586-linux-gnu.preinst	2011-05-26 17:13:03.000000000 +0000
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "upgrade" ] || [ "$1" = "configure" ]; then
+    update-alternatives --quiet --remove i586-linux-gnu-cpp /usr/bin/i586-linux-gnu-cpp-4.4
+fi
+
+#DEBHELPER#
+
+exit 0
diff -Nru gcc-4.4-4.4.5/debian/cpp-4.4-i686-linux-gnu.preinst gcc-4.4-4.4.6/debian/cpp-4.4-i686-linux-gnu.preinst
--- gcc-4.4-4.4.5/debian/cpp-4.4-i686-linux-gnu.preinst	1970-01-01 00:00:00.000000000 +0000
+++ gcc-4.4-4.4.6/debian/cpp-4.4-i686-linux-gnu.preinst	2011-05-26 17:13:03.000000000 +0000
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "upgrade" ] || [ "$1" = "configure" ]; then
+    update-alternatives --quiet --remove i686-linux-gnu-cpp /usr/bin/i686-linux-gnu-cpp-4.4
+fi
+
+#DEBHELPER#
+
+exit 0
diff -Nru gcc-4.4-4.4.5/debian/g++-4.4-i586-linux-gnu.preinst gcc-4.4-4.4.6/debian/g++-4.4-i586-linux-gnu.preinst
--- gcc-4.4-4.4.5/debian/g++-4.4-i586-linux-gnu.preinst	1970-01-01 00:00:00.000000000 +0000
+++ gcc-4.4-4.4.6/debian/g++-4.4-i586-linux-gnu.preinst	2011-05-26 17:13:03.000000000 +0000
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "upgrade" ] || [ "$1" = "configure" ]; then
+    update-alternatives --quiet --remove i586-linux-gnu-g++ /usr/bin/i586-linux-gnu-g++-4.4
+fi
+
+#DEBHELPER#
+
+exit 0
diff -Nru gcc-4.4-4.4.5/debian/g++-4.4-i686-linux-gnu.preinst gcc-4.4-4.4.6/debian/g++-4.4-i686-linux-gnu.preinst
--- gcc-4.4-4.4.5/debian/g++-4.4-i686-linux-gnu.preinst	1970-01-01 00:00:00.000000000 +0000
+++ gcc-4.4-4.4.6/debian/g++-4.4-i686-linux-gnu.preinst	2011-05-26 17:13:03.000000000 +0000
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "upgrade" ] || [ "$1" = "configure" ]; then
+    update-alternatives --quiet --remove i686-linux-gnu-g++ /usr/bin/i686-linux-gnu-g++-4.4
+fi
+
+#DEBHELPER#
+
+exit 0
diff -Nru gcc-4.4-4.4.5/debian/gcc-4.4-i586-linux-gnu.preinst gcc-4.4-4.4.6/debian/gcc-4.4-i586-linux-gnu.preinst
--- gcc-4.4-4.4.5/debian/gcc-4.4-i586-linux-gnu.preinst	1970-01-01 00:00:00.000000000 +0000
+++ gcc-4.4-4.4.6/debian/gcc-4.4-i586-linux-gnu.preinst	2011-05-26 17:13:03.000000000 +0000
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "upgrade" ] || [ "$1" = "configure" ]; then
+    update-alternatives --quiet --remove i586-linux-gnu-gcc /usr/bin/i586-linux-gnu-gcc-4.4
+    update-alternatives --quiet --remove i586-linux-gnu-gcov /usr/bin/i586-linux-gnu-gcov-4.4
+fi
+
+#DEBHELPER#
+
+exit 0
diff -Nru gcc-4.4-4.4.5/debian/gcc-4.4-i686-linux-gnu.preinst gcc-4.4-4.4.6/debian/gcc-4.4-i686-linux-gnu.preinst
--- gcc-4.4-4.4.5/debian/gcc-4.4-i686-linux-gnu.preinst	1970-01-01 00:00:00.000000000 +0000
+++ gcc-4.4-4.4.6/debian/gcc-4.4-i686-linux-gnu.preinst	2011-05-26 17:13:03.000000000 +0000
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "upgrade" ] || [ "$1" = "configure" ]; then
+    update-alternatives --quiet --remove i686-linux-gnu-gcc /usr/bin/i686-linux-gnu-gcc-4.4
+    update-alternatives --quiet --remove i686-linux-gnu-gcov /usr/bin/i686-linux-gnu-gcov-4.4
+fi
+
+#DEBHELPER#
+
+exit 0
diff -Nru gcc-4.4-4.4.5/debian/gfortran-4.4-i586-linux-gnu.preinst gcc-4.4-4.4.6/debian/gfortran-4.4-i586-linux-gnu.preinst
--- gcc-4.4-4.4.5/debian/gfortran-4.4-i586-linux-gnu.preinst	1970-01-01 00:00:00.000000000 +0000
+++ gcc-4.4-4.4.6/debian/gfortran-4.4-i586-linux-gnu.preinst	2011-05-26 17:13:03.000000000 +0000
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "upgrade" ] || [ "$1" = "configure" ]; then
+    update-alternatives --quiet --remove i586-linux-gnu-gfortran /usr/bin/i586-linux-gnu-gfortran-4.4
+fi
+
+#DEBHELPER#
+
+exit 0
diff -Nru gcc-4.4-4.4.5/debian/gfortran-4.4-i686-linux-gnu.preinst gcc-4.4-4.4.6/debian/gfortran-4.4-i686-linux-gnu.preinst
--- gcc-4.4-4.4.5/debian/gfortran-4.4-i686-linux-gnu.preinst	1970-01-01 00:00:00.000000000 +0000
+++ gcc-4.4-4.4.6/debian/gfortran-4.4-i686-linux-gnu.preinst	2011-05-26 17:13:03.000000000 +0000
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "upgrade" ] || [ "$1" = "configure" ]; then
+    update-alternatives --quiet --remove i686-linux-gnu-gfortran /usr/bin/i686-linux-gnu-gfortran-4.4
+fi
+
+#DEBHELPER#
+
+exit 0
diff -Nru gcc-4.4-4.4.5/debian/gnat.1 gcc-4.4-4.4.6/debian/gnat.1
--- gcc-4.4-4.4.5/debian/gnat.1	2011-05-26 17:12:59.000000000 +0000
+++ gcc-4.4-4.4.6/debian/gnat.1	2011-05-26 17:13:03.000000000 +0000
@@ -1,6 +1,7 @@
 .\" Hey, Emacs!  This is an -*- nroff -*- source file.
 .\"
 .\" Copyright (C) 1996 Erick Branderhorst <branderh@debian.org>
+.\" Copyright (C) 2011 Nicolas Boulenguez <nicolas.boulenguez@free.fr>
 .\"
 .\" 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
@@ -21,19 +22,22 @@
 .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 \-
+gnatls, gnatmake, gnatprep, gnatpsta, gnatpsys, gnatxref, gnathtml \-
 GNAT toolbox
 .SH DESCRIPTION
-Those programs are part of GNU GNAT 4.1, a freely available Ada 95 compiler.
+Those programs are part of GNU GNAT, a freely available Ada compiler.
 .PP
 For accessing the full GNAT manuals, use
-.B info gnat-ug-4.1
+.B info gnat-ug-4.4
 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)
+.B info gnat-rm-4.4
+for the sections related to the reference manual.
+If those sections cannot be found, you will have to install the
+gnat-4.4-doc package as well (since these manuals contain invariant parts,
+the package is located in the non-free part of the Debian archive).
+You may also browse
+.B http://gcc.gnu.org/onlinedocs
+which provides the GCC online documentation.
 .SH AUTHOR
 This manpage has been written by Samuel Tardieu <sam@debian.org>, for the
 Debian GNU/Linux project.
diff -Nru gcc-4.4-4.4.5/debian/lib32gcc1.preinst gcc-4.4-4.4.6/debian/lib32gcc1.preinst
--- gcc-4.4-4.4.5/debian/lib32gcc1.preinst	2011-05-26 17:12:59.000000000 +0000
+++ gcc-4.4-4.4.6/debian/lib32gcc1.preinst	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
-#! /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#
diff -Nru gcc-4.4-4.4.5/debian/patches/ada-bug601133.diff gcc-4.4-4.4.6/debian/patches/ada-bug601133.diff
--- gcc-4.4-4.4.5/debian/patches/ada-bug601133.diff	1970-01-01 00:00:00.000000000 +0000
+++ gcc-4.4-4.4.6/debian/patches/ada-bug601133.diff	2011-05-26 17:13:03.000000000 +0000
@@ -0,0 +1,31 @@
+Revert the change in uintp.adb that changes the checksum of the source
+file in the .ali file, causing bug #601133.
+
+Index: b/src/gcc/ada/uintp.adb
+===================================================================
+--- a/src/gcc/ada/uintp.adb
++++ b/src/gcc/ada/uintp.adb
+@@ -239,7 +239,7 @@
+ 
+    function Hash_Num (F : Int) return Hnum is
+    begin
+-      return Types."mod" (F, Hnum'Range_Length);
++      return Standard."mod" (F, Hnum'Range_Length);
+    end Hash_Num;
+ 
+    ---------------
+Index: b/src/gcc/ada/gcc-interface/Make-lang.in
+===================================================================
+--- a/src/gcc/ada/gcc-interface/Make-lang.in
++++ b/src/gcc/ada/gcc-interface/Make-lang.in
+@@ -995,8 +995,8 @@
+ 	$(ECHO) "with Osint; use Osint;" >>tmp-sdefault.adb
+ 	$(ECHO) "package body Sdefault is" >>tmp-sdefault.adb
+ 	$(ECHO) "   S0 : constant String := \"$(prefix)/\";" >>tmp-sdefault.adb
+-	$(ECHO) "   S1 : constant String := \"$(ADA_INCLUDE_DIR)/\";" >>tmp-sdefault.adb
+-	$(ECHO) "   S2 : constant String := \"$(ADA_RTL_OBJ_DIR)/\";" >>tmp-sdefault.adb
++	$(ECHO) "   S1 : constant String := \"$(libdir)/gcc/$(target_noncanonical)/4.4/adainclude/\";" >>tmp-sdefault.adb
++	$(ECHO) "   S2 : constant String := \"$(libdir)/gcc/$(target_noncanonical)/4.4/adalib/\";" >>tmp-sdefault.adb
+ 	$(ECHO) "   S3 : constant String := \"$(target)/\";" >>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
diff -Nru gcc-4.4-4.4.5/debian/patches/armhf-triplet-backport.diff gcc-4.4-4.4.6/debian/patches/armhf-triplet-backport.diff
--- gcc-4.4-4.4.5/debian/patches/armhf-triplet-backport.diff	1970-01-01 00:00:00.000000000 +0000
+++ gcc-4.4-4.4.6/debian/patches/armhf-triplet-backport.diff	2011-05-26 17:13:03.000000000 +0000
@@ -0,0 +1,105 @@
+# DP: add support for arm-linux-*eabi* triplets; useful for armhf
+
+--- a/src/configure.ac	2011-03-18 19:10:48.804622758 +0000
++++ b/src/configure.ac	2011-03-18 19:11:18.324622793 +0000
+@@ -592,7 +592,7 @@
+     noconfigdirs="$noconfigdirs target-libffi target-qthreads"
+     libgloss_dir=arm
+     ;;
+-  arm*-*-linux-gnueabi)
++  arm*-*-linux-*eabi*)
+     noconfigdirs="$noconfigdirs target-qthreads"
+     case ${with_newlib} in
+       no) noconfigdirs="$noconfigdirs target-newlib target-libgloss"
+--- a/src/gcc/ada/gcc-interface/Makefile.in	2011-03-18 19:11:37.296622753 +0000
++++ b/src/gcc/ada/gcc-interface/Makefile.in	2011-03-18 19:11:52.964621827 +0000
+@@ -1857,7 +1857,7 @@
+   LIBRARY_VERSION := $(LIB_VERSION)
+ endif
+ 
+-ifeq ($(strip $(filter-out arm% linux-gnueabi,$(arch) $(osys)-$(word 4,$(targ)))),)
++ifeq ($(strip $(filter-out arm%-linux,$(arch)-$(osys)) $(if $(findstring eabi,$(word 4,$(targ))),,$(word 4,$(targ)))),)
+   LIBGNAT_TARGET_PAIRS = \
+   a-intnam.ads<a-intnam-linux.ads \
+   s-inmaop.adb<s-inmaop-posix.adb \
+--- a/src/gcc/config.gcc	2011-03-18 19:12:05.128622749 +0000
++++ b/src/gcc/config.gcc	2011-03-18 19:12:52.960622752 +0000
+@@ -736,7 +736,7 @@
+ 	esac
+ 	tmake_file="${tmake_file} t-linux arm/t-arm"
+ 	case ${target} in
+-	arm*-*-linux-*eabi)
++	arm*-*-linux-*eabi*)
+ 	    tm_file="$tm_file arm/bpabi.h arm/linux-eabi.h"
+ 	    tmake_file="$tmake_file arm/t-arm-elf arm/t-bpabi arm/t-linux-eabi t-slibgcc-libgcc"
+   	    # The BPABI long long divmod functions return a 128-bit value in
+@@ -757,7 +757,7 @@
+ 	tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/linux-gas.h arm/uclinux-elf.h glibc-stdint.h"
+ 	tmake_file="arm/t-arm arm/t-arm-elf"
+ 	case ${target} in
+-	arm*-*-uclinux*eabi)
++	arm*-*-uclinux*eabi*)
+ 	    tm_file="$tm_file arm/bpabi.h arm/uclinux-eabi.h"
+ 	    tmake_file="$tmake_file arm/t-bpabi"
+   	    # The BPABI long long divmod functions return a 128-bit value in
+--- a/src/gcc/testsuite/lib/target-supports.exp	2011-03-18 19:13:48.604622749 +0000
++++ b/src/gcc/testsuite/lib/target-supports.exp	2011-03-18 19:14:24.132622629 +0000
+@@ -2593,7 +2593,7 @@
+ 	     || [istarget i?86-*-*]
+ 	     || [istarget x86_64-*-*]
+ 	     || [istarget alpha*-*-*] 
+-	     || [istarget arm*-*-linux-gnueabi] 
++	     || [istarget arm*-*-linux-*eabi*] 
+ 	     || [istarget s390*-*-*] 
+ 	     || [istarget powerpc*-*-*]
+ 	     || [istarget sparc64-*-*]
+@@ -2622,7 +2622,7 @@
+ 	     || [istarget i?86-*-*]
+ 	     || [istarget x86_64-*-*]
+ 	     || [istarget alpha*-*-*] 
+-	     || [istarget arm*-*-linux-gnueabi] 
++	     || [istarget arm*-*-linux-*eabi*] 
+ 	     || [istarget s390*-*-*] 
+ 	     || [istarget powerpc*-*-*]
+ 	     || [istarget sparc64-*-*]
+--- a/src/libjava/configure.ac	2011-03-18 19:14:37.464622750 +0000
++++ b/src/libjava/configure.ac	2011-03-18 19:15:00.780622755 +0000
+@@ -920,7 +920,7 @@
+     # on Darwin -single_module speeds up loading of the dynamic libraries.
+     extra_ldflags_libjava=-Wl,-single_module
+     ;;
+-arm*linux*eabi)
++arm*-*-linux-*eabi*)
+     # Some of the ARM unwinder code is actually in libstdc++.  We
+     # could in principle replicate it in libgcj, but it's better to
+     # have a dependency on libstdc++.
+--- a/src/libstdc++-v3/configure.host	2011-03-18 19:15:16.288622758 +0000
++++ b/src/libstdc++-v3/configure.host	2011-03-18 19:15:30.932622217 +0000
+@@ -325,7 +325,7 @@
+         fi
+     esac
+     case "${host}" in
+-      arm*-*-linux-*eabi)
++      arm*-*-linux-*eabi*)
+ 	port_specific_symbol_files="\$(srcdir)/../config/os/gnu-linux/arm-eabi-extra.ver"
+ 	;;
+     esac
+--- a/src/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-2.cc	2011-03-18 19:15:43.204622783 +0000
++++ b/src/libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs-2.cc	2011-03-18 19:16:06.324622740 +0000
+@@ -1,5 +1,5 @@
+ // { dg-options "-std=gnu++0x -funsigned-char -fshort-enums" }
+-// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
++// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux-*eabi* } }
+ 
+ // 2007-05-03  Benjamin Kosnik  <bkoz@redhat.com>
+ //
+--- a/src/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc	2011-03-18 19:16:31.144622761 +0000
++++ b/src/libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs-2.cc	2011-03-18 19:16:41.420622950 +0000
+@@ -1,5 +1,5 @@
+ // { dg-options "-std=gnu++0x -funsigned-char -fshort-enums" }
+-// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux*eabi } }
++// { dg-options "-std=gnu++0x -funsigned-char -fshort-enums -Wl,--no-enum-size-warning" { target arm*-*-linux-*eabi* } }
+ 
+ // 2007-05-03  Benjamin Kosnik  <bkoz@redhat.com>
+ //
+
diff -Nru gcc-4.4-4.4.5/debian/patches/gcc-lfs.diff gcc-4.4-4.4.6/debian/patches/gcc-lfs.diff
--- gcc-4.4-4.4.5/debian/patches/gcc-lfs.diff	1970-01-01 00:00:00.000000000 +0000
+++ gcc-4.4-4.4.6/debian/patches/gcc-lfs.diff	2011-05-26 17:13:03.000000000 +0000
@@ -0,0 +1,96 @@
+# DP: Check for large file support (backport from 4.6).
+
+gcc/
+
+2010-11-02  Ian Lance Taylor  <iant@google.com>
+
+	* configure.ac: Use AC_SYS_LARGEFILE.
+	* configure: Rebuild.
+	* config.in: Rebuild.
+
+2010-11-11  Paolo Bonzini  <bonzini@gnu.org>
+
+	* Makefile.in (gengtype-lex.c): Include bconfig.h first.
+
+libcpp/
+
+2010-11-02  Ian Lance Taylor  <iant@google.com>
+
+	* configure.ac: Use AC_SYS_LARGEFILE.
+	* configure: Rebuild.
+	* config.in: Rebuild.
+
+ 
+--- a/src/gcc/configure.ac
++++ b/src/gcc/configure.ac
+@@ -303,6 +303,8 @@
+ AC_PROG_CPP
+ AC_C_INLINE
+ 
++AC_SYS_LARGEFILE
++
+ # sizeof(char) is 1 by definition.
+ AC_CHECK_SIZEOF(void *)
+ AC_CHECK_SIZEOF(short)
+--- a/src/gcc/config.in
++++ b/src/gcc/config.in
+@@ -1546,6 +1546,18 @@
+ #endif
+ 
+ 
++/* Number of bits in a file offset, on hosts where this is settable. */
++#ifndef USED_FOR_TARGET
++#undef _FILE_OFFSET_BITS
++#endif
++
++
++/* Define for large files, on AIX-style hosts. */
++#ifndef USED_FOR_TARGET
++#undef _LARGE_FILES
++#endif
++
++
+ /* Define to 1 if on MINIX. */
+ #ifndef USED_FOR_TARGET
+ #undef _MINIX
+--- a/src/gcc/Makefile.in
++++ b/src/gcc/Makefile.in
+@@ -3457,7 +3457,11 @@
+ 
+ # Generated source files for gengtype.
+ gengtype-lex.c : gengtype-lex.l
+-	-$(FLEX) $(FLEXFLAGS) -o$@ $<
++	-$(FLEX) $(FLEXFLAGS) -o$@ $< && { \
++	  echo '#include "bconfig.h"' > $@.tmp; \
++	  cat $@ >> $@.tmp; \
++	  mv $@.tmp $@; \
++	}
+ 
+ #
+ # Remake internationalization support.
+--- a/src/libcpp/configure.ac
++++ b/src/libcpp/configure.ac
+@@ -13,6 +13,8 @@
+ AC_PROG_CC
+ AC_PROG_RANLIB
+ 
++AC_SYS_LARGEFILE
++
+ MISSING=`cd $ac_aux_dir && ${PWDCMD-pwd}`/missing
+ AC_CHECK_PROGS([ACLOCAL], [aclocal], [$MISSING aclocal])
+ AC_CHECK_PROGS([AUTOCONF], [autoconf], [$MISSING autoconf])
+--- a/src/libcpp/config.in
++++ b/src/libcpp/config.in
+@@ -266,6 +266,12 @@
+ /* Define to 1 if your <sys/time.h> declares `struct tm'. */
+ #undef TM_IN_SYS_TIME
+ 
++/* Number of bits in a file offset, on hosts where this is settable. */
++#undef _FILE_OFFSET_BITS
++
++/* Define for large files, on AIX-style hosts. */
++#undef _LARGE_FILES
++
+ /* Define to empty if `const' does not conform to ANSI C. */
+ #undef const
+ 
diff -Nru gcc-4.4-4.4.5/debian/patches/gcc-linaro.diff gcc-4.4-4.4.6/debian/patches/gcc-linaro.diff
--- gcc-4.4-4.4.5/debian/patches/gcc-linaro.diff	2011-05-26 17:12:59.000000000 +0000
+++ gcc-4.4-4.4.6/debian/patches/gcc-linaro.diff	2011-05-26 17:13:03.000000000 +0000
@@ -43704,1498 +43704,6 @@
  	  }
  	fputs ("        }\n      break;\n", output_file);
        }
---- a/src/gcc/gengtype-lex.c
-+++ b/src/gcc/gengtype-lex.c
-@@ -54,7 +54,6 @@
- typedef unsigned char flex_uint8_t; 
- typedef unsigned short int flex_uint16_t;
- typedef unsigned int flex_uint32_t;
--#endif /* ! C99 */
- 
- /* Limits of integral types. */
- #ifndef INT8_MIN
-@@ -85,6 +84,8 @@
- #define UINT32_MAX             (4294967295U)
- #endif
- 
-+#endif /* ! C99 */
-+
- #endif /* ! FLEXINT_H */
- 
- #ifdef __cplusplus
-@@ -141,7 +142,15 @@
- 
- /* Size of default input buffer. */
- #ifndef YY_BUF_SIZE
-+#ifdef __ia64__
-+/* On IA-64, the buffer size is 16k, not 8k.
-+ * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
-+ * Ditto for the __ia64__ case accordingly.
-+ */
-+#define YY_BUF_SIZE 32768
-+#else
- #define YY_BUF_SIZE 16384
-+#endif /* __ia64__ */
- #endif
- 
- /* The state buf must be large enough to hold one state per character in the main buffer.
-@@ -372,7 +381,7 @@
- 	flex_int32_t yy_verify;
- 	flex_int32_t yy_nxt;
- 	};
--static yyconst flex_int16_t yy_accept[445] =
-+static yyconst flex_int16_t yy_accept[465] =
-     {   0,
-         0,    0,    0,    0,    0,    0,    0,    0,   50,   36,
-        36,   33,   45,   36,   45,   34,   36,   36,   34,   34,
-@@ -383,43 +392,45 @@
-        37,    0,    0,    0,   38,   32,   34,    0,    0,    0,
-         0,    0,    0,    0,    0,    0,   34,   34,   34,   34,
-        34,   10,    0,   25,    0,    0,    0,    0,    9,   20,
--       24,    0,    0,    0,    0,    0,    0,    0,    0,   26,
-+       24,    0,    0,    0,    0,    0,    0,    0,    0,    0,
- 
--       11,    0,    0,    0,    0,    0,    0,    0,    0,    0,
--        0,    0,    0,    0,    0,   10,    0,    0,    0,    0,
--       42,   44,   43,    0,   35,    0,    0,    0,    0,    0,
--        0,   34,   34,   34,   34,   34,   34,   27,   28,    0,
-+       26,   11,    0,    0,    0,    0,    0,    0,    0,    0,
-+        0,    0,    0,    0,    0,    0,   10,    0,    0,    0,
-+        0,   42,   44,   43,    0,   35,    0,    0,    0,    0,
-+        0,    0,   34,   34,   34,   34,   34,   34,   27,   28,
-         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
--        0,    0,    0,   30,    0,    0,    0,    0,    0,    0,
--        0,    0,    0,    0,   34,   34,   34,   34,   34,   34,
--        0,    0,    0,   13,    0,   14,    0,    0,    0,    0,
--       22,   22,    0,    0,    0,    0,    0,    0,    0,    0,
-+        0,    0,    0,    0,    0,   30,    0,    0,    0,    0,
-+        0,    0,    0,    0,    0,    0,   34,   34,   34,   34,
-+       34,   34,    0,    0,    0,   13,    0,    0,   14,    0,
-+        0,    0,    0,   22,   22,    0,    0,    0,    0,    0,
- 
--        0,    0,    0,   48,    0,    0,    0,    0,    0,    0,
--        0,   34,   34,   34,   34,   34,   34,    0,    0,    0,
--        0,    0,   17,    0,    0,    0,    0,    0,    0,    0,
-+        0,    0,    0,    0,    0,    0,   48,    0,    0,    0,
-+        0,    0,    0,    0,   34,   34,   34,   34,   34,   34,
-+        0,    0,    0,    0,    0,    0,   17,    0,    0,    0,
-         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
--        0,    0,    0,    0,    0,    0,    0,    0,    0,   34,
--       34,   34,   34,   34,    3,    0,    0,    0,    0,   12,
-         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
--        0,    0,    0,    0,    0,    0,   15,    0,    0,    0,
--        0,    0,    0,    0,   34,    4,    5,    2,   34,    0,
-+        0,    0,    0,   34,   34,   34,   34,   34,    3,    0,
-+        0,    0,    0,    0,   12,    0,    0,    0,    0,    0,
-         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-+        0,    0,   15,    0,    0,    0,    0,    0,    0,    0,
-+       34,    4,    5,    2,   34,    0,    0,    0,    0,    0,
- 
--        0,    0,    0,    0,    0,    0,    0,    0,    0,   16,
--        0,    0,    0,    0,   34,    1,    0,    0,    0,    0,
-+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-+        0,    0,    0,    0,    0,    0,    0,   16,    0,    0,
-+        0,    0,   34,    1,    0,    0,    0,    0,    0,    0,
-         0,    0,    0,    0,    0,   22,   22,    0,    0,    0,
-         0,    0,    0,    0,    0,    0,    0,   34,   34,   34,
-         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
--       21,    0,    0,    0,    0,    0,    0,   34,    7,    6,
--        0,    0,    0,    0,    0,    0,    0,    0,    0,   18,
--        0,    0,    0,   34,    0,    0,    0,    0,    0,    0,
--        0,    0,   19,    0,    0,   47,   34,    0,    0,    0,
--        0,    0,    0,    0,    0,    0,    0,   34,    0,    0,
--
--        0,    0,    0,    0,    0,    0,   34,    0,   24,   24,
--        0,    0,    0,    0,    0,    0,    0,   34,    0,    0,
-+        0,    0,   21,    0,    0,    0,    0,    0,    0,   34,
-+        7,    6,    0,    0,    0,    0,    0,    0,    0,    0,
-+        0,    0,    0,   18,    0,    0,    0,   34,    0,    0,
-+        0,    0,    0,    0,    0,    0,    0,    0,   19,    0,
-+
-+        0,   47,   34,    0,    0,    0,    0,    0,    0,    0,
-+        0,    0,    0,    0,   34,    0,    0,    0,    0,    0,
-+        0,    0,    0,    0,   34,    0,   24,   24,    0,    0,
-+        0,    0,    0,    0,    0,    0,   34,    0,    0,    0,
-         0,    0,    0,    0,    0,    0,    0,    0,    0,    8,
-         0,   23,    0,    0,    0,    0,    0,   40,    0,    0,
-         0,    0,    0,    0
-@@ -468,132 +479,138 @@
-         9,    9
-     } ;
- 
--static yyconst flex_int16_t yy_base[483] =
-+static yyconst flex_int16_t yy_base[503] =
-     {   0,
--        0,   38,   96,   12,   12,   13,   15,   16, 1028, 1444,
--       32,   51,   20,  990, 1016,    0,  157,   18, 1007,  964,
--      966,  961,  969, 1444,   25,   27,   27, 1444,  983, 1008,
--     1008, 1004,  215,  253,    5,   32,   29,  974,   45,  962,
--      996,   35,   38,   39,   40,   41,  134,   42,  136,  137,
--      138,   75,  996,    0, 1444,  985,  984,  166,  964,  162,
--     1444,    0,  987,  990, 1444, 1444,    0,  186,  165,  974,
--      931,  933,  928,  936,  168,  943,  967,  928,  140,  930,
--      935,   87,  167, 1444,  979,  974,  977,  968, 1444,  950,
--     1444,  935,  934,  145,   52,   46,  148,  165,  922, 1444,
--
--     1444,  152,  156,  155,  170,  173,  175,  182,  183,  185,
--      211,  214,  222,  218,  221,  269,  957,  956,  291,    0,
--     1444, 1444, 1444,  922, 1444,  937,  898,  195,  900,  905,
--      907,  912,  906,  892,  890,  903,  893, 1444, 1444,  209,
--      254,  251,  353,  248,  391,  354,  350,  351,  340,  355,
--      341,  429,  339,  356,  344,  347,  360,  390,   43,  361,
--      391,  395,  429, 1444,    0,    0,  280,  906,  900,  886,
--      884,  897,  872,  876,  890,  867,  873,  878,  876,  866,
--      381,  348,  382, 1444,  384, 1444,  389,  397,  491,  398,
--     1444,  528,  418,  399,  420,  477,  478,  422,  421,  480,
--
--      479,    0,  449, 1444,  884,  861,  867,  872,  870,  860,
--      859,  892,  857,  866,  850,  862,  586,  493,  496,  494,
--      484,  624, 1444,    0,  878,  876,  876,  834,  839,  841,
--      832,  830,  199,  830,  490,  499,  486,  492,  488,  489,
--      662,    0,  863,  828,  837,  821,  833,    0,  832,  859,
--      700,  738,  776,  829, 1444,  431,  258,  437,  515, 1444,
--      846,  844,  841,  817,  829,  809,  319,  815,  813,  478,
--      809,  512,  528,  520,  525,  814, 1444,    0,  833,    0,
--        0,    0,  803,  551,  808, 1444, 1444, 1444,  852,  383,
--      521,  530,  539,  822,  829,  813,  793,  787,  802,  801,
--
--      556,  793,  783,  785,  792,  787,  523,  545,  535, 1444,
--        0,  795,    0,  561,  585, 1444,  555,  343,  581,  584,
--      794,  811,  792,  773,  772, 1444,    0,  771,  783,  772,
--      764,  552,  890,  558,    0,  623,  778,  784,  928,  966,
--      583,  593,  594,  613,  792,  792,  771,  761,  746,  591,
--     1444, 1004,    0,  778,    0,    0,  766,  776, 1444, 1444,
--      620,  621,  626,  627,  653,  777,  769,  775, 1042, 1444,
--        0,  772,  787,  767,  556,  577,  615,  649,  629,  762,
--      753,  774, 1444,    0,  763, 1444,  773,  632,  659,  662,
--      656,  654,  754,  742,  753,    0,  754,  729,  665,  688,
--
--      667,  744,  742,  683,    0,  695,  692,  689,  715,  722,
--      699,  711,  701,  666,  673,    0,  705, 1080,  704,  749,
--      751,  753,  756,  663,  658,  618,  593,    0,    0, 1444,
--      758, 1444,  760,  600,  588,  543,  483, 1444,  439,  386,
--      247,  206,  167, 1444, 1118, 1127, 1136, 1145, 1154, 1158,
--     1167, 1176, 1185, 1194, 1202, 1211, 1220, 1229, 1238, 1247,
--     1256, 1265, 1273, 1282, 1290, 1298, 1306, 1314, 1323, 1331,
--     1340, 1349, 1357, 1365, 1374, 1383, 1392, 1400, 1409, 1417,
--     1426, 1435
-+        0,   38,   96,   12,   12,   13,   15,   16, 1075, 1454,
-+       32,   51,   20, 1037, 1063,    0,  157,   18, 1054, 1011,
-+     1013, 1008, 1016, 1454,   25,   27,   27, 1454, 1030, 1055,
-+     1055, 1036,  215,  253,    5,   32,   29,   51,   45, 1010,
-+     1044,   35,   39,   40,   41,  134,  136,   43,  138,  137,
-+      139,   78, 1044,    0, 1454, 1033, 1032,  167, 1012,  163,
-+     1454,    0, 1035, 1038, 1454, 1454,    0,  226,  166, 1022,
-+      979,  981,  976,  984,  169,  991, 1015,  976,  133,  978,
-+      983,   87,  168, 1454, 1027, 1022, 1025, 1016, 1454,  998,
-+     1454,  983,  982,  148,  165,   42,  152,  153,  166,  970,
-+
-+     1454, 1454,  177,  163,  180,  175,  179,  183,  181,  211,
-+      184,  214,  215,  239,  217,  223,  271, 1005, 1004,  301,
-+        0, 1454, 1454, 1454,  970, 1454,  985,  946,  237,  948,
-+      953,  955,  960,  954,  940,  938,  951,  941, 1454, 1454,
-+      172,  259,  220,  363,  261,  266,  401,  364,  360,  361,
-+       46,  365,   52,  439,  254,  362,  208,  260,  363,  368,
-+      349,  367,  369,  350,  439, 1454,    0,    0,  376,  954,
-+      948,  934,  932,  945,  920,  924,  938,  915,  921,  926,
-+      924,  914,  358,  359,  394, 1454,  396,  397, 1454,  399,
-+      400,  501,  401, 1454,  538,  425,  402,  427,  403,  428,
-+
-+      432,  487,  490,  488,    0,  460, 1454,  932,  909,  915,
-+      920,  918,  908,  907,  940,  905,  914,  898,  910,  596,
-+      446,  504,  501,  267,  492,  634, 1454,    0,  926,  924,
-+      506,  898,  888,  890,  881,  879,  334,  879,  500,  508,
-+      495,  503,  407,  498,  672,    0,  912,  877,  886,  870,
-+      882,    0,  881,  908,  710,  748,  786,  878, 1454,  443,
-+      521,  522,  505,  529, 1454,  895,  893,  891,  889,  865,
-+      877,  857,  504,  863,  861,  490,  857,  531,  550,  535,
-+      537,  824, 1454,    0,  881,    0,    0,    0,  851,  429,
-+      856, 1454, 1454, 1454,  862,  538,  533,  540,  546,  551,
-+
-+      870,  877,  875,  860,  840,  834,  849,  848,  572,  840,
-+      830,  832,  839,  834,  555,  557,  583, 1454,    0,  842,
-+        0,  609,  600, 1454,  447,  268,  568,  591,  597,  841,
-+      858,  839,  838,  819,  818, 1454,    0,  802,  814,  818,
-+      810,  563,  900,  565,    0,  633,  824,  830,  938,  976,
-+      604,  626,  627,  589,  629,  838,  838,  822,  816,  806,
-+      791,  630, 1454, 1014,    0,  823,    0,    0,  811,  821,
-+     1454, 1454,  640,  642,  668,  669,  661,  667,  822,  814,
-+      824,  819, 1052, 1454,    0,  816,  831,  811,  639,  624,
-+      666,  670,  625,  672,  806,  782,  800,  802, 1454,    0,
-+
-+      791, 1454,  801,  706,  673,  707,  680,  698,  797,  785,
-+      775,  795,    0,  796,  772,  709,  735,  677,  787,  785,
-+      775,  700,    0,  744,  713,  705,  761,  703,  700,  764,
-+      761,  762,  748,  753,    0,  739, 1090,  741,  768,  771,
-+      775,  797,  741,  719,  711,  689,  639,    0,    0, 1454,
-+      799, 1454,  801,  608,  599,  571,  560, 1454,  559,  498,
-+      344,  218,  167, 1454, 1128, 1137, 1146, 1155, 1164, 1168,
-+     1177, 1186, 1195, 1204, 1212, 1221, 1230, 1239, 1248, 1257,
-+     1266, 1275, 1283, 1292, 1300, 1308, 1316, 1324, 1333, 1341,
-+     1350, 1359, 1367, 1375, 1384, 1393, 1402, 1410, 1419, 1427,
-+
-+     1436, 1445
-     } ;
- 
--static yyconst flex_int16_t yy_def[483] =
-+static yyconst flex_int16_t yy_def[503] =
-     {   0,
--      445,  445,  444,    3,  446,  446,  446,  446,  444,  444,
--      444,  444,  447,  448,  449,  450,  444,  444,  450,  450,
--      450,  450,  450,  444,  444,  444,  451,  444,  452,  444,
--      444,  444,  453,  453,   34,   34,   34,   34,   34,  454,
--      444,   34,   34,   34,   34,   34,   34,   34,   34,   34,
--       34,  444,  455,  456,  444,  457,  457,  444,  444,  447,
--      444,  447,  444,  448,  444,  444,  450,  444,  444,  444,
--      444,  444,  444,  444,  444,  444,  450,  450,  450,  450,
--      450,  444,  451,  444,  451,  444,  452,  444,  444,  444,
--      444,   34,   34,   34,   34,   34,   34,   34,  454,  444,
--
--      444,   34,   34,   34,   34,   34,   34,   34,   34,   34,
--       34,   34,   34,   34,   34,  444,  455,  455,  444,  458,
--      444,  444,  444,  444,  444,  444,  444,  444,  444,  444,
--      444,  450,  450,  450,  450,  450,  450,  444,  444,   34,
--       34,   34,  453,   34,  453,   34,   34,   34,   34,   34,
--       34,  453,   34,   34,   34,   34,   34,   34,   34,   34,
--       34,   34,  119,  444,  119,  459,  444,  444,  444,  444,
--      444,  444,  444,  444,  450,  450,  450,  450,  450,  450,
--       34,   34,   34,  444,   34,  444,   34,   34,  453,   34,
--      444,  444,   34,   34,   34,   34,   34,   34,   34,   34,
--
--       34,  460,  444,  444,  444,  444,  444,  444,  444,  444,
--      444,  450,  450,  450,  450,  450,  450,   34,   34,   34,
--       34,  453,  444,  192,  444,  444,  444,  444,  444,  444,
--      444,  444,  444,  444,   34,   34,   34,   34,   34,   34,
--      453,  461,  444,  444,  444,  444,  444,  462,  444,  450,
--      450,  450,  450,  450,  444,   34,   34,   34,   34,  444,
--      444,  444,  444,  444,  444,  444,  444,  444,  444,  444,
--      444,   34,   34,   34,   34,  453,  444,  463,  444,  464,
--      465,  466,  444,  444,  450,  444,  444,  444,  450,   34,
--       34,   34,   34,  444,  444,  444,  444,  444,  444,  444,
--
--      467,  444,  444,  444,  444,  444,   34,   34,   34,  444,
--      468,  444,  469,  444,  450,  444,   34,   34,   34,   34,
--      444,  444,  444,  444,  444,  444,  192,  444,  444,  444,
--      444,   34,  453,   34,  470,  444,  444,  450,  450,  450,
--       34,   34,   34,   34,  444,  444,  444,  444,  444,   34,
--      444,  453,  471,  444,  472,  473,  444,  450,  444,  444,
--       34,   34,   34,   34,   34,  444,  444,  444,  453,  444,
--      474,  444,  444,  450,   34,   34,   34,   34,   34,  444,
--      444,  444,  444,  475,  444,  444,  450,   34,   34,   34,
--       34,   34,  444,  444,  444,  476,  444,  450,   34,   34,
--
--       34,  444,  444,  444,  477,  444,  450,   34,  444,  478,
--       34,  444,  444,  444,  444,  479,  444,  450,   34,  444,
--      478,  478,  480,  444,  444,  444,  444,  481,  482,  444,
--      444,  444,  480,  444,  444,  444,  444,  444,  444,  444,
--      444,  444,  444,    0,  444,  444,  444,  444,  444,  444,
--      444,  444,  444,  444,  444,  444,  444,  444,  444,  444,
--      444,  444,  444,  444,  444,  444,  444,  444,  444,  444,
--      444,  444,  444,  444,  444,  444,  444,  444,  444,  444,
--      444,  444
-+      465,  465,  464,    3,  466,  466,  466,  466,  464,  464,
-+      464,  464,  467,  468,  469,  470,  464,  464,  470,  470,
-+      470,  470,  470,  464,  464,  464,  471,  464,  472,  464,
-+      464,  464,  473,  473,   34,   34,   34,   34,   34,  474,
-+      464,   34,   34,   34,   34,   34,   34,   34,   34,   34,
-+       34,  464,  475,  476,  464,  477,  477,  464,  464,  467,
-+      464,  467,  464,  468,  464,  464,  470,  464,  464,  464,
-+      464,  464,  464,  464,  464,  464,  470,  470,  470,  470,
-+      470,  464,  471,  464,  471,  464,  472,  464,  464,  464,
-+      464,   34,   34,   34,   34,   34,   34,   34,   34,  474,
-+
-+      464,  464,   34,   34,   34,   34,   34,   34,   34,   34,
-+       34,   34,   34,   34,   34,   34,  464,  475,  475,  464,
-+      478,  464,  464,  464,  464,  464,  464,  464,  464,  464,
-+      464,  464,  470,  470,  470,  470,  470,  470,  464,  464,
-+       34,   34,   34,  473,   34,   34,  473,   34,   34,   34,
-+       34,   34,   34,  473,   34,   34,   34,   34,   34,   34,
-+       34,   34,   34,   34,  120,  464,  120,  479,  464,  464,
-+      464,  464,  464,  464,  464,  464,  470,  470,  470,  470,
-+      470,  470,   34,   34,   34,  464,   34,   34,  464,   34,
-+       34,  473,   34,  464,  464,   34,   34,   34,   34,   34,
-+
-+       34,   34,   34,   34,  480,  464,  464,  464,  464,  464,
-+      464,  464,  464,  464,  470,  470,  470,  470,  470,  470,
-+       34,   34,   34,   34,   34,  473,  464,  195,  464,  464,
-+      464,  464,  464,  464,  464,  464,  464,  464,   34,   34,
-+       34,   34,   34,   34,  473,  481,  464,  464,  464,  464,
-+      464,  482,  464,  470,  470,  470,  470,  470,  464,   34,
-+       34,   34,   34,   34,  464,  464,  464,  464,  464,  464,
-+      464,  464,  464,  464,  464,  464,  464,   34,   34,   34,
-+       34,  473,  464,  483,  464,  484,  485,  486,  464,  464,
-+      470,  464,  464,  464,  470,   34,   34,   34,   34,   34,
-+
-+      464,  464,  464,  464,  464,  464,  464,  464,  487,  464,
-+      464,  464,  464,  464,   34,   34,   34,  464,  488,  464,
-+      489,  464,  470,  464,   34,   34,   34,   34,   34,  464,
-+      464,  464,  464,  464,  464,  464,  195,  464,  464,  464,
-+      464,   34,  473,   34,  490,  464,  464,  470,  470,  470,
-+       34,   34,   34,   34,   34,  464,  464,  464,  464,  464,
-+      464,   34,  464,  473,  491,  464,  492,  493,  464,  470,
-+      464,  464,   34,   34,   34,   34,   34,   34,  464,  464,
-+      464,  464,  473,  464,  494,  464,  464,  470,   34,   34,
-+       34,   34,   34,   34,  464,  464,  464,  464,  464,  495,
-+
-+      464,  464,  470,   34,   34,   34,   34,   34,  464,  464,
-+      464,  464,  496,  464,  470,   34,   34,   34,  464,  464,
-+      464,  464,  497,  464,  470,   34,  464,  498,   34,  464,
-+      464,  464,  464,  464,  499,  464,  470,   34,  464,  498,
-+      498,  500,  464,  464,  464,  464,  464,  501,  502,  464,
-+      464,  464,  500,  464,  464,  464,  464,  464,  464,  464,
-+      464,  464,  464,    0,  464,  464,  464,  464,  464,  464,
-+      464,  464,  464,  464,  464,  464,  464,  464,  464,  464,
-+      464,  464,  464,  464,  464,  464,  464,  464,  464,  464,
-+      464,  464,  464,  464,  464,  464,  464,  464,  464,  464,
-+
-+      464,  464
-     } ;
- 
--static yyconst flex_int16_t yy_nxt[1507] =
-+static yyconst flex_int16_t yy_nxt[1517] =
-     {   0,
-        10,   11,   12,   13,   10,   10,   14,   10,   10,   10,
-        10,   15,   10,   52,   55,   55,   53,   55,   55,   75,
--      444,   56,   56,   61,   57,   57,   82,   82,   82,   82,
-+      464,   56,   56,   61,   57,   57,   82,   82,   82,   82,
-        84,   92,   94,   58,   58,   10,   10,   10,   10,   17,
-        12,   13,   18,   10,   14,   10,   10,   10,   10,   15,
-        10,   59,   58,   58,   19,   92,   62,   95,   92,   96,
--       76,   92,   98,   85,   92,   92,   92,   92,   92,   92,
--       59,   92,   92,   10,   10,   10,  116,   82,   92,  117,
--      143,   20,  105,  142,  103,  109,  198,  102,   82,   82,
--      104,  106,  107,   21,   22,   23,   24,   25,   26,   27,
-+       76,   92,   99,   85,   97,   92,   92,   92,   92,   92,
-+       59,   92,   92,   10,   10,   10,  144,   98,   92,  117,
-+       82,   20,  118,  106,  191,  104,  110,  103,   82,   82,
-+      193,  105,  107,   21,   22,   23,   24,   25,   26,   27,
- 
-        24,   28,   29,   28,   28,   28,   30,   31,   32,   33,
-        34,   35,   33,   36,   33,   37,   38,   33,   33,   33,
-@@ -601,158 +618,159 @@
-        33,   40,   41,   24,   33,   33,   42,   43,   44,   45,
-        33,   33,   33,   46,   33,   47,   33,   48,   33,   49,
-        33,   50,   33,   51,   33,   33,   33,   33,   68,   58,
--       92,   69,   92,   92,   92,   61,   75,   58,   58,   75,
--       84,   92,  141,   70,   92,  110,   59,  144,   92,  134,
--      145,   92,   92,  112,  113,   59,  108,   68,   58,  115,
--       69,   92,  111,  114,  135,  147,   92,  301,   62,   92,
--
--       71,   92,   70,   85,  146,   59,  148,   76,   92,   92,
--       76,   92,   72,   73,   74,   91,   91,   91,   91,   91,
--       91,   91,   91,   91,   91,   91,   91,  151,  149,   71,
--      150,  152,  181,  153,  170,   92,  301,   92,  154,  155,
--       92,   72,   73,   74,   92,  269,  270,   92,   92,  171,
-+       92,   69,   92,   92,   92,   92,   61,   75,   58,   58,
-+       75,   84,  135,   70,   92,  142,   59,  111,   92,   92,
-+      145,  147,  146,  113,  114,  108,   59,  136,  109,   92,
-+      116,   92,   92,  115,  112,  183,  143,  309,   92,   62,
-+
-+       71,   92,  149,   92,   85,   92,   92,   92,   76,   92,
-+       92,   76,   72,   73,   74,   91,   91,   91,   91,   91,
-+       91,   91,   91,   91,   91,   91,   91,   68,   58,  148,
-+       69,  150,  155,  151,   92,  153,  152,   92,  157,  154,
-+       92,   92,   70,   92,  185,   59,   92,  197,  309,   92,
-        91,   91,   91,   91,   91,   91,   91,   91,   91,   91,
--       91,   91,   91,   91,   91,  156,  157,  158,  161,  182,
--      116,   82,  160,  117,   92,  183,  162,   92,  185,   93,
--       92,  203,  203,  159,   92,  443,  291,  204,   91,   91,
--       91,  163,  163,  164,  163,  163,  163,  163,  163,  163,
--
--      163,  163,  163,  163,  163,  163,  163,  163,  163,  163,
--      163,  163,  163,  163,  163,  163,  163,  163,  163,  163,
--      163,  163,  163,  163,  163,  163,  163,  163,  163,  165,
-+       91,   91,   91,   91,   91,   92,  156,  159,  158,   71,
-+      163,  162,  117,   82,  184,  118,  172,  187,  164,   93,
-+       92,   72,   73,   74,  160,   92,   92,   92,   91,   91,
-+       91,  173,   92,   92,   92,  263,  188,  352,  198,  154,
-+
-+      161,  165,  165,  166,  165,  165,  165,  165,  165,  165,
-+      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-+      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-+      165,  165,  165,  165,  165,  165,  165,  165,  165,  167,
-+      167,  167,  167,  167,  167,  167,  167,  167,  167,  167,
-+      167,  167,  167,  167,  167,  167,  167,  167,  167,  167,
-+      167,  167,  167,  186,  186,  186,  186,  186,  186,  186,
-+      186,  186,  186,  186,  186,   92,   92,  206,  206,  222,
-+      275,  276,  463,  207,   92,   92,   92,   92,   92,   92,
-+       92,   92,  201,   92,   92,   92,  221,  204,  186,  186,
-+
-+      186,  189,  189,  189,  189,  189,  189,  189,  189,  189,
-+      189,  189,  189,  154,  154,  192,  190,  199,  196,  200,
-+       92,  203,   92,   92,  202,   92,   92,   92,   92,   92,
-+      322,  322,  223,   92,  224,  225,  189,  189,  189,  194,
-+      195,  195,  194,  194,  194,  194,  194,  194,  194,  194,
-+      194,   92,  240,   92,   92,  226,  154,  154,   92,  154,
-+      260,  206,  206,  154,  296,  351,  241,  207,  239,   92,
-+      243,  242,   92,   92,  194,  194,  194,  165,  165,  165,
-       165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-       165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
--      165,  165,  165,  184,  184,  184,  184,  184,  184,  184,
--      184,  184,  184,  184,  184,   92,   92,   92,  219,   92,
--       92,  300,  342,   92,   92,  301,   92,   92,  188,  190,
--       92,   92,   92,  194,  152,  195,   92,   92,  184,  184,
--      184,  186,  186,  186,  186,  186,  186,  186,  186,  186,
--
--      186,  186,  186,  152,  152,  189,  187,   92,   92,   92,
--       92,  442,  193,  317,  196,   92,   92,   92,  199,  218,
--      220,   92,  221,   92,   92,   92,  186,  186,  186,  191,
--      192,  192,  191,  191,  191,  191,  191,  191,  191,  191,
--      191,  197,  201,  200,   92,  222,   92,   92,   92,  236,
--      203,  203,  290,  152,  152,  441,  204,   92,  292,  237,
--      239,  235,  240,   92,  191,  191,  191,  163,  163,  163,
--      163,  163,  163,  163,  163,  163,  163,  163,  163,  163,
--      163,  163,  163,  163,  163,  163,  163,  163,  163,  163,
--      163,  223,  223,  223,  223,  223,  223,  223,  223,  223,
--
--      223,  223,  223,   92,   92,   92,   92,  256,  258,  257,
--       92,  273,   92,  301,   92,   92,   92,  259,   92,   92,
--       92,  238,   92,  304,  158,   92,  223,  223,  223,  224,
--      224,  241,  272,  152,  152,  275,  293,  274,   92,  305,
--      273,   92,  225,  226,  152,  276,   92,   92,  227,   92,
--      307,   92,  314,  314,   92,  320,   92,  327,  327,  318,
--      319,   92,  314,  314,  440,   92,  274,  308,  228,  229,
--      230,   92,  309,  341,  334,  231,  332,  232,   92,  388,
--      337,   92,   92,  233,   92,  234,  255,  255,  255,  255,
--      255,  255,  255,  255,  255,  255,  255,  255,  338,  343,
--
--      333,  344,  389,   92,  361,  439,  339,   92,  350,   92,
--       92,  340,  340,  352,  362,  363,  301,   92,  437,   92,
--       92,  255,  255,  255,  260,  260,  260,  260,  260,  260,
--      260,  260,  260,  260,  260,  260,  354,  375,  390,   92,
--      376,   92,  364,  377,  355,  369,   92,   92,  152,  356,
--      356,  365,   92,   92,  392,   92,  436,  378,   92,  260,
--      260,  260,  277,  277,  277,  277,  277,  277,  277,  277,
--      277,  277,  277,  277,  379,   92,  399,  401,  400,   92,
--       92,  408,   92,  435,  152,   92,  434,  391,   92,  409,
--      409,   92,  411,   92,  427,  410,  426,  277,  277,  277,
--
--      286,  286,  286,  286,  286,  286,  286,  286,  286,  286,
--      286,  286,  414,  418,   92,   92,  420,  420,  418,  418,
--      425,  415,  421,  422,  422,   92,  429,  419,  424,  152,
--       92,  429,  429,  417,  152,  286,  286,  286,  287,  287,
--      287,  287,  287,  287,  287,  287,  287,  287,  287,  287,
--      420,  420,  422,  422,  422,  422,  421,  431,  431,  431,
--      431,  431,  431,  413,  432,  412,  432,  407,  432,  406,
--      404,  403,  402,  287,  287,  287,  288,  288,  288,  288,
--      288,  288,  288,  288,  288,  288,  288,  288,  398,  397,
--      395,  394,  393,  387,  386,  385,  382,  381,  380,  374,
--
--      373,  372,  301,  301,  368,  367,  366,  358,  357,  304,
--      349,  288,  288,  288,  310,  310,  310,  310,  310,  310,
--      310,  310,  310,  310,  310,  310,  348,  301,  301,  301,
--      347,  346,  345,  336,  331,  330,  329,  328,  301,  325,
--      324,  301,  301,  323,  322,  321,  315,  313,  312,  310,
--      310,  310,  316,  316,  316,  316,  316,  316,  316,  316,
--      316,  316,  316,  316,  306,  303,  302,  299,  298,  297,
--      296,  295,  294,  289,  285,  284,  283,  282,  281,  280,
--      279,  271,  268,  267,  266,  265,  264,  316,  316,  316,
--      351,  351,  351,  351,  351,  351,  351,  351,  351,  351,
--
--      351,  351,  263,  262,  261,  254,  253,  252,  251,  250,
--      249,  248,  247,  246,  245,  244,  243,  217,  216,  215,
--      214,  213,  212,  211,  210,  351,  351,  351,  359,  359,
--      359,  359,  359,  359,  359,  359,  359,  359,  359,  359,
--      209,  208,  207,  206,  205,  180,  179,  178,  177,  176,
--      175,  174,  173,  172,  169,  168,  167,  118,  118,  100,
--      140,   92,   90,  359,  359,  359,  360,  360,  360,  360,
--      360,  360,  360,  360,  360,  360,  360,  360,  139,  444,
--      138,  444,  137,  136,  133,  132,  131,  130,  129,  128,
--      127,  126,  444,  125,  124,  123,  122,  118,  101,  100,
--
--       97,  360,  360,  360,  370,  370,  370,  370,  370,  370,
--      370,  370,  370,  370,  370,  370,   90,   89,   88,   87,
--       81,   80,   79,   78,   77,   66,   64,  444,  444,  444,
--      444,  444,  444,  444,  444,  444,  444,  444,  444,  370,
--      370,  370,  383,  383,  383,  383,  383,  383,  383,  383,
--      383,  383,  383,  383,  444,  444,  444,  444,  444,  444,
--      444,  444,  444,  444,  444,  444,  444,  444,  444,  444,
--      444,  444,  444,  444,  444,  444,  444,  383,  383,  383,
--      430,  430,  430,  430,  430,  430,  430,  430,  430,  430,
--      430,  430,  444,  444,  444,  444,  444,  444,  444,  444,
- 
--      444,  444,  444,  444,  444,  444,  444,  444,  444,  444,
--      444,  444,  444,  444,  444,  430,  430,  430,   16,   16,
-+      165,  227,  227,  227,  227,  227,  227,  227,  227,  227,
-+      227,  227,  227,   92,   92,  262,   92,  261,   92,  268,
-+      279,   92,  299,  462,   92,  264,   92,   92,  244,   92,
-+       92,   92,  269,  160,   92,  312,  227,  227,  227,  228,
-+      228,  245,  278,  298,  281,  154,  280,   92,   92,  297,
-+      300,  313,  229,  230,  282,   92,  308,   92,  231,   92,
-+      309,   92,  279,   92,   92,  328,   92,  329,  325,  315,
-+      327,  326,   92,  337,  337,  461,   92,   92,  232,  233,
-+      234,   92,  316,   92,  317,  235,  353,  236,  280,   92,
-+      309,   92,  460,  237,   92,  238,  259,  259,  259,  259,
-+
-+      259,  259,  259,  259,  259,  259,  259,  259,  342,   92,
-+      322,  322,  343,  348,  355,   92,  459,   92,  376,  362,
-+      364,  349,  344,   92,  309,  373,  350,  350,  347,  354,
-+       92,  259,  259,  259,  265,  265,  265,  265,  265,  265,
-+      265,  265,  265,  265,  265,  265,  366,  374,  375,  405,
-+       92,   92,   92,   92,  367,   92,   92,  389,  377,  368,
-+      368,  390,  404,  407,  457,   92,   92,  378,   92,  265,
-+      265,  265,  283,  283,  283,  283,  283,  283,  283,  283,
-+      283,  283,  283,  283,  383,  391,  392,   92,  394,  406,
-+      416,  393,   92,   92,   92,   92,   92,  408,   92,   92,
-+
-+      154,  418,  429,   92,  441,  441,   92,  283,  283,  283,
-+      292,  292,  292,  292,  292,  292,  292,  292,  292,  292,
-+      292,  292,  154,  417,   92,  426,   92,  456,  154,  433,
-+      154,   92,   92,   92,  437,   92,  427,  427,  434,  437,
-+      437,  309,  428,  438,  455,  292,  292,  292,  293,  293,
-+      293,  293,  293,  293,  293,  293,  293,  293,  293,  293,
-+      449,   92,  439,  439,  454,  449,  449,   92,  440,  439,
-+      439,  154,  441,  441,  447,  440,  441,  441,  446,  445,
-+      444,  443,  436,  293,  293,  293,  294,  294,  294,  294,
-+      294,  294,  294,  294,  294,  294,  294,  294,  451,  451,
-+
-+      451,  451,  451,  451,  432,  452,  431,  452,  430,  452,
-+      425,  424,  422,  421,  420,  419,  415,  414,  412,  411,
-+      410,  294,  294,  294,  318,  318,  318,  318,  318,  318,
-+      318,  318,  318,  318,  318,  318,  409,  403,  402,  401,
-+      398,  397,  396,  395,  388,  387,  386,  309,  309,  382,
-+      381,  380,  379,  370,  369,  312,  361,  360,  309,  318,
-+      318,  318,  324,  324,  324,  324,  324,  324,  324,  324,
-+      324,  324,  324,  324,  309,  309,  359,  358,  357,  356,
-+      346,  341,  340,  339,  338,  309,  335,  334,  309,  309,
-+      333,  332,  331,  330,  323,  321,  320,  324,  324,  324,
-+
-+      363,  363,  363,  363,  363,  363,  363,  363,  363,  363,
-+      363,  363,  314,  311,  310,  307,  306,  305,  304,  303,
-+      302,  301,  295,  291,  290,  289,  288,  287,  286,  285,
-+      277,  274,  273,  272,  271,  363,  363,  363,  371,  371,
-+      371,  371,  371,  371,  371,  371,  371,  371,  371,  371,
-+      270,  267,  266,  258,  257,  256,  255,  254,  253,  252,
-+      251,  250,  249,  248,  247,  220,  219,  218,  217,  216,
-+      215,  214,  213,  371,  371,  371,  372,  372,  372,  372,
-+      372,  372,  372,  372,  372,  372,  372,  372,  212,  211,
-+      210,  209,  208,  182,  181,  180,  179,  178,  177,  176,
-+
-+      175,  174,  171,  170,  169,  119,  119,  101,  141,   92,
-+       90,  372,  372,  372,  384,  384,  384,  384,  384,  384,
-+      384,  384,  384,  384,  384,  384,  140,  464,  139,  464,
-+      138,  137,  134,  133,  132,  131,  130,  129,  128,  127,
-+      464,  126,  125,  124,  123,  119,  102,  101,   90,  384,
-+      384,  384,  399,  399,  399,  399,  399,  399,  399,  399,
-+      399,  399,  399,  399,   89,   88,   87,   81,   80,   79,
-+       78,   77,   66,   64,  464,  464,  464,  464,  464,  464,
-+      464,  464,  464,  464,  464,  464,  464,  399,  399,  399,
-+      450,  450,  450,  450,  450,  450,  450,  450,  450,  450,
-+
-+      450,  450,  464,  464,  464,  464,  464,  464,  464,  464,
-+      464,  464,  464,  464,  464,  464,  464,  464,  464,  464,
-+      464,  464,  464,  464,  464,  450,  450,  450,   16,   16,
-        16,   16,   16,   16,   16,   16,   16,   54,   54,   54,
-        54,   54,   54,   54,   54,   54,   60,   60,   60,   60,
-        60,   60,   60,   60,   60,   63,   63,   63,   63,   63,
-        63,   63,   63,   63,   65,   65,   65,   65,   65,   65,
--       65,   65,   65,   67,   67,  444,   67,   83,   83,   83,
-+       65,   65,   65,   67,   67,  464,   67,   83,   83,   83,
-        83,   83,   83,   83,   83,   83,   86,   86,   86,   86,
-        86,   86,   86,   86,   86,   92,   92,   92,   92,   92,
--       92,   92,   92,   92,   99,   99,   99,   99,   99,   99,
- 
--       99,  444,   99,  119,  444,  444,  444,  444,  444,  444,
--      119,  120,  120,  444,  120,  444,  120,  120,  120,  120,
--      121,  121,  121,  121,  121,  121,  121,  121,  121,  166,
--      166,  444,  166,  444,  166,  166,  166,  166,  202,  202,
--      444,  202,  444,  202,  202,  202,  202,  242,  242,  444,
--      242,  444,  242,  242,  242,  242,  278,  278,  444,  278,
--      444,  278,  278,  278,  278,  255,  255,  255,  255,  255,
--      444,  444,  255,  311,  311,  444,  311,  444,  311,  311,
--      311,  311,  286,  286,  286,  286,  286,  444,  444,  286,
--      287,  287,  287,  287,  287,  444,  444,  287,  288,  288,
--
--      288,  288,  288,  444,  444,  288,  326,  326,  326,  326,
--      326,  444,  444,  326,  335,  335,  444,  335,  444,  335,
--      335,  335,  335,  316,  316,  316,  316,  316,  444,  444,
--      316,  353,  353,  444,  353,  444,  353,  353,  353,  353,
--      371,  371,  444,  371,  444,  371,  371,  371,  371,  359,
--      359,  359,  359,  359,  444,  444,  359,  360,  360,  360,
--      360,  360,  444,  444,  360,  384,  384,  444,  384,  444,
--      384,  384,  384,  384,  396,  396,  444,  396,  444,  396,
--      396,  396,  396,  405,  405,  444,  405,  444,  405,  405,
--      405,  405,  416,  416,  444,  416,  444,  416,  416,  416,
--
--      416,  423,  423,  444,  444,  444,  423,  444,  423,  428,
--      428,  444,  428,  444,  428,  428,  428,  428,  433,  433,
--      433,  444,  433,  433,  444,  433,  438,  438,  444,  438,
--      444,  438,  438,  438,  438,  430,  430,  430,  430,  430,
--      444,  444,  430,    9,  444,  444,  444,  444,  444,  444,
--      444,  444,  444,  444,  444,  444,  444,  444,  444,  444,
--      444,  444,  444,  444,  444,  444,  444,  444,  444,  444,
--      444,  444,  444,  444,  444,  444,  444,  444,  444,  444,
--      444,  444,  444,  444,  444,  444,  444,  444,  444,  444,
--      444,  444,  444,  444,  444,  444,  444,  444,  444,  444,
-+       92,   92,   92,   92,  100,  100,  100,  100,  100,  100,
-+      100,  464,  100,  120,  464,  464,  464,  464,  464,  464,
-+      120,  121,  121,  464,  121,  464,  121,  121,  121,  121,
-+      122,  122,  122,  122,  122,  122,  122,  122,  122,  168,
-+      168,  464,  168,  464,  168,  168,  168,  168,  205,  205,
-+      464,  205,  464,  205,  205,  205,  205,  246,  246,  464,
-+      246,  464,  246,  246,  246,  246,  284,  284,  464,  284,
-+      464,  284,  284,  284,  284,  259,  259,  259,  259,  259,
-+      464,  464,  259,  319,  319,  464,  319,  464,  319,  319,
-+      319,  319,  292,  292,  292,  292,  292,  464,  464,  292,
-+
-+      293,  293,  293,  293,  293,  464,  464,  293,  294,  294,
-+      294,  294,  294,  464,  464,  294,  336,  336,  336,  336,
-+      336,  464,  464,  336,  345,  345,  464,  345,  464,  345,
-+      345,  345,  345,  324,  324,  324,  324,  324,  464,  464,
-+      324,  365,  365,  464,  365,  464,  365,  365,  365,  365,
-+      385,  385,  464,  385,  464,  385,  385,  385,  385,  371,
-+      371,  371,  371,  371,  464,  464,  371,  372,  372,  372,
-+      372,  372,  464,  464,  372,  400,  400,  464,  400,  464,
-+      400,  400,  400,  400,  413,  413,  464,  413,  464,  413,
-+      413,  413,  413,  423,  423,  464,  423,  464,  423,  423,
-+
-+      423,  423,  435,  435,  464,  435,  464,  435,  435,  435,
-+      435,  442,  442,  464,  464,  464,  442,  464,  442,  448,
-+      448,  464,  448,  464,  448,  448,  448,  448,  453,  453,
-+      453,  464,  453,  453,  464,  453,  458,  458,  464,  458,
-+      464,  458,  458,  458,  458,  450,  450,  450,  450,  450,
-+      464,  464,  450,    9,  464,  464,  464,  464,  464,  464,
-+      464,  464,  464,  464,  464,  464,  464,  464,  464,  464,
-+      464,  464,  464,  464,  464,  464,  464,  464,  464,  464,
-+      464,  464,  464,  464,  464,  464,  464,  464,  464,  464,
-+      464,  464,  464,  464,  464,  464,  464,  464,  464,  464,
- 
--      444,  444,  444,  444,  444,  444
-+      464,  464,  464,  464,  464,  464,  464,  464,  464,  464,
-+      464,  464,  464,  464,  464,  464
-     } ;
- 
--static yyconst flex_int16_t yy_chk[1507] =
-+static yyconst flex_int16_t yy_chk[1517] =
-     {   0,
-         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-         1,    1,    1,    4,    5,    6,    4,    7,    8,   18,
-@@ -760,10 +778,10 @@
-        27,   35,   35,   11,   11,    1,    1,    1,    2,    2,
-         2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
-         2,   11,   12,   12,    2,   37,   13,   36,   36,   37,
--       18,   42,   39,   27,   43,   44,   45,   46,   48,  159,
--       12,   39,   96,    2,    2,    2,   52,   52,   95,   52,
--       96,    2,   44,   95,   43,   48,  159,   42,   82,   82,
--       43,   45,   46,    2,    2,    2,    3,    3,    3,    3,
-+       18,   42,   39,   27,   38,   43,   44,   45,   96,   48,
-+       12,   39,  151,    2,    2,    2,   96,   38,  153,   52,
-+       52,    2,   52,   44,  151,   43,   48,   42,   82,   82,
-+      153,   43,   45,    2,    2,    2,    3,    3,    3,    3,
- 
-         3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-         3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-@@ -771,155 +789,156 @@
-         3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-         3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-         3,    3,    3,    3,    3,    3,    3,    3,   17,   17,
--       47,   17,   49,   50,   51,   60,   69,   58,   58,   75,
--       83,   94,   94,   17,   97,   49,   17,   97,  102,   79,
--       98,  104,  103,   50,   50,   58,   47,   68,   68,   51,
--       68,   98,   49,   50,   79,  103,  105,  443,   60,  106,
--
--       17,  107,   68,   83,  102,   68,  104,   69,  108,  109,
--       75,  110,   17,   17,   17,   33,   33,   33,   33,   33,
--       33,   33,   33,   33,   33,   33,   33,  107,  105,   68,
--      106,  107,  140,  108,  128,  140,  442,  111,  109,  110,
--      112,   68,   68,   68,  114,  233,  233,  115,  113,  128,
-+       46,   17,   47,   50,   49,   51,   60,   69,   58,   58,
-+       75,   83,   79,   17,   94,   94,   17,   49,   97,   98,
-+       97,   99,   98,   50,   50,   46,   58,   79,   47,  104,
-+       51,   95,   99,   50,   49,  141,   95,  463,  141,   60,
-+
-+       17,  106,  104,  103,   83,  107,  105,  109,   69,  108,
-+      111,   75,   17,   17,   17,   33,   33,   33,   33,   33,
-+       33,   33,   33,   33,   33,   33,   33,   68,   68,  103,
-+       68,  105,  109,  106,  157,  108,  107,  110,  111,  108,
-+      112,  113,   68,  115,  143,   68,  143,  157,  462,  116,
-        33,   33,   33,   34,   34,   34,   34,   34,   34,   34,
--       34,   34,   34,   34,   34,  111,  112,  113,  115,  141,
--      116,  116,  114,  116,  144,  142,  115,  142,  144,   34,
--      141,  167,  167,  113,  257,  441,  257,  167,   34,   34,
--       34,  119,  119,  119,  119,  119,  119,  119,  119,  119,
--
--      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
--      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
--      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
--      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
--      119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
--      119,  119,  119,  143,  143,  143,  143,  143,  143,  143,
--      143,  143,  143,  143,  143,  153,  149,  151,  182,  318,
--      155,  267,  318,  156,  182,  267,  147,  148,  149,  151,
--      146,  150,  154,  155,  153,  156,  157,  160,  143,  143,
--      143,  145,  145,  145,  145,  145,  145,  145,  145,  145,
--
--      145,  145,  145,  146,  147,  150,  148,  181,  183,  290,
--      185,  440,  154,  290,  157,  187,  158,  161,  160,  181,
--      183,  162,  185,  188,  190,  194,  145,  145,  145,  152,
--      152,  152,  152,  152,  152,  152,  152,  152,  152,  152,
--      152,  158,  162,  161,  193,  187,  195,  199,  198,  194,
--      203,  203,  256,  188,  190,  439,  203,  256,  258,  195,
--      198,  193,  199,  258,  152,  152,  152,  163,  163,  163,
--      163,  163,  163,  163,  163,  163,  163,  163,  163,  163,
--      163,  163,  163,  163,  163,  163,  163,  163,  163,  163,
--      163,  189,  189,  189,  189,  189,  189,  189,  189,  189,
--
--      189,  189,  189,  196,  197,  201,  200,  218,  220,  219,
--      221,  236,  237,  437,  239,  240,  235,  221,  238,  218,
--      220,  197,  219,  270,  201,  236,  189,  189,  189,  192,
--      192,  200,  235,  196,  238,  237,  259,  236,  272,  270,
--      273,  259,  192,  192,  239,  240,  274,  291,  192,  307,
--      272,  275,  284,  284,  273,  293,  292,  301,  301,  291,
--      292,  309,  314,  314,  436,  293,  273,  274,  192,  192,
--      192,  308,  275,  317,  309,  192,  307,  192,  332,  375,
--      314,  317,  375,  192,  334,  192,  217,  217,  217,  217,
--      217,  217,  217,  217,  217,  217,  217,  217,  315,  319,
--
--      308,  320,  376,  376,  341,  435,  315,  319,  332,  341,
--      320,  315,  315,  334,  342,  343,  434,  350,  427,  342,
--      343,  217,  217,  217,  222,  222,  222,  222,  222,  222,
--      222,  222,  222,  222,  222,  222,  336,  361,  377,  344,
--      362,  377,  344,  363,  336,  350,  361,  362,  388,  336,
--      336,  344,  363,  364,  379,  379,  426,  364,  388,  222,
--      222,  222,  241,  241,  241,  241,  241,  241,  241,  241,
--      241,  241,  241,  241,  365,  378,  389,  391,  390,  365,
--      392,  399,  391,  425,  392,  389,  424,  378,  390,  400,
--      400,  399,  401,  401,  415,  400,  414,  241,  241,  241,
--
--      251,  251,  251,  251,  251,  251,  251,  251,  251,  251,
--      251,  251,  404,  407,  400,  408,  409,  409,  407,  407,
--      413,  404,  409,  410,  410,  411,  417,  408,  412,  411,
--      419,  417,  417,  406,  419,  251,  251,  251,  252,  252,
--      252,  252,  252,  252,  252,  252,  252,  252,  252,  252,
--      420,  420,  421,  421,  422,  422,  420,  423,  423,  431,
--      431,  433,  433,  403,  423,  402,  431,  398,  433,  397,
--      395,  394,  393,  252,  252,  252,  253,  253,  253,  253,
--      253,  253,  253,  253,  253,  253,  253,  253,  387,  385,
--      382,  381,  380,  374,  373,  372,  368,  367,  366,  358,
--
--      357,  354,  349,  348,  347,  346,  345,  338,  337,  331,
--      330,  253,  253,  253,  276,  276,  276,  276,  276,  276,
--      276,  276,  276,  276,  276,  276,  329,  328,  325,  324,
--      323,  322,  321,  312,  306,  305,  304,  303,  302,  300,
--      299,  298,  297,  296,  295,  294,  285,  283,  279,  276,
--      276,  276,  289,  289,  289,  289,  289,  289,  289,  289,
--      289,  289,  289,  289,  271,  269,  268,  266,  265,  264,
--      263,  262,  261,  254,  250,  249,  247,  246,  245,  244,
--      243,  234,  232,  231,  230,  229,  228,  289,  289,  289,
--      333,  333,  333,  333,  333,  333,  333,  333,  333,  333,
--
--      333,  333,  227,  226,  225,  216,  215,  214,  213,  212,
--      211,  210,  209,  208,  207,  206,  205,  180,  179,  178,
--      177,  176,  175,  174,  173,  333,  333,  333,  339,  339,
--      339,  339,  339,  339,  339,  339,  339,  339,  339,  339,
--      172,  171,  170,  169,  168,  137,  136,  135,  134,  133,
--      132,  131,  130,  129,  127,  126,  124,  118,  117,   99,
--       93,   92,   90,  339,  339,  339,  340,  340,  340,  340,
--      340,  340,  340,  340,  340,  340,  340,  340,   88,   87,
--       86,   85,   81,   80,   78,   77,   76,   74,   73,   72,
--       71,   70,   64,   63,   59,   57,   56,   53,   41,   40,
--
--       38,  340,  340,  340,  352,  352,  352,  352,  352,  352,
--      352,  352,  352,  352,  352,  352,   32,   31,   30,   29,
--       23,   22,   21,   20,   19,   15,   14,    9,    0,    0,
--        0,    0,    0,    0,    0,    0,    0,    0,    0,  352,
--      352,  352,  369,  369,  369,  369,  369,  369,  369,  369,
--      369,  369,  369,  369,    0,    0,    0,    0,    0,    0,
--        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
--        0,    0,    0,    0,    0,    0,    0,  369,  369,  369,
--      418,  418,  418,  418,  418,  418,  418,  418,  418,  418,
--      418,  418,    0,    0,    0,    0,    0,    0,    0,    0,
-+       34,   34,   34,   34,   34,  114,  110,  113,  112,   68,
-+      116,  115,  117,  117,  142,  117,  129,  145,  116,   34,
-+      155,   68,   68,   68,  114,  142,  158,  145,   34,   34,
-+       34,  129,  146,  224,  326,  224,  146,  326,  158,  155,
-+
-+      114,  120,  120,  120,  120,  120,  120,  120,  120,  120,
-+      120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
-+      120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
-+      120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
-+      120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
-+      120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
-+      120,  120,  120,  144,  144,  144,  144,  144,  144,  144,
-+      144,  144,  144,  144,  144,  161,  164,  169,  169,  184,
-+      237,  237,  461,  169,  183,  184,  149,  150,  156,  159,
-+      148,  152,  161,  162,  160,  163,  183,  164,  144,  144,
-+
-+      144,  147,  147,  147,  147,  147,  147,  147,  147,  147,
-+      147,  147,  147,  148,  149,  152,  150,  159,  156,  160,
-+      185,  163,  187,  188,  162,  190,  191,  193,  197,  199,
-+      290,  290,  185,  243,  187,  188,  147,  147,  147,  154,
-+      154,  154,  154,  154,  154,  154,  154,  154,  154,  154,
-+      154,  196,  197,  198,  200,  190,  191,  193,  201,  199,
-+      221,  206,  206,  243,  260,  325,  198,  206,  196,  260,
-+      201,  200,  221,  325,  154,  154,  154,  165,  165,  165,
-+      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-+      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-+
-+      165,  192,  192,  192,  192,  192,  192,  192,  192,  192,
-+      192,  192,  192,  202,  204,  223,  203,  222,  225,  231,
-+      240,  241,  263,  460,  244,  225,  239,  223,  202,  242,
-+      222,  263,  231,  204,  240,  276,  192,  192,  192,  195,
-+      195,  203,  239,  262,  241,  242,  240,  261,  262,  261,
-+      264,  276,  195,  195,  244,  264,  273,  278,  195,  297,
-+      273,  280,  279,  281,  296,  299,  298,  300,  296,  278,
-+      298,  297,  299,  309,  309,  459,  279,  300,  195,  195,
-+      195,  315,  280,  316,  281,  195,  327,  195,  279,  342,
-+      457,  344,  456,  195,  327,  195,  220,  220,  220,  220,
-+
-+      220,  220,  220,  220,  220,  220,  220,  220,  315,  317,
-+      322,  322,  316,  323,  329,  354,  455,  328,  354,  342,
-+      344,  323,  317,  329,  454,  351,  323,  323,  322,  328,
-+      351,  220,  220,  220,  226,  226,  226,  226,  226,  226,
-+      226,  226,  226,  226,  226,  226,  346,  352,  353,  390,
-+      390,  393,  352,  353,  346,  355,  362,  373,  355,  346,
-+      346,  374,  389,  393,  447,  389,  373,  355,  374,  226,
-+      226,  226,  245,  245,  245,  245,  245,  245,  245,  245,
-+      245,  245,  245,  245,  362,  375,  376,  377,  378,  391,
-+      405,  377,  391,  378,  375,  376,  392,  394,  394,  405,
-+
-+      392,  407,  418,  418,  428,  428,  407,  245,  245,  245,
-+      255,  255,  255,  255,  255,  255,  255,  255,  255,  255,
-+      255,  255,  404,  406,  408,  416,  429,  446,  408,  422,
-+      429,  426,  404,  406,  425,  416,  417,  417,  422,  425,
-+      425,  445,  417,  426,  444,  255,  255,  255,  256,  256,
-+      256,  256,  256,  256,  256,  256,  256,  256,  256,  256,
-+      436,  417,  427,  427,  443,  436,  436,  438,  427,  439,
-+      439,  438,  440,  440,  434,  439,  441,  441,  433,  432,
-+      431,  430,  424,  256,  256,  256,  257,  257,  257,  257,
-+      257,  257,  257,  257,  257,  257,  257,  257,  442,  442,
-+
-+      451,  451,  453,  453,  421,  442,  420,  451,  419,  453,
-+      415,  414,  412,  411,  410,  409,  403,  401,  398,  397,
-+      396,  257,  257,  257,  282,  282,  282,  282,  282,  282,
-+      282,  282,  282,  282,  282,  282,  395,  388,  387,  386,
-+      382,  381,  380,  379,  370,  369,  366,  361,  360,  359,
-+      358,  357,  356,  348,  347,  341,  340,  339,  338,  282,
-+      282,  282,  295,  295,  295,  295,  295,  295,  295,  295,
-+      295,  295,  295,  295,  335,  334,  333,  332,  331,  330,
-+      320,  314,  313,  312,  311,  310,  308,  307,  306,  305,
-+      304,  303,  302,  301,  291,  289,  285,  295,  295,  295,
-+
-+      343,  343,  343,  343,  343,  343,  343,  343,  343,  343,
-+      343,  343,  277,  275,  274,  272,  271,  270,  269,  268,
-+      267,  266,  258,  254,  253,  251,  250,  249,  248,  247,
-+      238,  236,  235,  234,  233,  343,  343,  343,  349,  349,
-+      349,  349,  349,  349,  349,  349,  349,  349,  349,  349,
-+      232,  230,  229,  219,  218,  217,  216,  215,  214,  213,
-+      212,  211,  210,  209,  208,  182,  181,  180,  179,  178,
-+      177,  176,  175,  349,  349,  349,  350,  350,  350,  350,
-+      350,  350,  350,  350,  350,  350,  350,  350,  174,  173,
-+      172,  171,  170,  138,  137,  136,  135,  134,  133,  132,
-+
-+      131,  130,  128,  127,  125,  119,  118,  100,   93,   92,
-+       90,  350,  350,  350,  364,  364,  364,  364,  364,  364,
-+      364,  364,  364,  364,  364,  364,   88,   87,   86,   85,
-+       81,   80,   78,   77,   76,   74,   73,   72,   71,   70,
-+       64,   63,   59,   57,   56,   53,   41,   40,   32,  364,
-+      364,  364,  383,  383,  383,  383,  383,  383,  383,  383,
-+      383,  383,  383,  383,   31,   30,   29,   23,   22,   21,
-+       20,   19,   15,   14,    9,    0,    0,    0,    0,    0,
-+        0,    0,    0,    0,    0,    0,    0,  383,  383,  383,
-+      437,  437,  437,  437,  437,  437,  437,  437,  437,  437,
- 
-+      437,  437,    0,    0,    0,    0,    0,    0,    0,    0,
-         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
--        0,    0,    0,    0,    0,  418,  418,  418,  445,  445,
--      445,  445,  445,  445,  445,  445,  445,  446,  446,  446,
--      446,  446,  446,  446,  446,  446,  447,  447,  447,  447,
--      447,  447,  447,  447,  447,  448,  448,  448,  448,  448,
--      448,  448,  448,  448,  449,  449,  449,  449,  449,  449,
--      449,  449,  449,  450,  450,    0,  450,  451,  451,  451,
--      451,  451,  451,  451,  451,  451,  452,  452,  452,  452,
--      452,  452,  452,  452,  452,  453,  453,  453,  453,  453,
--      453,  453,  453,  453,  454,  454,  454,  454,  454,  454,
--
--      454,    0,  454,  455,    0,    0,    0,    0,    0,    0,
--      455,  456,  456,    0,  456,    0,  456,  456,  456,  456,
--      457,  457,  457,  457,  457,  457,  457,  457,  457,  458,
--      458,    0,  458,    0,  458,  458,  458,  458,  459,  459,
--        0,  459,    0,  459,  459,  459,  459,  460,  460,    0,
--      460,    0,  460,  460,  460,  460,  461,  461,    0,  461,
--        0,  461,  461,  461,  461,  462,  462,  462,  462,  462,
--        0,    0,  462,  463,  463,    0,  463,    0,  463,  463,
--      463,  463,  464,  464,  464,  464,  464,    0,    0,  464,
--      465,  465,  465,  465,  465,    0,    0,  465,  466,  466,
--
--      466,  466,  466,    0,    0,  466,  467,  467,  467,  467,
--      467,    0,    0,  467,  468,  468,    0,  468,    0,  468,
--      468,  468,  468,  469,  469,  469,  469,  469,    0,    0,
--      469,  470,  470,    0,  470,    0,  470,  470,  470,  470,
--      471,  471,    0,  471,    0,  471,  471,  471,  471,  472,
--      472,  472,  472,  472,    0,    0,  472,  473,  473,  473,
--      473,  473,    0,    0,  473,  474,  474,    0,  474,    0,
--      474,  474,  474,  474,  475,  475,    0,  475,    0,  475,
--      475,  475,  475,  476,  476,    0,  476,    0,  476,  476,
--      476,  476,  477,  477,    0,  477,    0,  477,  477,  477,
--
--      477,  478,  478,    0,    0,    0,  478,    0,  478,  479,
--      479,    0,  479,    0,  479,  479,  479,  479,  480,  480,
--      480,    0,  480,  480,    0,  480,  481,  481,    0,  481,
-+        0,    0,    0,    0,    0,  437,  437,  437,  465,  465,
-+      465,  465,  465,  465,  465,  465,  465,  466,  466,  466,
-+      466,  466,  466,  466,  466,  466,  467,  467,  467,  467,
-+      467,  467,  467,  467,  467,  468,  468,  468,  468,  468,
-+      468,  468,  468,  468,  469,  469,  469,  469,  469,  469,
-+      469,  469,  469,  470,  470,    0,  470,  471,  471,  471,
-+      471,  471,  471,  471,  471,  471,  472,  472,  472,  472,
-+      472,  472,  472,  472,  472,  473,  473,  473,  473,  473,
-+
-+      473,  473,  473,  473,  474,  474,  474,  474,  474,  474,
-+      474,    0,  474,  475,    0,    0,    0,    0,    0,    0,
-+      475,  476,  476,    0,  476,    0,  476,  476,  476,  476,
-+      477,  477,  477,  477,  477,  477,  477,  477,  477,  478,
-+      478,    0,  478,    0,  478,  478,  478,  478,  479,  479,
-+        0,  479,    0,  479,  479,  479,  479,  480,  480,    0,
-+      480,    0,  480,  480,  480,  480,  481,  481,    0,  481,
-         0,  481,  481,  481,  481,  482,  482,  482,  482,  482,
--        0,    0,  482,  444,  444,  444,  444,  444,  444,  444,
--      444,  444,  444,  444,  444,  444,  444,  444,  444,  444,
--      444,  444,  444,  444,  444,  444,  444,  444,  444,  444,
--      444,  444,  444,  444,  444,  444,  444,  444,  444,  444,
--      444,  444,  444,  444,  444,  444,  444,  444,  444,  444,
--      444,  444,  444,  444,  444,  444,  444,  444,  444,  444,
-+        0,    0,  482,  483,  483,    0,  483,    0,  483,  483,
-+      483,  483,  484,  484,  484,  484,  484,    0,    0,  484,
- 
--      444,  444,  444,  444,  444,  444
-+      485,  485,  485,  485,  485,    0,    0,  485,  486,  486,
-+      486,  486,  486,    0,    0,  486,  487,  487,  487,  487,
-+      487,    0,    0,  487,  488,  488,    0,  488,    0,  488,
-+      488,  488,  488,  489,  489,  489,  489,  489,    0,    0,
-+      489,  490,  490,    0,  490,    0,  490,  490,  490,  490,
-+      491,  491,    0,  491,    0,  491,  491,  491,  491,  492,
-+      492,  492,  492,  492,    0,    0,  492,  493,  493,  493,
-+      493,  493,    0,    0,  493,  494,  494,    0,  494,    0,
-+      494,  494,  494,  494,  495,  495,    0,  495,    0,  495,
-+      495,  495,  495,  496,  496,    0,  496,    0,  496,  496,
-+
-+      496,  496,  497,  497,    0,  497,    0,  497,  497,  497,
-+      497,  498,  498,    0,    0,    0,  498,    0,  498,  499,
-+      499,    0,  499,    0,  499,  499,  499,  499,  500,  500,
-+      500,    0,  500,  500,    0,  500,  501,  501,    0,  501,
-+        0,  501,  501,  501,  501,  502,  502,  502,  502,  502,
-+        0,    0,  502,  464,  464,  464,  464,  464,  464,  464,
-+      464,  464,  464,  464,  464,  464,  464,  464,  464,  464,
-+      464,  464,  464,  464,  464,  464,  464,  464,  464,  464,
-+      464,  464,  464,  464,  464,  464,  464,  464,  464,  464,
-+      464,  464,  464,  464,  464,  464,  464,  464,  464,  464,
-+
-+      464,  464,  464,  464,  464,  464,  464,  464,  464,  464,
-+      464,  464,  464,  464,  464,  464
-     } ;
- 
- static yy_state_type yy_last_accepting_state;
-@@ -936,7 +955,7 @@
- #define YY_MORE_ADJ 0
- #define YY_RESTORE_YY_MORE_OFFSET
- char *yytext;
--#line 1 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l"
-+#line 1 "/home/ams/tmp/linaro/gcc-4.4/gcc-linaro-4.4-2011.02-0/gcc/gengtype-lex.l"
- /* -*- indented-text -*- */
- /* Process source files and output type information.
-    Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008, 2009
-@@ -957,7 +976,7 @@
- You should have received a copy of the GNU General Public License
- along with GCC; see the file COPYING3.  If not see
- <http://www.gnu.org/licenses/>.  */
--#line 23 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l"
-+#line 23 "/home/ams/tmp/linaro/gcc-4.4/gcc-linaro-4.4-2011.02-0/gcc/gengtype-lex.l"
- #include "bconfig.h"
- #include "system.h"
- 
-@@ -982,7 +1001,7 @@
- }
- 
- 
--#line 986 "gengtype-lex.c"
-+#line 1005 "gengtype-lex.c"
- 
- #define INITIAL 0
- #define in_struct 1
-@@ -1064,7 +1083,12 @@
- 
- /* Amount of stuff to slurp up with each read. */
- #ifndef YY_READ_BUF_SIZE
-+#ifdef __ia64__
-+/* On IA-64, the buffer size is 16k, not 8k */
-+#define YY_READ_BUF_SIZE 16384
-+#else
- #define YY_READ_BUF_SIZE 8192
-+#endif /* __ia64__ */
- #endif
- 
- /* Copy whatever the last rule matched to the standard output. */
-@@ -1083,7 +1107,7 @@
- 	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
- 		{ \
- 		int c = '*'; \
--		unsigned n; \
-+		size_t n; \
- 		for ( n = 0; n < max_size && \
- 			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
- 			buf[n] = (char) c; \
-@@ -1168,7 +1192,7 @@
- 	register char *yy_cp, *yy_bp;
- 	register int yy_act;
-     
--#line 58 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l"
-+#line 58 "/home/ams/tmp/linaro/gcc-4.4/gcc-linaro-4.4-2011.02-0/gcc/gengtype-lex.l"
- 
-   /* Do this on entry to yylex():  */
-   *yylval = 0;
-@@ -1179,7 +1203,7 @@
-     }
- 
-   /* Things we look for in skipping mode: */
--#line 1183 "gengtype-lex.c"
-+#line 1207 "gengtype-lex.c"
- 
- 	if ( !(yy_init) )
- 		{
-@@ -1233,13 +1257,13 @@
- 			while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
- 				{
- 				yy_current_state = (int) yy_def[yy_current_state];
--				if ( yy_current_state >= 445 )
-+				if ( yy_current_state >= 465 )
- 					yy_c = yy_meta[(unsigned int) yy_c];
- 				}
- 			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
- 			++yy_cp;
- 			}
--		while ( yy_current_state != 444 );
-+		while ( yy_current_state != 464 );
- 		yy_cp = (yy_last_accepting_cpos);
- 		yy_current_state = (yy_last_accepting_state);
- 
-@@ -1265,7 +1289,7 @@
- (yy_c_buf_p) = yy_cp -= 1;
- YY_DO_BEFORE_ACTION; /* set up yytext again */
- YY_RULE_SETUP
--#line 69 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l"
-+#line 69 "/home/ams/tmp/linaro/gcc-4.4/gcc-linaro-4.4-2011.02-0/gcc/gengtype-lex.l"
- {
-   BEGIN(in_struct);
-   return TYPEDEF;
-@@ -1277,7 +1301,7 @@
- (yy_c_buf_p) = yy_cp -= 1;
- YY_DO_BEFORE_ACTION; /* set up yytext again */
- YY_RULE_SETUP
--#line 73 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l"
-+#line 73 "/home/ams/tmp/linaro/gcc-4.4/gcc-linaro-4.4-2011.02-0/gcc/gengtype-lex.l"
- {
-   BEGIN(in_struct);
-   return STRUCT;
-@@ -1289,7 +1313,7 @@
- (yy_c_buf_p) = yy_cp -= 1;
- YY_DO_BEFORE_ACTION; /* set up yytext again */
- YY_RULE_SETUP
--#line 77 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l"
-+#line 77 "/home/ams/tmp/linaro/gcc-4.4/gcc-linaro-4.4-2011.02-0/gcc/gengtype-lex.l"
- {
-   BEGIN(in_struct);
-   return UNION;
-@@ -1301,7 +1325,7 @@
- (yy_c_buf_p) = yy_cp -= 1;
- YY_DO_BEFORE_ACTION; /* set up yytext again */
- YY_RULE_SETUP
--#line 81 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l"
-+#line 81 "/home/ams/tmp/linaro/gcc-4.4/gcc-linaro-4.4-2011.02-0/gcc/gengtype-lex.l"
- {
-   BEGIN(in_struct);
-   return EXTERN;
-@@ -1313,7 +1337,7 @@
- (yy_c_buf_p) = yy_cp -= 1;
- YY_DO_BEFORE_ACTION; /* set up yytext again */
- YY_RULE_SETUP
--#line 85 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l"
-+#line 85 "/home/ams/tmp/linaro/gcc-4.4/gcc-linaro-4.4-2011.02-0/gcc/gengtype-lex.l"
- {
-   BEGIN(in_struct);
-   return STATIC;
-@@ -1325,7 +1349,7 @@
- (yy_c_buf_p) = yy_cp -= 1;
- YY_DO_BEFORE_ACTION; /* set up yytext again */
- YY_RULE_SETUP
--#line 90 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l"
-+#line 90 "/home/ams/tmp/linaro/gcc-4.4/gcc-linaro-4.4-2011.02-0/gcc/gengtype-lex.l"
- {
-   BEGIN(in_struct);
-   return DEFVEC_OP;
-@@ -1337,7 +1361,7 @@
- (yy_c_buf_p) = yy_cp -= 1;
- YY_DO_BEFORE_ACTION; /* set up yytext again */
- YY_RULE_SETUP
--#line 94 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l"
-+#line 94 "/home/ams/tmp/linaro/gcc-4.4/gcc-linaro-4.4-2011.02-0/gcc/gengtype-lex.l"
- {
-   BEGIN(in_struct);
-   return DEFVEC_I;
-@@ -1349,7 +1373,7 @@
- (yy_c_buf_p) = yy_cp -= 1;
- YY_DO_BEFORE_ACTION; /* set up yytext again */
- YY_RULE_SETUP
--#line 98 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l"
-+#line 98 "/home/ams/tmp/linaro/gcc-4.4/gcc-linaro-4.4-2011.02-0/gcc/gengtype-lex.l"
- {
-   BEGIN(in_struct);
-   return DEFVEC_ALLOC;
-@@ -1359,19 +1383,19 @@
- 
- case 9:
- YY_RULE_SETUP
--#line 106 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l"
-+#line 106 "/home/ams/tmp/linaro/gcc-4.4/gcc-linaro-4.4-2011.02-0/gcc/gengtype-lex.l"
- { BEGIN(in_struct_comment); }
- 	YY_BREAK
- case 10:
- /* rule 10 can match eol */
- YY_RULE_SETUP
--#line 108 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l"
-+#line 108 "/home/ams/tmp/linaro/gcc-4.4/gcc-linaro-4.4-2011.02-0/gcc/gengtype-lex.l"
- { update_lineno (yytext, yyleng); }
- 	YY_BREAK
- case 11:
- /* rule 11 can match eol */
- YY_RULE_SETUP
--#line 109 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l"
-+#line 109 "/home/ams/tmp/linaro/gcc-4.4/gcc-linaro-4.4-2011.02-0/gcc/gengtype-lex.l"
- { lexer_line.line++; }
- 	YY_BREAK
- case 12:
-@@ -1380,7 +1404,7 @@
- (yy_c_buf_p) = yy_cp = yy_bp + 5;
- YY_DO_BEFORE_ACTION; /* set up yytext again */
- YY_RULE_SETUP
--#line 111 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l"
-+#line 111 "/home/ams/tmp/linaro/gcc-4.4/gcc-linaro-4.4-2011.02-0/gcc/gengtype-lex.l"
- /* don't care */
- 	YY_BREAK
- case 13:
-@@ -1389,7 +1413,7 @@
- (yy_c_buf_p) = yy_cp = yy_bp + 3;
- YY_DO_BEFORE_ACTION; /* set up yytext again */
- YY_RULE_SETUP
--#line 112 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l"
-+#line 112 "/home/ams/tmp/linaro/gcc-4.4/gcc-linaro-4.4-2011.02-0/gcc/gengtype-lex.l"
- { return GTY_TOKEN; }
- 	YY_BREAK
- case 14:
-@@ -1398,7 +1422,7 @@
- (yy_c_buf_p) = yy_cp = yy_bp + 3;
- YY_DO_BEFORE_ACTION; /* set up yytext again */
- YY_RULE_SETUP
--#line 113 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l"
-+#line 113 "/home/ams/tmp/linaro/gcc-4.4/gcc-linaro-4.4-2011.02-0/gcc/gengtype-lex.l"
- { return VEC_TOKEN; }
- 	YY_BREAK
- case 15:
-@@ -1407,7 +1431,7 @@
- (yy_c_buf_p) = yy_cp = yy_bp + 5;
- YY_DO_BEFORE_ACTION; /* set up yytext again */
- YY_RULE_SETUP
--#line 114 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l"
-+#line 114 "/home/ams/tmp/linaro/gcc-4.4/gcc-linaro-4.4-2011.02-0/gcc/gengtype-lex.l"
- { return UNION; }
- 	YY_BREAK
- case 16:
-@@ -1416,7 +1440,7 @@
- (yy_c_buf_p) = yy_cp = yy_bp + 6;
- YY_DO_BEFORE_ACTION; /* set up yytext again */
- YY_RULE_SETUP
--#line 115 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l"
-+#line 115 "/home/ams/tmp/linaro/gcc-4.4/gcc-linaro-4.4-2011.02-0/gcc/gengtype-lex.l"
- { return STRUCT; }
- 	YY_BREAK
- case 17:
-@@ -1425,7 +1449,7 @@
- (yy_c_buf_p) = yy_cp = yy_bp + 4;
- YY_DO_BEFORE_ACTION; /* set up yytext again */
- YY_RULE_SETUP
--#line 116 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l"
-+#line 116 "/home/ams/tmp/linaro/gcc-4.4/gcc-linaro-4.4-2011.02-0/gcc/gengtype-lex.l"
- { return ENUM; }
- 	YY_BREAK
- case 18:
-@@ -1434,7 +1458,7 @@
- (yy_c_buf_p) = yy_cp = yy_bp + 9;
- YY_DO_BEFORE_ACTION; /* set up yytext again */
- YY_RULE_SETUP
--#line 117 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l"
-+#line 117 "/home/ams/tmp/linaro/gcc-4.4/gcc-linaro-4.4-2011.02-0/gcc/gengtype-lex.l"
- { return PTR_ALIAS; }
- 	YY_BREAK
- case 19:
-@@ -1443,12 +1467,12 @@
- (yy_c_buf_p) = yy_cp = yy_bp + 10;
- YY_DO_BEFORE_ACTION; /* set up yytext again */
- YY_RULE_SETUP
--#line 118 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l"
-+#line 118 "/home/ams/tmp/linaro/gcc-4.4/gcc-linaro-4.4-2011.02-0/gcc/gengtype-lex.l"
- { return NESTED_PTR; }
- 	YY_BREAK
- case 20:
- YY_RULE_SETUP
--#line 119 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l"
-+#line 119 "/home/ams/tmp/linaro/gcc-4.4/gcc-linaro-4.4-2011.02-0/gcc/gengtype-lex.l"
- { return NUM; }
- 	YY_BREAK
- case 21:
-@@ -1457,7 +1481,7 @@
- (yy_c_buf_p) = yy_cp -= 1;
- YY_DO_BEFORE_ACTION; /* set up yytext again */
- YY_RULE_SETUP
--#line 120 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l"
-+#line 120 "/home/ams/tmp/linaro/gcc-4.4/gcc-linaro-4.4-2011.02-0/gcc/gengtype-lex.l"
- {
-   *yylval = XDUPVAR (const char, yytext, yyleng, yyleng+1);
-   return PARAM_IS;
-@@ -1468,11 +1492,11 @@
- *yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
- (yy_c_buf_p) = yy_cp -= 1;
- YY_DO_BEFORE_ACTION; /* set up yytext again */
--#line 126 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l"
-+#line 126 "/home/ams/tmp/linaro/gcc-4.4/gcc-linaro-4.4-2011.02-0/gcc/gengtype-lex.l"
- case 23:
- /* rule 23 can match eol */
- YY_RULE_SETUP
--#line 126 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l"
-+#line 126 "/home/ams/tmp/linaro/gcc-4.4/gcc-linaro-4.4-2011.02-0/gcc/gengtype-lex.l"
- {
-   size_t len;
- 
-@@ -1490,7 +1514,7 @@
- (yy_c_buf_p) = yy_cp -= 1;
- YY_DO_BEFORE_ACTION; /* set up yytext again */
- YY_RULE_SETUP
--#line 138 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l"
-+#line 138 "/home/ams/tmp/linaro/gcc-4.4/gcc-linaro-4.4-2011.02-0/gcc/gengtype-lex.l"
- {
-   *yylval = XDUPVAR (const char, yytext, yyleng, yyleng+1);
-   return ID;
-@@ -1499,7 +1523,7 @@
- case 25:
- /* rule 25 can match eol */
- YY_RULE_SETUP
--#line 143 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l"
-+#line 143 "/home/ams/tmp/linaro/gcc-4.4/gcc-linaro-4.4-2011.02-0/gcc/gengtype-lex.l"
- {
-   *yylval = XDUPVAR (const char, yytext+1, yyleng-2, yyleng-1);
-   return STRING;
-@@ -1509,7 +1533,7 @@
- case 26:
- /* rule 26 can match eol */
- YY_RULE_SETUP
--#line 148 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l"
-+#line 148 "/home/ams/tmp/linaro/gcc-4.4/gcc-linaro-4.4-2011.02-0/gcc/gengtype-lex.l"
- {
-   *yylval = XDUPVAR (const char, yytext+1, yyleng-2, yyleng-1);
-   return ARRAY;
-@@ -1518,7 +1542,7 @@
- case 27:
- /* rule 27 can match eol */
- YY_RULE_SETUP
--#line 152 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l"
-+#line 152 "/home/ams/tmp/linaro/gcc-4.4/gcc-linaro-4.4-2011.02-0/gcc/gengtype-lex.l"
- {
-   *yylval = XDUPVAR (const char, yytext+1, yyleng-2, yyleng);
-   return CHAR;
-@@ -1526,24 +1550,24 @@
- 	YY_BREAK
- case 28:
- YY_RULE_SETUP
--#line 157 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l"
-+#line 157 "/home/ams/tmp/linaro/gcc-4.4/gcc-linaro-4.4-2011.02-0/gcc/gengtype-lex.l"
- { return ELLIPSIS; }
- 	YY_BREAK
- case 29:
- YY_RULE_SETUP
--#line 158 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l"
-+#line 158 "/home/ams/tmp/linaro/gcc-4.4/gcc-linaro-4.4-2011.02-0/gcc/gengtype-lex.l"
- { return yytext[0]; }
- 	YY_BREAK
- /* ignore pp-directives */
- case 30:
- /* rule 30 can match eol */
- YY_RULE_SETUP
--#line 161 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l"
-+#line 161 "/home/ams/tmp/linaro/gcc-4.4/gcc-linaro-4.4-2011.02-0/gcc/gengtype-lex.l"
- {lexer_line.line++;}
- 	YY_BREAK
- case 31:
- YY_RULE_SETUP
--#line 163 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l"
-+#line 163 "/home/ams/tmp/linaro/gcc-4.4/gcc-linaro-4.4-2011.02-0/gcc/gengtype-lex.l"
- {
-   error_at_line (&lexer_line, "unexpected character `%s'", yytext);
- }
-@@ -1551,30 +1575,30 @@
- 
- case 32:
- YY_RULE_SETUP
--#line 168 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l"
-+#line 168 "/home/ams/tmp/linaro/gcc-4.4/gcc-linaro-4.4-2011.02-0/gcc/gengtype-lex.l"
- { BEGIN(in_comment); }
- 	YY_BREAK
- case 33:
- /* rule 33 can match eol */
- YY_RULE_SETUP
--#line 169 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l"
-+#line 169 "/home/ams/tmp/linaro/gcc-4.4/gcc-linaro-4.4-2011.02-0/gcc/gengtype-lex.l"
- { lexer_line.line++; }
- 	YY_BREAK
- case 34:
--#line 171 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l"
-+#line 171 "/home/ams/tmp/linaro/gcc-4.4/gcc-linaro-4.4-2011.02-0/gcc/gengtype-lex.l"
- case 35:
- /* rule 35 can match eol */
--#line 172 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l"
-+#line 172 "/home/ams/tmp/linaro/gcc-4.4/gcc-linaro-4.4-2011.02-0/gcc/gengtype-lex.l"
- case 36:
- /* rule 36 can match eol */
- YY_RULE_SETUP
--#line 172 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l"
-+#line 172 "/home/ams/tmp/linaro/gcc-4.4/gcc-linaro-4.4-2011.02-0/gcc/gengtype-lex.l"
- /* do nothing */
- 	YY_BREAK
- case 37:
- /* rule 37 can match eol */
- YY_RULE_SETUP
--#line 173 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l"
-+#line 173 "/home/ams/tmp/linaro/gcc-4.4/gcc-linaro-4.4-2011.02-0/gcc/gengtype-lex.l"
- { update_lineno (yytext, yyleng); }
- 	YY_BREAK
- case 38:
-@@ -1583,21 +1607,21 @@
- (yy_c_buf_p) = yy_cp = yy_bp + 1;
- YY_DO_BEFORE_ACTION; /* set up yytext again */
- YY_RULE_SETUP
--#line 174 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l"
-+#line 174 "/home/ams/tmp/linaro/gcc-4.4/gcc-linaro-4.4-2011.02-0/gcc/gengtype-lex.l"
- /* do nothing */
- 	YY_BREAK
- 
- case 39:
- /* rule 39 can match eol */
- YY_RULE_SETUP
--#line 177 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l"
-+#line 177 "/home/ams/tmp/linaro/gcc-4.4/gcc-linaro-4.4-2011.02-0/gcc/gengtype-lex.l"
- { lexer_line.line++; }
- 	YY_BREAK
- case 40:
--#line 179 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l"
-+#line 179 "/home/ams/tmp/linaro/gcc-4.4/gcc-linaro-4.4-2011.02-0/gcc/gengtype-lex.l"
- case 41:
- YY_RULE_SETUP
--#line 179 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l"
-+#line 179 "/home/ams/tmp/linaro/gcc-4.4/gcc-linaro-4.4-2011.02-0/gcc/gengtype-lex.l"
- /* do nothing */
- 	YY_BREAK
- case 42:
-@@ -1606,25 +1630,25 @@
- (yy_c_buf_p) = yy_cp = yy_bp + 1;
- YY_DO_BEFORE_ACTION; /* set up yytext again */
- YY_RULE_SETUP
--#line 180 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l"
-+#line 180 "/home/ams/tmp/linaro/gcc-4.4/gcc-linaro-4.4-2011.02-0/gcc/gengtype-lex.l"
- /* do nothing */
- 	YY_BREAK
- 
- case 43:
- YY_RULE_SETUP
--#line 182 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l"
-+#line 182 "/home/ams/tmp/linaro/gcc-4.4/gcc-linaro-4.4-2011.02-0/gcc/gengtype-lex.l"
- { BEGIN(INITIAL); } 
- 	YY_BREAK
- case 44:
- YY_RULE_SETUP
--#line 183 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l"
-+#line 183 "/home/ams/tmp/linaro/gcc-4.4/gcc-linaro-4.4-2011.02-0/gcc/gengtype-lex.l"
- { BEGIN(in_struct); }
- 	YY_BREAK
- case 45:
--#line 186 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l"
-+#line 186 "/home/ams/tmp/linaro/gcc-4.4/gcc-linaro-4.4-2011.02-0/gcc/gengtype-lex.l"
- case 46:
- YY_RULE_SETUP
--#line 186 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l"
-+#line 186 "/home/ams/tmp/linaro/gcc-4.4/gcc-linaro-4.4-2011.02-0/gcc/gengtype-lex.l"
- {
-   error_at_line (&lexer_line, 
- 		 "unterminated comment or string; unexpected EOF");
-@@ -1633,23 +1657,23 @@
- case 47:
- /* rule 47 can match eol */
- YY_RULE_SETUP
--#line 191 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l"
-+#line 191 "/home/ams/tmp/linaro/gcc-4.4/gcc-linaro-4.4-2011.02-0/gcc/gengtype-lex.l"
- /* do nothing */
- 	YY_BREAK
- case 48:
- /* rule 48 can match eol */
- YY_RULE_SETUP
--#line 192 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l"
-+#line 192 "/home/ams/tmp/linaro/gcc-4.4/gcc-linaro-4.4-2011.02-0/gcc/gengtype-lex.l"
- {
-   error_at_line (&lexer_line, "stray GTY marker");
- }
- 	YY_BREAK
- case 49:
- YY_RULE_SETUP
--#line 196 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l"
-+#line 196 "/home/ams/tmp/linaro/gcc-4.4/gcc-linaro-4.4-2011.02-0/gcc/gengtype-lex.l"
- YY_FATAL_ERROR( "flex scanner jammed" );
- 	YY_BREAK
--#line 1653 "gengtype-lex.c"
-+#line 1677 "gengtype-lex.c"
- case YY_STATE_EOF(INITIAL):
- case YY_STATE_EOF(in_struct):
- case YY_STATE_EOF(in_struct_comment):
-@@ -1946,7 +1970,7 @@
- 		while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
- 			{
- 			yy_current_state = (int) yy_def[yy_current_state];
--			if ( yy_current_state >= 445 )
-+			if ( yy_current_state >= 465 )
- 				yy_c = yy_meta[(unsigned int) yy_c];
- 			}
- 		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
-@@ -1974,11 +1998,11 @@
- 	while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
- 		{
- 		yy_current_state = (int) yy_def[yy_current_state];
--		if ( yy_current_state >= 445 )
-+		if ( yy_current_state >= 465 )
- 			yy_c = yy_meta[(unsigned int) yy_c];
- 		}
- 	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
--	yy_is_jam = (yy_current_state == 444);
-+	yy_is_jam = (yy_current_state == 464);
- 
- 	return yy_is_jam ? 0 : yy_current_state;
- }
-@@ -2373,8 +2397,8 @@
- 
- /** Setup the input buffer state to scan the given bytes. The next call to yylex() will
-  * scan from a @e copy of @a bytes.
-- * @param bytes the byte buffer to scan
-- * @param len the number of bytes in the buffer pointed to by @a bytes.
-+ * @param yybytes the byte buffer to scan
-+ * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
-  * 
-  * @return the newly allocated buffer state object.
-  */
-@@ -2613,7 +2637,7 @@
- 
- #define YYTABLES_NAME "yytables"
- 
--#line 196 "/d/gcc-4.4.5/gcc-4.4.5/gcc/gengtype-lex.l"
-+#line 196 "/home/ams/tmp/linaro/gcc-4.4/gcc-linaro-4.4-2011.02-0/gcc/gengtype-lex.l"
- 
- 
- 
 --- a/src/gcc/gengtype-lex.l
 +++ b/src/gcc/gengtype-lex.l
 @@ -48,7 +48,7 @@
diff -Nru gcc-4.4-4.4.5/debian/patches/gcc-linaro-doc.diff gcc-4.4-4.4.6/debian/patches/gcc-linaro-doc.diff
--- gcc-4.4-4.4.5/debian/patches/gcc-linaro-doc.diff	2011-05-26 17:12:59.000000000 +0000
+++ gcc-4.4-4.4.6/debian/patches/gcc-linaro-doc.diff	2011-05-26 17:13:03.000000000 +0000
@@ -653,7 +653,7 @@
  -m32  -m64 -mlarge-data-threshold=@var{num} @gol
  -mfused-madd -mno-fused-madd -msse2avx}
  
-@@ -648,12 +653,13 @@
+@@ -652,12 +657,13 @@
  @gccoptlist{-EL  -EB  -march=@var{arch}  -mtune=@var{arch} @gol
  -mips1  -mips2  -mips3  -mips4  -mips32  -mips32r2 @gol
  -mips64  -mips64r2 @gol
@@ -668,7 +668,7 @@
  -mfpu=@var{fpu-type} @gol
  -msmartmips  -mno-smartmips @gol
  -mpaired-single  -mno-paired-single  -mdmx  -mno-mdmx @gol
-@@ -669,6 +675,7 @@
+@@ -673,6 +679,7 @@
  -mcheck-zero-division  -mno-check-zero-division @gol
  -mdivide-traps  -mdivide-breaks @gol
  -mmemcpy  -mno-memcpy  -mlong-calls  -mno-long-calls @gol
@@ -676,7 +676,7 @@
  -mmad  -mno-mad  -mfused-madd  -mno-fused-madd  -nocpp @gol
  -mfix-r4000  -mno-fix-r4000  -mfix-r4400  -mno-fix-r4400 @gol
  -mfix-r10000 -mno-fix-r10000  -mfix-vr4120  -mno-fix-vr4120 @gol
-@@ -774,12 +781,12 @@
+@@ -778,12 +785,12 @@
  -m5-32media  -m5-32media-nofpu @gol
  -m5-compact  -m5-compact-nofpu @gol
  -mb  -ml  -mdalign  -mrelax @gol
@@ -849,10 +849,10 @@
  @opindex fipa-struct-reorg
 -Perform structure reorganization optimization, that change C-like structures 
 -layout in order to better utilize spatial locality.  This transformation is 
--affective for programs containing arrays of structures.  Available in two 
+-effective for programs containing arrays of structures.  Available in two 
 +Perform structure reorganization optimization, that change C-like structures
 +layout in order to better utilize spatial locality.  This transformation is
-+affective for programs containing arrays of structures.  Available in two
++effective for programs containing arrays of structures.  Available in two
  compilation modes: profile-based (enabled with @option{-fprofile-generate})
  or static (which uses built-in heuristics).  Require @option{-fipa-type-escape}
  to provide the safety of this transformation.  It works only in whole program
@@ -1133,7 +1133,23 @@
  @item -mpush-args
  @itemx -mno-push-args
  @opindex mpush-args
-@@ -12003,7 +12081,7 @@
+@@ -11612,6 +11690,15 @@
+ specifies that a GUI application is to be generated by
+ instructing the linker to set the PE header subsystem type
+ appropriately.
++
++@item -mpe-aligned-commons
++@opindex mpe-aligned-commons
++This option is available for Cygwin and MinGW targets.  It
++specifies that the GNU extension to the PE file format that
++permits the correct alignment of COMMON variables should be
++used when generating code.  It will be enabled by default if
++GCC detects that the target assembler found during configuration
++supports the feature.
+ @end table
+ 
+ See also under @ref{i386 and x86-64 Options} for standard options.
+@@ -12068,7 +12155,7 @@
  
  @multitable @columnfractions 0.20 0.80
  @item @strong{Family} @tab @strong{@samp{-mcpu} arguments}
@@ -1142,7 +1158,7 @@
  @item @samp{5206} @tab @samp{5202} @samp{5204} @samp{5206}
  @item @samp{5206e} @tab @samp{5206e}
  @item @samp{5208} @tab @samp{5207} @samp{5208}
-@@ -12012,6 +12090,7 @@
+@@ -12077,6 +12164,7 @@
  @item @samp{5216} @tab @samp{5214} @samp{5216}
  @item @samp{52235} @tab @samp{52230} @samp{52231} @samp{52232} @samp{52233} @samp{52234} @samp{52235}
  @item @samp{5225} @tab @samp{5224} @samp{5225}
@@ -1150,7 +1166,7 @@
  @item @samp{5235} @tab @samp{5232} @samp{5233} @samp{5234} @samp{5235} @samp{523x}
  @item @samp{5249} @tab @samp{5249}
  @item @samp{5250} @tab @samp{5250}
-@@ -12019,6 +12098,7 @@
+@@ -12084,6 +12172,7 @@
  @item @samp{5272} @tab @samp{5272}
  @item @samp{5275} @tab @samp{5274} @samp{5275}
  @item @samp{5282} @tab @samp{5280} @samp{5281} @samp{5282} @samp{528x}
@@ -1158,7 +1174,7 @@
  @item @samp{5307} @tab @samp{5307}
  @item @samp{5329} @tab @samp{5327} @samp{5328} @samp{5329} @samp{532x}
  @item @samp{5373} @tab @samp{5372} @samp{5373} @samp{537x}
-@@ -12518,8 +12598,9 @@
+@@ -12583,8 +12672,9 @@
  @samp{24kec}, @samp{24kef2_1}, @samp{24kef1_1},
  @samp{34kc}, @samp{34kf2_1}, @samp{34kf1_1},
  @samp{74kc}, @samp{74kf2_1}, @samp{74kf1_1}, @samp{74kf3_2},
@@ -1169,7 +1185,7 @@
  @samp{octeon},
  @samp{orion},
  @samp{r2000}, @samp{r3000}, @samp{r3900}, @samp{r4000}, @samp{r4400},
-@@ -12617,11 +12698,14 @@
+@@ -12682,11 +12772,14 @@
  Equivalent to @samp{-march=mips64r2}.
  
  @item -mips16
@@ -1184,7 +1200,7 @@
  
  MIPS16 code generation can also be controlled on a per-function basis
  by means of @code{mips16} and @code{nomips16} attributes.  
-@@ -12637,13 +12721,14 @@
+@@ -12702,13 +12795,14 @@
  @itemx -mno-interlink-mips16
  @opindex minterlink-mips16
  @opindex mno-interlink-mips16
@@ -1203,7 +1219,7 @@
  
  @item -mabi=32
  @itemx -mabi=o64
-@@ -12846,12 +12931,29 @@
+@@ -12911,12 +13005,29 @@
  Use (do not use) the MIPS-3D ASE@.  @xref{MIPS-3D Built-in Functions}.
  The option @option{-mips3d} implies @option{-mpaired-single}.
  
@@ -1233,7 +1249,7 @@
  @item -mlong64
  @opindex mlong64
  Force @code{long} types to be 64 bits wide.  See @option{-mlong32} for
-@@ -13047,6 +13149,16 @@
+@@ -13112,6 +13223,16 @@
  This option has no effect on abicalls code.  The default is
  @option{-mno-long-calls}.
  
@@ -1250,7 +1266,7 @@
  @item -mmad
  @itemx -mno-mad
  @opindex mmad
-@@ -13968,8 +14080,8 @@
+@@ -14033,8 +14154,8 @@
  @itemx -mdouble-float
  @opindex msingle-float
  @opindex mdouble-float
@@ -1261,7 +1277,7 @@
  
  @item -msimple-fpu
  @opindex msimple-fpu
-@@ -13977,7 +14089,7 @@
+@@ -14042,7 +14163,7 @@
  
  @item -mfpu
  @opindex mfpu
@@ -1270,7 +1286,7 @@
  (equivalent to -msingle-float -msimple-fpu), @var{dp_lite} (equivalent
  to -mdouble-float -msimple-fpu), @var{sp_full} (equivalent to -msingle-float),
  and @var{dp_full} (equivalent to -mdouble-float).
-@@ -14613,7 +14725,7 @@
+@@ -14678,7 +14799,7 @@
  
  @item -mel
  @opindex mel
@@ -1279,7 +1295,7 @@
  
  @item -mnhwloop
  @opindex mnhwloop
-@@ -14625,7 +14737,7 @@
+@@ -14690,7 +14811,7 @@
  
  @item -mmac
  @opindex mmac
@@ -1288,7 +1304,7 @@
  
  @item -mscore5
  @opindex mscore5
-@@ -14742,7 +14854,8 @@
+@@ -14807,7 +14928,8 @@
  
  @item -mfmovd
  @opindex mfmovd
@@ -1298,7 +1314,7 @@
  
  @item -mhitachi
  @opindex mhitachi
-@@ -14917,6 +15030,11 @@
+@@ -14982,6 +15104,11 @@
  This option is only meaningful when @option{-mno-pt-fixed} is in effect.
  It will then prevent cross-basic-block cse, hoisting and most scheduling
  of symbol loads.  The default is @option{-mno-invalid-symbols}.
@@ -1310,7 +1326,7 @@
  @end table
  
  @node SPARC Options
-@@ -15278,7 +15396,7 @@
+@@ -15343,7 +15470,7 @@
  @opindex mhint-max-distance
  The encoding of the branch hint instruction limits the hint to be within
  256 instructions of the branch it is effecting.  By default, GCC makes
@@ -1319,22 +1335,6 @@
  
  @item -msafe-hints
  @opindex msafe-hints
-@@ -15554,6 +15672,15 @@
- specifies that a GUI application is to be generated by
- instructing the linker to set the PE header subsystem type
- appropriately.
-+
-+@item -mpe-aligned-commons
-+@opindex mpe-aligned-commons
-+This option is available for Cygwin and MinGW targets.  It
-+specifies that the GNU extension to the PE file format that
-+permits the correct alignment of COMMON variables should be
-+used when generating code.  It will be enabled by default if
-+GCC detects that the target assembler found during configuration
-+supports the feature.
- @end table
- 
- See also under @ref{i386 and x86-64 Options} for standard options.
 @@ -15810,19 +15937,19 @@
  In C code, controls the placement of uninitialized global variables.
  Unix C compilers have traditionally permitted multiple definitions of
diff -Nru gcc-4.4-4.4.5/debian/patches/gdc-4.4-linaro.diff gcc-4.4-4.4.6/debian/patches/gdc-4.4-linaro.diff
--- gcc-4.4-4.4.5/debian/patches/gdc-4.4-linaro.diff	1970-01-01 00:00:00.000000000 +0000
+++ gcc-4.4-4.4.6/debian/patches/gdc-4.4-linaro.diff	2011-05-26 17:13:03.000000000 +0000
@@ -0,0 +1,786 @@
+# DP: Patches the GCC Directory for D.
+
+--- a/src/gcc/cgraph.c	2008-11-16 22:31:58.000000000 +0000
++++ b/src/gcc/cgraph.c	2010-08-26 17:13:05.507131097 +0100
+@@ -451,6 +451,7 @@
+ cgraph_node (tree decl)
+ {
+   struct cgraph_node key, *node, **slot;
++  tree context;
+ 
+   gcc_assert (TREE_CODE (decl) == FUNCTION_DECL);
+ 
+@@ -472,14 +473,18 @@
+   node = cgraph_create_node ();
+   node->decl = decl;
+   *slot = node;
+-  if (DECL_CONTEXT (decl) && TREE_CODE (DECL_CONTEXT (decl)) == FUNCTION_DECL)
++  if (!DECL_NO_STATIC_CHAIN (decl))
+     {
+-      node->origin = cgraph_node (DECL_CONTEXT (decl));
+-      node->origin->ever_was_nested = 1;
+-      node->next_nested = node->origin->nested;
+-      node->origin->nested = node;
+-      node->master_clone = node;
+-      node->ever_was_nested = 1;
++      context = decl_function_context (decl);
++      if (context)
++	{
++	  node->origin = cgraph_node (context);
++	  node->origin->ever_was_nested = 1;
++	  node->next_nested = node->origin->nested;
++	  node->origin->nested = node;
++	  node->master_clone = node;
++	  node->ever_was_nested = 1;
++	}
+     }
+   if (assembler_name_hash)
+     {
+--- a/src/gcc/cgraphunit.c	2010-03-31 14:23:17.000000000 +0100
++++ b/src/gcc/cgraphunit.c	2010-08-26 17:13:05.511130348 +0100
+@@ -1032,6 +1032,10 @@
+ static void
+ cgraph_expand_function (struct cgraph_node *node)
+ {
++  int save_flag_omit_frame_pointer = flag_omit_frame_pointer;
++  static int inited = 0;
++  static int orig_omit_frame_pointer;
++
+   tree decl = node->decl;
+ 
+   /* We ought to not compile any inline clones.  */
+@@ -1041,11 +1045,21 @@
+ 
+   gcc_assert (node->lowered);
+ 
++  if (!inited)
++    {
++      inited = 1;
++      orig_omit_frame_pointer = flag_omit_frame_pointer;
++    }
++  flag_omit_frame_pointer = orig_omit_frame_pointer ||
++      DECL_STRUCT_FUNCTION (decl)->naked;
++
+   /* Generate RTL for the body of DECL.  */
+   if (lang_hooks.callgraph.emit_associated_thunks)
+     lang_hooks.callgraph.emit_associated_thunks (decl);
+   tree_rest_of_compilation (decl);
+ 
++  flag_omit_frame_pointer = save_flag_omit_frame_pointer;
++
+   /* Make sure that BE didn't give up on compiling.  */
+   gcc_assert (TREE_ASM_WRITTEN (decl));
+   current_function_decl = NULL;
+--- a/src/gcc/config/i386/i386.c	2010-04-08 16:09:17.000000000 +0100
++++ b/src/gcc/config/i386/i386.c	2010-08-26 17:13:05.590134523 +0100
+@@ -7876,6 +7876,11 @@
+     frame->red_zone_size = 0;
+   frame->to_allocate -= frame->red_zone_size;
+   frame->stack_pointer_offset -= frame->red_zone_size;
++
++  if (cfun->naked)
++    /* As above, skip return address */
++    frame->stack_pointer_offset = UNITS_PER_WORD;
++
+ #if 0
+   fprintf (stderr, "\n");
+   fprintf (stderr, "size: %ld\n", (long)size);
+@@ -26792,7 +26797,7 @@
+ 	  output_set_got (tmp, NULL_RTX);
+ 
+ 	  xops[1] = tmp;
+-	  output_asm_insn ("mov{l}\t{%0@GOT(%1), %1|%1, %0@GOT[%1]}", xops);
++	  output_asm_insn ("mov{l}\t{%a0@GOT(%1), %1|%1, %a0@GOT[%1]}", xops);
+ 	  output_asm_insn ("jmp\t{*}%1", xops);
+ 	}
+     }
+--- a/src/gcc/config/rs6000/rs6000.c	2010-03-27 18:56:08.000000000 +0000
++++ b/src/gcc/config/rs6000/rs6000.c	2010-08-26 17:13:05.622134818 +0100
+@@ -17630,7 +17630,8 @@
+ 	 C is 0.  Fortran is 1.  Pascal is 2.  Ada is 3.  C++ is 9.
+ 	 Java is 13.  Objective-C is 14.  Objective-C++ isn't assigned
+ 	 a number, so for now use 9.  */
+-      if (! strcmp (language_string, "GNU C"))
++      if (! strcmp (language_string, "GNU C")
++	  || ! strcmp (language_string, "GNU D"))
+ 	i = 0;
+       else if (! strcmp (language_string, "GNU F77")
+ 	       || ! strcmp (language_string, "GNU Fortran"))
+--- a/src/gcc/dwarf2out.c	2010-02-10 15:09:06.000000000 +0000
++++ b/src/gcc/dwarf2out.c	2010-08-26 17:13:05.654133370 +0100
+@@ -6398,7 +6398,8 @@
+ 
+   return (lang == DW_LANG_C || lang == DW_LANG_C89 || lang == DW_LANG_ObjC
+ 	  || lang == DW_LANG_C99
+-	  || lang == DW_LANG_C_plus_plus || lang == DW_LANG_ObjC_plus_plus);
++	  || lang == DW_LANG_C_plus_plus || lang == DW_LANG_ObjC_plus_plus
++	  || lang == DW_LANG_D);
+ }
+ 
+ /* Return TRUE if the language is C++.  */
+@@ -14506,6 +14507,8 @@
+     language = DW_LANG_ObjC;
+   else if (strcmp (language_string, "GNU Objective-C++") == 0)
+     language = DW_LANG_ObjC_plus_plus;
++  else if (strcmp (language_string, "GNU D") == 0)
++    language = DW_LANG_D;
+   else
+     language = DW_LANG_C89;
+ 
+@@ -15688,7 +15691,7 @@
+ 
+       /* For local statics lookup proper context die.  */
+       if (TREE_STATIC (decl) && decl_function_context (decl))
+-	context_die = lookup_decl_die (DECL_CONTEXT (decl));
++	context_die = lookup_decl_die (decl_function_context (decl));
+ 
+       /* If we are in terse mode, don't generate any DIEs to represent any
+ 	 variable declarations or definitions.  */
+--- a/src/gcc/except.c	2010-03-08 11:46:28.000000000 +0000
++++ b/src/gcc/except.c	2010-08-26 17:13:05.662141930 +0100
+@@ -200,7 +200,7 @@
+ 
+ typedef struct eh_region *eh_region;
+ 
+-struct call_site_record GTY(())
++struct call_site_record_d GTY(())
+ {
+   rtx landing_pad;
+   int action;
+@@ -3198,7 +3198,7 @@
+ {
+   call_site_record record;
+   
+-  record = GGC_NEW (struct call_site_record);
++  record = GGC_NEW (struct call_site_record_d);
+   record->landing_pad = landing_pad;
+   record->action = action;
+ 
+@@ -3399,7 +3399,7 @@
+ 
+   for (i = 0; i < n; ++i)
+     {
+-      struct call_site_record *cs = VEC_index (call_site_record, crtl->eh.call_site_record, i);
++      struct call_site_record_d *cs = VEC_index (call_site_record, crtl->eh.call_site_record, i);
+       size += size_of_uleb128 (cs->action);
+     }
+ 
+@@ -3415,7 +3415,7 @@
+ 
+   for (i = 0; i < n; ++i)
+     {
+-      struct call_site_record *cs = VEC_index (call_site_record, crtl->eh.call_site_record, i);
++      struct call_site_record_d *cs = VEC_index (call_site_record, crtl->eh.call_site_record, i);
+       size += size_of_uleb128 (INTVAL (cs->landing_pad));
+       size += size_of_uleb128 (cs->action);
+     }
+@@ -3432,7 +3432,7 @@
+ 
+   for (i = 0; i < n; ++i)
+     {
+-      struct call_site_record *cs = VEC_index (call_site_record, crtl->eh.call_site_record, i);
++      struct call_site_record_d *cs = VEC_index (call_site_record, crtl->eh.call_site_record, i);
+       char reg_start_lab[32];
+       char reg_end_lab[32];
+       char landing_pad_lab[32];
+@@ -3486,7 +3486,7 @@
+ 
+   for (i = 0; i < n; ++i)
+     {
+-      struct call_site_record *cs = VEC_index (call_site_record, crtl->eh.call_site_record, i);
++      struct call_site_record_d *cs = VEC_index (call_site_record, crtl->eh.call_site_record, i);
+ 
+       dw2_asm_output_data_uleb128 (INTVAL (cs->landing_pad),
+ 				   "region %d landing pad", i);
+--- a/src/gcc/expr.c	2010-03-08 11:46:28.000000000 +0000
++++ b/src/gcc/expr.c	2010-08-26 17:13:05.678130275 +0100
+@@ -9321,6 +9321,11 @@
+ 	 represent.  */
+       return const0_rtx;
+ 
++    case STATIC_CHAIN_EXPR:
++    case STATIC_CHAIN_DECL:
++      /* Lowered by tree-nested.c */
++      gcc_unreachable ();
++
+     case EXC_PTR_EXPR:
+       return get_exception_pointer ();
+ 
+--- a/src/gcc/function.c	2009-11-13 19:57:51.000000000 +0000
++++ b/src/gcc/function.c	2010-08-26 17:13:05.690132989 +0100
+@@ -3184,7 +3184,8 @@
+       FUNCTION_ARG_ADVANCE (all.args_so_far, data.promoted_mode,
+ 			    data.passed_type, data.named_arg);
+ 
+-      assign_parm_adjust_stack_rtl (&data);
++      if (!cfun->naked)
++	assign_parm_adjust_stack_rtl (&data);
+ 
+       if (assign_parm_setup_block_p (&data))
+ 	assign_parm_setup_block (&all, parm, &data);
+@@ -3199,7 +3200,8 @@
+ 
+   /* Output all parameter conversion instructions (possibly including calls)
+      now that all parameters have been copied out of hard registers.  */
+-  emit_insn (all.first_conversion_insn);
++  if (!cfun->naked)
++    emit_insn (all.first_conversion_insn);
+ 
+   /* Estimate reload stack alignment from scalar return mode.  */
+   if (SUPPORTS_STACK_ALIGNMENT)
+@@ -3351,6 +3353,9 @@
+   tree fnargs, parm;
+   gimple_seq stmts = NULL;
+ 
++  if (cfun->naked)
++    return NULL;
++
+   assign_parms_initialize_all (&all);
+   fnargs = assign_parms_augmented_arg_list (&all);
+ 
+@@ -4456,11 +4461,15 @@
+       tree parm = cfun->static_chain_decl;
+       rtx local = gen_reg_rtx (Pmode);
+ 
+-      set_decl_incoming_rtl (parm, static_chain_incoming_rtx, false);
+       SET_DECL_RTL (parm, local);
+       mark_reg_pointer (local, TYPE_ALIGN (TREE_TYPE (TREE_TYPE (parm))));
+ 
+-      emit_move_insn (local, static_chain_incoming_rtx);
++      if (!cfun->custom_static_chain)
++	{
++	  set_decl_incoming_rtl (parm, static_chain_incoming_rtx, false);
++	  emit_move_insn (local, static_chain_incoming_rtx);
++	}
++      /* else, the static chain will be set in the main body */
+     }
+ 
+   /* If the function receives a non-local goto, then store the
+@@ -4981,6 +4990,9 @@
+ #endif
+   edge_iterator ei;
+ 
++  if (cfun->naked)
++    return;
++
+   rtl_profile_for_bb (ENTRY_BLOCK_PTR);
+ #ifdef HAVE_prologue
+   if (HAVE_prologue)
+--- a/src/gcc/function.h	2009-09-23 15:58:58.000000000 +0100
++++ b/src/gcc/function.h	2010-08-26 17:13:05.694133708 +0100
+@@ -137,7 +137,7 @@
+   rtx x_forced_labels;
+ };
+ 
+-typedef struct call_site_record *call_site_record;
++typedef struct call_site_record_d *call_site_record;
+ DEF_VEC_P(call_site_record);
+ DEF_VEC_ALLOC_P(call_site_record, gc);
+ 
+@@ -175,12 +175,12 @@
+ struct gimple_df;
+ struct temp_slot;
+ typedef struct temp_slot *temp_slot_p;
+-struct call_site_record;
++struct call_site_record_d;
+ 
+ DEF_VEC_P(temp_slot_p);
+ DEF_VEC_ALLOC_P(temp_slot_p,gc);
+-struct ipa_opt_pass;
+-typedef struct ipa_opt_pass *ipa_opt_pass;
++struct ipa_opt_pass_d;
++typedef struct ipa_opt_pass_d *ipa_opt_pass;
+ 
+ DEF_VEC_P(ipa_opt_pass);
+ DEF_VEC_ALLOC_P(ipa_opt_pass,heap);
+@@ -600,6 +600,14 @@
+      adjusts one of its arguments and forwards to another
+      function.  */
+   unsigned int is_thunk : 1;
++
++  /* Nonzero if static chain is initialized by something other than
++     static_chain_incoming_rtx. */
++  unsigned int custom_static_chain : 1;
++
++  /* Nonzero if no code should be generated for prologues, copying
++     parameters, etc. */
++  unsigned int naked : 1;
+ };
+ 
+ /* If va_list_[gf]pr_size is set to this, it means we don't know how
+--- a/src/gcc/gcc.c	2010-01-09 00:05:06.000000000 +0000
++++ b/src/gcc/gcc.c	2010-08-26 17:13:39.034133274 +0100
+@@ -126,6 +126,9 @@
+ /* Flag set to nonzero if an @file argument has been supplied to gcc.  */
+ static bool at_file_supplied;
+ 
++/* Flag set by drivers needing Pthreads. */
++int need_pthreads;
++
+ /* Flag saying to pass the greatest exit code returned by a sub-process
+    to the calling program.  */
+ static int pass_exit_codes;
+@@ -373,6 +376,9 @@
+ static const char *version_compare_spec_function (int, const char **);
+ static const char *include_spec_function (int, const char **);
+ static const char *print_asm_header_spec_function (int, const char **);
++
++extern const char *d_all_sources_spec_function (int, const char **);
++extern const char *d_output_prefix_spec_function (int, const char **);
+ 
+ /* The Specs Language
+ 
+@@ -480,6 +486,7 @@
+ 	assembler has done its job.
+  %D	Dump out a -L option for each directory in startfile_prefixes.
+ 	If multilib_dir is set, extra entries are generated with it affixed.
++ %N     Output the currently selected multilib directory name
+  %l     process LINK_SPEC as a spec.
+  %L     process LIB_SPEC as a spec.
+  %G     process LIBGCC_SPEC as a spec.
+@@ -925,6 +932,8 @@
+ #endif
+ #endif
+ 
++#define GCC_SPEC_FORMAT_4 1
++
+ /* Record the mapping from file suffixes for compilation specs.  */
+ 
+ struct compiler
+@@ -1647,6 +1656,10 @@
+   { "version-compare",		version_compare_spec_function },
+   { "include",			include_spec_function },
+   { "print-asm-header",		print_asm_header_spec_function },
++#ifdef D_USE_EXTRA_SPEC_FUNCTIONS
++  { "d-all-sources",		d_all_sources_spec_function },
++  { "d-output-prefix",		d_output_prefix_spec_function },
++#endif
+ #ifdef EXTRA_SPEC_FUNCTIONS
+   EXTRA_SPEC_FUNCTIONS
+ #endif
+@@ -4022,6 +4035,9 @@
+ 	}
+     }
+ 
++  if (need_pthreads)
++      n_switches++;
++
+   if (save_temps_flag && use_pipes)
+     {
+       /* -save-temps overrides -pipe, so that temp files are produced */
+@@ -4332,6 +4348,18 @@
+       infiles[0].name   = "help-dummy";
+     }
+ 
++  if (need_pthreads)
++    {
++      switches[n_switches].part1 = "pthread";
++      switches[n_switches].args = 0;
++      switches[n_switches].live_cond = 0;
++      /* Do not print an error if there is not expansion for -pthread. */
++      switches[n_switches].validated = 1;
++      switches[n_switches].ordering = 0;
++
++      n_switches++;
++    }
++
+   switches[n_switches].part1 = 0;
+   infiles[n_infiles].name = 0;
+ }
+@@ -5337,6 +5365,17 @@
+ 	      return value;
+ 	    break;
+ 
++	  case 'N':
++	    if (multilib_dir)
++	      {
++		arg_going = 1;
++		obstack_grow (&obstack, "-fmultilib-dir=",
++			      strlen ("-fmultilib-dir="));
++		obstack_grow (&obstack, multilib_dir,
++			      strlen (multilib_dir));
++	      }
++	    break;
++
+ 	    /* Here we define characters other than letters and digits.  */
+ 
+ 	  case '{':
+--- a/src/gcc/gimple.c	2008-12-07 23:27:14.000000000 +0000
++++ b/src/gcc/gimple.c	2010-08-26 17:13:05.714129477 +0100
+@@ -2535,6 +2535,9 @@
+       || (SYM) == POLYNOMIAL_CHREC					    \
+       || (SYM) == DOT_PROD_EXPR						    \
+       || (SYM) == VEC_COND_EXPR						    \
++      || (SYM) == STATIC_CHAIN_DECL					    \
++      || (SYM) == STATIC_CHAIN_EXPR /* not sure if this is right...*/	    \
++      || (SYM) == VEC_COND_EXPR						    \
+       || (SYM) == REALIGN_LOAD_EXPR) ? GIMPLE_SINGLE_RHS		    \
+    : GIMPLE_INVALID_RHS),
+ #define END_OF_BASE_TREE_CODES (unsigned char) GIMPLE_INVALID_RHS,
+@@ -2615,7 +2618,10 @@
+ 	  || TREE_CODE (t) == WITH_SIZE_EXPR
+ 	  /* These are complex lvalues, but don't have addresses, so they
+ 	     go here.  */
+-	  || TREE_CODE (t) == BIT_FIELD_REF);
++	  || TREE_CODE (t) == BIT_FIELD_REF
++	  /* This is an lvalue because it will be replaced with the real
++	     static chain decl. */
++	  || TREE_CODE (t) == STATIC_CHAIN_DECL);
+ }
+ 
+ /*  Return true if T is a GIMPLE condition.  */
+@@ -2851,6 +2857,7 @@
+   return (TREE_CODE (t) == VAR_DECL
+ 	  || TREE_CODE (t) == PARM_DECL
+ 	  || TREE_CODE (t) == RESULT_DECL
++	  || TREE_CODE (t) == STATIC_CHAIN_DECL
+ 	  || TREE_CODE (t) == SSA_NAME);
+ }
+ 
+--- a/src/gcc/gimple.h	2009-05-18 11:13:43.000000000 +0100
++++ b/src/gcc/gimple.h	2010-08-26 17:13:05.722133148 +0100
+@@ -65,7 +65,7 @@
+     const_gimple __gs = (GS);						\
+     if (gimple_code (__gs) != (CODE))					\
+       gimple_check_failed (__gs, __FILE__, __LINE__, __FUNCTION__,	\
+-	  		   (CODE), 0);					\
++	  		   (CODE), ERROR_MARK);				\
+   } while (0)
+ #else  /* not ENABLE_GIMPLE_CHECKING  */
+ #define GIMPLE_CHECK(GS, CODE)			(void)0
+@@ -2216,7 +2216,7 @@
+ gimple_cond_code (const_gimple gs)
+ {
+   GIMPLE_CHECK (gs, GIMPLE_COND);
+-  return gs->gsbase.subcode;
++  return (enum tree_code) gs->gsbase.subcode;
+ }
+ 
+ 
+--- a/src/gcc/gimplify.c	2010-04-08 12:47:13.000000000 +0100
++++ b/src/gcc/gimplify.c	2010-08-26 17:13:05.734134534 +0100
+@@ -6447,6 +6447,12 @@
+ 	    }
+ 	  break;
+ 
++	case STATIC_CHAIN_EXPR:
++	  /* The argument is used as information only.  No need to gimplify */
++	case STATIC_CHAIN_DECL:
++	  ret = GS_ALL_DONE;
++	  break;
++
+ 	case TREE_LIST:
+ 	  gcc_unreachable ();
+ 
+--- a/src/gcc/ipa-cp.c	2009-12-27 22:39:58.000000000 +0000
++++ b/src/gcc/ipa-cp.c	2010-08-26 17:13:05.738152434 +0100
+@@ -1393,7 +1393,7 @@
+   return flag_ipa_cp;
+ }
+ 
+-struct ipa_opt_pass pass_ipa_cp = 
++struct ipa_opt_pass_d pass_ipa_cp = 
+ {
+  {
+   IPA_PASS,
+--- a/src/gcc/ipa-inline.c	2010-02-08 14:10:15.000000000 +0000
++++ b/src/gcc/ipa-inline.c	2010-08-26 17:13:05.742147425 +0100
+@@ -1753,7 +1753,7 @@
+   return todo | execute_fixup_cfg ();
+ }
+ 
+-struct ipa_opt_pass pass_ipa_inline = 
++struct ipa_opt_pass_d pass_ipa_inline = 
+ {
+  {
+   IPA_PASS,
+--- a/src/gcc/ipa-pure-const.c	2008-09-18 18:28:40.000000000 +0100
++++ b/src/gcc/ipa-pure-const.c	2010-08-26 17:13:05.746146816 +0100
+@@ -910,7 +910,7 @@
+ 	  && !(errorcount || sorrycount));
+ }
+ 
+-struct ipa_opt_pass pass_ipa_pure_const =
++struct ipa_opt_pass_d pass_ipa_pure_const =
+ {
+  {
+   IPA_PASS,
+--- a/src/gcc/ipa-reference.c	2008-09-18 18:28:40.000000000 +0100
++++ b/src/gcc/ipa-reference.c	2010-08-26 17:13:05.746146816 +0100
+@@ -1257,7 +1257,7 @@
+ 	  && !(errorcount || sorrycount));
+ }
+ 
+-struct ipa_opt_pass pass_ipa_reference =
++struct ipa_opt_pass_d pass_ipa_reference =
+ {
+  {
+   IPA_PASS,
+--- a/src/gcc/passes.c	2009-02-20 15:20:38.000000000 +0000
++++ b/src/gcc/passes.c	2010-08-26 17:13:05.750140201 +0100
+@@ -1146,14 +1146,14 @@
+ static void
+ add_ipa_transform_pass (void *data)
+ {
+-  struct ipa_opt_pass *ipa_pass = (struct ipa_opt_pass *) data;
++  struct ipa_opt_pass_d *ipa_pass = (struct ipa_opt_pass_d *) data;
+   VEC_safe_push (ipa_opt_pass, heap, cfun->ipa_transforms_to_apply, ipa_pass);
+ }
+ 
+ /* Execute summary generation for all of the passes in IPA_PASS.  */
+ 
+ static void
+-execute_ipa_summary_passes (struct ipa_opt_pass *ipa_pass)
++execute_ipa_summary_passes (struct ipa_opt_pass_d *ipa_pass)
+ {
+   while (ipa_pass)
+     {
+@@ -1167,7 +1167,7 @@
+ 	  ipa_pass->generate_summary ();
+ 	  pass_fini_dump_file (pass);
+ 	}
+-      ipa_pass = (struct ipa_opt_pass *)ipa_pass->pass.next;
++      ipa_pass = (struct ipa_opt_pass_d *)ipa_pass->pass.next;
+     }
+ }
+ 
+@@ -1175,7 +1175,7 @@
+ 
+ static void
+ execute_one_ipa_transform_pass (struct cgraph_node *node,
+-				struct ipa_opt_pass *ipa_pass)
++				struct ipa_opt_pass_d *ipa_pass)
+ {
+   struct opt_pass *pass = &ipa_pass->pass;
+   unsigned int todo_after = 0;
+@@ -1347,7 +1347,7 @@
+ 	    {
+ 	      if (!quiet_flag && !cfun)
+ 		fprintf (stderr, " <summary generate>");
+-	      execute_ipa_summary_passes ((struct ipa_opt_pass *) pass);
++	      execute_ipa_summary_passes ((struct ipa_opt_pass_d *) pass);
+ 	    }
+ 	  summaries_generated = true;
+ 	}
+--- a/src/gcc/system.h	2008-07-28 15:33:56.000000000 +0100
++++ b/src/gcc/system.h	2010-08-26 17:13:05.754132398 +0100
+@@ -786,6 +786,9 @@
+    change after the fact).  Beyond these uses, most other cases of
+    using this macro should be viewed with extreme caution.  */
+ 
++#ifdef __cplusplus
++#define CONST_CAST2(TOTYPE,FROMTYPE,X) (const_cast<TOTYPE> (X))
++#else
+ #if defined(__GNUC__) && GCC_VERSION > 4000
+ /* GCC 4.0.x has a bug where it may ICE on this expression,
+    so does GCC 3.4.x (PR17436).  */
+@@ -793,6 +796,7 @@
+ #else
+ #define CONST_CAST2(TOTYPE,FROMTYPE,X) ((TOTYPE)(FROMTYPE)(X))
+ #endif
++#endif
+ #define CONST_CAST(TYPE,X) CONST_CAST2(TYPE, const TYPE, (X))
+ #define CONST_CAST_TREE(X) CONST_CAST(union tree_node *, (X))
+ #define CONST_CAST_RTX(X) CONST_CAST(struct rtx_def *, (X))
+--- a/src/gcc/tree.def	2009-02-20 15:20:38.000000000 +0000
++++ b/src/gcc/tree.def	2010-08-26 17:13:05.758136609 +0100
+@@ -554,6 +554,13 @@
+    arguments to the call.  */
+ DEFTREECODE (CALL_EXPR, "call_expr", tcc_vl_exp, 3)
+ 
++/* Operand 0 is the FUNC_DECL of the outer function for
++   which the static chain is to be computed. */
++DEFTREECODE (STATIC_CHAIN_EXPR, "static_chain_expr", tcc_expression, 1)
++    
++/* Represents a function's static chain.  It can be used as an lvalue. */
++DEFTREECODE (STATIC_CHAIN_DECL, "static_chain_decl", tcc_expression, 0)
++
+ /* Specify a value to compute along with its corresponding cleanup.
+    Operand 0 is the cleanup expression.
+    The cleanup is executed by the first enclosing CLEANUP_POINT_EXPR,
+--- a/src/gcc/tree-dump.c	2008-08-06 16:57:09.000000000 +0100
++++ b/src/gcc/tree-dump.c	2010-08-26 17:13:05.770134642 +0100
+@@ -639,6 +639,10 @@
+       }
+       break;
+ 
++    case STATIC_CHAIN_EXPR:
++      dump_child ("func", TREE_OPERAND (t, 0));
++      break;
++
+     case CONSTRUCTOR:
+       {
+ 	unsigned HOST_WIDE_INT cnt;
+--- a/src/gcc/tree-nested.c	2010-04-20 09:37:12.000000000 +0100
++++ b/src/gcc/tree-nested.c	2010-08-26 17:13:05.774146186 +0100
+@@ -714,6 +714,8 @@
+ 
+   if (info->context == target_context)
+     {
++      /* might be doing something wrong to need the following line.. */
++      get_frame_type (info);
+       x = build_addr (info->frame_decl, target_context);
+     }
+   else
+@@ -1761,6 +1763,10 @@
+       if (DECL_NO_STATIC_CHAIN (decl))
+ 	break;
+ 
++      /* Don't use a trampoline for a static reference. */
++      if (TREE_STATIC (t))
++	break;
++
+       /* If we don't want a trampoline, then don't build one.  */
+       if (TREE_NO_TRAMPOLINE (t))
+ 	break;
+@@ -1908,6 +1914,25 @@
+       walk_body (convert_gimple_call, NULL, info, gimple_omp_body (stmt));
+       break;
+ 
++    case GIMPLE_ASSIGN:
++      /* Deal with static_chain_decl */
++      decl = gimple_op(stmt, 0);
++      if (TREE_CODE (decl) == STATIC_CHAIN_DECL)
++	{
++	  tree chain = get_chain_decl (info);
++	  gimple_assign_set_lhs (stmt, chain);
++	  break;
++	}
++      /* Deal with static_chain_expr */
++      decl = gimple_op(stmt, 1);
++      if (TREE_CODE (decl) == STATIC_CHAIN_EXPR)
++	{
++	  tree chain = get_static_chain (info, TREE_OPERAND (decl, 0), &wi->gsi);
++	  gimple_assign_set_rhs1 (stmt, chain);
++	  break;
++	}
++      /* FALLTHRU */
++
+     default:
+       /* Keep looking for other operands.  */
+       *handled_ops_p = false;
+@@ -2054,8 +2079,38 @@
+       gimple bind;
+       annotate_all_with_location (stmt_list, DECL_SOURCE_LOCATION (context));
+       bind = gimple_seq_first_stmt (gimple_body (context));
+-      gimple_seq_add_seq (&stmt_list, gimple_bind_body (bind));
+-      gimple_bind_set_body (bind, stmt_list);
++
++      if (DECL_STRUCT_FUNCTION (root->context)->custom_static_chain)
++	{
++	  /* This chicanery is needed to make sure the GIMPLE initialization
++	     statements are in the right order
++
++	     CHAIN.3 = D.1614;
++	     FRAME.0.__chain = CHAIN.3;
++	     FRAME.0.m = m;
++	   */
++	  gimple_stmt_iterator gsi =
++	      gsi_start (gimple_bind_body (bind));
++	  int found = 0;
++	  while (!gsi_end_p (gsi))
++	    {
++	      gimple g = gsi_stmt (gsi);
++	      if (gimple_code (g) == GIMPLE_ASSIGN &&
++		  gimple_op (g, 0) == root->chain_decl)
++		{
++		  gsi_insert_seq_after (& gsi, stmt_list, GSI_SAME_STMT);
++		  found = 1;
++		  break;
++		}
++	      gsi_next (& gsi);
++	    }
++	  gcc_assert (found);
++	}
++      else
++	{
++	  gimple_seq_add_seq (&stmt_list, gimple_bind_body (bind));
++	  gimple_bind_set_body (bind, stmt_list);
++	}
+     }
+ 
+   /* If a chain_decl was created, then it needs to be registered with
+--- a/src/gcc/tree-pass.h	2009-02-20 15:20:38.000000000 +0000
++++ b/src/gcc/tree-pass.h	2010-08-26 17:13:05.774146186 +0100
+@@ -157,7 +157,7 @@
+ 
+ /* Description of IPA pass with generate summary, write, execute, read and
+    transform stages.  */
+-struct ipa_opt_pass
++struct ipa_opt_pass_d
+ {
+   struct opt_pass pass;
+ 
+@@ -390,10 +390,10 @@
+ extern struct gimple_opt_pass pass_reset_cc_flags;
+ 
+ /* IPA Passes */
+-extern struct ipa_opt_pass pass_ipa_inline;
+-extern struct ipa_opt_pass pass_ipa_cp;
+-extern struct ipa_opt_pass pass_ipa_reference;
+-extern struct ipa_opt_pass pass_ipa_pure_const;
++extern struct ipa_opt_pass_d pass_ipa_inline;
++extern struct ipa_opt_pass_d pass_ipa_cp;
++extern struct ipa_opt_pass_d pass_ipa_reference;
++extern struct ipa_opt_pass_d pass_ipa_pure_const;
+ 
+ extern struct simple_ipa_opt_pass pass_ipa_matrix_reorg;
+ extern struct simple_ipa_opt_pass pass_ipa_early_inline;
+--- a/src/gcc/tree-pretty-print.c	2009-02-18 21:03:05.000000000 +0000
++++ b/src/gcc/tree-pretty-print.c	2010-08-26 17:13:05.778131469 +0100
+@@ -1216,6 +1216,16 @@
+ 	pp_string (buffer, " [tail call]");
+       break;
+ 
++    case STATIC_CHAIN_EXPR:
++      pp_string (buffer, "<<static chain of ");
++      dump_generic_node (buffer, TREE_OPERAND (node, 0), spc, flags, false);
++      pp_string (buffer, ">>");
++      break;
++
++    case STATIC_CHAIN_DECL:
++      pp_string (buffer, "<<static chain decl>>");
++      break;
++
+     case WITH_CLEANUP_EXPR:
+       NIY;
+       break;
+--- a/src/gcc/tree-sra.c	2010-04-18 16:56:32.000000000 +0100
++++ b/src/gcc/tree-sra.c	2010-08-26 17:13:05.786133185 +0100
+@@ -263,6 +263,8 @@
+     case RECORD_TYPE:
+       {
+ 	bool saw_one_field = false;
++	tree last_offset = size_zero_node;
++	tree cmp;
+ 
+ 	for (t = TYPE_FIELDS (type); t ; t = TREE_CHAIN (t))
+ 	  if (TREE_CODE (t) == FIELD_DECL)
+@@ -274,6 +276,12 @@
+ 		      != TYPE_PRECISION (TREE_TYPE (t))))
+ 		goto fail;
+ 
++	      /* Reject aliased fields created by GDC for anonymous unions. */
++	      cmp = fold_binary_to_constant (LE_EXPR, boolean_type_node,
++					     DECL_FIELD_OFFSET (t), last_offset);
++	      if (cmp == NULL_TREE || tree_expr_nonzero_p (cmp))
++		goto fail;
++
+ 	      saw_one_field = true;
+ 	    }
+ 
+--- a/src/gcc/tree-ssa.c	2009-08-03 20:27:32.000000000 +0100
++++ b/src/gcc/tree-ssa.c	2010-08-26 17:13:05.790130062 +0100
+@@ -1094,8 +1094,10 @@
+       && TYPE_CANONICAL (inner_type) == TYPE_CANONICAL (outer_type))
+     return true;
+ 
+-  /* Changes in machine mode are never useless conversions.  */
+-  if (TYPE_MODE (inner_type) != TYPE_MODE (outer_type))
++  /* Changes in machine mode are never useless conversions unless we
++     deal with aggregate types in which case we defer to later checks.  */
++  if (TYPE_MODE (inner_type) != TYPE_MODE (outer_type)
++      && !AGGREGATE_TYPE_P (inner_type))
+     return false;
+ 
+   /* If both the inner and outer types are integral types, then the
diff -Nru gcc-4.4-4.4.5/debian/patches/gdc-multiarch-incdir.diff gcc-4.4-4.4.6/debian/patches/gdc-multiarch-incdir.diff
--- gcc-4.4-4.4.5/debian/patches/gdc-multiarch-incdir.diff	1970-01-01 00:00:00.000000000 +0000
+++ gcc-4.4-4.4.6/debian/patches/gdc-multiarch-incdir.diff	2011-05-26 17:13:03.000000000 +0000
@@ -0,0 +1,13 @@
+# DP: Fix D system include dir for multiarch locations
+
+--- a/src/gcc/d/Make-lang.in
++++ b/src/gcc/d/Make-lang.in
+@@ -73,7 +73,7 @@
+ D_EXTRA_DEFINES += -DLIBPHOBOS=\"-lgphobos$(D_ver_suffix)\" -DLIBPHOBOS_PROFILE=\"-lgphobos$(D_ver_suffix)\"
+ 
+ # This should be configured
+-gcc_d_include_dir = $(libsubdir)/$(unlibsubdir)/..`echo $(exec_prefix) | sed -e 's|^$(prefix)||' -e 's|/[^/]*|/..|g'`/include/$(D_incl_subdir)/$(version)
++gcc_d_include_dir = $(libsubdir)/$(unlibsubdir)/../..`echo $(exec_prefix) | sed -e 's|^$(prefix)||' -e 's|/[^/]*|/..|g'`/include/$(D_incl_subdir)/$(version)
+ 
+ ifeq ($(D_LANGUAGE_VERSION),2)
+ D_DMD_H := d/dmd/aggregate.h d/dmd/arraytypes.h d/dmd/attrib.h \
diff -Nru gcc-4.4-4.4.5/debian/patches/libjava-jnipath.diff gcc-4.4-4.4.6/debian/patches/libjava-jnipath.diff
--- gcc-4.4-4.4.5/debian/patches/libjava-jnipath.diff	2011-05-26 17:12:59.000000000 +0000
+++ gcc-4.4-4.4.6/debian/patches/libjava-jnipath.diff	2011-05-26 17:13:03.000000000 +0000
@@ -55,7 +55,7 @@
 +  const char* jnilibdir = "/usr/lib/jni";
 +#ifdef MULTIARCH_DIR
 +  const char* jnilibdir2 = "/usr/lib/" MULTIARCH_DIR "/jni";
-+  jsize len2 = strlen (jnilibdir) + 2;
++  jsize len2 = strlen (jnilibdir2) + 2;
 +#else
 +  jsize len2 = 0;
 +#endif
diff -Nru gcc-4.4-4.4.5/debian/patches/svn-updates.diff gcc-4.4-4.4.6/debian/patches/svn-updates.diff
--- gcc-4.4-4.4.5/debian/patches/svn-updates.diff	2011-05-26 17:12:59.000000000 +0000
+++ gcc-4.4-4.4.6/debian/patches/svn-updates.diff	2011-05-26 17:13:03.000000000 +0000
@@ -1,7121 +1,1681 @@
-# DP: updates from the 4.4 branch upto 20110313 (r170923).
+# DP: updates from the 4.4 branch upto 20110523 (r174066).
 
 last_updated()
 {
 	cat > ${dir}LAST_UPDATED <<EOF
-Sun Mar 13 19:10:06 CET 2011
-Sun Mar 13 18:10:06 UTC 2011 (revision 170923)
+Mon May 23 15:29:19 CEST 2011
+Mon May 23 13:29:19 UTC 2011 (revision 174066)
 EOF
 }
 
-svn diff svn://gcc.gnu.org/svn/gcc/tags/gcc_4_4_5_release svn://gcc.gnu.org/svn/gcc/branches/gcc-4_4-branch \
+svn diff svn://gcc.gnu.org/svn/gcc/tags/gcc_4_4_6_release svn://gcc.gnu.org/svn/gcc/branches/gcc-4_4-branch \
 	| sed -r 's,^--- (\S+)\t(\S+)(.*)$,--- a/src/\1\t\2,;s,^\+\+\+ (\S+)\t(\S+)(.*)$,+++ b/src/\1\t\2,' \
 	| awk '/^Index:.*\.(class|texi)/ {skip=1; next} /^Index:/ { skip=0 } skip==0'
 
-Index: configure
+Index: libgomp/fortran.c
 ===================================================================
---- a/src/configure	(.../tags/gcc_4_4_5_release)
-+++ b/src/configure	(.../branches/gcc-4_4-branch)
-@@ -2078,7 +2078,7 @@
-     # Check for target supported by gold.
-     case "${target}" in
-       i?86-*-* | x86_64-*-* | sparc*-*-* | powerpc*-*-*)
--        configdirs="`echo " ${configdirs} " | sed -e 's/ ld / gold /'`"
-+        configdirs=`echo " ${configdirs} " | sed -e 's/ ld / gold /'`
-         ;;
-     esac
-   fi
-Index: libgomp/configure.tgt
-===================================================================
---- a/src/libgomp/configure.tgt	(.../tags/gcc_4_4_5_release)
-+++ b/src/libgomp/configure.tgt	(.../branches/gcc-4_4-branch)
-@@ -115,6 +115,10 @@
- 	config_path="bsd posix"
- 	;;
- 
-+  mips-sgi-irix6*)
-+	# Need to link with -lpthread so libgomp.so is self-contained.
-+	XLDFLAGS="${XLDFLAGS} -lpthread"
-+	;;
-   *)
- 	;;
+--- a/src/libgomp/fortran.c	(.../tags/gcc_4_4_6_release)
++++ b/src/libgomp/fortran.c	(.../branches/gcc-4_4-branch)
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2005, 2007, 2008, 2009 Free Software Foundation, Inc.
++/* Copyright (C) 2005, 2007, 2008, 2009, 2011 Free Software Foundation, Inc.
+    Contributed by Jakub Jelinek <jakub@redhat.com>.
  
-Index: libgomp/ChangeLog
-===================================================================
---- a/src/libgomp/ChangeLog	(.../tags/gcc_4_4_5_release)
-+++ b/src/libgomp/ChangeLog	(.../branches/gcc-4_4-branch)
-@@ -1,3 +1,49 @@
-+2011-02-27  H.J. Lu  <hongjiu.lu@intel.com>
-+
-+	* testsuite/libgomp.fortran/task3.f90: Remove duplicated code.
-+
-+2011-02-27  Tobias Burnus  <burnus@net-b.de>
-+
-+	Backport from mainline
-+	2011-02-27  Jakub Jelinek  <jakub@redhat.com>
-+
-+	PR fortran/47886
-+	* testsuite/libgomp.fortran/task3.f90: New test.
-+
-+2011-01-16  Jakub Jelinek  <jakub@redhat.com>
-+
-+	Backport from mainline
-+	2010-12-14  Jakub Jelinek  <jakub@redhat.com>
-+
-+	PR fortran/46874
-+	* libgomp.fortran/allocatable6.f90: New test.
-+
-+2010-12-10  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-+
-+	Backport from mainline:
-+	2010-12-01  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-+
-+	* configure.tgt (mips-sgi-irix6*): Add -lpthread to XLDFLAGS.
-+
-+2010-12-07  Jakub Jelinek  <jakub@redhat.com>
-+
-+	Backport from mainline
-+	2010-12-02  Jakub Jelinek  <jakub@redhat.com>
-+
-+	PR fortran/46753
-+	* libgomp.fortran/pr46753.f90: New test.
-+
-+	PR libgomp/45240
-+	* parallel.c (GOMP_parallel_end): Unlock gomp_remaining_threads_lock
-+	at the end if sync builtins aren't supported.
-+
-+2010-12-03  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-+
-+	Backport from mainline:
-+	2010-12-01  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-+
-+	* testsuite/libgomp.fortran/vla8.f90: Use dg-timeout-factor 2.0.
+    This file is part of the GNU OpenMP Library (libgomp).
+@@ -27,6 +27,7 @@
+ #include "libgomp.h"
+ #include "libgomp_f.h"
+ #include <stdlib.h>
++#include <limits.h>
+ 
+ #ifdef HAVE_ATTRIBUTE_ALIAS
+ /* Use internal aliases if possible.  */
+@@ -244,6 +245,8 @@
+ omp_lock_symver (omp_test_nest_lock_)
+ #endif
+ 
++#define TO_INT(x) ((x) > INT_MIN ? (x) < INT_MAX ? (x) : INT_MAX : INT_MIN)
 +
- 2010-10-01  Release Manager
+ void
+ omp_set_dynamic_ (const int32_t *set)
+ {
+@@ -253,7 +256,7 @@
+ void
+ omp_set_dynamic_8_ (const int64_t *set)
+ {
+-  omp_set_dynamic (*set);
++  omp_set_dynamic (!!*set);
+ }
  
- 	* GCC 4.4.5 released.
-Index: libgomp/testsuite/libgomp.fortran/allocatable6.f90
+ void
+@@ -265,7 +268,7 @@
+ void
+ omp_set_nested_8_ (const int64_t *set)
+ {
+-  omp_set_nested (*set);
++  omp_set_nested (!!*set);
+ }
+ 
+ void
+@@ -277,7 +280,7 @@
+ void
+ omp_set_num_threads_8_ (const int64_t *set)
+ {
+-  omp_set_num_threads (*set);
++  omp_set_num_threads (TO_INT (*set));
+ }
+ 
+ int32_t
+@@ -343,7 +346,7 @@
+ void
+ omp_set_schedule_8_ (const int32_t *kind, const int64_t *modifier)
+ {
+-  omp_set_schedule (*kind, *modifier);
++  omp_set_schedule (*kind, TO_INT (*modifier));
+ }
+ 
+ void
+@@ -381,7 +384,7 @@
+ void
+ omp_set_max_active_levels_8_ (const int64_t *levels)
+ {
+-  omp_set_max_active_levels (*levels);
++  omp_set_max_active_levels (TO_INT (*levels));
+ }
+ 
+ int32_t
+@@ -405,7 +408,7 @@
+ int32_t
+ omp_get_ancestor_thread_num_8_ (const int64_t *level)
+ {
+-  return omp_get_ancestor_thread_num (*level);
++  return omp_get_ancestor_thread_num (TO_INT (*level));
+ }
+ 
+ int32_t
+@@ -417,7 +420,7 @@
+ int32_t
+ omp_get_team_size_8_ (const int64_t *level)
+ {
+-  return omp_get_team_size (*level);
++  return omp_get_team_size (TO_INT (*level));
+ }
+ 
+ int32_t
+Index: libgomp/ChangeLog
 ===================================================================
---- a/src/libgomp/testsuite/libgomp.fortran/allocatable6.f90	(.../tags/gcc_4_4_5_release)
-+++ b/src/libgomp/testsuite/libgomp.fortran/allocatable6.f90	(.../branches/gcc-4_4-branch)
-@@ -0,0 +1,45 @@
-+! PR fortran/46874
-+! { dg-do run }
-+
-+  interface
-+    subroutine sub (a, b, c, d, n)
-+      integer :: n
-+      integer, allocatable :: a(:), b(:), c(:), d(:)
-+    end subroutine
-+  end interface
-+
-+  integer, allocatable :: a(:), b(:), c(:), d(:)
-+  integer :: i, j
-+  allocate (a(50), b(50), c(50), d(50))
-+  do i = 1, 50
-+    a(i) = 2 + modulo (i, 7)
-+    b(i) = 179 - modulo (i, 11)
-+  end do
-+  c = 0
-+  d = 2147483647
-+  call sub (a, b, c, d, 50)
-+  do i = 1, 50
-+    j = 0
-+    if (i .eq. 3) then
-+      j = 8
-+    else if (i .gt. 1 .and. i .lt. 9) then
-+      j = 7
-+    end if
-+    if (c(i) .ne. j) call abort
-+    j = 179 - modulo (i, 11)
-+    if (i .gt. 1 .and. i .lt. 9) j = i
-+    if (d(i) .ne. j) call abort
-+  end do
-+  deallocate (a, b, c, d)
-+end
+--- a/src/libgomp/ChangeLog	(.../tags/gcc_4_4_6_release)
++++ b/src/libgomp/ChangeLog	(.../branches/gcc-4_4-branch)
+@@ -1,3 +1,15 @@
++2011-05-06  Jakub Jelinek  <jakub@redhat.com>
 +
-+subroutine sub (a, b, c, d, n)
-+  integer :: n
-+  integer, allocatable :: a(:), b(:), c(:), d(:)
-+!$omp parallel do shared(a, b) reduction(+:c) reduction(min:d)
-+  do i = 1, n
-+    c(a(i)) = c(a(i)) + 1
-+    d(i) = min(d(i), b(i))
-+    d(a(i)) = min(d(a(i)), a(i))
-+  end do
-+end
-Index: libgomp/testsuite/libgomp.fortran/pr46753.f90
-===================================================================
---- a/src/libgomp/testsuite/libgomp.fortran/pr46753.f90	(.../tags/gcc_4_4_5_release)
-+++ b/src/libgomp/testsuite/libgomp.fortran/pr46753.f90	(.../branches/gcc-4_4-branch)
-@@ -0,0 +1,17 @@
-+! PR fortran/46753
++	PR fortran/48894
++	* fortran.c: Include limits.h.
++	(TO_INT): Define.
++	(omp_set_dynamic_8_, omp_set_num_threads_8_): Use !!*set instead of
++	*set.
++	(omp_set_num_threads_8_, omp_set_schedule_8_,
++	omp_set_max_active_levels_8_, omp_get_ancestor_thread_num_8_,
++	omp_get_team_size_8_): Use TO_INT macro.
++	* testsuite/libgomp.fortran/pr48894.f90: New test.
++
+ 2011-04-16  Release Manager
+ 
+ 	* GCC 4.4.6 released.
+Index: libgomp/testsuite/libgomp.fortran/pr48894.f90
+===================================================================
+--- a/src/libgomp/testsuite/libgomp.fortran/pr48894.f90	(.../tags/gcc_4_4_6_release)
++++ b/src/libgomp/testsuite/libgomp.fortran/pr48894.f90	(.../branches/gcc-4_4-branch)
+@@ -0,0 +1,23 @@
++! PR fortran/48894
 +! { dg-do run }
++! { dg-options "-fdefault-integer-8" }
 +
-+  integer :: i, j
-+  j = 0
-+!$omp parallel do reduction(+:j)
-+  do i = 2147483636, 2147483646
-+    j = j + 1
-+  end do
-+  if (j.ne.11) call abort
-+  j = 0
-+!$omp parallel do reduction(+:j)
-+  do i = -2147483637, -2147483647, -1
-+    j = j + 1
-+  end do
-+  if (j.ne.11) call abort
++  use omp_lib
++  integer, parameter :: zero = 0
++  integer :: err
++  logical :: l
++  err = 0
++  !$omp parallel
++    !$omp parallel private (l)
++      l = omp_get_ancestor_thread_num (-HUGE (zero)) .ne. -1
++      l = l .or. (omp_get_ancestor_thread_num (HUGE (zero)) .ne. -1)
++      l = l .or. (omp_get_team_size (-HUGE (zero)) .ne. -1)
++      l = l .or. (omp_get_team_size (HUGE (zero)) .ne. -1)
++      if (l) then
++        !$omp atomic
++          err = err + 1
++      endif
++    !$omp end parallel
++  !$omp end parallel
++  if (err .ne. 0) call abort
 +end
-Index: libgomp/testsuite/libgomp.fortran/vla8.f90
-===================================================================
---- a/src/libgomp/testsuite/libgomp.fortran/vla8.f90	(.../tags/gcc_4_4_5_release)
-+++ b/src/libgomp/testsuite/libgomp.fortran/vla8.f90	(.../branches/gcc-4_4-branch)
-@@ -1,4 +1,5 @@
- ! { dg-do run }
-+! { dg-timeout-factor 2.0 }
- 
-   call test
- contains
-Index: libgomp/testsuite/libgomp.fortran/task3.f90
-===================================================================
---- a/src/libgomp/testsuite/libgomp.fortran/task3.f90	(.../tags/gcc_4_4_5_release)
-+++ b/src/libgomp/testsuite/libgomp.fortran/task3.f90	(.../branches/gcc-4_4-branch)
-@@ -0,0 +1,27 @@
-+! { dg-do run }
-+! { dg-options "-fopenmp" }
-+!
-+! PR fortran/47886
-+!
-+! Test case contributed by Bill Long
-+
-+!  derived from OpenMP test OMP3f/F03_2_7_1d.F90
-+program F03_2_7_1d
-+   use omp_lib
-+   implicit none
-+   integer, parameter :: NT = 4
-+   integer :: sum = 0
-+
-+   call omp_set_num_threads(NT); 
-+
-+   !$omp parallel
-+   !$omp task if(omp_get_num_threads() > 0)
-+   !$omp atomic
-+      sum = sum + 1
-+   !$omp end task
-+   !$omp end parallel
-+   if (sum /= NT) then
-+      print *, "FAIL - sum == ", sum, " (expected ", NT, ")"
-+      call abort
-+   end if
-+end program F03_2_7_1d
-Index: libgomp/parallel.c
+Index: gcc/DATESTAMP
 ===================================================================
---- a/src/libgomp/parallel.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/libgomp/parallel.c	(.../branches/gcc-4_4-branch)
-@@ -1,4 +1,4 @@
--/* Copyright (C) 2005, 2007, 2008, 2009 Free Software Foundation, Inc.
-+/* Copyright (C) 2005, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-    Contributed by Richard Henderson <rth@redhat.com>.
- 
-    This file is part of the GNU OpenMP Library (libgomp).
-@@ -123,6 +123,7 @@
- #else
- 	  gomp_mutex_lock (&gomp_remaining_threads_lock);
- 	  gomp_remaining_threads_count -= team->nthreads - 1;
-+	  gomp_mutex_unlock (&gomp_remaining_threads_lock);
- #endif
- 	}
+--- a/src/gcc/DATESTAMP	(.../tags/gcc_4_4_6_release)
++++ b/src/gcc/DATESTAMP	(.../branches/gcc-4_4-branch)
+@@ -1 +1 @@
+-20110416
++20110523
+Index: gcc/tree-tailcall.c
+===================================================================
+--- a/src/gcc/tree-tailcall.c	(.../tags/gcc_4_4_6_release)
++++ b/src/gcc/tree-tailcall.c	(.../branches/gcc-4_4-branch)
+@@ -953,6 +953,14 @@
+ 					     integer_one_node);
      }
-Index: gcc/cfgloopmanip.c
-===================================================================
---- a/src/gcc/cfgloopmanip.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/cfgloopmanip.c	(.../branches/gcc-4_4-branch)
-@@ -1546,7 +1546,10 @@
-   /* Duplicate loop.  */
-   if (!cfg_hook_duplicate_loop_to_header_edge (loop, entry, 1,
- 					       NULL, NULL, NULL, 0))
--    return NULL;
+ 
++  if (a_acc || m_acc)
 +    {
-+      entry->flags |= irred_flag;
-+      return NULL;
++      /* When the tail call elimination using accumulators is performed,
++	 statements adding the accumulated value are inserted at all exits.
++	 This turns all other tail calls to non-tail ones.  */
++      opt_tailcalls = false;
 +    }
- 
-   /* After duplication entry edge now points to new loop head block.
-      Note down new head as second_head.  */
-Index: gcc/DATESTAMP
++
+   for (; tailcalls; tailcalls = next)
+     {
+       next = tailcalls->next;
+Index: gcc/final.c
 ===================================================================
---- a/src/gcc/DATESTAMP	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/DATESTAMP	(.../branches/gcc-4_4-branch)
-@@ -1 +1 @@
--20101001
-+20110313
-Index: gcc/configure
-===================================================================
---- a/src/gcc/configure	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/configure	(.../branches/gcc-4_4-branch)
-@@ -22423,6 +22423,18 @@
-   set_have_as_tls=yes
- fi
- fi
-+case "$target" in
-+  *-*-irix6*)
-+    # IRIX 6.5 rld and libc.so lack TLS support, so even if gas and gld
-+    # with TLS support are in use, native TLS cannot work.
-+    set_have_as_tls=no
-+    ;;
-+  *-*-osf*)
-+    # Tru64 UNIX loader and libc.so lack TLS support, so even if gas and
-+    # gld with TLS support are in use, native TLS cannot work.
-+    set_have_as_tls=no
-+    ;;
-+esac
- if test $set_have_as_tls = yes ; then
- 
- cat >>confdefs.h <<\_ACEOF
-Index: gcc/builtins.c
-===================================================================
---- a/src/gcc/builtins.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/builtins.c	(.../branches/gcc-4_4-branch)
-@@ -5452,14 +5452,30 @@
- 	{
- 	  /* If the format specifier was "string\n", call puts("string").  */
- 	  size_t len = strlen (fmt_str);
--	  if ((unsigned char)fmt_str[len - 1] == target_newline)
-+	  if ((unsigned char)fmt_str[len - 1] == target_newline
-+	      && (size_t) (int) len == len
-+	      && (int) len > 0)
- 	    {
-+	      char *newstr;
-+	      tree offset_node, string_cst;
-+
- 	      /* Create a NUL-terminated string that's one char shorter
- 		 than the original, stripping off the trailing '\n'.  */
--	      char *newstr = XALLOCAVEC (char, len);
--	      memcpy (newstr, fmt_str, len - 1);
--	      newstr[len - 1] = 0;
--	      arg = build_string_literal (len, newstr);
-+	      arg = build_string_literal (len, fmt_str);
-+	      string_cst = string_constant (arg, &offset_node);
-+#ifdef ENABLE_CHECKING
-+	      gcc_assert (string_cst
-+			  && (TREE_STRING_LENGTH (string_cst)
-+			      == (int) len)
-+			  && integer_zerop (offset_node)
-+			  && (unsigned char)
-+			      TREE_STRING_POINTER (string_cst)[len - 1]
-+			      == target_newline);
-+#endif
-+	      /* build_string_literal creates a new STRING_CST,
-+		 modify it in place to avoid double copying.  */
-+	      newstr = CONST_CAST (char *, TREE_STRING_POINTER (string_cst));
-+	      newstr[len - 1] = '\0';
- 	      if (fn_puts)
- 		fn = build_call_expr (fn_puts, 1, arg);
- 	    }
-@@ -12844,15 +12860,30 @@
- 	{
- 	  /* If the string was "string\n", call puts("string").  */
- 	  size_t len = strlen (str);
--	  if ((unsigned char)str[len - 1] == target_newline)
-+	  if ((unsigned char)str[len - 1] == target_newline
-+	      && (size_t) (int) len == len
-+	      && (int) len > 0)
- 	    {
-+	      char *newstr;
-+	      tree offset_node, string_cst;
-+
- 	      /* Create a NUL-terminated string that's one char shorter
- 		 than the original, stripping off the trailing '\n'.  */
--	      char *newstr = XALLOCAVEC (char, len);
--	      memcpy (newstr, str, len - 1);
--	      newstr[len - 1] = 0;
--
--	      newarg = build_string_literal (len, newstr);
-+	      newarg = build_string_literal (len, str);
-+	      string_cst = string_constant (newarg, &offset_node);
-+#ifdef ENABLE_CHECKING
-+	      gcc_assert (string_cst
-+			  && (TREE_STRING_LENGTH (string_cst)
-+			      == (int) len)
-+			  && integer_zerop (offset_node)
-+			  && (unsigned char)
-+			      TREE_STRING_POINTER (string_cst)[len - 1]
-+			      == target_newline);
-+#endif
-+	      /* build_string_literal creates a new STRING_CST,
-+		 modify it in place to avoid double copying.  */
-+	      newstr = CONST_CAST (char *, TREE_STRING_POINTER (string_cst));
-+	      newstr[len - 1] = '\0';
- 	      if (fn_puts)
- 		call = build_call_expr (fn_puts, 1, newarg);
- 	    }
-Index: gcc/fold-const.c
-===================================================================
---- a/src/gcc/fold-const.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/fold-const.c	(.../branches/gcc-4_4-branch)
-@@ -11658,8 +11658,14 @@
- 	  if (integer_pow2p (sval) && tree_int_cst_sgn (sval) > 0)
- 	    {
- 	      tree sh_cnt = TREE_OPERAND (arg1, 1);
--	      unsigned long pow2 = exact_log2 (TREE_INT_CST_LOW (sval));
-+	      unsigned long pow2;
- 
-+	      if (TREE_INT_CST_LOW (sval))
-+		pow2 = exact_log2 (TREE_INT_CST_LOW (sval));
-+	      else
-+		pow2 = exact_log2 (TREE_INT_CST_HIGH (sval))
-+		       + HOST_BITS_PER_WIDE_INT;
-+
- 	      if (strict_overflow_p)
- 		fold_overflow_warning (("assuming signed overflow does not "
- 					"occur when simplifying A / (B << N)"),
+--- a/src/gcc/final.c	(.../tags/gcc_4_4_6_release)
++++ b/src/gcc/final.c	(.../branches/gcc-4_4-branch)
+@@ -2207,6 +2207,11 @@
+ 	    location_t loc;
+ 	    expanded_location expanded;
+ 
++	    /* Make sure we flush any queued register saves in case this
++	       clobbers affected registers.  */
++	    if (dwarf2out_do_frame ())
++	      dwarf2out_frame_debug (insn, false);
++
+ 	    /* There's no telling what that did to the condition codes.  */
+ 	    CC_STATUS_INIT;
+ 
+Index: gcc/reorg.c
+===================================================================
+--- a/src/gcc/reorg.c	(.../tags/gcc_4_4_6_release)
++++ b/src/gcc/reorg.c	(.../branches/gcc-4_4-branch)
+@@ -3453,9 +3453,13 @@
+ 	     We do this by deleting the INSN containing the SEQUENCE, then
+ 	     re-emitting the insns separately, and then deleting the RETURN.
+ 	     This allows the count of the jump target to be properly
+-	     decremented.  */
++	     decremented.
+ 
+-	  /* Clear the from target bit, since these insns are no longer
++	     Note that we need to change the INSN_UID of the re-emitted insns
++	     since it is used to hash the insns for mark_target_live_regs and
++	     the re-emitted insns will no longer be wrapped up in a SEQUENCE.
++
++	     Clear the from target bit, since these insns are no longer
+ 	     in delay slots.  */
+ 	  for (i = 0; i < XVECLEN (pat, 0); i++)
+ 	    INSN_FROM_TARGET_P (XVECEXP (pat, 0, i)) = 0;
+@@ -3463,13 +3467,10 @@
+ 	  trial = PREV_INSN (insn);
+ 	  delete_related_insns (insn);
+ 	  gcc_assert (GET_CODE (pat) == SEQUENCE);
+-	  after = trial;
+-	  for (i = 0; i < XVECLEN (pat, 0); i++)
+-	    {
+-	      rtx this_insn = XVECEXP (pat, 0, i);
+-	      add_insn_after (this_insn, after, NULL);
+-	      after = this_insn;
+-	    }
++	  add_insn_after (delay_insn, trial, NULL);
++	  after = delay_insn;
++	  for (i = 1; i < XVECLEN (pat, 0); i++)
++	    after = emit_copy_of_insn_after (XVECEXP (pat, 0, i), after);
+ 	  delete_scheduled_jump (delay_insn);
+ 	  continue;
+ 	}
+@@ -3571,9 +3572,13 @@
+ 	     We do this by deleting the INSN containing the SEQUENCE, then
+ 	     re-emitting the insns separately, and then deleting the jump.
+ 	     This allows the count of the jump target to be properly
+-	     decremented.  */
++	     decremented.
+ 
+-	  /* Clear the from target bit, since these insns are no longer
++	     Note that we need to change the INSN_UID of the re-emitted insns
++	     since it is used to hash the insns for mark_target_live_regs and
++	     the re-emitted insns will no longer be wrapped up in a SEQUENCE.
++
++	     Clear the from target bit, since these insns are no longer
+ 	     in delay slots.  */
+ 	  for (i = 0; i < XVECLEN (pat, 0); i++)
+ 	    INSN_FROM_TARGET_P (XVECEXP (pat, 0, i)) = 0;
+@@ -3581,13 +3586,10 @@
+ 	  trial = PREV_INSN (insn);
+ 	  delete_related_insns (insn);
+ 	  gcc_assert (GET_CODE (pat) == SEQUENCE);
+-	  after = trial;
+-	  for (i = 0; i < XVECLEN (pat, 0); i++)
+-	    {
+-	      rtx this_insn = XVECEXP (pat, 0, i);
+-	      add_insn_after (this_insn, after, NULL);
+-	      after = this_insn;
+-	    }
++	  add_insn_after (delay_insn, trial, NULL);
++	  after = delay_insn;
++	  for (i = 1; i < XVECLEN (pat, 0); i++)
++	    after = emit_copy_of_insn_after (XVECEXP (pat, 0, i), after);
+ 	  delete_scheduled_jump (delay_insn);
+ 	  continue;
+ 	}
 Index: gcc/ChangeLog
 ===================================================================
---- a/src/gcc/ChangeLog	(.../tags/gcc_4_4_5_release)
+--- a/src/gcc/ChangeLog	(.../tags/gcc_4_4_6_release)
 +++ b/src/gcc/ChangeLog	(.../branches/gcc-4_4-branch)
-@@ -1,3 +1,341 @@
-+2011-03-03  Uros Bizjak  <ubizjak@gmail.com>
-+
-+	* config/i386/sse.md (*avx_pmaddubsw128): Fix mode of VEC_SELECT RTX.
-+	(ssse3_pmaddubsw128): Ditto.
-+	(ssse3_pmaddubsw): Ditto.
+@@ -1,3 +1,108 @@
++2011-05-21  Eric Botcazou  <ebotcazou@adacore.com>
 +
-+2011-02-21  Uros Bizjak  <ubizjak@gmail.com>
++	* config/sparc/sparc.md (setjmp): Handle PIC mode and use the hard
++	frame pointer.
 +
-+	PR target/47840
-+	* config/i386/avxintrin.h (_mm256_insert_epi32): Use _mm_insert_epi32.
-+	(_mm256_insert_epi64): Use _mm_insert_epi64.
++2011-05-21  Eric Botcazou  <ebotcazou@adacore.com>
 +
-+2011-02-19  Alexandre Oliva  <aoliva@redhat.com>
++	* config/sparc/sparc.c (eligible_for_return_delay): Do not return
++	false if there are call-saved registers here...
++	(sparc_can_use_return_insn_p): ...but here instead.
++	(save_or_restore_regs): Fix thinko.
++	(sparc_expand_prologue): Use current_function_is_leaf.
++	* config/sparc/sparc.h (FRAME_POINTER_REQUIRED) : Likewise.
 +
-+	PR tree-optimization/46620
-+	* tree-sra.c (try_instantiate_multiple_fields): Don't get stuck at
-+	padding within accessed words.
++2011-05-14  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
 +
-+2011-02-18  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
++	PR rtl-optimization/48932
++	Backport from mainline:
++	2010-09-15  Eric Botcazou  <ebotcazou@adacore.com>
 +
-+	* config.gcc (hppa[12]*-*-hpux11*): Set extra_parts.
-+	* config/pa/stublib.c (pthread_default_stacksize_np, pthread_mutex_lock,
-+	pthread_mutex_unlock, pthread_once): Reinstate pthread stubs.
-+	* config/pa/t-pa-hpux11: Add rules to build pthread stubs.
-+	* config/pa/t-pa64: Likewise.
-+	* config/pa/pa-hpux11.h (LINK_GCC_C_SEQUENCE_SPEC): Define.
++	PR rtl-optimization/45593
++	* reorg.c (relax_delay_slots): Use emit_copy_of_insn_after to re-emit
++	insns that were in delay slots as stand-alone insns.
 +
-+2011-02-17  Uros Bizjak  <ubizjak@gmail.com>
++2011-05-10  Jakub Jelinek  <jakub@redhat.com>
 +
-+	PR target/43653
-+	* config/i386/i386.c (ix86_secondary_reload): Handle SSE
-+	input reload with PLUS RTX.
++	Backported from mainline
++	2011-05-07  Zdenek Dvorak  <ook@ucw.cz>
 +
-+2011-02-15  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
++	PR tree-optimization/48837
++	* tree-tailcall.c (tree_optimize_tail_calls_1): Do not mark tailcalls
++	when accumulator transformation is performed.
 +
-+	PR pch/14940
-+	* config/alpha/host-osf.c: New file.
-+	* config/alpha/x-osf: New file.
-+	* config.host (alpha*-dec-osf*): Use it.
++2011-05-05  Jason Merrill  <jason@redhat.com>
 +
-+2011-02-10  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
++	PR c++/40975
++	* tree-inline.c (copy_tree_r): Handle STATEMENT_LIST.
 +
-+	Backport from mainline:
-+	2011-02-07  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
++2011-05-05  Julian Brown  <julian@codesourcery.com>
 +
-+	* config/pa/pa64-hpux.h (LIB_SPEC): In static links, link against
-+	shared libc if not linking against libpthread.
-+	* config/pa/pa-hpux11.h (LIB_SPEC): Likewise.
-+
-+	2010-08-22  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
-+
-+	PR boehm-gc/34544
-+	* gthr-posix.h (__gthread_active_init): Delete.
-+	(__gthread_active_p): Do activity check here.
-+	Don't include errno.h on hppa-hpux.  Update comment.
-+	* gthr-posix95.h (__gthread_active_init): Delete.
-+	(__gthread_active_p): Do activity check here.
-+	Don't include errno.h on hppa-hpux.  Update comment.
++	* config/arm/neon.md (vec_set<mode>_internal): Fix misplaced
++	parenthesis in D-register case.
 +
-+2011-01-31  Nathan Froyd  <froydnj@codesourcery.com>
++2011-05-04  Jakub Jelinek  <jakub@redhat.com>
 +
-+	Backport from mainline:
-+	2010-12-30  Nathan Froyd  <froydnj@codesourcery.com>
++	Backported from mainline
++	2011-05-03  Uros Bizjak  <ubizjak@gmail.com>
++		    Jakub Jelinek  <jakub@redhat.com>
 +
-+	PR target/44606
-+	* reload1.c (choose_reload_regs): Don't look for equivalences for
-+	output reloads of constant loads.
-+
-+2011-01-17  H.J. Lu  <hongjiu.lu@intel.com>
-+
-+	Backport from mainline
-+	2011-01-17  H.J. Lu  <hongjiu.lu@intel.com>
-+
-+	PR target/47318
-+	* config/i386/avxintrin.h (_mm_maskload_pd): Change mask to
-+	__m128i.
-+	(_mm_maskstore_pd): Likewise.
-+	(_mm_maskload_ps): Likewise.
-+	(_mm_maskstore_ps): Likewise.
-+	(_mm256_maskload_pd): Change mask to __m256i.
-+	(_mm256_maskstore_pd): Likewise.
-+	(_mm256_maskload_ps): Likewise.
-+	(_mm256_maskstore_ps): Likewise.
-+
-+	* config/i386/i386-builtin-types.def: Updated.
-+	(ix86_expand_special_args_builtin): Likewise.
-+
-+	* config/i386/i386.c (ix86_special_builtin_type): Remove
-+	V8SF_FTYPE_PCV8SF_V8SF, V4DF_FTYPE_PCV4DF_V4DF,
-+	V4SF_FTYPE_PCV4SF_V4SF, V2DF_FTYPE_PCV2DF_V2DF,
-+	VOID_FTYPE_PV8SF_V8SF_V8SF, VOID_FTYPE_PV4DF_V4DF_V4DF,
-+	VOID_FTYPE_PV4SF_V4SF_V4SF and VOID_FTYPE_PV2DF_V2DF_V2DF.
-+	Add V8SF_FTYPE_PCV8SF_V8SI, V4DF_FTYPE_PCV4DF_V4DI,
-+	V4SF_FTYPE_PCV4SF_V4SI, V2DF_FTYPE_PCV2DF_V2DI,
-+	VOID_FTYPE_PV8SF_V8SI_V8SF, VOID_FTYPE_PV4DF_V4DI_V4DF,
-+	VOID_FTYPE_PV4SF_V4SI_V4SF and VOID_FTYPE_PV2DF_V2DI_V2DF.
-+	(bdesc_special_args): Update
-+	__builtin_ia32_maskloadpd, __builtin_ia32_maskloadps,
-+	__builtin_ia32_maskloadpd256, __builtin_ia32_maskloadps256,
-+	__builtin_ia32_maskstorepd, __builtin_ia32_maskstoreps,
-+	__builtin_ia32_maskstorepd256 and __builtin_ia32_maskstoreps256.
-+	(ix86_init_mmx_sse_builtins): Updated.
-+
-+	* config/i386/sse.md (avx_maskload<ssemodesuffix><avxmodesuffix>):
-+	Use <avxpermvecmode> on mask register.
-+	(avx_maskstore<ssemodesuffix><avxmodesuffix>): Likewise.
-+
-+2011-01-16  Jakub Jelinek  <jakub@redhat.com>
-+
-+	Backport from mainline
-+	2010-12-21  Jakub Jelinek  <jakub@redhat.com>
-+
-+	PR target/46880
-+	* config/i386/sse.md (sse2_loadlpd, sse2_movsd): Fix shufpd source
-+	operand.
-+
-+	PR middle-end/45852
-+	* expr.c (store_expr): Ignore alt_rtl if equal to target,
-+	but has side-effects.
-+
-+	2010-12-10  Jakub Jelinek  <jakub@redhat.com>
-+
-+	PR rtl-optimization/46865
-+	* rtl.c (rtx_equal_p_cb): For last operand of
-+	ASM_OPERANDS and ASM_INPUT if integers are different,
-+	call locator_eq.
-+	* jump.c (rtx_renumbered_equal_p): Likewise.
++	PR target/48774
++	* config/i386/i386.c (ix86_match_ccmode): For CC{A,C,O,S}mode
++	only succeed if req_mode is the same as set_mode.
 +
-+2011-01-07  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
++	2011-04-30  Jakub Jelinek  <jakub@redhat.com>
 +
-+	Backport from mainline:
-+	2011-01-06  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
++	PR tree-optimization/48809
++	* tree-switch-conversion.c (build_arrays): Compute tidx in unsigned
++	type.
++	(gen_inbound_check): Don't compute index_expr - range_min in utype
++	again, instead reuse SSA_NAME initialized in build_arrays.
++	Remove two useless gsi_for_stmt calls.
 +
-+	PR target/43309
-+	* config/i386/i386.c (legitimize_tls_address)
-+	<TLS_MODEL_INITIAL_EXEC>: Handle TARGET_64BIT && TARGET_SUN_TLS.
-+	* config/i386/i386.md (UNSPEC_TLS_IE_SUN): Declare.
-+	(tls_initial_exec_64_sun): New pattern.
++	2011-04-28  Jakub Jelinek  <jakub@redhat.com>
 +
-+	2010-03-24  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
++	PR middle-end/48597
++	* final.c (final_scan_insn): Call dwarf2out_frame_debug even for
++	inline asm.
 +
-+	* config/i386/i386.c (override_options): Don't accept
-+	-mtls-dialect=sun any longer.
-+	* config/i386/i386.h (TARGET_SUN_TLS): Define as 0.
-+	* config/i386/i386.md (*tls_global_dynamic_32_sun): Remove.
-+	(*tls_local_dynamic_base_32_sun): Likewise.
-+	* config/i386/sol2.h (TARGET_SUN_TLS): Redefine.
++2011-04-24  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
 +
-+2010-12-30  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
++	PR target/48288
++	* config/pa/predicates.md (ior_operand): Delete predicate.
++	(cint_ior_operand, reg_or_cint_ior_operand): New predicates.
++	* config/pa/pa.md (iordi3): Use reg_or_cint_ior_operand predicate in
++	expander.  Use cint_ior_operand in unnamed insn.
++	(iorsi3): Likewise.
++	* config/pa/pa-protos.h (ior_operand): Delete declarations.
 +
-+	* config/pa/pa.md: Add ",*" condition to 64-bit add/subtract boolean
-+	patterns.
++2011-04-19  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
 +
-+2010-12-27  Yao Qi  <yao@codesourcery.com>
++	* config/pa/pa.h (REGISTER_MOVE_COST): Increase to 18 cost of
++	move from floating point to shift amount register.
 +
 +	Backport from mainline:
-+	2010-10-14  Yao Qi  <yao@codesourcery.com>
++	2011-04-08  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
 +
-+	PR target/45447
-+	* config/arm/arm.c (arm_build_builtin_va_list): Assign
-+	va_list_name to TYPE_STUB_DECL (va_list_type).
++	PR target/48366
++	* config/pa/pa.c (emit_move_sequence): Remove secondary reload
++	support for floating point to shift amount amount register copies.
++	(pa_secondary_reload): Return GENERAL_REGS for floating point/shift
++	amount register copies.
++	* config/pa/pa32-regs.h (HARD_REGNO_MODE_OK): For shift amount
++	register, return false if mode isn't a scalar integer mode.
++	* config/pa/pa64-regs.h (HARD_REGNO_MODE_OK): Likewise.
 +
-+2010-12-22 John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
++2011-04-16  Jakub Jelinek  <jakub@redhat.com>
 +
-+	Backport from mainline:
-+	2010-12-18  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
++	Backported from 4.6 branch
++	2011-04-15  Jakub Jelinek  <jakub@redhat.com>
 +
-+	PR target/46915
-+	* config/pa/pa.c (branch_to_delay_slot_p): Use next_active_insn instead
-+	of next_real_insn.  Search forward checking for both ASM_INPUT and
-+	ASM_OPERANDS asms until exit condition is found.
-+	(branch_needs_nop_p): Likewise.
-+	(use_skip_p): New function.
-+	(output_cbranch): Use use_skip_p.
-+	(output_bb, output_bvb): Likewise.
-+
-+	2009-06-25  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
-+
-+	PR target/40468
-+	* pa.c (branch_to_delay_slot_p, branch_needs_nop_p): New functions.
-+	(output_cbranch): Use new functions.
-+	(output_bb, output_bvb, output_dbra, output_movb): Likewise.
++	PR target/48605
++	* config/i386/sse.md (avx_insertps, sse4_1_insertps): If operands[2]
++	is a MEM, offset it as needed based on top 2 bits in operands[3],
++	change MEM mode to SFmode and mask those 2 bits away from operands[3].
 +
-+2010-12-13  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+ 2011-04-16  Release Manager
+ 
+ 	* GCC 4.4.6 released.
+Index: gcc/testsuite/gcc.c-torture/execute/pr48809.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.c-torture/execute/pr48809.c	(.../tags/gcc_4_4_6_release)
++++ b/src/gcc/testsuite/gcc.c-torture/execute/pr48809.c	(.../branches/gcc-4_4-branch)
+@@ -0,0 +1,60 @@
++/* PR tree-optimization/48809 */
 +
-+	Backport from mainline:
-+	2010-09-15  Olivier Hainque  <hainque@adacore.com>
-+		    Jose Ruiz  <ruiz@adacore.com>
++extern void abort (void);
 +
-+	* config/alpha/osf.h (MD_UNWIND_SUPPORT): Define.
-+	* config/alpha/osf-unwind.h: New file.
++int
++foo (signed char x)
++{
++  int y = 0;
++  switch (x)
++    {
++    case 0: y = 1; break;
++    case 1: y = 7; break;
++    case 2: y = 2; break;
++    case 3: y = 19; break;
++    case 4: y = 5; break;
++    case 5: y = 17; break;
++    case 6: y = 31; break;
++    case 7: y = 8; break;
++    case 8: y = 28; break;
++    case 9: y = 16; break;
++    case 10: y = 31; break;
++    case 11: y = 12; break;
++    case 12: y = 15; break;
++    case 13: y = 111; break;
++    case 14: y = 17; break;
++    case 15: y = 10; break;
++    case 16: y = 31; break;
++    case 17: y = 7; break;
++    case 18: y = 2; break;
++    case 19: y = 19; break;
++    case 20: y = 5; break;
++    case 21: y = 107; break;
++    case 22: y = 31; break;
++    case 23: y = 8; break;
++    case 24: y = 28; break;
++    case 25: y = 106; break;
++    case 26: y = 31; break;
++    case 27: y = 102; break;
++    case 28: y = 105; break;
++    case 29: y = 111; break;
++    case 30: y = 17; break;
++    case 31: y = 10; break;
++    case 32: y = 31; break;
++    case 98: y = 18; break;
++    case -62: y = 19; break;
++    }
++  return y;
++}
 +
-+	2009-08-09  Olivier Hainque  <hainque@adacore.com>
-+		    Douglas B Rupp  <rupp@gnat.com>
++int
++main ()
++{
++  if (foo (98) != 18 || foo (97) != 0 || foo (99) != 0)
++    abort ();
++  if (foo (-62) != 19 || foo (-63) != 0 || foo (-61) != 0)
++    abort ();
++  if (foo (28) != 105 || foo (27) != 102 || foo (29) != 111)
++    abort ();
++  return 0;
++}
+Index: gcc/testsuite/gcc.c-torture/compile/20100915-1.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.c-torture/compile/20100915-1.c	(.../tags/gcc_4_4_6_release)
++++ b/src/gcc/testsuite/gcc.c-torture/compile/20100915-1.c	(.../branches/gcc-4_4-branch)
+@@ -0,0 +1,82 @@
++/* PR rtl-optimization/45593 */
++/* Testcase by Arnaud Lacombe <lacombar@gmail.com> */
++
++typedef unsigned int __u32;
++typedef __u32 __be32;
++static inline __attribute__((always_inline)) int __attribute__((__cold__)) printk(const char *s, ...) { return 0; }
++typedef struct journal_s journal_t;
++typedef struct journal_header_s
++{
++ __be32 h_magic;
++ __be32 h_blocktype;
++ __be32 h_sequence;
++} journal_header_t;
++typedef struct journal_superblock_s
++{
++ journal_header_t s_header;
++ __be32 s_blocksize;
++ __be32 s_maxlen;
++} journal_superblock_t;
++struct journal_s
++{
++ struct buffer_head *j_sb_buffer;
++ journal_superblock_t *j_superblock;
++ int j_format_version;
++ int j_blocksize;
++ unsigned int j_maxlen;
++};
++static void journal_fail_superblock (journal_t *journal)
++{
++ journal->j_sb_buffer = ((void *)0);
++}
++static int journal_get_superblock(journal_t *journal)
++{
++ struct buffer_head *bh;
++ journal_superblock_t *sb;
++ int err = -100;
++ bh = journal->j_sb_buffer;
++ if (!buffer_uptodate(bh)) {
++  if (!buffer_uptodate(bh)) {
++   printk ("JBD: IO error reading journal superblock\n");
++   goto out;
++  }
++ }
++ err = -101;
++ if (sb->s_header.h_magic != (( __be32)(__u32)(0)) ||
++     sb->s_blocksize != (( __be32)(__u32)(journal->j_blocksize))) {
++  printk("JBD: no valid journal superblock found\n");
++  goto out;
++ }
++ switch((( __u32)(__be32)(sb->s_header.h_blocktype))) {
++ case 0:
++ case 1:
++  break;
++ default:
++  goto out;
++ }
++ if ((( __u32)(__be32)(sb->s_maxlen)) < journal->j_maxlen)
++  journal->j_maxlen = (( __u32)(__be32)(sb->s_maxlen));
++ else if ((( __u32)(__be32)(sb->s_maxlen)) > journal->j_maxlen) {
++  printk ("JBD: journal file too short\n");
++  goto out;
++ }
++ return 0;
++out:
++ journal_fail_superblock(journal);
++ return err;
++}
++static int load_superblock(journal_t *journal)
++{
++ journal_get_superblock(journal);
++ return 0;
++}
++int jbd2_journal_update_format (journal_t *journal)
++{
++ journal_get_superblock(journal);
++ return 0;
++}
++int jbd2_journal_wipe(journal_t *journal, int write)
++{
++ load_superblock(journal);
++ return 0;
++}
+Index: gcc/testsuite/gcc.target/arm/neon-vset_lanes8.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/arm/neon-vset_lanes8.c	(.../tags/gcc_4_4_6_release)
++++ b/src/gcc/testsuite/gcc.target/arm/neon-vset_lanes8.c	(.../branches/gcc-4_4-branch)
+@@ -0,0 +1,21 @@
++/* Test the `vset_lane_s8' ARM Neon intrinsic.  */
 +
-+	* config/alpha/alpha.h (DWARF_FRAME_REGNUM): Define.
++/* { dg-do run } */
++/* { dg-require-effective-target arm_neon_hw } */
++/* { dg-options "-O0" } */
++/* { dg-add-options arm_neon } */
 +
-+2010-12-13  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
++#include "arm_neon.h"
++#include <stdlib.h>
++#include <string.h>
 +
-+	Backport from mainline:
-+	2010-04-28  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
++int8x8_t x = { 1, 2, 3, 4, 5, 6, 7, 8 };
++int8x8_t y = { 1, 2, 3, 16, 5, 6, 7, 8 };
 +
-+	PR target/22224
-+	* config/alpha/osf.h (ASM_OUTPUT_LOCAL): Redefine.
++int main (void)
++{
++  x = vset_lane_s8 (16, x, 3);
++  if (memcmp (&x, &y, sizeof (x)) != 0)
++    abort();
++  return 0;
++}
+Index: gcc/testsuite/gcc.target/i386/sse4_1-insertps-4.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/i386/sse4_1-insertps-4.c	(.../tags/gcc_4_4_6_release)
++++ b/src/gcc/testsuite/gcc.target/i386/sse4_1-insertps-4.c	(.../branches/gcc-4_4-branch)
+@@ -0,0 +1,92 @@
++/* { dg-do run } */
++/* { dg-require-effective-target sse4 } */
++/* { dg-options "-O2 -msse4.1" } */
 +
-+2010-12-13  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
++#ifndef CHECK_H
++#define CHECK_H "sse4_1-check.h"
++#endif
 +
-+	Backport from mainline:
-+	2010-11-12  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
++#ifndef TEST
++#define TEST sse4_1_test
++#endif
 +
-+	* config/mips/iris.h [!IRIX_USING_GNU_LD]
-+	(SUPPORTS_INIT_PRIORITY): Define.
++#include CHECK_H
 +
-+2010-12-13  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
++#include <smmintrin.h>
++#include <string.h>
 +
-+	Backport from mainline:
-+	2010-11-02  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
++#define msk0 0x41
++#define msk1 0x90
++#define msk2 0xe9
++#define msk3 0x70
++
++#define msk4 0xFC
++#define msk5 0x05
++#define msk6 0x0A
++#define msk7 0x0F
 +
-+	* configure.ac (*-*-irix6*): Disable set_have_as_tls.
-+	(*-*-osf*): Likewise.
-+	* configure: Regenerate.
++union
++  {
++    __m128 x;
++    float f[4];
++  } val1;
 +
-+2010-12-07  Jakub Jelinek  <jakub@redhat.com>
++static void
++TEST (void)
++{
++  union
++    {
++      __m128 x;
++      float f[4];
++    } res[8], val2, tmp;
++  int masks[8];
++  int i, j;
++
++  val2.f[0] = 55.0;
++  val2.f[1] = 55.0;
++  val2.f[2] = 55.0;
++  val2.f[3] = 55.0;
++
++  val1.f[0] = 1.;
++  val1.f[1] = 2.;
++  val1.f[2] = 3.;
++  val1.f[3] = 4.;
++
++  asm volatile ("" : "+m" (val1));
++  res[0].x = _mm_insert_ps (val2.x, val1.x, msk0);
++  asm volatile ("" : "+m" (val1));
++  res[1].x = _mm_insert_ps (val2.x, val1.x, msk1);
++  asm volatile ("" : "+m" (val1));
++  res[2].x = _mm_insert_ps (val2.x, val1.x, msk2);
++  asm volatile ("" : "+m" (val1));
++  res[3].x = _mm_insert_ps (val2.x, val1.x, msk3);
++
++  masks[0] = msk0;
++  masks[1] = msk1;
++  masks[2] = msk2;
++  masks[3] = msk3;
 +
-+	PR middle-end/46534
-+	* builtins.c (expand_builtin_printf): Don't copy and modify string
-+	before build_string_literal, instead modify what
-+	build_string_literal returned.
++  for (i = 0; i < 4; i++)
++    {
++      asm volatile ("" : "+m" (val1));
++      res[i + 4].x = _mm_insert_ps (val2.x, val1.x, msk4);
++    }
 +
-+	Backport from mainline
-+	2010-11-18  Jakub Jelinek  <jakub@redhat.com>
++  masks[4] = msk4;
++  masks[5] = msk4;
++  masks[6] = msk4;
++  masks[7] = msk4;
 +
-+	PR middle-end/46534
-+	* builtins.c (fold_builtin_printf): Don't copy and modify string
-+	before build_string_literal, instead modify what
-+	build_string_literal returned.
++  for (i=0; i < 8; i++)
++    {
++      tmp = val2;
++      tmp.f[(masks[i] & 0x30) >> 4] = val1.f[(masks[i] & 0xC0) >> 6];
 +
-+2010-12-05  Richard Guenther  <rguenther@suse.de>
-+	    Ira Rosen  <irar@il.ibm.com>
++      for (j = 0; j < 4; j++)
++	if (masks[i] & (0x1 << j))
++	  tmp.f[j] = 0.f;
 +
-+	PR tree-optimization/46663
-+	* tree-vect-patterns.c (vect_recog_pow_pattern): Check that
-+	FUNCTION_DECL exists and that it's a builtin.
++      if (memcmp (&res[i], &tmp, sizeof (tmp)))
++	abort ();
++    }
++} 
+Index: gcc/testsuite/gcc.target/i386/avx-vinsertps-3.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/i386/avx-vinsertps-3.c	(.../tags/gcc_4_4_6_release)
++++ b/src/gcc/testsuite/gcc.target/i386/avx-vinsertps-3.c	(.../branches/gcc-4_4-branch)
+@@ -0,0 +1,8 @@
++/* { dg-do run { target ilp32 } } */
++/* { dg-require-effective-target avx } */
++/* { dg-options "-O2 -mfpmath=sse -mavx -mtune=geode" } */
 +
-+2010-11-29  Eric Botcazou  <ebotcazou@adacore.com>
++#define CHECK_H "avx-check.h"
++#define TEST avx_test
 +
-+	PR rtl-optimization/46337
-+	Backport from mainline
-+	2009-04-20  Ian Lance Taylor  <iant@google.com>
++#include "sse4_1-insertps-3.c"
+Index: gcc/testsuite/gcc.target/i386/sse4_1-insertps-3.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/i386/sse4_1-insertps-3.c	(.../tags/gcc_4_4_6_release)
++++ b/src/gcc/testsuite/gcc.target/i386/sse4_1-insertps-3.c	(.../branches/gcc-4_4-branch)
+@@ -0,0 +1,5 @@
++/* { dg-do run { target ilp32 } } */
++/* { dg-require-effective-target sse4 } */
++/* { dg-options "-O2 -msse4.1 -mtune=geode" } */
++
++#include "sse4_1-insertps-2.c"
+Index: gcc/testsuite/gcc.target/i386/avx-vinsertps-4.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.target/i386/avx-vinsertps-4.c	(.../tags/gcc_4_4_6_release)
++++ b/src/gcc/testsuite/gcc.target/i386/avx-vinsertps-4.c	(.../branches/gcc-4_4-branch)
+@@ -0,0 +1,8 @@
++/* { dg-do run } */
++/* { dg-require-effective-target avx } */
++/* { dg-options "-O2 -mfpmath=sse -mavx" } */
 +
-+	* dse.c (replace_inc_dec): Reverse parameters to gen_int_mode.
++#define CHECK_H "avx-check.h"
++#define TEST avx_test
 +
-+2010-11-12  Jakub Jelinek  <jakub@redhat.com>
++#include "sse4_1-insertps-4.c"
+Index: gcc/testsuite/gcc.dg/pr48837.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.dg/pr48837.c	(.../tags/gcc_4_4_6_release)
++++ b/src/gcc/testsuite/gcc.dg/pr48837.c	(.../branches/gcc-4_4-branch)
+@@ -0,0 +1,30 @@
++/* PR tree-optimization/48837 */
++/* { dg-do run } */
++/* { dg-options "-O2" } */
 +
-+	Backport from mainline
-+	2010-11-05  Jakub Jelinek  <jakub@redhat.com>
++void abort (void);
 +
-+	PR middle-end/43690
-+	* gimplify.c (gimplify_asm_expr): If a "m" input is a
-+	{pre,post}{in,de}crement, fail.
++__attribute__((noinline))
++int baz(void)
++{
++  return 1;
++}
 +
-+	2010-11-03  Jakub Jelinek  <jakub@redhat.com>
++inline const int *bar(const int *a, const int *b)
++{
++ return *a ? a : b;
++}
 +
-+	PR tree-optimization/46107
-+	* cfgloopmanip.c (loop_version): Set irred_flag back into entry->flags
-+	if cfg_hook_duplicate_loop_to_header_edge failed.
++int foo(int a, int b)
++{
++   return a || b ? baz() : foo(*bar(&a, &b), 1) + foo(1, 0);
++}
 +
-+2010-11-10  Uros Bizjak  <ubizjak@gmail.com>
++int main(void)
++{
++ if (foo(0, 0) != 2)
++   abort();
 +
-+	PR middle-end/46419
-+	* config/i386/xmmintrin.h (_mm_cvtpi16_ps): Swap __hisi and __losi.
-+	(_mm_cvtpu16_ps): Ditto.
++ return 0;
++}
 +
-+2010-11-04  Uros Bizjak  <ubizjak@gmail.com>
+Index: gcc/testsuite/gcc.dg/pr48774.c
+===================================================================
+--- a/src/gcc/testsuite/gcc.dg/pr48774.c	(.../tags/gcc_4_4_6_release)
++++ b/src/gcc/testsuite/gcc.dg/pr48774.c	(.../branches/gcc-4_4-branch)
+@@ -0,0 +1,38 @@
++/* PR target/48774 */
++/* { dg-do run } */
++/* { dg-options "-O2 -funroll-loops" } */
 +
-+	Revert:
-+	2010-10-30  Uros Bizjak  <ubizjak@gmail.com>
++extern void abort (void);
++unsigned long int s[24]
++  = { 12, ~1, 12, ~2, 12, ~4, 12, ~8, 12, ~16, 12, ~32,
++      12, ~64, 12, ~128, 12, ~256, 12, ~512, 12, ~1024, 12, ~2048 };
++struct { int n; unsigned long *e[12]; } g
++  = { 12, { &s[0], &s[2], &s[4], &s[6], &s[8], &s[10], &s[12], &s[14],
++	    &s[16], &s[18], &s[20], &s[22] } };
++int c[12];
 +
-+	PR middle-end/44569
-+	* lower-suberg.c (simplify_subreg_concatn): For VOIDmode elements,
-+	determine the mode of a subreg by GET_MODE_INNER of CONCATN RTX.
++__attribute__((noinline)) void
++foo (void)
++{
++  int i, j;
++  for (i = 0; i < g.n; i++)
++    for (j = 0; j < g.n; j++)
++      {
++	if (i == j && j < g.e[0][0] && (g.e[i][1] & (1UL << j)))
++	  abort ();
++	if (j < g.e[0][0] && (g.e[i][1] & (1UL << j)))
++	  c[i]++;
++      }
++}
 +
-+2010-11-04  Alan Modra  <amodra@gmail.com>
++int
++main ()
++{
++  int i;
++  asm volatile ("" : "+m" (s), "+m" (g), "+m" (c));
++  foo ();
++  for (i = 0; i < 12; i++)
++    if (c[i] != 11)
++      abort ();
++  return 0;
++}
+Index: gcc/testsuite/ChangeLog
+===================================================================
+--- a/src/gcc/testsuite/ChangeLog	(.../tags/gcc_4_4_6_release)
++++ b/src/gcc/testsuite/ChangeLog	(.../branches/gcc-4_4-branch)
+@@ -1,3 +1,66 @@
++2011-05-20  Jason Merrill  <jason@redhat.com>
 +
-+	* config/rs6000/rs6000.c (rs6000_pic_labelno): Make static.
-+	(rs6000_emit_load_toc_table): Don't use rs6000_pic_labelno when
-+	TARGET_SECURE_PLT.
-+	* config/rs6000/sysv4.h (rs6000_pic_labelno): Don't declare.
-+	* config/rs6000/rs6000.md (load_toc_v4_PIC_3b): Use "b" constraint
-+	on input, "r" on output.
++	* g++.dg/init/new32.C: New.
 +
-+2010-10-30  Uros Bizjak  <ubizjak@gmail.com>
++2011-05-14  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
 +
-+	PR middle-end/44569
-+	* lower-suberg.c (simplify_subreg_concatn): For VOIDmode elements,
-+	determine the mode of a subreg by GET_MODE_INNER of a CONCATN RTX.
++	Backport from mainline:
++	2010-09-15  Eric Botcazou  <ebotcazou@adacore.com>
 +
-+2010-10-22  Uros Bizjak  <ubizjak@gmail.com>
++	* gcc.c-torture/compile/20100915-1.c: New test.
 +
-+	PR target/45946
-+	* config/i386/i386.md (*pushti2): New insn pattern.
-+	(pushti2 splitter): New insn splitter.
++2011-05-10  Jakub Jelinek  <jakub@redhat.com>
 +
-+2010-10-20  Vladimir Makarov  <vmakarov@redhat.com>
++	Backported from mainline
++	2011-05-07  Zdenek Dvorak  <ook@ucw.cz>
 +
-+	PR fortran/42169
-+	* ira-emit.c (store_can_be_removed_p): Return false instead of
-+	gcc_unreachable.
++	PR tree-optimization/48837
++	* gcc.dg/pr48837.c: New testcase.
 +
-+2010-10-18  Jakub Jelinek  <jakub@redhat.com>
++2011-05-09  Jason Merrill  <jason@redhat.com>
 +
-+	PR middle-end/46019
-+	* fold-const.c (fold_binary_loc): If integer_pow2p has
-+	TREE_INT_CST_LOW zero, look at TREE_INT_CST_HIGH.
++	* g++.dg/template/nontype23.C: New.
 +
-+2010-10-07  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
++2011-05-05  Jason Merrill  <jason@redhat.com>
 +
-+	PR target/45820
-+	* config/pa/pa.c (pa_secondary_reload): Handle symbolic operands
-+	earlier.
++	* g++.dg/init/new30.C: New.
 +
-+2010-10-01  Jakub Jelinek  <jakub@redhat.com>
++2011-05-05  Julian Brown  <julian@codesourcery.com>
 +
-+	Backport from mainline
-+	2010-09-30  Jakub Jelinek  <jakub@redhat.com>
++	* gcc.target/arm/neon-vset_lanes8.c: New test.
 +
-+	PR target/45843
-+	* config/i386/i386.c (ix86_gimplify_va_arg): Use
-+	INTVAL (XEXP (slot, 1)) as prev_size.
++2011-05-04  Jakub Jelinek  <jakub@redhat.com>
 +
-+	2010-06-21  Jakub Jelinek  <jakub@redhat.com>
++	Backported from mainline
++	2011-05-03  Jakub Jelinek  <jakub@redhat.com>
 +
-+	PR target/44575
-+	* config/i386/i386.c (ix86_gimplify_va_arg): When copying
-+	va_arg from a set of register save slots into a temporary,
-+	if the container is bigger than type size, do the copying
-+	using smaller mode or using memcpy.
++	PR target/48774
++	* gcc.dg/pr48774.c: New test.
 +
- 2010-10-01  Release Manager
- 
- 	* GCC 4.4.5 released.
-@@ -111,9 +454,9 @@
- 	2010-09-01  Ian Bolton  <ian.bolton@arm.com>
- 
- 	* Makefile.in (tree-switch-conversion.o): Update dependencies.
--	
++	2011-04-30  Jakub Jelinek  <jakub@redhat.com>
 +
- 	2010-08-19  Ian Bolton  <ian.bolton@arm.com>
--	
++	PR tree-optimization/48809
++	* gcc.c-torture/execute/pr48809.c: New test.
 +
- 	PR target/45070
- 	* config/arm/arm.c (arm_output_epilogue): Ensure that return
- 	value of size 1-3 is handled correctly.
-@@ -124,7 +467,7 @@
- 	type for the conditional has wide enough range.
- 
- 	2010-08-07  Marcus Shawcroft  <marcus.shawcroft@arm.com>
--	
++2011-04-26  Jason Merrill  <jason@redhat.com>
 +
- 	* config/arm/linux-atomic.c (SUBWORD_VAL_CAS): Instantiate with
- 	'unsigned short' and 'unsigned char' instead of 'short' and 'char'.
- 	(SUBWORD_BOOL_CAS): Likewise.
-@@ -133,9 +476,9 @@
- 	(FETCH_AND_OP_WORD): Parenthesise INF_OP
- 	(SUBWORD_SYNC_OP): Likewise.
- 	(OP_AND_FETCH_WORD): Likewise.
--	
++	* g++.dg/lookup/koenig13.C: New.
 +
- 2010-09-02  Jakub Jelinek  <jakub@redhat.com>
--	
++2011-04-20  Jason Merrill  <jason@redhat.com>
 +
- 	Backport from mainline
- 	2010-08-30  Jakub Jelinek  <jakub@redhat.com>
- 
-Index: gcc/testsuite/gcc.c-torture/execute/pr46019.c
-===================================================================
---- a/src/gcc/testsuite/gcc.c-torture/execute/pr46019.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/gcc.c-torture/execute/pr46019.c	(.../branches/gcc-4_4-branch)
-@@ -0,0 +1,14 @@
-+/* PR middle-end/46019 */
++	* g++.dg/template/operator11.C: New.
 +
-+extern void abort (void);
++2011-04-16  Jakub Jelinek  <jakub@redhat.com>
 +
-+int
-+main (void)
-+{
-+  unsigned long long l = 0x40000000000ULL;
-+  int n;
-+  for (n = 0; n < 8; n++)
-+    if (l / (0x200000000ULL << n) != (0x200 >> n))
-+      abort ();
-+  return 0;
-+}
-Index: gcc/testsuite/gcc.c-torture/execute/pr44575.c
-===================================================================
---- a/src/gcc/testsuite/gcc.c-torture/execute/pr44575.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/gcc.c-torture/execute/pr44575.c	(.../branches/gcc-4_4-branch)
-@@ -0,0 +1,49 @@
-+/* PR target/44575 */
++	Backported from 4.6 branch
++	2011-04-15  Jakub Jelinek  <jakub@redhat.com>
 +
-+#include <stdarg.h>
++	PR target/48605
++	* gcc.target/i386/sse4_1-insertps-3.c: New test.
++	* gcc.target/i386/sse4_1-insertps-4.c: New test.
++	* gcc.target/i386/avx-insertps-3.c: New test.
++	* gcc.target/i386/avx-insertps-4.c: New test.
 +
-+int fails = 0;
-+struct S { float a[3]; };
-+struct S a[5];
+ 2011-04-16  Release Manager
+ 
+ 	* GCC 4.4.6 released.
+Index: gcc/testsuite/g++.dg/lookup/koenig13.C
+===================================================================
+--- a/src/gcc/testsuite/g++.dg/lookup/koenig13.C	(.../tags/gcc_4_4_6_release)
++++ b/src/gcc/testsuite/g++.dg/lookup/koenig13.C	(.../branches/gcc-4_4-branch)
+@@ -0,0 +1,16 @@
++// PR c++/42687
++// DR 705
 +
-+void
-+check (int z, ...)
++namespace N
 +{
-+  struct S arg, *p;
-+  va_list ap;
-+  int j = 0, k = 0;
-+  int i;
-+  va_start (ap, z);
-+  for (i = 2; i < 4; ++i)
-+    {
-+      p = 0;
-+      j++;
-+      k += 2;
-+      switch ((z << 4) | i)
-+	{
-+	case 0x12:
-+	case 0x13:
-+	  p = &a[2];
-+	  arg = va_arg (ap, struct S);
-+	  break;
-+	default:
-+	  ++fails;
-+	  break;
-+	}
-+      if (p && p->a[2] != arg.a[2])
-+	++fails;
-+      if (fails)
-+	break;
-+    }
-+  va_end (ap);
++    struct S { };
++    void f(const S &) { }
 +}
 +
-+int
-+main ()
++void f(const N::S &) { }
++
++int main()
 +{
-+  a[2].a[2] = -49026;
-+  check (1, a[2], a[2]);
-+  if (fails)
-+    abort ();
-+  return 0;
++    N::S v;
++    (f)(v); // no ambiguity: ADL is prevented with (), only ::f is considered
 +}
-Index: gcc/testsuite/gcc.c-torture/compile/pr46107.c
+Index: gcc/testsuite/g++.dg/init/new30.C
 ===================================================================
---- a/src/gcc/testsuite/gcc.c-torture/compile/pr46107.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/gcc.c-torture/compile/pr46107.c	(.../branches/gcc-4_4-branch)
-@@ -0,0 +1,16 @@
-+/* PR tree-optimization/46107 */
-+
-+int foo (void) __attribute__ ((noreturn));
+--- a/src/gcc/testsuite/g++.dg/init/new30.C	(.../tags/gcc_4_4_6_release)
++++ b/src/gcc/testsuite/g++.dg/init/new30.C	(.../branches/gcc-4_4-branch)
+@@ -0,0 +1,15 @@
++// PR c++/40975
 +
-+void
-+bar (int x, int *y, int z)
++struct data_type
 +{
-+  static void *j[] = { &&l1, &&l2 };
-+l1:
-+  if (*y)
-+    goto *j[z];
-+  foo ();
-+l2:
-+  *y ^= (x & 1) ? -1 : 0;
-+  goto *j[x];
-+}
-Index: gcc/testsuite/gcc.c-torture/compile/pr46534.c
-===================================================================
---- a/src/gcc/testsuite/gcc.c-torture/compile/pr46534.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/gcc.c-torture/compile/pr46534.c	(.../branches/gcc-4_4-branch)
-@@ -0,0 +1,17 @@
-+/* PR middle-end/46534 */
-+
-+extern int printf (const char *, ...);
-+
-+#define S1 "                    "
-+#define S2 S1 S1 S1 S1 S1 S1 S1 S1 S1 S1
-+#define S3 S2 S2 S2 S2 S2 S2 S2 S2 S2 S2
-+#define S4 S3 S3 S3 S3 S3 S3 S3 S3 S3 S3
-+#define S5 S4 S4 S4 S4 S4 S4 S4 S4 S4 S4
-+#define S6 S5 S5 S5 S5 S5 S5 S5 S5 S5 S5
-+#define S7 S6 S6 S6 S6 S6 S6 S6 S6 S6 S6
++    // constructor required to reproduce compiler bug
++    data_type() {}
++};
 +
-+void
-+foo (void)
++struct ptr_type
 +{
-+  printf (S7 "\n");
-+}
-Index: gcc/testsuite/gcc.target/arm/pr45447.c
-===================================================================
---- a/src/gcc/testsuite/gcc.target/arm/pr45447.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/gcc.target/arm/pr45447.c	(.../branches/gcc-4_4-branch)
-@@ -0,0 +1,3 @@
-+/* { dg-do compile } */
-+/* { dg-options "-g -femit-struct-debug-baseonly" } */
-+typedef __builtin_va_list x;
-Index: gcc/testsuite/gcc.target/i386/i386.exp
-===================================================================
---- a/src/gcc/testsuite/gcc.target/i386/i386.exp	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/gcc.target/i386/i386.exp	(.../branches/gcc-4_4-branch)
-@@ -161,13 +161,24 @@
- 
- # If the linker used understands -M <mapfile>, pass it to clear hardware
- # capabilities set by the Sun assembler.
--set FLAGS ""
- set clearcap_ldflags "-Wl,-M,$srcdir/$subdir/clearcap.map"
- 
- if [check_no_compiler_messages mapfile executable {
- 	int main (void) { return 0; }
-   } $clearcap_ldflags ] {
--  set FLAGS $clearcap_ldflags
-+
-+  if { [info procs gcc_target_compile] != [list] \
-+	&& [info procs saved_gcc_target_compile] == [list] } {
-+    rename gcc_target_compile saved_gcc_target_compile
-+
-+    proc gcc_target_compile { source dest type options } {
-+      global clearcap_ldflags
-+      # Always pass -Wl,-M,<mapfile>, but don't let it show up in gcc.sum.
-+      lappend options "additional_flags=$clearcap_ldflags"
++    // array new as default argument required to reproduce compiler bug
++    ptr_type (data_type* ptr = new data_type[1]) { delete[] ptr; }
++};
 +
-+      return [saved_gcc_target_compile $source $dest $type $options]
-+    }
-+  }
- }
- 
- # If a testcase doesn't have special options, use these.
-@@ -194,7 +205,7 @@
- set tests [prune $tests $srcdir/$subdir/vect-args.c]
- 
- # Main loop.
--dg-runtest $tests $FLAGS $DEFAULT_CFLAGS
-+dg-runtest $tests "" $DEFAULT_CFLAGS
- 
- # All done.
- dg-finish
-Index: gcc/testsuite/gcc.target/i386/avx-check.h
-===================================================================
---- a/src/gcc/testsuite/gcc.target/i386/avx-check.h	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/gcc.target/i386/avx-check.h	(.../branches/gcc-4_4-branch)
-@@ -13,7 +13,7 @@
-     return 0;
- 
-   /* Run AVX test only if host has AVX support.  */
--  if (ecx & bit_AVX)
-+  if ((ecx & (bit_AVX | bit_OSXSAVE)) == (bit_AVX | bit_OSXSAVE))
-     {
-       avx_test ();
- #ifdef DEBUG
-Index: gcc/testsuite/gcc.target/i386/pr45946.c
-===================================================================
---- a/src/gcc/testsuite/gcc.target/i386/pr45946.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/gcc.target/i386/pr45946.c	(.../branches/gcc-4_4-branch)
-@@ -0,0 +1,14 @@
-+/* { dg-do compile } */
-+/* { dg-require-effective-target dfp } */
-+/* { dg-options "-std=gnu99 -Os -fno-omit-frame-pointer" } */
++ptr_type obj;
+Index: gcc/testsuite/g++.dg/init/new32.C
+===================================================================
+--- a/src/gcc/testsuite/g++.dg/init/new32.C	(.../tags/gcc_4_4_6_release)
++++ b/src/gcc/testsuite/g++.dg/init/new32.C	(.../branches/gcc-4_4-branch)
+@@ -0,0 +1,16 @@
++// PR c++/48873
 +
-+void
-+__attribute__((noinline))
-+bar (_Decimal128, _Decimal128, _Decimal128, _Decimal128, _Decimal128,
-+     _Decimal128, _Decimal128, _Decimal128, _Decimal128);
++#include <new>
 +
-+void
-+foo (void)
-+{
-+  bar (0, 0, 0, 0, 0, 0, 0, 0, 0);
-+}
-Index: gcc/testsuite/gcc.target/i386/avx-vmaskmovps-256-1.c
-===================================================================
---- a/src/gcc/testsuite/gcc.target/i386/avx-vmaskmovps-256-1.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/gcc.target/i386/avx-vmaskmovps-256-1.c	(.../branches/gcc-4_4-branch)
-@@ -16,10 +16,11 @@
-   int i;
-   int m[8] = {mask_v(0), mask_v(1), mask_v(2), mask_v(3), mask_v(4), mask_v(5), mask_v(6), mask_v(7)};
-   float s[8] = {1,2,3,4,5,6,7,8};
--  union256 u, mask;
-+  union256 u;
-+  union256i_d mask;
-   float e [8] = {0.0};
- 
--  mask.x = _mm256_loadu_ps ((float*)m);
-+  mask.x = _mm256_loadu_si256 ((__m256i *)m);
-   u.x = _mm256_maskload_ps (s, mask.x);
- 
-   for (i = 0 ; i < 8; i++) 
-Index: gcc/testsuite/gcc.target/i386/pr46880.c
-===================================================================
---- a/src/gcc/testsuite/gcc.target/i386/pr46880.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/gcc.target/i386/pr46880.c	(.../branches/gcc-4_4-branch)
-@@ -0,0 +1,28 @@
-+/* PR target/46880 */
-+/* { dg-do run } */
-+/* { dg-options "-O2 -fno-strict-aliasing -msse2" } */
-+/* { dg-require-effective-target sse2_runtime } */
++struct D {
++private:
++  ~D();
++};
 +
-+typedef double __m128d __attribute__ ((__vector_size__ (16), __may_alias__));
-+typedef double (*T)[2];
++template<class T>
++T& create();
 +
-+static __attribute__ ((noinline)) __m128d
-+foo (__m128d c, __m128d d)
++void f()
 +{
-+  T cp = (T) &c;
-+  T dp = (T) &d;
-+  __m128d e = { (*cp)[1], (*dp)[1] };
-+  return e;
++  D* dp = new (((void*) 0)) D(create<D>()); // #
 +}
+Index: gcc/testsuite/g++.dg/template/nontype23.C
+===================================================================
+--- a/src/gcc/testsuite/g++.dg/template/nontype23.C	(.../tags/gcc_4_4_6_release)
++++ b/src/gcc/testsuite/g++.dg/template/nontype23.C	(.../branches/gcc-4_4-branch)
+@@ -0,0 +1,9 @@
++// PR c++/48936
 +
-+int
-+main ()
++template <bool C> int foo (void);
++template <class T> struct S
 +{
-+  __m128d c = { 1.0, 2.0 };
-+  __m128d d = { 3.0, 4.0 };
-+  union { __m128d x; double d[2]; } u;
-+  u.x = foo (c, d);
-+  if (u.d[0] != 2.0 || u.d[1] != 4.0)
-+    __builtin_abort ();
-+  return 0;
-+}
-Index: gcc/testsuite/gcc.target/i386/avx-vmaskmovps-1.c
++  static const unsigned int a = sizeof (T);
++  enum { c = sizeof (foo <(a == 0)> ()) };
++};
++S<int> x;
+Index: gcc/testsuite/g++.dg/template/operator11.C
 ===================================================================
---- a/src/gcc/testsuite/gcc.target/i386/avx-vmaskmovps-1.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/gcc.target/i386/avx-vmaskmovps-1.c	(.../branches/gcc-4_4-branch)
-@@ -0,0 +1,31 @@
-+/* { dg-do run } */
-+/* { dg-require-effective-target avx } */
-+/* { dg-options "-O2 -mavx" } */
+--- a/src/gcc/testsuite/g++.dg/template/operator11.C	(.../tags/gcc_4_4_6_release)
++++ b/src/gcc/testsuite/g++.dg/template/operator11.C	(.../branches/gcc-4_4-branch)
+@@ -0,0 +1,25 @@
++// PR c++/48594
++// Test for uses of (X->*Y)() that don't actually involve a
++// pointer to member function.
++
++struct A { } a;
++struct B { } b;
++struct C * cp;
++
++struct Func { void operator()(); };
++Func operator->* (A, int);
++
++typedef void (*pfn)();
++pfn operator->* (B, int);
++
++pfn C::*cpfn;
++Func C::*cfunc;
++
++template <class T>
++void f()
++{
++  (a->*1)();
++  (b->*1)();
++  (cp->*cpfn)();
++  (cp->*cfunc)();
++}
+Index: gcc/cp/call.c
+===================================================================
+--- a/src/gcc/cp/call.c	(.../tags/gcc_4_4_6_release)
++++ b/src/gcc/cp/call.c	(.../branches/gcc-4_4-branch)
+@@ -145,7 +145,6 @@
+ 			       bool, tsubst_flags_t);
+ static void op_error (enum tree_code, enum tree_code, tree, tree,
+ 		      tree, const char *);
+-static tree build_object_call (tree, tree, tsubst_flags_t);
+ static tree resolve_args (tree);
+ static struct z_candidate *build_user_type_conversion_1 (tree, tree, int);
+ static void print_z_candidate (const char *, struct z_candidate *);
+@@ -3194,7 +3193,7 @@
+    return build_over_call (cand, LOOKUP_NORMAL, tf_warning_or_error);
+ }
+ 
+-static tree
++tree
+ build_object_call (tree obj, tree args, tsubst_flags_t complain)
+ {
+   struct z_candidate *candidates = 0, *cand;
+Index: gcc/cp/tree.c
+===================================================================
+--- a/src/gcc/cp/tree.c	(.../tags/gcc_4_4_6_release)
++++ b/src/gcc/cp/tree.c	(.../branches/gcc-4_4-branch)
+@@ -2663,7 +2663,8 @@
+   if (!TREE_SIDE_EFFECTS (exp))
+     init_expr = NULL_TREE;
+   else if (!real_lvalue_p (exp)
+-	   || !TYPE_NEEDS_CONSTRUCTING (TREE_TYPE (exp)))
++	   || (!TYPE_NEEDS_CONSTRUCTING (TREE_TYPE (exp))
++	       && !TYPE_HAS_NONTRIVIAL_DESTRUCTOR (TREE_TYPE (exp))))
+     {
+       init_expr = get_target_expr (exp);
+       exp = TARGET_EXPR_SLOT (init_expr);
+Index: gcc/cp/cp-tree.h
+===================================================================
+--- a/src/gcc/cp/cp-tree.h	(.../tags/gcc_4_4_6_release)
++++ b/src/gcc/cp/cp-tree.h	(.../branches/gcc-4_4-branch)
+@@ -4193,6 +4193,7 @@
+ 						 tsubst_flags_t);
+ extern tree build_operator_new_call		(tree, tree, tree *, tree *,
+ 						 tree *);
++extern tree build_object_call			(tree, tree, tsubst_flags_t);
+ extern tree build_new_method_call		(tree, tree, tree, tree, int,
+ 						 tree *, tsubst_flags_t);
+ extern tree build_special_member_call		(tree, tree, tree, tree, int,
+Index: gcc/cp/ChangeLog
+===================================================================
+--- a/src/gcc/cp/ChangeLog	(.../tags/gcc_4_4_6_release)
++++ b/src/gcc/cp/ChangeLog	(.../branches/gcc-4_4-branch)
+@@ -1,3 +1,26 @@
++2011-05-20  Jason Merrill  <jason@redhat.com>
 +
-+#include "avx-check.h"
++	PR c++/48873
++	* tree.c (stabilize_expr): Don't make gratuitous copies of classes.
 +
-+#ifndef MASK
-+#define MASK 134
-+#endif
++2011-05-09  Jason Merrill  <jason@redhat.com>
 +
-+#define mask_v(pos) (((MASK & (0x1 << (pos))) >> (pos)) << 31)
++	PR c++/48936
++	* decl2.c (mark_used): Instantiate constant variables even
++	in unevaluated context.
 +
-+void static
-+avx_test (void)
-+{
-+  int i;
-+  int m[4] = {mask_v(0), mask_v(1), mask_v(2), mask_v(3)};
-+  float s[4] = {1,2,3,4};
-+  union128 u;
-+  union128i_d mask;
-+  float e[4] = {0.0};
-+
-+  mask.x = _mm_loadu_si128 ((__m128i *)m);
-+  u.x = _mm_maskload_ps (s, mask.x);
-+
-+  for (i = 0 ; i < 4; i++) 
-+    e[i] = m[i] ? s[i] : 0;
-+   
-+  if (check_union128 (u, e))
-+    abort ();
-+}
-Index: gcc/testsuite/gcc.target/i386/avx-vmaskmovpd-256-1.c
-===================================================================
---- a/src/gcc/testsuite/gcc.target/i386/avx-vmaskmovpd-256-1.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/gcc.target/i386/avx-vmaskmovpd-256-1.c	(.../branches/gcc-4_4-branch)
-@@ -14,12 +14,13 @@
- avx_test (void)
- {
-   int i;
--  long long m[8] = {mask_v(0), mask_v(1), mask_v(2), mask_v(3)};
-+  long long m[4] = {mask_v(0), mask_v(1), mask_v(2), mask_v(3)};
-   double s[4] = {1.1, 2.2, 3.3, 4.4};
--  union256d u, mask;
-+  union256d u;
-+  union256i_q mask;
-   double e [4] = {0.0};
- 
--  mask.x = _mm256_loadu_pd ((double*)m);
-+  mask.x = _mm256_loadu_si256 ((__m256i *)m);
-   u.x = _mm256_maskload_pd (s, mask.x);
- 
-   for (i = 0 ; i < 4; i++) 
-Index: gcc/testsuite/gcc.target/i386/avx-vmaskmovpd-1.c
-===================================================================
---- a/src/gcc/testsuite/gcc.target/i386/avx-vmaskmovpd-1.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/gcc.target/i386/avx-vmaskmovpd-1.c	(.../branches/gcc-4_4-branch)
-@@ -0,0 +1,31 @@
-+/* { dg-do run } */
-+/* { dg-require-effective-target avx } */
-+/* { dg-options "-O2 -mavx" } */
++2011-04-26  Jason Merrill  <jason@redhat.com>
 +
-+#include "avx-check.h"
++	PR c++/42687
++	* parser.c (cp_parser_primary_expression): Set *idk to
++	CP_ID_KIND_NONE for a parenthesized identifier.
 +
-+#ifndef MASK
-+#define MASK 7
-+#endif
++2011-04-20  Jason Merrill  <jason@redhat.com>
 +
-+#define mask_v(pos) (((MASK & (0x1ULL << (pos))) >> (pos)) << 63)
++	PR c++/48594
++	* decl2.c (build_offset_ref_call_from_tree): Fix calling a functor
++	or pointer to (non-member) function.
 +
-+void static
-+avx_test (void)
-+{
-+  int i;
-+  long long m[2] = {mask_v(0), mask_v(1)};
-+  double s[2] = {1.1, 2.2};
-+  union128d u;
-+  union128i_q mask;
-+  double e[2] = {0.0};
-+
-+  mask.x = _mm_loadu_si128 ((__m128i *)m);
-+  u.x = _mm_maskload_pd (s, mask.x);
-+
-+  for (i = 0 ; i < 2; i++) 
-+    e[i] = m[i] ? s[i] : 0;
-+   
-+  if (check_union128d (u, e))
-+    abort ();
-+}
-Index: gcc/testsuite/gcc.target/i386/pr46865-1.c
+ 2011-04-16  Release Manager
+ 
+ 	* GCC 4.4.6 released.
+Index: gcc/cp/decl2.c
 ===================================================================
---- a/src/gcc/testsuite/gcc.target/i386/pr46865-1.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/gcc.target/i386/pr46865-1.c	(.../branches/gcc-4_4-branch)
-@@ -0,0 +1,31 @@
-+/* PR rtl-optimization/46865 */
-+/* { dg-do compile } */
-+/* { dg-options "-O2" } */
-+
-+extern unsigned long f;
-+
-+#define m1(f)							\
-+  if (f & 1)							\
-+    asm volatile ("nop /* asmnop */\n");			\
-+  else								\
-+    asm volatile ("nop /* asmnop */\n");
-+
-+#define m2(f)							\
-+  if (f & 1)							\
-+    asm volatile ("nop /* asmnop */\n" : : "i" (6) : "cx");	\
-+  else								\
-+    asm volatile ("nop /* asmnop */\n" : : "i" (6) : "cx");
-+
-+void
-+foo (void)
-+{
-+  m1 (f);
-+}
-+
-+void
-+bar (void)
-+{
-+  m2 (f);
-+}
-+
-+/* { dg-final { scan-assembler-times "asmnop" 2 } } */
-Index: gcc/testsuite/gcc.target/i386/pr45852.c
-===================================================================
---- a/src/gcc/testsuite/gcc.target/i386/pr45852.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/gcc.target/i386/pr45852.c	(.../branches/gcc-4_4-branch)
-@@ -0,0 +1,16 @@
-+/* PR middle-end/45852 */
-+/* { dg-options "-O2 -mcmodel=small" } */
-+/* { dg-do compile { target { { i?86-*-linux* x86_64-*-linux* } && lp64 } } } */
-+/* { dg-require-visibility "" } */
-+
-+struct S { int s; };
-+
-+volatile struct S globvar __attribute__((visibility ("hidden"))) = { -6 };
-+
-+void
-+foo (void)
-+{
-+  globvar = globvar;
-+}
-+
-+/* { dg-final { scan-assembler-times "globvar.%?rip" 2 } } */
-Index: gcc/testsuite/gcc.target/i386/avx-vmaskmovps-256-2.c
-===================================================================
---- a/src/gcc/testsuite/gcc.target/i386/avx-vmaskmovps-256-2.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/gcc.target/i386/avx-vmaskmovps-256-2.c	(.../branches/gcc-4_4-branch)
-@@ -16,12 +16,13 @@
-   int i;
-   int m[8] = {mask_v(0), mask_v(1), mask_v(2), mask_v(3), mask_v(4), mask_v(5), mask_v(6), mask_v(7)};
-   float s[8] = {1,2,3,4,5,6,7,8};
--  union256 src, mask;
-+  union256 src;
-+  union256i_d mask;
-   float e [8] = {0.0};
-   float d [8] = {0.0};
- 
-   src.x = _mm256_loadu_ps (s);
--  mask.x = _mm256_loadu_ps ((float *)m);
-+  mask.x = _mm256_loadu_si256 ((__m256i *)m);
-   _mm256_maskstore_ps (d, mask.x, src.x);
- 
-   for (i = 0 ; i < 8; i++) 
-Index: gcc/testsuite/gcc.target/i386/pr43653.c
-===================================================================
---- a/src/gcc/testsuite/gcc.target/i386/pr43653.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/gcc.target/i386/pr43653.c	(.../branches/gcc-4_4-branch)
-@@ -0,0 +1,14 @@
-+/* { dg-do compile } */
-+/* { dg-options "-O1 -ftree-vectorize -msse" } */
-+
-+typedef struct {} S;
-+
-+void *foo()
-+{
-+  S a[64], *p[64];
-+  int i;
-+
-+  for (i = 0; i < 64; i++)
-+    p[i] = &a[i];
-+  return p[0];
-+}
-Index: gcc/testsuite/gcc.target/i386/avx-vmaskmovps-2.c
-===================================================================
---- a/src/gcc/testsuite/gcc.target/i386/avx-vmaskmovps-2.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/gcc.target/i386/avx-vmaskmovps-2.c	(.../branches/gcc-4_4-branch)
-@@ -0,0 +1,33 @@
-+/* { dg-do run } */
-+/* { dg-require-effective-target avx } */
-+/* { dg-options "-O2 -mavx" } */
-+
-+#include "avx-check.h"
-+
-+#ifndef MASK
-+#define MASK 214
-+#endif
-+
-+#define mask_v(pos) (((MASK & (0x1 << (pos))) >> (pos)) << 31)
-+
-+void static
-+avx_test (void)
-+{
-+  int i;
-+  int m[4] = {mask_v(0), mask_v(1), mask_v(2), mask_v(3)};
-+  float s[4] = {1,2,3,4};
-+  union128 src;
-+  union128i_d mask;
-+  float e[4] = {0.0};
-+  float d[4] = {0.0};
-+
-+  src.x = _mm_loadu_ps (s);
-+  mask.x = _mm_loadu_si128 ((__m128i *)m);
-+  _mm_maskstore_ps (d, mask.x, src.x);
-+
-+  for (i = 0 ; i < 4; i++) 
-+    e[i] = m[i] ? s[i] : 0;
-+   
-+  if (checkVf (d, e, 4))
-+    abort ();
-+}
-Index: gcc/testsuite/gcc.target/i386/avx-vmaskmovpd-256-2.c
-===================================================================
---- a/src/gcc/testsuite/gcc.target/i386/avx-vmaskmovpd-256-2.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/gcc.target/i386/avx-vmaskmovpd-256-2.c	(.../branches/gcc-4_4-branch)
-@@ -18,10 +18,11 @@
-   double s[4] = {1.1, 2.2, 3.3, 4.4};
-   double e [4] = {0.0};
-   double d [4] = {0.0};
--  union256d src, mask;
-+  union256d src;
-+  union256i_q mask;
-   
-   src.x = _mm256_loadu_pd (s);
--  mask.x = _mm256_loadu_pd ((double*)m);
-+  mask.x = _mm256_loadu_si256 ((__m256i *)m);
-   _mm256_maskstore_pd (d, mask.x, src.x);
- 
-   for (i = 0 ; i < 4; i++) 
-Index: gcc/testsuite/gcc.target/i386/avx-vmaskmovpd-2.c
-===================================================================
---- a/src/gcc/testsuite/gcc.target/i386/avx-vmaskmovpd-2.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/gcc.target/i386/avx-vmaskmovpd-2.c	(.../branches/gcc-4_4-branch)
-@@ -0,0 +1,33 @@
-+/* { dg-do run } */
-+/* { dg-require-effective-target avx } */
-+/* { dg-options "-O2 -mavx" } */
-+
-+#include "avx-check.h"
-+
-+#ifndef MASK
-+#define MASK 6
-+#endif
-+
-+#define mask_v(pos) (((MASK & (0x1ULL << (pos))) >> (pos)) << 63)
-+
-+void static
-+avx_test (void)
-+{
-+  int i;
-+  long long m[2] = {mask_v(0), mask_v(1)};
-+  double s[2] = {1.1, 2.2};
-+  double e[2] = {0.0};
-+  double d[2] = {0.0};
-+  union128d src;
-+  union128i_q mask;
-+  
-+  src.x = _mm_loadu_pd (s);
-+  mask.x = _mm_loadu_si128 ((__m128i *)m);
-+  _mm_maskstore_pd (d, mask.x, src.x);
-+
-+  for (i = 0 ; i < 2; i++) 
-+    e[i] = m[i] ? s[i] : 0;
-+   
-+  if (checkVd (d, e, 2))
-+    abort ();
-+}
-Index: gcc/testsuite/gcc.target/i386/pr46419.c
-===================================================================
---- a/src/gcc/testsuite/gcc.target/i386/pr46419.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/gcc.target/i386/pr46419.c	(.../branches/gcc-4_4-branch)
-@@ -0,0 +1,39 @@
-+/* { dg-do run } */
-+/* { dg-options "-O2 -msse" } */
-+/* { dg-require-effective-target sse } */
-+
-+#include "sse-check.h"
-+
-+#include <xmmintrin.h>
-+
-+void __attribute__((noinline))
-+sse_test (void)
-+{
-+  char image[4];
-+  __m128 image4;
-+  float out[4] __attribute__ ((aligned (16)));
-+  int i;
-+
-+  for (i = 0; i < 4; i++)
-+    image[i] = i + 1;
-+
-+  image4 =
-+    _mm_cvtpi8_ps (_mm_setr_pi8
-+		   (image[0], image[1], image[2], image[3], 0, 0, 0, 0));
-+  _mm_store_ps (out, image4);
-+  _mm_empty ();
-+
-+  for (i = 0; i < 4; i++)
-+    if (out[i] != (float) (i + 1))
-+      abort ();
-+
-+  image4 =
-+    _mm_cvtpu8_ps (_mm_setr_pi8
-+		   (image[0], image[1], image[2], image[3], 0, 0, 0, 0));
-+  _mm_store_ps (out, image4);
-+  _mm_empty ();
-+
-+  for (i = 0; i < 4; i++)
-+    if (out[i] != (float) (i + 1))
-+      abort ();
-+}
-Index: gcc/testsuite/gcc.target/i386/pr46865-2.c
-===================================================================
---- a/src/gcc/testsuite/gcc.target/i386/pr46865-2.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/gcc.target/i386/pr46865-2.c	(.../branches/gcc-4_4-branch)
-@@ -0,0 +1,32 @@
-+/* PR rtl-optimization/46865 */
-+/* { dg-do compile } */
-+/* { dg-options "-O2 -save-temps" } */
-+
-+extern unsigned long f;
-+
-+#define m1(f)							\
-+  if (f & 1)							\
-+    asm volatile ("nop /* asmnop */\n");			\
-+  else								\
-+    asm volatile ("nop /* asmnop */\n");
-+
-+#define m2(f)							\
-+  if (f & 1)							\
-+    asm volatile ("nop /* asmnop */\n" : : "i" (6) : "cx");	\
-+  else								\
-+    asm volatile ("nop /* asmnop */\n" : : "i" (6) : "cx");
-+
-+void
-+foo (void)
-+{
-+  m1 (f);
-+}
-+
-+void
-+bar (void)
-+{
-+  m2 (f);
-+}
-+
-+/* { dg-final { scan-assembler-times "asmnop" 2 } } */
-+/* { dg-final { cleanup-saved-temps } } */
-Index: gcc/testsuite/gcc.target/mips/save-restore-3.c
-===================================================================
---- a/src/gcc/testsuite/gcc.target/mips/save-restore-3.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/gcc.target/mips/save-restore-3.c	(.../branches/gcc-4_4-branch)
-@@ -1,6 +1,7 @@
- /* Check that we can use the save instruction to save spilled arguments
-    when the argument save area is out of range of a direct load or store.  */
- /* { dg-options "(-mips16) isa_rev>=1 -mabi=32 -O2" } */
-+/* { dg-skip-if "PR target/46610" { mips-sgi-irix6* } } */
- 
- void bar (int *);
- 
-Index: gcc/testsuite/gcc.target/mips/save-restore-4.c
-===================================================================
---- a/src/gcc/testsuite/gcc.target/mips/save-restore-4.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/gcc.target/mips/save-restore-4.c	(.../branches/gcc-4_4-branch)
-@@ -1,5 +1,6 @@
- /* Check that we can use the save instruction to save $16, $17 and $31.  */
- /* { dg-options "(-mips16) isa_rev>=1 -mabi=32 -O2" } */
-+/* { dg-skip-if "PR target/46610" { mips-sgi-irix6* } } */
- 
- void bar (void);
- 
-Index: gcc/testsuite/gcc.target/mips/save-restore-1.c
-===================================================================
---- a/src/gcc/testsuite/gcc.target/mips/save-restore-1.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/gcc.target/mips/save-restore-1.c	(.../branches/gcc-4_4-branch)
-@@ -1,5 +1,6 @@
- /* Check that we can use the save instruction to save varargs.  */
- /* { dg-options "(-mips16) isa_rev>=1 -mabi=32 -O2" } */
-+/* { dg-skip-if "PR target/46610" { mips-sgi-irix6* } } */
- 
- #include <stdarg.h>
- 
-Index: gcc/testsuite/gcc.target/mips/save-restore-5.c
-===================================================================
---- a/src/gcc/testsuite/gcc.target/mips/save-restore-5.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/gcc.target/mips/save-restore-5.c	(.../branches/gcc-4_4-branch)
-@@ -1,5 +1,6 @@
- /* Check that we don't try to save the same register twice.  */
- /* { dg-options "(-mips16) isa_rev>=1 -mgp32 -O2" } */
-+/* { dg-skip-if "PR target/46610" { mips-sgi-irix6* } } */
- 
- int bar (int, int, int, int);
- void frob (void);
-Index: gcc/testsuite/gnat.dg/pack9.adb
-===================================================================
---- a/src/gcc/testsuite/gnat.dg/pack9.adb	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/gnat.dg/pack9.adb	(.../branches/gcc-4_4-branch)
-@@ -14,5 +14,5 @@
- 
- end Pack9;
- 
---- { dg-final { scan-tree-dump-not "__gnat_rcheck" "final_cleanup" } }
-+-- { dg-final { scan-tree-dump-not "gnat_rcheck" "final_cleanup" } }
- -- { dg-final { cleanup-tree-dump "final_cleanup" } }
-Index: gcc/testsuite/gnat.dg/aliasing2.adb
-===================================================================
---- a/src/gcc/testsuite/gnat.dg/aliasing2.adb	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/gnat.dg/aliasing2.adb	(.../branches/gcc-4_4-branch)
-@@ -18,5 +18,5 @@
- 
- end Aliasing2;
- 
---- { dg-final { scan-tree-dump-not "__gnat_rcheck" "final_cleanup" } }
-+-- { dg-final { scan-tree-dump-not "gnat_rcheck" "final_cleanup" } }
- -- { dg-final { cleanup-tree-dump "final_cleanup" } }
-Index: gcc/testsuite/ada/acats/run_acats
-===================================================================
---- a/src/gcc/testsuite/ada/acats/run_acats	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/ada/acats/run_acats	(.../branches/gcc-4_4-branch)
-@@ -14,9 +14,9 @@
- # Fall back to whence which ksh88 and ksh93 provide, but bash does not.
- 
- which () {
--    type -p $* 2>/dev/null && return 0
--    type $* 2>/dev/null | awk '{print $3}' && return 0
--    whence $* 2>/dev/null && return 0
-+    path=`type -p $* 2>/dev/null` && { echo $path; return 0; }
-+    path=`type $* 2>/dev/null | awk '{print $NF}'` && { echo $path; return 0; }
-+    path=`whence $* 2>/dev/null` && { echo $path; return 0; }
-     return 1
- }
- 
-Index: gcc/testsuite/gcc.dg/pragma-init-fini.c
-===================================================================
---- a/src/gcc/testsuite/gcc.dg/pragma-init-fini.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/gcc.dg/pragma-init-fini.c	(.../branches/gcc-4_4-branch)
-@@ -1,6 +1,7 @@
- /* Tests for #pragma init and #pragma fini.  */
- 
- /* { dg-do run { target *-*-solaris2.* } } */
-+/* { dg-skip-if "no .pushsection/.popsection" { i?86-*-solaris2.8 && { ! gas } } } */
- 
- extern void abort ();
- 
-Index: gcc/testsuite/gcc.dg/20061124-1.c
-===================================================================
---- a/src/gcc/testsuite/gcc.dg/20061124-1.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/gcc.dg/20061124-1.c	(.../branches/gcc-4_4-branch)
-@@ -1,5 +1,6 @@
- /* { dg-do run } */
- /* { dg-require-effective-target sync_char_short } */
-+/* { dg-options "-mcpu=v9" { target sparc*-*-* } } */
- 
- /* This testcase failed on s390 because no compare instruction for
-    the check of FLAG was emitted.  */
-Index: gcc/testsuite/gcc.dg/torture/pr41555.c
-===================================================================
---- a/src/gcc/testsuite/gcc.dg/torture/pr41555.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/gcc.dg/torture/pr41555.c	(.../branches/gcc-4_4-branch)
-@@ -1,5 +1,6 @@
- /* { dg-do run } */
- /* { dg-options "-std=c99" } */
-+/* { dg-require-effective-target stdint_types } */
- 
- #include <stdint.h>
- #include <limits.h>
-Index: gcc/testsuite/gcc.dg/torture/pr45678-1.c
-===================================================================
---- a/src/gcc/testsuite/gcc.dg/torture/pr45678-1.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/gcc.dg/torture/pr45678-1.c	(.../branches/gcc-4_4-branch)
-@@ -1,4 +1,5 @@
- /* { dg-do run } */
-+/* { dg-options "-fno-common" { target { { hppa*-*-hpux* } && { ! hppa*64*-*-* } } } } */
- 
- typedef float V __attribute__ ((vector_size (16)));
- V g;
-Index: gcc/testsuite/gcc.dg/torture/pr45678-2.c
-===================================================================
---- a/src/gcc/testsuite/gcc.dg/torture/pr45678-2.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/gcc.dg/torture/pr45678-2.c	(.../branches/gcc-4_4-branch)
-@@ -1,4 +1,5 @@
- /* { dg-do run } */
-+/* { dg-options "-fno-common" { target { { hppa*-*-hpux* } && { ! hppa*64*-*-* } } } } */
- 
- typedef float V __attribute__ ((vector_size (16)));
- V g;
-Index: gcc/testsuite/gcc.dg/pragma-init-fini-2.c
-===================================================================
---- a/src/gcc/testsuite/gcc.dg/pragma-init-fini-2.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/gcc.dg/pragma-init-fini-2.c	(.../branches/gcc-4_4-branch)
-@@ -2,6 +2,7 @@
- 
- /* { dg-do link { target *-*-solaris2.* } } */
- /* { dg-options "-fpic" } */
-+/* { dg-xfail-if "no .pushsection/.popsection" { i?86-*-solaris2.8 && { ! gas } } } */
- 
- #include <stdio.h>
- 
-Index: gcc/testsuite/gcc.dg/compat/vector-1b_main.c
-===================================================================
---- a/src/gcc/testsuite/gcc.dg/compat/vector-1b_main.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/gcc.dg/compat/vector-1b_main.c	(.../branches/gcc-4_4-branch)
-@@ -1,12 +1,10 @@
- /* { dg-skip-if "test AVX vector" { ! { i?86-*-* x86_64-*-* } } } */
--/* { dg-require-effective-target avx } */
-+/* { dg-require-effective-target avx_runtime } */
- 
- /* Test compatibility of vector types: layout between separately-compiled
-    modules, parameter passing, and function return.  This test uses
-    vectors of integer values.  */
- 
--#include "cpuid.h"
--
- extern void vector_1_x (void);
- extern void exit (int);
- int fails;
-@@ -14,14 +12,6 @@
- int
- main ()
- {
--  unsigned int eax, ebx, ecx, edx;
--
--  if (!__get_cpuid (1, &eax, &ebx, &ecx, &edx))
--    return 0;
--
--  /* Run AVX vector test only if host has AVX support.  */
--  if (ecx & bit_AVX)
--    vector_1_x ();
--
-+  vector_1_x ();
-   exit (0);
- }
-Index: gcc/testsuite/gcc.dg/compat/vector-2b_main.c
-===================================================================
---- a/src/gcc/testsuite/gcc.dg/compat/vector-2b_main.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/gcc.dg/compat/vector-2b_main.c	(.../branches/gcc-4_4-branch)
-@@ -1,12 +1,10 @@
- /* { dg-skip-if "test AVX support" { ! { i?86-*-* x86_64-*-* } } } */
--/* { dg-require-effective-target avx } */
-+/* { dg-require-effective-target avx_runtime } */
- 
- /* Test compatibility of vector types: layout between separately-compiled
-    modules, parameter passing, and function return.  This test uses
-    vectors of floating points values.  */
- 
--#include "cpuid.h"
--
- extern void vector_2_x (void);
- extern void exit (int);
- int fails;
-@@ -14,14 +12,6 @@
- int
- main ()
- {
--  unsigned int eax, ebx, ecx, edx;
--
--  if (!__get_cpuid (1, &eax, &ebx, &ecx, &edx))
--    return 0;
--
--  /* Run AVX vector test only if host has AVX support.  */
--  if (ecx & bit_AVX)
--    vector_2_x ();
--
-+  vector_2_x ();
-   exit (0);
- }
-Index: gcc/testsuite/gcc.dg/debug/dwarf2/inline2.c
-===================================================================
---- a/src/gcc/testsuite/gcc.dg/debug/dwarf2/inline2.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/gcc.dg/debug/dwarf2/inline2.c	(.../branches/gcc-4_4-branch)
-@@ -21,27 +21,27 @@
-    - One for each subroutine inlined into main, that's 3.
-    - One for earch subroutine inline into the out of line instances
-      of third, second and first.  */
--/* { dg-final { scan-assembler-times "\\(DIE \\(.*?\\) DW_TAG_inlined_subroutine" 6 } } */
-+/* { dg-final { scan-assembler-times "\\(DIE \\(\[^\n\]*\\) DW_TAG_inlined_subroutine" 6 } } */
- 
- /* Likewise we should have 6 DW_TAG_lexical_block DIEs:
-    - One for each subroutine inlined into main, so that's 3.
-    - One for each subroutine inlined in the out of line instances
-      of third, second and first, that's 3.
- */
--/* { dg-final { scan-assembler-times "\\(DIE \\(.*?\\) DW_TAG_lexical_block" 6 } } */
-+/* { dg-final { scan-assembler-times "\\(DIE \\(\[^\n\]*\\) DW_TAG_lexical_block" 6 } } */
- 
- 
- /* There are 3 DW_AT_inline attributes: one per abstract inline instance.
-    The value of the attribute must be 0x3, meaning the function was
-    actually inlined.  */
--/* { dg-final { scan-assembler-times "byte.*?0x3.*? DW_AT_inline" 3 } } */
-+/* { dg-final { scan-assembler-times  "(?:byte|data1)\[^\n\]*0x3\[^\n\]* DW_AT_inline" 3 } } */
- 
-+volatile int *a;
- 
- inline void
- third (int arg3)
- {
-   int var3 = arg3;
--  int* a = 0;
-   a[0] = var3;
- }
- 
-Index: gcc/testsuite/gcc.dg/pr28796-2.c
-===================================================================
---- a/src/gcc/testsuite/gcc.dg/pr28796-2.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/gcc.dg/pr28796-2.c	(.../branches/gcc-4_4-branch)
-@@ -2,6 +2,7 @@
- /* { dg-options "-O2 -funsafe-math-optimizations -fno-finite-math-only -DUNSAFE" } */
- /* { dg-options "-mieee -O2 -funsafe-math-optimizations -fno-finite-math-only -DUNSAFE" { target alpha*-*-* } } */
- /* { dg-skip-if "No Inf/NaN support" { spu-*-* } } */
-+/* { dg-skip-if "Bug in _Q_dtoq" { sparc*-sun-solaris2.8 } } */
- 
- #include "tg-tests.h"
- 
-Index: gcc/testsuite/gcc.dg/pr44606.c
-===================================================================
---- a/src/gcc/testsuite/gcc.dg/pr44606.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/gcc.dg/pr44606.c	(.../branches/gcc-4_4-branch)
-@@ -0,0 +1,52 @@
-+/* PR target/44606 */
-+/* { dg-do run } */
-+/* { dg-options "-O2" } */
-+
-+#include <stdio.h>
-+
-+extern void abort (void);
-+
-+ typedef struct _PixelPacket { 	unsigned char r, g, b; }
-+ PixelPacket;
-+#define ARRAYLEN(X) (sizeof(X)/sizeof(X[0]))
-+PixelPacket q[6];
-+#define COLS (ARRAYLEN(q) - 1)
-+PixelPacket p[2*COLS + 22];
-+#define Minify(POS, WEIGHT) do {	\
-+	total_r += (WEIGHT)*(p[POS].r);	\
-+	total_g += (WEIGHT)*(p[POS].g);	\
-+	total_b += (WEIGHT)*(p[POS].b);	\
-+} while (0)
-+unsigned long columns = COLS;
-+int main(void)
-+{
-+	static const unsigned char answers[COLS] = { 31, 32, 34, 35, 36 };
-+	unsigned long x;
-+	for (x = 0; x < sizeof(p)/sizeof(p[0]); x++) {
-+		p[x].b = (x + 34) | 1;
-+	}
-+	for (x = 0; x < columns; x++) {
-+		double total_r = 0, total_g = 0, total_b = 0;
-+		double saved_r = 0, saved_g = 0, saved_b = 0;
-+		Minify(2*x +  0,  3.0);
-+		Minify(2*x +  1,  7.0);
-+		Minify(2*x +  2,  7.0);
-+		saved_r = total_r;
-+		saved_g = total_g;
-+		Minify(2*x + 11, 15.0);
-+		Minify(2*x + 12,  7.0);
-+		Minify(2*x + 18,  7.0);
-+		Minify(2*x + 19, 15.0);
-+		Minify(2*x + 20, 15.0);
-+		Minify(2*x + 21,  7.0);
-+		q[x].r = (unsigned char)(total_r/128.0 + 0.5);
-+		q[x].g = (unsigned char)(total_g/128.0 + 0.5);
-+		q[x].b = (unsigned char)(total_b/128.0 + 0.5);
-+		fprintf(stderr, "r:%f g:%f b:%f\n", saved_r, saved_g, saved_b);
-+	}
-+	for (x = 0; x < COLS; x++) {
-+		if (answers[x] != q[x].b)
-+			abort();
-+	}
-+	return 0;
-+}
-Index: gcc/testsuite/gcc.dg/pr46620.c
-===================================================================
---- a/src/gcc/testsuite/gcc.dg/pr46620.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/gcc.dg/pr46620.c	(.../branches/gcc-4_4-branch)
-@@ -0,0 +1,76 @@
-+/* PR tree-optimization/46620 */
-+/* SRA bitfield grouping used to lose track at padding bitfields in
-+   the middle of a word.  */
-+/* { dg-do run } */
-+/* { dg-options "-O2" } */
-+
-+#include <stdlib.h>
-+
-+struct PCT
-+{
-+  unsigned char	pi1	: 4;
-+  unsigned char	pi2	: 3;
-+  unsigned char	pif	: 5;
-+
-+  unsigned char	sl	: 2;
-+  unsigned char	uc	: 1;
-+  unsigned char	st	: 1;
-+
-+  unsigned char	p	: 1;
-+  unsigned char	cs	: 1;
-+  unsigned char	ss	: 1;
-+
-+  unsigned char	pc	: 3;
-+  unsigned char	dmv	: 4;
-+  unsigned char	cv	: 4;
-+};
-+
-+struct rt
-+{
-+  struct rt*		d;
-+  void (*edo)(void * const);
-+  short			lId;
-+  char          dac;
-+};
-+
-+struct pedr
-+{
-+  struct rt re;
-+  struct PCT pc;
-+  unsigned char mid;
-+} ;
-+
-+void __attribute__((__noinline__))
-+rei(struct rt* const me, unsigned short anId, void *ad )
-+{
-+  asm volatile ("");
-+}
-+
-+void __attribute__((__noinline__))
-+pedrdo(void * const p)
-+{
-+  asm volatile ("");
-+}
-+
-+void __attribute__((__noinline__))
-+pedri (struct pedr* const  me, struct PCT ppc, unsigned char pmid)
-+{
-+  rei(&(me->re), 0x7604, 0);
-+  me->pc = ppc;
-+  me->mid = pmid;
-+  (me)->re.edo = pedrdo;
-+}
-+
-+int main()
-+{
-+  struct PCT ps;
-+  struct pedr pm;
-+
-+  pm.pc.dmv = 0;
-+  ps.dmv = 1;
-+  pedri(&pm, ps, 32);
-+
-+  if (pm.pc.dmv != 1)
-+    abort ();
-+  exit (0);
-+}
-Index: gcc/testsuite/gcc.dg/vect/pr46663.c
-===================================================================
---- a/src/gcc/testsuite/gcc.dg/vect/pr46663.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/gcc.dg/vect/pr46663.c	(.../branches/gcc-4_4-branch)
-@@ -0,0 +1,14 @@
-+/* { dg-do compile } */
-+/* { dg-options "-O -ftree-vectorize -fdump-tree-vect-details -fexceptions" } */
-+
-+typedef __attribute__ ((const)) int (*bart) (void);
-+
-+int foo (bart bar, int m)
-+{
-+  int i, j = 0;
-+  for (i = 0; i < m; i++)
-+    j += bar();
-+  return j;
-+}
-+
-+/* { dg-final { cleanup-tree-dump "vect" } } */
-Index: gcc/testsuite/gcc.dg/vect/slp-multitypes-2.c
-===================================================================
---- a/src/gcc/testsuite/gcc.dg/vect/slp-multitypes-2.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/gcc.dg/vect/slp-multitypes-2.c	(.../branches/gcc-4_4-branch)
-@@ -1,4 +1,5 @@
- /* { dg-require-effective-target vect_int } */
-+/* { dg-do run { xfail { sparc*-*-* && ilp32 } } } PR rtl-opt/46603 */
- 
- #include <stdarg.h>
- #include <stdio.h>
-Index: gcc/testsuite/ChangeLog
-===================================================================
---- a/src/gcc/testsuite/ChangeLog	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/ChangeLog	(.../branches/gcc-4_4-branch)
-@@ -1,3 +1,379 @@
-+2011-03-09  Jason Merrill  <jason@redhat.com>
-+
-+	* g++.dg/template/nontype22.C: New.
-+
-+2011-03-08  Jason Merrill  <jason@redhat.com>
-+
-+	* g++.dg/template/anon5.C: New.
-+
-+2011-03-08  Jason Merrill  <jason@redhat.com>
-+
-+	* g++.dg/cpp0x/variadic105.C: New.
-+
-+2011-03-08  Dodji Seketeli  <dodji@redhat.com>
-+
-+	* g++.dg/lookup/template3.C: New test.
-+
-+2011-03-06  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
-+
-+	Backport from mainline
-+	PR libgfortran/47878
-+	* gfortran.dg/pr47878.f90: New test.
-+
-+2011-02-19  Alexandre Oliva  <aoliva@redhat.com>
-+
-+	PR tree-optimization/46620
-+	* gcc.dg/pr46620.c: New.
-+
-+2011-02-19  Tobias Burnus
-+
-+	PR fortran/47775
-+	* gfortran.dg/func_result_6.f90: New.
-+
-+2011-02-17  Uros Bizjak  <ubizjak@gmail.com>
-+
-+	PR target/43653
-+	* gcc.target/i386/pr43653.c: New test.
-+
-+2011-02-14  Tobias Burnus  <burnus@net-b.de>
-+
-+	* gfortran.dg/argument_checking_13.f90: Update dg-error.
-+	* gfortran.dg/argument_checking_17.f90: New.
-+
-+2011-02-10  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-+
-+	PR target/46610
-+	* gcc.target/mips/save-restore-1.c: Skip on mips-sgi-irix6*.
-+	* gcc.target/mips/save-restore-3.c: Likewise.
-+	* gcc.target/mips/save-restore-4.c: Likewise.
-+	* gcc.target/mips/save-restore-5.c: Likewise.
-+
-+2011-02-07  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-+
-+	Backport from mainline:
-+	2010-07-23  Uros Bizjak  <ubizjak@gmail.com>
-+
-+	* lib/target-supports.exp (check_avx_hw_available): New procedure.
-+	(check_effective_target_avx_runtime): New procedure.
-+
-+	* gcc.dg/compat/vector-1b_main.c: Use avx_runtime effective target.
-+	Remove cpuid.h include and __get_cpuid test.
-+	* gcc.dg/compat/vector-2b_main.c: Ditto.
-+
-+	* gcc.target/i386/avx-check.h (main): Also check bit_OSXSAVE.
-+
-+2011-02-03  Jonathan Wakely  <jwakely.gcc@gmail.com>
-+
-+	PR c++/47589
-+	* g++.dg/pr47589.C: New test.
-+
-+2011-01-31  Nathan Froyd  <froydnj@codesourcery.com>
-+
-+	Backport from mainline:
-+	2010-12-30  Nathan Froyd  <froydnj@codesourcery.com>
-+
-+	PR target/44606
-+	* gcc.dg/pr44606.c: New test.
-+
-+2011-01-24  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-+
-+	* gfortran.dg/cray_pointers_2.f90: Avoid cycling through
-+	optimization options.
-+
-+2011-01-21  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-+
-+	* g++.dg/other/anon5.C: Skip on mips-sgi-irix*.
-+
-+	Backport from mainline:
-+	2010-11-10  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-+
-+	* g++.dg/other/anon5.C: Skip on alpha*-dec-osf*.
-+
-+2011-01-17  Eric Botcazou  <ebotcazou@adacore.com>
-+
-+	Backport from mainline
-+	2010-11-22  Eric Botcazou  <ebotcazou@adacore.com>
-+
-+	* gcc.dg/pr28796-2.c: SKIP on SPARC/Solaris 8.
-+
-+	PR rtl-optimization/46603
-+	* gcc.dg/vect/slp-multitypes-2.c: XFAIL execution on SPARC 32-bit.
-+
-+2011-01-17  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-+
-+	* g++.old-deja/g++.other/init19.C: Don't XFAIL on mips-sgi-irix*.
-+
-+2011-01-17  H.J. Lu  <hongjiu.lu@intel.com>
-+
-+	Backport from mainline
-+	2011-01-17  H.J. Lu  <hongjiu.lu@intel.com>
-+
-+	PR target/47318
-+	* gcc.target/i386/avx-vmaskmovpd-1.c: New.
-+	* gcc.target/i386/avx-vmaskmovpd-2.c: Likewise.
-+	* gcc.target/i386/avx-vmaskmovps-1.c: Likewise.
-+	* gcc.target/i386/avx-vmaskmovps-1.c: Likewise.
-+
-+	* gcc.target/i386/avx-vmaskmovpd-256-1.c (avx_test): Load mask
-+	as __m256i.
-+	* gcc.target/i386/avx-vmaskmovpd-256-2.c (avx_test): Likewise.
-+	* gcc.target/i386/avx-vmaskmovps-256-1.c (avx_test): Likewise.
-+	* gcc.target/i386/avx-vmaskmovps-256-2.c (avx_test): Likewise.
-+
-+2011-01-16  Jakub Jelinek  <jakub@redhat.com>
-+
-+	Backport from mainline
-+	2010-12-21  Jakub Jelinek  <jakub@redhat.com>
-+
-+	PR target/46880
-+	* gcc.target/i386/pr46880.c: New test.
-+
-+	PR middle-end/45852
-+	* gcc.target/i386/pr45852.c: New test.
-+
-+	2010-12-10  Jakub Jelinek  <jakub@redhat.com>
-+
-+	PR rtl-optimization/46865
-+	* gcc.target/i386/pr46865-1.c: New test.
-+	* gcc.target/i386/pr46865-2.c: New test.
-+
-+2011-01-13  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-+
-+	* gfortran.dg/cray_pointers_2.f90: Use dg-timeout-factor 4.
-+
-+2011-01-12  Eric Botcazou  <ebotcazou@adacore.com>
-+
-+	PR testsuite/33033
-+	* gcc.dg/20061124-1.c: Pass -mcpu=v9 on the SPARC.
-+
-+2010-12-27  Yao Qi  <yao@codesourcery.com>
-+
-+	Backport from mainline:
-+	2010-10-14  Yao Qi  <yao@codesourcery.com>
-+
-+	PR target/45447
-+	* gcc.target/arm/pr45447.c: New test.
-+
-+2010-12-13  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-+
-+	Backport from mainline:
-+	2010-04-01  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-+
-+	* g++.dg/cpp/_Pragma1.C: Skip on alpha*-dec-osf*.
-+	* g++.dg/eh/spbp.C: Likewise.
-+	* g++.dg/other/pragma-ep-1.C: Properly define p, remove
-+	superfluous casts.
-+	* objc.dg/dwarf-1.m: Skip on  alpha*-dec-osf*.
-+	* objc.dg/dwarf-2.m: Likewise.
-+
-+2010-12-13  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-+
-+	Backport from mainline:
-+	2010-11-12  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-+
-+	* lib/prune.exp (prune_gcc_output): Ignore IRIX 6 linker multiline
-+	warning.
-+	* g++.dg/cpp/_Pragma1.C: Skip on mips-sgi-irix*.
-+
-+2010-12-09  Daniel Kraft  <d@domob.eu>
-+
-+	PR fortran/46794
-+	* gfortran.dg/power2.f90: New test.
-+
-+2010-12-09  Paul Thomas  <pault@gcc.gnu.org>
-+
-+	PR fortran/45081
-+	* gfortran.dg/derived_array_intrinsics_1.f90 : New test.
-+
-+2010-12-07  Jakub Jelinek  <jakub@redhat.com>
-+
-+	Backport from mainline
-+	2010-11-20  Jakub Jelinek  <jakub@redhat.com>
-+
-+	PR c++/46538
-+	* g++.dg/other/error34.C: New test.
-+
-+	2010-11-18  Jakub Jelinek  <jakub@redhat.com>
-+
-+	PR middle-end/46534
-+	* gcc.c-torture/compile/pr46534.c: New test.
-+
-+2010-12-06  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-+
-+	* ada/acats/run_acats (which): Assign output to temporary
-+	variable, only use if successful.
-+	Use last field of type output.
-+
-+2010-12-05  Richard Guenther  <rguenther@suse.de>
-+	    Ira Rosen  <irar@il.ibm.com>
-+
-+	PR tree-optimization/46663
-+	* gcc.dg/vect/pr46663.c: New test.
-+
-+2010-11-28  Eric Botcazou  <ebotcazou@adacore.com>
-+
-+	* gnat.dg/aliasing2.adb (dg-final): Robustify pattern matching.
-+	* gnat.dg/pack9.adb (dg-final): Likewise.
-+
-+2010-11-27  Tobias Burnus  <burnus@net-b.de>
-+
-+	PR fortran/46638
-+	PR fortran/46668
-+	* gfortran.dg/transfer_simplify_10.f90: Fix endian issue.
-+
-+2010-11-25  Tobias Burnus  <burnus@net-b.de>
-+
-+	PR fortran/46638
-+	* gfortran.dg/transfer_simplify_10.f90: New.
-+
-+2010-11-13  Tobias Burnus  <burnus@net-b.de>
-+
-+	PR fortran/45742
-+	* gfortran.dg/volatile12.f90: New.
-+
-+2010-11-12  Jakub Jelinek  <jakub@redhat.com>
-+
-+	Backport from mainline
-+	2010-11-05  Jakub Jelinek  <jakub@redhat.com>
-+
-+	PR middle-end/43690
-+	* c-c++-common/pr43690.c: New test.
-+
-+	2010-11-03  Jakub Jelinek  <jakub@redhat.com>
-+
-+	PR tree-optimization/46107
-+	* gcc.c-torture/compile/pr46107.c: New test.
-+
-+2010-11-10  Uros Bizjak  <ubizjak@gmail.com>
-+
-+	PR target/46419
-+	* gcc-target/i386/pr46419.c: New test.
-+
-+2010-11-08  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-+
-+	Backport from mainline:
-+	2010-11-05  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-+
-+	* gcc.target/i386/i386.exp (FLAGS): Remove.
-+	Wrap gcc_target_compile with $clearcap_ldflags added to options.
-+
-+2010-11-03  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
-+
-+	Backport from mainline:
-+	PR libgfortran/46010
-+	* gfortran.dg/namelist_66.f90: New test.
-+
-+2010-10-22  Uros Bizjak  <ubizjak@gmail.com>
-+	    H.J. Lu  <hongjiu.lu@intel.com>
-+
-+	PR target/45946
-+	* gcc.target/i386/pr45946.c: New test.
-+
-+2010-10-21  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-+
-+	Backport from mainline:
-+	2010-10-20  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-+
-+	PR c++/46024
-+	* g++.dg/warn/miss-format-1.C: Enclose dg-error target list in braces.
-+
-+	2010-08-04  Daniel Gutson  <dgutson@codesourcery.com>
-+
-+	* g++.dg/warn/miss-format-1.C: Update line number.
-+
-+	2010-05-03  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-+
-+	* g++.dg/warn/miss-format-1.C (bar): xfail dg-warning on
-+	alpha*-dec-osf*.
-+
-+2010-10-18  Jakub Jelinek  <jakub@redhat.com>
-+
-+	PR middle-end/46019
-+	* gcc.c-torture/execute/pr46019.c: New test.
-+
-+2010-10-16  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
-+
-+	Backport from mainline
-+	2010-09-06  Jakub Jelinek  <jakub@redhat.com>
-+
-+	PR testsuite/45543
-+	* g++.dg/debug/dwarf2/typedef1.C: Expect just one
-+	DW_TAG_enumeration_type DIE.
-+
-+	2010-09-04  Andreas Schwab  <schwab@linux-m68k.org>
-+	* g++.dg/debug/dwarf2/typedef1.C: Replace ".*" by "\[^\n\]*".
-+
-+	2009-11-07  Jason Merrill  <jason@redhat.com>
-+
-+	PR c++/18451
-+	PR c++/40738
-+	* g++.dg/other/typedef1.C: Update expected errors.
-+
-+	2009-08-03  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
-+
-+	PR testsuite/40858
-+	* g++.dg/debug/dwarf2/typedef1.C: Also match assembler string used with
-+	.ascii.
-+
-+	2010-09-04  Andreas Schwab  <schwab@linux-m68k.org>
-+	* g++.dg/debug/dwarf2/pubnames-1.C: Replace ".*" by "\[^\n\]*".
-+
-+	2010-07-07  Tom Tromey  <tromey@redhat.com>
-+	* g++.dg/debug/dwarf2/pubnames-1.C: Make darwin-specific.
-+
-+	2009-09-08  Dodji Seketeli  <dodji@redhat.com>
-+	* g++.dg/debug/dwarf2/pubnames-1.C: Use -fno-merge-debug-string
-+	and adjust.  Also, adjust to take darwin specifics in account.
-+
-+2010-10-12  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-+
-+	* gcc.dg/pragma-init-fini.c: Skip on i?86-*-solaris2.8 && !gas.
-+	* gcc.dg/pragma-init-fini-2.c: XFAIL on i?86-*-solaris2.8 && !gas.
-+
-+2010-10-10  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
-+
-+	Backport from mainline
-+	2010-09-04  Andreas Schwab  <schwab@linux-m68k.org>
-+
-+	* gcc.dg/debug/dwarf2/inline2.c: Replace ".*" by "\[^\n\]*".
-+
-+	2010-03-24  Jakub Jelinek  <jakub@redhat.com>
-+
-+	* gcc.dg/debug/dwarf2/inline2.c (third): Make a a global var
-+	and add volatile keyword.
-+
-+	2009-11-23  Steve Ellcey  <sje@cup.hp.com>
-+
-+	* gcc.dg/debug/dwarf2/inline2.c: Modify scan.
-+
-+2010-10-10  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
-+
-+	* gcc.dg/torture/pr41555.c: Require stdint types.
-+
-+2010-10-06  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
-+
-+	Backport from mainline
-+	PR libfortran/45710
-+	* gfortran.dg/namelist_65.f90: New test.
-+
-+2010-10-04  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
-+
-+	* gcc.dg/torture/pr45678-1.c: Add -fno-common to options on 32-bit
-+	hppa*-*-hpux*.
-+	* gcc.dg/torture/pr45678-2.c: Likewise.
-+
-+2010-10-01  Jakub Jelinek  <jakub@redhat.com>
-+
-+	Backport from mainline
-+	2010-09-30  Jakub Jelinek  <jakub@redhat.com>
-+
-+	* g++.dg/torture/pr45843.C: New test.
-+
-+	2010-06-21  Jakub Jelinek  <jakub@redhat.com>
-+
-+	PR target/44575
-+	* gcc.c-torture/execute/pr44575.c: New test.
-+
- 2010-10-01  Release Manager
- 
- 	* GCC 4.4.5 released.
-@@ -84,7 +460,7 @@
- 
- 	PR middle-end/40386
- 	* gcc.c-torture/execute/{pr40386.c,pr40386.x}: New testcase.
--	
-+
- 2010-09-08  Jakub Jelinek  <jakub@redhat.com>
- 
- 	PR fortran/45595
-@@ -94,14 +470,14 @@
- 
- 	Backport from mainline
- 	2010-08-19  Ian Bolton  <ian.bolton@arm.com>
--	
-+
- 	PR target/45070
- 	* gcc.c-torture/execute/pr45070.c: New.
- 
- 	2010-08-19  Ian Bolton  <ian.bolton@arm.com>
- 
- 	* g++.dg/pr44328.C: New test.
--	
-+
- 	2010-08-07  Marcus Shawcroft <marcus.shawcroft@arm.com>
- 
- 	* lib/target-supports.exp: (check_effective_target_sync_int_long):
-Index: gcc/testsuite/g++.old-deja/g++.other/init19.C
-===================================================================
---- a/src/gcc/testsuite/g++.old-deja/g++.other/init19.C	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/g++.old-deja/g++.other/init19.C	(.../branches/gcc-4_4-branch)
-@@ -1,4 +1,4 @@
--// { dg-do run { xfail { { ! cxa_atexit } && { ! *-*-solaris2* } } } }
-+// { dg-do run { xfail { { ! cxa_atexit } && { ! { mips-sgi-irix* *-*-solaris2* } } } } }
- #include <stdlib.h>
- 
- #define assert(x) do { if (! (x)) abort(); } while (0)
-Index: gcc/testsuite/g++.dg/other/error34.C
-===================================================================
---- a/src/gcc/testsuite/g++.dg/other/error34.C	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/g++.dg/other/error34.C	(.../branches/gcc-4_4-branch)
-@@ -0,0 +1,6 @@
-+// PR c++/46538
-+// { dg-do compile }
-+// { dg-options "" }
-+
-+S () : str(__PRETTY_FUNCTION__) {}	// { dg-error "forbids declaration" }
-+// { dg-error "only constructors" "" { target *-*-* } 5 }
-Index: gcc/testsuite/g++.dg/other/anon5.C
-===================================================================
---- a/src/gcc/testsuite/g++.dg/other/anon5.C	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/g++.dg/other/anon5.C	(.../branches/gcc-4_4-branch)
-@@ -1,5 +1,5 @@
- // PR c++/34094
--// { dg-do link { target { ! { *-*-darwin* *-*-hpux* *-*-solaris2.* } } } }
-+// { dg-do link { target { ! { *-*-darwin* *-*-hpux* *-*-solaris2.* alpha*-dec-osf* mips-sgi-irix* } } } }
- // { dg-options "-g" }
- 
- namespace {
-Index: gcc/testsuite/g++.dg/other/pragma-ep-1.C
-===================================================================
---- a/src/gcc/testsuite/g++.dg/other/pragma-ep-1.C	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/g++.dg/other/pragma-ep-1.C	(.../branches/gcc-4_4-branch)
-@@ -22,6 +22,6 @@
- 
- extern "C" int four(void);
- 
--void *p[] = {
--  (void *) one, (void *) two, (void *) three, (void *) four
-+int (*p[])(void) = {
-+  one, two, three, four
- };
-Index: gcc/testsuite/g++.dg/cpp/_Pragma1.C
-===================================================================
---- a/src/gcc/testsuite/g++.dg/cpp/_Pragma1.C	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/g++.dg/cpp/_Pragma1.C	(.../branches/gcc-4_4-branch)
-@@ -2,7 +2,7 @@
- // This is supposed to succeed only if
- // the target defines HANDLE_PRAGMA_PACK_PUSH_POP 
- // and doesn't define HANDLE_PRAGMA_PACK_WITH_EXPANSION.
--// { dg-do compile { target { ! { powerpc-ibm-aix* *-*-solaris2* fido-*-* m68k-*-* sh*-[us]*-elf m32c-*-* } } } }
-+// { dg-do compile { target { ! { powerpc-ibm-aix* *-*-solaris2* fido-*-* m68k-*-* mips-sgi-irix* sh*-[us]*-elf m32c-*-* alpha*-dec-osf* } } } }
- 
- #define push bar
- #define foo _Pragma ("pack(push)")
-Index: gcc/testsuite/g++.dg/pr47589.C
-===================================================================
---- a/src/gcc/testsuite/g++.dg/pr47589.C	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/g++.dg/pr47589.C	(.../branches/gcc-4_4-branch)
-@@ -0,0 +1,26 @@
-+// PR c++/47589
-+// { dg-do compile }
-+
-+struct F
-+{
-+    typedef void(*Cb)();
-+
-+    F(Cb);
-+};
-+
-+struct C
-+{
-+    template<class D> static void f();
-+};
-+
-+template<class D>
-+struct TF : F
-+{
-+    TF() : F(C::f<D>) { }
-+};
-+
-+struct DTC : TF<DTC>
-+{
-+    DTC() { }
-+};
-+
-Index: gcc/testsuite/g++.dg/debug/dwarf2/pubnames-1.C
-===================================================================
---- a/src/gcc/testsuite/g++.dg/debug/dwarf2/pubnames-1.C	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/g++.dg/debug/dwarf2/pubnames-1.C	(.../branches/gcc-4_4-branch)
-@@ -1,14 +1,22 @@
- // Contributed by Dodji Seketeli <dodji@redhat.com>
- // Origin PR debug/39706
--// { dg-options "-g -dA" }
--// { dg-do compile }
--// { dg-final { scan-assembler-times ".debug_pubnames" 1 } }
--// { dg-final { scan-assembler-times "\"main\".*external name" 1 } }
--// { dg-final { scan-assembler-times "\"ns::ns_x.*external name" 1 } }
--// { dg-final { scan-assembler-times "\"y::y_x.*external name" 1 } }
-+// { dg-do compile { target *-*-darwin* } }
-+// { dg-options "-g -dA -fno-merge-debug-strings" }
-+//
-+// There should be one debug_pubnames section generated.
-+// On Darwin though, there is also a label pointing at the begining of the
-+// debug_pubnames section. The assembly code of that label adds an occurence
-+// of section declaration assembly. So on Darwin, we need to check for two
-+// occurences of the debug_pubnames section declaration.
-+// { dg-final { scan-assembler-times "\.section\[\t \]\[^\n\]*debug_pubnames" 1 { target { ! *-*-darwin* } } } }
-+// { dg-final { scan-assembler-times "\.section\[\t \]\[^\n\]*debug_pubnames" 2 { target { *-*-darwin* } } } }
-+//
-+// Then check of the presence of the names we are interested in.
-+// { dg-final { scan-assembler-times "\"main.0\"\[^\n\]*external name" 1 } }
-+// { dg-final { scan-assembler-times "\"ns::ns_x\[^\n\]*external name" 1 } }
-+// { dg-final { scan-assembler-times "\"y::y_x\[^\n\]*external name" 1 } }
- 
- namespace ns { int ns_x; }
- class y { public: static int y_x; };
- int y::y_x;
- int main() { return ns::ns_x; }
--
-Index: gcc/testsuite/g++.dg/debug/dwarf2/typedef1.C
-===================================================================
---- a/src/gcc/testsuite/g++.dg/debug/dwarf2/typedef1.C	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/g++.dg/debug/dwarf2/typedef1.C	(.../branches/gcc-4_4-branch)
-@@ -3,12 +3,12 @@
- // { dg-options "-g -dA" }
- // { dg-do compile }
- // { dg-final { scan-assembler-times "DW_TAG_structure_type" 2 } }
--// { dg-final { scan-assembler-times "DW_AT_name: \"foo<1u>\"" 1 } }
-+// { dg-final { scan-assembler-times "DW_AT_name: \"foo<1u>\"|\"foo<1u>..\"\[^\n\]*DW_AT_name" 1 } }
- // { dg-final { scan-assembler-times "DW_TAG_enumeration_type" 2 } }
--// { dg-final { scan-assembler-times "DW_AT_name: \"typedef foo<1u>::type type\"" 1 } }
--// { dg-final { scan-assembler-times "DIE (.*) DW_TAG_enumeration_type" 2 } }
--// { dg-final { scan-assembler-times "\"e0..\".*DW_AT_name" 1 } }
--// { dg-final { scan-assembler-times "\"e1..\".*DW_AT_name" 1 } }
-+// { dg-final { scan-assembler-times "DW_AT_name: \"typedef foo<1u>::type type\"|\"typedef foo<1u>::type type..\"\[^\n\]*DW_AT_name" 1 } }
-+// { dg-final { scan-assembler-times "DIE \\(\[^\n\]*\\) DW_TAG_enumeration_type" 1 } }
-+// { dg-final { scan-assembler-times "\"e0..\"\[^\n\]*DW_AT_name" 1 } }
-+// { dg-final { scan-assembler-times "\"e1..\"\[^\n\]*DW_AT_name" 1 } }
- 
- template <unsigned int n>
- struct foo
-Index: gcc/testsuite/g++.dg/warn/miss-format-1.C
-===================================================================
---- a/src/gcc/testsuite/g++.dg/warn/miss-format-1.C	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/g++.dg/warn/miss-format-1.C	(.../branches/gcc-4_4-branch)
-@@ -4,7 +4,7 @@
- /* { dg-options "-Wmissing-format-attribute" } */
- /* { dg-options "-Wmissing-format-attribute -Wno-abi" { target arm_eabi } } */
- /* VxWorks does not provide vscanf, either in kernel or RTP mode.  */
--/* { dg-error "not declared" "" { target *-*-solaris2.[7-8] *-*-vxworks* } 25 } */
-+/* { dg-error "not declared" "" { target { *-*-solaris2.[7-8] *-*-vxworks* alpha*-dec-osf* } } 26 } */
- 
- #include <stdio.h>
- #include <stdarg.h>
-@@ -23,7 +23,7 @@
- {
-   va_list ap;
-   va_start (ap, fmt);
--  vscanf (fmt, ap); /* { dg-warning "candidate" "scanf attribute warning" { xfail *-*-solaris2.[7-8] *-*-vxworks* } } */
-+  vscanf (fmt, ap); /* { dg-warning "candidate" "scanf attribute warning" { xfail *-*-solaris2.[7-8] *-*-vxworks* alpha*-dec-osf* } } */
-   va_end (ap);
- }
- 
-Index: gcc/testsuite/g++.dg/lookup/template3.C
-===================================================================
---- a/src/gcc/testsuite/g++.dg/lookup/template3.C	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/g++.dg/lookup/template3.C	(.../branches/gcc-4_4-branch)
-@@ -0,0 +1,35 @@
-+// Origin PR c++/47957
-+// { dg-do compile }
-+
-+struct S
-+{
-+  int m;
-+
-+  S()
-+    : m(0)
-+  {
-+  }
-+};
-+
-+struct Base
-+{
-+  typedef S T;
-+};
-+
-+template<class T>
-+struct Derived : public Base
-+{
-+  int
-+  foo()
-+  {
-+    T a; // This is Base::T, not the template parameter.
-+    return a.m;
-+  }
-+};
-+
-+int
-+main()
-+{
-+  Derived<char> d;
-+  return d.foo();
-+}
-Index: gcc/testsuite/g++.dg/cpp0x/variadic105.C
-===================================================================
---- a/src/gcc/testsuite/g++.dg/cpp0x/variadic105.C	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/g++.dg/cpp0x/variadic105.C	(.../branches/gcc-4_4-branch)
-@@ -0,0 +1,24 @@
-+// PR c++/47289
-+// { dg-options -std=c++0x }
-+// { dg-prune-output "note" }
-+
-+template <template <typename... __ARGS> class _F, typename... _ARGS>
-+auto reverse (_ARGS... args) -> decltype(_F<_ARGS...>::call_function(args...)) {
-+  return _F<_ARGS...>::call_function(args...);
-+}
-+
-+template <typename _T>
-+_T sum(_T x) { return x; }
-+
-+template <typename _T, typename... _ARGS>
-+_T sum(_T x, _ARGS... args) { return x + sum(args...); }
-+
-+template <typename _T, typename... _ARGS>
-+struct call_sum {
-+  static _T call_function(_T x1, _ARGS... args) { return sum(x1, args...); }
-+};
-+
-+int main() {
-+  // This shouldn't be an error; this is bug 35722.
-+  reverse<call_sum>(1,2);	// { dg-bogus "no match" "" { xfail *-*-* } }
-+}
-Index: gcc/testsuite/g++.dg/eh/spbp.C
-===================================================================
---- a/src/gcc/testsuite/g++.dg/eh/spbp.C	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/g++.dg/eh/spbp.C	(.../branches/gcc-4_4-branch)
-@@ -1,6 +1,6 @@
- /* { dg-do run } */
- /* { dg-options "-gdwarf-2" } */
--/* { dg-skip-if "No Dwarf" { { *-*-aix* hppa*-*-hpux* } && { ! hppa*64*-*-* } } { "*" } { "" } } */
-+/* { dg-skip-if "No Dwarf" { { *-*-aix* alpha*-dec-osf* hppa*-*-hpux* } && { ! hppa*64*-*-* } } { "*" } { "" } } */
- 
- /* This was a bug on x86-darwin, where the register numbering for SP
-    and BP was swapped (it's easy to do because on that port it's
-Index: gcc/testsuite/g++.dg/torture/pr45843.C
-===================================================================
---- a/src/gcc/testsuite/g++.dg/torture/pr45843.C	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/g++.dg/torture/pr45843.C	(.../branches/gcc-4_4-branch)
-@@ -0,0 +1,28 @@
-+// PR target/45843
-+// { dg-do run }
-+
-+#include <stdarg.h>
-+
-+extern "C" void abort ();
-+struct S { struct T { } a[14]; char b; };
-+struct S arg, s;
-+
-+void
-+foo (int z, ...)
-+{
-+  char c;
-+  va_list ap;
-+  va_start (ap, z);
-+  c = 'a';
-+  arg = va_arg (ap, struct S);
-+  if (c != 'a')
-+    abort ();
-+  va_end (ap);
-+}
-+
-+int
-+main ()
-+{
-+  foo (1, s);
-+  return 0;
-+}
-Index: gcc/testsuite/g++.dg/template/nontype22.C
-===================================================================
---- a/src/gcc/testsuite/g++.dg/template/nontype22.C	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/g++.dg/template/nontype22.C	(.../branches/gcc-4_4-branch)
-@@ -0,0 +1,11 @@
-+// PR c++/44629
-+// The proper mangling is unclear.
-+
-+template<typename T> int cmp1(T a, T b);
-+template<typename T, int (*cmp)(T, T) = cmp1> struct A { };
-+template <typename T> void f (A<T> &);
-+void g()
-+{
-+  A<char> a;
-+  f(a);				// { dg-bogus "" "" { xfail *-*-* } }
-+}
-Index: gcc/testsuite/g++.dg/template/anon5.C
-===================================================================
---- a/src/gcc/testsuite/g++.dg/template/anon5.C	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/g++.dg/template/anon5.C	(.../branches/gcc-4_4-branch)
-@@ -0,0 +1,6 @@
-+// PR c++/45651
-+
-+namespace { template <int T> struct A {}; }
-+template <int T> struct B { void f(A<T>); };
-+template struct B<1>;
-+template<int T> void B<T>::f(A<T>) {}
-Index: gcc/testsuite/lib/prune.exp
-===================================================================
---- a/src/gcc/testsuite/lib/prune.exp	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/lib/prune.exp	(.../branches/gcc-4_4-branch)
-@@ -1,4 +1,4 @@
--#   Copyright (C) 1997, 1999, 2000, 2002, 2004, 2007, 2008
-+#   Copyright (C) 1997, 1999, 2000, 2002, 2004, 2007, 2008, 2010
- #   Free Software Foundation, Inc.
- 
- # This program is free software; you can redistribute it and/or modify
-@@ -37,6 +37,9 @@
-     regsub -all "(^|\n)\[^\n\]*: Additional NOP may be necessary to workaround Itanium processor A/B step errata" $text "" text
-     regsub -all "(^|\n)\[^\n*\]*: Assembler messages:\[^\n\]*" $text "" text
- 
-+    # Ignore second line of IRIX 6 linker multiline message.
-+    regsub -all "(^|\n)\[ \t\]*that might degrade performance on an older version \\(rev. 2.2\\) R4000 processor.\[^\n\]*" $text "" text
-+
-     # It would be nice to avoid passing anything to gcc that would cause it to
-     # issue these messages (since ignoring them seems like a hack on our part),
-     # but that's too difficult in the general case.  For example, sometimes
-Index: gcc/testsuite/lib/target-supports.exp
-===================================================================
---- a/src/gcc/testsuite/lib/target-supports.exp	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/lib/target-supports.exp	(.../branches/gcc-4_4-branch)
-@@ -1,5 +1,5 @@
--#   Copyright (C) 1999, 2001, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
--#    Free Software Foundation, Inc.
-+#   Copyright (C) 1999, 2001, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-+#   2011 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
-@@ -926,6 +926,30 @@
-     }]
- }
- 
-+# Return 1 if the target supports executing AVX instructions, 0
-+# otherwise.  Cache the result.
-+
-+proc check_avx_hw_available { } {
-+    return [check_cached_effective_target avx_hw_available {
-+	# If this is not the right target then we can skip the test.
-+	if { !([istarget x86_64-*-*] || [istarget i?86-*-*]) } {
-+	    expr 0
-+	} else {
-+	    check_runtime_nocache avx_hw_available {
-+		#include "cpuid.h"
-+		int main ()
-+		{
-+		  unsigned int eax, ebx, ecx, edx;
-+		  if (__get_cpuid (1, &eax, &ebx, &ecx, &edx))
-+		    return ((ecx & (bit_AVX | bit_OSXSAVE))
-+			    != (bit_AVX | bit_OSXSAVE));
-+		  return 1;
-+		}
-+	    } ""
-+	}
-+    }]
-+}
-+
- # Return 1 if the target supports running SSE executables, 0 otherwise.
- 
- proc check_effective_target_sse_runtime { } {
-@@ -946,6 +970,16 @@
-     }
- }
- 
-+# Return 1 if the target supports running AVX executables, 0 otherwise.
-+
-+proc check_effective_target_avx_runtime { } {
-+    if { [check_effective_target_avx]
-+	 && [check_avx_hw_available] } {
-+	return 1
-+    }
-+    return 0
-+}
-+
- # Return 1 if the target supports executing AltiVec instructions, 0
- # otherwise.  Cache the result.
- 
-Index: gcc/testsuite/objc.dg/dwarf-1.m
-===================================================================
---- a/src/gcc/testsuite/objc.dg/dwarf-1.m	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/objc.dg/dwarf-1.m	(.../branches/gcc-4_4-branch)
-@@ -1,6 +1,6 @@
- /* { dg-options "-gdwarf-2 -dA" } */
- /* { dg-final { scan-assembler "\"id.0\".*DW_AT_name" } } */
--/* { dg-skip-if "No Dwarf" { { *-*-aix* hppa*-*-hpux* } && { ! hppa*64*-*-* } } { "*" } { "" } } */
-+/* { dg-skip-if "No Dwarf" { { *-*-aix* alpha*-dec-osf* hppa*-*-hpux* } && { ! hppa*64*-*-* } } { "*" } { "" } } */
- @interface foo
-   id x;
- @end
-Index: gcc/testsuite/objc.dg/dwarf-2.m
-===================================================================
---- a/src/gcc/testsuite/objc.dg/dwarf-2.m	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/objc.dg/dwarf-2.m	(.../branches/gcc-4_4-branch)
-@@ -1,4 +1,4 @@
- /* { dg-options "-gdwarf-2 -dA" } */
- /* { dg-final { scan-assembler "0x10\[^0-9a-f\].*DW_AT_language" } } */
--/* { dg-skip-if "No Dwarf" { { *-*-aix* hppa*-*-hpux* } && { ! hppa*64*-*-* } } { "*" } { "" } } */
-+/* { dg-skip-if "No Dwarf" { { *-*-aix* alpha*-dec-osf* hppa*-*-hpux* } && { ! hppa*64*-*-* } } { "*" } { "" } } */
- int x;
-Index: gcc/testsuite/gfortran.dg/pr47878.f90
-===================================================================
---- a/src/gcc/testsuite/gfortran.dg/pr47878.f90	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/gfortran.dg/pr47878.f90	(.../branches/gcc-4_4-branch)
-@@ -0,0 +1,10 @@
-+! PR fortran/47878
-+! { dg-do run }
-+  integer :: a(5)
-+  open (99, recl = 40)
-+  write (99, '(5i3)') 1, 2, 3
-+  rewind (99)
-+  read (99, '(5i3)') a
-+  if (any (a.ne.(/1, 2, 3, 0, 0/))) call abort 
-+  close (99, status = 'delete')
-+end
-Index: gcc/testsuite/gfortran.dg/argument_checking_13.f90
-===================================================================
---- a/src/gcc/testsuite/gfortran.dg/argument_checking_13.f90	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/gfortran.dg/argument_checking_13.f90	(.../branches/gcc-4_4-branch)
-@@ -26,9 +26,9 @@
- real, allocatable :: deferred(:,:,:)
- real, pointer     :: ptr(:,:,:)
- call rlv1(deferred(1,1,1))         ! valid since contiguous
--call rlv1(ptr(1,1,1))              ! { dg-error "Element of assumed-shaped array" }
--call rlv1(assumed_sh_dummy(1,1,1)) ! { dg-error "Element of assumed-shaped array" }
--call rlv1(pointer_dummy(1,1,1))    ! { dg-error "Element of assumed-shaped array" }
-+call rlv1(ptr(1,1,1))              ! { dg-error "Element of assumed-shaped or pointer array" }
-+call rlv1(assumed_sh_dummy(1,1,1)) ! { dg-error "Element of assumed-shaped or pointer array" }
-+call rlv1(pointer_dummy(1,1,1))    ! { dg-error "Element of assumed-shaped or pointer array" }
- end
- 
- subroutine test2(assumed_sh_dummy, pointer_dummy)
-Index: gcc/testsuite/gfortran.dg/namelist_66.f90
-===================================================================
---- a/src/gcc/testsuite/gfortran.dg/namelist_66.f90	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/gfortran.dg/namelist_66.f90	(.../branches/gcc-4_4-branch)
-@@ -0,0 +1,40 @@
-+! { dg-do run }
-+! PR46010 Failure to read these two examples of namelists
-+type ptracer
-+   character(len = 2)  :: sname
-+   logical              :: lini
-+end type ptracer
-+type(ptracer) , dimension(3) :: tracer
-+namelist/naml1/  tracer
-+
-+type qptracer
-+   character(len = 20)  :: sname  = ""!: short name
-+   character(len = 45 ) :: lname  = ""!: long name
-+   character(len = 20 ) :: sunit  = "" !: unit
-+   logical              :: lini   !: read in a file or not
-+   logical              :: lsav   !: ouput the tracer or not 
-+end type qptracer
-+type(qptracer) , dimension(3) :: qtracer
-+namelist/naml2/  qtracer
-+
-+open (99, file='nml.dat', status="replace")
-+write(99,*) "&naml1"
-+write(99,*) "   tracer(1)   = 'aa', .true."
-+write(99,*) "   tracer(2)   = 'bb', .true."
-+write(99,*) "   tracer(3)   = 'cc', .true."
-+write(99,*) "/"
-+rewind(99)
-+read (99, nml=naml1)
-+write (*, nml=naml1)
-+rewind(99)
-+write(99,*) "&naml2     !   just some stuff"
-+write(99,*) "   qtracer(1)   = 'dic     ' , 'dissolved inorganic concentration      ',  'mol-c/l' ,  .true.     ,  .true.,"
-+write(99,*) "   qtracer(2)   = 'alkalini' , 'total alkalinity concentration         ',  'eq/l '   ,  .true.     ,  .true.,"
-+write(99,*) "/"
-+rewind(99)
-+read (99, nml=naml2)
-+write (*, nml=naml2)
-+rewind(99)
-+
-+close (99, status="delete")
-+end
-Index: gcc/testsuite/gfortran.dg/cray_pointers_2.f90
-===================================================================
---- a/src/gcc/testsuite/gfortran.dg/cray_pointers_2.f90	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/gfortran.dg/cray_pointers_2.f90	(.../branches/gcc-4_4-branch)
-@@ -1,5 +1,8 @@
--! { dg-do run }
--! { dg-options "-fcray-pointer -fbounds-check" }
-+! Using two spaces between dg-do and run is a hack to keep gfortran-dg-runtest
-+! from cycling through optimization options for this expensive test.
-+! { dg-do  run }
-+! { dg-options "-O3 -fcray-pointer -fbounds-check" }
-+! { dg-timeout-factor 4 }
- ! Series of routines for testing a Cray pointer implementation
- program craytest
-   common /errors/errors(400)
-Index: gcc/testsuite/gfortran.dg/argument_checking_17.f90
-===================================================================
---- a/src/gcc/testsuite/gfortran.dg/argument_checking_17.f90	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/gfortran.dg/argument_checking_17.f90	(.../branches/gcc-4_4-branch)
-@@ -0,0 +1,26 @@
-+! { dg-do compile }
-+!
-+! PR fortran/47569
-+!
-+! Contributed by Jos de Kloe 
-+!
-+module teststr
-+  implicit none
-+  integer, parameter :: GRH_SIZE = 20, NMAX = 41624
-+  type strtype
-+    integer   :: size
-+    character :: mdr(NMAX)
-+  end type strtype
-+contains
-+  subroutine sub2(string,str_size)
-+    integer,intent(in)    :: str_size
-+    character,intent(out) :: string(str_size)
-+    string(:) = 'a'
-+  end subroutine sub2
-+  subroutine sub1(a)
-+    type(strtype),intent(inout) :: a
-+    call sub2(a%mdr(GRH_SIZE+1),a%size-GRH_SIZE)
-+  end subroutine sub1
-+end module teststr
-+
-+! { dg-final { cleanup-modules "teststr" } }
-Index: gcc/testsuite/gfortran.dg/derived_array_intrinisics_1.f90
-===================================================================
---- a/src/gcc/testsuite/gfortran.dg/derived_array_intrinisics_1.f90	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/gfortran.dg/derived_array_intrinisics_1.f90	(.../branches/gcc-4_4-branch)
-@@ -0,0 +1,33 @@
-+! { dg-do compile }
-+! { dg-options "-fdump-tree-original" }
-+! Test the fix for PR45081 in which derived type array valued intrinsics failed
-+! to simplify, which caused an ICE in trans-array.c
-+!
-+! Contributed by Thorsten Ohl <ohl@physik.uni-wuerzburg.de>
-+! 
-+! Modified for GCC 4.4, which does not support (UN)PACK, TRANSPOSE or SPEAD
-+! as initialization expressions.
-+
-+  module m
-+    implicit none
-+    integer :: i
-+    type t
-+      integer :: i
-+    end type t
-+    type(t), dimension(4), parameter :: t1  = [( t(i), i = 1, 4)]
-+    type(t), dimension(4), parameter :: t2  = [( t(i), i = 8, 11)]
-+    type(t), dimension(2,2), parameter :: a = reshape ( t1, [ 2, 2 ] )
-+    type(t), dimension(2,2), parameter :: b = a !transpose (a)
-+    type(t), dimension(4), parameter :: c = reshape ( b, [ 4 ] )
-+    type(t), dimension(2), parameter :: d = c([2,4]) !pack ( c, [.false.,.true.,.false.,.true.])
-+    type(t), dimension(4), parameter :: e = c !unpack (d, [.false.,.true.,.false.,.true.], t2)
-+    type(t), dimension(4,2), parameter :: f = reshape([c,c],[4,2]) !spread (e, 2, 2)
-+    type(t), dimension(8), parameter :: g = reshape ( f, [ 8 ] )
-+    integer, parameter :: total = g(3)%i
-+  end module m
-+
-+    use m
-+    integer :: j
-+    j = total
-+  end
-+! { dg-final { scan-tree-dump-times "j = 3" 1 "original" } }
-Index: gcc/testsuite/gfortran.dg/volatile12.f90
-===================================================================
---- a/src/gcc/testsuite/gfortran.dg/volatile12.f90	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/gfortran.dg/volatile12.f90	(.../branches/gcc-4_4-branch)
-@@ -0,0 +1,16 @@
-+! { dg-do compile }
-+! { dg-options "-fdump-tree-optimized -O3" }
-+!
-+! PR fortran/45742
-+!
-+
-+subroutine sub(arg)
-+  integer, volatile :: arg
-+  if (arg /= arg) call I_dont_exist()
-+end
-+
-+! { dg-final { scan-tree-dump "integer.kind=.. . volatile arg" "optimized" } }
-+! { dg-final { scan-tree-dump-times " =.v. arg;" 2 "optimized" } }
-+! { dg-final { scan-tree-dump "i_dont_exist" "optimized" } }
-+! { dg-final { cleanup-tree-dump "optimized" } }
-+
-Index: gcc/testsuite/gfortran.dg/func_result_6.f90
-===================================================================
---- a/src/gcc/testsuite/gfortran.dg/func_result_6.f90	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/gfortran.dg/func_result_6.f90	(.../branches/gcc-4_4-branch)
-@@ -0,0 +1,73 @@
-+! { dg-do run }
-+!
-+! PR fortran/47775
-+!
-+! Contributed by Fran Martinez Fadrique
-+!
-+! Before, a temporary was missing for generic procedured (cf. test())
-+! as the allocatable attribute was ignored for the check whether a
-+! temporary is required
-+!
-+module m
-+type t
-+contains
-+  procedure, NOPASS :: foo => foo
-+  generic :: gen => foo
-+end type t
-+contains
-+  function foo(i)
-+    integer, allocatable :: foo(:)
-+    integer :: i
-+    allocate(foo(2))
-+    foo(1) = i
-+    foo(2) = i + 10
-+  end function foo
-+end module m
-+
-+use m
-+type(t) :: x
-+integer, pointer :: ptr1, ptr2
-+integer, target              :: bar1(2)
-+integer, target, allocatable :: bar2(:)
-+
-+allocate(bar2(2))
-+ptr1 => bar1(2)
-+ptr2 => bar2(2)
-+
-+bar1 = x%gen(1)
-+if (ptr1 /= 11) call abort()
-+bar1 = x%foo(2)
-+if (ptr1 /= 12) call abort()
-+bar2 = x%gen(3)
-+if (ptr2 /= 13) call abort()
-+bar2 = x%foo(4)
-+if (ptr2 /= 14) call abort()
-+bar2(:) = x%gen(5)
-+if (ptr2 /= 15) call abort()
-+bar2(:) = x%foo(6)
-+if (ptr2 /= 16) call abort()
-+
-+call test()
-+end
-+
-+subroutine test
-+interface gen
-+  procedure foo
-+end interface gen
-+
-+integer, target :: bar(2)
-+integer, pointer :: ptr
-+bar = [1,2]
-+ptr => bar(2)
-+if (ptr /= 2) call abort()
-+bar = gen()
-+if (ptr /= 77) call abort()
-+contains
-+  function foo()
-+    integer, allocatable :: foo(:)
-+    allocate(foo(2))
-+    foo = [33, 77]
-+  end function foo
-+end subroutine test
-+
-+! { dg-final { cleanup-modules "m" } }
-Index: gcc/testsuite/gfortran.dg/namelist_65.f90
-===================================================================
---- a/src/gcc/testsuite/gfortran.dg/namelist_65.f90	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/gfortran.dg/namelist_65.f90	(.../branches/gcc-4_4-branch)
-@@ -0,0 +1,22 @@
-+! { dg-do run }
-+! { dg-options "-std=gnu" }
-+! PR45710 Adjust format/padding for WRITE of NAMELIST group to internal file
-+program oneline
-+real :: a=1,b=2,c=3,d=4
-+namelist /nl1/ a,b,c
-+parameter(ilines=5)
-+character(len=80) :: out(ilines)
-+
-+! fill array out with @
-+do i=1,len(out)
-+   out(:)(i:i)='@'
-+enddo
-+
-+write(out,nl1)
-+if (out(1).ne."&NL1") call abort
-+if (out(2).ne." A=  1.0000000    ,") call abort
-+if (out(3).ne." B=  2.0000000    ,") call abort
-+if (out(4).ne." C=  3.0000000    ,") call abort
-+if (out(5).ne." /") call abort
-+
-+end program oneline
-Index: gcc/testsuite/gfortran.dg/power2.f90
-===================================================================
---- a/src/gcc/testsuite/gfortran.dg/power2.f90	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/gfortran.dg/power2.f90	(.../branches/gcc-4_4-branch)
-@@ -0,0 +1,25 @@
-+! { dg-do compile }
-+! PR fortran/46794
-+
-+! Check that results of powers of integers with kinds 1 and 2 are
-+! correctly converted back; this used to ICE because a conversion
-+! from kind 4 to the correct one was missing.
-+
-+! Contributed by Daniel Kraft, d@domob.eu.
-+
-+PROGRAM main
-+  IMPLICIT NONE
-+
-+  INTEGER(KIND=1) :: k1
-+  INTEGER(KIND=2) :: k2
-+
-+  k1 = 1_1
-+  k2 = 1_2
-+
-+  k1 = 1_1 + 1_1**k1
-+  k2 = 1_2 + 1_2**k2
-+
-+  k2 = 1_1 + 1_1**k2
-+  k2 = 1_1 + 1_2**k1
-+  k2 = 1_1 + 1_2**k2
-+END PROGRAM main
-Index: gcc/testsuite/gfortran.dg/transfer_simplify_10.f90
-===================================================================
---- a/src/gcc/testsuite/gfortran.dg/transfer_simplify_10.f90	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/gfortran.dg/transfer_simplify_10.f90	(.../branches/gcc-4_4-branch)
-@@ -0,0 +1,34 @@
-+! { dg-do run }
-+!
-+! PR fortran/46638
-+!
-+! Contributed by James Van Buskirk
-+!
-+program test5
-+   use ISO_C_BINDING
-+   implicit none
-+   type, bind(C) :: CPUID_type
-+      integer(C_INT32_T) eax
-+      integer(C_INT32_T) ebx
-+      integer(C_INT32_T) edx
-+      integer(C_INT32_T) ecx
-+      integer(C_INT32_T) bbb
-+   end type CPUID_type
-+   type(CPUID_TYPE) result
-+  result = transfer(achar(10)//achar(0)//achar(0)//achar(0)//'GenuineIntel'//'abcd',result)
-+
-+  if((     int(z'0000000A') /= result%eax  &
-+      .or. int(z'756E6547') /= result%ebx  &
-+      .or. int(z'49656E69') /= result%edx  &
-+      .or. int(z'6C65746E') /= result%ecx  &
-+      .or. int(z'64636261') /= result%bbb) &
-+     .and. & ! Big endian
-+     (     int(z'0A000000') /= result%eax  &
-+      .or. int(z'47656E75') /= result%ebx  &
-+      .or. int(z'696E6549') /= result%edx  &
-+      .or. int(z'6E74656C') /= result%ecx  &
-+      .or. int(z'61626364') /= result%bbb)) then
-+    write(*,'(5(z8.8:1x))') result
-+    call abort()
-+  end if
-+end program test5 
-Index: gcc/testsuite/c-c++-common/pr43690.c
-===================================================================
---- a/src/gcc/testsuite/c-c++-common/pr43690.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/testsuite/c-c++-common/pr43690.c	(.../branches/gcc-4_4-branch)
-@@ -0,0 +1,13 @@
-+/* PR middle-end/43690 */
-+/* { dg-do compile } */
-+/* { dg-options "-O2" } */
-+
-+void
-+foo (char *x)
-+{
-+  asm ("" : : "m" (x++));	/* { dg-error "is not directly addressable" } */
-+  asm ("" : : "m" (++x));	/* { dg-error "is not directly addressable" } */
-+  asm ("" : : "m" (x--));	/* { dg-error "is not directly addressable" } */
-+  asm ("" : : "m" (--x));	/* { dg-error "is not directly addressable" } */
-+  asm ("" : : "m" (x + 1));	/* { dg-error "is not directly addressable" } */
-+}
-Index: gcc/cp/decl.c
-===================================================================
---- a/src/gcc/cp/decl.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/cp/decl.c	(.../branches/gcc-4_4-branch)
-@@ -3536,6 +3536,8 @@
-   if (current_function_decl)
-     {
-       struct cp_binding_level *b = current_binding_level;
-+      if (b->kind == sk_function_parms)
-+	return error_mark_node;
-       while (b->level_chain->kind != sk_function_parms)
- 	b = b->level_chain;
-       pushdecl_with_scope (decl, b, /*is_friend=*/false);
-Index: gcc/cp/tree.c
-===================================================================
---- a/src/gcc/cp/tree.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/cp/tree.c	(.../branches/gcc-4_4-branch)
-@@ -72,7 +72,8 @@
- 	  == REFERENCE_TYPE)
-     return lvalue_p_1 (TREE_OPERAND (ref, 0));
- 
--  if (TREE_CODE (TREE_TYPE (ref)) == REFERENCE_TYPE)
-+  if (TREE_TYPE (ref)
-+      && TREE_CODE (TREE_TYPE (ref)) == REFERENCE_TYPE)
-     {
-       /* unnamed rvalue references are rvalues */
-       if (TYPE_REF_IS_RVALUE (TREE_TYPE (ref))
-Index: gcc/cp/mangle.c
-===================================================================
---- a/src/gcc/cp/mangle.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/cp/mangle.c	(.../branches/gcc-4_4-branch)
-@@ -2443,6 +2443,10 @@
-       write_real_cst (value);
-       break;
- 
-+    case STRING_CST:
-+      sorry ("string literal in function template signature");
-+      break;
-+
-     default:
-       gcc_unreachable ();
-     }
-Index: gcc/cp/ChangeLog
-===================================================================
---- a/src/gcc/cp/ChangeLog	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/cp/ChangeLog	(.../branches/gcc-4_4-branch)
-@@ -1,3 +1,47 @@
-+2011-03-09  Jason Merrill  <jason@redhat.com>
-+
-+	PR c++/44629
-+	* pt.c (unify): An unresolved overload is a nondeduced context.
-+
-+2011-03-08  Jason Merrill  <jason@redhat.com>
-+
-+	PR c++/45651
-+	* pt.c (instantiate_decl): Don't clear DECL_INTERFACE_KNOWN on
-+	!TREE_PUBLIC decls.
-+
-+2011-03-08  Jason Merrill  <jason@redhat.com>
-+
-+	PR c++/47289
-+	* pt.c (coerce_template_parms): Fix error recovery.
-+
-+2011-03-08  Dodji Seketeli  <dodji@redhat.com>
-+
-+	* name-lookup.c (binding_to_template_parms_of_scope_p): Only
-+	consider scopes of primary template definitions.  Adjust comments.
-+
-+2011-03-08  Jason Merrill  <jason@redhat.com>
-+
-+	PR c++/47488
-+	* mangle.c (write_template_arg_literal) [STRING_CST]: Sorry.
-+
-+2011-02-03  Jonathan Wakely  <jwakely.gcc@gmail.com>
-+
-+	PR c++/47589
-+	Backport from mainline
-+	2010-11-09  Jakub Jelinek  <jakub@redhat.com>
-+
-+	PR c++/45894
-+	* tree.c (lvalue_kind): Don't crash if ref has NULL type.
-+
-+2010-12-07  Jakub Jelinek  <jakub@redhat.com>
-+
-+	Backport from mainline
-+	2010-11-20  Jakub Jelinek  <jakub@redhat.com>
-+ 
-+	PR c++/46538
-+	* decl.c (cp_make_fname_decl): Return error_mark_node if
-+	current_binding_level has already sk_function_parms kind.
-+
- 2010-10-01  Release Manager
- 
- 	* GCC 4.4.5 released.
-Index: gcc/cp/pt.c
-===================================================================
---- a/src/gcc/cp/pt.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/cp/pt.c	(.../branches/gcc-4_4-branch)
-@@ -5452,7 +5452,7 @@
- 		    sorry ("cannot expand %<%T%> into a fixed-length "
- 			   "argument list", arg);
- 		}
--	      return error_mark_node;
-+	      ++lost;
-             }
-         }
-       else if (require_all_args)
-@@ -5473,7 +5473,7 @@
-            reported) that we are trying to recover from, e.g., a class
-            template with a parameter list such as
-            template<typename..., typename>.  */
--        return error_mark_node;
-+	++lost;
-       else
- 	arg = convert_template_argument (TREE_VALUE (parm),
- 					 arg, new_args, complain, 
-@@ -14125,6 +14125,9 @@
-       return 1;
- 
-     default:
-+      /* An unresolved overload is a nondeduced context.  */
-+      if (type_unknown_p (parm))
-+	return 0;
-       gcc_assert (EXPR_P (parm));
- 
-       /* We must be looking at an expression.  This can happen with
-@@ -15533,8 +15536,13 @@
-   if (!pattern_defined && expl_inst_class_mem_p
-       && DECL_EXPLICIT_INSTANTIATION (d))
-     {
--      DECL_NOT_REALLY_EXTERN (d) = 0;
--      DECL_INTERFACE_KNOWN (d) = 0;
-+      /* Leave linkage flags alone on instantiations with anonymous
-+	 visibility.  */
-+      if (TREE_PUBLIC (d))
-+	{
-+	  DECL_NOT_REALLY_EXTERN (d) = 0;
-+	  DECL_INTERFACE_KNOWN (d) = 0;
-+	}
-       SET_DECL_IMPLICIT_INSTANTIATION (d);
-     }
- 
-Index: gcc/cp/name-lookup.c
-===================================================================
---- a/src/gcc/cp/name-lookup.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/cp/name-lookup.c	(.../branches/gcc-4_4-branch)
-@@ -3998,9 +3998,14 @@
- }
- 
- /* Subroutine of outer_binding.
--   Returns TRUE if BINDING is a binding to a template parameter of SCOPE,
--   FALSE otherwise.  */
- 
-+   Returns TRUE if BINDING is a binding to a template parameter of
-+   SCOPE.  In that case SCOPE is the scope of a primary template
-+   parameter -- in the sense of G++, i.e, a template that has its own
-+   template header.
-+
-+   Returns FALSE otherwise.  */
-+
- static bool
- binding_to_template_parms_of_scope_p (cxx_binding *binding,
- 				      cxx_scope *scope)
-@@ -4015,6 +4020,8 @@
-   return (scope
- 	  && scope->this_entity
- 	  && get_template_info (scope->this_entity)
-+	  && PRIMARY_TEMPLATE_P (TI_TEMPLATE
-+				 (get_template_info (scope->this_entity)))
- 	  && parameter_of_template_p (binding_value,
- 				      TI_TEMPLATE (get_template_info \
- 						    (scope->this_entity))));
-Index: gcc/jump.c
-===================================================================
---- a/src/gcc/jump.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/jump.c	(.../branches/gcc-4_4-branch)
-@@ -1670,7 +1670,13 @@
- 
- 	case 'i':
- 	  if (XINT (x, i) != XINT (y, i))
--	    return 0;
-+	    {
-+	      if (((code == ASM_OPERANDS && i == 5)
-+		   || (code == ASM_INPUT && i == 1))
-+		  && locator_eq (XINT (x, i), XINT (y, i)))
-+		break;
-+	      return 0;
-+	    }
- 	  break;
- 
- 	case 't':
-Index: gcc/expr.c
-===================================================================
---- a/src/gcc/expr.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/expr.c	(.../branches/gcc-4_4-branch)
-@@ -4662,7 +4662,10 @@
-       /* If store_expr stores a DECL whose DECL_RTL(exp) == TARGET,
- 	 but TARGET is not valid memory reference, TEMP will differ
- 	 from TARGET although it is really the same location.  */
--      && !(alt_rtl && rtx_equal_p (alt_rtl, target))
-+      && !(alt_rtl
-+	   && rtx_equal_p (alt_rtl, target)
-+	   && !side_effects_p (alt_rtl)
-+	   && !side_effects_p (target))
-       /* If there's nothing to copy, don't bother.  Don't call
- 	 expr_size unless necessary, because some front-ends (C++)
- 	 expr_size-hook must not be given objects that are not
-Index: gcc/dse.c
-===================================================================
---- a/src/gcc/dse.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/dse.c	(.../branches/gcc-4_4-branch)
-@@ -826,7 +826,7 @@
-     case POST_INC:
-       {
- 	rtx r1 = XEXP (x, 0);
--	rtx c = gen_int_mode (Pmode, data->size);
-+	rtx c = gen_int_mode (data->size, Pmode);
- 	emit_insn_before (gen_rtx_SET (Pmode, r1, 
- 				       gen_rtx_PLUS (Pmode, r1, c)),
- 			  data->insn);
-@@ -837,7 +837,7 @@
-     case POST_DEC:
-       {
- 	rtx r1 = XEXP (x, 0);
--	rtx c = gen_int_mode (Pmode, -data->size);
-+	rtx c = gen_int_mode (-data->size, Pmode);
- 	emit_insn_before (gen_rtx_SET (Pmode, r1, 
- 				       gen_rtx_PLUS (Pmode, r1, c)),
- 			  data->insn);
-Index: gcc/fortran/openmp.c
-===================================================================
---- a/src/gcc/fortran/openmp.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/fortran/openmp.c	(.../branches/gcc-4_4-branch)
-@@ -1518,6 +1518,7 @@
-     case EXEC_OMP_PARALLEL_SECTIONS:
-     case EXEC_OMP_SECTIONS:
-     case EXEC_OMP_SINGLE:
-+    case EXEC_OMP_TASK:
-       if (code->ext.omp_clauses)
- 	resolve_omp_clauses (code);
-       break;
-Index: gcc/fortran/interface.c
-===================================================================
---- a/src/gcc/fortran/interface.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/fortran/interface.c	(.../branches/gcc-4_4-branch)
-@@ -1436,7 +1436,7 @@
- 		   int ranks_must_agree, int is_elemental, locus *where)
- {
-   gfc_ref *ref;
--  bool rank_check;
-+  bool rank_check, is_pointer;
- 
-   /* If the formal arg has type BT_VOID, it's to one of the iso_c_binding
-      procs c_f_pointer or c_f_procpointer, and we need to accept most
-@@ -1511,22 +1511,48 @@
-     return 1;
- 
-   /* At this point, we are considering a scalar passed to an array.   This
--     is valid (cf. F95 12.4.1.1; F2003 12.4.1.2),
-+     is valid (cf. F95 12.4.1.1, F2003 12.4.1.2, and F2008 12.5.2.4),
-      - if the actual argument is (a substring of) an element of a
--       non-assumed-shape/non-pointer array;
--     - (F2003) if the actual argument is of type character.  */
-+       non-assumed-shape/non-pointer/non-polymorphic array; or
-+     - (F2003) if the actual argument is of type character of default/c_char
-+       kind.  */
- 
-+  is_pointer = actual->expr_type == EXPR_VARIABLE
-+	       ? actual->symtree->n.sym->attr.pointer : false;
-+
-   for (ref = actual->ref; ref; ref = ref->next)
--    if (ref->type == REF_ARRAY && ref->u.ar.type == AR_ELEMENT)
--      break;
-+    {
-+      if (ref->type == REF_COMPONENT)
-+	is_pointer = ref->u.c.component->attr.pointer;
-+      else if (ref->type == REF_ARRAY && ref->u.ar.type == AR_ELEMENT
-+	       && ref->u.ar.dimen > 0
-+	       && (!ref->next 
-+		   || (ref->next->type == REF_SUBSTRING && !ref->next->next)))
-+	break;
-+    }
- 
--  /* Not an array element.  */
--  if (formal->ts.type == BT_CHARACTER
--      && (ref == NULL
--          || (actual->expr_type == EXPR_VARIABLE
--	      && (actual->symtree->n.sym->as->type == AS_ASSUMED_SHAPE
--		  || actual->symtree->n.sym->attr.pointer))))
-+  if (actual->expr_type != EXPR_NULL && ref && actual->ts.type != BT_CHARACTER
-+      && (is_pointer || ref->u.ar.as->type == AS_ASSUMED_SHAPE))
-     {
-+      if (where)
-+	gfc_error ("Element of assumed-shaped or pointer "
-+		   "array passed to array dummy argument '%s' at %L",
-+		   formal->name, &actual->where);
-+      return 0;
-+    }
-+
-+  if (actual->ts.type == BT_CHARACTER && actual->expr_type != EXPR_NULL
-+      && (!ref || is_pointer || ref->u.ar.as->type == AS_ASSUMED_SHAPE))
-+    {
-+      if (formal->ts.kind != 1 && (gfc_option.allow_std & GFC_STD_GNU) == 0)
-+	{
-+	  if (where)
-+	    gfc_error ("Extension: Scalar non-default-kind, non-C_CHAR-kind "
-+		       "CHARACTER actual argument with array dummy argument "
-+		       "'%s' at %L", formal->name, &actual->where);
-+	  return 0;
-+	}
-+
-       if (where && (gfc_option.allow_std & GFC_STD_F2003) == 0)
- 	{
- 	  gfc_error ("Fortran 2003: Scalar CHARACTER actual argument with "
-@@ -1539,7 +1565,8 @@
-       else
- 	return 1;
-     }
--  else if (ref == NULL)
-+
-+  if (ref == NULL && actual->expr_type != EXPR_NULL)
-     {
-       if (where)
- 	gfc_error ("Rank mismatch in argument '%s' at %L (%d and %d)",
-@@ -1548,17 +1575,6 @@
-       return 0;
-     }
- 
--  if (actual->expr_type == EXPR_VARIABLE
--      && actual->symtree->n.sym->as
--      && (actual->symtree->n.sym->as->type == AS_ASSUMED_SHAPE
--	  || actual->symtree->n.sym->attr.pointer))
--    {
--      if (where)
--	gfc_error ("Element of assumed-shaped array passed to dummy "
--		   "argument '%s' at %L", formal->name, &actual->where);
--      return 0;
--    }
--
-   return 1;
- }
- 
-Index: gcc/fortran/trans-expr.c
-===================================================================
---- a/src/gcc/fortran/trans-expr.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/fortran/trans-expr.c	(.../branches/gcc-4_4-branch)
-@@ -917,6 +917,7 @@
-   tree gfc_int4_type_node;
-   int kind;
-   int ikind;
-+  int res_ikind_1, res_ikind_2;
-   gfc_se lse;
-   gfc_se rse;
-   tree fndecl;
-@@ -937,6 +938,13 @@
- 
-   gfc_int4_type_node = gfc_get_int_type (4);
- 
-+  /* In case of integer operands with kinds 1 or 2, we call the integer kind 4
-+     library routine.  But in the end, we have to convert the result back
-+     if this case applies -- with res_ikind_K, we keep track whether operand K
-+     falls into this case.  */
-+  res_ikind_1 = -1;
-+  res_ikind_2 = -1;
-+
-   kind = expr->value.op.op1->ts.kind;
-   switch (expr->value.op.op2->ts.type)
-     {
-@@ -947,6 +955,7 @@
- 	case 1:
- 	case 2:
- 	  rse.expr = convert (gfc_int4_type_node, rse.expr);
-+	  res_ikind_2 = ikind;
- 	  /* Fall through.  */
- 
- 	case 4:
-@@ -969,7 +978,10 @@
- 	case 1:
- 	case 2:
- 	  if (expr->value.op.op1->ts.type == BT_INTEGER)
--	    lse.expr = convert (gfc_int4_type_node, lse.expr);
-+	    {
-+	      lse.expr = convert (gfc_int4_type_node, lse.expr);
-+	      res_ikind_1 = kind;
-+	    }
- 	  else
- 	    gcc_unreachable ();
- 	  /* Fall through.  */
-@@ -1080,6 +1092,15 @@
-     }
- 
-   se->expr = build_call_expr (fndecl, 2, lse.expr, rse.expr);
-+
-+  /* Convert the result back if it is of wrong integer kind.  */
-+  if (res_ikind_1 != -1 && res_ikind_2 != -1)
-+    {
-+      /* We want the maximum of both operand kinds as result.  */
-+      if (res_ikind_1 < res_ikind_2)
-+	res_ikind_1 = res_ikind_2;
-+      se->expr = convert (gfc_get_int_type (res_ikind_1), se->expr);
-+    }
- }
- 
- 
-@@ -4384,9 +4405,13 @@
-   if (gfc_ref_needs_temporary_p (expr1->ref))
-     return true;
- 
--  /* Functions returning pointers need temporaries.  */
--  if (expr2->symtree->n.sym->attr.pointer 
--      || expr2->symtree->n.sym->attr.allocatable)
-+  /* Functions returning pointers or allocatables need temporaries.  */
-+  c = expr2->value.function.esym
-+      ? (expr2->value.function.esym->attr.pointer 
-+	 || expr2->value.function.esym->attr.allocatable)
-+      : (expr2->symtree->n.sym->attr.pointer
-+	 || expr2->symtree->n.sym->attr.allocatable);
-+  if (c)
-     return true;
- 
-   /* Character array functions need temporaries unless the
-Index: gcc/fortran/trans-common.c
-===================================================================
---- a/src/gcc/fortran/trans-common.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/fortran/trans-common.c	(.../branches/gcc-4_4-branch)
-@@ -323,6 +323,7 @@
-     {
-       tree new_type;
-       TREE_THIS_VOLATILE (field) = 1;
-+      TREE_SIDE_EFFECTS (field) = 1;
-       new_type = build_qualified_type (TREE_TYPE (field), TYPE_QUAL_VOLATILE);
-       TREE_TYPE (field) = new_type;
-     }
-Index: gcc/fortran/trans-openmp.c
-===================================================================
---- a/src/gcc/fortran/trans-openmp.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/fortran/trans-openmp.c	(.../branches/gcc-4_4-branch)
-@@ -477,13 +477,23 @@
-   gfc_symbol init_val_sym, outer_sym, intrinsic_sym;
-   gfc_expr *e1, *e2, *e3, *e4;
-   gfc_ref *ref;
--  tree decl, backend_decl, stmt;
-+  tree decl, backend_decl, stmt, type, outer_decl;
-   locus old_loc = gfc_current_locus;
-   const char *iname;
-   gfc_try t;
- 
-   decl = OMP_CLAUSE_DECL (c);
-   gfc_current_locus = where;
-+  type = TREE_TYPE (decl);
-+  outer_decl = create_tmp_var_raw (type, NULL);
-+  if (TREE_CODE (decl) == PARM_DECL
-+      && TREE_CODE (type) == REFERENCE_TYPE
-+      && GFC_DESCRIPTOR_TYPE_P (TREE_TYPE (type))
-+      && GFC_TYPE_ARRAY_AKIND (TREE_TYPE (type)) == GFC_ARRAY_ALLOCATABLE)
-+    {
-+      decl = build_fold_indirect_ref (decl);
-+      type = TREE_TYPE (type);
-+    }
- 
-   /* Create a fake symbol for init value.  */
-   memset (&init_val_sym, 0, sizeof (init_val_sym));
-@@ -502,7 +512,9 @@
-   outer_sym.attr.dummy = 0;
-   outer_sym.attr.result = 0;
-   outer_sym.attr.flavor = FL_VARIABLE;
--  outer_sym.backend_decl = create_tmp_var_raw (TREE_TYPE (decl), NULL);
-+  outer_sym.backend_decl = outer_decl;
-+  if (decl != OMP_CLAUSE_DECL (c))
-+    outer_sym.backend_decl = build_fold_indirect_ref (outer_decl);
- 
-   /* Create fake symtrees for it.  */
-   symtree1 = gfc_new_symtree (&root1, sym->name);
-@@ -619,12 +631,12 @@
- 
-   /* Create the init statement list.  */
-   pushlevel (0);
--  if (GFC_DESCRIPTOR_TYPE_P (TREE_TYPE (decl))
--      && GFC_TYPE_ARRAY_AKIND (TREE_TYPE (decl)) == GFC_ARRAY_ALLOCATABLE)
-+  if (GFC_DESCRIPTOR_TYPE_P (type)
-+      && GFC_TYPE_ARRAY_AKIND (type) == GFC_ARRAY_ALLOCATABLE)
-     {
-       /* If decl is an allocatable array, it needs to be allocated
- 	 with the same bounds as the outer var.  */
--      tree type = TREE_TYPE (decl), rank, size, esize, ptr;
-+      tree rank, size, esize, ptr;
-       stmtblock_t block;
- 
-       gfc_start_block (&block);
-@@ -660,8 +672,8 @@
- 
-   /* Create the merge statement list.  */
-   pushlevel (0);
--  if (GFC_DESCRIPTOR_TYPE_P (TREE_TYPE (decl))
--      && GFC_TYPE_ARRAY_AKIND (TREE_TYPE (decl)) == GFC_ARRAY_ALLOCATABLE)
-+  if (GFC_DESCRIPTOR_TYPE_P (type)
-+      && GFC_TYPE_ARRAY_AKIND (type) == GFC_ARRAY_ALLOCATABLE)
-     {
-       /* If decl is an allocatable array, it needs to be deallocated
- 	 afterwards.  */
-@@ -681,7 +693,7 @@
-   OMP_CLAUSE_REDUCTION_MERGE (c) = stmt;
- 
-   /* And stick the placeholder VAR_DECL into the clause as well.  */
--  OMP_CLAUSE_REDUCTION_PLACEHOLDER (c) = outer_sym.backend_decl;
-+  OMP_CLAUSE_REDUCTION_PLACEHOLDER (c) = outer_decl;
- 
-   gfc_current_locus = old_loc;
- 
-@@ -1240,8 +1252,9 @@
-       if (simple)
- 	{
- 	  TREE_VEC_ELT (init, i) = build2_v (MODIFY_EXPR, dovar, from);
--	  TREE_VEC_ELT (cond, i) = fold_build2 (simple > 0 ? LE_EXPR : GE_EXPR,
--						boolean_type_node, dovar, to);
-+	  /* The condition should not be folded.  */
-+	  TREE_VEC_ELT (cond, i) = build2 (simple > 0 ? LE_EXPR : GE_EXPR,
-+					   boolean_type_node, dovar, to);
- 	  TREE_VEC_ELT (incr, i) = fold_build2 (PLUS_EXPR, type, dovar, step);
- 	  TREE_VEC_ELT (incr, i) = fold_build2 (MODIFY_EXPR, type, dovar,
- 						TREE_VEC_ELT (incr, i));
-@@ -1262,8 +1275,9 @@
- 	  count = gfc_create_var (type, "count");
- 	  TREE_VEC_ELT (init, i) = build2_v (MODIFY_EXPR, count,
- 					     build_int_cst (type, 0));
--	  TREE_VEC_ELT (cond, i) = fold_build2 (LT_EXPR, boolean_type_node,
--						count, tmp);
-+	  /* The condition should not be folded.  */
-+	  TREE_VEC_ELT (cond, i) = build2 (LT_EXPR, boolean_type_node,
-+					   count, tmp);
- 	  TREE_VEC_ELT (incr, i) = fold_build2 (PLUS_EXPR, type, count,
- 						build_int_cst (type, 1));
- 	  TREE_VEC_ELT (incr, i) = fold_build2 (MODIFY_EXPR, type,
-Index: gcc/fortran/ChangeLog
-===================================================================
---- a/src/gcc/fortran/ChangeLog	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/fortran/ChangeLog	(.../branches/gcc-4_4-branch)
-@@ -1,3 +1,75 @@
-+2011-01-27  Tobias Burnus  <burnus@net-b.de>
-+
-+	Backport from mainline
-+	2011-02-26  Tobias Burnus  <burnus@net-b.de>
-+
-+	PR fortran/47886
-+	* openmp.c (gfc_resolve_omp_directive): Resolve if()
-+	condition of OpenMP's task.
-+
-+2011-02-19  Tobias Burnus
-+
-+	PR fortran/47775
-+	* trans-expr.c (arrayfunc_assign_needs_temporary): Use
-+	esym to check whether the specific procedure returns an
-+	allocatable or pointer.
-+
-+2011-02-14  Tobias Burnus  <burnus@net-b.de>
-+
-+	PR fortran/47569
-+	* interface.c (compare_parameter): Avoid ICE with
-+	character components.
-+
-+2011-01-16  Jakub Jelinek  <jakub@redhat.com>
-+
-+	Backport from mainline
-+	2010-12-14  Jakub Jelinek  <jakub@redhat.com>
-+
-+	PR fortran/46874
-+	* trans-openmp.c (gfc_trans_omp_array_reduction): Handle allocatable
-+	dummy variables.
-+
-+2010-12-09  Daniel Kraft  <d@domob.eu>
-+
-+	PR fortran/46794
-+	* trans-expr.c (gfc_conv_power_op): Handle kind of result expression
-+	correctly for integer kind 1 and 2 operands.
-+
-+2010-12-09  Paul Thomas  <pault@gcc.gnu.org>
-+
-+	PR fortran/45081
-+	* simplify.c (is_constant_array_expr): Allow structure array
-+	elements as well as constants.
-+	(gfc_simplify_reshape): Copy the derived type of source to
-+	the result.
-+
-+2010-12-07  Jakub Jelinek  <jakub@redhat.com>
-+
-+	Backport from mainline
-+	2010-12-02  Jakub Jelinek  <jakub@redhat.com>
-+
-+	PR fortran/46753
-+	* trans-openmp.c (gfc_trans_omp_do): Use build2_loc instead of
-+	fold_build2_loc for OMP_FOR conditions.
-+
-+2010-11-25  Tobias Burnus  <burnus@net-b.de>
-+
-+	PR fortran/46638
-+	* target-memory.c (gfc_interpret_derived): Correctly handle
-+	component offset.
-+
-+2010-11-13  Tobias Burnus  <burnus@net-b.de>
-+
-+	PR fortran/45742
-+	* trans-common.c (build_field): Add TREE_SIDE_EFFECTS for volatile.
-+	* trans-decl.c (gfc_finish_var_decl): Ditto.
-+	(create_function_arglist): Handle volatile dummy arguments.
-+
-+2010-10-25  Steven G. Kargl  <kargl@gcc.gnu.org>
-+
-+	PR fortran/46140
-+	* fortran/scanner.c (include_line): Check return value of load_file.
-+
- 2010-10-01  Release Manager
- 
- 	* GCC 4.4.5 released.
-Index: gcc/fortran/scanner.c
-===================================================================
---- a/src/gcc/fortran/scanner.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/fortran/scanner.c	(.../branches/gcc-4_4-branch)
-@@ -1770,7 +1770,9 @@
- 		   read by anything else.  */
- 
-   filename = gfc_widechar_to_char (begin, -1);
--  load_file (filename, NULL, false);
-+  if (load_file (filename, NULL, false) == FAILURE)
-+    exit (1);
-+
-   gfc_free (filename);
-   return true;
- }
-Index: gcc/fortran/trans-decl.c
-===================================================================
---- a/src/gcc/fortran/trans-decl.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/fortran/trans-decl.c	(.../branches/gcc-4_4-branch)
-@@ -539,6 +539,7 @@
-   if (sym->attr.volatile_)
-     {
-       TREE_THIS_VOLATILE (decl) = 1;
-+      TREE_SIDE_EFFECTS (decl) = 1;
-       new_type = build_qualified_type (TREE_TYPE (decl), TYPE_QUAL_VOLATILE);
-       TREE_TYPE (decl) = new_type;
-     } 
-@@ -1655,10 +1656,19 @@
- 
-       if (f->sym->attr.proc_pointer)
-         type = build_pointer_type (type);
-+ 
-+      if (f->sym->attr.volatile_)
-+	type = build_qualified_type (type, TYPE_QUAL_VOLATILE);
- 
-       /* Build the argument declaration.  */
-       parm = build_decl (PARM_DECL, gfc_sym_identifier (f->sym), type);
- 
-+      if (f->sym->attr.volatile_)
+--- a/src/gcc/cp/decl2.c	(.../tags/gcc_4_4_6_release)
++++ b/src/gcc/cp/decl2.c	(.../branches/gcc-4_4-branch)
+@@ -3725,9 +3725,12 @@
+ 	 because we depend on the form of FN.  */
+       args = build_non_dependent_args (args);
+       object = build_non_dependent_expr (object);
+-      if (TREE_CODE (fn) == DOTSTAR_EXPR)
+-	object = cp_build_unary_op (ADDR_EXPR, object, 0, tf_warning_or_error);
+-      args = tree_cons (NULL_TREE, object, args);
++      if (TREE_CODE (TREE_TYPE (fn)) == METHOD_TYPE)
 +	{
-+	  TREE_THIS_VOLATILE (parm) = 1;
-+	  TREE_SIDE_EFFECTS (parm) = 1;
++	  if (TREE_CODE (fn) == DOTSTAR_EXPR)
++	    object = cp_build_unary_op (ADDR_EXPR, object, 0, tf_warning_or_error);
++	  args = tree_cons (NULL_TREE, object, args);
 +	}
-+
-       /* Fill in arg stuff.  */
-       DECL_CONTEXT (parm) = fndecl;
-       DECL_ARG_TYPE (parm) = TREE_VALUE (typelist);
-Index: gcc/fortran/target-memory.c
-===================================================================
---- a/src/gcc/fortran/target-memory.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/fortran/target-memory.c	(.../branches/gcc-4_4-branch)
-@@ -484,7 +484,16 @@
- 	     }
- 	}
- 
--      ptr = TREE_INT_CST_LOW (DECL_FIELD_OFFSET (cmp->backend_decl));
-+      /* Calculate the offset, which consists of the the FIELD_OFFSET in
-+	 bytes, which appears in multiples of DECL_OFFSET_ALIGN-bit-sized,
-+	 and additional bits of FIELD_BIT_OFFSET. The code assumes that all
-+	 sizes of the components are multiples of BITS_PER_UNIT,
-+	 i.e. there are, e.g., no bit fields.  */
-+
-+      ptr = TREE_INT_CST_LOW (DECL_FIELD_BIT_OFFSET (cmp->backend_decl));
-+      gcc_assert (ptr % 8 == 0);
-+      ptr = ptr/8 + TREE_INT_CST_LOW (DECL_FIELD_OFFSET (cmp->backend_decl));
-+
-       gfc_target_interpret_expr (&buffer[ptr], buffer_size - ptr,
- 				 tail->expr);
- 
-Index: gcc/fortran/simplify.c
-===================================================================
---- a/src/gcc/fortran/simplify.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/fortran/simplify.c	(.../branches/gcc-4_4-branch)
-@@ -3448,7 +3448,8 @@
-     return false;
-   
-   for (c = e->value.constructor; c; c = c->next)
--    if (c->expr->expr_type != EXPR_CONSTANT)
-+    if (c->expr->expr_type != EXPR_CONSTANT
-+	  && c->expr->expr_type != EXPR_STRUCTURE)
-       return false;
- 
-   return true;
-@@ -3679,6 +3680,11 @@
-   e->ts = source->ts;
-   e->rank = rank;
- 
-+  if (source->ts.type == BT_CHARACTER)
-+    e->ts.cl = source->ts.cl;
-+  else if (source->ts.type == BT_DERIVED)
-+    e->ts.derived = source->ts.derived;
-+
-   return e;
- 
- bad_reshape:
-Index: gcc/configure.ac
-===================================================================
---- a/src/gcc/configure.ac	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/configure.ac	(.../branches/gcc-4_4-branch)
-@@ -2838,6 +2838,18 @@
-   [$tls_first_major,$tls_first_minor,0], [$tls_as_opt], [$conftest_s],,
-   [set_have_as_tls=yes])
- fi
-+case "$target" in
-+  *-*-irix6*)
-+    # IRIX 6.5 rld and libc.so lack TLS support, so even if gas and gld
-+    # with TLS support are in use, native TLS cannot work.
-+    set_have_as_tls=no
-+    ;;
-+  *-*-osf*)
-+    # Tru64 UNIX loader and libc.so lack TLS support, so even if gas and
-+    # gld with TLS support are in use, native TLS cannot work.
-+    set_have_as_tls=no
-+    ;;
-+esac
- if test $set_have_as_tls = yes ; then
-   AC_DEFINE(HAVE_AS_TLS, 1,
- 	    [Define if your assembler supports thread-local storage.])
-Index: gcc/ira-emit.c
-===================================================================
---- a/src/gcc/ira-emit.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/ira-emit.c	(.../branches/gcc-4_4-branch)
-@@ -368,7 +368,8 @@
- 	   prohibit removal of the store in such complicated case.  */
- 	return false;
-     }
--  gcc_unreachable ();
-+  /* It is actually a loop entry -- do not remove the store.  */
-+  return false;
- }
- 
- /* Generate and attach moves to the edge E.  This looks at the final
-Index: gcc/gimplify.c
-===================================================================
---- a/src/gcc/gimplify.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/gimplify.c	(.../branches/gcc-4_4-branch)
-@@ -4842,6 +4842,13 @@
-       /* If the operand is a memory input, it should be an lvalue.  */
-       if (!allows_reg && allows_mem)
- 	{
-+	  tree inputv = TREE_VALUE (link);
-+	  STRIP_NOPS (inputv);
-+	  if (TREE_CODE (inputv) == PREDECREMENT_EXPR
-+	      || TREE_CODE (inputv) == PREINCREMENT_EXPR
-+	      || TREE_CODE (inputv) == POSTDECREMENT_EXPR
-+	      || TREE_CODE (inputv) == POSTINCREMENT_EXPR)
-+	    TREE_VALUE (link) = error_mark_node;
- 	  tret = gimplify_expr (&TREE_VALUE (link), pre_p, post_p,
- 				is_gimple_lvalue, fb_lvalue | fb_mayfail);
- 	  mark_addressable (TREE_VALUE (link));
-Index: gcc/tree-sra.c
-===================================================================
---- a/src/gcc/tree-sra.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/tree-sra.c	(.../branches/gcc-4_4-branch)
-@@ -1661,13 +1661,13 @@
- 		  || mbit + msize <= fbit)
- 		continue;
- 
--	      if (fbit <= mbit)
-+	      if (fbit < bit)
- 		{
- 		  unsigned HOST_WIDE_INT diff = fbit + fsize - mbit;
- 		  mbit += diff;
- 		  msize -= diff;
- 		}
--	      else if (fbit > mbit)
-+	      else if (fbit > bit)
- 		msize -= (mbit + msize - fbit);
- 	      else
- 		gcc_unreachable ();
-Index: gcc/tree-vect-patterns.c
-===================================================================
---- a/src/gcc/tree-vect-patterns.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/tree-vect-patterns.c	(.../branches/gcc-4_4-branch)
-@@ -475,6 +475,9 @@
-   type = gimple_expr_type (last_stmt);
- 
-   fn = gimple_call_fndecl (last_stmt);
-+  if (fn == NULL_TREE || DECL_BUILT_IN_CLASS (fn) != BUILT_IN_NORMAL)
-+    return NULL;
-+
-   switch (DECL_FUNCTION_CODE (fn))
-     {
-     case BUILT_IN_POWIF:
-Index: gcc/rtl.c
-===================================================================
---- a/src/gcc/rtl.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/rtl.c	(.../branches/gcc-4_4-branch)
-@@ -405,7 +405,15 @@
- 	case 'n':
- 	case 'i':
- 	  if (XINT (x, i) != XINT (y, i))
--	    return 0;
-+	    {
-+#ifndef GENERATOR_FILE
-+	      if (((code == ASM_OPERANDS && i == 5)
-+		   || (code == ASM_INPUT && i == 1))
-+		  && locator_eq (XINT (x, i), XINT (y, i)))
-+		break;
-+#endif
-+	      return 0;
-+	    }
- 	  break;
- 
- 	case 'V':
-Index: gcc/config.gcc
-===================================================================
---- a/src/gcc/config.gcc	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/config.gcc	(.../branches/gcc-4_4-branch)
-@@ -1012,6 +1012,7 @@
- 	else
- 	    tmake_file="$tmake_file pa/t-slibgcc-dwarf-ver"
- 	fi
-+	extra_parts="libgcc_stub.a"
- 	case x${enable_threads} in
- 	x | xyes | xposix )
- 		thread_file=posix
-Index: gcc/config.host
-===================================================================
---- a/src/gcc/config.host	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/config.host	(.../branches/gcc-4_4-branch)
-@@ -1,5 +1,5 @@
- # GCC host-specific configuration file.
--# Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2006, 2007, 2008
-+# Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2006, 2007, 2008, 2011
- # Free Software Foundation, Inc.
- 
- #This file is part of GCC.
-@@ -155,6 +155,10 @@
- 
- # Machine-specific settings.
- case ${host} in
-+  alpha*-dec-osf*)
-+    out_host_hook_obj=host-osf.o
-+    host_xmake_file="${host_xmake_file} alpha/x-osf"
-+    ;;
-   alpha*-dec-*vms*)
-     host_xm_file=alpha/xm-vms.h
-     host_xmake_file="${host_xmake_file} alpha/x-vms"
-Index: gcc/gthr-posix.h
-===================================================================
---- a/src/gcc/gthr-posix.h	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/gthr-posix.h	(.../branches/gcc-4_4-branch)
-@@ -250,61 +250,34 @@
-    calls in shared flavors of the HP-UX C library.  Most of the stubs
-    have no functionality.  The details are described in the "libc cumulative
-    patch" for each subversion of HP-UX 11.  There are two special interfaces
--   provided for checking whether an application is linked to a pthread
-+   provided for checking whether an application is linked to a shared pthread
-    library or not.  However, these interfaces aren't available in early
--   libc versions.  We also can't use pthread_once as some libc versions
--   call the init function.  So, we use pthread_create to check whether it
--   is possible to create a thread or not.  The stub implementation returns
--   the error number ENOSYS.  */
-+   libpthread libraries.  We also need a test that works for archive
-+   libraries.  We can't use pthread_once as some libc versions call the
-+   init function.  We also can't use pthread_create or pthread_attr_init
-+   as these create a thread and thereby prevent changing the default stack
-+   size.  The function pthread_default_stacksize_np is available in both
-+   the archive and shared versions of libpthread.   It can be used to
-+   determine the default pthread stack size.  There is a stub in some
-+   shared libc versions which returns a zero size if pthreads are not
-+   active.  We provide an equivalent stub to handle cases where libc
-+   doesn't provide one.  */
- 
- #if defined(__hppa__) && defined(__hpux__)
- 
--#include <errno.h>
--
- static volatile int __gthread_active = -1;
- 
--static void *
--__gthread_start (void *__arg __attribute__((unused)))
--{
--  return NULL;
--}
--
--static void __gthread_active_init (void) __attribute__((noinline));
--static void
--__gthread_active_init (void)
--{
--  static pthread_mutex_t __gthread_active_mutex = PTHREAD_MUTEX_INITIALIZER;
--  pthread_t __t;
--  pthread_attr_t __a;
--  int __result;
--
--  __gthrw_(pthread_mutex_lock) (&__gthread_active_mutex);
--  if (__gthread_active < 0)
--    {
--      __gthrw_(pthread_attr_init) (&__a);
--      __gthrw_(pthread_attr_setdetachstate) (&__a, PTHREAD_CREATE_DETACHED);
--      __result = __gthrw_(pthread_create) (&__t, &__a, __gthread_start, NULL);
--      if (__result != ENOSYS)
--	__gthread_active = 1;
--      else
--	__gthread_active = 0;
--      __gthrw_(pthread_attr_destroy) (&__a);
--    }
--  __gthrw_(pthread_mutex_unlock) (&__gthread_active_mutex);
--}
--
- static inline int
- __gthread_active_p (void)
- {
-   /* Avoid reading __gthread_active twice on the main code path.  */
-   int __gthread_active_latest_value = __gthread_active;
-+  size_t __s;
- 
--  /* This test is not protected to avoid taking a lock on the main code
--     path so every update of __gthread_active in a threaded program must
--     be atomic with regard to the result of the test.  */
-   if (__builtin_expect (__gthread_active_latest_value < 0, 0))
-     {
--      __gthread_active_init ();
-+      pthread_default_stacksize_np (0, &__s);
-+      __gthread_active = __s ? 1 : 0;
-       __gthread_active_latest_value = __gthread_active;
+       /* Now that the arguments are done, transform FN.  */
+       fn = build_non_dependent_expr (fn);
      }
- 
-Index: gcc/config/alpha/osf-unwind.h
-===================================================================
---- a/src/gcc/config/alpha/osf-unwind.h	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/config/alpha/osf-unwind.h	(.../branches/gcc-4_4-branch)
-@@ -0,0 +1,329 @@
-+/* DWARF2 EH unwinding support for Alpha Tru64.
-+   Copyright (C) 2010 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 3, or (at your option) any later
-+version.
-+
-+GCC is distributed in the hope that it will be useful, but WITHOUT ANY
-+WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-+for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with GCC; see the file COPYING3.  If not see
-+<http://www.gnu.org/licenses/>.  */
-+
-+/* This file implements the MD_FALLBACK_FRAME_STATE_FOR macro, triggered when
-+   the GCC table based unwinding process hits a frame for which no unwind info
-+   has been registered. This typically occurs when raising an exception from a
-+   signal handler, because the handler is actually called from the OS kernel.
-+
-+   The basic idea is to detect that we are indeed trying to unwind past a
-+   signal handler and to fill out the GCC internal unwinding structures for
-+   the OS kernel frame as if it had been directly called from the interrupted
-+   context.
-+
-+   This is all assuming that the code to set the handler asked the kernel to
-+   pass a pointer to such context information.  */
-+
-+/* --------------------------------------------------------------------------
-+   -- Basic principles of operation:
-+   --------------------------------------------------------------------------
-+
-+   1/ We first need a way to detect if we are trying to unwind past a signal
-+      handler.
-+
-+   The typical method that is used on most platforms is to look at the code
-+   around the return address we have and check if it matches the OS code
-+   calling a handler.  To determine what this code is expected to be, get a
-+   breakpoint into a real signal handler and look at the code around the
-+   return address.  Depending on the library versions the pattern of the
-+   signal handler is different; this is the reason why we check against more
-+   than one pattern.
-+
-+   On this target, the return address is right after the call and every
-+   instruction is 4 bytes long.  For the simple case of a null dereference in
-+   a single-threaded app, it went like:
-+
-+   # Check that we indeed have something we expect: the instruction right
-+   # before the return address is within a __sigtramp function and is a call.
-+
-+   [... run gdb and break at the signal handler entry ...]
-+
-+   (gdb) x /i $ra-4
-+   <__sigtramp+160>: jsr     ra,(a3),0x3ff800d0ed4 <_fpdata+36468>
-+
-+   # Look at the code around that return address, and eventually observe a
-+   # significantly large chunk of *constant* code right before the call:
-+
-+   (gdb) x /10i  $ra-44
-+   <__sigtramp+120>: lda     gp,-27988(gp)
-+   <__sigtramp+124>: ldq     at,-18968(gp)
-+   <__sigtramp+128>: lda     t0,-1
-+   <__sigtramp+132>: stq     t0,0(at)
-+   <__sigtramp+136>: ldq     at,-18960(gp)
-+   <__sigtramp+140>: ldl     t1,8(at)
-+   <__sigtramp+144>: ldq     at,-18960(gp)
-+   <__sigtramp+148>: stl     t1,12(at)
-+   <__sigtramp+152>: ldq     at,-18960(gp)
-+   <__sigtramp+156>: stl     t0,8(at)
-+
-+   # The hexadecimal equivalent that we will have to match is:
-+
-+   (gdb) x /10x  $ra-44
-+   <__sigtramp+120>: 0x23bd92ac    0xa79db5e8    0x203fffff   0xb43c0000
-+   <__sigtramp+136>: 0xa79db5f0    0xa05c0008    0xa79db5f0   0xb05c000c
-+   <__sigtramp+152>: 0xa79db5f0    0xb03c0008
-+
-+   The problem observed on this target with this approach is that although
-+   we found a constant set of instruction patterns there were some
-+   gp-related offsets that made the machine code to differ from one
-+   installation to another.  This problem could have been overcome by masking
-+   these offsets, but we found that it would be simpler and more efficient to
-+   check whether the return address was part of a signal handler, by comparing
-+   it against some expected code offset from __sigtramp.
-+
-+   # Check that we indeed have something we expect: the instruction
-+   # right before the return address is within a __sigtramp
-+   # function and is a call. We also need to obtain the offset
-+   # between the return address and the start address of __sigtramp.
-+
-+   [... run gdb and break at the signal handler entry ...]
-+
-+   (gdb) x /2i $ra-4
-+   <__sigtramp+160>: jsr     ra,(a3),0x3ff800d0ed4 <_fpdata+36468>
-+   <__sigtramp+164>: ldah    gp,16381(ra)
-+
-+   (gdb) p (long)$ra - (long)&__sigtramp
-+   $2 = 164
-+
-+   --------------------------------------------------------------------------
-+
-+   2/ Once we know we are going through a signal handler, we need a way to
-+      retrieve information about the interrupted run-time context.
-+
-+   On this platform, the third handler's argument is a pointer to a structure
-+   describing this context (struct sigcontext *). We unfortunately have no
-+   direct way to transfer this value here, so a couple of tricks are required
-+   to compute it.
-+
-+   As documented at least in some header files (e.g. sys/machine/context.h),
-+   the structure the handler gets a pointer to is located on the stack.  As of
-+   today, while writing this macro, we have unfortunately not been able to
-+   find a detailed description of the full stack layout at handler entry time,
-+   so we'll have to resort to empirism :)
-+
-+   When unwinding here, we have the handler's CFA at hand, as part of the
-+   current unwinding context which is one of our arguments.  We presume that
-+   for each call to a signal handler by the same kernel routine, the context's
-+   structure location on the stack is always at the same offset from the
-+   handler's CFA, and we compute that offset from bare observation:
-+
-+   For the simple case of a bare null dereference in a single-threaded app,
-+   computing the offset was done using GNAT like this:
-+
-+   # Break on the first handler's instruction, before the prologue to have the
-+   # CFA in $sp, and get there:
-+
-+   (gdb) b *&__gnat_error_handler
-+   Breakpoint 1 at 0x120016090: file init.c, line 378.
-+
-+   (gdb) r
-+   Program received signal SIGSEGV, Segmentation fault.
-+
-+   (gdb) c
-+   Breakpoint 1, __gnat_error_handler (sig=..., sip=..., context=...)
-+
-+   # The displayed argument value are meaningless because we stopped before
-+   # their final "homing". We know they are passed through $a0, $a1 and $a2
-+   # from the ABI, though, so ...
-+
-+   # Observe that $sp and the context pointer are in the same (stack) area,
-+   # and compute the offset:
-+
-+   (gdb) p /x $sp
-+   $2 = 0x11fffbc80
-+
-+   (gdb) p /x $a2
-+   $3 = 0x11fffbcf8
-+
-+   (gdb) p /x (long)$a2 - (long)$sp
-+   $4 = 0x78
-+
-+   --------------------------------------------------------------------------
-+
-+   3/ Once we know we are unwinding through a signal handler and have the
-+      address of the structure describing the interrupted context at hand, we
-+      have to fill the internal frame-state/unwind-context structures properly
-+      to allow the unwinding process to proceed.
-+
-+   Roughly, we are provided with an *unwinding* CONTEXT, describing the state
-+   of some point P in the call chain we are unwinding through.  The macro we
-+   implement has to fill a "frame state" structure FS that describe the P's
-+   caller state, by way of *rules* to compute its CFA, return address, and
-+   **saved** registers *locations*. 
-+
-+   For the case we are going to deal with, the caller is some kernel code
-+   calling a signal handler, and:
-+
-+   o The saved registers are all in the interrupted run-time context,
-+
-+   o The CFA is the stack pointer value when the kernel code is entered, that
-+     is, the stack pointer value at the interruption point, also part of the
-+     interrupted run-time context.
-+
-+   o We want the return address to appear as the address of the active
-+     instruction at the interruption point, so that the unwinder proceeds as
-+     if the interruption had been a regular call.  This address is also part
-+     of the interrupted run-time context.
-+
-+   --
-+
-+   Also, note that there is an important difference between the return address
-+   we need to claim for the kernel frame and the value of the return address
-+   register at the interruption point.
-+
-+   The latter might be required to be able to unwind past the interrupted
-+   routine, for instance if it is interrupted before saving the incoming
-+   register value in its own frame, which may typically happen during stack
-+   probes for stack-checking purposes.
-+
-+   It is then essential that the rules stated to locate the kernel frame
-+   return address don't clobber the rules describing where is saved the return
-+   address register at the interruption point, so some scratch register state
-+   entry should be used for the former. We have DWARF_ALT_FRAME_RETURN_COLUMN
-+   at hand exactly for that purpose.
-+
-+   --------------------------------------------------------------------------
-+
-+   4/ Depending on the context (single-threaded or multi-threaded app, ...),
-+   the code calling the handler and the handler-cfa to interrupted-context
-+   offset might change, so we use a simple generic data structure to track
-+   the possible variants.  */
-+
-+/* This is the structure to wrap information about each possible sighandler
-+   caller we may have to identify.  */
-+
-+typedef struct {
-+  /* Expected return address when being called from a sighandler.  */
-+  void *ra_value;
-+
-+  /* Offset to get to the sigcontext structure from the handler's CFA
-+     when the pattern matches.  */
-+  int cfa_to_context_offset;
-+
-+} sighandler_call_t;
-+
-+/* Helper macro for MD_FALLBACK_FRAME_STATE_FOR below.
-+
-+   Look at RA to see if it matches within a sighandler caller.
-+   Set SIGCTX to the corresponding sigcontext structure (computed from
-+   CFA) if it does, or to 0 otherwise.  */
-+
-+#define COMPUTE_SIGCONTEXT_FOR(RA,CFA,SIGCTX)				    \
-+do {									    \
-+  /* Define and register the applicable patterns.  */			    \
-+  extern void __sigtramp (void);					    \
-+									    \
-+  sighandler_call_t sighandler_calls [] = {				    \
-+    {__sigtramp + 164, 0x78}						    \
-+  };									    \
-+									    \
-+  int n_patterns_to_match						    \
-+    = sizeof (sighandler_calls) / sizeof (sighandler_call_t);		    \
-+									    \
-+  int pn;  /* pattern number  */					    \
-+									    \
-+  int match = 0;  /* Did last pattern match ?  */			    \
-+									    \
-+  /* Try to match each pattern in turn.  */				    \
-+  for (pn = 0; !match && pn < n_patterns_to_match; pn ++)		    \
-+    match = ((RA) == sighandler_calls[pn].ra_value);			    \
-+									    \
-+  (SIGCTX) = (struct sigcontext *)					    \
-+    (match ? ((CFA) + sighandler_calls[pn - 1].cfa_to_context_offset) : 0); \
-+} while (0);
-+
-+#include <sys/context_t.h>
-+
-+#define REG_SP  30  /* hard reg for stack pointer */
-+#define REG_RA  26  /* hard reg for return address */
-+
-+#define MD_FALLBACK_FRAME_STATE_FOR alpha_fallback_frame_state
-+
-+static _Unwind_Reason_Code
-+alpha_fallback_frame_state (struct _Unwind_Context *context,
-+			    _Unwind_FrameState *fs)
-+{
-+  /* Return address and CFA of the frame we're attempting to unwind through,
-+     possibly a signal handler.  */
-+  void *ctx_ra  = (void *)context->ra;
-+  void *ctx_cfa = (void *)context->cfa;
-+
-+  /* CFA of the intermediate abstract kernel frame between the interrupted
-+     code and the signal handler, if we're indeed unwinding through a signal
-+     handler.  */
-+  void *k_cfa;
-+
-+  /* Pointer to the sigcontext structure pushed by the kernel when we're
-+     unwinding through a signal handler.  */
-+  struct sigcontext *sigctx;
-+  int i;
-+
-+  COMPUTE_SIGCONTEXT_FOR (ctx_ra, ctx_cfa, sigctx);
-+
-+  if (sigctx == 0)
-+    return _URC_END_OF_STACK;
-+
-+  /* The kernel frame's CFA is exactly the stack pointer value at the
-+     interruption point.  */
-+  k_cfa = (void *) sigctx->sc_regs [REG_SP];
-+
-+  /* State the rules to compute the CFA we have the value of: use the
-+     previous CFA and offset by the difference between the two.  See
-+     uw_update_context_1 for the supporting details.  */
-+  fs->regs.cfa_how = CFA_REG_OFFSET;
-+  fs->regs.cfa_reg = __builtin_dwarf_sp_column ();
-+  fs->regs.cfa_offset = k_cfa - ctx_cfa;
-+
-+  /* Fill the internal frame_state structure with information stating
-+     where each register of interest in the saved context can be found
-+     from the CFA.  */
-+
-+  /* The general registers are in sigctx->sc_regs.  Leave out r31, which
-+     is read-as-zero. It makes no sense restoring it, and we are going to
-+     use the state entry for the kernel return address rule below.
-+
-+     This loop must cover at least all the callee-saved registers, and
-+     we just don't bother specializing the set here.  */
-+  for (i = 0; i <= 30; i ++)
-+    {
-+      fs->regs.reg[i].how = REG_SAVED_OFFSET;
-+      fs->regs.reg[i].loc.offset
-+	= (void *) &sigctx->sc_regs[i] - (void *) k_cfa;
-+    }
-+
-+  /* Ditto for the floating point registers in sigctx->sc_fpregs.  */
-+  for (i = 0; i <= 31; i ++)
-+    {
-+      fs->regs.reg[32+i].how = REG_SAVED_OFFSET;
-+      fs->regs.reg[32+i].loc.offset
-+	= (void *) &sigctx->sc_fpregs[i] - (void *) k_cfa;
-+    }
-+
-+  /* State the rules to find the kernel's code "return address", which
-+     is the address of the active instruction when the signal was caught,
-+     in sigctx->sc_pc. Use DWARF_ALT_FRAME_RETURN_COLUMN since the return
-+     address register is a general register and should be left alone.  */
-+  fs->retaddr_column = DWARF_ALT_FRAME_RETURN_COLUMN;
-+  fs->regs.reg[DWARF_ALT_FRAME_RETURN_COLUMN].how = REG_SAVED_OFFSET;
-+  fs->regs.reg[DWARF_ALT_FRAME_RETURN_COLUMN].loc.offset
-+    = (void *) &sigctx->sc_pc - (void *) k_cfa;
-+  fs->signal_frame = 1;
-+
-+  return _URC_NO_REASON;
-+}
-Index: gcc/config/alpha/alpha.h
-===================================================================
---- a/src/gcc/config/alpha/alpha.h	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/config/alpha/alpha.h	(.../branches/gcc-4_4-branch)
-@@ -913,6 +913,12 @@
- 
- #define RETURN_ADDR_RTX  alpha_return_addr
- 
-+/* Provide a definition of DWARF_FRAME_REGNUM here so that fallback unwinders
-+   can use DWARF_ALT_FRAME_RETURN_COLUMN defined below.  This is just the same
-+   as the default definition in dwarf2out.c.  */
-+#undef DWARF_FRAME_REGNUM
-+#define DWARF_FRAME_REGNUM(REG) DBX_REGISTER_NUMBER (REG)
-+
- /* Before the prologue, RA lives in $26.  */
- #define INCOMING_RETURN_ADDR_RTX  gen_rtx_REG (Pmode, 26)
- #define DWARF_FRAME_RETURN_COLUMN DWARF_FRAME_REGNUM (26)
-Index: gcc/config/alpha/host-osf.c
-===================================================================
---- a/src/gcc/config/alpha/host-osf.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/config/alpha/host-osf.c	(.../branches/gcc-4_4-branch)
-@@ -0,0 +1,147 @@
-+/* Tru64 UNIX host-specific hook definitions.
-+   Copyright (C) 2011 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 3, or (at your
-+   option) any later version.
-+
-+   GCC is distributed in the hope that it will be useful, but WITHOUT
-+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-+   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
-+   License for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with GCC; see the file COPYING3.  If not see
-+   <http://www.gnu.org/licenses/>.  */
-+
-+#include "config.h"
-+#include "system.h"
-+#include "coretypes.h"
-+#include <sys/mman.h>
-+/* Inhibit inclusion of <sys/mount.h>, unnecessary and errors out due to
-+   use of poisoned bcmp, bcopy.  */
-+#define _SYS_MOUNT_H_
-+#include <sys/procfs.h>
-+#include "hosthooks.h"
-+#include "hosthooks-def.h"
-+
-+
-+#undef HOST_HOOKS_GT_PCH_GET_ADDRESS
-+#define HOST_HOOKS_GT_PCH_GET_ADDRESS osf_gt_pch_get_address
-+#undef HOST_HOOKS_GT_PCH_USE_ADDRESS
-+#define HOST_HOOKS_GT_PCH_USE_ADDRESS osf_gt_pch_use_address
-+
-+/* The mmap ADDR parameter may be ignored without MAP_FIXED set.  Before we
-+   give up, check existing mappings with ioctl(PIOCMAP) to see if the space
-+   is really free.  */
-+
-+static void *
-+mmap_fixed (void *addr, size_t len, int prot, int flags, int fd, off_t off)
-+{
-+  void *base;
-+
-+  base = mmap ((caddr_t) addr, len, prot, flags, fd, off);
-+  
-+  if (base != addr)
-+    {
-+      /* PID_MAX is SHRT_MAX on Tru64 UNIX V4.0, but INT_MAX on V5.1.
-+	 Allow for both.  "/proc/" + INT_MAX + '\0'.  */
-+      char pname[6+10+1];
-+      int procfd, nmap;
-+      prmap_t *pmap;
-+      int i, overlap = 0;
-+
-+      if (base != (void *) MAP_FAILED)
-+	munmap ((caddr_t) base, len);
-+
-+      /* Check if there's any mapping overlapping [addr, addr+len).  */
-+
-+      snprintf (pname, sizeof (pname), "/proc/%d", getpid ());
-+      procfd = open (pname, O_RDONLY);
-+      if (procfd == -1)
-+	return ((void *) MAP_FAILED);
-+      if (ioctl (procfd, PIOCNMAP, &nmap) == -1)
-+	return ((void *) MAP_FAILED);
-+      pmap = (prmap_t *) xmalloc (sizeof (*pmap) * (nmap+1));
-+      if (ioctl (procfd, PIOCMAP, pmap) == -1)
-+	return ((void *) MAP_FAILED);
-+
-+      /* It seems like pmap[] is sorted by address, but can we rely on
-+	 that?  */
-+      for (i = 0; i < nmap; i++)
-+	{
-+	  unsigned long map_start = (unsigned long) pmap[i].pr_vaddr;
-+	  unsigned long map_end = map_start + pmap[i].pr_size;
-+
-+	  if ((unsigned long) addr < map_end
-+	      && (unsigned long) addr+len > map_start)
-+	    {
-+	      overlap = 1;
-+	      break;
-+	    }
-+	}
-+      free (pmap);
-+      close (procfd);
-+
-+      if (!overlap)
-+	base = mmap ((caddr_t) addr, len, prot, flags | MAP_FIXED, fd, off);
-+      else
-+	base = mmap ((caddr_t) addr, len, prot, flags, fd, off);
-+    }
-+
-+  return base;
-+}
-+
-+/* For various ports, try to guess a fixed spot in the vm space that's
-+   probably free.  Take the middle between start of text segment and
-+   dynamic loader space.  See <sys/machine/addrconf.h> and Tru64 UNIX
-+   Assembly Language Programmer's Guide, p.6-18, Figure 6-3: Default Layout
-+   of Memory (User Program View).  */
-+#define TRY_EMPTY_VM_SPACE	0x20050000000
-+
-+/* Determine a location where we might be able to reliably allocate
-+   SIZE bytes.  FD is the PCH file, though we should return with the
-+   file unmapped.  */
-+
-+static void *
-+osf_gt_pch_get_address (size_t size, int fd)
-+{
-+  void *addr;
-+
-+  addr = mmap_fixed ((caddr_t) TRY_EMPTY_VM_SPACE, size,
-+		     PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
-+
-+  /* If we failed the map, that means there's *no* free space.  */
-+  if (addr == (void *) MAP_FAILED)
-+    return NULL;
-+  /* Unmap the area before returning.  */
-+  munmap ((caddr_t) addr, size);
-+
-+  return addr;
-+}
-+
-+/* Map SIZE bytes of FD+OFFSET at BASE.  Return 1 if we succeeded at 
-+   mapping the data at BASE, -1 if we couldn't.  */
-+
-+static int
-+osf_gt_pch_use_address (void *base, size_t size, int fd, size_t offset)
-+{
-+  void *addr;
-+
-+  /* We're called with size == 0 if we're not planning to load a PCH
-+     file at all.  This allows the hook to free any static space that
-+     we might have allocated at link time.  */
-+  if (size == 0)
-+    return -1;
-+
-+  addr = mmap_fixed ((caddr_t) base, size,
-+		     PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, offset);
-+
-+  return addr == base ? 1 : -1;
-+}
-+
-+
-+const struct host_hooks host_hooks = HOST_HOOKS_INITIALIZER;
-Index: gcc/config/alpha/x-osf
-===================================================================
---- a/src/gcc/config/alpha/x-osf	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/config/alpha/x-osf	(.../branches/gcc-4_4-branch)
-@@ -0,0 +1,4 @@
-+host-osf.o : $(srcdir)/config/alpha/host-osf.c $(CONFIG_H) $(SYSTEM_H) \
-+  coretypes.h hosthooks.h hosthooks-def.h $(HOOKS_H)
-+	$(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
-+		$(srcdir)/config/alpha/host-osf.c
-Index: gcc/config/alpha/osf.h
-===================================================================
---- a/src/gcc/config/alpha/osf.h	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/config/alpha/osf.h	(.../branches/gcc-4_4-branch)
-@@ -1,6 +1,6 @@
- /* Definitions of target machine for GNU compiler, for DEC Alpha on OSF/1.
-    Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2001, 2002, 2003,
--   2004, 2007 Free Software Foundation, Inc.
-+   2004, 2007, 2010 Free Software Foundation, Inc.
-    Contributed by Richard Kenner (kenner@vlsi1.ultra.nyu.edu)
- 
- This file is part of GCC.
-@@ -185,6 +185,14 @@
-    ? (((GLOBAL) ? DW_EH_PE_indirect : 0) | DW_EH_PE_pcrel | DW_EH_PE_sdata4) \
-    : DW_EH_PE_aligned)
- 
-+/* The Tru64 UNIX assembler warns on .lcomm with SIZE 0, so use 1 in that
-+   case.  */
-+#undef ASM_OUTPUT_LOCAL
-+#define ASM_OUTPUT_LOCAL(FILE, NAME, SIZE,ROUNDED)	\
-+( fputs ("\t.lcomm ", (FILE)),				\
-+  assemble_name ((FILE), (NAME)),			\
-+  fprintf ((FILE), ","HOST_WIDE_INT_PRINT_UNSIGNED"\n", (SIZE) ? (SIZE) : 1))
-+
- /* This is how we tell the assembler that a symbol is weak.  */
- 
- #define ASM_OUTPUT_WEAK_ALIAS(FILE, NAME, VALUE)	\
-@@ -210,3 +218,5 @@
- /* Handle #pragma extern_prefix.  Technically only needed for Tru64 5.x,
-    but easier to manipulate preprocessor bits from here.  */
- #define TARGET_HANDLE_PRAGMA_EXTERN_PREFIX 1
-+
-+#define MD_UNWIND_SUPPORT "config/alpha/osf-unwind.h"
-Index: gcc/config/i386/i386.h
-===================================================================
---- a/src/gcc/config/i386/i386.h	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/config/i386/i386.h	(.../branches/gcc-4_4-branch)
-@@ -1,6 +1,6 @@
- /* Definitions of target machine for GCC for IA-32.
-    Copyright (C) 1988, 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
--   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-+   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-    Free Software Foundation, Inc.
- 
- This file is part of GCC.
-@@ -422,7 +422,7 @@
- #define TARGET_GNU_TLS		(ix86_tls_dialect == TLS_DIALECT_GNU)
- #define TARGET_GNU2_TLS		(ix86_tls_dialect == TLS_DIALECT_GNU2)
- #define TARGET_ANY_GNU_TLS	(TARGET_GNU_TLS || TARGET_GNU2_TLS)
--#define TARGET_SUN_TLS		(ix86_tls_dialect == TLS_DIALECT_SUN)
-+#define TARGET_SUN_TLS		0
- 
- extern int ix86_isa_flags;
- 
-Index: gcc/config/i386/i386.md
-===================================================================
---- a/src/gcc/config/i386/i386.md	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/config/i386/i386.md	(.../branches/gcc-4_4-branch)
-@@ -1,6 +1,6 @@
- ;; GCC machine description for IA-32 and x86-64.
- ;; Copyright (C) 1988, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
--;; 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-+;; 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
- ;; Free Software Foundation, Inc.
- ;; Mostly by William Schelter.
- ;; x86_64 support added by Jan Hubicka
-@@ -75,6 +75,7 @@
-    (UNSPEC_TLS_GD		21)
-    (UNSPEC_TLS_LD_BASE		22)
-    (UNSPEC_TLSDESC		23)
-+   (UNSPEC_TLS_IE_SUN		24)
- 
-    ; Other random patterns
-    (UNSPEC_EH_RETURN		29)
-@@ -2561,6 +2562,12 @@
-   DONE;
- })
- 
-+(define_insn "*pushti"
-+  [(set (match_operand:TI 0 "push_operand" "=<")
-+	(match_operand:TI 1 "general_no_elim_operand" "riF*m"))]
-+  "TARGET_64BIT"
-+  "#")
-+
- (define_insn "*movti_internal"
-   [(set (match_operand:TI 0 "nonimmediate_operand" "=x,x,m")
- 	(match_operand:TI 1 "vector_move_operand" "C,xm,x"))]
-@@ -2668,6 +2675,14 @@
- 	       (const_string "DI")))])
- 
- (define_split
-+  [(set (match_operand:TI 0 "push_operand" "")
-+        (match_operand:TI 1 "general_operand" ""))]
-+  "TARGET_64BIT && reload_completed
-+   && !SSE_REG_P (operands[1])"
-+  [(const_int 0)]
-+  "ix86_split_long_move (operands); DONE;")
-+
-+(define_split
-   [(set (match_operand:TI 0 "nonimmediate_operand" "")
-         (match_operand:TI 1 "general_operand" ""))]
-   "reload_completed && !SSE_REG_P (operands[0])
-@@ -15875,21 +15890,6 @@
-   [(set_attr "type" "multi")
-    (set_attr "length" "12")])
- 
--(define_insn "*tls_global_dynamic_32_sun"
--  [(set (match_operand:SI 0 "register_operand" "=a")
--	(unspec:SI [(match_operand:SI 1 "register_operand" "b")
--		    (match_operand:SI 2 "tls_symbolic_operand" "")
--		    (match_operand:SI 3 "call_insn_operand" "")]
--		    UNSPEC_TLS_GD))
--   (clobber (match_scratch:SI 4 "=d"))
--   (clobber (match_scratch:SI 5 "=c"))
--   (clobber (reg:CC FLAGS_REG))]
--  "!TARGET_64BIT && TARGET_SUN_TLS"
--  "lea{l}\t{%a2@DTLNDX(%1), %4|%4, %a2@DTLNDX[%1]}
--	push{l}\t%4\;call\t%a2@TLSPLT\;pop{l}\t%4\;nop"
--  [(set_attr "type" "multi")
--   (set_attr "length" "14")])
--
- (define_expand "tls_global_dynamic_32"
-   [(parallel [(set (match_operand:SI 0 "register_operand" "")
- 		   (unspec:SI
-@@ -15958,20 +15958,6 @@
-   [(set_attr "type" "multi")
-    (set_attr "length" "11")])
- 
--(define_insn "*tls_local_dynamic_base_32_sun"
--  [(set (match_operand:SI 0 "register_operand" "=a")
--	(unspec:SI [(match_operand:SI 1 "register_operand" "b")
--                    (match_operand:SI 2 "call_insn_operand" "")]
--		   UNSPEC_TLS_LD_BASE))
--   (clobber (match_scratch:SI 3 "=d"))
--   (clobber (match_scratch:SI 4 "=c"))
--   (clobber (reg:CC FLAGS_REG))]
--  "!TARGET_64BIT && TARGET_SUN_TLS"
--  "lea{l}\t{%&@TMDNX(%1), %3|%3, %&@TMDNX[%1]}
--	push{l}\t%3\;call\t%&@TLSPLT\;pop{l}\t%3"
--  [(set_attr "type" "multi")
--   (set_attr "length" "13")])
--
- (define_expand "tls_local_dynamic_base_32"
-   [(parallel [(set (match_operand:SI 0 "register_operand" "")
- 		   (unspec:SI [(match_dup 1) (match_dup 2)]
-@@ -16097,6 +16083,18 @@
-    (set_attr "memory" "load")
-    (set_attr "imm_disp" "false")])
- 
-+;; The Sun linker took the AMD64 TLS spec literally and can only handle
-+;; %rax as destination of the initial executable code sequence.
-+(define_insn "tls_initial_exec_64_sun"
-+  [(set (match_operand:DI 0 "register_operand" "=a")
-+	(unspec:DI
-+	 [(match_operand:DI 1 "tls_symbolic_operand" "")]
-+	 UNSPEC_TLS_IE_SUN))
-+   (clobber (reg:CC FLAGS_REG))]
-+  "TARGET_64BIT && TARGET_SUN_TLS"
-+  "mov{q}\t{%%fs:0, %0|%0, QWORD PTR fs:0}\n\tadd{q}\t{%a1@gottpoff(%%rip), %0|%0, %a1@gottpoff[rip]}"
-+  [(set_attr "type" "multi")])
-+
- ;; GNU2 TLS patterns can be split.
- 
- (define_expand "tls_dynamic_gnu2_32"
-Index: gcc/config/i386/sol2.h
-===================================================================
---- a/src/gcc/config/i386/sol2.h	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/config/i386/sol2.h	(.../branches/gcc-4_4-branch)
-@@ -91,6 +91,11 @@
-       }							\
-   } while (0)
- 
-+/* Follow Sun requirements for TLS code sequences and use Sun assembler TLS
-+   syntax.  */
-+#undef TARGET_SUN_TLS
-+#define TARGET_SUN_TLS 1
-+
- /* The Solaris assembler cannot grok .stabd directives.  */
- #undef NO_DBX_BNSYM_ENSYM
- #define NO_DBX_BNSYM_ENSYM 1
-Index: gcc/config/i386/xmmintrin.h
-===================================================================
---- a/src/gcc/config/i386/xmmintrin.h	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/config/i386/xmmintrin.h	(.../branches/gcc-4_4-branch)
-@@ -626,13 +626,13 @@
-   __sign = __builtin_ia32_pcmpgtw ((__v4hi)0LL, (__v4hi)__A);
- 
-   /* Convert the four words to doublewords.  */
-+  __losi = (__v2si) __builtin_ia32_punpcklwd ((__v4hi)__A, __sign);
-   __hisi = (__v2si) __builtin_ia32_punpckhwd ((__v4hi)__A, __sign);
--  __losi = (__v2si) __builtin_ia32_punpcklwd ((__v4hi)__A, __sign);
- 
-   /* Convert the doublewords to floating point two at a time.  */
-   __zero = (__v4sf) _mm_setzero_ps ();
--  __ra = __builtin_ia32_cvtpi2ps (__zero, __hisi);
--  __rb = __builtin_ia32_cvtpi2ps (__ra, __losi);
-+  __ra = __builtin_ia32_cvtpi2ps (__zero, __losi);
-+  __rb = __builtin_ia32_cvtpi2ps (__ra, __hisi);
- 
-   return (__m128) __builtin_ia32_movlhps (__ra, __rb);
- }
-@@ -645,13 +645,13 @@
-   __v4sf __zero, __ra, __rb;
- 
-   /* Convert the four words to doublewords.  */
-+  __losi = (__v2si) __builtin_ia32_punpcklwd ((__v4hi)__A, (__v4hi)0LL);
-   __hisi = (__v2si) __builtin_ia32_punpckhwd ((__v4hi)__A, (__v4hi)0LL);
--  __losi = (__v2si) __builtin_ia32_punpcklwd ((__v4hi)__A, (__v4hi)0LL);
- 
-   /* Convert the doublewords to floating point two at a time.  */
-   __zero = (__v4sf) _mm_setzero_ps ();
--  __ra = __builtin_ia32_cvtpi2ps (__zero, __hisi);
--  __rb = __builtin_ia32_cvtpi2ps (__ra, __losi);
-+  __ra = __builtin_ia32_cvtpi2ps (__zero, __losi);
-+  __rb = __builtin_ia32_cvtpi2ps (__ra, __hisi);
- 
-   return (__m128) __builtin_ia32_movlhps (__ra, __rb);
- }
-Index: gcc/config/i386/sse.md
-===================================================================
---- a/src/gcc/config/i386/sse.md	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/config/i386/sse.md	(.../branches/gcc-4_4-branch)
-@@ -4456,7 +4456,7 @@
-    movsd\t{%2, %0|%0, %2}
-    movlpd\t{%2, %0|%0, %2}
-    movsd\t{%2, %0|%0, %2}
--   shufpd\t{$2, %2, %0|%0, %2, 2}
-+   shufpd\t{$2, %1, %0|%0, %1, 2}
-    movhpd\t{%H1, %0|%0, %H1}
-    #
-    #
-@@ -4533,7 +4533,7 @@
-    movsd\t{%2, %0|%0, %2}
-    movlpd\t{%2, %0|%0, %2}
-    movlpd\t{%2, %0|%0, %2}
--   shufpd\t{$2, %2, %0|%0, %2, 2}
-+   shufpd\t{$2, %1, %0|%0, %1, 2}
-    movhps\t{%H1, %0|%0, %H1}
-    movhps\t{%1, %H0|%H0, %1}"
-   [(set_attr "type" "ssemov,ssemov,ssemov,sselog,ssemov,ssemov")
-@@ -8421,7 +8421,7 @@
- 	(ss_plus:V8HI
- 	  (mult:V8HI
- 	    (zero_extend:V8HI
--	      (vec_select:V4QI
-+	      (vec_select:V8QI
- 		(match_operand:V16QI 1 "register_operand" "x")
- 		(parallel [(const_int 0)
- 			   (const_int 2)
-@@ -8444,7 +8444,7 @@
- 			   (const_int 14)]))))
- 	  (mult:V8HI
- 	    (zero_extend:V8HI
--	      (vec_select:V16QI (match_dup 1)
-+	      (vec_select:V8QI (match_dup 1)
- 		(parallel [(const_int 1)
- 			   (const_int 3)
- 			   (const_int 5)
-@@ -8454,7 +8454,7 @@
- 			   (const_int 13)
- 			   (const_int 15)])))
- 	    (sign_extend:V8HI
--	      (vec_select:V16QI (match_dup 2)
-+	      (vec_select:V8QI (match_dup 2)
- 		(parallel [(const_int 1)
- 			   (const_int 3)
- 			   (const_int 5)
-@@ -8474,7 +8474,7 @@
- 	(ss_plus:V8HI
- 	  (mult:V8HI
- 	    (zero_extend:V8HI
--	      (vec_select:V4QI
-+	      (vec_select:V8QI
- 		(match_operand:V16QI 1 "register_operand" "0")
- 		(parallel [(const_int 0)
- 			   (const_int 2)
-@@ -8497,7 +8497,7 @@
- 			   (const_int 14)]))))
- 	  (mult:V8HI
- 	    (zero_extend:V8HI
--	      (vec_select:V16QI (match_dup 1)
-+	      (vec_select:V8QI (match_dup 1)
- 		(parallel [(const_int 1)
- 			   (const_int 3)
- 			   (const_int 5)
-@@ -8507,7 +8507,7 @@
- 			   (const_int 13)
- 			   (const_int 15)])))
- 	    (sign_extend:V8HI
--	      (vec_select:V16QI (match_dup 2)
-+	      (vec_select:V8QI (match_dup 2)
- 		(parallel [(const_int 1)
- 			   (const_int 3)
- 			   (const_int 5)
-@@ -8543,13 +8543,13 @@
- 			   (const_int 6)]))))
- 	  (mult:V4HI
- 	    (zero_extend:V4HI
--	      (vec_select:V8QI (match_dup 1)
-+	      (vec_select:V4QI (match_dup 1)
- 		(parallel [(const_int 1)
- 			   (const_int 3)
- 			   (const_int 5)
- 			   (const_int 7)])))
- 	    (sign_extend:V4HI
--	      (vec_select:V8QI (match_dup 2)
-+	      (vec_select:V4QI (match_dup 2)
- 		(parallel [(const_int 1)
- 			   (const_int 3)
- 			   (const_int 5)
-@@ -11657,7 +11657,7 @@
-   [(set (match_operand:AVXMODEF2P 0 "register_operand" "=x")
- 	(unspec:AVXMODEF2P
- 	  [(match_operand:AVXMODEF2P 1 "memory_operand" "m")
--	   (match_operand:AVXMODEF2P 2 "register_operand" "x")
-+	   (match_operand:<avxpermvecmode> 2 "register_operand" "x")
- 	   (match_dup 0)]
- 	  UNSPEC_MASKLOAD))]
-   "TARGET_AVX"
-@@ -11669,7 +11669,7 @@
- (define_insn "avx_maskstorep<avxmodesuffixf2c><avxmodesuffix>"
-   [(set (match_operand:AVXMODEF2P 0 "memory_operand" "=m")
- 	(unspec:AVXMODEF2P
--	  [(match_operand:AVXMODEF2P 1 "register_operand" "x")
-+	  [(match_operand:<avxpermvecmode> 1 "register_operand" "x")
- 	   (match_operand:AVXMODEF2P 2 "register_operand" "x")
- 	   (match_dup 0)]
- 	  UNSPEC_MASKSTORE))]
-Index: gcc/config/i386/avxintrin.h
-===================================================================
---- a/src/gcc/config/i386/avxintrin.h	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/config/i386/avxintrin.h	(.../branches/gcc-4_4-branch)
-@@ -737,7 +737,7 @@
- _mm256_insert_epi32 (__m256i __X, int __D, int const __N)
- {
-   __m128i __Y = _mm256_extractf128_si256 (__X, __N >> 2);
--  __Y = _mm_insert_epi16 (__Y, __D, __N % 4);
-+  __Y = _mm_insert_epi32 (__Y, __D, __N % 4);
-   return _mm256_insertf128_si256 (__X, __Y, __N >> 2);
- }
- 
-@@ -762,7 +762,7 @@
- _mm256_insert_epi64 (__m256i __X, int __D, int const __N)
- {
-   __m128i __Y = _mm256_extractf128_si256 (__X, __N >> 1);
--  __Y = _mm_insert_epi16 (__Y, __D, __N % 2);
-+  __Y = _mm_insert_epi64 (__Y, __D, __N % 2);
-   return _mm256_insertf128_si256 (__X, __Y, __N >> 1);
- }
- #endif
-@@ -890,55 +890,55 @@
- }
- 
- extern __inline __m128d __attribute__((__gnu_inline__, __always_inline__, __artificial__))
--_mm_maskload_pd (double const *__P, __m128d __M)
-+_mm_maskload_pd (double const *__P, __m128i __M)
- {
-   return (__m128d) __builtin_ia32_maskloadpd ((const __v2df *)__P,
--					      (__v2df)__M);
-+					      (__v2di)__M);
- }
- 
- extern __inline void __attribute__((__gnu_inline__, __always_inline__, __artificial__))
--_mm_maskstore_pd (double *__P, __m128d __M, __m128d __A)
-+_mm_maskstore_pd (double *__P, __m128i __M, __m128d __A)
- {
--  __builtin_ia32_maskstorepd ((__v2df *)__P, (__v2df)__M, (__v2df)__A);
-+  __builtin_ia32_maskstorepd ((__v2df *)__P, (__v2di)__M, (__v2df)__A);
- }
- 
- extern __inline __m256d __attribute__((__gnu_inline__, __always_inline__, __artificial__))
--_mm256_maskload_pd (double const *__P, __m256d __M)
-+_mm256_maskload_pd (double const *__P, __m256i __M)
- {
-   return (__m256d) __builtin_ia32_maskloadpd256 ((const __v4df *)__P,
--						 (__v4df)__M);
-+						 (__v4di)__M);
- }
- 
- extern __inline void __attribute__((__gnu_inline__, __always_inline__, __artificial__))
--_mm256_maskstore_pd (double *__P, __m256d __M, __m256d __A)
-+_mm256_maskstore_pd (double *__P, __m256i __M, __m256d __A)
- {
--  __builtin_ia32_maskstorepd256 ((__v4df *)__P, (__v4df)__M, (__v4df)__A);
-+  __builtin_ia32_maskstorepd256 ((__v4df *)__P, (__v4di)__M, (__v4df)__A);
- }
- 
- extern __inline __m128 __attribute__((__gnu_inline__, __always_inline__, __artificial__))
--_mm_maskload_ps (float const *__P, __m128 __M)
-+_mm_maskload_ps (float const *__P, __m128i __M)
- {
-   return (__m128) __builtin_ia32_maskloadps ((const __v4sf *)__P,
--					     (__v4sf)__M);
-+					     (__v4si)__M);
- }
- 
- extern __inline void __attribute__((__gnu_inline__, __always_inline__, __artificial__))
--_mm_maskstore_ps (float *__P, __m128 __M, __m128 __A)
-+_mm_maskstore_ps (float *__P, __m128i __M, __m128 __A)
- {
--  __builtin_ia32_maskstoreps ((__v4sf *)__P, (__v4sf)__M, (__v4sf)__A);
-+  __builtin_ia32_maskstoreps ((__v4sf *)__P, (__v4si)__M, (__v4sf)__A);
- }
- 
- extern __inline __m256 __attribute__((__gnu_inline__, __always_inline__, __artificial__))
--_mm256_maskload_ps (float const *__P, __m256 __M)
-+_mm256_maskload_ps (float const *__P, __m256i __M)
- {
-   return (__m256) __builtin_ia32_maskloadps256 ((const __v8sf *)__P,
--						(__v8sf)__M);
-+						(__v8si)__M);
- }
- 
- extern __inline void __attribute__((__gnu_inline__, __always_inline__, __artificial__))
--_mm256_maskstore_ps (float *__P, __m256 __M, __m256 __A)
-+_mm256_maskstore_ps (float *__P, __m256i __M, __m256 __A)
- {
--  __builtin_ia32_maskstoreps256 ((__v8sf *)__P, (__v8sf)__M, (__v8sf)__A);
-+  __builtin_ia32_maskstoreps256 ((__v8sf *)__P, (__v8si)__M, (__v8sf)__A);
- }
- 
- extern __inline __m256 __attribute__((__gnu_inline__, __always_inline__, __artificial__))
-Index: gcc/config/i386/i386.c
-===================================================================
---- a/src/gcc/config/i386/i386.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/config/i386/i386.c	(.../branches/gcc-4_4-branch)
-@@ -2999,8 +2999,6 @@
- 	ix86_tls_dialect = TLS_DIALECT_GNU;
-       else if (strcmp (ix86_tls_dialect_string, "gnu2") == 0)
- 	ix86_tls_dialect = TLS_DIALECT_GNU2;
--      else if (strcmp (ix86_tls_dialect_string, "sun") == 0)
--	ix86_tls_dialect = TLS_DIALECT_SUN;
-       else
- 	error ("bad value (%s) for %stls-dialect=%s %s",
- 	       ix86_tls_dialect_string, prefix, suffix, sw);
-@@ -6956,7 +6954,7 @@
- 	}
-       if (need_temp)
- 	{
--	  int i;
-+	  int i, prev_size = 0;
- 	  tree temp = create_tmp_var (type, "va_arg_tmp");
- 
- 	  /* addr = &temp; */
-@@ -6968,14 +6966,32 @@
- 	      rtx slot = XVECEXP (container, 0, i);
- 	      rtx reg = XEXP (slot, 0);
- 	      enum machine_mode mode = GET_MODE (reg);
--	      tree piece_type = lang_hooks.types.type_for_mode (mode, 1);
--	      tree addr_type = build_pointer_type (piece_type);
--	      tree daddr_type = build_pointer_type_for_mode (piece_type,
--							     ptr_mode, true);
-+	      tree piece_type;
-+	      tree addr_type;
-+	      tree daddr_type;
- 	      tree src_addr, src;
- 	      int src_offset;
- 	      tree dest_addr, dest;
-+	      int cur_size = GET_MODE_SIZE (mode);
- 
-+	      gcc_assert (prev_size <= INTVAL (XEXP (slot, 1)));
-+	      prev_size = INTVAL (XEXP (slot, 1));
-+	      if (prev_size + cur_size > size)
-+		{
-+		  cur_size = size - prev_size;
-+		  mode = mode_for_size (cur_size * BITS_PER_UNIT, MODE_INT, 1);
-+		  if (mode == BLKmode)
-+		    mode = QImode;
-+		}
-+	      piece_type = lang_hooks.types.type_for_mode (mode, 1);
-+	      if (mode == GET_MODE (reg))
-+		addr_type = build_pointer_type (piece_type);
-+	      else
-+		addr_type = build_pointer_type_for_mode (piece_type, ptr_mode,
-+							 true);
-+	      daddr_type = build_pointer_type_for_mode (piece_type, ptr_mode,
-+							true);
-+
- 	      if (SSE_REGNO_P (REGNO (reg)))
- 		{
- 		  src_addr = sse_addr;
-@@ -6989,14 +7005,26 @@
- 	      src_addr = fold_convert (addr_type, src_addr);
- 	      src_addr = fold_build2 (POINTER_PLUS_EXPR, addr_type, src_addr,
- 				      size_int (src_offset));
--	      src = build_va_arg_indirect_ref (src_addr);
- 
- 	      dest_addr = fold_convert (daddr_type, addr);
- 	      dest_addr = fold_build2 (POINTER_PLUS_EXPR, daddr_type, dest_addr,
--				       size_int (INTVAL (XEXP (slot, 1))));
--	      dest = build_va_arg_indirect_ref (dest_addr);
-+				       size_int (prev_size));
-+	      if (cur_size == GET_MODE_SIZE (mode))
-+		{
-+		  src = build_va_arg_indirect_ref (src_addr);
-+		  dest = build_va_arg_indirect_ref (dest_addr);
- 
--	      gimplify_assign (dest, src, pre_p);
-+		  gimplify_assign (dest, src, pre_p);
-+		}
-+	      else
-+		{
-+		  tree copy
-+		    = build_call_expr (implicit_built_in_decls[BUILT_IN_MEMCPY],
-+				       3, dest_addr, src_addr,
-+				       size_int (cur_size));
-+		  gimplify_and_add (copy, pre_p);
-+		}
-+	      prev_size += cur_size;
- 	    }
- 	}
- 
-@@ -9839,6 +9867,17 @@
-     case TLS_MODEL_INITIAL_EXEC:
-       if (TARGET_64BIT)
- 	{
-+	  if (TARGET_SUN_TLS)
-+	    {
-+	      /* The Sun linker took the AMD64 TLS spec literally
-+		 and can only handle %rax as destination of the
-+		 initial executable code sequence.  */
-+
-+	      dest = gen_reg_rtx (Pmode);
-+	      emit_insn (gen_tls_initial_exec_64_sun (dest, x));
-+	      return dest;
-+	    }
-+
- 	  pic = NULL;
- 	  type = UNSPEC_GOTNTPOFF;
- 	}
-@@ -20767,12 +20806,12 @@
-   V4DF_FTYPE_PCDOUBLE,
-   V4SF_FTYPE_PCFLOAT,
-   V2DF_FTYPE_PCDOUBLE,
--  V8SF_FTYPE_PCV8SF_V8SF,
--  V4DF_FTYPE_PCV4DF_V4DF,
-+  V8SF_FTYPE_PCV8SF_V8SI,
-+  V4DF_FTYPE_PCV4DF_V4DI,
-   V4SF_FTYPE_V4SF_PCV2SF,
--  V4SF_FTYPE_PCV4SF_V4SF,
-+  V4SF_FTYPE_PCV4SF_V4SI,
-   V2DF_FTYPE_V2DF_PCDOUBLE,
--  V2DF_FTYPE_PCV2DF_V2DF,
-+  V2DF_FTYPE_PCV2DF_V2DI,
-   V2DI_FTYPE_PV2DI,
-   VOID_FTYPE_PV2SF_V4SF,
-   VOID_FTYPE_PV4DI_V4DI,
-@@ -20785,10 +20824,10 @@
-   VOID_FTYPE_PDOUBLE_V2DF,
-   VOID_FTYPE_PDI_DI,
-   VOID_FTYPE_PINT_INT,
--  VOID_FTYPE_PV8SF_V8SF_V8SF,
--  VOID_FTYPE_PV4DF_V4DF_V4DF,
--  VOID_FTYPE_PV4SF_V4SF_V4SF,
--  VOID_FTYPE_PV2DF_V2DF_V2DF
-+  VOID_FTYPE_PV8SF_V8SI_V8SF,
-+  VOID_FTYPE_PV4DF_V4DI_V4DF,
-+  VOID_FTYPE_PV4SF_V4SI_V4SF,
-+  VOID_FTYPE_PV2DF_V2DI_V2DF
- };
- 
- /* Builtin types */
-@@ -21019,14 +21058,14 @@
-   { OPTION_MASK_ISA_AVX, CODE_FOR_avx_movntv4df, "__builtin_ia32_movntpd256", IX86_BUILTIN_MOVNTPD256, UNKNOWN, (int) VOID_FTYPE_PDOUBLE_V4DF },
-   { OPTION_MASK_ISA_AVX, CODE_FOR_avx_movntv8sf, "__builtin_ia32_movntps256", IX86_BUILTIN_MOVNTPS256, UNKNOWN, (int) VOID_FTYPE_PFLOAT_V8SF },
- 
--  { OPTION_MASK_ISA_AVX, CODE_FOR_avx_maskloadpd, "__builtin_ia32_maskloadpd", IX86_BUILTIN_MASKLOADPD, UNKNOWN, (int) V2DF_FTYPE_PCV2DF_V2DF },
--  { OPTION_MASK_ISA_AVX, CODE_FOR_avx_maskloadps, "__builtin_ia32_maskloadps", IX86_BUILTIN_MASKLOADPS, UNKNOWN, (int) V4SF_FTYPE_PCV4SF_V4SF },
--  { OPTION_MASK_ISA_AVX, CODE_FOR_avx_maskloadpd256, "__builtin_ia32_maskloadpd256", IX86_BUILTIN_MASKLOADPD256, UNKNOWN, (int) V4DF_FTYPE_PCV4DF_V4DF },
--  { OPTION_MASK_ISA_AVX, CODE_FOR_avx_maskloadps256, "__builtin_ia32_maskloadps256", IX86_BUILTIN_MASKLOADPS256, UNKNOWN, (int) V8SF_FTYPE_PCV8SF_V8SF },
--  { OPTION_MASK_ISA_AVX, CODE_FOR_avx_maskstorepd, "__builtin_ia32_maskstorepd", IX86_BUILTIN_MASKSTOREPD, UNKNOWN, (int) VOID_FTYPE_PV2DF_V2DF_V2DF },
--  { OPTION_MASK_ISA_AVX, CODE_FOR_avx_maskstoreps, "__builtin_ia32_maskstoreps", IX86_BUILTIN_MASKSTOREPS, UNKNOWN, (int) VOID_FTYPE_PV4SF_V4SF_V4SF },
--  { OPTION_MASK_ISA_AVX, CODE_FOR_avx_maskstorepd256, "__builtin_ia32_maskstorepd256", IX86_BUILTIN_MASKSTOREPD256, UNKNOWN, (int) VOID_FTYPE_PV4DF_V4DF_V4DF },
--  { OPTION_MASK_ISA_AVX, CODE_FOR_avx_maskstoreps256, "__builtin_ia32_maskstoreps256", IX86_BUILTIN_MASKSTOREPS256, UNKNOWN, (int) VOID_FTYPE_PV8SF_V8SF_V8SF },
-+  { OPTION_MASK_ISA_AVX, CODE_FOR_avx_maskloadpd, "__builtin_ia32_maskloadpd", IX86_BUILTIN_MASKLOADPD, UNKNOWN, (int) V2DF_FTYPE_PCV2DF_V2DI },
-+  { OPTION_MASK_ISA_AVX, CODE_FOR_avx_maskloadps, "__builtin_ia32_maskloadps", IX86_BUILTIN_MASKLOADPS, UNKNOWN, (int) V4SF_FTYPE_PCV4SF_V4SI },
-+  { OPTION_MASK_ISA_AVX, CODE_FOR_avx_maskloadpd256, "__builtin_ia32_maskloadpd256", IX86_BUILTIN_MASKLOADPD256, UNKNOWN, (int) V4DF_FTYPE_PCV4DF_V4DI },
-+  { OPTION_MASK_ISA_AVX, CODE_FOR_avx_maskloadps256, "__builtin_ia32_maskloadps256", IX86_BUILTIN_MASKLOADPS256, UNKNOWN, (int) V8SF_FTYPE_PCV8SF_V8SI },
-+  { OPTION_MASK_ISA_AVX, CODE_FOR_avx_maskstorepd, "__builtin_ia32_maskstorepd", IX86_BUILTIN_MASKSTOREPD, UNKNOWN, (int) VOID_FTYPE_PV2DF_V2DI_V2DF },
-+  { OPTION_MASK_ISA_AVX, CODE_FOR_avx_maskstoreps, "__builtin_ia32_maskstoreps", IX86_BUILTIN_MASKSTOREPS, UNKNOWN, (int) VOID_FTYPE_PV4SF_V4SI_V4SF },
-+  { OPTION_MASK_ISA_AVX, CODE_FOR_avx_maskstorepd256, "__builtin_ia32_maskstorepd256", IX86_BUILTIN_MASKSTOREPD256, UNKNOWN, (int) VOID_FTYPE_PV4DF_V4DI_V4DF },
-+  { OPTION_MASK_ISA_AVX, CODE_FOR_avx_maskstoreps256, "__builtin_ia32_maskstoreps256", IX86_BUILTIN_MASKSTOREPS256, UNKNOWN, (int) VOID_FTYPE_PV8SF_V8SI_V8SF },
- };
- 
- /* Builtins with variable number of arguments.  */
-@@ -22581,40 +22620,40 @@
-     = build_pointer_type (build_type_variant (V8SF_type_node, 1, 0));
-   tree pcv4df_type_node
-     = build_pointer_type (build_type_variant (V4DF_type_node, 1, 0));
--  tree v8sf_ftype_pcv8sf_v8sf
-+  tree v8sf_ftype_pcv8sf_v8si
-     = build_function_type_list (V8SF_type_node,
--				pcv8sf_type_node, V8SF_type_node,
-+				pcv8sf_type_node, V8SI_type_node,
- 				NULL_TREE);
--  tree v4df_ftype_pcv4df_v4df
-+  tree v4df_ftype_pcv4df_v4di
-     = build_function_type_list (V4DF_type_node,
--				pcv4df_type_node, V4DF_type_node,
-+				pcv4df_type_node, V4DI_type_node,
- 				NULL_TREE);
--  tree v4sf_ftype_pcv4sf_v4sf
-+  tree v4sf_ftype_pcv4sf_v4si
-     = build_function_type_list (V4SF_type_node,
--				pcv4sf_type_node, V4SF_type_node,
-+				pcv4sf_type_node, V4SI_type_node,
- 				NULL_TREE);
--  tree v2df_ftype_pcv2df_v2df
-+  tree v2df_ftype_pcv2df_v2di
-     = build_function_type_list (V2DF_type_node,
--				pcv2df_type_node, V2DF_type_node,
-+				pcv2df_type_node, V2DI_type_node,
- 				NULL_TREE);
--  tree void_ftype_pv8sf_v8sf_v8sf
-+  tree void_ftype_pv8sf_v8si_v8sf
-     = build_function_type_list (void_type_node,
--			        pv8sf_type_node, V8SF_type_node,
-+			        pv8sf_type_node, V8SI_type_node,
- 				V8SF_type_node,
- 				NULL_TREE);
--  tree void_ftype_pv4df_v4df_v4df
-+  tree void_ftype_pv4df_v4di_v4df
-     = build_function_type_list (void_type_node,
--			        pv4df_type_node, V4DF_type_node,
-+			        pv4df_type_node, V4DI_type_node,
- 				V4DF_type_node,
- 				NULL_TREE);
--  tree void_ftype_pv4sf_v4sf_v4sf
-+  tree void_ftype_pv4sf_v4si_v4sf
-     = build_function_type_list (void_type_node,
--			        pv4sf_type_node, V4SF_type_node,
-+			        pv4sf_type_node, V4SI_type_node,
- 				V4SF_type_node,
- 				NULL_TREE);
--  tree void_ftype_pv2df_v2df_v2df
-+  tree void_ftype_pv2df_v2di_v2df
-     = build_function_type_list (void_type_node,
--			        pv2df_type_node, V2DF_type_node,
-+			        pv2df_type_node, V2DI_type_node,
- 				V2DF_type_node,
- 				NULL_TREE);
-   tree v4df_ftype_v2df
-@@ -22720,23 +22759,23 @@
- 	case V2DF_FTYPE_PCDOUBLE:
- 	  type = v2df_ftype_pcdouble;
- 	  break;
--	case V8SF_FTYPE_PCV8SF_V8SF:
--	  type = v8sf_ftype_pcv8sf_v8sf;
-+	case V8SF_FTYPE_PCV8SF_V8SI:
-+	  type = v8sf_ftype_pcv8sf_v8si;
- 	  break;
--	case V4DF_FTYPE_PCV4DF_V4DF:
--	  type = v4df_ftype_pcv4df_v4df;
-+	case V4DF_FTYPE_PCV4DF_V4DI:
-+	  type = v4df_ftype_pcv4df_v4di;
- 	  break;
- 	case V4SF_FTYPE_V4SF_PCV2SF:
- 	  type = v4sf_ftype_v4sf_pcv2sf;
- 	  break;
--	case V4SF_FTYPE_PCV4SF_V4SF:
--	  type = v4sf_ftype_pcv4sf_v4sf;
-+	case V4SF_FTYPE_PCV4SF_V4SI:
-+	  type = v4sf_ftype_pcv4sf_v4si;
- 	  break;
- 	case V2DF_FTYPE_V2DF_PCDOUBLE:
- 	  type = v2df_ftype_v2df_pcdouble;
- 	  break;
--	case V2DF_FTYPE_PCV2DF_V2DF:
--	  type = v2df_ftype_pcv2df_v2df;
-+	case V2DF_FTYPE_PCV2DF_V2DI:
-+	  type = v2df_ftype_pcv2df_v2di;
- 	  break;
- 	case VOID_FTYPE_PV2SF_V4SF:
- 	  type = void_ftype_pv2sf_v4sf;
-@@ -22771,17 +22810,17 @@
- 	case VOID_FTYPE_PINT_INT:
- 	  type = void_ftype_pint_int;
- 	  break;
--	case VOID_FTYPE_PV8SF_V8SF_V8SF:
--	  type = void_ftype_pv8sf_v8sf_v8sf;
-+	case VOID_FTYPE_PV8SF_V8SI_V8SF:
-+	  type = void_ftype_pv8sf_v8si_v8sf;
- 	  break;
--	case VOID_FTYPE_PV4DF_V4DF_V4DF:
--	  type = void_ftype_pv4df_v4df_v4df;
-+	case VOID_FTYPE_PV4DF_V4DI_V4DF:
-+	  type = void_ftype_pv4df_v4di_v4df;
- 	  break;
--	case VOID_FTYPE_PV4SF_V4SF_V4SF:
--	  type = void_ftype_pv4sf_v4sf_v4sf;
-+	case VOID_FTYPE_PV4SF_V4SI_V4SF:
-+	  type = void_ftype_pv4sf_v4si_v4sf;
- 	  break;
--	case VOID_FTYPE_PV2DF_V2DF_V2DF:
--	  type = void_ftype_pv2df_v2df_v2df;
-+	case VOID_FTYPE_PV2DF_V2DI_V2DF:
-+	  type = void_ftype_pv2df_v2di_v2df;
- 	  break;
- 	default:
- 	  gcc_unreachable ();
-@@ -24611,18 +24650,18 @@
-       klass = load;
-       memory = 1;
-       break;
--    case V8SF_FTYPE_PCV8SF_V8SF:
--    case V4DF_FTYPE_PCV4DF_V4DF:
--    case V4SF_FTYPE_PCV4SF_V4SF:
--    case V2DF_FTYPE_PCV2DF_V2DF:
-+    case V8SF_FTYPE_PCV8SF_V8SI:
-+    case V4DF_FTYPE_PCV4DF_V4DI:
-+    case V4SF_FTYPE_PCV4SF_V4SI:
-+    case V2DF_FTYPE_PCV2DF_V2DI:
-       nargs = 2;
-       klass = load;
-       memory = 0;
-       break;
--    case VOID_FTYPE_PV8SF_V8SF_V8SF:
--    case VOID_FTYPE_PV4DF_V4DF_V4DF:
--    case VOID_FTYPE_PV4SF_V4SF_V4SF:
--    case VOID_FTYPE_PV2DF_V2DF_V2DF:
-+    case VOID_FTYPE_PV8SF_V8SI_V8SF:
-+    case VOID_FTYPE_PV4DF_V4DI_V4DF:
-+    case VOID_FTYPE_PV4SF_V4SI_V4SF:
-+    case VOID_FTYPE_PV2DF_V2DI_V2DF:
-       nargs = 2;
-       klass = store;
-       /* Reserve memory operand for target.  */
-@@ -25588,7 +25627,8 @@
- {
-   /* QImode spills from non-QI registers require
-      intermediate register on 32bit targets.  */
--  if (!in_p && mode == QImode && !TARGET_64BIT
-+  if (!TARGET_64BIT
-+      && !in_p && mode == QImode
-       && (rclass == GENERAL_REGS
- 	  || rclass == LEGACY_REGS
- 	  || rclass == INDEX_REGS))
-@@ -25608,6 +25648,45 @@
- 	return Q_REGS;
+@@ -3747,7 +3750,10 @@
+       args = tree_cons (NULL_TREE, object_addr, args);
      }
  
-+  /* This condition handles corner case where an expression involving
-+     pointers gets vectorized.  We're trying to use the address of a
-+     stack slot as a vector initializer.  
-+
-+     (set (reg:V2DI 74 [ vect_cst_.2 ])
-+          (vec_duplicate:V2DI (reg/f:DI 20 frame)))
-+
-+     Eventually frame gets turned into sp+offset like this:
-+
-+     (set (reg:V2DI 21 xmm0 [orig:74 vect_cst_.2 ] [74])
-+          (vec_duplicate:V2DI (plus:DI (reg/f:DI 7 sp)
-+	                               (const_int 392 [0x188]))))
-+
-+     That later gets turned into:
-+
-+     (set (reg:V2DI 21 xmm0 [orig:74 vect_cst_.2 ] [74])
-+          (vec_duplicate:V2DI (plus:DI (reg/f:DI 7 sp)
-+	    (mem/u/c/i:DI (symbol_ref/u:DI ("*.LC0") [flags 0x2]) [0 S8 A64]))))
-+
-+     We'll have the following reload recorded:
-+
-+     Reload 0: reload_in (DI) =
-+           (plus:DI (reg/f:DI 7 sp)
-+            (mem/u/c/i:DI (symbol_ref/u:DI ("*.LC0") [flags 0x2]) [0 S8 A64]))
-+     reload_out (V2DI) = (reg:V2DI 21 xmm0 [orig:74 vect_cst_.2 ] [74])
-+     SSE_REGS, RELOAD_OTHER (opnum = 0), can't combine
-+     reload_in_reg: (plus:DI (reg/f:DI 7 sp) (const_int 392 [0x188]))
-+     reload_out_reg: (reg:V2DI 21 xmm0 [orig:74 vect_cst_.2 ] [74])
-+     reload_reg_rtx: (reg:V2DI 22 xmm1)
-+
-+     Which isn't going to work since SSE instructions can't handle scalar
-+     additions.  Returning GENERAL_REGS forces the addition into integer
-+     register and reload can handle subsequent reloads without problems.  */
-+
-+  if (in_p && GET_CODE (x) == PLUS
-+      && SSE_CLASS_P (rclass)
-+      && SCALAR_INT_MODE_P (mode))
-+    return GENERAL_REGS;
-+
-   return NO_REGS;
- }
- 
-Index: gcc/config/rs6000/rs6000.c
-===================================================================
---- a/src/gcc/config/rs6000/rs6000.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/config/rs6000/rs6000.c	(.../branches/gcc-4_4-branch)
-@@ -199,7 +199,7 @@
- 
- /* Label number of label created for -mrelocatable, to call to so we can
-    get the address of the GOT section */
--int rs6000_pic_labelno;
-+static int rs6000_pic_labelno;
- 
- #ifdef USING_ELFOS_H
- /* Which abi to adhere to */
-@@ -15330,7 +15330,8 @@
-       char buf[30];
-       rtx lab, tmp1, tmp2, got;
- 
--      ASM_GENERATE_INTERNAL_LABEL (buf, "LCF", rs6000_pic_labelno);
-+      lab = gen_label_rtx ();
-+      ASM_GENERATE_INTERNAL_LABEL (buf, "L", CODE_LABEL_NUMBER (lab));
-       lab = gen_rtx_SYMBOL_REF (Pmode, ggc_strdup (buf));
-       if (flag_pic == 2)
- 	got = gen_rtx_SYMBOL_REF (Pmode, toc_label_name);
-@@ -15343,8 +15344,7 @@
- 	  tmp2 = gen_reg_rtx (Pmode);
- 	}
-       emit_insn (gen_load_toc_v4_PIC_1 (lab));
--      emit_move_insn (tmp1,
--			     gen_rtx_REG (Pmode, LR_REGNO));
-+      emit_move_insn (tmp1, gen_rtx_REG (Pmode, LR_REGNO));
-       emit_insn (gen_load_toc_v4_PIC_3b (tmp2, tmp1, got, lab));
-       emit_insn (gen_load_toc_v4_PIC_3c (dest, tmp2, got, lab));
+-  expr = cp_build_function_call (fn, args, tf_warning_or_error);
++  if (CLASS_TYPE_P (TREE_TYPE (fn)))
++    expr = build_object_call (fn, args, tf_warning_or_error);
++  else
++    expr = cp_build_function_call (fn, args, tf_warning_or_error);
+   if (processing_template_decl && expr != error_mark_node)
+     return build_min_non_dep_call_list (expr, orig_fn, orig_args);
+   return expr;
+@@ -3795,8 +3801,6 @@
+ void
+ mark_used (tree decl)
+ {
+-  HOST_WIDE_INT saved_processing_template_decl = 0;
+-
+   /* If DECL is a BASELINK for a single function, then treat it just
+      like the DECL for the function.  Otherwise, if the BASELINK is
+      for an overloaded function, we don't know which function was
+@@ -3819,9 +3823,6 @@
+       error ("used here");
+       return;
      }
-@@ -15371,8 +15371,7 @@
- 	  symL = gen_rtx_SYMBOL_REF (Pmode, ggc_strdup (buf));
- 
- 	  emit_insn (gen_load_toc_v4_PIC_1 (symF));
--	  emit_move_insn (dest,
--			  gen_rtx_REG (Pmode, LR_REGNO));
-+	  emit_move_insn (dest, gen_rtx_REG (Pmode, LR_REGNO));
- 	  emit_insn (gen_load_toc_v4_PIC_2 (temp0, dest, symL, symF));
- 	}
-       else
-Index: gcc/config/rs6000/rs6000.md
-===================================================================
---- a/src/gcc/config/rs6000/rs6000.md	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/config/rs6000/rs6000.md	(.../branches/gcc-4_4-branch)
-@@ -10737,8 +10737,8 @@
-   [(set_attr "type" "load")])
- 
- (define_insn "load_toc_v4_PIC_3b"
--  [(set (match_operand:SI 0 "gpc_reg_operand" "=b")
--	(plus:SI (match_operand:SI 1 "gpc_reg_operand" "r")
-+  [(set (match_operand:SI 0 "gpc_reg_operand" "=r")
-+	(plus:SI (match_operand:SI 1 "gpc_reg_operand" "b")
- 		 (high:SI
- 		   (minus:SI (match_operand:SI 2 "symbol_ref_operand" "s")
- 			     (match_operand:SI 3 "symbol_ref_operand" "s")))))]
-Index: gcc/config/rs6000/sysv4.h
-===================================================================
---- a/src/gcc/config/rs6000/sysv4.h	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/config/rs6000/sysv4.h	(.../branches/gcc-4_4-branch)
-@@ -416,8 +416,6 @@
-    Some svr4 assemblers need to also have something extra said about the
-    function's return value.  We allow for that here.  */
- 
--extern int rs6000_pic_labelno;
--
- /* Override elfos.h definition.  */
- #undef	ASM_DECLARE_FUNCTION_NAME
- #define ASM_DECLARE_FUNCTION_NAME(FILE, NAME, DECL)			\
-Index: gcc/config/arm/arm.c
-===================================================================
---- a/src/gcc/config/arm/arm.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/config/arm/arm.c	(.../branches/gcc-4_4-branch)
-@@ -964,6 +964,7 @@
- 			     va_list_type);
-   DECL_ARTIFICIAL (va_list_name) = 1;
-   TYPE_NAME (va_list_type) = va_list_name;
-+  TYPE_STUB_DECL (va_list_type) = va_list_name;
-   /* Create the __ap field.  */
-   ap_field = build_decl (FIELD_DECL, 
- 			 get_identifier ("__ap"),
-Index: gcc/config/pa/pa64-hpux.h
-===================================================================
---- a/src/gcc/config/pa/pa64-hpux.h	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/config/pa/pa64-hpux.h	(.../branches/gcc-4_4-branch)
-@@ -57,36 +57,42 @@
- #if ((TARGET_DEFAULT | TARGET_CPU_DEFAULT) & MASK_GNU_LD)
- #define LIB_SPEC \
-   "%{!shared:\
--     %{!p:%{!pg:%{static|mt|pthread:%{fopenmp:%{static:-a shared} -lrt\
--		  %{static:-a archive}} -lpthread} -lc\
--	    %{static:%{!nolibdld:-a shared -ldld -a archive -lc}}}}\
-+     %{!p:%{!pg:%{fopenmp:%{static:-a shared} -lrt %{static:-a archive}}\
-+	    %{mt|pthread:-lpthread} -lc\
-+	    %{static:%{!nolibdld:-a shared -ldld -a archive -lc}\
-+		%{!mt:%{!pthread:-a shared -lc -a archive}}}}}\
-      %{p:%{!pg:%{static:%{!mhp-ld:-a shared}%{mhp-ld:-a archive_shared}}\
- 	   -lprof %{static:-a archive}\
--	   %{static|mt|pthread:%{fopenmp:%{static:-a shared} -lrt\
--	     %{static:-a archive}} -lpthread} -lc\
--	   %{static:%{!nolibdld:-a shared -ldld -a archive -lc}}}}\
-+	   %{fopenmp:%{static:-a shared} -lrt %{static:-a archive}}\
-+	   %{mt|pthread:-lpthread} -lc\
-+	   %{static:%{!nolibdld:-a shared -ldld -a archive -lc}\
-+		%{!mt:%{!pthread:-a shared -lc -a archive}}}}}\
-      %{pg:%{static:%{!mhp-ld:-a shared}%{mhp-ld:-a archive_shared}}\
-        -lgprof %{static:-a archive}\
--       %{static|mt|pthread:%{fopenmp:%{static:-a shared} -lrt\
--	 %{static:-a archive}} -lpthread} -lc\
--       %{static:%{!nolibdld:-a shared -ldld -a archive -lc}}}}\
-+       %{fopenmp:%{static:-a shared} -lrt %{static:-a archive}}\
-+       %{mt|pthread:-lpthread} -lc\
-+       %{static:%{!nolibdld:-a shared -ldld -a archive -lc}\
-+		%{!mt:%{!pthread:-a shared -lc -a archive}}}}}\
-    %{shared:%{mt|pthread:-lpthread}}"
- #else
- #define LIB_SPEC \
-   "%{!shared:\
--     %{!p:%{!pg:%{static|mt|pthread:%{fopenmp:%{static:-a shared} -lrt\
--		  %{static:-a archive}} -lpthread} -lc\
--	    %{static:%{!nolibdld:-a shared -ldld -a archive -lc}}}}\
-+     %{!p:%{!pg:%{fopenmp:%{static:-a shared} -lrt %{static:-a archive}}\
-+	    %{mt|pthread:-lpthread} -lc\
-+	    %{static:%{!nolibdld:-a shared -ldld -a archive -lc}\
-+		%{!mt:%{!pthread:-a shared -lc -a archive}}}}}\
-      %{p:%{!pg:%{static:%{mgnu-ld:-a shared}%{!mgnu-ld:-a archive_shared}}\
- 	   -lprof %{static:-a archive}\
--	   %{static|mt|pthread:%{fopenmp:%{static:-a shared} -lrt\
--	     %{static:-a archive}} -lpthread} -lc\
--	   %{static:%{!nolibdld:-a shared -ldld -a archive -lc}}}}\
-+	   %{fopenmp:%{static:-a shared} -lrt %{static:-a archive}}\
-+	   %{mt|pthread:-lpthread} -lc\
-+	   %{static:%{!nolibdld:-a shared -ldld -a archive -lc}\
-+		%{!mt:%{!pthread:-a shared -lc -a archive}}}}}\
-      %{pg:%{static:%{mgnu-ld:-a shared}%{!mgnu-ld:-a archive_shared}}\
-        -lgprof %{static:-a archive}\
--       %{static|mt|pthread:%{fopenmp:%{static:-a shared} -lrt\
--	 %{static:-a archive}} -lpthread} -lc\
--       %{static:%{!nolibdld:-a shared -ldld -a archive -lc}}}}\
-+       %{fopenmp:%{static:-a shared} -lrt %{static:-a archive}}\
-+       %{mt|pthread:-lpthread} -lc\
-+       %{static:%{!nolibdld:-a shared -ldld -a archive -lc}\
-+		%{!mt:%{!pthread:-a shared -lc -a archive}}}}}\
-    %{shared:%{mt|pthread:-lpthread}}"
- #endif
- 
-Index: gcc/config/pa/t-pa-hpux11
-===================================================================
---- a/src/gcc/config/pa/t-pa-hpux11	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/config/pa/t-pa-hpux11	(.../branches/gcc-4_4-branch)
-@@ -1,2 +1,31 @@
- TARGET_LIBGCC2_CFLAGS = -fPIC
- LIB2FUNCS_EXTRA=lib2funcs.asm quadlib.c
-+LIBGCCSTUB_OBJS = pthread_default_stacksize_np-stub.o \
-+	pthread_mutex_lock-stub.o \
-+	pthread_mutex_unlock-stub.o \
-+	pthread_once-stub.o
-+
-+stublib.c: $(srcdir)/config/pa/stublib.c
-+	rm -f stublib.c
-+	cp $(srcdir)/config/pa/stublib.c .
-+
-+pthread_default_stacksize_np-stub.o: stublib.c $(GCC_PASSES)
-+	$(GCC_FOR_TARGET) -c -O2 -DL_pthread_default_stacksize_np stublib.c \
-+	  -o pthread_default_stacksize_np-stub.o
-+
-+pthread_mutex_lock-stub.o: stublib.c $(GCC_PASSES)
-+	$(GCC_FOR_TARGET) -c -O2 -DL_pthread_mutex_lock stublib.c \
-+	  -o pthread_mutex_lock-stub.o
-+
-+pthread_mutex_unlock-stub.o: stublib.c $(GCC_PASSES)
-+	$(GCC_FOR_TARGET) -c -O2 -DL_pthread_mutex_unlock stublib.c \
-+	  -o pthread_mutex_unlock-stub.o
-+
-+pthread_once-stub.o: stublib.c $(GCC_PASSES)
-+	$(GCC_FOR_TARGET) -c -O2 -DL_pthread_once stublib.c \
-+	  -o pthread_once-stub.o
-+
-+$(T)libgcc_stub.a: $(LIBGCCSTUB_OBJS)
-+	-rm -rf $(T)libgcc_stub.a
-+	$(AR) rc $(T)libgcc_stub.a $(LIBGCCSTUB_OBJS)
-+	$(RANLIB) $(T)libgcc_stub.a
-Index: gcc/config/pa/pa.md
-===================================================================
---- a/src/gcc/config/pa/pa.md	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/config/pa/pa.md	(.../branches/gcc-4_4-branch)
-@@ -998,7 +998,7 @@
- 			 (match_operand:DI 3 "arith11_operand" "rI"))
- 		 (match_operand:DI 1 "register_operand" "r")))]
-   "TARGET_64BIT"
--  "sub%I3 %3,%2,%%r0\;add,dc %%r0,%1,%0"
-+  "sub%I3,* %3,%2,%%r0\;add,dc %%r0,%1,%0"
-   [(set_attr "type" "binary")
-    (set_attr "length" "8")])
- 
-@@ -1020,7 +1020,7 @@
- 			 (match_operand:DI 3 "register_operand" "r"))
- 		 (match_operand:DI 1 "register_operand" "r")))]
-   "TARGET_64BIT"
--  "sub %2,%3,%%r0\;add,dc %%r0,%1,%0"
-+  "sub,* %2,%3,%%r0\;add,dc %%r0,%1,%0"
-   [(set_attr "type" "binary")
-    (set_attr "length" "8")])
- 
-@@ -1043,7 +1043,7 @@
- 			 (match_operand:DI 3 "int11_operand" "I"))
- 		 (match_operand:DI 1 "register_operand" "r")))]
-   "TARGET_64BIT"
--  "addi %k3,%2,%%r0\;add,dc %%r0,%1,%0"
-+  "addi,* %k3,%2,%%r0\;add,dc %%r0,%1,%0"
-   [(set_attr "type" "binary")
-    (set_attr "length" "8")])
- 
-@@ -1089,7 +1089,7 @@
- 		  (gtu:DI (match_operand:DI 2 "register_operand" "r")
- 			  (match_operand:DI 3 "arith11_operand" "rI"))))]
-   "TARGET_64BIT"
--  "sub%I3 %3,%2,%%r0\;sub,db %1,%%r0,%0"
-+  "sub%I3,* %3,%2,%%r0\;sub,db %1,%%r0,%0"
-   [(set_attr "type" "binary")
-    (set_attr "length" "8")])
- 
-@@ -1111,7 +1111,7 @@
- 				    (match_operand:DI 3 "arith11_operand" "rI")))
- 		  (match_operand:DI 4 "register_operand" "r")))]
-   "TARGET_64BIT"
--  "sub%I3 %3,%2,%%r0\;sub,db %1,%4,%0"
-+  "sub%I3,* %3,%2,%%r0\;sub,db %1,%4,%0"
-   [(set_attr "type" "binary")
-    (set_attr "length" "8")])
- 
-@@ -1133,7 +1133,7 @@
- 		  (ltu:DI (match_operand:DI 2 "register_operand" "r")
- 			  (match_operand:DI 3 "register_operand" "r"))))]
-   "TARGET_64BIT"
--  "sub %2,%3,%%r0\;sub,db %1,%%r0,%0"
-+  "sub,* %2,%3,%%r0\;sub,db %1,%%r0,%0"
-   [(set_attr "type" "binary")
-    (set_attr "length" "8")])
- 
-@@ -1155,7 +1155,7 @@
- 				    (match_operand:DI 3 "register_operand" "r")))
- 		  (match_operand:DI 4 "register_operand" "r")))]
-   "TARGET_64BIT"
--  "sub %2,%3,%%r0\;sub,db %1,%4,%0"
-+  "sub,* %2,%3,%%r0\;sub,db %1,%4,%0"
-   [(set_attr "type" "binary")
-    (set_attr "length" "8")])
- 
-@@ -1178,7 +1178,7 @@
- 		  (leu:DI (match_operand:DI 2 "register_operand" "r")
- 			  (match_operand:DI 3 "int11_operand" "I"))))]
-   "TARGET_64BIT"
--  "addi %k3,%2,%%r0\;sub,db %1,%%r0,%0"
-+  "addi,* %k3,%2,%%r0\;sub,db %1,%%r0,%0"
-   [(set_attr "type" "binary")
-    (set_attr "length" "8")])
- 
-@@ -1200,7 +1200,7 @@
- 				    (match_operand:DI 3 "int11_operand" "I")))
- 		  (match_operand:DI 4 "register_operand" "r")))]
-   "TARGET_64BIT"
--  "addi %k3,%2,%%r0\;sub,db %1,%4,%0"
-+  "addi,* %k3,%2,%%r0\;sub,db %1,%4,%0"
-   [(set_attr "type" "binary")
-    (set_attr "length" "8")])
- 
-Index: gcc/config/pa/pa-hpux11.h
-===================================================================
---- a/src/gcc/config/pa/pa-hpux11.h	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/config/pa/pa-hpux11.h	(.../branches/gcc-4_4-branch)
-@@ -116,18 +116,24 @@
-    -z %{mlinker-opt:-O} %{!shared:-u main -u __gcc_plt_call}\
-    %{static:-a archive} %{shared:-b}"
- 
--/* HP-UX 11 has posix threads.  HP libc contains pthread stubs so that
--   non-threaded applications can be linked with a thread-safe libc
--   without a subsequent loss of performance.  For more details, see
--   <http://docs.hp.com/en/1896/pthreads.html>.  */
-+/* HP-UX 11 has posix threads.  HP's shared libc contains pthread stubs
-+   so that non-threaded applications can be linked with a thread-safe
-+   libc without a subsequent loss of performance.  For more details,
-+   see <http://docs.hp.com/en/1896/pthreads.html>.  */
- #undef LIB_SPEC
- #define LIB_SPEC \
-   "%{!shared:\
--     %{static|mt|pthread:%{fopenmp:%{static:-a archive_shared} -lrt\
--       %{static:-a archive}} -lpthread} -lc\
--     %{static:%{!nolibdld:-a archive_shared -ldld -a archive -lc}}}\
-+     %{fopenmp:%{static:-a archive_shared} -lrt %{static:-a archive}}\
-+     %{mt|pthread:-lpthread} -lc\
-+     %{static:%{!nolibdld:-a archive_shared -ldld -a archive -lc}\
-+       %{!mt:%{!pthread:-a shared -lc -a archive}}}}\
-    %{shared:%{mt|pthread:-lpthread}}"
- 
-+/* The libgcc_stub.a library needs to come last.  */
-+#undef LINK_GCC_C_SEQUENCE_SPEC
-+#define LINK_GCC_C_SEQUENCE_SPEC \
-+  "%G %L %G %{!nostdlib:%{!nodefaultlibs:%{!shared:-lgcc_stub}}}"
-+
- #undef STARTFILE_SPEC
- #define STARTFILE_SPEC \
-   "%{!shared:%{pg:gcrt0%O%s}%{!pg:%{p:mcrt0%O%s}%{!p:crt0%O%s}} \
-Index: gcc/config/pa/t-pa64
-===================================================================
---- a/src/gcc/config/pa/t-pa64	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/config/pa/t-pa64	(.../branches/gcc-4_4-branch)
-@@ -1,7 +1,11 @@
- TARGET_LIBGCC2_CFLAGS = -fPIC -Dpa64=1 -DELF=1 -mlong-calls
- LIB2FUNCS_EXTRA = quadlib.c
--LIBGCCSTUB_OBJS = rfi-stub.o dfi-stub.o jvrc-stub.o cxaf-stub.o
--
-+LIBGCCSTUB_OBJS = rfi-stub.o dfi-stub.o jvrc-stub.o cxaf-stub.o \
-+	pthread_default_stacksize_np-stub.o \
-+	pthread_mutex_lock-stub.o \
-+	pthread_mutex_unlock-stub.o \
-+	pthread_once-stub.o
-+  
- stublib.c: $(srcdir)/config/pa/stublib.c
- 	rm -f stublib.c
- 	cp $(srcdir)/config/pa/stublib.c .
-@@ -22,6 +26,22 @@
- 	$(GCC_FOR_TARGET) -c -O2 -DL_Jv_RegisterClasses stublib.c \
- 	  -o jvrc-stub.o
- 
-+pthread_default_stacksize_np-stub.o: stublib.c $(GCC_PASSES)
-+	$(GCC_FOR_TARGET) -c -O2 -DL_pthread_default_stacksize_np stublib.c \
-+	  -o pthread_default_stacksize_np-stub.o
-+
-+pthread_mutex_lock-stub.o: stublib.c $(GCC_PASSES)
-+	$(GCC_FOR_TARGET) -c -O2 -DL_pthread_mutex_lock stublib.c \
-+	  -o pthread_mutex_lock-stub.o
-+
-+pthread_mutex_unlock-stub.o: stublib.c $(GCC_PASSES)
-+	$(GCC_FOR_TARGET) -c -O2 -DL_pthread_mutex_unlock stublib.c \
-+	  -o pthread_mutex_unlock-stub.o
-+
-+pthread_once-stub.o: stublib.c $(GCC_PASSES)
-+	$(GCC_FOR_TARGET) -c -O2 -DL_pthread_once stublib.c \
-+	  -o pthread_once-stub.o
-+
- $(T)libgcc_stub.a: $(LIBGCCSTUB_OBJS)
- 	-rm -rf $(T)libgcc_stub.a
- 	$(AR) rc $(T)libgcc_stub.a $(LIBGCCSTUB_OBJS)
-Index: gcc/config/pa/pa.c
-===================================================================
---- a/src/gcc/config/pa/pa.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/config/pa/pa.c	(.../branches/gcc-4_4-branch)
-@@ -5699,7 +5699,7 @@
- pa_secondary_reload (bool in_p, rtx x, enum reg_class rclass,
- 		     enum machine_mode mode, secondary_reload_info *sri)
- {
--  int is_symbolic, regno;
-+  int regno;
- 
-   /* Handle the easy stuff first.  */
-   if (rclass == R1_REGS)
-@@ -5732,6 +5732,23 @@
-       return NO_REGS;
+-  /* If we don't need a value, then we don't need to synthesize DECL.  */
+-  if (skip_evaluation)
+-    return;
+ 
+   /* If within finish_function, defer the rest until that function
+      finishes, otherwise it might recurse.  */
+@@ -3835,9 +3836,10 @@
+      DECL.  However, if DECL is a static data member initialized with
+      a constant, we need the value right now because a reference to
+      such a data member is not value-dependent.  */
+-  if (TREE_CODE (decl) == VAR_DECL
+-      && DECL_INITIALIZED_BY_CONSTANT_EXPRESSION_P (decl)
+-      && DECL_CLASS_SCOPE_P (decl))
++  if (DECL_INTEGRAL_CONSTANT_VAR_P (decl)
++      && !DECL_INITIAL (decl)
++      && DECL_LANG_SPECIFIC (decl)
++      && DECL_TEMPLATE_INSTANTIATION (decl))
+     {
+       /* Don't try to instantiate members of dependent types.  We
+ 	 cannot just use dependent_type_p here because this function
+@@ -3847,12 +3849,14 @@
+       if (CLASSTYPE_TEMPLATE_INFO ((DECL_CONTEXT (decl)))
+ 	  && uses_template_parms (CLASSTYPE_TI_ARGS (DECL_CONTEXT (decl))))
+ 	return;
+-      /* Pretend that we are not in a template, even if we are, so
+-	 that the static data member initializer will be processed.  */
+-      saved_processing_template_decl = processing_template_decl;
+-      processing_template_decl = 0;
++      instantiate_decl (decl, /*defer_ok=*/false,
++			/*expl_inst_class_mem_p=*/false);
      }
  
-+  /* Secondary reloads of symbolic operands require %r1 as a scratch
-+     register when we're generating PIC code and when the operand isn't
-+     readonly.  */
-+  if (symbolic_expression_p (x))
-+    {
-+      if (GET_CODE (x) == HIGH)
-+	x = XEXP (x, 0);
-+
-+      if (flag_pic || !read_only_operand (x, VOIDmode))
-+	{
-+	  gcc_assert (mode == SImode || mode == DImode);
-+	  sri->icode = (mode == SImode ? CODE_FOR_reload_insi_r1
-+			: CODE_FOR_reload_indi_r1);
-+	  return NO_REGS;
-+	}
-+    }
-+
-   /* Profiling showed the PA port spends about 1.3% of its compilation
-      time in true_regnum from calls inside pa_secondary_reload_class.  */
-   if (regno >= FIRST_PSEUDO_REGISTER || GET_CODE (x) == SUBREG)
-@@ -5790,49 +5807,8 @@
-   if (regno >= 0 && regno < FIRST_PSEUDO_REGISTER
-       && (REGNO_REG_CLASS (regno) == SHIFT_REGS
-       && FP_REG_CLASS_P (rclass)))
--    {
--      sri->icode = in_p ? reload_in_optab[mode] : reload_out_optab[mode];
--      return NO_REGS;
--    }
-+    sri->icode = in_p ? reload_in_optab[mode] : reload_out_optab[mode];
- 
--  /* Secondary reloads of symbolic operands require %r1 as a scratch
--     register when we're generating PIC code and when the operand isn't
--     readonly.  */
--  if (GET_CODE (x) == HIGH)
--    x = XEXP (x, 0);
--
--  /* Profiling has showed GCC spends about 2.6% of its compilation
--     time in symbolic_operand from calls inside pa_secondary_reload_class.
--     So, we use an inline copy to avoid useless work.  */
--  switch (GET_CODE (x))
--    {
--      rtx op;
--
--      case SYMBOL_REF:
--        is_symbolic = !SYMBOL_REF_TLS_MODEL (x);
--        break;
--      case LABEL_REF:
--        is_symbolic = 1;
--        break;
--      case CONST:
--	op = XEXP (x, 0);
--	is_symbolic = (((GET_CODE (XEXP (op, 0)) == SYMBOL_REF
--			 && !SYMBOL_REF_TLS_MODEL (XEXP (op, 0)))
--			|| GET_CODE (XEXP (op, 0)) == LABEL_REF)
--		       && GET_CODE (XEXP (op, 1)) == CONST_INT);
--        break;
--      default:
--        is_symbolic = 0;
--        break;
--    }
--
--  if (is_symbolic && (flag_pic || !read_only_operand (x, VOIDmode)))
--    {
--      gcc_assert (mode == SImode || mode == DImode);
--      sri->icode = (mode == SImode ? CODE_FOR_reload_insi_r1
--		    : CODE_FOR_reload_indi_r1);
--    }
--
-   return NO_REGS;
- }
- 
-@@ -6118,6 +6094,95 @@
++  /* If we don't need a value, then we don't need to synthesize DECL.  */
++  if (skip_evaluation)
++    return;
++
+   if (processing_template_decl)
+     return;
+ 
+@@ -3912,8 +3916,6 @@
+        need.  Therefore, we always try to defer instantiation.  */
+     instantiate_decl (decl, /*defer_ok=*/true,
+ 		      /*expl_inst_class_mem_p=*/false);
+-
+-  processing_template_decl = saved_processing_template_decl;
+ }
+ 
+ /* Given function PARM_DECL PARM, return its index in the function's list
+Index: gcc/cp/parser.c
+===================================================================
+--- a/src/gcc/cp/parser.c	(.../tags/gcc_4_4_6_release)
++++ b/src/gcc/cp/parser.c	(.../branches/gcc-4_4-branch)
+@@ -3274,6 +3274,12 @@
+ 	       `&A::B' might be a pointer-to-member, but `&(A::B)' is
+ 	       not.  */
+ 	    finish_parenthesized_expr (expr);
++	    /* DR 705: Wrapping an unqualified name in parentheses
++	       suppresses arg-dependent lookup.  We want to pass back
++	       CP_ID_KIND_QUALIFIED for suppressing vtable lookup
++	       (c++/37862), but none of the others.  */
++	    if (*idk != CP_ID_KIND_QUALIFIED)
++	      *idk = CP_ID_KIND_NONE;
+ 	  }
+ 	/* The `>' token might be the end of a template-id or
+ 	   template-parameter-list now.  */
+Index: gcc/tree-inline.c
+===================================================================
+--- a/src/gcc/tree-inline.c	(.../tags/gcc_4_4_6_release)
++++ b/src/gcc/tree-inline.c	(.../branches/gcc-4_4-branch)
+@@ -3722,14 +3722,16 @@
+ 					 CONSTRUCTOR_ELTS (*tp));
+       *tp = new_tree;
      }
- }
++  else if (code == STATEMENT_LIST)
++    /* We used to just abort on STATEMENT_LIST, but we can run into them
++       with statement-expressions (c++/40975).  */
++    copy_statement_list (tp);
+   else if (TREE_CODE_CLASS (code) == tcc_type)
+     *walk_subtrees = 0;
+   else if (TREE_CODE_CLASS (code) == tcc_declaration)
+     *walk_subtrees = 0;
+   else if (TREE_CODE_CLASS (code) == tcc_constant)
+     *walk_subtrees = 0;
+-  else
+-    gcc_assert (code != STATEMENT_LIST);
+   return NULL_TREE;
+ }
+ 
+Index: gcc/tree-switch-conversion.c
+===================================================================
+--- a/src/gcc/tree-switch-conversion.c	(.../tags/gcc_4_4_6_release)
++++ b/src/gcc/tree-switch-conversion.c	(.../branches/gcc-4_4-branch)
+@@ -519,7 +519,7 @@
+ build_arrays (gimple swtch)
+ {
+   tree arr_index_type;
+-  tree tidx, sub;
++  tree tidx, sub, utype;
+   gimple stmt;
+   gimple_stmt_iterator gsi;
+   int i;
+@@ -527,12 +527,20 @@
+   gsi = gsi_for_stmt (swtch);
  
-+/* Return TRUE if INSN, a jump insn, has an unfilled delay slot and
-+   it branches into the delay slot.  Otherwise, return FALSE.  */
-+
-+static bool
-+branch_to_delay_slot_p (rtx insn)
-+{
-+  rtx jump_insn;
-+
-+  if (dbr_sequence_length ())
-+    return FALSE;
-+
-+  jump_insn = next_active_insn (JUMP_LABEL (insn));
-+  while (insn)
-+    {
-+      insn = next_active_insn (insn);
-+      if (jump_insn == insn)
-+	return TRUE;
-+
-+      /* We can't rely on the length of asms.  So, we return FALSE when
-+	 the branch is followed by an asm.  */
-+      if (!insn
-+	  || GET_CODE (PATTERN (insn)) == ASM_INPUT
-+	  || asm_noperands (PATTERN (insn)) >= 0
-+	  || get_attr_length (insn) > 0)
-+	break;
-+    }
-+
-+  return FALSE;
-+}
-+
-+/* Return TRUE if INSN, a forward jump insn, needs a nop in its delay slot.
-+
-+   This occurs when INSN has an unfilled delay slot and is followed
-+   by an asm.  Disaster can occur if the asm is empty and the jump
-+   branches into the delay slot.  So, we add a nop in the delay slot
-+   when this occurs.  */
-+
-+static bool
-+branch_needs_nop_p (rtx insn)
-+{
-+  rtx jump_insn;
-+
-+  if (dbr_sequence_length ())
-+    return FALSE;
-+
-+  jump_insn = next_active_insn (JUMP_LABEL (insn));
-+  while (insn)
-+    {
-+      insn = next_active_insn (insn);
-+      if (!insn || jump_insn == insn)
-+	return TRUE;
-+
-+      if (!(GET_CODE (PATTERN (insn)) == ASM_INPUT
-+	   || asm_noperands (PATTERN (insn)) >= 0)
-+	  && get_attr_length (insn) > 0)
-+	break;
-+    }
-+
-+  return FALSE;
-+}
-+
-+/* Return TRUE if INSN, a forward jump insn, can use nullification
-+   to skip the following instruction.  This avoids an extra cycle due
-+   to a mis-predicted branch when we fall through.  */
-+
-+static bool
-+use_skip_p (rtx insn)
-+{
-+  rtx jump_insn = next_active_insn (JUMP_LABEL (insn));
+   arr_index_type = build_index_type (info.range_size);
+-  tidx = make_rename_temp (arr_index_type, "csti");
+-  sub = fold_build2 (MINUS_EXPR, TREE_TYPE (info.index_expr), info.index_expr,
+-		     fold_convert (TREE_TYPE (info.index_expr),
+-				   info.range_min));
+-  sub = force_gimple_operand_gsi (&gsi, fold_convert (arr_index_type, sub),
+-				  false, NULL, true, GSI_SAME_STMT);
++
++  /* Make sure we do not generate arithmetics in a subrange.  */
++  if (TREE_TYPE (TREE_TYPE (info.index_expr)))
++    utype = lang_hooks.types.type_for_mode
++      (TYPE_MODE (TREE_TYPE (TREE_TYPE (info.index_expr))), 1);
++  else
++    utype = lang_hooks.types.type_for_mode
++      (TYPE_MODE (TREE_TYPE (info.index_expr)), 1);
++
++  tidx = make_rename_temp (utype, "csui");
++  sub = fold_build2 (MINUS_EXPR, utype,
++		     fold_convert (utype, info.index_expr),
++		     fold_convert (utype, info.range_min));
++  sub = force_gimple_operand_gsi (&gsi, sub, false, NULL, true, GSI_SAME_STMT);
+   stmt = gimple_build_assign (tidx, sub);
+ 
+   gsi_insert_before (&gsi, stmt, GSI_SAME_STMT);
+@@ -641,10 +649,7 @@
+   gimple label1, label2, label3;
+ 
+   tree utype;
+-  tree tmp_u;
+-  tree cast;
+-  gimple cast_assign, minus_assign;
+-  tree ulb, minus;
++  tree tidx;
+   tree bound;
+ 
+   gimple cond_stmt;
+@@ -657,49 +662,27 @@
+   gcc_assert (info.default_values);
+   bb0 = gimple_bb (swtch);
+ 
+-  /* Make sure we do not generate arithmetics in a subrange.  */
+-  if (TREE_TYPE (TREE_TYPE (info.index_expr)))
+-    utype = lang_hooks.types.type_for_mode
+-      (TYPE_MODE (TREE_TYPE (TREE_TYPE (info.index_expr))), 1);
+-  else
+-    utype = lang_hooks.types.type_for_mode
+-      (TYPE_MODE (TREE_TYPE (info.index_expr)), 1);
++  tidx = gimple_assign_lhs (info.arr_ref_first);
++  utype = TREE_TYPE (tidx);
+ 
+   /* (end of) block 0 */
+   gsi = gsi_for_stmt (info.arr_ref_first);
+-  tmp_u = make_rename_temp (utype, "csui");
++  gsi_next (&gsi);
+ 
+-  cast = fold_convert (utype, info.index_expr);
+-  cast_assign = gimple_build_assign (tmp_u, cast);
+-  find_new_referenced_vars (cast_assign);
+-  gsi_insert_before (&gsi, cast_assign, GSI_SAME_STMT);
+-  mark_symbols_for_renaming (cast_assign);
+-
+-  ulb = fold_convert (utype, info.range_min);
+-  minus = fold_build2 (MINUS_EXPR, utype, tmp_u, ulb);
+-  minus = force_gimple_operand_gsi (&gsi, minus, false, NULL, true,
+-				    GSI_SAME_STMT);
+-  minus_assign = gimple_build_assign (tmp_u, minus);
+-  find_new_referenced_vars (minus_assign);
+-  gsi_insert_before (&gsi, minus_assign, GSI_SAME_STMT);
+-  mark_symbols_for_renaming (minus_assign);
+-
+   bound = fold_convert (utype, info.range_size);
+ 
+-  cond_stmt = gimple_build_cond (LE_EXPR, tmp_u, bound, NULL_TREE, NULL_TREE);
++  cond_stmt = gimple_build_cond (LE_EXPR, tidx, bound, NULL_TREE, NULL_TREE);
+ 
+   find_new_referenced_vars (cond_stmt);
+   gsi_insert_before (&gsi, cond_stmt, GSI_SAME_STMT);
+   mark_symbols_for_renaming (cond_stmt);
+ 
+   /* block 2 */
+-  gsi = gsi_for_stmt (info.arr_ref_first);
+   label2 = gimple_build_label (label_decl2);
+   gsi_insert_before (&gsi, label2, GSI_SAME_STMT);
+   last_assign = gen_def_assigns (&gsi);
+ 
+   /* block 1 */
+-  gsi = gsi_for_stmt (info.arr_ref_first);
+   label1 = gimple_build_label (label_decl1);
+   gsi_insert_before (&gsi, label1, GSI_SAME_STMT);
+ 
+Index: gcc/config/sparc/sparc.md
+===================================================================
+--- a/src/gcc/config/sparc/sparc.md	(.../tags/gcc_4_4_6_release)
++++ b/src/gcc/config/sparc/sparc.md	(.../branches/gcc-4_4-branch)
+@@ -7068,8 +7068,8 @@
+ 		      (const_int 4)))])
+ 
+ ;; For __builtin_setjmp we need to flush register windows iff the function
+-;; calls alloca as well, because otherwise the register window might be
+-;; saved after %sp adjustment and thus setjmp would crash
++;; calls alloca as well, because otherwise the current register window might
++;; be saved after the %sp adjustment and thus setjmp would crash.
+ (define_expand "builtin_setjmp_setup"
+   [(match_operand 0 "register_operand" "r")]
+   ""
+@@ -7108,19 +7108,26 @@
+                (eq_attr "pic" "true")
+                  (const_int 4)] (const_int 3)))])
+ 
+-;; Pattern for use after a setjmp to store FP and the return register
+-;; into the stack area.
++;; Pattern for use after a setjmp to store registers into the save area.
+ 
+ (define_expand "setjmp"
+   [(const_int 0)]
+   ""
+ {
+   rtx mem;
+-  
 +
-+  while (insn)
++  if (flag_pic)
 +    {
-+      insn = next_active_insn (insn);
-+
-+      /* We can't rely on the length of asms, so we can't skip asms.  */
-+      if (!insn
-+	  || GET_CODE (PATTERN (insn)) == ASM_INPUT
-+	  || asm_noperands (PATTERN (insn)) >= 0)
-+	break;
-+      if (get_attr_length (insn) == 4
-+	  && jump_insn == next_active_insn (insn))
-+	return TRUE;
-+      if (get_attr_length (insn) > 0)
-+	break;
++      mem = gen_rtx_MEM (Pmode,
++			 plus_constant (stack_pointer_rtx,
++					SPARC_STACK_BIAS + 7 * UNITS_PER_WORD));
++      emit_insn (gen_rtx_SET (VOIDmode, mem, pic_offset_table_rtx));
 +    }
 +
-+  return FALSE;
-+}
-+
- /* This routine handles all the normal conditional branch sequences we
-    might need to generate.  It handles compare immediate vs compare
-    register, nullification of delay slots, varying length branches,
-@@ -6129,7 +6194,7 @@
- output_cbranch (rtx *operands, int negated, rtx insn)
- {
-   static char buf[100];
--  int useskip = 0;
-+  bool useskip;
-   int nullify = INSN_ANNULLED_BRANCH_P (insn);
-   int length = get_attr_length (insn);
-   int xdelay;
-@@ -6143,7 +6208,7 @@
-      slot and the same branch target as this branch.  We could check
-      for this but jump optimization should eliminate nop jumps.  It
-      is always safe to emit a nop.  */
--  if (next_real_insn (JUMP_LABEL (insn)) == next_real_insn (insn))
-+  if (branch_to_delay_slot_p (insn))
-     return "nop";
- 
-   /* The doubleword form of the cmpib instruction doesn't have the LEU
-@@ -6167,12 +6232,7 @@
-   /* A forward branch over a single nullified insn can be done with a
-      comclr instruction.  This avoids a single cycle penalty due to
-      mis-predicted branch if we fall through (branch not taken).  */
--  if (length == 4
--      && next_real_insn (insn) != 0
--      && get_attr_length (next_real_insn (insn)) == 4
--      && JUMP_LABEL (insn) == next_nonnote_insn (next_real_insn (insn))
--      && nullify)
--    useskip = 1;
-+  useskip = (length == 4 && nullify) ? use_skip_p (insn) : FALSE;
- 
-   switch (length)
-     {
-@@ -6192,7 +6252,12 @@
- 	if (useskip)
- 	  strcat (buf, " %2,%r1,%%r0");
- 	else if (nullify)
--	  strcat (buf, ",n %2,%r1,%0");
-+	  {
-+	    if (branch_needs_nop_p (insn))
-+	      strcat (buf, ",n %2,%r1,%0%#");
-+	    else
-+	      strcat (buf, ",n %2,%r1,%0");
-+	  }
- 	else
- 	  strcat (buf, " %2,%r1,%0");
- 	break;
-@@ -6455,7 +6520,7 @@
- output_bb (rtx *operands ATTRIBUTE_UNUSED, int negated, rtx insn, int which)
- {
-   static char buf[100];
--  int useskip = 0;
-+  bool useskip;
-   int nullify = INSN_ANNULLED_BRANCH_P (insn);
-   int length = get_attr_length (insn);
-   int xdelay;
-@@ -6465,7 +6530,7 @@
-      is only used when optimizing; jump optimization should eliminate the
-      jump.  But be prepared just in case.  */
- 
--  if (next_real_insn (JUMP_LABEL (insn)) == next_real_insn (insn))
-+  if (branch_to_delay_slot_p (insn))
-     return "nop";
- 
-   /* If this is a long branch with its delay slot unfilled, set `nullify'
-@@ -6481,14 +6546,8 @@
-   /* A forward branch over a single nullified insn can be done with a
-      extrs instruction.  This avoids a single cycle penalty due to
-      mis-predicted branch if we fall through (branch not taken).  */
-+  useskip = (length == 4 && nullify) ? use_skip_p (insn) : FALSE;
- 
--  if (length == 4
--      && next_real_insn (insn) != 0
--      && get_attr_length (next_real_insn (insn)) == 4
--      && JUMP_LABEL (insn) == next_nonnote_insn (next_real_insn (insn))
--      && nullify)
--    useskip = 1;
--
-   switch (length)
-     {
+   mem = gen_rtx_MEM (Pmode,
+ 		     plus_constant (stack_pointer_rtx,
+ 				    SPARC_STACK_BIAS + 14 * UNITS_PER_WORD));
+-  emit_insn (gen_rtx_SET (VOIDmode, mem, frame_pointer_rtx));
++  emit_insn (gen_rtx_SET (VOIDmode, mem, hard_frame_pointer_rtx));
+ 
+   mem = gen_rtx_MEM (Pmode,
+ 		     plus_constant (stack_pointer_rtx,
+Index: gcc/config/sparc/sparc.c
+===================================================================
+--- a/src/gcc/config/sparc/sparc.c	(.../tags/gcc_4_4_6_release)
++++ b/src/gcc/config/sparc/sparc.c	(.../branches/gcc-4_4-branch)
+@@ -2636,11 +2636,6 @@
+   if (get_attr_length (trial) != 1)
+     return 0;
  
-@@ -6511,11 +6570,21 @@
- 	if (useskip)
- 	  strcat (buf, " %0,%1,1,%%r0");
- 	else if (nullify && negated)
--	  strcat (buf, ",n %0,%1,%3");
-+	  {
-+	    if (branch_needs_nop_p (insn))
-+	      strcat (buf, ",n %0,%1,%3%#");
-+	    else
-+	      strcat (buf, ",n %0,%1,%3");
-+	  }
- 	else if (nullify && ! negated)
--	  strcat (buf, ",n %0,%1,%2");
-+	  {
-+	    if (branch_needs_nop_p (insn))
-+	      strcat (buf, ",n %0,%1,%2%#");
-+	    else
-+	      strcat (buf, ",n %0,%1,%2");
-+	  }
- 	else if (! nullify && negated)
--	  strcat (buf, "%0,%1,%3");
-+	  strcat (buf, " %0,%1,%3");
- 	else if (! nullify && ! negated)
- 	  strcat (buf, " %0,%1,%2");
- 	break;
-@@ -6636,7 +6705,7 @@
- output_bvb (rtx *operands ATTRIBUTE_UNUSED, int negated, rtx insn, int which)
- {
-   static char buf[100];
--  int useskip = 0;
-+  bool useskip;
-   int nullify = INSN_ANNULLED_BRANCH_P (insn);
-   int length = get_attr_length (insn);
-   int xdelay;
-@@ -6646,7 +6715,7 @@
-      is only used when optimizing; jump optimization should eliminate the
-      jump.  But be prepared just in case.  */
- 
--  if (next_real_insn (JUMP_LABEL (insn)) == next_real_insn (insn))
-+  if (branch_to_delay_slot_p (insn))
-     return "nop";
- 
-   /* If this is a long branch with its delay slot unfilled, set `nullify'
-@@ -6662,14 +6731,8 @@
-   /* A forward branch over a single nullified insn can be done with a
-      extrs instruction.  This avoids a single cycle penalty due to
-      mis-predicted branch if we fall through (branch not taken).  */
-+  useskip = (length == 4 && nullify) ? use_skip_p (insn) : FALSE;
- 
--  if (length == 4
--      && next_real_insn (insn) != 0
--      && get_attr_length (next_real_insn (insn)) == 4
--      && JUMP_LABEL (insn) == next_nonnote_insn (next_real_insn (insn))
--      && nullify)
--    useskip = 1;
+-  /* If there are any call-saved registers, we should scan TRIAL if it
+-     does not reference them.  For now just make it easy.  */
+-  if (num_gfregs)
+-    return 0;
 -
-   switch (length)
-     {
- 
-@@ -6692,11 +6755,21 @@
- 	if (useskip)
- 	  strcat (buf, "{ %0,1,%%r0| %0,%%sar,1,%%r0}");
- 	else if (nullify && negated)
--	  strcat (buf, "{,n %0,%3|,n %0,%%sar,%3}");
-+	  {
-+	    if (branch_needs_nop_p (insn))
-+	      strcat (buf, "{,n %0,%3%#|,n %0,%%sar,%3%#}");
-+	    else
-+	      strcat (buf, "{,n %0,%3|,n %0,%%sar,%3}");
-+	  }
- 	else if (nullify && ! negated)
--	  strcat (buf, "{,n %0,%2|,n %0,%%sar,%2}");
-+	  {
-+	    if (branch_needs_nop_p (insn))
-+	      strcat (buf, "{,n %0,%2%#|,n %0,%%sar,%2%#}");
-+	    else
-+	      strcat (buf, "{,n %0,%2|,n %0,%%sar,%2}");
-+	  }
- 	else if (! nullify && negated)
--	  strcat (buf, "{%0,%3|%0,%%sar,%3}");
-+	  strcat (buf, "{ %0,%3| %0,%%sar,%3}");
- 	else if (! nullify && ! negated)
- 	  strcat (buf, "{ %0,%2| %0,%%sar,%2}");
- 	break;
-@@ -6818,7 +6891,7 @@
-   /* A conditional branch to the following instruction (e.g. the delay slot) is
-      asking for a disaster.  Be prepared!  */
- 
--  if (next_real_insn (JUMP_LABEL (insn)) == next_real_insn (insn))
-+  if (branch_to_delay_slot_p (insn))
-     {
-       if (which_alternative == 0)
- 	return "ldo %1(%0),%0";
-@@ -6855,7 +6928,12 @@
- 	{
- 	case 4:
- 	  if (nullify)
--	    return "addib,%C2,n %1,%0,%3";
-+	    {
-+	      if (branch_needs_nop_p (insn))
-+		return "addib,%C2,n %1,%0,%3%#";
-+	      else
-+		return "addib,%C2,n %1,%0,%3";
-+	    }
- 	  else
- 	    return "addib,%C2 %1,%0,%3";
-       
-@@ -6963,7 +7041,7 @@
-   /* A conditional branch to the following instruction (e.g. the delay slot) is
-      asking for a disaster.  Be prepared!  */
+   /* If the function uses __builtin_eh_return, the eh_return machinery
+      occupies the delay slot.  */
+   if (crtl->calls_eh_return)
+@@ -3922,7 +3917,7 @@
+ 	    emit_move_insn (gen_rtx_REG (mode, regno), mem);
+ 
+ 	  /* Always preserve double-word alignment.  */
+-	  offset = (offset + 7) & -8;
++	  offset = (offset + 8) & -8;
+ 	}
+     }
  
--  if (next_real_insn (JUMP_LABEL (insn)) == next_real_insn (insn))
-+  if (branch_to_delay_slot_p (insn))
-     {
-       if (which_alternative == 0)
- 	return "copy %1,%0";
-@@ -7001,7 +7079,12 @@
- 	{
- 	case 4:
- 	  if (nullify)
--	    return "movb,%C2,n %1,%0,%3";
-+	    {
-+	      if (branch_needs_nop_p (insn))
-+		return "movb,%C2,n %1,%0,%3%#";
-+	      else
-+		return "movb,%C2,n %1,%0,%3";
-+	    }
- 	  else
- 	    return "movb,%C2 %1,%0,%3";
- 
-Index: gcc/config/pa/stublib.c
-===================================================================
---- a/src/gcc/config/pa/stublib.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/config/pa/stublib.c	(.../branches/gcc-4_4-branch)
-@@ -56,3 +56,42 @@
- {
+@@ -4029,7 +4024,7 @@
+      example, the regrename pass has special provisions to not rename to
+      non-leaf registers in a leaf function.  */
+   sparc_leaf_function_p
+-    = optimize > 0 && leaf_function_p () && only_leaf_regs_used ();
++    = optimize > 0 && current_function_is_leaf && only_leaf_regs_used ();
+ 
+   /* Need to use actual_fsize, since we are also allocating
+      space for our callee (and our own register save area).  */
+@@ -4155,6 +4150,7 @@
+ sparc_can_use_return_insn_p (void)
+ {
+   return sparc_prologue_data_valid_p
++	 && num_gfregs == 0
+ 	 && (actual_fsize == 0 || !sparc_leaf_function_p);
  }
- #endif
-+
-+#ifdef L_pthread_default_stacksize_np
-+int pthread_default_stacksize_np (unsigned long __attribute__((unused)),
-+				  unsigned long *);
-+int
-+pthread_default_stacksize_np (unsigned long new, unsigned long *old)
-+{
-+  if (old)
-+    *old = 0;
-+  return 0;
-+}
-+#endif
-+
-+#ifdef L_pthread_mutex_lock
-+int pthread_mutex_lock (void);
-+int
-+pthread_mutex_lock (void)
-+{
-+  return 0;
-+}
-+#endif
-+
-+#ifdef L_pthread_mutex_unlock
-+int pthread_mutex_unlock (void);
-+int
-+pthread_mutex_unlock (void)
+   
+Index: gcc/config/sparc/sparc.h
+===================================================================
+--- a/src/gcc/config/sparc/sparc.h	(.../tags/gcc_4_4_6_release)
++++ b/src/gcc/config/sparc/sparc.h	(.../branches/gcc-4_4-branch)
+@@ -970,7 +970,7 @@
+    may be accessed via the stack pointer) in functions that seem suitable.
+    Used in flow.c, global.c, ra.c and reload1.c.  */
+ #define FRAME_POINTER_REQUIRED	\
+-  (! (leaf_function_p () && only_leaf_regs_used ()))
++  (!(current_function_is_leaf && only_leaf_regs_used ()))
+ 
+ /* Base register for access to arguments of the function.  */
+ #define ARG_POINTER_REGNUM FRAME_POINTER_REGNUM
+Index: gcc/config/i386/sse.md
+===================================================================
+--- a/src/gcc/config/i386/sse.md	(.../tags/gcc_4_4_6_release)
++++ b/src/gcc/config/i386/sse.md	(.../branches/gcc-4_4-branch)
+@@ -3655,7 +3655,16 @@
+ 		      (match_operand:SI 3 "const_0_to_255_operand" "n")]
+ 		     UNSPEC_INSERTPS))]
+   "TARGET_AVX"
+-  "vinsertps\t{%3, %2, %1, %0|%0, %1, %2, %3}";
 +{
-+  return 0;
++  if (MEM_P (operands[2]))
++    {
++      unsigned count_s = INTVAL (operands[3]) >> 6;
++      if (count_s)
++	operands[3] = GEN_INT (INTVAL (operands[3]) & 0x3f);
++      operands[2] = adjust_address_nv (operands[2], SFmode, count_s * 4);
++    }
++  return "vinsertps\t{%3, %2, %1, %0|%0, %1, %2, %3}";
 +}
-+#endif
-+
-+#ifdef L_pthread_once
-+int pthread_once (void);
-+int
-+pthread_once (void)
+   [(set_attr "type" "sselog")
+    (set_attr "prefix" "vex")
+    (set_attr "mode" "V4SF")])
+@@ -3667,7 +3676,16 @@
+ 		      (match_operand:SI 3 "const_0_to_255_operand" "n")]
+ 		     UNSPEC_INSERTPS))]
+   "TARGET_SSE4_1"
+-  "insertps\t{%3, %2, %0|%0, %2, %3}";
 +{
-+  return 0;
++  if (MEM_P (operands[2]))
++    {
++      unsigned count_s = INTVAL (operands[3]) >> 6;
++      if (count_s)
++	operands[3] = GEN_INT (INTVAL (operands[3]) & 0x3f);
++      operands[2] = adjust_address_nv (operands[2], SFmode, count_s * 4);
++    }
++  return "insertps\t{%3, %2, %0|%0, %2, %3}";
 +}
-+#endif
-Index: gcc/config/mips/iris.h
+   [(set_attr "type" "sselog")
+    (set_attr "prefix_extra" "1")
+    (set_attr "mode" "V4SF")])
+Index: gcc/config/i386/i386.c
 ===================================================================
---- a/src/gcc/config/mips/iris.h	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/config/mips/iris.h	(.../branches/gcc-4_4-branch)
-@@ -163,6 +163,11 @@
-    library search directories.  */
- #define LINK_ELIMINATE_DUPLICATE_LDIRECTORIES 1
- 
-+/* The SGI linker doesn't understand constructor priorities.  */
-+#ifndef IRIX_USING_GNU_LD
-+#define SUPPORTS_INIT_PRIORITY 0
-+#endif
+--- a/src/gcc/config/i386/i386.c	(.../tags/gcc_4_4_6_release)
++++ b/src/gcc/config/i386/i386.c	(.../branches/gcc-4_4-branch)
+@@ -13645,11 +13645,15 @@
+       if (req_mode == CCZmode)
+ 	return 0;
+       /* FALLTHRU */
++    case CCZmode:
++      break;
 +
- /* Add -g to mips.h default to avoid confusing gas with local symbols
-    generated from stabs info.  */
- #undef NM_FLAGS
-Index: gcc/reload1.c
-===================================================================
---- a/src/gcc/reload1.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/reload1.c	(.../branches/gcc-4_4-branch)
-@@ -6200,18 +6200,7 @@
- 	      && (rld[r].nregs == max_group_size
- 		  || ! reg_classes_intersect_p (rld[r].rclass, group_class)))
- 	    search_equiv = rld[r].in;
--	  /* If this is an output reload from a simple move insn, look
--	     if an equivalence for the input is available.  */
--	  else if (inheritance && rld[r].in == 0 && rld[r].out != 0)
--	    {
--	      rtx set = single_set (insn);
- 
--	      if (set
--		  && rtx_equal_p (rld[r].out, SET_DEST (set))
--		  && CONSTANT_P (SET_SRC (set)))
--		search_equiv = SET_SRC (set);
--	    }
--
- 	  if (search_equiv)
- 	    {
- 	      rtx equiv
-Index: gcc/gthr-posix95.h
-===================================================================
---- a/src/gcc/gthr-posix95.h	(.../tags/gcc_4_4_5_release)
-+++ b/src/gcc/gthr-posix95.h	(.../branches/gcc-4_4-branch)
-@@ -184,61 +184,34 @@
-    calls in shared flavors of the HP-UX C library.  Most of the stubs
-    have no functionality.  The details are described in the "libc cumulative
-    patch" for each subversion of HP-UX 11.  There are two special interfaces
--   provided for checking whether an application is linked to a pthread
-+   provided for checking whether an application is linked to a shared pthread
-    library or not.  However, these interfaces aren't available in early
--   libc versions.  We also can't use pthread_once as some libc versions
--   call the init function.  So, we use pthread_create to check whether it
--   is possible to create a thread or not.  The stub implementation returns
--   the error number ENOSYS.  */
-+   pthread libraries.  We also need a test that works for archive
-+   libraries.  We can't use pthread_once as some libc versions call the
-+   init function.  We also can't use pthread_create or pthread_attr_init
-+   as these create a thread and thereby prevent changing the default stack
-+   size.  The function pthread_default_stacksize_np is available in both
-+   the archive and shared versions of libpthread.   It can be used to
-+   determine the default pthread stack size.  There is a stub in some
-+   shared libc versions which returns a zero size if pthreads are not
-+   active.  We provide an equivalent stub to handle cases where libc
-+   doesn't provide one.  */
+     case CCAmode:
+     case CCCmode:
+     case CCOmode:
+     case CCSmode:
+-    case CCZmode:
++      if (set_mode != req_mode)
++	return 0;
+       break;
  
- #if defined(__hppa__) && defined(__hpux__)
+     default:
+Index: gcc/config/arm/neon.md
+===================================================================
+--- a/src/gcc/config/arm/neon.md	(.../tags/gcc_4_4_6_release)
++++ b/src/gcc/config/arm/neon.md	(.../branches/gcc-4_4-branch)
+@@ -667,7 +667,7 @@
+           (match_operand:SI 2 "immediate_operand" "i")))]
+   "TARGET_NEON"
+ {
+-  int elt = ffs ((int) INTVAL (operands[2]) - 1);
++  int elt = ffs ((int) INTVAL (operands[2])) - 1;
+   if (BYTES_BIG_ENDIAN)
+     elt = GET_MODE_NUNITS (<MODE>mode) - 1 - elt;
+   operands[2] = GEN_INT (elt);
+Index: gcc/config/pa/predicates.md
+===================================================================
+--- a/src/gcc/config/pa/predicates.md	(.../tags/gcc_4_4_6_release)
++++ b/src/gcc/config/pa/predicates.md	(.../branches/gcc-4_4-branch)
+@@ -410,12 +410,16 @@
  
--#include <errno.h>
--
- static volatile int __gthread_active = -1;
+ ;; True iff depi can be used to compute (reg | OP).
  
--static void *
--__gthread_start (void *arg __attribute__((unused)))
+-(define_predicate "ior_operand"
+-  (match_code "const_int")
 -{
--  return NULL;
--}
--
--static void __gthread_active_init (void) __attribute__((noinline));
--static void
--__gthread_active_init (void)
--{
--  static pthread_mutex_t __gthread_active_mutex = PTHREAD_MUTEX_INITIALIZER;
--  pthread_t t;
--  pthread_attr_t a;
--  int result;
--
--  __gthrw_(pthread_mutex_lock) (&__gthread_active_mutex);
--  if (__gthread_active < 0)
--    {
--      __gthrw_(pthread_attr_init) (&a);
--      __gthrw_(pthread_attr_setdetachstate) (&a, PTHREAD_CREATE_DETACHED);
--      result = __gthrw_(pthread_create) (&t, &a, __gthread_start, NULL);
--      if (result != ENOSYS)
--	__gthread_active = 1;
--      else
--	__gthread_active = 0;
--      __gthrw_(pthread_attr_destroy) (&a);
--    }
--  __gthrw_(pthread_mutex_unlock) (&__gthread_active_mutex);
--}
--
- static inline int
- __gthread_active_p (void)
- {
-   /* Avoid reading __gthread_active twice on the main code path.  */
-   int __gthread_active_latest_value = __gthread_active;
-+  size_t __s;
- 
--  /* This test is not protected to avoid taking a lock on the main code
--     path so every update of __gthread_active in a threaded program must
--     be atomic with regard to the result of the test.  */
-   if (__builtin_expect (__gthread_active_latest_value < 0, 0))
-     {
--      __gthread_active_init ();
-+      pthread_default_stacksize_np (0, &__s);
-+      __gthread_active = __s ? 1 : 0;
-       __gthread_active_latest_value = __gthread_active;
-     }
- 
-Index: libstdc++-v3/src/bitmap_allocator.cc
-===================================================================
---- a/src/libstdc++-v3/src/bitmap_allocator.cc	(.../tags/gcc_4_4_5_release)
-+++ b/src/libstdc++-v3/src/bitmap_allocator.cc	(.../branches/gcc-4_4-branch)
-@@ -49,6 +49,7 @@
-   {
- #if defined __GTHREADS
-     __mutex_type& __bfl_mutex = _M_get_mutex();
-+    __bfl_mutex.lock();
- #endif
-     const vector_type& __free_list = _M_get_free_list();
-     using __gnu_cxx::__detail::__lower_bound;
-Index: libstdc++-v3/ChangeLog
+-  return (GET_CODE (op) == CONST_INT && ior_mask_p (INTVAL (op)));
+-})
++(define_predicate "cint_ior_operand"
++  (and (match_code "const_int")
++       (match_test "ior_mask_p (INTVAL (op))")))
+ 
++;; True iff OP can be used to compute (reg | OP).
++
++(define_predicate "reg_or_cint_ior_operand"
++  (ior (match_operand 0 "register_operand")
++       (match_operand 0 "cint_ior_operand")))
++
+ ;; True iff OP is a CONST_INT of the forms 0...0xxxx or
+ ;; 0...01...1xxxx. Such values can be the left hand side x in (x <<
+ ;; r), using the zvdepi instruction.
+Index: gcc/config/pa/pa.md
 ===================================================================
---- a/src/libstdc++-v3/ChangeLog	(.../tags/gcc_4_4_5_release)
-+++ b/src/libstdc++-v3/ChangeLog	(.../branches/gcc-4_4-branch)
-@@ -1,3 +1,13 @@
-+2011-01-19  Graham Reed  <greed@pobox.com>
-+
-+	PR libstdc++/47354
-+	* src/bitmap_allocator.cc (free_list::_M_get): Lock mutex.
-+
-+2010-12-10  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-+
-+	* testsuite/lib/libstdc++.exp (v3-build_support): Delete
-+	libtestc++.a before creation.
-+
- 2010-10-01  Release Manager
- 
- 	* GCC 4.4.5 released.
-Index: libstdc++-v3/testsuite/lib/libstdc++.exp
+--- a/src/gcc/config/pa/pa.md	(.../tags/gcc_4_4_6_release)
++++ b/src/gcc/config/pa/pa.md	(.../branches/gcc-4_4-branch)
+@@ -6136,7 +6136,7 @@
+ (define_expand "iordi3"
+   [(set (match_operand:DI 0 "register_operand" "")
+ 	(ior:DI (match_operand:DI 1 "register_operand" "")
+-		(match_operand:DI 2 "ior_operand" "")))]
++		(match_operand:DI 2 "reg_or_cint_ior_operand" "")))]
+   ""
+   "
+ {
+@@ -6157,7 +6157,7 @@
+ (define_insn ""
+   [(set (match_operand:DI 0 "register_operand" "=r,r")
+ 	(ior:DI (match_operand:DI 1 "register_operand" "0,0")
+-		(match_operand:DI 2 "ior_operand" "M,i")))]
++		(match_operand:DI 2 "cint_ior_operand" "M,i")))]
+   "TARGET_64BIT"
+   "* return output_64bit_ior (operands); "
+   [(set_attr "type" "binary,shift")
+@@ -6176,19 +6176,14 @@
+ (define_expand "iorsi3"
+   [(set (match_operand:SI 0 "register_operand" "")
+ 	(ior:SI (match_operand:SI 1 "register_operand" "")
+-		(match_operand:SI 2 "arith32_operand" "")))]
++		(match_operand:SI 2 "reg_or_cint_ior_operand" "")))]
+   ""
+-  "
+-{
+-  if (! (ior_operand (operands[2], SImode)
+-         || register_operand (operands[2], SImode)))
+-    operands[2] = force_reg (SImode, operands[2]);
+-}")
++  "")
+ 
+ (define_insn ""
+   [(set (match_operand:SI 0 "register_operand" "=r,r")
+ 	(ior:SI (match_operand:SI 1 "register_operand" "0,0")
+-		(match_operand:SI 2 "ior_operand" "M,i")))]
++		(match_operand:SI 2 "cint_ior_operand" "M,i")))]
+   ""
+   "* return output_ior (operands); "
+   [(set_attr "type" "binary,shift")
+Index: gcc/config/pa/pa-protos.h
+===================================================================
+--- a/src/gcc/config/pa/pa-protos.h	(.../tags/gcc_4_4_6_release)
++++ b/src/gcc/config/pa/pa-protos.h	(.../branches/gcc-4_4-branch)
+@@ -82,7 +82,6 @@
+ extern int prefetch_cc_operand (rtx, enum machine_mode);
+ extern int prefetch_nocc_operand (rtx, enum machine_mode);
+ extern int and_operand (rtx, enum machine_mode);
+-extern int ior_operand (rtx, enum machine_mode);
+ extern int arith32_operand (rtx, enum machine_mode);
+ extern int uint32_operand (rtx, enum machine_mode);
+ extern int reg_before_reload_operand (rtx, enum machine_mode);
+@@ -97,7 +96,6 @@
+ extern int fmpyaddoperands (rtx *);
+ extern int fmpysuboperands (rtx *);
+ extern int call_operand_address (rtx, enum machine_mode);
+-extern int ior_operand (rtx, enum machine_mode);
+ extern void emit_bcond_fp (enum rtx_code, rtx);
+ extern int emit_move_sequence (rtx *, enum machine_mode, rtx);
+ extern int emit_hpdiv_const (rtx *, int);
+Index: gcc/config/pa/pa.c
 ===================================================================
---- a/src/libstdc++-v3/testsuite/lib/libstdc++.exp	(.../tags/gcc_4_4_5_release)
-+++ b/src/libstdc++-v3/testsuite/lib/libstdc++.exp	(.../branches/gcc-4_4-branch)
-@@ -554,6 +554,15 @@
+--- a/src/gcc/config/pa/pa.c	(.../tags/gcc_4_4_6_release)
++++ b/src/gcc/config/pa/pa.c	(.../branches/gcc-4_4-branch)
+@@ -1618,15 +1618,12 @@
+       return 1;
      }
- 
-     # Collect into libtestc++.a
-+    # Delete libtestc++.a first.  Mixed 32 and 64-bit archives cannot be
-+    # linked on IRIX 6.
-+    # Use same procedure as gcc-dg.exp (remove-build-file).
-+    if [is_remote host] {
-+	# Ensure the host knows the file is gone by deleting there
-+	# first.
-+	remote_file host delete "./libtestc++.a"
-+	}
-+    remote_file build delete "./libtestc++.a"
-     if  [info exists env(AR)] {
- 	set ar $env(AR)
-     } else {
-Index: configure.ac
-===================================================================
---- a/src/configure.ac	(.../tags/gcc_4_4_5_release)
-+++ b/src/configure.ac	(.../branches/gcc-4_4-branch)
-@@ -319,7 +319,7 @@
-     # Check for target supported by gold.
-     case "${target}" in
-       i?86-*-* | x86_64-*-* | sparc*-*-* | powerpc*-*-*)
--        configdirs="`echo " ${configdirs} " | sed -e 's/ ld / gold /'`"
-+        configdirs=`echo " ${configdirs} " | sed -e 's/ ld / gold /'`
-         ;;
-     esac
-   fi
-Index: intl/configure
-===================================================================
---- a/src/intl/configure	(.../tags/gcc_4_4_5_release)
-+++ b/src/intl/configure	(.../branches/gcc-4_4-branch)
-@@ -8560,7 +8560,7 @@
-       case "$ac_file" in */Makefile.in)
-         # Adjust a relative srcdir.
-         ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
--        ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
-+        ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
-         ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
-         # In autoconf-2.13 it is called $ac_given_srcdir.
-         # In autoconf-2.50 it is called $srcdir.
-Index: intl/ChangeLog
-===================================================================
---- a/src/intl/ChangeLog	(.../tags/gcc_4_4_5_release)
-+++ b/src/intl/ChangeLog	(.../branches/gcc-4_4-branch)
-@@ -1,3 +1,8 @@
-+2010-10-02  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+   /* Handle secondary reloads for SAR.  These occur when trying to load
+-     the SAR from memory, FP register, or with a constant.  */
++     the SAR from memory or a constant.  */
+   else if (scratch_reg
+ 	   && GET_CODE (operand0) == REG
+ 	   && REGNO (operand0) < FIRST_PSEUDO_REGISTER
+ 	   && REGNO_REG_CLASS (REGNO (operand0)) == SHIFT_REGS
+-	   && (GET_CODE (operand1) == MEM
+-	       || GET_CODE (operand1) == CONST_INT
+-	       || (GET_CODE (operand1) == REG
+-		   && FP_REG_CLASS_P (REGNO_REG_CLASS (REGNO (operand1))))))
++	   && (GET_CODE (operand1) == MEM || GET_CODE (operand1) == CONST_INT))
+     {
+       /* D might not fit in 14 bits either; for such cases load D into
+ 	 scratch reg.  */
+@@ -5695,6 +5692,10 @@
+   fputc ('\n', asm_out_file);
+ }
+ 
++/* Inform reload about cases where moving X with a mode MODE to a register in
++   RCLASS requires an extra scratch or immediate register.  Return the class
++   needed for the immediate register.  */
 +
-+	PR bootstrap/44621
-+	* configure: Regenerate.
-+
- 2010-10-01  Release Manager
- 
- 	* GCC 4.4.5 released.
-Index: libgfortran/intrinsics/c99_functions.c
-===================================================================
---- a/src/libgfortran/intrinsics/c99_functions.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/libgfortran/intrinsics/c99_functions.c	(.../branches/gcc-4_4-branch)
-@@ -538,7 +538,7 @@
-   if (x > DBL_MAX || x < -DBL_MAX)
-     {
- #ifdef HAVE_NEXTAFTERL
--      static long double prechalf = nexafterl (0.5L, LDBL_MAX);
-+      long double prechalf = nextafterl (0.5L, LDBL_MAX);
- #else
-       static long double prechalf = 0.5L;
- #endif
-@@ -566,16 +566,16 @@
- 
-    if (x >= 0.0) 
-     {
--      t = ceil(x);
--      if (t - x > 0.5)
--	t -= 1.0;
-+      t = floor(x);
-+      if (t - x <= -0.5)
-+	t += 1.0;
-       return (t);
-     } 
-    else 
-     {
--      t = ceil(-x);
--      if (t + x > 0.5)
--	t -= 1.0;
-+      t = floor(-x);
-+      if (t + x <= -0.5)
-+	t += 1.0;
-       return (-t);
+ static enum reg_class
+ pa_secondary_reload (bool in_p, rtx x, enum reg_class rclass,
+ 		     enum machine_mode mode, secondary_reload_info *sri)
+@@ -5794,20 +5795,27 @@
+       return NO_REGS;
      }
- }
-@@ -595,16 +595,16 @@
  
-    if (x >= 0.0) 
+-  /* We need a secondary register (GPR) for copies between the SAR
+-     and anything other than a general register.  */
+-  if (rclass == SHIFT_REGS && (regno <= 0 || regno >= 32))
++  /* A SAR<->FP register copy requires an intermediate general register
++     and secondary memory.  We need a secondary reload with a general
++     scratch register for spills.  */
++  if (rclass == SHIFT_REGS)
      {
--      t = ceilf(x);
--      if (t - x > 0.5)
--	t -= 1.0;
-+      t = floorf(x);
-+      if (t - x <= -0.5)
-+	t += 1.0;
-       return (t);
-     } 
-    else 
-     {
--      t = ceilf(-x);
--      if (t + x > 0.5)
--	t -= 1.0;
-+      t = floorf(-x);
-+      if (t + x <= -0.5)
-+	t += 1.0;
-       return (-t);
-     }
- }
-Index: libgfortran/ChangeLog
-===================================================================
---- a/src/libgfortran/ChangeLog	(.../tags/gcc_4_4_5_release)
-+++ b/src/libgfortran/ChangeLog	(.../branches/gcc-4_4-branch)
-@@ -1,3 +1,57 @@
-+2011-03-06  Jakub Jelinek  <jakub@redhat.com>
-+
-+	Backport from mainline
-+	PR fortran/47878
-+	* io/transfer.c (read_sf): Call fbuf_getptr only at the end,
-+	and subtract n, dtp->u.p.sf_seen_eor and seen_comma from it.
-+
-+2011-03-06  Janne Blomqvist  <jb@gcc.gnu.org>
-+	    Jerry DeLisle    <jvdelisle@gcc.gnu.org>
-+
-+	Backport from mainline
-+	PR libfortran/47694
-+	* io/io.h (fbuf_getptr): New inline function.
-+	* io/transfer.c (read_sf): Use fbuf_getptr and fbuf_getc to scan
-+	through the string instead of fbuf_read.
-+
-+2011-02-22  Tobias Burnus  <burnus@net-b.de>
-+	    Kai-Uwe Eckhardt  <kuehro@gmx.de>
-+
-+	PR libfortran/47830
-+	* intrinsics/c99_functions.c (roundl): Make C valid for
-+	HAVE_NEXTAFTERL.
-+
-+2010-11-10  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
-+
-+	PR libgfortran/46373
-+	Backport from mainline:
-+	* io/transfer.c (data_transfer_init): Do not call flush_if_preconnected
-+	if this is an internal unit.
-+
-+2010-11-03  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
-+
-+	PR libgfortran/46010
-+	Backport from mainline:
-+	* io/list_read.c (nml_parse_qualifier): Add additional conditions for
-+	setting the end index for loop specification. Fix some whitespace.
-+
-+2010-10-16  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
-+
-+	Backport from mainline:
-+	2009-03-29  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
-+
-+	PR fortran/33595
-+	* intrinsics/c99_functions.c (round): Use floor instead of ceil.
-+	Revise checks to round up.
-+	(roundf): Likewise.
-+
-+2010-10-06  Jerry DeLisle  <jvdelisle@gcc.gnu.org>
-+
-+	Backport from mainline:
-+	PR libfortran/45710
-+	* io/write.c (namelist_write_newline): Pad character array internal
-+	unit records with spaces.
-+
- 2010-10-01  Release Manager
- 
- 	* GCC 4.4.5 released.
-Index: libgfortran/io/list_read.c
-===================================================================
---- a/src/libgfortran/io/list_read.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/libgfortran/io/list_read.c	(.../branches/gcc-4_4-branch)
-@@ -2077,8 +2077,10 @@
- 
- 		  /*  If -std=f95/2003 or an array section is specified,
- 		      do not allow excess data to be processed.  */
--                  if (is_array_section == 1
--		      || compile_options.allow_std < GFC_STD_GNU)
-+		  if (is_array_section == 1
-+		      || !(compile_options.allow_std & GFC_STD_GNU)
-+		      || !dtp->u.p.ionml->touched
-+		      || dtp->u.p.ionml->type == GFC_DTYPE_DERIVED)
- 		    ls[dim].end = ls[dim].start;
- 		  else
- 		    dtp->u.p.expanded_read = 1;
-@@ -2093,12 +2095,12 @@
- 	}
- 
-       if (is_array_section == 1 && dtp->u.p.expanded_read == 1)
--     	{
+-      sri->icode = in_p ? reload_in_optab[mode] : reload_out_optab[mode];
+-      return NO_REGS;
++      /* Handle spill.  */
++      if (regno >= FIRST_PSEUDO_REGISTER || regno < 0)
 +	{
- 	  int i;
- 	  dtp->u.p.expanded_read = 0;
- 	  for (i = 0; i < dim; i++)
- 	    ls[i].end = ls[i].start;
--      	}
++	  sri->icode = in_p ? reload_in_optab[mode] : reload_out_optab[mode];
++	  return NO_REGS;
 +	}
- 
-       /* Check the values of the triplet indices.  */
-       if ((ls[dim].start > (ssize_t)ad[dim].ubound)
-Index: libgfortran/io/io.h
-===================================================================
---- a/src/libgfortran/io/io.h	(.../tags/gcc_4_4_5_release)
-+++ b/src/libgfortran/io/io.h	(.../branches/gcc-4_4-branch)
-@@ -1013,6 +1013,12 @@
-   return fbuf_getc_refill (u);
- }
- 
-+static inline char *
-+fbuf_getptr (gfc_unit * u)
-+{
-+  return (char*) (u->fbuf->buf + u->fbuf->pos);
-+}
 +
- /* lock.c */
- extern void free_ionml (st_parameter_dt *);
- internal_proto(free_ionml);
-Index: libgfortran/io/transfer.c
-===================================================================
---- a/src/libgfortran/io/transfer.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/libgfortran/io/transfer.c	(.../branches/gcc-4_4-branch)
-@@ -222,7 +222,7 @@
- read_sf (st_parameter_dt *dtp, int * length)
- {
-   static char *empty_string[0];
--  char *base, *p, q;
-+  int q, q2;
-   int n, lorig, seen_comma;
- 
-   /* If we have seen an eor previously, return a length of 0.  The
-@@ -239,18 +239,15 @@
- 
-   /* Read data into format buffer and scan through it.  */
-   lorig = *length;
--  base = p = fbuf_read (dtp->u.p.current_unit, length);
--  if (base == NULL)
--    return NULL;
- 
-   while (n < *length)
-     {
--      q = *p;
--
--      if (q == '\n' || q == '\r')
-+      q = fbuf_getc (dtp->u.p.current_unit);
-+      if (q == EOF)
-+	break;
-+      else if (q == '\n' || q == '\r')
- 	{
- 	  /* Unexpected end of line. Set the position.  */
--	  fbuf_seek (dtp->u.p.current_unit, n + 1 ,SEEK_CUR);
- 	  dtp->u.p.sf_seen_eor = 1;
- 
- 	  /* If we see an EOR during non-advancing I/O, we need to skip
-@@ -261,15 +258,12 @@
- 	  /* If we encounter a CR, it might be a CRLF.  */
- 	  if (q == '\r') /* Probably a CRLF */
- 	    {
--	      /* See if there is an LF. Use fbuf_read rather then fbuf_getc so
--		 the position is not advanced unless it really is an LF.  */
--	      int readlen = 1;
--	      p = fbuf_read (dtp->u.p.current_unit, &readlen);
--	      if (*p == '\n' && readlen == 1)
--	        {
--		  dtp->u.p.sf_seen_eor = 2;
--		  fbuf_seek (dtp->u.p.current_unit, 1 ,SEEK_CUR);
--		}
-+	      /* See if there is an LF.  */
-+	      q2 = fbuf_getc (dtp->u.p.current_unit);
-+	      if (q2 == '\n')
-+		dtp->u.p.sf_seen_eor = 2;
-+	      else if (q2 != EOF) /* Oops, seek back.  */
-+		fbuf_seek (dtp->u.p.current_unit, -1, SEEK_CUR);
- 	    }
- 
- 	  /* Without padding, terminate the I/O statement without assigning
-@@ -287,20 +281,18 @@
-       /*  Short circuit the read if a comma is found during numeric input.
- 	  The flag is set to zero during character reads so that commas in
- 	  strings are not ignored  */
--      if (q == ',')
-+      else if (q == ',')
- 	if (dtp->u.p.sf_read_comma == 1)
- 	  {
--            seen_comma = 1;
-+	    seen_comma = 1;
- 	    notify_std (&dtp->common, GFC_STD_GNU,
- 			"Comma in formatted numeric read.");
--	    *length = n;
- 	    break;
- 	  }
-       n++;
--      p++;
--    } 
-+    }
- 
--  fbuf_seek (dtp->u.p.current_unit, n + seen_comma, SEEK_CUR);
-+  *length = n;
- 
-   /* A short read implies we hit EOF, unless we hit EOR, a comma, or
-      some other stuff. Set the relevant flags.  */
-@@ -338,7 +330,12 @@
-   if ((dtp->common.flags & IOPARM_DT_HAS_SIZE) != 0)
-     dtp->u.p.size_used += (GFC_IO_INT) n;
- 
--  return base;
-+  /* We can't call fbuf_getptr before the loop doing fbuf_getc, because
-+     fbuf_getc might reallocate the buffer.  So return current pointer
-+     minus all the advances, which is n plus up to two characters
-+     of newline or comma.  */
-+  return fbuf_getptr (dtp->u.p.current_unit)
-+	 - n - dtp->u.p.sf_seen_eor - seen_comma;
- }
- 
- 
-@@ -2450,7 +2447,8 @@
++      /* Handle FP copy.  */
++      if (FP_REG_CLASS_P (REGNO_REG_CLASS (regno)))
++	return GENERAL_REGS;
      }
  
-   /* Bugware for badly written mixed C-Fortran I/O.  */
--  flush_if_preconnected(dtp->u.p.current_unit->s);
-+  if (!is_internal_unit (dtp))
-+    flush_if_preconnected(dtp->u.p.current_unit->s);
- 
-   dtp->u.p.current_unit->mode = dtp->u.p.mode;
- 
-Index: libgfortran/io/write.c
-===================================================================
---- a/src/libgfortran/io/write.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/libgfortran/io/write.c	(.../branches/gcc-4_4-branch)
-@@ -1194,10 +1194,15 @@
-   if (is_array_io (dtp))
-     {
-       gfc_offset record;
--      int finished, length;
-+      int finished;
-+      char *p;
-+      int length = dtp->u.p.current_unit->bytes_left;
- 
--      length = (int) dtp->u.p.current_unit->bytes_left;
--	      
-+      p = write_block (dtp, length);
-+      if (p == NULL)
-+	return;
-+      memset (p, ' ', length);
-+
-       /* Now that the current record has been padded out,
- 	 determine where the next record in the array is. */
-       record = next_array_record (dtp, dtp->u.p.current_unit->ls,
-Index: ChangeLog
-===================================================================
---- a/src/ChangeLog	(.../tags/gcc_4_4_5_release)
-+++ b/src/ChangeLog	(.../branches/gcc-4_4-branch)
-@@ -1,3 +1,9 @@
-+2010-10-02  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
-+
-+	PR bootstrap/44621
-+	* configure.ac: Fix unportable shell quoting.
-+	* configure: Regenerate.
-+
- 2010-10-01  Release Manager
- 
- 	* GCC 4.4.5 released.
-Index: libffi/configure
-===================================================================
---- a/src/libffi/configure	(.../tags/gcc_4_4_5_release)
-+++ b/src/libffi/configure	(.../branches/gcc-4_4-branch)
-@@ -13301,7 +13301,7 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--asm (".ascii \"string\"");
-+asm (".ascii \\"string\\"");
- int
- main ()
- {
-@@ -13366,7 +13366,7 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--asm (".string \"string\"");
-+asm (".string \\"string\\"");
- int
- main ()
- {
-Index: libffi/ChangeLog
-===================================================================
---- a/src/libffi/ChangeLog	(.../tags/gcc_4_4_5_release)
-+++ b/src/libffi/ChangeLog	(.../branches/gcc-4_4-branch)
-@@ -1,3 +1,19 @@
-+2010-12-06  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-+
-+	* configure.ac (libffi_cv_as_ascii_pseudo_op): Use double
-+	backslashes.
-+	(libffi_cv_as_string_pseudo_op): Likewise.
-+	* configure: Regenerate.
-+
-+2010-10-01  Jakub Jelinek  <jakub@redhat.com>
-+
-+	* testsuite/libffi.call/many2.c: Don't use uint8_t.
-+
-+	PR libffi/45677
-+	* src/x86/ffi64.c (ffi_prep_cif_machdep): Ensure cif->bytes is
-+	a multiple of 8.
-+	* testsuite/libffi.call/many2.c: New test.
-+
- 2010-10-01  Release Manager
- 
- 	* GCC 4.4.5 released.
-Index: libffi/src/x86/ffi64.c
-===================================================================
---- a/src/libffi/src/x86/ffi64.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/libffi/src/x86/ffi64.c	(.../branches/gcc-4_4-branch)
-@@ -321,7 +321,7 @@
- 	  if (align < 8)
- 	    align = 8;
- 
--	  bytes = ALIGN(bytes, align);
-+	  bytes = ALIGN (bytes, align);
- 	  bytes += cif->arg_types[i]->size;
- 	}
-       else
-@@ -333,7 +333,7 @@
-   if (ssecount)
-     flags |= 1 << 11;
-   cif->flags = flags;
--  cif->bytes = bytes;
-+  cif->bytes = ALIGN (bytes, 8);
+-  /* A SAR<->FP register copy requires a secondary register (GPR) as
+-     well as secondary memory.  */
+   if (regno >= 0 && regno < FIRST_PSEUDO_REGISTER
+-      && (REGNO_REG_CLASS (regno) == SHIFT_REGS
+-      && FP_REG_CLASS_P (rclass)))
+-    sri->icode = in_p ? reload_in_optab[mode] : reload_out_optab[mode];
++      && REGNO_REG_CLASS (regno) == SHIFT_REGS
++      && FP_REG_CLASS_P (rclass))
++    return GENERAL_REGS;
  
-   return FFI_OK;
+   return NO_REGS;
  }
-Index: libffi/testsuite/libffi.call/many2.c
-===================================================================
---- a/src/libffi/testsuite/libffi.call/many2.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/libffi/testsuite/libffi.call/many2.c	(.../branches/gcc-4_4-branch)
-@@ -0,0 +1,52 @@
-+/* Area:        ffi_call
-+   Purpose:     Check unsigned char arguments.
-+   Limitations: none.
-+   PR:          PR45677.
-+   Originator:  Dan Witte <dwitte@gmail.com> 20100916  */
-+
-+/* { dg-do run } */
-+
-+#include "ffitest.h"
-+
-+#define NARGS 7
-+
-+typedef unsigned char u8;
-+
-+__attribute__((noinline)) u8
-+foo (u8 a, u8 b, u8 c, u8 d, u8 e, u8 f, u8 g)
-+{
-+  return a + b + c + d + e + f + g;
-+}
-+
-+u8
-+bar (u8 a, u8 b, u8 c, u8 d, u8 e, u8 f, u8 g)
-+{
-+  return foo (a, b, c, d, e, f, g);
-+}
-+
-+int
-+main (void)
-+{
-+  ffi_type *ffitypes[NARGS];
-+  int i;
-+  ffi_cif cif;
-+  ffi_arg result = 0;
-+  u8 args[NARGS];
-+  void *argptrs[NARGS];
-+
-+  for (i = 0; i < NARGS; ++i)
-+    ffitypes[i] = &ffi_type_uchar;
-+
-+  CHECK (ffi_prep_cif (&cif, FFI_DEFAULT_ABI, NARGS,
-+		       &ffi_type_uint8, ffitypes) == FFI_OK);
-+
-+  for (i = 0; i < NARGS; ++i)
-+    {
-+      args[i] = i;
-+      argptrs[i] = &args[i];
-+    }
-+  ffi_call (&cif, FFI_FN (bar), &result, argptrs);
-+
-+  CHECK (result == 21);
-+  return 0;
-+}
-Index: libffi/configure.ac
-===================================================================
---- a/src/libffi/configure.ac	(.../tags/gcc_4_4_5_release)
-+++ b/src/libffi/configure.ac	(.../branches/gcc-4_4-branch)
-@@ -258,7 +258,7 @@
-        libffi_cv_as_ascii_pseudo_op, [
-        libffi_cv_as_ascii_pseudo_op=unknown
-        # Check if we have .ascii
--       AC_TRY_COMPILE([asm (".ascii \"string\"");],,
-+       AC_TRY_COMPILE([asm (".ascii \\"string\\"");],,
- 		       [libffi_cv_as_ascii_pseudo_op=yes],
- 		       [libffi_cv_as_ascii_pseudo_op=no])
-     ])
-@@ -271,7 +271,7 @@
-        libffi_cv_as_string_pseudo_op, [
-        libffi_cv_as_string_pseudo_op=unknown
-        # Check if we have .string
--       AC_TRY_COMPILE([asm (".string \"string\"");],,
-+       AC_TRY_COMPILE([asm (".string \\"string\\"");],,
- 		       [libffi_cv_as_string_pseudo_op=yes],
- 		       [libffi_cv_as_string_pseudo_op=no])
-     ])
-Index: config/ChangeLog
-===================================================================
---- a/src/config/ChangeLog	(.../tags/gcc_4_4_5_release)
-+++ b/src/config/ChangeLog	(.../branches/gcc-4_4-branch)
-@@ -1,3 +1,7 @@
-+2010-10-02  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
-+
-+	* po.m4 (AM_PO_SUBDIRS): Fix unportable shell quoting.
-+
- 2010-10-01  Release Manager
- 
- 	* GCC 4.4.5 released.
-Index: config/po.m4
-===================================================================
---- a/src/config/po.m4	(.../tags/gcc_4_4_5_release)
-+++ b/src/config/po.m4	(.../branches/gcc-4_4-branch)
-@@ -96,7 +96,7 @@
-       case "$ac_file" in */Makefile.in)
-         # Adjust a relative srcdir.
-         ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
--        ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
-+        ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
-         ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
-         # In autoconf-2.13 it is called $ac_given_srcdir.
-         # In autoconf-2.50 it is called $srcdir.
-Index: libjava/ChangeLog
-===================================================================
---- a/src/libjava/ChangeLog	(.../tags/gcc_4_4_5_release)
-+++ b/src/libjava/ChangeLog	(.../branches/gcc-4_4-branch)
-@@ -1,3 +1,22 @@
-+2011-01-07  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-+
-+	Backport from mainline:
-+	2011-01-06  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-+
-+	* testsuite/libjava.jni/jni.exp (gcj_jni_get_cxxflags_invocation):
-+	Add -shared-libgcc to cxxflags for *-*-solaris*.
-+	Remove -lsocket.
-+
-+2010-12-13  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-+
-+	Backport from mainline:
-+	2010-11-09  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-+
-+	* testsuite/libjava.jvmti/jvmti.exp (gcj_jvmti_compile_cxx_to_o):
-+	Add -pthread on alpha*-dec-osf*.
-+	* testsuite/libjava.jvmti/jvmti-interp.exp
-+	(gcj_jni_compile_c_to_so): Likewise.
-+
- 2010-10-01  Release Manager
- 
- 	* GCC 4.4.5 released.
-Index: libjava/testsuite/libjava.jvmti/jvmti-interp.exp
-===================================================================
---- a/src/libjava/testsuite/libjava.jvmti/jvmti-interp.exp	(.../tags/gcc_4_4_5_release)
-+++ b/src/libjava/testsuite/libjava.jvmti/jvmti-interp.exp	(.../branches/gcc-4_4-branch)
-@@ -34,6 +34,10 @@
-   if { [istarget "arm*"] } {
-       lappend options "additional_flags=-Wno-abi"
-   }
-+  # Tru64 UNIX requires <pthread.h> to be compiled with -pthread.
-+  if { [istarget "alpha*-dec-osf*"] } {
-+      lappend options "additional_flags=-pthread"
-+  }
- 
-   set filename [file tail $file]
-   set name [file rootname $filename]
-Index: libjava/testsuite/libjava.jvmti/jvmti.exp
-===================================================================
---- a/src/libjava/testsuite/libjava.jvmti/jvmti.exp	(.../tags/gcc_4_4_5_release)
-+++ b/src/libjava/testsuite/libjava.jvmti/jvmti.exp	(.../branches/gcc-4_4-branch)
-@@ -20,6 +20,10 @@
-   if { [istarget "arm*"] } {
-       lappend options "additional_flags=-Wno-abi"
-   }
-+  # Tru64 UNIX requires <pthread.h> to be compiled with -pthread.
-+  if { [istarget "alpha*-dec-osf*"] } {
-+      lappend options "additional_flags=-pthread"
-+  }
- 
-   set x [libjava_prune_warnings \
- 	   [target_compile $file $oname object $options]]
-Index: libjava/testsuite/libjava.jni/jni.exp
-===================================================================
---- a/src/libjava/testsuite/libjava.jni/jni.exp	(.../tags/gcc_4_4_5_release)
-+++ b/src/libjava/testsuite/libjava.jni/jni.exp	(.../branches/gcc-4_4-branch)
-@@ -265,8 +265,10 @@
-     lappend cxxflags -shared-libgcc -lgcj -liconv
-   }
- 
-+  # Make sure libgcc unwinder is used on 64-bit Solaris 10+/x86 rather than
-+  # the libc one.
-   if { [istarget "*-*-solaris*"] } {
--    lappend cxxflags "-lsocket"
-+    lappend cxxflags "-shared-libgcc"
-   }
- 
-   return $cxxflags
-Index: libcpp/directives.c
-===================================================================
---- a/src/libcpp/directives.c	(.../tags/gcc_4_4_5_release)
-+++ b/src/libcpp/directives.c	(.../branches/gcc-4_4-branch)
-@@ -276,16 +276,17 @@
- static void
- end_directive (cpp_reader *pfile, int skip_line)
- {
--  if (pfile->state.in_deferred_pragma)
--    ;
--  else if (CPP_OPTION (pfile, traditional))
-+  if (CPP_OPTION (pfile, traditional))
-     {
-       /* Revert change of prepare_directive_trad.  */
--      pfile->state.prevent_expansion--;
-+      if (!pfile->state.in_deferred_pragma)
-+	pfile->state.prevent_expansion--;
- 
-       if (pfile->directive != &dtable[T_DEFINE])
- 	_cpp_remove_overlay (pfile);
-     }
-+  else if (pfile->state.in_deferred_pragma)
-+    ;
-   /* We don't skip for an assembler #.  */
-   else if (skip_line)
-     {
-Index: libcpp/ChangeLog
+Index: gcc/config/pa/pa.h
 ===================================================================
---- a/src/libcpp/ChangeLog	(.../tags/gcc_4_4_5_release)
-+++ b/src/libcpp/ChangeLog	(.../branches/gcc-4_4-branch)
-@@ -1,3 +1,10 @@
-+2011-11-04  Eric Botcazou  <ebotcazou@adacore.com>
-+            Jakub Jelinek  <jakub@redhat.com>
-+
-+	PR preprocessor/39213
-+	* directives.c (end_directive): Call _cpp_remove_overlay for deferred
-+	pragmas as well in traditional mode.
-+
- 2010-10-01  Release Manager
- 
- 	* GCC 4.4.5 released.
+--- a/src/gcc/config/pa/pa.h	(.../tags/gcc_4_4_6_release)
++++ b/src/gcc/config/pa/pa.h	(.../branches/gcc-4_4-branch)
+@@ -1564,6 +1564,7 @@
+    Other copies are reasonably cheap.  */
+ #define REGISTER_MOVE_COST(MODE, CLASS1, CLASS2) \
+  (CLASS1 == SHIFT_REGS ? 0x100					\
++  : CLASS2 == SHIFT_REGS && FP_REG_CLASS_P (CLASS1) ? 18	\
+   : FP_REG_CLASS_P (CLASS1) && ! FP_REG_CLASS_P (CLASS2) ? 16	\
+   : FP_REG_CLASS_P (CLASS2) && ! FP_REG_CLASS_P (CLASS1) ? 16	\
+   : 2)
+Index: gcc/config/pa/pa32-regs.h
+===================================================================
+--- a/src/gcc/config/pa/pa32-regs.h	(.../tags/gcc_4_4_6_release)
++++ b/src/gcc/config/pa/pa32-regs.h	(.../branches/gcc-4_4-branch)
+@@ -202,6 +202,7 @@
+    registers.  */
+ #define HARD_REGNO_MODE_OK(REGNO, MODE) \
+   ((REGNO) == 0 ? (MODE) == CCmode || (MODE) == CCFPmode		\
++   : (REGNO) == 88 ? SCALAR_INT_MODE_P (MODE)				\
+    : !TARGET_PA_11 && FP_REGNO_P (REGNO)				\
+      ? (VALID_FP_MODE_P (MODE)						\
+ 	&& (GET_MODE_SIZE (MODE) <= 8					\
+Index: gcc/config/pa/pa64-regs.h
+===================================================================
+--- a/src/gcc/config/pa/pa64-regs.h	(.../tags/gcc_4_4_6_release)
++++ b/src/gcc/config/pa/pa64-regs.h	(.../branches/gcc-4_4-branch)
+@@ -161,10 +161,11 @@
+ 
+ /* Value is 1 if hard register REGNO can hold a value of machine-mode MODE.
+    On the HP-PA, the cpu registers can hold any mode.  We
+-   force this to be an even register is it cannot hold the full mode.  */
++   force this to be an even register if it cannot hold the full mode.  */
+ #define HARD_REGNO_MODE_OK(REGNO, MODE) \
+   ((REGNO) == 0								\
+    ? (MODE) == CCmode || (MODE) == CCFPmode				\
++   : (REGNO) == 60 ? SCALAR_INT_MODE_P (MODE)				\
+    /* Make wide modes be in aligned registers.  */			\
+    : FP_REGNO_P (REGNO)							\
+      ? (VALID_FP_MODE_P (MODE)						\
 Index: fixincludes/ChangeLog
 ===================================================================
---- a/src/fixincludes/ChangeLog	(.../tags/gcc_4_4_5_release)
+--- a/src/fixincludes/ChangeLog	(.../tags/gcc_4_4_6_release)
 +++ b/src/fixincludes/ChangeLog	(.../branches/gcc-4_4-branch)
-@@ -1,3 +1,22 @@
-+2010-12-13  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-+
-+	Backport from mainline:
-+	2010-11-09  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-+
-+	* inclhack.def (irix_pthread_init): New fix.
-+	* fixincl.x: Regenerate.
-+	* tests/base/pthread.h [IRIX_PTHREAD_INIT_CHECK]: New test.
-+
-+2010-10-21  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
-+
-+	Backport from mainline:
-+	2010-10-20  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+@@ -1,3 +1,8 @@
++2011-04-16  Eric Botcazou  <ebotcazou@adacore.com>
 +
-+	PR c++/46024
-+	* inclhack.def (solaris_sys_va_list): New fix.
-+	* fixincl.x: Regenerate.
-+	* tests/base/sys/va_list.h: New test.
++	PR other/48639
++	* tests/base/pthread.h [IRIX_PTHREAD_INIT_CHECK]: Move around.
 +
- 2010-10-01  Release Manager
+ 2011-04-16  Release Manager
  
- 	* GCC 4.4.5 released.
+ 	* GCC 4.4.6 released.
 Index: fixincludes/tests/base/pthread.h
 ===================================================================
---- a/src/fixincludes/tests/base/pthread.h	(.../tags/gcc_4_4_5_release)
+--- a/src/fixincludes/tests/base/pthread.h	(.../tags/gcc_4_4_6_release)
 +++ b/src/fixincludes/tests/base/pthread.h	(.../branches/gcc-4_4-branch)
-@@ -101,6 +101,13 @@
- #endif  /* PTHREAD_PAGE_SIZE_CHECK */
+@@ -96,11 +96,6 @@
+ #endif  /* GLIBC_MUTEX_INIT_CHECK */
+ 
+ 
+-#if defined( PTHREAD_PAGE_SIZE_CHECK )
+-extern int __page_size;
+-#endif  /* PTHREAD_PAGE_SIZE_CHECK */
+-
+-
+ #if defined( IRIX_PTHREAD_INIT_CHECK )
+ #define PTHREAD_MUTEX_INITIALIZER	{ { 0 } }
+ #define PTHREAD_COND_INITIALIZER	{ { 0 } }
+@@ -108,6 +103,11 @@
+ #endif  /* IRIX_PTHREAD_INIT_CHECK */
  
  
-+#if defined( IRIX_PTHREAD_INIT_CHECK )
-+#define PTHREAD_MUTEX_INITIALIZER	{ { 0 } }
-+#define PTHREAD_COND_INITIALIZER	{ { 0 } }
-+#define PTHREAD_RWLOCK_INITIALIZER	{ { 0 } }
-+#endif  /* IRIX_PTHREAD_INIT_CHECK */
++#if defined( PTHREAD_PAGE_SIZE_CHECK )
++extern int __page_size;
++#endif  /* PTHREAD_PAGE_SIZE_CHECK */
 +
 +
  #if defined( PTHREAD_INCOMPLETE_STRUCT_ARGUMENT_CHECK )
  extern int __sigsetjmp (struct __jmp_buf_tag *__env, int __savemask);
  #endif  /* PTHREAD_INCOMPLETE_STRUCT_ARGUMENT_CHECK */
-Index: fixincludes/tests/base/sys/va_list.h
-===================================================================
---- a/src/fixincludes/tests/base/sys/va_list.h	(.../tags/gcc_4_4_5_release)
-+++ b/src/fixincludes/tests/base/sys/va_list.h	(.../branches/gcc-4_4-branch)
-@@ -0,0 +1,22 @@
-+/*  DO NOT EDIT THIS FILE.
-+
-+    It has been auto-edited by fixincludes from:
-+
-+	"fixinc/tests/inc/sys/va_list.h"
-+
-+    This had to be done to correct non-standard usages in the
-+    original, manufacturer supplied header file.  */
-+
-+
-+
-+#if defined( SOLARIS_SYS_VA_LIST_CHECK )
-+#ifdef __GNUC__
-+typedef __builtin_va_list __va_list;
-+#else
-+#if defined(__STDC__) && !defined(__ia64)
-+typedef void *__va_list;
-+#else
-+typedef char *__va_list;
-+#endif
-+#endif
-+#endif  /* SOLARIS_SYS_VA_LIST_CHECK */
-Index: fixincludes/fixincl.x
-===================================================================
---- a/src/fixincludes/fixincl.x	(.../tags/gcc_4_4_5_release)
-+++ b/src/fixincludes/fixincl.x	(.../branches/gcc-4_4-branch)
-@@ -2,11 +2,11 @@
-  * 
-  * DO NOT EDIT THIS FILE   (fixincl.x)
-  * 
-- * It has been AutoGen-ed  Wednesday July 14, 2010 at 11:12:51 AM MEST
-+ * It has been AutoGen-ed  Thursday December  9, 2010 at 04:55:48 PM MET
-  * From the definitions    inclhack.def
-  * and the template file   fixincl
-  */
--/* DO NOT SVN-MERGE THIS FILE, EITHER Wed Jul 14 11:12:52 MEST 2010
-+/* DO NOT SVN-MERGE THIS FILE, EITHER Thu Dec  9 16:55:48 MET 2010
-  *
-  * You must regenerate it.  Use the ./genfixes script.
-  *
-@@ -15,7 +15,7 @@
-  * certain ANSI-incompatible system header files which are fixed to work
-  * correctly with ANSI C and placed in a directory that GNU C will search.
-  *
-- * This file contains 183 fixup descriptions.
-+ * This file contains 185 fixup descriptions.
-  *
-  * See README for more information.
-  *
-@@ -3862,6 +3862,43 @@
- 
- /* * * * * * * * * * * * * * * * * * * * * * * * * *
-  *
-+ *  Description of Irix_Pthread_Init fix
-+ */
-+tSCC zIrix_Pthread_InitName[] =
-+     "irix_pthread_init";
-+
-+/*
-+ *  File name selection pattern
-+ */
-+tSCC zIrix_Pthread_InitList[] =
-+  "pthread.h\0";
-+/*
-+ *  Machine/OS name selection pattern
-+ */
-+tSCC* apzIrix_Pthread_InitMachs[] = {
-+        "mips-sgi-irix6.5",
-+        (const char*)NULL };
-+
-+/*
-+ *  content selection pattern - do fix if pattern found
-+ */
-+tSCC zIrix_Pthread_InitSelect0[] =
-+       "^(#define[ \t]+PTHREAD_.*_INITIALIZER[ \t]+)(\\{ 0 \\})";
-+
-+#define    IRIX_PTHREAD_INIT_TEST_CT  1
-+static tTestDesc aIrix_Pthread_InitTests[] = {
-+  { TT_EGREP,    zIrix_Pthread_InitSelect0, (regex_t*)NULL }, };
-+
-+/*
-+ *  Fix Command Arguments for Irix_Pthread_Init
-+ */
-+static const char* apzIrix_Pthread_InitPatch[] = {
-+    "format",
-+    "%1{ %2 }",
-+    (char*)NULL };
-+
-+/* * * * * * * * * * * * * * * * * * * * * * * * * *
-+ *
-  *  Description of Irix_Socklen_T fix
-  */
- tSCC zIrix_Socklen_TName[] =
-@@ -5927,6 +5964,51 @@
- 
- /* * * * * * * * * * * * * * * * * * * * * * * * * *
-  *
-+ *  Description of Solaris_Sys_Va_List fix
-+ */
-+tSCC zSolaris_Sys_Va_ListName[] =
-+     "solaris_sys_va_list";
-+
-+/*
-+ *  File name selection pattern
-+ */
-+tSCC zSolaris_Sys_Va_ListList[] =
-+  "sys/va_list.h\0";
-+/*
-+ *  Machine/OS name selection pattern
-+ */
-+tSCC* apzSolaris_Sys_Va_ListMachs[] = {
-+        "*-*-solaris2.[89]",
-+        (const char*)NULL };
-+
-+/*
-+ *  content selection pattern - do fix if pattern found
-+ */
-+tSCC zSolaris_Sys_Va_ListSelect0[] =
-+       "#if.*__STDC__.*\n\
-+typedef void \\*__va_list;\n\
-+#else\n\
-+typedef char \\*__va_list;\n\
-+#endif";
-+
-+#define    SOLARIS_SYS_VA_LIST_TEST_CT  1
-+static tTestDesc aSolaris_Sys_Va_ListTests[] = {
-+  { TT_EGREP,    zSolaris_Sys_Va_ListSelect0, (regex_t*)NULL }, };
-+
-+/*
-+ *  Fix Command Arguments for Solaris_Sys_Va_List
-+ */
-+static const char* apzSolaris_Sys_Va_ListPatch[] = {
-+    "format",
-+    "#ifdef __GNUC__\n\
-+typedef __builtin_va_list __va_list;\n\
-+#else\n\
-+%0\n\
-+#endif",
-+    (char*)NULL };
-+
-+/* * * * * * * * * * * * * * * * * * * * * * * * * *
-+ *
-  *  Description of Statsswtch fix
-  */
- tSCC zStatsswtchName[] =
-@@ -7424,9 +7506,9 @@
-  *
-  *  List of all fixes
-  */
--#define REGEX_COUNT          229
-+#define REGEX_COUNT          231
- #define MACH_LIST_SIZE_LIMIT 181
--#define FIX_COUNT            183
-+#define FIX_COUNT            185
- 
- /*
-  *  Enumerate the fixes
-@@ -7526,6 +7608,7 @@
-     IRIX_ASM_APOSTROPHE_FIXIDX,
-     IRIX_COMPLEX_FIXIDX,
-     IRIX_LIMITS_CONST_FIXIDX,
-+    IRIX_PTHREAD_INIT_FIXIDX,
-     IRIX_SOCKLEN_T_FIXIDX,
-     IRIX_STDINT_C99_FIXIDX,
-     IRIX_STDIO_VA_LIST_FIXIDX,
-@@ -7578,6 +7661,7 @@
-     SOLARIS_ONCE_INIT_1_FIXIDX,
-     SOLARIS_ONCE_INIT_2_FIXIDX,
-     SOLARIS_STDIO_TAG_FIXIDX,
-+    SOLARIS_SYS_VA_LIST_FIXIDX,
-     STATSSWTCH_FIXIDX,
-     STDIO_STDARG_H_FIXIDX,
-     STDIO_VA_LIST_FIXIDX,
-@@ -8088,6 +8172,11 @@
-      IRIX_LIMITS_CONST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-      aIrix_Limits_ConstTests,   apzIrix_Limits_ConstPatch, 0 },
- 
-+  {  zIrix_Pthread_InitName,    zIrix_Pthread_InitList,
-+     apzIrix_Pthread_InitMachs,
-+     IRIX_PTHREAD_INIT_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-+     aIrix_Pthread_InitTests,   apzIrix_Pthread_InitPatch, 0 },
-+
-   {  zIrix_Socklen_TName,    zIrix_Socklen_TList,
-      apzIrix_Socklen_TMachs,
-      IRIX_SOCKLEN_T_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-@@ -8348,6 +8437,11 @@
-      SOLARIS_STDIO_TAG_TEST_CT, FD_MACH_ONLY,
-      aSolaris_Stdio_TagTests,   apzSolaris_Stdio_TagPatch, 0 },
- 
-+  {  zSolaris_Sys_Va_ListName,    zSolaris_Sys_Va_ListList,
-+     apzSolaris_Sys_Va_ListMachs,
-+     SOLARIS_SYS_VA_LIST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-+     aSolaris_Sys_Va_ListTests,   apzSolaris_Sys_Va_ListPatch, 0 },
-+
-   {  zStatsswtchName,    zStatsswtchList,
-      apzStatsswtchMachs,
-      STATSSWTCH_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
-Index: fixincludes/inclhack.def
-===================================================================
---- a/src/fixincludes/inclhack.def	(.../tags/gcc_4_4_5_release)
-+++ b/src/fixincludes/inclhack.def	(.../branches/gcc-4_4-branch)
-@@ -2102,6 +2102,24 @@
- 
- 
- /*
-+ *  IRIX 6.5 PTHREAD_*_INITIALIZER need an additional level of braces in
-+ *  <pthread.h>.
-+ */
-+fix = {
-+    hackname    = irix_pthread_init;
-+    files       = pthread.h;
-+    select      = "^(#define[ \t]+PTHREAD_.*_INITIALIZER[ \t]+)(\\{ 0 \\})";
-+
-+    mach	= "mips-sgi-irix6.5";
-+    c_fix       = format;
-+    c_fix_arg   = "%1{ %2 }";
-+    test_text   = "#define PTHREAD_MUTEX_INITIALIZER	{ 0 }\n"
-+		  "#define PTHREAD_COND_INITIALIZER	{ 0 }\n"
-+		  "#define PTHREAD_RWLOCK_INITIALIZER	{ 0 }";
-+};
-+
-+
-+/*
-  *  IRIX 6.5.1[78] <sys/socket.h> has a broken definition of socklen_t.
-  *  Various socket function prototypes use different types instead,
-  *  depending on the API in use (BSD, XPG4/5), but the socklen_t
-@@ -3143,6 +3161,34 @@
- 
- 
- /*
-+ * On Solaris 8 and 9, __va_list needs to become a typedef for
-+ * __builtin_va_list to make -Wmissing-format-attribute work.
-+ */
-+fix = {
-+    hackname = solaris_sys_va_list;
-+    files    = sys/va_list.h;
-+    mach     = '*-*-solaris2.[89]';
-+    select   = "#if.*__STDC__.*\n"
-+	       "typedef void \\*__va_list;\n"
-+	       "#else\n"
-+	       "typedef char \\*__va_list;\n"
-+	       "#endif";
-+
-+    c_fix    = format;
-+    c_fix_arg = "#ifdef __GNUC__\n"
-+		"typedef __builtin_va_list __va_list;\n"
-+		"#else\n"
-+		"%0\n"
-+		"#endif";
-+    test_text = "#if defined(__STDC__) && !defined(__ia64)\n"
-+    		"typedef void *__va_list;\n"
-+	        "#else\n"
-+	        "typedef char *__va_list;\n"
-+	        "#endif";
-+};
-+
-+
-+/*
-  *  a missing semi-colon at the end of the statsswtch structure definition.
-  */
- fix = {
diff -Nru gcc-4.4-4.4.5/debian/patches/svn-updates-linaro.diff gcc-4.4-4.4.6/debian/patches/svn-updates-linaro.diff
--- gcc-4.4-4.4.5/debian/patches/svn-updates-linaro.diff	2011-05-26 17:12:59.000000000 +0000
+++ gcc-4.4-4.4.6/debian/patches/svn-updates-linaro.diff	2011-05-26 17:13:03.000000000 +0000
@@ -1,4 +1,4 @@
-# DP: updates from the 4.4 branch upto 2010xxxx (r164607).
+# DP: updates from the 4.4 branch upto 2011xxxx (r164607).
 
 last_updated()
 {
diff -Nru gcc-4.4-4.4.5/debian/rules2 gcc-4.4-4.4.6/debian/rules2
--- gcc-4.4-4.4.5/debian/rules2	2011-05-26 17:12:59.000000000 +0000
+++ gcc-4.4-4.4.6/debian/rules2	2011-05-26 17:13:03.000000000 +0000
@@ -388,11 +388,12 @@
 endif
 
 ifneq (,$(filter $(DEB_TARGET_ARCH), amd64 i386 kfreebsd-i386 kfreebsd-amd64))
-  #CONFARGS += --with-arch-32=i486
-  ifeq ($(distribution),Ubuntu)
-    CONFARGS += --with-arch-32=i686
-  else
+  ifneq (,$(filter $(distrelease),etch lenny dapper hardy))
+    CONFARGS += --with-arch-32=i486
+  else ifneq (,$(filter $(distrelease),squeeze wheezy sid jaunty karmic lucid))
     CONFARGS += --with-arch-32=i586
+  else
+    CONFARGS += --with-arch-32=i686
   endif
 endif
 
diff -Nru gcc-4.4-4.4.5/debian/rules.conf gcc-4.4-4.4.6/debian/rules.conf
--- gcc-4.4-4.4.5/debian/rules.conf	2011-05-26 17:12:59.000000000 +0000
+++ gcc-4.4-4.4.6/debian/rules.conf	2011-05-26 17:13:03.000000000 +0000
@@ -241,13 +241,13 @@
   GMP_BUILD_DEP = libgmp3-dev,
   MPFR_BUILD_DEP = libmpfr-dev,
 else
-  GMP_BUILD_DEP = libgmp10-dev,
+  GMP_BUILD_DEP = libgmp-dev (>= 2:5.0.1~),
   MPFR_BUILD_DEP = libmpfr-dev (>= 3.0.0-9~),
 endif
 
 PPL_BUILD_DEP = libppl-dev (>= 0.10) | libppl0.10-dev (>= 0.10),
-CLOOG_BUILD_DEP = libcloog-ppl-dev (>= 0.15.9-2~),
-CLOOG_RUNTIME_DEP = libcloog-ppl0 (>= 0.15.9-2~), libppl-c2, libppl7
+CLOOG_BUILD_DEP = libcloog-ppl-dev (>= 0.15.8-1~),
+CLOOG_RUNTIME_DEP = libcloog-ppl0 (>= 0.15.8-1~), libppl-c2, libppl7
 # FIXME GCC-4.5
 ifneq (,$(findstring snapshot,$(PKGSOURCE)))
   MPC_BUILD_DEP = libmpc-dev,
diff -Nru gcc-4.4-4.4.5/debian/rules.d/binary-ada.mk gcc-4.4-4.4.6/debian/rules.d/binary-ada.mk
--- gcc-4.4-4.4.5/debian/rules.d/binary-ada.mk	2011-05-26 17:12:59.000000000 +0000
+++ gcc-4.4-4.4.6/debian/rules.d/binary-ada.mk	2011-05-26 17:13:03.000000000 +0000
@@ -28,7 +28,7 @@
 d_gnatd	= debian/$(p_gnatd)
 
 GNAT_TOOLS = gnat gnatbind gnatchop gnatclean gnatfind gnatkr gnatlink \
-             gnatls gnatmake gnatname gnatprep gnatxref
+             gnatls gnatmake gnatname gnatprep gnatxref gnathtml
 
 dirs_gnat = \
 	$(docdir)/$(p_base) \
@@ -245,6 +245,9 @@
 	: # gnat
 	rm -rf $(d_gnat)
 	dh_installdirs -p$(p_gnat) $(dirs_gnat)
+	# Upstream does not install gnathtml.
+	cp src/gcc/ada/gnathtml.pl debian/tmp/$(PF)/bin/gnathtml
+	chmod 755 debian/tmp/$(PF)/bin/gnathtml
 	dh_movefiles -p$(p_gnat) $(files_gnat)
 ifeq ($(with_gnat_zcx)-$(with_gnat_sjlj),yes-yes)
 	dh_link -p$(p_gnat) \
diff -Nru gcc-4.4-4.4.5/debian/rules.d/binary-base.mk gcc-4.4-4.4.6/debian/rules.d/binary-base.mk
--- gcc-4.4-4.4.5/debian/rules.d/binary-base.mk	2011-05-26 17:12:59.000000000 +0000
+++ gcc-4.4-4.4.6/debian/rules.d/binary-base.mk	2011-05-26 17:13:03.000000000 +0000
@@ -3,6 +3,18 @@
 # ---------------------------------------------------------------------------
 # gcc-base
 
+ifneq (,$(filter $(distrelease), karmic))
+  additional_links = 4.4.1
+else ifneq (,$(filter $(distrelease),lucid))
+  additional_links = 4.4.3
+else ifneq (,$(filter $(distrelease),maverick))
+  additional_links = 4.4.4
+else ifneq (,$(filter $(distrelease),squeeze natty))
+  additional_links = 4.4.5
+else
+  additional_links =
+endif
+
 $(binary_stamp)-base: $(install_dependencies)
 	dh_testdir
 	dh_testroot
@@ -13,13 +25,17 @@
 ifeq ($(with_common_gcclibdir),yes)
 	ln -sf $(BASE_VERSION) \
 	    $(d_base)/$(subst /$(BASE_VERSION),/$(GCC_VERSION),$(gcc_lib_dir))
-	ln -sf $(BASE_VERSION) \
-	    $(d_base)/$(subst /$(BASE_VERSION),/4.4.4,$(gcc_lib_dir))
+	for link in $(additional_links); do \
+	  ln -sf $(BASE_VERSION) \
+	    $(d_base)/$$(dirname $(gcc_lib_dir))/$$link; \
+        done
   ifneq ($(gcc_lib_dir),$(gcc_lexec_dir))
 	ln -sf $(BASE_VERSION) \
 	    $(d_base)/$(subst /$(BASE_VERSION),/$(GCC_VERSION),$(gcc_lexec_dir))
-	ln -sf $(BASE_VERSION) \
-	    $(d_base)/$(subst /$(BASE_VERSION),/4.4.4,$(gcc_lexec_dir))
+	for link in $(additional_links); do \
+	  ln -sf $(BASE_VERSION) \
+	    $(d_base)/$$(dirname $(gcc_lexec_dir))/$$link; \
+        done
   endif
 endif
 
diff -Nru gcc-4.4-4.4.5/debian/rules.d/binary-d.mk gcc-4.4-4.4.6/debian/rules.d/binary-d.mk
--- gcc-4.4-4.4.5/debian/rules.d/binary-d.mk	2011-05-26 17:12:59.000000000 +0000
+++ gcc-4.4-4.4.6/debian/rules.d/binary-d.mk	2011-05-26 17:13:03.000000000 +0000
@@ -32,7 +32,7 @@
 	$(gcc_lib_dir)
 
 files_libphobos = \
-	$(PF)/lib/libgphobos$(libphobos_version).a \
+	$(PF)/$(libdir)/libgphobos$(libphobos_version).a \
 	$(gdc_include_dir)/$(BASE_VERSION)
 
 links_gdc = \
@@ -86,7 +86,7 @@
 	DH_COMPAT=2 dh_movefiles -p$(p_libphobos) -X/zlib/ $(files_libphobos)
 
 	# better to have it there, avoid conflicts
-	mv $(d_libphobos)/$(PF)/lib/libgphobos$(libphobos_version).a \
+	mv $(d_libphobos)/$(PF)/$(libdir)/libgphobos$(libphobos_version).a \
 	    $(d_libphobos)/$(gcc_lib_dir)
 
 	# included in gdc package
diff -Nru gcc-4.4-4.4.5/debian/rules.defs gcc-4.4-4.4.6/debian/rules.defs
--- gcc-4.4-4.4.5/debian/rules.defs	2011-05-26 17:12:59.000000000 +0000
+++ gcc-4.4-4.4.6/debian/rules.defs	2011-05-26 17:13:03.000000000 +0000
@@ -97,9 +97,11 @@
   $(error Invalid architecure.)
 endif
 
-ifeq ($(distribution)-$(DEB_TARGET_ARCH),Ubuntu-i386)
-  DEB_TARGET_GNU_CPU := i686
-  DEB_TARGET_GNU_TYPE := i686-linux-gnu
+ifeq ($(DEB_TARGET_ARCH),i386)
+  ifneq (,$(filter $(distrelease),dapper hardy jaunty karmic lucid))
+    DEB_TARGET_GNU_CPU := i486
+    DEB_TARGET_GNU_TYPE := i486-linux-gnu
+  endif
 endif
 # including unversiond symlinks for binaries
 #with_unversioned = yes
@@ -270,11 +272,13 @@
 
 # build using fsf or linaro
 ifeq ($(distribution),Ubuntu)
+  ifeq (,$(filter $(distrelease),dapper hardy jaunty karmic lucid))
   ifeq (,$(findstring gnat, $(PKGSOURCE)))
   ifneq (,$(findstring $(DEB_TARGET_ARCH),amd64 armel armhf i386 powerpc))
     with_linaro_branch = yes
   endif
   endif
+  endif
 endif
 ifeq ($(DEB_TARGET_ARCH),armhf)
   with_linaro_branch := yes
@@ -299,9 +303,11 @@
 # XXX: should with_common_libs be "yes" only if this is the default compiler
 # version on the targeted arch?
 ifeq (,$(filter $(distrelease),lenny etch squeeze dapper hardy jaunty karmic lucid))
+ifeq (,$(filter $(DEB_TARGET_ARCH),m68k))
   with_common_pkgs := no
   with_common_libs := no
 endif
+endif
 #ifneq (,$(filter $(distrelease),squeeze sid))
 #  ifneq (,$(filter $(DEB_TARGET_ARCH),amd64 i386))
 #    with_common_pkgs := no
diff -Nru gcc-4.4-4.4.5/debian/rules.parameters gcc-4.4-4.4.6/debian/rules.parameters
--- gcc-4.4-4.4.5/debian/rules.parameters	2011-05-26 17:12:59.000000000 +0000
+++ gcc-4.4-4.4.6/debian/rules.parameters	2011-05-26 17:13:03.000000000 +0000
@@ -1,10 +1,10 @@
 # configuration parameters taken from upstream source files
-GCC_VERSION	:= 4.4.5
-NEXT_GCC_VERSION	:= 4.4.6
+GCC_VERSION	:= 4.4.6
+NEXT_GCC_VERSION	:= 4.4.7
 BASE_VERSION	:= 4.4
-SOURCE_VERSION	:= 4.4.5-15ubuntu1
-DEB_VERSION	:= 4.4.5-15ubuntu1
-DEB_EVERSION	:= 1:4.4.5-15ubuntu1
+SOURCE_VERSION	:= 4.4.6-3natty3
+DEB_VERSION	:= 4.4.6-3natty3
+DEB_EVERSION	:= 1:4.4.6-3natty3
 GPC_BASE_VERSION	:= 
 GDC_BASE_VERSION  := 
 DEB_GPC_VERSION	:= 
@@ -12,7 +12,7 @@
 DEB_SOVERSION	:= 4.4
 DEB_SOEVERSION	:= 1:4.4
 DEB_LIBGCC_SOVERSION	:= 1:4.4
-DEB_LIBGCC_VERSION	:= 1:4.4.5-15ubuntu1
+DEB_LIBGCC_VERSION	:= 1:4.4.6-3natty3
 DEB_STDCXX_SOVERSION	:= 4.4
 DEB_GCJ_SOVERSION	:= 4.4
 PKG_GCJ_EXT	:= 10
diff -Nru gcc-4.4-4.4.5/debian/rules.patch gcc-4.4-4.4.6/debian/rules.patch
--- gcc-4.4-4.4.5/debian/rules.patch	2011-05-26 17:12:59.000000000 +0000
+++ gcc-4.4-4.4.6/debian/rules.patch	2011-05-26 17:13:03.000000000 +0000
@@ -84,6 +84,7 @@
 	gcc-system-root \
 	no_fpr_in_libgcc \
 	pr44364 \
+	gcc-lfs \
 
 ifneq ($(with_linaro_branch),yes)
   debian_patches += \
@@ -143,7 +144,7 @@
   debian_patches += deb-protoize
 endif
 
-#ifeq ($(with_ada),yes)
+ifeq ($(with_ada),yes)
   debian_patches += \
 	ada-driver-check \
 	ada-gcc-name \
@@ -151,31 +152,32 @@
 	ada-symbolic-tracebacks \
 	ada-library-project-files-soname \
 	ada-polyorb-dsa \
-	ada-bug589164
+	ada-bug589164 \
+	ada-bug601133
 
   ifeq ($(biarch64),yes)
     debian_patches += \
 	ada-nobiarch-check
   endif
 
-#  ifeq ($(with_libgnat),yes)
+  ifeq ($(with_libgnat),yes)
     debian_patches += \
 	ada-gnatvsn \
 	ada-link-lib \
 	ada-libgnatvsn \
 	ada-libgnatprj \
 	ada-acats
-#    ifeq ($(with_gnat_zcx)-$(with_gnat_sjlj),yes-yes)
+    ifeq ($(with_gnat_zcx)-$(with_gnat_sjlj),yes-yes)
       debian_patches += \
 	ada-sjlj
-#    endif
-#  endif
+    endif
+  endif
 
   ifeq ($(DEB_TARGET_ARCH_OS),kfreebsd)
     debian_patches += ada-bug564232
   endif
 
-#endif
+endif
 
 # gcc-4.4 is not yet supported by gpc
 ifeq ($(with_pascal),yes)
@@ -186,7 +188,7 @@
 
 ifeq ($(with_d),yes)
   debian_patches += \
-       gdc-4.4 \
+       gdc-4.4$(if $(with_linaro_branch),-linaro) \
        gdc-hg-updates \
        gdc-hg-doc-updates \
        gdc-ice-valist \
@@ -202,6 +204,9 @@
   else
     debian_patches += gdc-driver-nophobos
   endif
+  ifeq ($(with_multiarch_lib),yes)
+    debian_patches += gdc-multiarch-incdir
+  endif
 else
   debian_patches += gcc-d-lang
 endif
@@ -220,6 +225,7 @@
 ifneq (,$(findstring $(DEB_TARGET_ARCH),arm armel armhf))
   debian_patches += libjava-armel-unwind
   debian_patches += $(if $(with_linaro_branch),,arm-gcc-gcse)
+  debian_patches += $(if $(with_linaro_branch),armhf-triplet-backport)
 endif
 ifeq ($(distribution),Ubuntu)
   # times out on the buildd
@@ -385,6 +391,7 @@
 	if ! test -f ./autotools_files ; then touch ./autotools_files ; fi
 
 	cd $(srcdir)/fixincludes && ./genfixes
+	rm -f $(srcdir)/gcc/gengtype-lex.c
 
 	for f in $(autotools_files) ; \
 	  do case $$f in \
Binary files /tmp/FrZTe6Tcb6/gcc-4.4-4.4.5/gcc-4.4.5.tar.xz and /tmp/6kY_eXXHnc/gcc-4.4-4.4.6/gcc-4.4.5.tar.xz differ
Binary files /tmp/FrZTe6Tcb6/gcc-4.4-4.4.5/gcc-4.4.6.tar.xz and /tmp/6kY_eXXHnc/gcc-4.4-4.4.6/gcc-4.4.6.tar.xz differ