[gcc-7] 30/354: [ YunQiang Su ] * Update gnat patches for GCC 7, stop building libgnatvsn and libgnatprj. Addresses: #844367.

Ximin Luo infinity0 at debian.org
Thu Nov 23 15:50:26 UTC 2017


This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository gcc-7.

commit aee5f297a5bdf390e9558a778334efa4560bf9c4
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Thu Nov 17 20:14:54 2016 +0000

      [ YunQiang Su ]
      * Update gnat patches for GCC 7, stop building libgnatvsn and libgnatprj.
        Addresses: #844367.
    
    
    git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9081 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog                          |    6 +
 debian/control                            |   81 ++
 debian/control.m4                         |  137 --
 debian/libgnatprjBV.overrides             |    1 -
 debian/libgnatvsnBV.overrides             |    1 -
 debian/patches/ada-acats.diff             |  116 +-
 debian/patches/ada-gnattools-cross.diff   |  761 -----------
 debian/patches/ada-libgnatprj.diff        | 1991 -----------------------------
 debian/patches/ada-libgnatvsn.diff        |  836 ------------
 debian/patches/ada-link-lib.diff          |  946 +-------------
 debian/patches/ada-link-shlib.diff        |   65 +-
 debian/patches/ada-sjlj.diff              |  620 +++++----
 debian/patches/libgnatprj-cross-hack.diff |   66 -
 debian/patches/libgnatprj-link.diff       |   21 -
 debian/rules.d/binary-ada.mk              |  106 +-
 debian/rules.defs                         |    2 -
 debian/rules.patch                        |   11 +-
 17 files changed, 584 insertions(+), 5183 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 09fdac6..ec92e1c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
 gcc-7 (7-20161117-1) UNRELEASED; urgency=medium
 
   * GCC 7 snapshot build, taken from the trunk 20161117.
+
+  [ Matthias Klose ]
   * Update libgphobos symbol files.
 
+  [ YunQiang Su ]
+  * Update gnat patches for GCC 7, stop building libgnatvsn and libgnatprj.
+    Addresses: #844367.
+
  -- Matthias Klose <doko at debian.org>  Thu, 17 Nov 2016 13:58:09 +0100
 
 gcc-7 (7-20161116-1) experimental; urgency=medium
diff --git a/debian/control b/debian/control
index 736df9f..ae4b9b0 100644
--- a/debian/control
+++ b/debian/control
@@ -2048,6 +2048,77 @@ Description: GNU Standard C++ Library v3 (documentation files)
  alphabetical list, compound list, file list, namespace members,
  compound members and file members.
 
+Package: gnat-7
+Architecture: any
+Priority: optional
+Pre-Depends: ${misc:Pre-Depends}
+Depends: gcc-7-base (= ${gcc:Version}), gcc-7 (>= ${gcc:SoftVersion}), ${dep:libgnat}, ${dep:libcdev}, ${shlibs:Depends}, ${misc:Depends}
+Suggests: gnat-7-doc, ada-reference-manual-2012, gnat-7-sjlj
+Breaks:   gnat (<< 4.6.1), dh-ada-library (<< 6.0), gnat-4.6-base (= 4.6.4-2),
+ gnat-4.9-base (= 4.9-20140330-1)
+Replaces: gnat (<< 4.6.1), dh-ada-library (<< 6.0), gnat-4.6-base (= 4.6.4-2),
+ gnat-4.9-base (= 4.9-20140330-1)
+# Takes over symlink from gnat (<< 4.6.1): /usr/bin/gnatgcc.
+# Takes over file from dh-ada-library (<< 6.0): debian_packaging.mk.
+# g-base 4.6.4-2, 4.9-20140330-1 contain debian_packaging.mk by mistake.
+# Newer versions of gnat and dh-ada-library will not provide these files.
+Conflicts: gnat (<< 4.1), gnat-3.1, gnat-3.2, gnat-3.3, gnat-3.4, gnat-3.5,
+ gnat-4.0, gnat-4.1, gnat-4.2, gnat-4.3, gnat-4.4, gnat-4.6, gnat-4.7, gnat-4.8,
+ gnat-4.9, gnat-5, gnat-6
+# These other packages will continue to provide /usr/bin/gnatmake and
+# other files.
+Description: GNU Ada compiler
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
+ .
+ This package provides the compiler, tools and runtime library that handles
+ exceptions using the default zero-cost mechanism.
+
+Package: gnat-7-sjlj
+Architecture: any
+Priority: extra
+Pre-Depends: ${misc:Pre-Depends}
+Depends: gcc-7-base (= ${gcc:Version}), gnat-7 (= ${gnat:Version}), ${misc:Depends}
+Description: GNU Ada compiler (setjump/longjump runtime library)
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
+ .
+ This package provides an alternative runtime library that handles
+ exceptions using the setjump/longjump mechanism (as a static library
+ only).  You can install it to supplement the normal compiler.
+
+Package: libgnat-7
+Section: libs
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Priority: optional
+Depends: gcc-7-base (= ${gcc:Version}), ${shlibs:Depends}, ${misc:Depends}
+Description: runtime for applications compiled with GNAT (shared library)
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
+ .
+ The libgnat library provides runtime components needed by most
+ applications produced with GNAT.
+ .
+ This package contains the runtime shared library.
+
+Package: libgnat-7-dbg
+Section: debug
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Priority: extra
+Depends: gcc-7-base (= ${gcc:Version}), libgnat-7 (= ${gnat:Version}), ${misc:Depends}
+Description: runtime for applications compiled with GNAT (debugging symbols)
+ GNAT is a compiler for the Ada programming language. It produces optimized
+ code on platforms supported by the GNU Compiler Collection (GCC).
+ .
+ The libgnat library provides runtime components needed by most
+ applications produced with GNAT.
+ .
+ This package contains the debugging symbols.
+
 Package: gdc-7
 Architecture: any
 Priority: optional
@@ -2207,6 +2278,16 @@ Description: Phobos D standard library (debug symbols)
  .
  For more information check http://www.dlang.org/phobos/
 
+#Package: gcc`'PV-soft-float
+#Architecture: arm armel armhf
+#Priority: PRI(optional)
+#Depends: BASEDEP, depifenabled(`cdev',`gcc`'PV (= ${gcc:Version}),') ${shlibs:Depends}, ${misc:Depends}
+#Conflicts: gcc-4.4-soft-float, gcc-4.5-soft-float, gcc-4.6-soft-float
+#BUILT_USING`'dnl
+#Description: GCC soft-floating-point gcc libraries (ARM)
+# These are versions of basic static libraries such as libgcc.a compiled
+# with the -msoft-float option, for CPUs without a floating-point unit.
+
 Package: fixincludes
 Architecture: any
 Priority: optional
diff --git a/debian/control.m4 b/debian/control.m4
index 04771a6..eadfb5e 100644
--- a/debian/control.m4
+++ b/debian/control.m4
@@ -4647,143 +4647,6 @@ Description: runtime for applications compiled with GNAT (debugging symbols)
  applications produced with GNAT.
  .
  This package contains the debugging symbols.
-
-Package: libgnatvsn`'GNAT_V-dev`'LS
-Section: libdevel
-Architecture: ifdef(`TARGET',`CROSS_ARCH',`any')
-Priority: extra
-Depends: BASELDEP, ifdef(`TARGET',`',`gnat`'PV`'TS (ifdef(`TARGET',`>= ${gnat:SoftVersion}',`= ${gnat:Version}')),')
- libgnatvsn`'GNAT_V`'LS (= ${gnat:Version}), ${misc:Depends}
-ifdef(`TARGET',`Recommends: gnat`'PV`'TS (>= ${gnat:SoftVersion})
-')`'dnl
-Conflicts: libgnatvsn-dev (<< `'GNAT_V),
- libgnatvsn4.1-dev, libgnatvsn4.3-dev, libgnatvsn4.4-dev,
- libgnatvsn4.5-dev, libgnatvsn4.6-dev, libgnatvsn4.9-dev,
- libgnatvsn5-dev`'LS, libgnatvsn6-dev`'LS,
-BUILT_USING`'dnl
-Description: GNU Ada compiler selected components (development files)
- GNAT is a compiler for the Ada programming language. It produces optimized
- code on platforms supported by the GNU Compiler Collection (GCC).
- .
- The libgnatvsn library exports selected GNAT components for use in other
- packages, most notably ASIS tools. It is licensed under the GNAT-Modified
- GPL, allowing to link proprietary programs with it.
- .
- This package contains the development files and static library.
-
-Package: libgnatvsn`'GNAT_V`'LS
-Architecture: ifdef(`TARGET',`CROSS_ARCH',`any')
-ifdef(`MULTIARCH', `Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-')`'dnl
-Priority: ifdef(`TARGET',`extra',`PRI(optional)')
-Section: ifdef(`TARGET',`devel',`libs')
-Depends: BASELDEP, libgnat`'-GNAT_V`'LS (= ${gnat:Version}),
- ${shlibs:Depends}, ${misc:Depends}
-BUILT_USING`'dnl
-Description: GNU Ada compiler selected components (shared library)
- GNAT is a compiler for the Ada programming language. It produces optimized
- code on platforms supported by the GNU Compiler Collection (GCC).
- .
- The libgnatvsn library exports selected GNAT components for use in other
- packages, most notably ASIS tools. It is licensed under the GNAT-Modified
- GPL, allowing to link proprietary programs with it.
- .
- This package contains the runtime shared library.
-
-Package: libgnatvsn`'GNAT_V-dbg`'LS
-Architecture: ifdef(`TARGET',`CROSS_ARCH',`any')
-ifdef(`MULTIARCH', `Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-')`'dnl
-Priority: extra
-Section: debug
-Depends: BASELDEP, libgnatvsn`'GNAT_V`'LS (= ${gnat:Version}), ${misc:Depends}
-Suggests: gnat
-BUILT_USING`'dnl
-Description: GNU Ada compiler selected components (debugging symbols)
- GNAT is a compiler for the Ada programming language. It produces optimized
- code on platforms supported by the GNU Compiler Collection (GCC).
- .
- The libgnatvsn library exports selected GNAT components for use in other
- packages, most notably ASIS tools. It is licensed under the GNAT-Modified
- GPL, allowing to link proprietary programs with it.
- .
- This package contains the debugging symbols.
-
-Package: libgnatprj`'GNAT_V-dev`'LS
-Section: libdevel
-Architecture: ifdef(`TARGET',`CROSS_ARCH',`any')
-Priority: extra
-Depends: BASELDEP, ifdef(`TARGET',`',`gnat`'PV`'TS (ifdef(`TARGET',`>= ${gnat:SoftVersion}',`= ${gnat:Version}')),')
- libgnatprj`'GNAT_V`'LS (= ${gnat:Version}),
- libgnatvsn`'GNAT_V-dev`'LS (= ${gnat:Version}), ${misc:Depends}
-ifdef(`TARGET',`Recommends: gnat`'PV`'TS (>= ${gnat:SoftVersion})
-')`'dnl
-Conflicts: libgnatprj-dev (<< `'GNAT_V),
- libgnatprj4.1-dev, libgnatprj4.3-dev, libgnatprj4.4-dev,
- libgnatprj4.5-dev, libgnatprj4.6-dev, libgnatprj4.9-dev,
- libgnatprj5-dev`'LS, libgnatprj6-dev`'LS,
-BUILT_USING`'dnl
-Description: GNU Ada compiler Project Manager (development files)
- GNAT is a compiler for the Ada programming language. It produces optimized
- code on platforms supported by the GNU Compiler Collection (GCC).
- .
- GNAT uses project files to organise source and object files in large-scale
- development efforts. The libgnatprj library exports GNAT project files
- management for use in other packages, most notably ASIS tools (package
- asis-programs) and GNAT Programming Studio (package gnat-gps). It is
- licensed under the pure GPL; all programs that use it must also be
- distributed under the GPL, or not distributed at all.
- .
- This package contains the development files and static library.
-
-Package: libgnatprj`'GNAT_V`'LS
-Architecture: ifdef(`TARGET',`CROSS_ARCH',`any')
-ifdef(`MULTIARCH', `Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-')`'dnl
-Priority: ifdef(`TARGET',`extra',`PRI(optional)')
-Section: ifdef(`TARGET',`devel',`libs')
-Depends: BASELDEP, libgnat`'-GNAT_V`'LS (= ${gnat:Version}),
- libgnatvsn`'GNAT_V`'LS (= ${gnat:Version}),
- ${shlibs:Depends}, ${misc:Depends}
-BUILT_USING`'dnl
-Description: GNU Ada compiler Project Manager (shared library)
- GNAT is a compiler for the Ada programming language. It produces optimized
- code on platforms supported by the GNU Compiler Collection (GCC).
- .
- GNAT uses project files to organise source and object files in large-scale
- development efforts. The libgnatprj library exports GNAT project files
- management for use in other packages, most notably ASIS tools (package
- asis-programs) and GNAT Programming Studio (package gnat-gps). It is
- licensed under the pure GPL; all programs that use it must also be
- distributed under the GPL, or not distributed at all.
- .
- This package contains the runtime shared library.
-
-Package: libgnatprj`'GNAT_V-dbg`'LS
-Architecture: ifdef(`TARGET',`CROSS_ARCH',`any')
-ifdef(`MULTIARCH', `Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-')`'dnl
-Priority: extra
-Section: debug
-Depends: BASELDEP, libgnatprj`'GNAT_V`'LS (= ${gnat:Version}), ${misc:Depends}
-Suggests: gnat
-BUILT_USING`'dnl
-Description: GNU Ada compiler Project Manager (debugging symbols)
- GNAT is a compiler for the Ada programming language. It produces optimized
- code on platforms supported by the GNU Compiler Collection (GCC).
- .
- GNAT uses project files to organise source and object files in large-scale
- development efforts. The libgnatprj library exports GNAT project files
- management for use in other packages, most notably ASIS tools (package
- asis-programs) and GNAT Programming Studio (package gnat-gps). It is
- licensed under the pure GPL; all programs that use it must also be
- distributed under the GPL, or not distributed at all.
- .
- This package contains the debugging symbols.
 ')`'dnl libgnat
 
 ifenabled(`lib64gnat',`
diff --git a/debian/libgnatprjBV.overrides b/debian/libgnatprjBV.overrides
deleted file mode 100644
index 20b359e..0000000
--- a/debian/libgnatprjBV.overrides
+++ /dev/null
@@ -1 +0,0 @@
-libgnatprj at BV@ binary: missing-dependency-on-libc
diff --git a/debian/libgnatvsnBV.overrides b/debian/libgnatvsnBV.overrides
deleted file mode 100644
index d1bd4d3..0000000
--- a/debian/libgnatvsnBV.overrides
+++ /dev/null
@@ -1 +0,0 @@
-libgnatvsn at BV@ binary: missing-dependency-on-libc
diff --git a/debian/patches/ada-acats.diff b/debian/patches/ada-acats.diff
index 83b9acf..58590c9 100644
--- a/debian/patches/ada-acats.diff
+++ b/debian/patches/ada-acats.diff
@@ -2,87 +2,14 @@
 # DP:   directory (build/gnattools), and for the shared libraries in
 # DP:   build/gcc/ada/rts, build/libgnatvsn and build/libgnatprj.
 
-Index: b/src/gcc/testsuite/ada/acats/run_acats
+Index: gcc-7-7-20161112/src/gcc/testsuite/ada/acats/run_all.sh
 ===================================================================
---- a/src/gcc/testsuite/ada/acats/run_acats
-+++ b/src/gcc/testsuite/ada/acats/run_acats
-@@ -20,52 +20,30 @@ which () {
-     return 1
+--- gcc-7-7-20161112.orig/src/gcc/testsuite/ada/acats/run_all.sh
++++ gcc-7-7-20161112/src/gcc/testsuite/ada/acats/run_all.sh
+@@ -68,6 +68,10 @@ target_gcc () {
+   $GCC $gccflags $*
  }
  
-+echo '#!/bin/sh' > host_gnatchop
-+echo exec /usr/bin/gnatchop '$*' >> host_gnatchop
-+
-+chmod +x host_gnatchop
-+
-+echo '#!/bin/sh' > host_gnatmake
-+echo echo '$PATH' '$*' >> host_gnatmake
-+echo exec /usr/bin/gnatmake '$*' >> host_gnatmake
-+
-+chmod +x host_gnatmake
-+
- # Set up environment to use the Ada compiler from the object tree
- 
--host_gnatchop=`which gnatchop`
--host_gnatmake=`which gnatmake`
- ROOT=`${PWDCMD-pwd}`
- BASE=`cd $ROOT/../../..; ${PWDCMD-pwd}`
--
- PATH=$BASE:$ROOT:$PATH
--ADA_INCLUDE_PATH=$BASE/ada/rts
--LD_LIBRARY_PATH=$ADA_INCLUDE_PATH:$BASE:$LD_LIBRARY_PATH
--ADA_OBJECTS_PATH=$ADA_INCLUDE_PATH
--
--if [ ! -d $ADA_INCLUDE_PATH ]; then
--   echo gnatlib missing, exiting.
--   exit 1
--fi
--
--if [ ! -f $BASE/gnatchop ]; then
--   echo gnattools missing, exiting.
--   exit 1
--fi
--
--if [ ! -f $BASE/gnatmake ]; then
--   echo gnattools missing, exiting.
--   exit 1
--fi
--
- GCC_DRIVER="$BASE/xgcc"
-+TARGET=`${GCC_DRIVER} -v  2>&1 |grep '^Target:' | cut -d' ' -f2`
-+GNATTOOLS=`cd $BASE/../gnattools; ${PWDCMD-pwd}`
-+LIBGNATVSN=`cd $BASE/../${TARGET}/libgnatvsn; ${PWDCMD-pwd}`
-+LIBGNATPRJ=`cd $BASE/../${TARGET}/libgnatprj; ${PWDCMD-pwd}`
- GCC="$BASE/xgcc -B$BASE/"
- export PATH ADA_INCLUDE_PATH ADA_OBJECTS_PATH GCC_DRIVER GCC LD_LIBRARY_PATH
--
--echo '#!/bin/sh' > host_gnatchop
--echo PATH=`dirname $host_gnatchop`:'$PATH' >> host_gnatchop
--echo unset ADA_INCLUDE_PATH ADA_OBJECTS_PATH GCC_EXEC_PREFIX >> host_gnatchop
--echo export PATH >> host_gnatchop
--echo exec gnatchop '"$@"' >> host_gnatchop
--
--chmod +x host_gnatchop
--
--echo '#!/bin/sh' > host_gnatmake
--echo PATH=`dirname $host_gnatmake`:'$PATH' >> host_gnatmake
--echo unset ADA_INCLUDE_PATH ADA_OBJECTS_PATH GCC_EXEC_PREFIX >> host_gnatmake
--echo export PATH >> host_gnatmake
--echo exec gnatmake '"$@"' >> host_gnatmake
--
--chmod +x host_gnatmake
-+export GNATTOOLS LIBGNATVSN LIBGNATPRJ
- 
- # Limit the stack to 16MB for stack checking
- ulimit -s 16384
-Index: b/src/gcc/testsuite/ada/acats/run_all.sh
-===================================================================
---- a/src/gcc/testsuite/ada/acats/run_all.sh
-+++ b/src/gcc/testsuite/ada/acats/run_all.sh
-@@ -12,6 +12,10 @@
- gccflags="-O2"
- gnatflags="-gnatws"
- 
 +RTS=`cd $GNATTOOLS/../gcc/ada/rts; ${PWDCMD-pwd}`
 +LD_LIBRARY_PATH=$RTS:$LIBGNATVSN:$LIBGNATPRJ
 +export LD_LIBRARY_PATH
@@ -90,26 +17,7 @@ Index: b/src/gcc/testsuite/ada/acats/run_all.sh
  target_run () {
    eval $EXPECT -f $testdir/run_test.exp $*
  }
-@@ -63,12 +67,15 @@ if [ "$dir" = "$testdir" ]; then
- fi
- 
- target_gnatchop () {
--  gnatchop --GCC="$GCC_DRIVER" $*
-+  ADA_INCLUDE_PATH=$GNATTOOLS/../../src/gcc/ada $GNATTOOLS/gnatchop --GCC="$GCC_DRIVER" $*
- }
- 
- target_gnatmake () {
--  echo gnatmake --GCC=\"$GCC\" $gnatflags $gccflags $* -largs $EXTERNAL_OBJECTS --GCC=\"$GCC\"
--  gnatmake --GCC="$GCC" $gnatflags $gccflags $* -largs $EXTERNAL_OBJECTS --GCC="$GCC"
-+  EXTERNAL_OBJECTS="$EXTERNAL_OBJECTS $RTS/adaint.o $RTS/sysdep.o $RTS/init.o $RTS/raise-gcc.o"
-+  $GNATTOOLS/gnatmake -I- -I$RTS -I. \
-+      --GCC="$GCC" --GNATBIND="$GNATTOOLS/gnatbind" \
-+      --GNATLINK="$GNATTOOLS/gnatlink" $gnatflags $gccflags $* \
-+      -bargs -static -largs $EXTERNAL_OBJECTS --GCC="$GCC -I- -I$RTS -I."
- }
- 
- target_gcc () {
-@@ -101,8 +108,8 @@ display target gcc is $GCC
+@@ -98,8 +102,8 @@ display target gcc is $GCC
  display `$GCC -v 2>&1`
  display host=`gcc -dumpmachine`
  display target=$target
@@ -120,19 +28,19 @@ Index: b/src/gcc/testsuite/ada/acats/run_all.sh
  display ""
  
  if [ -n "$GCC_RUNTEST_PARALLELIZE_DIR" ]; then
-@@ -129,7 +136,7 @@ cp $testdir/support/*.ada $testdir/suppo
- # Find out the size in bit of an address on the target
- target_gnatmake $testdir/support/impbit.adb >> $dir/acats.log 2>&1
+@@ -130,7 +134,7 @@ if [ $? -ne 0 ]; then
+    exit 1
+ fi
  target_run $dir/support/impbit > $dir/support/impbit.out 2>&1
 -target_bit=`cat $dir/support/impbit.out`
 +target_bit=`cat $dir/support/impbit.out` | sed -e 's/\r//g'
  echo target_bit="$target_bit" >> $dir/acats.log
  
  # Find out a suitable asm statement
-Index: b/src/gcc/testsuite/lib/gnat.exp
+Index: gcc-7-7-20161112/src/gcc/testsuite/lib/gnat.exp
 ===================================================================
---- a/src/gcc/testsuite/lib/gnat.exp
-+++ b/src/gcc/testsuite/lib/gnat.exp
+--- gcc-7-7-20161112.orig/src/gcc/testsuite/lib/gnat.exp
++++ gcc-7-7-20161112/src/gcc/testsuite/lib/gnat.exp
 @@ -88,18 +88,25 @@ proc gnat_init { args } {
      global GNAT_UNDER_TEST
      global TOOL_EXECUTABLE
diff --git a/debian/patches/ada-gnattools-cross.diff b/debian/patches/ada-gnattools-cross.diff
deleted file mode 100644
index a085d1d..0000000
--- a/debian/patches/ada-gnattools-cross.diff
+++ /dev/null
@@ -1,761 +0,0 @@
-# DP: - When building the native gnat, link the gnat tools against
-# DP:   the build tree (build/$(host_alias)/{libgnatvsn,libgnatprj}.)
-# DP: - When building a cross gnat, link against the libgnatvsn-6-dev
-# DP:   and libgnatprj-6-dev packages.
-# DP:   This link will be done by /usr/bin/$(host_alias)-gnat*, thus
-# DP:   the native gnat with the same major version will be required.
-
-Index: b/src/gcc/ada/gcc-interface/Makefile.in
-===================================================================
---- a/src/gcc/ada/gcc-interface/Makefile.in
-+++ b/src/gcc/ada/gcc-interface/Makefile.in
-@@ -102,7 +102,7 @@ INSTALL_DATA_DATE = cp -p
- MAKEINFO = makeinfo
- TEXI2DVI = texi2dvi
- TEXI2PDF = texi2pdf
--GNATBIND_FLAGS = -static -x
-+GNATBIND_FLAGS = -shared -x
- ADA_CFLAGS =
- ADAFLAGS = -W -Wall -gnatpg -gnata
- FORCE_DEBUG_ADAFLAGS = -g
-@@ -141,6 +141,8 @@ target=@target@
- target_cpu=@target_cpu@
- target_vendor=@target_vendor@
- target_os=@target_os@
-+host_alias=@host_alias@
-+host=@host@
- host_cpu=@host_cpu@
- host_vendor=@host_vendor@
- host_os=@host_os@
-@@ -235,7 +237,7 @@ ALL_CPPFLAGS = $(CPPFLAGS)
- ALL_COMPILERFLAGS = $(ALL_CFLAGS)
- 
- # This is where we get libiberty.a from.
--LIBIBERTY = ../../libiberty/libiberty.a
-+LIBIBERTY = ../../libiberty/pic/libiberty.a
- 
- # We need to link against libbacktrace because diagnostic.c in
- # libcommon.a uses it.
-@@ -247,9 +249,15 @@ LIBS = $(LIBINTL) $(LIBICONV) $(LIBBACKT
- LIBDEPS = $(LIBINTL_DEP) $(LIBICONV_DEP) $(LIBBACKTRACE) $(LIBIBERTY)
- # Default is no TGT_LIB; one might be passed down or something
- TGT_LIB =
--TOOLS_LIBS = ../link.o ../targext.o ../../ggc-none.o ../../libcommon-target.a \
--  ../../libcommon.a ../../../libcpp/libcpp.a $(LIBGNAT) $(LIBINTL) $(LIBICONV) \
--  ../$(LIBBACKTRACE) ../$(LIBIBERTY) $(SYSLIBS) $(TGT_LIB)
-+
-+TOOLS_LIBS = ../link.o ../targext.o ../../ggc-none.o ../../version.o ../../../libiberty/pic/lrealpath.o \
-+      ../../libbackend.a ../../libcommon-target.a ../../libcommon.a ../../../libcpp/libcpp.a ../$(LIBBACKTRACE) ../$(LIBIBERTY) -lstdc++
-+
-+ifeq ($(host),$(target))
-+  TOOLS_LIBS +=  -L../$(RTSDIR) -lgnat-6 \
-+		-L../../../$(target_alias)/libgnatvsn -lgnatvsn \
-+                -L../../../$(target_alias)/libgnatprj -lgnatprj
-+endif
- 
- # Add -no-pie to TOOLS_LIBS since some of them are compiled with -fno-PIE.
- TOOLS_LIBS += @NO_PIE_FLAG@
-@@ -261,7 +269,12 @@ TOOLS_LIBS += @NO_PIE_FLAG@
- INCLUDES = -iquote . -iquote .. -iquote $(srcdir)/ada -iquote $(srcdir) \
- 	   -I $(ftop_srcdir)/include $(GMPINC)
- 
--ADA_INCLUDES = -I- -I. -I$(srcdir)/ada
-+ifeq ($(host),$(target))
-+  ADA_INCLUDES = -I../rts \
-+		-I../../../$(target_alias)/libgnatvsn \
-+		-I../../../$(target_alias)/libgnatprj
-+endif
-+ADA_INCLUDES += -I- -I. -I$(srcdir)/ada
- 
- # Likewise, but valid for subdirectories of the current dir.
- # FIXME: for VxWorks, we cannot add $(fsrcdir) because the regs.h file in
-@@ -309,30 +322,50 @@ Makefile: ../config.status $(srcdir)/ada
- # defined in this file into the environment.
- .NOEXPORT:
- 

--# Lists of files for various purposes.
- 
--GNATLINK_OBJS = gnatlink.o \
-- a-except.o ali.o alloc.o butil.o casing.o csets.o debug.o fmap.o fname.o \
-- gnatvsn.o hostparm.o indepsw.o interfac.o i-c.o i-cstrin.o namet.o opt.o \
-- osint.o output.o rident.o s-exctab.o s-secsta.o s-stalib.o s-stoele.o \
-- sdefault.o snames.o stylesw.o switch.o system.o table.o targparm.o tree_io.o \
-- types.o validsw.o widechar.o
--
--GNATMAKE_OBJS = a-except.o ali.o ali-util.o aspects.o s-casuti.o alloc.o \
-- atree.o binderr.o butil.o casing.o csets.o debug.o elists.o einfo.o errout.o \
-- erroutc.o errutil.o err_vars.o fmap.o fname.o fname-uf.o fname-sf.o \
-- gnatmake.o gnatvsn.o hostparm.o interfac.o i-c.o i-cstrin.o krunch.o lib.o \
-- make.o makeusg.o makeutl.o mlib.o mlib-fil.o mlib-prj.o mlib-tgt.o \
-- mlib-tgt-specific.o mlib-utl.o namet.o nlists.o opt.o osint.o osint-m.o \
-- output.o prj.o prj-attr.o prj-attr-pm.o prj-com.o prj-dect.o prj-env.o \
-- prj-conf.o prj-pp.o prj-err.o prj-ext.o prj-nmsc.o prj-pars.o prj-part.o \
-- prj-proc.o prj-strt.o prj-tree.o prj-util.o restrict.o rident.o s-exctab.o \
-- s-secsta.o s-stalib.o s-stoele.o scans.o scng.o sdefault.o sfn_scan.o \
-- s-purexc.o s-htable.o scil_ll.o sem_aux.o sinfo.o sinput.o sinput-c.o \
-- sinput-p.o snames.o stand.o stringt.o styleg.o stylesw.o system.o validsw.o \
-- switch.o switch-m.o table.o targparm.o tempdir.o tree_io.o types.o uintp.o \
-- uname.o urealp.o usage.o widechar.o \
-- $(EXTRA_GNATMAKE_OBJS)
-+# Since we don't have gnatmake, we must specify the full list of
-+# object files necessary to build gnatmake and gnatlink.
-+GNATLINK_OBJS = \
-+gnatlink.o \
-+indepsw.o \
-+validsw.o
-+
-+GNATMAKE_OBJS = \
-+aspects.o \
-+errout.o \
-+fname-sf.o \
-+gnatmake.o \
-+make.o \
-+makeusg.o \
-+mlib-prj.o \
-+osint-m.o \
-+restrict.o \
-+sem_aux.o \
-+usage.o \
-+validsw.o \
-+$(EXTRA_GNATMAKE_OBJS)
-+
-+EXTRA_TOOLS_OBJS = \
-+bcheck.o \
-+binde.o \
-+bindgen.o \
-+bindusg.o \
-+clean.o \
-+gprep.o \
-+makegpr.o \
-+osint-b.o \
-+osint-l.o \
-+prep.o \
-+prj-makr.o \
-+prj-pp.o \
-+switch-b.o \
-+vms_cmds.o \
-+vms_conv.o \
-+vms_data.o \
-+xr_tabls.o \
-+xref_lib.o
-+
-+OBJECTS = $(GNATLINK_OBJS) $(GNATMAKE_OBJS) $(EXTRA_TOOLS_OBJS)
- 
- # Make arch match the current multilib so that the RTS selection code
- # picks up the right files. For a given target this must be coherent
-@@ -1612,6 +1645,11 @@ ifeq ($(strip $(filter-out s390% linux%,
-   LIBRARY_VERSION := $(LIB_VERSION)
- endif
- 
-+ifeq ($(strip $(filter-out hppa% unknown linux gnu,$(targ))),)
-+  GNATLIB_SHARED = gnatlib-shared-dual
-+  LIBRARY_VERSION := $(LIB_VERSION)
-+endif
-+
- # HP/PA HP-UX 10
- ifeq ($(strip $(filter-out hppa% hp hpux10%,$(target_cpu) $(target_vendor) $(target_os))),)
-   LIBGNAT_TARGET_PAIRS = \
-@@ -2515,153 +2553,6 @@ ADA_EXCLUDE_FILES=$(filter-out \
-   $(patsubst %$(objext),%.adb,$(GNATRTL_OBJS)), \
-   $(ADA_EXCLUDE_SRCS))
- 
--LIBGNAT=../$(RTSDIR)/libgnat.a
--
--TOOLS_FLAGS_TO_PASS=		\
--	"CC=$(CC)" 		\
--	"CFLAGS=$(CFLAGS)"	\
--	"LDFLAGS=$(LDFLAGS)"	\
--	"ADAFLAGS=$(ADAFLAGS)"	\
--	"INCLUDES=$(INCLUDES_FOR_SUBDIR)"\
--	"ADA_INCLUDES=$(ADA_INCLUDES) $(ADA_INCLUDES_FOR_SUBDIR)"\
--	"libsubdir=$(libsubdir)"	\
--	"exeext=$(exeext)"	\
--	"fsrcdir=$(fsrcdir)"	\
--	"srcdir=$(fsrcdir)"	\
--	"TOOLS_LIBS=$(TOOLS_LIBS) $(TGT_LIB)"	\
--	"GNATMAKE=$(GNATMAKE)"	\
--	"GNATLINK=$(GNATLINK)"	\
--	"GNATBIND=$(GNATBIND)"
--
--GCC_LINK=$(CXX) $(GCC_LINK_FLAGS) $(ADA_INCLUDES) $(LDFLAGS)
--
--# Build directory for the tools. Let's copy the target-dependent
--# sources using the same mechanism as for gnatlib. The other sources are
--# accessed using the vpath directive below
--
--../stamp-tools:
--	-$(RM) tools/*
--	-$(RMDIR) tools
--	-$(MKDIR) tools
--	-(cd tools; $(LN_S) ../sdefault.adb ../snames.ads ../snames.adb .)
--	-$(foreach PAIR,$(TOOLS_TARGET_PAIRS), \
--	          $(RM) tools/$(word 1,$(subst <, ,$(PAIR)));\
--	          $(LN_S) $(fsrcpfx)ada/$(word 2,$(subst <, ,$(PAIR))) \
--	                tools/$(word 1,$(subst <, ,$(PAIR)));)
--	touch ../stamp-tools
--
--# when compiling the tools, the runtime has to be first on the path so that
--# it hides the runtime files lying with the rest of the sources
--ifeq ($(TOOLSCASE),native)
--  vpath %.ads ../$(RTSDIR) ../
--  vpath %.adb ../$(RTSDIR) ../
--  vpath %.c   ../$(RTSDIR) ../
--  vpath %.h   ../$(RTSDIR) ../
--endif
--
--# in the cross tools case, everything is compiled with the native
--# gnatmake/link. Therefore only -I needs to be modified in ADA_INCLUDES
--ifeq ($(TOOLSCASE),cross)
--  vpath %.ads ../
--  vpath %.adb ../
--  vpath %.c   ../
--  vpath %.h   ../
--endif
--
--# gnatmake/link tools cannot always be built with gnatmake/link for bootstrap
--# reasons: gnatmake should be built with a recent compiler, a recent compiler
--# may not generate ALI files compatible with an old gnatmake so it is important
--# to be able to build gnatmake without a version of gnatmake around. Once
--# everything has been compiled once, gnatmake can be recompiled with itself
--# (see target gnattools1-re)
--gnattools1: ../stamp-tools ../stamp-gnatlib-$(RTSDIR)
--	$(MAKE) -C tools -f ../Makefile $(TOOLS_FLAGS_TO_PASS) \
--	  TOOLSCASE=native \
--	  ../../gnatmake$(exeext) ../../gnatlink$(exeext)
--
--# gnatmake/link can be built with recent gnatmake/link if they are available.
--# This is especially convenient for building cross tools or for rebuilding
--# the tools when the original bootstrap has already be done.
--gnattools1-re: ../stamp-tools
--	$(MAKE) -C tools -f ../Makefile $(TOOLS_FLAGS_TO_PASS) \
--	  TOOLSCASE=cross INCLUDES="" gnatmake-re gnatlink-re
--
--# these tools are built with gnatmake & are common to native and cross
--gnattools2: ../stamp-tools
--	$(MAKE) -C tools -f ../Makefile $(TOOLS_FLAGS_TO_PASS) \
--	  TOOLSCASE=native common-tools $(EXTRA_GNATTOOLS)
--
--# those tools are only built for the cross version
--gnattools4: ../stamp-tools
--ifeq ($(ENABLE_VXADDR2LINE),true)
--	$(MAKE) -C tools -f ../Makefile $(TOOLS_FLAGS_TO_PASS) \
--	  TOOLSCASE=cross top_buildir=../../.. \
--	  ../../vxaddr2line$(exeext)
--endif
--
--common-tools: ../stamp-tools
--	$(GNATMAKE) -j0 -c -b $(ADA_INCLUDES) \
--	  --GNATBIND="$(GNATBIND)" --GCC="$(CC) $(ALL_ADAFLAGS)" \
--	  gnatchop gnatcmd gnatkr gnatls gnatprep gnatxref gnatfind gnatname \
--	  gnatclean -bargs $(ADA_INCLUDES) $(GNATBIND_FLAGS)
--	$(GNATLINK) -v gnatcmd -o ../../gnat$(exeext) \
--		--GCC="$(GCC_LINK)" $(TOOLS_LIBS) $(LDFLAGS)
--	$(GNATLINK) -v gnatchop -o ../../gnatchop$(exeext) \
--		--GCC="$(GCC_LINK)" $(TOOLS_LIBS) $(LDFLAGS)
--	$(GNATLINK) -v gnatkr -o ../../gnatkr$(exeext) \
--		--GCC="$(GCC_LINK)" $(TOOLS_LIBS) $(LDFLAGS)
--	$(GNATLINK) -v gnatls -o ../../gnatls$(exeext) \
--		--GCC="$(GCC_LINK)" $(TOOLS_LIBS) $(LDFLAGS)
--	$(GNATLINK) -v gnatprep -o ../../gnatprep$(exeext) \
--		--GCC="$(GCC_LINK)" $(TOOLS_LIBS) $(LDFLAGS)
--	$(GNATLINK) -v gnatxref -o ../../gnatxref$(exeext) \
--		--GCC="$(GCC_LINK)" $(TOOLS_LIBS) $(LDFLAGS)
--	$(GNATLINK) -v gnatfind -o ../../gnatfind$(exeext) \
--		--GCC="$(GCC_LINK)" $(TOOLS_LIBS) $(LDFLAGS)
--	$(GNATLINK) -v gnatname -o ../../gnatname$(exeext) \
--		--GCC="$(GCC_LINK)" $(TOOLS_LIBS) $(LDFLAGS)
--	$(GNATLINK) -v gnatclean -o ../../gnatclean$(exeext) \
--		--GCC="$(GCC_LINK)" $(TOOLS_LIBS) $(LDFLAGS)
--
--../../gnatdll$(exeext): ../stamp-tools
--	$(GNATMAKE) -c $(ADA_INCLUDES) gnatdll --GCC="$(CC) $(ALL_ADAFLAGS)"
--	$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatdll
--	$(GNATLINK) -v gnatdll -o $@ --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
--
--../../vxaddr2line$(exeext): ../stamp-tools
--	$(GNATMAKE) -c  $(ADA_INCLUDES) vxaddr2line --GCC="$(CC) $(ALL_ADAFLAGS)"
--	$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) vxaddr2line
--	$(GNATLINK) -v vxaddr2line -o $@ --GCC="$(GCC_LINK)" ../targext.o $(CLIB)
--
--gnatmake-re: ../stamp-tools
--	$(GNATMAKE) -j0 $(ADA_INCLUDES) -u sdefault --GCC="$(CC) $(MOST_ADA_FLAGS)"
--	$(GNATMAKE) -j0 -c $(ADA_INCLUDES) gnatmake --GCC="$(CC) $(ALL_ADAFLAGS)"
--	$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatmake
--	$(GNATLINK) -v gnatmake -o ../../gnatmake$(exeext) \
--		--GCC="$(GCC_LINK)" $(TOOLS_LIBS)
--
--# Note the use of the "mv" command in order to allow gnatlink to be linked with
--# with the former version of gnatlink itself which cannot override itself.
--# gnatlink-re cannot be run at the same time as gnatmake-re, hence the
--# dependency
--gnatlink-re: ../stamp-tools gnatmake-re
--	$(GNATMAKE) -j0 -c $(ADA_INCLUDES) gnatlink --GCC="$(CC) $(ALL_ADAFLAGS)"
--	$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatlink
--	$(GNATLINK) -v gnatlink -o ../../gnatlinknew$(exeext) \
--		    --GCC="$(GCC_LINK)" $(TOOLS_LIBS)
--	$(MV)  ../../gnatlinknew$(exeext)  ../../gnatlink$(exeext)
--
--# Needs to be built with CC=gcc
--# Since the RTL should be built with the latest compiler, remove the
--#  stamp target in the parent directory whenever gnat1 is rebuilt
--
--# Likewise for the tools
--../../gnatmake$(exeext): $(P) b_gnatm.o $(GNATMAKE_OBJS)
--	+$(GCC_LINK) $(ALL_CFLAGS) -o $@ b_gnatm.o $(GNATMAKE_OBJS) $(TOOLS_LIBS) $(TOOLS1_LIBS)
--
--../../gnatlink$(exeext): $(P) b_gnatl.o $(GNATLINK_OBJS)
--	+$(GCC_LINK) $(ALL_CFLAGS) -o $@ b_gnatl.o $(GNATLINK_OBJS) $(TOOLS_LIBS) $(TOOLS1_LIBS)
--
- ../stamp-gnatlib-$(RTSDIR):
- 	@if [ ! -f stamp-gnatlib-$(RTSDIR) ] ; \
- 	then \
-@@ -2700,14 +2591,10 @@ install-gnatlib: ../stamp-gnatlib-$(RTSD
- #     Also install the .dSYM directories if they exist (these directories
- #     contain the debug information for the shared libraries on darwin)
- 	for file in gnat gnarl; do \
--	   if [ -f $(RTSDIR)/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext) ]; then \
--	      $(INSTALL) $(RTSDIR)/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext) \
-+	   if [ -f $(RTSDIR)/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext).1 ]; then \
-+	      $(INSTALL) $(RTSDIR)/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext).1 \
- 			 $(DESTDIR)$(ADA_RTL_OBJ_DIR); \
- 	   fi; \
--	   if [ -f $(RTSDIR)/lib$${file}$(soext) ]; then \
--	      $(LN_S) lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext) \
--	      $(DESTDIR)$(ADA_RTL_OBJ_DIR)/lib$${file}$(soext); \
--	   fi; \
- 	   if [ -d $(RTSDIR)/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext).dSYM ]; then \
- 	      $(CP) -r $(RTSDIR)/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext).dSYM \
- 	        $(DESTDIR)$(ADA_RTL_OBJ_DIR); \
-@@ -2720,19 +2607,7 @@ install-gnatlib: ../stamp-gnatlib-$(RTSD
- 	cd $(DESTDIR)$(ADA_INCLUDE_DIR); $(CHMOD) a-wx *.adb
- 	cd $(DESTDIR)$(ADA_INCLUDE_DIR); $(CHMOD) a-wx *.ads
- 
--../stamp-gnatlib2-$(RTSDIR):
--	$(RM) $(RTSDIR)/s-*.ali
--	$(RM) $(RTSDIR)/s-*$(objext)
--	$(RM) $(RTSDIR)/a-*.ali
--	$(RM) $(RTSDIR)/a-*$(objext)
--	$(RM) $(RTSDIR)/*.ali
--	$(RM) $(RTSDIR)/*$(objext)
--	$(RM) $(RTSDIR)/*$(arext)
--	$(RM) $(RTSDIR)/*$(soext)
--	touch ../stamp-gnatlib2-$(RTSDIR)
--	$(RM) ../stamp-gnatlib-$(RTSDIR)
--
--../stamp-gnatlib1-$(RTSDIR): Makefile ../stamp-gnatlib2-$(RTSDIR)
-+../stamp-gnatlib1-$(RTSDIR): Makefile
- 	$(RMDIR) $(RTSDIR)
- 	$(MKDIR) $(RTSDIR)
- 	$(CHMOD) u+w $(RTSDIR)
-@@ -2797,7 +2672,7 @@ $(RTSDIR)/s-oscons.ads: ../stamp-gnatlib
- 	    $(OSCONS_EXTRACT) ; \
- 	    ../bldtools/oscons/xoscons s-oscons)
- 
--gnatlib: ../stamp-gnatlib1-$(RTSDIR) ../stamp-gnatlib2-$(RTSDIR) $(RTSDIR)/s-oscons.ads
-+gnatlib: ../stamp-gnatlib1-$(RTSDIR) $(RTSDIR)/s-oscons.ads
- 	test -f $(RTSDIR)/s-oscons.ads || exit 1
- # C files
- 	$(MAKE) -C $(RTSDIR) \
-@@ -2835,32 +2710,44 @@ gnatlib: ../stamp-gnatlib1-$(RTSDIR) ../
- 
- # Warning: this target assumes that LIBRARY_VERSION has been set correctly.
- gnatlib-shared-default:
--	$(MAKE) $(FLAGS_TO_PASS) \
--             GNATLIBFLAGS="$(GNATLIBFLAGS)" \
--	     GNATLIBCFLAGS="$(GNATLIBCFLAGS) $(PICFLAG_FOR_TARGET)" \
--	     GNATLIBCFLAGS_FOR_C="$(GNATLIBCFLAGS_FOR_C) $(PICFLAG_FOR_TARGET)" \
--	     MULTISUBDIR="$(MULTISUBDIR)" \
--	     THREAD_KIND="$(THREAD_KIND)" \
--             gnatlib
--	$(RM) $(RTSDIR)/libgna*$(soext)
-+	$(MAKE) -C $(RTSDIR) \
-+		CC="`echo \"$(GCC_FOR_TARGET)\" \
-+		| sed -e 's,\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'`" \
-+	        INCLUDES="$(INCLUDES_FOR_SUBDIR) -I./../.." \
-+                CFLAGS="$(GNATLIBCFLAGS_FOR_C) $(PICFLAG_FOR_TARGET)" \
-+	        FORCE_DEBUG_ADAFLAGS="$(FORCE_DEBUG_ADAFLAGS)" \
-+		srcdir=$(fsrcdir) \
-+	        -f ../Makefile $(LIBGNAT_OBJS)
-+	$(MAKE) -C $(RTSDIR) \
-+		CC="`echo \"$(GCC_FOR_TARGET)\" \
-+		| sed -e 's,\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'`" \
-+	        ADA_INCLUDES="" \
-+                CFLAGS="$(GNATLIBCFLAGS) $(PICFLAG_FOR_TARGET)" \
-+	        ADAFLAGS="$(GNATLIBFLAGS) $(PICFLAG_FOR_TARGET)" \
-+	        FORCE_DEBUG_ADAFLAGS="$(FORCE_DEBUG_ADAFLAGS)" \
-+		srcdir=$(fsrcdir) \
-+	        -f ../Makefile \
-+	        $(GNATRTL_OBJS)
-+	$(RM) $(RTSDIR)/libgna*$(soext) $(RTSDIR)/libgna*$(soext).1
- 	cd $(RTSDIR); `echo "$(GCC_FOR_TARGET)" \
-                 | sed -e 's,\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'` -shared $(GNATLIBCFLAGS) \
- 		$(PICFLAG_FOR_TARGET) \
--		-o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
-+		-o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext).1 \
- 		$(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) \
--		$(SO_OPTS)libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
-+		$(SO_OPTS)libgnat$(hyphen)$(LIBRARY_VERSION)$(soext).1 \
- 		$(MISCLIB) -lm $(GNATLIBLDFLAGS)
- 	cd $(RTSDIR); `echo "$(GCC_FOR_TARGET)" \
-                 | sed -e 's,\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'` -shared $(GNATLIBCFLAGS) \
- 		$(PICFLAG_FOR_TARGET) \
--		-o libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
-+		-o libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext).1 \
- 		$(GNATRTL_TASKING_OBJS) \
--		$(SO_OPTS)libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
-+		$(SO_OPTS)libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext).1 \
- 		$(THREADSLIB) $(GNATLIBLDFLAGS)
--	cd $(RTSDIR); $(LN_S) libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
--		libgnat$(soext)
--	cd $(RTSDIR); $(LN_S) libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
--		libgnarl$(soext)
-+	cd $(RTSDIR); for lib in gnat gnarl; do \
-+		l=lib$${lib}$(hyphen)$(LIBRARY_VERSION)$(soext); \
-+		$(LN_S) $$l.1 $$l; \
-+	done
-+	$(CHMOD) a-wx $(RTSDIR)/*.ali
- 
- gnatlib-shared-dual:
- 	$(MAKE) $(FLAGS_TO_PASS) \
-@@ -2870,9 +2757,8 @@ gnatlib-shared-dual:
-              GNATLIBLDFLAGS="$(GNATLIBLDFLAGS)" \
- 	     MULTISUBDIR="$(MULTISUBDIR)" \
- 	     THREAD_KIND="$(THREAD_KIND)" \
--             gnatlib-shared-default
--	$(MV) $(RTSDIR)/libgna*$(soext) .
--	$(RM) ../stamp-gnatlib2-$(RTSDIR)
-+	     gnatlib
-+	$(RM) $(RTSDIR)/*.o $(RTSDIR)/*.ali
- 	$(MAKE) $(FLAGS_TO_PASS) \
-              GNATLIBFLAGS="$(GNATLIBFLAGS)" \
- 	     GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \
-@@ -2880,8 +2766,7 @@ gnatlib-shared-dual:
-              GNATLIBLDFLAGS="$(GNATLIBLDFLAGS)" \
- 	     MULTISUBDIR="$(MULTISUBDIR)" \
- 	     THREAD_KIND="$(THREAD_KIND)" \
--             gnatlib
--	$(MV) libgna*$(soext) $(RTSDIR)
-+	     gnatlib-shared-default
- 
- gnatlib-shared-dual-win32:
- 	$(MAKE) $(FLAGS_TO_PASS) \
-@@ -2891,17 +2776,15 @@ gnatlib-shared-dual-win32:
- 	     PICFLAG_FOR_TARGET="$(PICFLAG_FOR_TARGET)" \
- 	     MULTISUBDIR="$(MULTISUBDIR)" \
- 	     THREAD_KIND="$(THREAD_KIND)" \
--             gnatlib-shared-win32
--	$(MV) $(RTSDIR)/libgna*$(soext) .
--	$(RM) ../stamp-gnatlib2-$(RTSDIR)
-+             gnatlib
-+	$(RM) $(RTSDIR)/*.o $(RTSDIR)/*.ali
- 	$(MAKE) $(FLAGS_TO_PASS) \
-              GNATLIBFLAGS="$(GNATLIBFLAGS)" \
- 	     GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \
- 	     GNATLIBCFLAGS_FOR_C="$(GNATLIBCFLAGS_FOR_C)" \
- 	     MULTISUBDIR="$(MULTISUBDIR)" \
- 	     THREAD_KIND="$(THREAD_KIND)" \
--             gnatlib
--	$(MV) libgna*$(soext) $(RTSDIR)
-+             gnatlib-shared-win32
- 
- # ??? we need to add the option to support auto-import of arrays/records to
- # the GNATLIBFLAGS when this will be supported by GNAT. At this point we will
-@@ -3151,6 +3034,68 @@ targext.o : targext.c
- 		$(ALL_CPPFLAGS) $(INCLUDES_FOR_SUBDIR) \
- 		$< $(OUTPUT_OPTION)
- 
-+GCC_LINK=$(CXX) $(GCC_LINK_FLAGS) $(ADA_INCLUDES) $(LDFLAGS)
-+
-+../stamp-tools:
-+	-$(RM) tools/*
-+	-$(RMDIR) tools
-+	-$(MKDIR) tools
-+	-(cd tools; $(LN_S) ../sdefault.adb ../snames.ads ../snames.adb .)
-+	-$(foreach PAIR,$(TOOLS_TARGET_PAIRS), \
-+	          $(RM) tools/$(word 1,$(subst <, ,$(PAIR)));\
-+	          $(LN_S) $(fsrcpfx)ada/$(word 2,$(subst <, ,$(PAIR))) \
-+	                tools/$(word 1,$(subst <, ,$(PAIR)));)
-+	touch ../stamp-tools
-+
-+gnatmake-re: ../stamp-tools
-+	$(GNATMAKE) -j0 $(ADA_INCLUDES) -u sdefault --GCC="$(CC) $(MOST_ADA_FLAGS)"
-+	$(GNATMAKE) -j0 -c $(ADA_INCLUDES) gnatmake --GCC="$(CC) $(ALL_ADAFLAGS)"
-+	$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatmake
-+	$(GNATLINK) -v gnatmake -o ../../gnatmake$(exeext) \
-+		$(TOOLS_LIBS) $(LDFLAGS)
-+
-+# Note the use of the "mv" command in order to allow gnatlink to be linked with
-+# with the former version of gnatlink itself which cannot override itself.
-+# gnatlink-re cannot be run at the same time as gnatmake-re, hence the
-+# dependency
-+gnatlink-re: ../stamp-tools gnatmake-re
-+	$(GNATMAKE) -j0 -c $(ADA_INCLUDES) gnatlink --GCC="$(CC) $(ALL_ADAFLAGS)"
-+	$(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatlink
-+	$(GNATLINK) -v gnatlink -o ../../gnatlinknew$(exeext) \
-+		$(TOOLS_LIBS) $(LDFLAGS)
-+	$(MV)  ../../gnatlinknew$(exeext)  ../../gnatlink$(exeext)
-+
-+# Likewise for the tools
-+../../gnatmake$(exeext): $(P) b_gnatm.o $(GNATMAKE_OBJS)
-+	+$(GCC_LINK) $(ALL_CFLAGS) -o $@ b_gnatm.o $(GNATMAKE_OBJS) $(TOOLS_LIBS)
-+
-+../../gnatlink$(exeext): $(P) b_gnatl.o $(GNATLINK_OBJS)
-+	+$(GCC_LINK) $(ALL_CFLAGS) -o $@ b_gnatl.o $(GNATLINK_OBJS) $(TOOLS_LIBS)
-+
-+common-tools: ../stamp-tools
-+	$(GNATMAKE) -j0 -c -b $(ADA_INCLUDES) \
-+	  --GNATBIND="$(GNATBIND)" --GCC="$(CC) $(ALL_ADAFLAGS)" \
-+	  gnatchop gnatcmd gnatkr gnatls gnatprep gnatxref gnatfind gnatname \
-+	  gnatclean -bargs $(ADA_INCLUDES) $(GNATBIND_FLAGS)
-+	$(GNATLINK) -v gnatcmd -o ../../gnat$(exeext) \
-+		$(TOOLS_LIBS) $(LDFLAGS)
-+	$(GNATLINK) -v gnatchop -o ../../gnatchop$(exeext) \
-+		$(TOOLS_LIBS) $(LDFLAGS)
-+	$(GNATLINK) -v gnatkr -o ../../gnatkr$(exeext) \
-+		$(TOOLS_LIBS) $(LDFLAGS)
-+	$(GNATLINK) -v gnatls -o ../../gnatls$(exeext) \
-+		$(TOOLS_LIBS) $(LDFLAGS)
-+	$(GNATLINK) -v gnatprep -o ../../gnatprep$(exeext) \
-+		$(TOOLS_LIBS) $(LDFLAGS)
-+	$(GNATLINK) -v gnatxref -o ../../gnatxref$(exeext) \
-+		$(TOOLS_LIBS) $(LDFLAGS)
-+	$(GNATLINK) -v gnatfind -o ../../gnatfind$(exeext) \
-+		$(TOOLS_LIBS) $(LDFLAGS)
-+	$(GNATLINK) -v gnatname -o ../../gnatname$(exeext) \
-+		$(TOOLS_LIBS) $(LDFLAGS)
-+	$(GNATLINK) -v gnatclean -o ../../gnatclean$(exeext) \
-+		$(TOOLS_LIBS) $(LDFLAGS)
-+
- # In GNU Make, ignore whether `stage*' exists.
- .PHONY: stage1 stage2 stage3 stage4 clean realclean TAGS bootstrap
- .PHONY: risky-stage1 risky-stage2 risky-stage3 risky-stage4
-Index: b/src/gnattools/Makefile.in
-===================================================================
---- a/src/gnattools/Makefile.in
-+++ b/src/gnattools/Makefile.in
-@@ -52,7 +52,7 @@ WARN_CFLAGS = @warn_cflags@
- ADA_CFLAGS=@ADA_CFLAGS@
- 
- # Variables for gnattools.
--ADAFLAGS= -gnatpg -gnata
-+ADAFLAGS= -gnatn
- 
- # For finding the GCC build dir, which is used far too much
- GCC_DIR=../gcc
-@@ -70,28 +70,168 @@ INCLUDES_FOR_SUBDIR = -iquote . -iquote
- ADA_INCLUDES_FOR_SUBDIR = -I. -I$(fsrcdir)/ada
- 
- CXX_LFLAGS = \
-- -B../../../$(target_noncanonical)/libstdc++-v3/src/.libs \
-- -B../../../$(target_noncanonical)/libstdc++-v3/libsupc++/.libs \
-- -L../../../$(target_noncanonical)/libstdc++-v3/src/.libs \
-- -L../../../$(target_noncanonical)/libstdc++-v3/libsupc++/.libs
-+ -B../$(target_noncanonical)/libstdc++-v3/src/.libs \
-+ -B../$(target_noncanonical)/libstdc++-v3/libsupc++/.libs \
-+ -L../$(target_noncanonical)/libstdc++-v3/src/.libs \
-+ -L../$(target_noncanonical)/libstdc++-v3/libsupc++/.libs \
-+ -L../$(target_noncanonical)/libatomic/.libs
-+
-+CFLAGS=-O2 -Wall
-+ADA_CFLAGS=-O2 -gnatn
-+ADA_INCLUDES=-nostdinc -I- -I. -I../gcc/ada/rts \
-+     -I../$(target_noncanonical)/libgnatvsn -I../$(target_noncanonical)/libgnatprj
-+LIB_VERSION=$(strip $(shell grep ' Library_Version :' \
-+              ../$(target_noncanonical)/libgnatvsn/gnatvsn.ads | sed -e 's/.*"\(.*\)".*/\1/'))
-+SHARED_ADA_LIBS := -L../gcc/ada/rts -lgnat-$(LIB_VERSION)
-+SHARED_ADA_LIBS += -L../$(target_noncanonical)/libgnatvsn -lgnatvsn
-+SHARED_ADA_LIBS += -L../$(target_noncanonical)/libgnatprj -lgnatprj
-+STATIC_ADA_LIBS := ../gcc/ada/rts/libgnat.a
-+STATIC_GCC_LIBS := ../gcc/libcommon-target.a ../gcc/libcommon.a ../libcpp/libcpp.a \
-+../libbacktrace/.libs/libbacktrace.a ../libiberty/libiberty.a
-+
-+# We will use the just-built compiler to compile and link everything.
-+GCC=../gcc/xgcc -B../gcc/ -no-pie
-+GXX=../gcc/xg++ -B../gcc/ -no-pie
-+
-+# File lists
-+# ----------
-+
-+# File associations set by configure
-+EXTRA_GNATTOOLS = @EXTRA_GNATTOOLS@
-+TOOLS_TARGET_PAIRS = @TOOLS_TARGET_PAIRS@
-+
-+# Stage 1 builds xgcc and gnatbind; we can use them to build
-+# gnatmake-static and gnatlink-static, then use gnatmake-static and
-+# gnatlink-static to build the other tools.  The reason we first build
-+# statically-linked versions of gnatmake and gnatlink is so we can run
-+# them with confidence on all build platforms, without LD_LIBRARY_PATH
-+# or some such variable.
-+
-+# The tools we will build using gnatmake-static and gnatlink-static.
-+TOOLS := gnat gnatbind gnatchop gnatclean gnatfind gnatkr gnatls gnatlink
-+TOOLS += gnatmake gnatname gnatprep gnatxref
-+
-+# Since we don't have gnatmake, we must specify the full list of
-+# object files necessary to build gnatmake and gnatlink.
-+GNATLINK_OBJS = \
-+gnatlink.o \
-+indepsw.o \
-+validsw.o \
-+link.o
-+
-+GNATMAKE_OBJS = \
-+aspects.o \
-+errout.o \
-+fname-sf.o \
-+gnatmake.o \
-+make.o \
-+makeusg.o \
-+mlib-prj.o \
-+osint-m.o \
-+restrict.o \
-+sem_aux.o \
-+usage.o \
-+validsw.o \
-+link.o \
-+$(EXTRA_GNATMAKE_OBJS)
-+
-+EXTRA_TOOLS_OBJS = \
-+bcheck.o \
-+binde.o \
-+bindgen.o \
-+bindusg.o \
-+clean.o \
-+gprep.o \
-+makegpr.o \
-+osint-b.o \
-+osint-l.o \
-+prep.o \
-+prj-makr.o \
-+prj-pp.o \
-+switch-b.o \
-+vms_cmds.o \
-+vms_conv.o \
-+vms_data.o \
-+xr_tabls.o \
-+xref_lib.o
-+
-+OBJECTS = $(GNATLINK_OBJS) $(GNATMAKE_OBJS) $(EXTRA_TOOLS_OBJS)
-+
-+# Makefile targets
-+# ----------------
-+
-+.PHONY: gnattools gnattools-native gnattools-cross regnattools
-+gnattools: @default_gnattools_target@
-+
-+BODIES := $(foreach f,$(OBJECTS),$(wildcard $(patsubst %.o, at srcdir@/../gcc/ada/%.adb,$(f))))
-+SPECS  := $(foreach f,$(OBJECTS),$(wildcard $(patsubst %.o, at srcdir@/../gcc/ada/%.ads,$(f))))
-+
-+$(notdir $(SPECS) $(BODIES)): stamp-gnattools-sources
-+
-+stamp-gnattools-sources:
-+	for file in $(BODIES) $(SPECS); do \
-+	   $(LN_S) -f $$file .; \
-+	done
-+	rm -f sdefault.adb; $(LN_S) ../gcc/ada/sdefault.adb .
-+	$(foreach PAIR,$(TOOLS_TARGET_PAIRS), \
-+	          rm -f $(word 1,$(subst <, ,$(PAIR)));\
-+	          $(LN_S) @srcdir@/../gcc/ada/$(word 2,$(subst <, ,$(PAIR))) \
-+	                  $(word 1,$(subst <, ,$(PAIR)));)
-+	touch $@
-+
-+gnattools-native: ../gcc/ada/rts/libgnat-$(LIB_VERSION).so
-+gnattools-native: ../$(target_noncanonical)/libgnatvsn/libgnatvsn.so
-+gnattools-native: stamp-gnattools-sources
-+gnattools-native: $(TOOLS)
-+	cp -lpf $(TOOLS) ../gcc
-+
-+$(TOOLS) gnatcmd: | gnatmake-static gnatlink-static
-+
-+vpath %.c @srcdir@/../gcc/ada:@srcdir@/../gcc
-+vpath %.h @srcdir@/../gcc/ada
-+
-+# gnatlink
-+
-+gnatlink-static: $(GNATLINK_OBJS) b_gnatl.o
-+	$(GXX) -o $@ $^ \
-+	  ../$(target_noncanonical)/libgnatprj/libgnatprj.a \
-+	  ../$(target_noncanonical)/libgnatvsn/libgnatvsn.a \
-+	  ../gcc/ada/rts/libgnat.a $(STATIC_GCC_LIBS) $(CXX_LFLAGS) $(LDFLAGS)
-+
-+gnatlink: $(GNATLINK_OBJS) b_gnatl.o
-+	$(GXX) -o $@ $^ $(SHARED_ADA_LIBS) $(STATIC_GCC_LIBS) $(CXX_LFLAGS) $(LDFLAGS)
-+
-+b_gnatl.adb: $(GNATLINK_OBJS)
-+	../gcc/gnatbind -o $@ $(ADA_INCLUDES) gnatlink.ali
-+
-+# gnatmake
-+
-+gnatmake-static: $(GNATMAKE_OBJS) b_gnatm.o
-+	$(GXX) -o $@ $(ADA_CFLAGS) $^ \
-+	  ../$(target_noncanonical)/libgnatprj/libgnatprj.a \
-+	  ../$(target_noncanonical)/libgnatvsn/libgnatvsn.a \
-+	  $(STATIC_ADA_LIBS) $(STATIC_GCC_LIBS) $(CXX_LFLAGS) $(LDFLAGS)
-+
-+gnatmake: $(GNATMAKE_OBJS) b_gnatm.o
-+	$(GXX) -o $@ $(ADA_CFLAGS) $^ $(SHARED_ADA_LIBS) $(STATIC_GCC_LIBS) $(CXX_LFLAGS) $(LDFLAGS)
-+
-+b_gnatm.adb: $(GNATMAKE_OBJS)
-+	../gcc/gnatbind -o $@ $(ADA_INCLUDES) gnatmake.ali
-+
-+# Other tools
-+gnat: gnatcmd
-+	cp -lp $< $@
-+
-+gnatbind gnatchop gnatclean gnatcmd gnatfind gnatkr gnatls gnatname gnatprep \
-+gnatxref: link.o
-+	if [ ! -f $@.adb ] ; then $(LN_S) ../../src/gcc/ada/$@.ad[bs] .; fi
-+	./gnatmake-static -c -b $@ $(ADA_CFLAGS) $(ADA_INCLUDES) \
-+	   --GCC="$(GCC)" \
-+	   --GNATBIND=../gcc/gnatbind
-+	./gnatlink-static -o $@ $@.ali $^ \
-+	   $(ADA_INCLUDES) $(SHARED_ADA_LIBS) $(STATIC_GCC_LIBS) $(CXX_LFLAGS) $(LDFLAGS) \
-+	   --GCC="$(GXX) $(ADA_INCLUDES)"
- 
--# Variables for gnattools, native
--TOOLS_FLAGS_TO_PASS_NATIVE= \
--	"CC=../../xgcc -B../../" \
--	"CXX=../../xg++ -B../../ $(CXX_LFLAGS)" \
--	"CFLAGS=$(CFLAGS) $(WARN_CFLAGS)" \
--	"LDFLAGS=$(LDFLAGS)" \
--	"ADAFLAGS=$(ADAFLAGS)" \
--	"ADA_CFLAGS=$(ADA_CFLAGS)" \
--	"INCLUDES=$(INCLUDES_FOR_SUBDIR)" \
--	"ADA_INCLUDES=-I- -I../rts $(ADA_INCLUDES_FOR_SUBDIR)"\
--	"exeext=$(exeext)" \
--	"fsrcdir=$(fsrcdir)" \
--	"srcdir=$(fsrcdir)" \
--	"GNATMAKE=../../gnatmake" \
--	"GNATLINK=../../gnatlink" \
--	"GNATBIND=../../gnatbind" \
--	"TOOLSCASE=native"
- 
- # Variables for regnattools
- TOOLS_FLAGS_TO_PASS_RE= \
-@@ -184,20 +324,12 @@ $(GCC_DIR)/stamp-tools:
- 	                $(GCC_DIR)/ada/tools/$(word 1,$(subst <, ,$(PAIR)));)
- 	touch $(GCC_DIR)/stamp-tools
- 
--# gnatmake/link tools cannot always be built with gnatmake/link for bootstrap 
--# reasons: gnatmake should be built with a recent compiler, a recent compiler
--# may not generate ALI files compatible with an old gnatmake so it is important
--# to be able to build gnatmake without a version of gnatmake around. Once 
--# everything has been compiled once, gnatmake can be recompiled with itself 
--# (see target regnattools) 
--gnattools-native: $(GCC_DIR)/stamp-tools $(GCC_DIR)/stamp-gnatlib-rts
--	# gnattools1
--	$(MAKE) -C $(GCC_DIR)/ada/tools -f ../Makefile \
--	  $(TOOLS_FLAGS_TO_PASS_NATIVE) \
--	  ../../gnatmake$(exeext) ../../gnatlink$(exeext)
--	# gnattools2
--	$(MAKE) -C $(GCC_DIR)/ada/tools -f ../Makefile \
--	  $(TOOLS_FLAGS_TO_PASS_NATIVE) common-tools
-+%.o: %.adb
-+	$(GCC) -c -o $@ $< $(ADA_CFLAGS) $(ADA_INCLUDES)
-+
-+%.o: %.ads
-+	$(GCC) -c -o $@ $< $(ADA_CFLAGS) $(ADA_INCLUDES)
-+
- 
- # gnatmake/link can be built with recent gnatmake/link if they are available.
- # This is especially convenient for building cross tools or for rebuilding
diff --git a/debian/patches/ada-libgnatprj.diff b/debian/patches/ada-libgnatprj.diff
deleted file mode 100644
index 3ce8b46..0000000
--- a/debian/patches/ada-libgnatprj.diff
+++ /dev/null
@@ -1,1991 +0,0 @@
-t
-# DP: - Introduce a new shared library named libgnatprj, containing
-# DP:   the GNAT project file manager licensed under the pure GPL, for
-# DP:   use in GNAT tools, GLADE and GPS.  Link the GNAT tools against
-# DP:   this new library.
-
-# This patch seems large, but the hunks in Makefile.in are actually
-# generated from Makefile.def using autogen.
-
-# !!! Must be applied after ada-libgnatvsn.dpatch
-
-Index: b/src/gcc/ada/gcc-interface/config-lang.in
-===================================================================
---- a/src/gcc/ada/gcc-interface/config-lang.in
-+++ b/src/gcc/ada/gcc-interface/config-lang.in
-@@ -34,8 +34,8 @@ gtfiles="\$(srcdir)/ada/gcc-interface/ad
- 
- outputs="ada/gcc-interface/Makefile ada/Makefile"
- 
--target_libs="target-libada target-libgnatvsn"
--lang_dirs="libada libgnatvsn gnattools"
-+target_libs="target-libada target-libgnatvsn target-libgnatprj"
-+lang_dirs="libada libgnatvsn libgnatprj gnattools"
- 
- # Ada is not enabled by default for the time being.
- build_by_default=no
-Index: b/src/libgnatprj/Makefile.in
-===================================================================
---- /dev/null
-+++ b/src/libgnatprj/Makefile.in
-@@ -0,0 +1,180 @@
-+# Makefile for libgnatprj.
-+#   Copyright (c) 2006 Ludovic Brenta <ludovic at ludovic-brenta.org>
-+#
-+# This file is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+# 
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+# 
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-+
-+# Default target; must be first.
-+all: libgnatprj
-+
-+.SUFFIXES:
-+
-+CPUS := $(shell getconf _NPROCESSORS_ONLN)
-+LIB_VERSION := $(strip $(shell grep ' Library_Version :' \
-+                 @srcdir@/../gcc/ada/gnatvsn.ads | \
-+	         sed -e 's/.*"\(.*\)".*/\1/'))
-+GCC=$(CC)
-+GPP=$(CXX)
-+LIBGNAT_JUST_BUILT := -nostdinc -I../../gcc/ada/rts
-+LIBGNATVSN := -I../libgnatvsn
-+CFLAGS := -g -O2
-+ADAFLAGS := -g -O2 -gnatn
-+BASEVER := $(shell cat @srcdir@/../gcc/BASE-VER)
-+DEVPHASE := $(shell cat @srcdir@/../gcc/DEV-PHASE)
-+DATESTAMP := $(shell cat @srcdir@/../gcc/DATESTAMP)
-+TOOLS_TARGET_PAIRS := @TOOLS_TARGET_PAIRS@
-+LN_S := @LN_S@
-+
-+ifneq (@build@, at host@)
-+   CFLAGS += -b @host@
-+endif
-+
-+.PHONY: libgnatprj install
-+libgnatprj: libgnatprj.so.$(LIB_VERSION) libgnatprj.a
-+
-+# Here we list one file per Ada unit: the body file if the unit has a
-+# body, the spec file otherwise.
-+PRJ_SOURCES := ali.adb ali-util.adb butil.adb binderr.adb errout.adb \
-+erroutc.adb errutil.adb err_vars.ads fname-uf.adb fmap.adb impunit.adb \
-+lib-util.adb makeutl.adb mlib.adb mlib-fil.adb mlib-tgt.adb \
-+mlib-tgt-specific.adb mlib-utl.adb osint.adb osint-c.adb prj.adb prj-attr.adb \
-+prj-attr-pm.adb prj-com.ads prj-conf.adb prj-dect.adb prj-env.adb prj-err.adb \
-+prj-ext.adb prj-makr.adb prj-nmsc.adb prj-pars.adb prj-part.adb prj-pp.adb \
-+prj-proc.adb prj-strt.adb prj-tree.adb prj-util.adb restrict.adb rident.ads \
-+scng.adb sfn_scan.adb sinfo-cn.adb sinput-c.adb sinput-p.adb style.adb \
-+styleg.adb stylesw.adb switch.adb switch-m.adb targparm.adb tempdir.adb
-+
-+# Source files generated in build/gcc/ada, not src/gcc/ada.
-+GENERATED_SOURCES := sdefault.adb
-+
-+SOURCES := $(PRJ_SOURCES) $(GENERATED_SOURCES)
-+
-+OBJECTS := $(patsubst %.ads,%.o,$(SOURCES:.adb=.o))
-+
-+# Add some object files compiled from C sources.  prefix.o requires
-+# some objects from libiberty and from gcc.
-+OBJECTS += link.o prefix.o
-+
-+# These object files have already been built, both PIC and non-PIC.
-+# prefix.o depends on them.
-+LIBIBERTY_OBJECTS := concat.o filename_cmp.o lrealpath.o safe-ctype.o xexit.o xmalloc.o xstrdup.o
-+
-+vpath %.c @srcdir@ @srcdir@/../gcc @srcdir@/../gcc/common @srcdir@/../gcc/ada
-+
-+libgnatprj.so.$(LIB_VERSION): $(addprefix obj-shared/,$(OBJECTS))
-+	: # Make libgnatprj.so
-+	$(GCC) -o $@ -shared -fPIC -Wl,--soname,$@ -Wl,--no-allow-shlib-undefined \
-+	   $^ $(addprefix ../libiberty/pic/,$(LIBIBERTY_OBJECTS)) \
-+	   -L../../gcc/ada/rts -lgnat-$(LIB_VERSION) \
-+	   -L../libgnatvsn -lgnatvsn $(LDFLAGS)
-+	$(LN_S) -f libgnatprj.so.$(LIB_VERSION) libgnatprj.so
-+	chmod a=r obj-shared/*.ali
-+# Make the .ali files, but not the .o files, visible to the gnat tools.
-+	cp -lp obj-shared/*.ali .
-+
-+$(addprefix obj-shared/,$(OBJECTS)): | stamp-libgnatprj-sources obj-shared
-+
-+obj-shared/%.o: %.adb
-+	$(GCC) -c -fPIC $(ADAFLAGS) $(LIBGNAT_JUST_BUILT) $(LIBGNATVSN) -DUSED_FOR_TARGET $< -o $@
-+
-+obj-shared/%.o: %.ads
-+	$(GCC) -c -fPIC $(ADAFLAGS) $(LIBGNAT_JUST_BUILT) $(LIBGNATVSN) -DUSED_FOR_TARGET $< -o $@
-+
-+obj-shared/%.o: %.c
-+	$(GPP) -c -fPIC $(CFLAGS) -DHAVE_CONFIG_H -pedantic \
-+	   -I. -I at srcdir@/../gcc -I at srcdir@/../include -I at srcdir@/../libcpp/include -I../../gcc -DUSED_FOR_TARGET \
-+	   $< -o $@
-+
-+obj-shared/prefix.o: @srcdir@/../gcc/prefix.c
-+	$(GPP) -c -fPIC $(CFLAGS) -DPREFIX=\"@prefix@\" -DBASEVER=\"$(BASEVER)\" \
-+	   -I. -I at srcdir@/../gcc -I at srcdir@/../include -I../../gcc -I at srcdir@/../libcpp/include -DUSED_FOR_TARGET \
-+	   $< -o $@
-+
-+obj-shared:
-+	-mkdir $@
-+
-+libgnatprj.a: $(addprefix obj-static/,$(OBJECTS))
-+	: # Make libgnatprj.a
-+	ar rc $@ $^ $(addprefix ../libiberty/,$(LIBIBERTY_OBJECTS))
-+	ranlib $@
-+
-+$(addprefix obj-static/,$(OBJECTS)): | stamp-libgnatprj-sources obj-static
-+
-+obj-static/%.o: %.adb
-+	$(GCC) -c $(ADAFLAGS) $(LIBGNAT_JUST_BUILT) $(LIBGNATVSN) -DUSED_FOR_TARGET $< -o $@
-+
-+obj-static/%.o: %.ads
-+	$(GCC) -c $(ADAFLAGS) $(LIBGNAT_JUST_BUILT) $(LIBGNATVSN) -DUSED_FOR_TARGET $< -o $@
-+
-+obj-static/%.o: %.c
-+	$(GPP) -c $(CFLAGS) -DHAVE_CONFIG_H -pedantic \
-+	   -I. -I at srcdir@/../gcc -I at srcdir@/../include -I at srcdir@/../libcpp/include -I../../gcc -DUSED_FOR_TARGET \
-+	   $< -o $@
-+
-+obj-static/prefix.o: @srcdir@/../gcc/prefix.c
-+	$(GPP) -c $(CFLAGS) -DPREFIX=\"@prefix@\" -DBASEVER=\"$(BASEVER)\" \
-+	   -I. -I at srcdir@/../gcc -I at srcdir@/../include -I../../gcc -I at srcdir@/../libcpp/include -DUSED_FOR_TARGET \
-+	   $< -o $@
-+
-+obj-static:
-+	-mkdir $@
-+
-+$(SOURCES): stamp-libgnatprj-sources
-+
-+stamp-libgnatprj-sources:
-+	for file in $(PRJ_SOURCES); do \
-+	   ads=$$(echo $$file | sed 's/\.adb/.ads/'); \
-+	   if [ -f @srcdir@/../gcc/ada/$$file -a ! -L $$file ] ; then $(LN_S) @srcdir@/../gcc/ada/$$file .; fi; \
-+	   if [ -f @srcdir@/../gcc/ada/$$ads -a ! -L $$ads ] ; then $(LN_S) @srcdir@/../gcc/ada/$$ads .; fi; \
-+	done
-+	for file in $(GENERATED_SOURCES); do \
-+	   ads=$$(echo $$file | sed 's/\.adb/.ads/'); \
-+	   if [ -f ../../gcc/ada/$$file -a ! -L $$file ] ; then $(LN_S) ../../gcc/ada/$$file .; fi; \
-+	   if [ -f ../../gcc/ada/$$ads -a ! -L $$ads ] ; then $(LN_S) ../../gcc/ada/$$ads .; \
-+	   else \
-+	      if [ -f @srcdir@/../gcc/ada/$$ads -a ! -L $$ads ] ; then $(LN_S) @srcdir@/../gcc/ada/$$ads .; fi; \
-+	   fi; \
-+	done
-+	$(foreach PAIR,$(TOOLS_TARGET_PAIRS), \
-+	          rm -f $(word 1,$(subst <, ,$(PAIR)));\
-+	          $(LN_S) @srcdir@/../gcc/ada/$(word 2,$(subst <, ,$(PAIR))) \
-+	                  $(word 1,$(subst <, ,$(PAIR)));)
-+	touch $@
-+
-+# Generate a list of source files (.ads and .adb) to install.  Almost
-+# all of them are in src/gcc/ada, but some are generated during build
-+# and are in build/gcc/ada.
-+BODIES := $(filter %.adb,$(PRJ_SOURCES))
-+SPECS := $(filter %.ads,$(PRJ_SOURCES)) $(patsubst %.adb,%.ads,$(BODIES) $(GENERATED_SOURCES))
-+SOURCES_TO_INSTALL := \
-+$(addprefix  @srcdir@/../gcc/ada/,$(SPECS) $(BODIES)) \
-+$(addprefix ../../gcc/ada/,$(GENERATED_SOURCES))
-+
-+libdir = @libdir@
-+
-+install: libgnatprj
-+	$(INSTALL_DATA) libgnatprj.a $(DESTDIR)$(libdir)
-+	$(INSTALL_DATA) libgnatprj.so.$(LIB_VERSION) $(DESTDIR)$(libdir)
-+	cd $(DESTDIR)$(libdir); ln -sf libgnatprj.so.$(LIB_VERSION) libgnatprj.so
-+	mkdir -p $(DESTDIR)$(prefix)/share/ada/adainclude/gnatprj
-+	$(INSTALL_DATA) $(SOURCES_TO_INSTALL) \
-+	   $(DESTDIR)$(prefix)/share/ada/adainclude/gnatprj
-+	mkdir -p $(DESTDIR)$(prefix)/lib/ada/adalib/gnatprj
-+	$(INSTALL) -m 0444 obj-shared/*.ali \
-+	   $(DESTDIR)$(prefix)/lib/ada/adalib/gnatprj
-+	chmod a=r $(DESTDIR)$(prefix)/lib/ada/adalib/gnatprj/*.ali
-+
-+.PHONY: clean
-+clean:
-+	rm -rf *.ali obj-static obj-shared libgnatprj* *.adb *.ads stamp*
-Index: b/src/libgnatprj/targetm.c
-===================================================================
---- /dev/null
-+++ b/src/libgnatprj/targetm.c
-@@ -0,0 +1,7 @@
-+#include "config.h"
-+#include "system.h"
-+#include "coretypes.h"
-+#include "common/common-target.h"
-+#include "common/common-target-def.h"
-+
-+struct gcc_targetm_common targetm_common = TARGETM_COMMON_INITIALIZER;
-Index: b/src/Makefile.def
-===================================================================
---- a/src/Makefile.def
-+++ b/src/Makefile.def
-@@ -190,6 +190,13 @@ target_modules = { module= libgnatvsn; n
- 		   missing= TAGS;
- 		   missing= install-info;
- 		   missing= installcheck; };
-+target_modules = { module= libgnatprj; no_check=true;
-+		   missing= info;
-+		   missing= dvi;
-+		   missing= html;
-+		   missing= TAGS;
-+		   missing= install-info;
-+		   missing= installcheck; };
- target_modules = { module= libgomp; bootstrap= true; lib_path=.libs; };
- target_modules = { module= libitm; lib_path=.libs; };
- target_modules = { module= libatomic; lib_path=.libs; };
-@@ -389,8 +396,12 @@ dependencies = { module=all-fixincludes;
- dependencies = { module=all-target-libada; on=all-gcc; };
- dependencies = { module=all-gnattools; on=all-target-libada; };
- dependencies = { module=all-gnattools; on=all-target-libgnatvsn; };
-+dependencies = { module=all-gnattools; on=all-target-libgnatprj; };
- dependencies = { module=all-target-libgnatvsn; on=all-target-libada; };
-+dependencies = { module=all-target-libgnatprj; on=all-target-libgnatvsn; };
-+dependencies = { module=all-target-libgnatprj; on=all-target-libiberty; };
- dependencies = { module=all-gnattools; on=all-target-libstdc++-v3; };
-+dependencies = { module=all-target-libgnatvsn; on=all-target-libstdc++-v3; };
- 
- // Depending on the specific configuration, the LTO plugin will either use the
- // generic libiberty build or the specific build for linker plugins.
-Index: b/src/configure.ac
-===================================================================
---- a/src/configure.ac
-+++ b/src/configure.ac
-@@ -177,6 +177,7 @@ target_libraries="target-libgcc \
- 		target-libada \
- 		${target_libiberty} \
- 		target-libgnatvsn \
-+		target-libgnatprj \
- 		target-libgo"
- 
- # these tools are built using the target libraries, and are intended to
-@@ -461,7 +462,7 @@ AC_ARG_ENABLE(libada,
- ENABLE_LIBADA=$enableval,
- ENABLE_LIBADA=yes)
- if test "${ENABLE_LIBADA}" != "yes" ; then
--  noconfigdirs="$noconfigdirs target-libgnatvsn gnattools"
-+  noconfigdirs="$noconfigdirs target-libgnatvsn target-libgnatprj gnattools"
- fi
- 
- AC_ARG_ENABLE(libssp,
-Index: b/src/libgnatprj/configure.ac
-===================================================================
---- /dev/null
-+++ b/src/libgnatprj/configure.ac
-@@ -0,0 +1,557 @@
-+# Configure script for libada.
-+#   Copyright 2003, 2004 Free Software Foundation, Inc.
-+#
-+# This file is free software; you can redistribute it and/or modify it
-+# under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+# General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+
-+AC_INIT
-+AC_PREREQ([2.63])
-+
-+AC_CONFIG_SRCDIR([Makefile.in])
-+
-+# Start of actual configure tests
-+
-+AC_PROG_INSTALL
-+
-+AC_CANONICAL_BUILD
-+AC_CANONICAL_HOST
-+AC_CANONICAL_TARGET
-+
-+GCC_NO_EXECUTABLES
-+AC_PROG_CC
-+AC_GNU_SOURCE
-+AC_PROG_CPP_WERROR
-+
-+AC_PROG_CC_C_O
-+# autoconf is lame and doesn't give us any substitution variable for this.
-+if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" = no"; then
-+  NO_MINUS_C_MINUS_O=yes
-+else
-+  OUTPUT_OPTION='-o $@'
-+fi
-+AC_SUBST(NO_MINUS_C_MINUS_O)
-+AC_SUBST(OUTPUT_OPTION)
-+
-+AC_C_CONST
-+AC_C_INLINE
-+AC_C_BIGENDIAN
-+
-+dnl When we start using libtool:
-+dnl AM_PROG_LIBTOOL
-+
-+dnl When we start using automake:
-+dnl AM_CONFIG_HEADER(config.h:config.in)
-+AC_CONFIG_HEADER(config.h:config.in)
-+
-+sinclude(../config/acx.m4)
-+ACX_NONCANONICAL_TARGET
-+
-+# Need to pass this down for now :-P
-+AC_PROG_LN_S
-+
-+# It's OK to check for header files.  Although the compiler may not be
-+# able to link anything, it had better be able to at least compile
-+# something.
-+AC_CHECK_HEADERS(sys/file.h sys/param.h limits.h stdlib.h malloc.h string.h unistd.h strings.h sys/time.h time.h sys/resource.h sys/stat.h sys/mman.h fcntl.h alloca.h sys/pstat.h sys/sysmp.h sys/sysinfo.h machine/hal_sysinfo.h sys/table.h sys/sysctl.h sys/systemcfg.h stdint.h stdio_ext.h process.h sys/prctl.h)
-+AC_HEADER_SYS_WAIT
-+AC_HEADER_TIME
-+
-+# Determine sizes of some types.
-+AC_CHECK_SIZEOF([int])
-+AC_CHECK_SIZEOF([long])
-+AC_CHECK_SIZEOF([size_t])
-+
-+AC_TYPE_INTPTR_T
-+AC_TYPE_UINTPTR_T
-+AC_TYPE_SSIZE_T
-+
-+# Given the above check, we always have uintptr_t or a fallback
-+# definition.  So define HAVE_UINTPTR_T in case any imported code
-+# relies on it.
-+AC_DEFINE(HAVE_UINTPTR_T, 1, [Define if you have the \`uintptr_t' type.])
-+
-+AC_TYPE_PID_T
-+
-+# This is the list of functions which libiberty will provide if they
-+# are not available on the host.
-+
-+funcs="asprintf"
-+funcs="$funcs atexit"
-+funcs="$funcs basename"
-+funcs="$funcs bcmp"
-+funcs="$funcs bcopy"
-+funcs="$funcs bsearch"
-+funcs="$funcs bzero"
-+funcs="$funcs calloc"
-+funcs="$funcs clock"
-+funcs="$funcs ffs"
-+funcs="$funcs getcwd"
-+funcs="$funcs getpagesize"
-+funcs="$funcs gettimeofday"
-+funcs="$funcs index"
-+funcs="$funcs insque"
-+funcs="$funcs memchr"
-+funcs="$funcs memcmp"
-+funcs="$funcs memcpy"
-+funcs="$funcs memmem"
-+funcs="$funcs memmove"
-+funcs="$funcs mempcpy"
-+funcs="$funcs memset"
-+funcs="$funcs mkstemps"
-+funcs="$funcs putenv"
-+funcs="$funcs random"
-+funcs="$funcs rename"
-+funcs="$funcs rindex"
-+funcs="$funcs setenv"
-+funcs="$funcs snprintf"
-+funcs="$funcs sigsetmask"
-+funcs="$funcs stpcpy"
-+funcs="$funcs stpncpy"
-+funcs="$funcs strcasecmp"
-+funcs="$funcs strchr"
-+funcs="$funcs strdup"
-+funcs="$funcs strncasecmp"
-+funcs="$funcs strndup"
-+funcs="$funcs strnlen"
-+funcs="$funcs strrchr"
-+funcs="$funcs strstr"
-+funcs="$funcs strtod"
-+funcs="$funcs strtol"
-+funcs="$funcs strtoul"
-+funcs="$funcs strtoll"
-+funcs="$funcs strtoull"
-+funcs="$funcs strverscmp"
-+funcs="$funcs tmpnam"
-+funcs="$funcs vasprintf"
-+funcs="$funcs vfprintf"
-+funcs="$funcs vprintf"
-+funcs="$funcs vsnprintf"
-+funcs="$funcs vsprintf"
-+funcs="$funcs waitpid"
-+funcs="$funcs setproctitle"
-+
-+# Also in the old function.def file: alloca, vfork, getopt.
-+
-+vars="sys_errlist sys_nerr sys_siglist"
-+
-+checkfuncs="__fsetlocking canonicalize_file_name dup3 getrlimit getrusage \
-+ getsysinfo gettimeofday on_exit psignal pstat_getdynamic pstat_getstatic \
-+ realpath setrlimit sbrk spawnve spawnvpe strerror strsignal sysconf sysctl \
-+ sysmp table times wait3 wait4"
-+
-+# These are neither executed nor required, but they help keep
-+# autoheader happy without adding a bunch of text to acconfig.h.
-+if test "x" = "y"; then
-+  AC_CHECK_FUNCS(asprintf atexit \
-+    basename bcmp bcopy bsearch bzero \
-+    calloc canonicalize_file_name clock \
-+    dup3 \
-+    ffs __fsetlocking \
-+    getcwd getpagesize getrlimit getrusage getsysinfo gettimeofday \
-+    index insque \
-+    memchr memcmp memcpy memmem memmove memset mkstemps \
-+    on_exit \
-+    psignal pstat_getdynamic pstat_getstatic putenv \
-+    random realpath rename rindex \
-+    sbrk setenv setproctitle setrlimit sigsetmask snprintf spawnve spawnvpe \
-+     stpcpy stpncpy strcasecmp strchr strdup \
-+     strerror strncasecmp strndup strnlen strrchr strsignal strstr strtod \
-+     strtol strtoul strtoll strtoull strverscmp sysconf sysctl sysmp \
-+    table times tmpnam \
-+    vasprintf vfprintf vprintf vsprintf \
-+    wait3 wait4 waitpid)
-+  AC_CHECK_DECLS([basename, ffs, asprintf, vasprintf, snprintf, vsnprintf, strtol, strtoul, strtoll, strtoull])
-+  AC_DEFINE(HAVE_SYS_ERRLIST, 1, [Define if you have the sys_errlist variable.])
-+  AC_DEFINE(HAVE_SYS_NERR,    1, [Define if you have the sys_nerr variable.])
-+  AC_DEFINE(HAVE_SYS_SIGLIST, 1, [Define if you have the sys_siglist variable.])
-+fi
-+
-+# For each of these functions, if the host does not provide the
-+# function we want to put FN.o in LIBOBJS, and if the host does
-+# provide the function, we want to define HAVE_FN in config.h.
-+
-+setobjs=
-+CHECK=
-+if test -n "${with_target_subdir}"; then
-+
-+  # We are being configured as a target library.  AC_REPLACE_FUNCS
-+  # may not work correctly, because the compiler may not be able to
-+  # link executables.  Note that we may still be being configured
-+  # native.
-+
-+  # If we are being configured for newlib, we know which functions
-+  # newlib provide and which ones we will be expected to provide.
-+
-+  if test "x${with_newlib}" = "xyes"; then
-+    AC_LIBOBJ([asprintf])
-+    AC_LIBOBJ([basename])
-+    AC_LIBOBJ([insque])
-+    AC_LIBOBJ([random])
-+    AC_LIBOBJ([strdup])
-+    AC_LIBOBJ([vasprintf])
-+
-+    for f in $funcs; do
-+      case "$f" in
-+	asprintf | basename | insque | random | strdup | vasprintf)
-+	  ;;
-+	*)
-+	  n=HAVE_`echo $f | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-+	  AC_DEFINE_UNQUOTED($n)
-+	  ;;
-+      esac
-+    done
-+
-+    # newlib doesnt provide any of the variables in $vars, so we
-+    # dont have to check them here.
-+
-+    # Of the functions in $checkfuncs, newlib only has strerror.
-+    AC_DEFINE(HAVE_STRERROR)
-+
-+    setobjs=yes
-+
-+  fi
-+
-+  # If we are being configured for Mingw, we know which functions
-+  # Mingw provides and which ones we will be expected to provide.
-+
-+  case "${host}" in
-+  *-*-mingw*)
-+    AC_LIBOBJ([asprintf])
-+    AC_LIBOBJ([basename])
-+    AC_LIBOBJ([bcmp])
-+    AC_LIBOBJ([bcopy])
-+    AC_LIBOBJ([bzero])
-+    AC_LIBOBJ([clock])
-+    AC_LIBOBJ([ffs])
-+    AC_LIBOBJ([getpagesize])
-+    AC_LIBOBJ([index])
-+    AC_LIBOBJ([insque])
-+    AC_LIBOBJ([mempcpy])
-+    AC_LIBOBJ([mkstemps])
-+    AC_LIBOBJ([random])
-+    AC_LIBOBJ([rindex])
-+    AC_LIBOBJ([sigsetmask])
-+    AC_LIBOBJ([stpcpy])
-+    AC_LIBOBJ([stpncpy])
-+    AC_LIBOBJ([strndup])
-+    AC_LIBOBJ([strnlen])
-+    AC_LIBOBJ([strverscmp])
-+    AC_LIBOBJ([vasprintf])
-+    AC_LIBOBJ([waitpid])
-+
-+    for f in $funcs; do
-+      case "$f" in
-+	asprintf | basename | bcmp | bcopy | bzero | clock | ffs | getpagesize | index | insque | mempcpy | mkstemps | random | rindex | sigsetmask | stpcpy | stpncpy | strdup | strndup | strnlen | strverscmp | vasprintf | waitpid)
-+	  ;;
-+	*)
-+	  n=HAVE_`echo $f | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-+	  AC_DEFINE_UNQUOTED($n)
-+	  ;;
-+      esac
-+    done
-+
-+    # Mingw doesnt provide any of the variables in $vars, so we
-+    # dont have to check them here.
-+
-+    # Of the functions in $checkfuncs, Mingw only has strerror.
-+    AC_DEFINE(HAVE_STRERROR)
-+
-+    setobjs=yes
-+    ;;
-+
-+  *-*-msdosdjgpp)
-+    AC_LIBOBJ([vasprintf])
-+    AC_LIBOBJ([vsnprintf])
-+    AC_LIBOBJ([snprintf])
-+    AC_LIBOBJ([asprintf])
-+
-+    for f in atexit basename bcmp bcopy bsearch bzero calloc clock ffs \
-+             getcwd getpagesize getrusage gettimeofday \
-+             index insque memchr memcmp memcpy memmove memset psignal \
-+             putenv random rename rindex sbrk setenv stpcpy strcasecmp \
-+             strchr strdup strerror strncasecmp strrchr strstr strtod \
-+             strtol strtoul sysconf times tmpnam vfprintf vprintf \
-+             vsprintf waitpid
-+    do
-+      n=HAVE_`echo $f | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-+      AC_DEFINE_UNQUOTED($n)
-+    done
-+
-+
-+    setobjs=yes
-+    ;;
-+
-+  esac
-+
-+else
-+
-+   # Not a target library, so we set things up to run the test suite.
-+   CHECK=really-check
-+
-+fi
-+
-+AC_SUBST(CHECK)
-+AC_SUBST(target_header_dir)
-+
-+case "${host}" in
-+  *-*-cygwin* | *-*-mingw*)
-+    AC_DEFINE(HAVE_SYS_ERRLIST)
-+    AC_DEFINE(HAVE_SYS_NERR)
-+    ;;
-+esac
-+
-+if test -z "${setobjs}"; then
-+  case "${host}" in
-+
-+  *-*-vxworks*)
-+    # Handle VxWorks configuration specially, since on VxWorks the
-+    # libraries are actually on the target board, not in the file
-+    # system.
-+    AC_LIBOBJ([basename])
-+    AC_LIBOBJ([getpagesize])
-+    AC_LIBOBJ([insque])
-+    AC_LIBOBJ([random])
-+    AC_LIBOBJ([strcasecmp])
-+    AC_LIBOBJ([strncasecmp])
-+    AC_LIBOBJ([strdup])
-+    AC_LIBOBJ([vfork])
-+    AC_LIBOBJ([waitpid])
-+    AC_LIBOBJ([vasprintf])
-+    for f in $funcs; do
-+      case "$f" in
-+	basename | getpagesize | insque | random | strcasecmp)
-+	  ;;
-+	strncasecmp | strdup | vfork | waitpid | vasprintf)
-+	  ;;
-+	*)
-+	  n=HAVE_`echo $f | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-+	  AC_DEFINE_UNQUOTED($n)
-+	  ;;
-+      esac
-+    done
-+
-+    # VxWorks doesn't provide any of the variables in $vars, so we
-+    # don't have to check them here.
-+
-+    # Of the functions in $checkfuncs, VxWorks only has strerror.
-+    AC_DEFINE(HAVE_STRERROR)
-+
-+    setobjs=yes
-+    ;;
-+
-+  esac
-+fi
-+
-+if test -z "${setobjs}"; then
-+
-+  case "${host}" in
-+
-+  *-*-android*)
-+    # On android, getpagesize is defined in unistd.h as a static inline
-+    # function, which AC_CHECK_FUNCS does not handle properly.
-+    ac_cv_func_getpagesize=yes
-+    ;;
-+
-+  *-*-mingw32*)
-+    # Under mingw32, sys_nerr and sys_errlist exist, but they are
-+    # macros, so the test below won't find them.
-+    libgnatprj_cv_var_sys_nerr=yes
-+    libgnatprj_cv_var_sys_errlist=yes
-+    ;;
-+
-+  *-*-msdosdjgpp*)
-+    # vfork and fork are stubs.
-+    ac_cv_func_vfork_works=no
-+    ;;
-+
-+  *-*-uwin*)
-+    # Under some versions of uwin, vfork is notoriously buggy and the test 
-+    # can hang configure; on other versions, vfork exists just as a stub.
-+    # FIXME: This should be removed once vfork in uwin's runtime is fixed.
-+    ac_cv_func_vfork_works=no
-+    # Under uwin 2.0+, sys_nerr and sys_errlist exist, but they are
-+    # macros (actually, these are imported from a DLL, but the end effect 
-+    # is the same), so the test below won't find them.
-+    libgnatprj_cv_var_sys_nerr=yes
-+    libgnatprj_cv_var_sys_errlist=yes
-+    ;;
-+
-+  *-*-*vms*)
-+    # Under VMS, vfork works very different than on Unix. The standard test 
-+    # won't work, and it isn't easily adaptable. It makes more sense to
-+    # just force it.
-+    ac_cv_func_vfork_works=yes
-+    ;;
-+
-+  esac
-+
-+  # We haven't set the list of objects yet.  Use the standard autoconf
-+  # tests.  This will only work if the compiler works.
-+  AC_ISC_POSIX
-+  AC_REPLACE_FUNCS($funcs)
-+  AC_FUNC_FORK
-+  if test $ac_cv_func_vfork_works = no; then
-+    AC_LIBOBJ([vfork])
-+  fi
-+  # We only need _doprnt if we might use it to implement v*printf.
-+  if test $ac_cv_func_vprintf != yes \
-+     || test $ac_cv_func_vfprintf != yes \
-+     || test $ac_cv_func_vsprintf != yes; then
-+    AC_REPLACE_FUNCS(_doprnt)
-+  else
-+    AC_CHECK_FUNCS(_doprnt)
-+  fi
-+
-+  for v in $vars; do
-+    AC_MSG_CHECKING([for $v])
-+    AC_CACHE_VAL(libgnatprj_cv_var_$v,
-+      [AC_LINK_IFELSE([AC_LANG_PROGRAM([[int *p;]],[[extern int $v []; p = $v;]])],
-+		      [eval "libgnatprj_cv_var_$v=yes"],
-+		      [eval "libgnatprj_cv_var_$v=no"])])
-+    if eval "test \"`echo '$libgnatprj_cv_var_'$v`\" = yes"; then
-+      AC_MSG_RESULT(yes)
-+      n=HAVE_`echo $v | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-+      AC_DEFINE_UNQUOTED($n)
-+    else
-+      AC_MSG_RESULT(no)
-+    fi
-+  done
-+
-+  # special check for _system_configuration because AIX <4.3.2 do not
-+  # contain the `physmem' member.
-+  AC_MSG_CHECKING([for external symbol _system_configuration])
-+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/systemcfg.h>]],
-+			[[double x = _system_configuration.physmem;]])],
-+    [AC_MSG_RESULT([yes])
-+    AC_DEFINE(HAVE__SYSTEM_CONFIGURATION, 1,
-+	      [Define if you have the _system_configuration variable.])],
-+    [AC_MSG_RESULT([no])])
-+
-+  AC_CHECK_FUNCS($checkfuncs)
-+  AC_CHECK_DECLS([basename, ffs, asprintf, vasprintf, snprintf, vsnprintf])
-+  AC_CHECK_DECLS([calloc, getenv, getopt, malloc, realloc, sbrk])
-+  AC_CHECK_DECLS([strtol, strtoul, strtoll, strtoull])
-+  AC_CHECK_DECLS([strverscmp])
-+fi
-+
-+# Determine x_ada_cflags
-+case $host in
-+  hppa*) x_ada_cflags=-mdisable-indexing ;;
-+  *) x_ada_cflags= ;;
-+esac
-+AC_SUBST([x_ada_cflags])
-+
-+# Determine what to build for 'gnattools'
-+if test $build = $target ; then
-+  # Note that build=target is almost certainly the wrong test; FIXME
-+  default_gnattools_target="gnattools-native"
-+else
-+  default_gnattools_target="gnattools-cross"
-+fi
-+AC_SUBST([default_gnattools_target])
-+
-+# Target-specific stuff (defaults)
-+TOOLS_TARGET_PAIRS=
-+AC_SUBST(TOOLS_TARGET_PAIRS)
-+
-+# Per-target case statement
-+# ---/----------------------
-+case "${target}" in
-+  alpha*-dec-vx*) # Unlike all other Vxworks
-+    ;;
-+  m68k*-wrs-vx* \
-+  | powerpc*-wrs-vxworks \
-+  | sparc*-wrs-vx* \
-+  | *86-wrs-vxworks \
-+  | xscale*-wrs-vx* \
-+  | xscale*-wrs-coff \
-+  | mips*-wrs-vx*)
-+    TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-specific-vxworks.adb"
-+    ;;
-+  sparc-sun-solaris*)
-+    TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-specific-solaris.adb"
-+    ;;
-+  *86-*-solaris2*)
-+    TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-specific-solaris.adb"
-+    ;;
-+  *86-*-linux* \
-+  | aarch64*-*-linux* \
-+  | arm*-*-linux* \
-+  | powerpc*-*-linux* \
-+  | *ia64-*-linux* \
-+  | alpha*-*-linux* \
-+  | sparc*-*-linux* \
-+  | hppa*-*-linux* \
-+  | mips*-*-linux* \
-+  | m68k-*-linux \
-+  | *x86_64-*-linux* \
-+  | *86-*-kfreebsd*-gnu \
-+  | *86-*-gnu \
-+  | *x86_64-*-kfreebsd*-gnu )
-+    TOOLS_TARGET_PAIRS="\
-+    mlib-tgt-specific.adb<mlib-tgt-specific-linux.adb"
-+    ;;
-+  s390*-*-linux*)
-+    TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-specific-linux.adb"
-+    ;;
-+  *86-*-freebsd*)
-+    TOOLS_TARGET_PAIRS="\
-+    mlib-tgt-specific.adb<mlib-tgt-specific-linux.adb"
-+    ;;
-+  mips-sgi-irix*)
-+    TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-specific-irix.adb"
-+    ;;
-+  hppa*-hp-hpux10*) # Unlike hpux11
-+    ;;
-+  hppa*-hp-hpux11*)
-+    TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-specific-hpux.adb"
-+    ;;
-+  *-ibm-aix*)
-+    TOOLS_TARGET_PAIRS="\
-+    mlib-tgt-specific.adb<mlib-tgt-specific-aix.adb"
-+    ;;
-+  alpha*-dec-osf*)
-+    TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-specific-tru64.adb"
-+    ;;
-+  alpha*-dec-vms* | alpha*-dec-openvms* | alpha*-dec-vms* \
-+  | alpha*-hp-vms* | alpha*-hp-openvms* | alpha*-hp-vms*)
-+    TOOLS_TARGET_PAIRS="\
-+    mlib-tgt-specific.adb<mlib-tgt-specific-vms-alpha.adb \
-+    symbols.adb<symbols-vms.adb \
-+    symbols-processing.adb<symbols-processing-vms-alpha.adb"
-+    ;;
-+  ia64*-dec-vms* | ia64*-dec-openvms* | ia64*-dec-vms* \
-+  | ia64*-hp-vms* | ia64*-hp-openvms* | ia64*-hp-vms*)
-+    TOOLS_TARGET_PAIRS="\
-+    mlib-tgt-specific.adb<mlib-tgt-vms-ia64.adb \
-+    symbols.adb<symbols-vms.adb \
-+    symbols-processing.adb<symbols-processing-vms-ia64.adb"
-+    ;;
-+  *-*-cygwin32* | *-*-mingw32* | *-*-pe)
-+    TOOLS_TARGET_PAIRS="\
-+    mlib-tgt-specific.adb<mlib-tgt-specific-mingw.adb"
-+    ;;
-+  powerpc-*-darwin*)
-+    TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-specific-darwin.adb"
-+    ;;
-+  *-*-lynxos)
-+    TOOLS_TARGET_PAIRS="\
-+    mlib-tgt-specific.adb<mlib-tgt-specific-lynxos.adb"
-+    ;;
-+esac
-+
-+# Output: create a Makefile.
-+AC_CONFIG_FILES([Makefile])
-+
-+AC_OUTPUT
-Index: b/src/Makefile.in
-===================================================================
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -977,6 +977,7 @@ configure-target:  \
-     maybe-configure-target-rda \
-     maybe-configure-target-libada \
-     maybe-configure-target-libgnatvsn \
-+    maybe-configure-target-libgnatprj \
-     maybe-configure-target-libgomp \
-     maybe-configure-target-libitm \
-     maybe-configure-target-libatomic
-@@ -1146,6 +1147,7 @@ all-target: maybe-all-target-boehm-gc
- all-target: maybe-all-target-rda
- all-target: maybe-all-target-libada
- all-target: maybe-all-target-libgnatvsn
-+all-target: maybe-all-target-libgnatprj
- @if target-libgomp-no-bootstrap
- all-target: maybe-all-target-libgomp
- @endif target-libgomp-no-bootstrap
-@@ -1242,6 +1244,7 @@ info-target: maybe-info-target-boehm-gc
- info-target: maybe-info-target-rda
- info-target: maybe-info-target-libada
- info-target: maybe-info-target-libgnatvsn
-+info-target: maybe-info-target-libgnatprj
- info-target: maybe-info-target-libgomp
- info-target: maybe-info-target-libitm
- info-target: maybe-info-target-libatomic
-@@ -1331,6 +1334,7 @@ dvi-target: maybe-dvi-target-boehm-gc
- dvi-target: maybe-dvi-target-rda
- dvi-target: maybe-dvi-target-libada
- dvi-target: maybe-dvi-target-libgnatvsn
-+dvi-target: maybe-dvi-target-libgnatprj
- dvi-target: maybe-dvi-target-libgomp
- dvi-target: maybe-dvi-target-libitm
- dvi-target: maybe-dvi-target-libatomic
-@@ -1420,6 +1424,7 @@ pdf-target: maybe-pdf-target-boehm-gc
- pdf-target: maybe-pdf-target-rda
- pdf-target: maybe-pdf-target-libada
- pdf-target: maybe-pdf-target-libgnatvsn
-+pdf-target: maybe-pdf-target-libgnatprj
- pdf-target: maybe-pdf-target-libgomp
- pdf-target: maybe-pdf-target-libitm
- pdf-target: maybe-pdf-target-libatomic
-@@ -1509,6 +1514,7 @@ html-target: maybe-html-target-boehm-gc
- html-target: maybe-html-target-rda
- html-target: maybe-html-target-libada
- html-target: maybe-html-target-libgnatvsn
-+html-target: maybe-html-target-libgnatprj
- html-target: maybe-html-target-libgomp
- html-target: maybe-html-target-libitm
- html-target: maybe-html-target-libatomic
-@@ -1598,6 +1604,7 @@ TAGS-target: maybe-TAGS-target-boehm-gc
- TAGS-target: maybe-TAGS-target-rda
- TAGS-target: maybe-TAGS-target-libada
- TAGS-target: maybe-TAGS-target-libgnatvsn
-+TAGS-target: maybe-TAGS-target-libgnatprj
- TAGS-target: maybe-TAGS-target-libgomp
- TAGS-target: maybe-TAGS-target-libitm
- TAGS-target: maybe-TAGS-target-libatomic
-@@ -1687,6 +1694,7 @@ install-info-target: maybe-install-info-
- install-info-target: maybe-install-info-target-rda
- install-info-target: maybe-install-info-target-libada
- install-info-target: maybe-install-info-target-libgnatvsn
-+install-info-target: maybe-install-info-target-libgnatprj
- install-info-target: maybe-install-info-target-libgomp
- install-info-target: maybe-install-info-target-libitm
- install-info-target: maybe-install-info-target-libatomic
-@@ -1776,6 +1784,7 @@ install-pdf-target: maybe-install-pdf-ta
- install-pdf-target: maybe-install-pdf-target-rda
- install-pdf-target: maybe-install-pdf-target-libada
- install-pdf-target: maybe-install-pdf-target-libgnatvsn
-+install-pdf-target: maybe-install-pdf-target-libgnatprj
- install-pdf-target: maybe-install-pdf-target-libgomp
- install-pdf-target: maybe-install-pdf-target-libitm
- install-pdf-target: maybe-install-pdf-target-libatomic
-@@ -1865,6 +1874,7 @@ install-html-target: maybe-install-html-
- install-html-target: maybe-install-html-target-rda
- install-html-target: maybe-install-html-target-libada
- install-html-target: maybe-install-html-target-libgnatvsn
-+install-html-target: maybe-install-html-target-libgnatprj
- install-html-target: maybe-install-html-target-libgomp
- install-html-target: maybe-install-html-target-libitm
- install-html-target: maybe-install-html-target-libatomic
-@@ -1954,6 +1964,7 @@ installcheck-target: maybe-installcheck-
- installcheck-target: maybe-installcheck-target-rda
- installcheck-target: maybe-installcheck-target-libada
- installcheck-target: maybe-installcheck-target-libgnatvsn
-+installcheck-target: maybe-installcheck-target-libgnatprj
- installcheck-target: maybe-installcheck-target-libgomp
- installcheck-target: maybe-installcheck-target-libitm
- installcheck-target: maybe-installcheck-target-libatomic
-@@ -2043,6 +2054,7 @@ mostlyclean-target: maybe-mostlyclean-ta
- mostlyclean-target: maybe-mostlyclean-target-rda
- mostlyclean-target: maybe-mostlyclean-target-libada
- mostlyclean-target: maybe-mostlyclean-target-libgnatvsn
-+mostlyclean-target: maybe-mostlyclean-target-libgnatprj
- mostlyclean-target: maybe-mostlyclean-target-libgomp
- mostlyclean-target: maybe-mostlyclean-target-libitm
- mostlyclean-target: maybe-mostlyclean-target-libatomic
-@@ -2132,6 +2144,7 @@ clean-target: maybe-clean-target-boehm-g
- clean-target: maybe-clean-target-rda
- clean-target: maybe-clean-target-libada
- clean-target: maybe-clean-target-libgnatvsn
-+clean-target: maybe-clean-target-libgnatprj
- clean-target: maybe-clean-target-libgomp
- clean-target: maybe-clean-target-libitm
- clean-target: maybe-clean-target-libatomic
-@@ -2221,6 +2234,7 @@ distclean-target: maybe-distclean-target
- distclean-target: maybe-distclean-target-rda
- distclean-target: maybe-distclean-target-libada
- distclean-target: maybe-distclean-target-libgnatvsn
-+distclean-target: maybe-distclean-target-libgnatprj
- distclean-target: maybe-distclean-target-libgomp
- distclean-target: maybe-distclean-target-libitm
- distclean-target: maybe-distclean-target-libatomic
-@@ -2310,6 +2324,7 @@ maintainer-clean-target: maybe-maintaine
- maintainer-clean-target: maybe-maintainer-clean-target-rda
- maintainer-clean-target: maybe-maintainer-clean-target-libada
- maintainer-clean-target: maybe-maintainer-clean-target-libgnatvsn
-+maintainer-clean-target: maybe-maintainer-clean-target-libgnatprj
- maintainer-clean-target: maybe-maintainer-clean-target-libgomp
- maintainer-clean-target: maybe-maintainer-clean-target-libitm
- maintainer-clean-target: maybe-maintainer-clean-target-libatomic
-@@ -2455,6 +2470,7 @@ check-target:  \
-     maybe-check-target-rda \
-     maybe-check-target-libada \
-     maybe-check-target-libgnatvsn \
-+    maybe-check-target-libgnatprj \
-     maybe-check-target-libgomp \
-     maybe-check-target-libitm \
-     maybe-check-target-libatomic
-@@ -2640,6 +2656,7 @@ install-target:  \
-     maybe-install-target-rda \
-     maybe-install-target-libada \
-     maybe-install-target-libgnatvsn \
-+    maybe-install-target-libgnatprj \
-     maybe-install-target-libgomp \
-     maybe-install-target-libitm \
-     maybe-install-target-libatomic
-@@ -2749,6 +2766,7 @@ install-strip-target:  \
-     maybe-install-strip-target-rda \
-     maybe-install-strip-target-libada \
-     maybe-install-strip-target-libgnatvsn \
-+    maybe-install-strip-target-libgnatprj \
-     maybe-install-strip-target-libgomp \
-     maybe-install-strip-target-libitm \
-     maybe-install-strip-target-libatomic
-@@ -46415,6 +46433,362 @@ maintainer-clean-target-libgnatvsn:
- 
- 
- 
-+.PHONY: configure-target-libgnatprj maybe-configure-target-libgnatprj
-+maybe-configure-target-libgnatprj:
-+ at if gcc-bootstrap
-+configure-target-libgnatprj: stage_current
-+ at endif gcc-bootstrap
-+ at if target-libgnatprj
-+maybe-configure-target-libgnatprj: configure-target-libgnatprj
-+configure-target-libgnatprj: 
-+	@: $(MAKE); $(unstage)
-+	@r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	echo "Checking multilib configuration for libgnatprj..."; \
-+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgnatprj ; \
-+	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgnatprj/multilib.tmp 2> /dev/null ; \
-+	if test -r $(TARGET_SUBDIR)/libgnatprj/multilib.out; then \
-+	  if cmp -s $(TARGET_SUBDIR)/libgnatprj/multilib.tmp $(TARGET_SUBDIR)/libgnatprj/multilib.out; then \
-+	    rm -f $(TARGET_SUBDIR)/libgnatprj/multilib.tmp; \
-+	  else \
-+	    rm -f $(TARGET_SUBDIR)/libgnatprj/Makefile; \
-+	    mv $(TARGET_SUBDIR)/libgnatprj/multilib.tmp $(TARGET_SUBDIR)/libgnatprj/multilib.out; \
-+	  fi; \
-+	else \
-+	  mv $(TARGET_SUBDIR)/libgnatprj/multilib.tmp $(TARGET_SUBDIR)/libgnatprj/multilib.out; \
-+	fi; \
-+	test ! -f $(TARGET_SUBDIR)/libgnatprj/Makefile || exit 0; \
-+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgnatprj ; \
-+	$(NORMAL_TARGET_EXPORTS)  \
-+	echo Configuring in $(TARGET_SUBDIR)/libgnatprj; \
-+	cd "$(TARGET_SUBDIR)/libgnatprj" || exit 1; \
-+	case $(srcdir) in \
-+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-+	  *) topdir=`echo $(TARGET_SUBDIR)/libgnatprj/ | \
-+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-+	esac; \
-+	module_srcdir=libgnatprj; \
-+	rm -f no-such-file || : ; \
-+	CONFIG_SITE=no-such-file $(SHELL) \
-+	  $$s/$$module_srcdir/configure \
-+	  --srcdir=$${topdir}/$$module_srcdir \
-+	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-+	  --target=${target_alias}  \
-+	  || exit 1
-+ at endif target-libgnatprj
-+
-+
-+
-+
-+
-+.PHONY: all-target-libgnatprj maybe-all-target-libgnatprj
-+maybe-all-target-libgnatprj:
-+ at if gcc-bootstrap
-+all-target-libgnatprj: stage_current
-+ at endif gcc-bootstrap
-+ at if target-libgnatprj
-+TARGET-target-libgnatprj=all
-+maybe-all-target-libgnatprj: all-target-libgnatprj
-+all-target-libgnatprj: configure-target-libgnatprj
-+	@: $(MAKE); $(unstage)
-+	@r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	$(NORMAL_TARGET_EXPORTS)  \
-+	(cd $(TARGET_SUBDIR)/libgnatprj && \
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
-+		$(TARGET-target-libgnatprj))
-+ at endif target-libgnatprj
-+
-+
-+
-+
-+
-+.PHONY: check-target-libgnatprj maybe-check-target-libgnatprj
-+maybe-check-target-libgnatprj:
-+ at if target-libgnatprj
-+maybe-check-target-libgnatprj: check-target-libgnatprj
-+
-+# Dummy target for uncheckable module.
-+check-target-libgnatprj:
-+
-+ at endif target-libgnatprj
-+
-+.PHONY: install-target-libgnatprj maybe-install-target-libgnatprj
-+maybe-install-target-libgnatprj:
-+ at if target-libgnatprj
-+maybe-install-target-libgnatprj: install-target-libgnatprj
-+
-+install-target-libgnatprj: installdirs
-+	@: $(MAKE); $(unstage)
-+	@r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	$(NORMAL_TARGET_EXPORTS) \
-+	(cd $(TARGET_SUBDIR)/libgnatprj && \
-+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
-+
-+ at endif target-libgnatprj
-+
-+.PHONY: install-strip-target-libgnatprj maybe-install-strip-target-libgnatprj
-+maybe-install-strip-target-libgnatprj:
-+ at if target-libgnatprj
-+maybe-install-strip-target-libgnatprj: install-strip-target-libgnatprj
-+
-+install-strip-target-libgnatprj: installdirs
-+	@: $(MAKE); $(unstage)
-+	@r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	$(NORMAL_TARGET_EXPORTS) \
-+	(cd $(TARGET_SUBDIR)/libgnatprj && \
-+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
-+
-+ at endif target-libgnatprj
-+
-+# Other targets (info, dvi, pdf, etc.)
-+
-+.PHONY: maybe-info-target-libgnatprj info-target-libgnatprj
-+maybe-info-target-libgnatprj:
-+ at if target-libgnatprj
-+maybe-info-target-libgnatprj: info-target-libgnatprj
-+
-+# libgnatprj doesn't support info.
-+info-target-libgnatprj:
-+
-+ at endif target-libgnatprj
-+
-+.PHONY: maybe-dvi-target-libgnatprj dvi-target-libgnatprj
-+maybe-dvi-target-libgnatprj:
-+ at if target-libgnatprj
-+maybe-dvi-target-libgnatprj: dvi-target-libgnatprj
-+
-+# libgnatprj doesn't support dvi.
-+dvi-target-libgnatprj:
-+
-+ at endif target-libgnatprj
-+
-+.PHONY: maybe-pdf-target-libgnatprj pdf-target-libgnatprj
-+maybe-pdf-target-libgnatprj:
-+ at if target-libgnatprj
-+maybe-pdf-target-libgnatprj: pdf-target-libgnatprj
-+
-+pdf-target-libgnatprj: \
-+    configure-target-libgnatprj 
-+	@: $(MAKE); $(unstage)
-+	@[ -f $(TARGET_SUBDIR)/libgnatprj/Makefile ] || exit 0 ; \
-+	r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	$(NORMAL_TARGET_EXPORTS) \
-+	echo "Doing pdf in $(TARGET_SUBDIR)/libgnatprj" ; \
-+	for flag in $(EXTRA_TARGET_FLAGS); do \
-+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-+	done; \
-+	(cd $(TARGET_SUBDIR)/libgnatprj && \
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-+	          "RANLIB=$${RANLIB}" \
-+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-+	           pdf) \
-+	  || exit 1
-+
-+ at endif target-libgnatprj
-+
-+.PHONY: maybe-html-target-libgnatprj html-target-libgnatprj
-+maybe-html-target-libgnatprj:
-+ at if target-libgnatprj
-+maybe-html-target-libgnatprj: html-target-libgnatprj
-+
-+# libgnatprj doesn't support html.
-+html-target-libgnatprj:
-+
-+ at endif target-libgnatprj
-+
-+.PHONY: maybe-TAGS-target-libgnatprj TAGS-target-libgnatprj
-+maybe-TAGS-target-libgnatprj:
-+ at if target-libgnatprj
-+maybe-TAGS-target-libgnatprj: TAGS-target-libgnatprj
-+
-+# libgnatprj doesn't support TAGS.
-+TAGS-target-libgnatprj:
-+
-+ at endif target-libgnatprj
-+
-+.PHONY: maybe-install-info-target-libgnatprj install-info-target-libgnatprj
-+maybe-install-info-target-libgnatprj:
-+ at if target-libgnatprj
-+maybe-install-info-target-libgnatprj: install-info-target-libgnatprj
-+
-+# libgnatprj doesn't support install-info.
-+install-info-target-libgnatprj:
-+
-+ at endif target-libgnatprj
-+
-+.PHONY: maybe-install-pdf-target-libgnatprj install-pdf-target-libgnatprj
-+maybe-install-pdf-target-libgnatprj:
-+ at if target-libgnatprj
-+maybe-install-pdf-target-libgnatprj: install-pdf-target-libgnatprj
-+
-+install-pdf-target-libgnatprj: \
-+    configure-target-libgnatprj \
-+    pdf-target-libgnatprj 
-+	@: $(MAKE); $(unstage)
-+	@[ -f $(TARGET_SUBDIR)/libgnatprj/Makefile ] || exit 0 ; \
-+	r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	$(NORMAL_TARGET_EXPORTS) \
-+	echo "Doing install-pdf in $(TARGET_SUBDIR)/libgnatprj" ; \
-+	for flag in $(EXTRA_TARGET_FLAGS); do \
-+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-+	done; \
-+	(cd $(TARGET_SUBDIR)/libgnatprj && \
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-+	          "RANLIB=$${RANLIB}" \
-+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-+	           install-pdf) \
-+	  || exit 1
-+
-+ at endif target-libgnatprj
-+
-+.PHONY: maybe-install-html-target-libgnatprj install-html-target-libgnatprj
-+maybe-install-html-target-libgnatprj:
-+ at if target-libgnatprj
-+maybe-install-html-target-libgnatprj: install-html-target-libgnatprj
-+
-+install-html-target-libgnatprj: \
-+    configure-target-libgnatprj \
-+    html-target-libgnatprj 
-+	@: $(MAKE); $(unstage)
-+	@[ -f $(TARGET_SUBDIR)/libgnatprj/Makefile ] || exit 0 ; \
-+	r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	$(NORMAL_TARGET_EXPORTS) \
-+	echo "Doing install-html in $(TARGET_SUBDIR)/libgnatprj" ; \
-+	for flag in $(EXTRA_TARGET_FLAGS); do \
-+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-+	done; \
-+	(cd $(TARGET_SUBDIR)/libgnatprj && \
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-+	          "RANLIB=$${RANLIB}" \
-+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-+	           install-html) \
-+	  || exit 1
-+
-+ at endif target-libgnatprj
-+
-+.PHONY: maybe-installcheck-target-libgnatprj installcheck-target-libgnatprj
-+maybe-installcheck-target-libgnatprj:
-+ at if target-libgnatprj
-+maybe-installcheck-target-libgnatprj: installcheck-target-libgnatprj
-+
-+# libgnatprj doesn't support installcheck.
-+installcheck-target-libgnatprj:
-+
-+ at endif target-libgnatprj
-+
-+.PHONY: maybe-mostlyclean-target-libgnatprj mostlyclean-target-libgnatprj
-+maybe-mostlyclean-target-libgnatprj:
-+ at if target-libgnatprj
-+maybe-mostlyclean-target-libgnatprj: mostlyclean-target-libgnatprj
-+
-+mostlyclean-target-libgnatprj: 
-+	@: $(MAKE); $(unstage)
-+	@[ -f $(TARGET_SUBDIR)/libgnatprj/Makefile ] || exit 0 ; \
-+	r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	$(NORMAL_TARGET_EXPORTS) \
-+	echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgnatprj" ; \
-+	for flag in $(EXTRA_TARGET_FLAGS); do \
-+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-+	done; \
-+	(cd $(TARGET_SUBDIR)/libgnatprj && \
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-+	          "RANLIB=$${RANLIB}" \
-+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-+	           mostlyclean) \
-+	  || exit 1
-+
-+ at endif target-libgnatprj
-+
-+.PHONY: maybe-clean-target-libgnatprj clean-target-libgnatprj
-+maybe-clean-target-libgnatprj:
-+ at if target-libgnatprj
-+maybe-clean-target-libgnatprj: clean-target-libgnatprj
-+
-+clean-target-libgnatprj: 
-+	@: $(MAKE); $(unstage)
-+	@[ -f $(TARGET_SUBDIR)/libgnatprj/Makefile ] || exit 0 ; \
-+	r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	$(NORMAL_TARGET_EXPORTS) \
-+	echo "Doing clean in $(TARGET_SUBDIR)/libgnatprj" ; \
-+	for flag in $(EXTRA_TARGET_FLAGS); do \
-+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-+	done; \
-+	(cd $(TARGET_SUBDIR)/libgnatprj && \
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-+	          "RANLIB=$${RANLIB}" \
-+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-+	           clean) \
-+	  || exit 1
-+
-+ at endif target-libgnatprj
-+
-+.PHONY: maybe-distclean-target-libgnatprj distclean-target-libgnatprj
-+maybe-distclean-target-libgnatprj:
-+ at if target-libgnatprj
-+maybe-distclean-target-libgnatprj: distclean-target-libgnatprj
-+
-+distclean-target-libgnatprj: 
-+	@: $(MAKE); $(unstage)
-+	@[ -f $(TARGET_SUBDIR)/libgnatprj/Makefile ] || exit 0 ; \
-+	r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	$(NORMAL_TARGET_EXPORTS) \
-+	echo "Doing distclean in $(TARGET_SUBDIR)/libgnatprj" ; \
-+	for flag in $(EXTRA_TARGET_FLAGS); do \
-+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-+	done; \
-+	(cd $(TARGET_SUBDIR)/libgnatprj && \
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-+	          "RANLIB=$${RANLIB}" \
-+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-+	           distclean) \
-+	  || exit 1
-+
-+ at endif target-libgnatprj
-+
-+.PHONY: maybe-maintainer-clean-target-libgnatprj maintainer-clean-target-libgnatprj
-+maybe-maintainer-clean-target-libgnatprj:
-+ at if target-libgnatprj
-+maybe-maintainer-clean-target-libgnatprj: maintainer-clean-target-libgnatprj
-+
-+maintainer-clean-target-libgnatprj: 
-+	@: $(MAKE); $(unstage)
-+	@[ -f $(TARGET_SUBDIR)/libgnatprj/Makefile ] || exit 0 ; \
-+	r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	$(NORMAL_TARGET_EXPORTS) \
-+	echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libgnatprj" ; \
-+	for flag in $(EXTRA_TARGET_FLAGS); do \
-+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-+	done; \
-+	(cd $(TARGET_SUBDIR)/libgnatprj && \
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-+	          "RANLIB=$${RANLIB}" \
-+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-+	           maintainer-clean) \
-+	  || exit 1
-+
-+ at endif target-libgnatprj
-+
-+
-+
-+
-+
- .PHONY: configure-target-libgomp maybe-configure-target-libgomp
- maybe-configure-target-libgomp:
- @if gcc-bootstrap
-@@ -50620,6 +50994,7 @@ configure-target-boehm-gc: stage_last
- configure-target-rda: stage_last
- configure-target-libada: stage_last
- configure-target-libgnatvsn: stage_last
-+configure-target-libgnatprj: stage_last
- configure-stage1-target-libgomp: maybe-all-stage1-gcc
- configure-stage2-target-libgomp: maybe-all-stage2-gcc
- configure-stage3-target-libgomp: maybe-all-stage3-gcc
-@@ -50656,6 +51031,7 @@ configure-target-boehm-gc: maybe-all-gcc
- configure-target-rda: maybe-all-gcc
- configure-target-libada: maybe-all-gcc
- configure-target-libgnatvsn: maybe-all-gcc
-+configure-target-libgnatprj: maybe-all-gcc
- configure-target-libgomp: maybe-all-gcc
- configure-target-libitm: maybe-all-gcc
- configure-target-libatomic: maybe-all-gcc
-@@ -51030,8 +51406,12 @@ all-stagefeedback-fixincludes: maybe-all
- all-target-libada: maybe-all-gcc
- all-gnattools: maybe-all-target-libada
- all-gnattools: maybe-all-target-libgnatvsn
-+all-gnattools: maybe-all-target-libgnatprj
- all-target-libgnatvsn: maybe-all-target-libada
-+all-target-libgnatprj: maybe-all-target-libgnatvsn
-+all-target-libgnatprj: maybe-all-target-libiberty
- all-gnattools: maybe-all-target-libstdc++-v3
-+all-target-libgnatvsn: maybe-all-target-libstdc++-v3
- all-lto-plugin: maybe-all-libiberty
- 
- all-stage1-lto-plugin: maybe-all-stage1-libiberty
-@@ -51628,6 +52008,7 @@ configure-target-boehm-gc: maybe-all-tar
- configure-target-rda: maybe-all-target-libgcc
- configure-target-libada: maybe-all-target-libgcc
- configure-target-libgnatvsn: maybe-all-target-libgcc
-+configure-target-libgnatprj: maybe-all-target-libgcc
- configure-target-libgomp: maybe-all-target-libgcc
- configure-target-libitm: maybe-all-target-libgcc
- configure-target-libatomic: maybe-all-target-libgcc
-@@ -51684,6 +52065,8 @@ configure-target-libada: maybe-all-targe
- 
- configure-target-libgnatvsn: maybe-all-target-newlib maybe-all-target-libgloss
- 
-+configure-target-libgnatprj: maybe-all-target-newlib maybe-all-target-libgloss
-+
- configure-target-libgomp: maybe-all-target-newlib maybe-all-target-libgloss
- 
- configure-target-libitm: maybe-all-target-newlib maybe-all-target-libgloss
-Index: b/src/libgnatprj/config.in
-===================================================================
---- /dev/null
-+++ b/src/libgnatprj/config.in
-@@ -0,0 +1,565 @@
-+/* config.in.  Generated from configure.ac by autoheader.  */
-+
-+/* Define if building universal (internal helper macro) */
-+#undef AC_APPLE_UNIVERSAL_BUILD
-+
-+/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
-+   This function is required for alloca.c support on those systems. */
-+#undef CRAY_STACKSEG_END
-+
-+/* Define to 1 if you have the <alloca.h> header file. */
-+#undef HAVE_ALLOCA_H
-+
-+/* Define to 1 if you have the `asprintf' function. */
-+#undef HAVE_ASPRINTF
-+
-+/* Define to 1 if you have the `atexit' function. */
-+#undef HAVE_ATEXIT
-+
-+/* Define to 1 if you have the `basename' function. */
-+#undef HAVE_BASENAME
-+
-+/* Define to 1 if you have the `bcmp' function. */
-+#undef HAVE_BCMP
-+
-+/* Define to 1 if you have the `bcopy' function. */
-+#undef HAVE_BCOPY
-+
-+/* Define to 1 if you have the `bsearch' function. */
-+#undef HAVE_BSEARCH
-+
-+/* Define to 1 if you have the `bzero' function. */
-+#undef HAVE_BZERO
-+
-+/* Define to 1 if you have the `calloc' function. */
-+#undef HAVE_CALLOC
-+
-+/* Define to 1 if you have the `canonicalize_file_name' function. */
-+#undef HAVE_CANONICALIZE_FILE_NAME
-+
-+/* Define to 1 if you have the `clock' function. */
-+#undef HAVE_CLOCK
-+
-+/* Define to 1 if you have the declaration of `asprintf', and to 0 if you
-+   don't. */
-+#undef HAVE_DECL_ASPRINTF
-+
-+/* Define to 1 if you have the declaration of `basename(char *)', and to 0 if
-+   you don't. */
-+#undef HAVE_DECL_BASENAME
-+
-+/* Define to 1 if you have the declaration of `calloc', and to 0 if you don't.
-+   */
-+#undef HAVE_DECL_CALLOC
-+
-+/* Define to 1 if you have the declaration of `ffs', and to 0 if you don't. */
-+#undef HAVE_DECL_FFS
-+
-+/* Define to 1 if you have the declaration of `getenv', and to 0 if you don't.
-+   */
-+#undef HAVE_DECL_GETENV
-+
-+/* Define to 1 if you have the declaration of `getopt', and to 0 if you don't.
-+   */
-+#undef HAVE_DECL_GETOPT
-+
-+/* Define to 1 if you have the declaration of `malloc', and to 0 if you don't.
-+   */
-+#undef HAVE_DECL_MALLOC
-+
-+/* Define to 1 if you have the declaration of `realloc', and to 0 if you
-+   don't. */
-+#undef HAVE_DECL_REALLOC
-+
-+/* Define to 1 if you have the declaration of `sbrk', and to 0 if you don't.
-+   */
-+#undef HAVE_DECL_SBRK
-+
-+/* Define to 1 if you have the declaration of `snprintf', and to 0 if you
-+   don't. */
-+#undef HAVE_DECL_SNPRINTF
-+
-+/* Define to 1 if you have the declaration of `strtol', and to 0 if you don't.
-+   */
-+#undef HAVE_DECL_STRTOL
-+
-+/* Define to 1 if you have the declaration of `strtoll', and to 0 if you
-+   don't. */
-+#undef HAVE_DECL_STRTOLL
-+
-+/* Define to 1 if you have the declaration of `strtoul', and to 0 if you
-+   don't. */
-+#undef HAVE_DECL_STRTOUL
-+
-+/* Define to 1 if you have the declaration of `strtoull', and to 0 if you
-+   don't. */
-+#undef HAVE_DECL_STRTOULL
-+
-+/* Define to 1 if you have the declaration of `strverscmp', and to 0 if you
-+   don't. */
-+#undef HAVE_DECL_STRVERSCMP
-+
-+/* Define to 1 if you have the declaration of `vasprintf', and to 0 if you
-+   don't. */
-+#undef HAVE_DECL_VASPRINTF
-+
-+/* Define to 1 if you have the declaration of `vsnprintf', and to 0 if you
-+   don't. */
-+#undef HAVE_DECL_VSNPRINTF
-+
-+/* Define to 1 if you have the `dup3' function. */
-+#undef HAVE_DUP3
-+
-+/* Define to 1 if you have the <fcntl.h> header file. */
-+#undef HAVE_FCNTL_H
-+
-+/* Define to 1 if you have the `ffs' function. */
-+#undef HAVE_FFS
-+
-+/* Define to 1 if you have the `fork' function. */
-+#undef HAVE_FORK
-+
-+/* Define to 1 if you have the `getcwd' function. */
-+#undef HAVE_GETCWD
-+
-+/* Define to 1 if you have the `getpagesize' function. */
-+#undef HAVE_GETPAGESIZE
-+
-+/* Define to 1 if you have the `getrlimit' function. */
-+#undef HAVE_GETRLIMIT
-+
-+/* Define to 1 if you have the `getrusage' function. */
-+#undef HAVE_GETRUSAGE
-+
-+/* Define to 1 if you have the `getsysinfo' function. */
-+#undef HAVE_GETSYSINFO
-+
-+/* Define to 1 if you have the `gettimeofday' function. */
-+#undef HAVE_GETTIMEOFDAY
-+
-+/* Define to 1 if you have the `index' function. */
-+#undef HAVE_INDEX
-+
-+/* Define to 1 if you have the `insque' function. */
-+#undef HAVE_INSQUE
-+
-+/* Define to 1 if the system has the type `intptr_t'. */
-+#undef HAVE_INTPTR_T
-+
-+/* Define to 1 if you have the <inttypes.h> header file. */
-+#undef HAVE_INTTYPES_H
-+
-+/* Define to 1 if you have the <limits.h> header file. */
-+#undef HAVE_LIMITS_H
-+
-+/* Define if you have the `long long' type. */
-+#undef HAVE_LONG_LONG
-+
-+/* Define to 1 if you have the <machine/hal_sysinfo.h> header file. */
-+#undef HAVE_MACHINE_HAL_SYSINFO_H
-+
-+/* Define to 1 if you have the <malloc.h> header file. */
-+#undef HAVE_MALLOC_H
-+
-+/* Define to 1 if you have the `memchr' function. */
-+#undef HAVE_MEMCHR
-+
-+/* Define to 1 if you have the `memcmp' function. */
-+#undef HAVE_MEMCMP
-+
-+/* Define to 1 if you have the `memcpy' function. */
-+#undef HAVE_MEMCPY
-+
-+/* Define to 1 if you have the `memmem' function. */
-+#undef HAVE_MEMMEM
-+
-+/* Define to 1 if you have the `memmove' function. */
-+#undef HAVE_MEMMOVE
-+
-+/* Define to 1 if you have the <memory.h> header file. */
-+#undef HAVE_MEMORY_H
-+
-+/* Define to 1 if you have the `memset' function. */
-+#undef HAVE_MEMSET
-+
-+/* Define to 1 if you have the `mkstemps' function. */
-+#undef HAVE_MKSTEMPS
-+
-+/* Define to 1 if you have a working `mmap' system call. */
-+#undef HAVE_MMAP
-+
-+/* Define to 1 if you have the `on_exit' function. */
-+#undef HAVE_ON_EXIT
-+
-+/* Define to 1 if you have the <process.h> header file. */
-+#undef HAVE_PROCESS_H
-+
-+/* Define to 1 if you have the `psignal' function. */
-+#undef HAVE_PSIGNAL
-+
-+/* Define to 1 if you have the `pstat_getdynamic' function. */
-+#undef HAVE_PSTAT_GETDYNAMIC
-+
-+/* Define to 1 if you have the `pstat_getstatic' function. */
-+#undef HAVE_PSTAT_GETSTATIC
-+
-+/* Define to 1 if you have the `putenv' function. */
-+#undef HAVE_PUTENV
-+
-+/* Define to 1 if you have the `random' function. */
-+#undef HAVE_RANDOM
-+
-+/* Define to 1 if you have the `realpath' function. */
-+#undef HAVE_REALPATH
-+
-+/* Define to 1 if you have the `rename' function. */
-+#undef HAVE_RENAME
-+
-+/* Define to 1 if you have the `rindex' function. */
-+#undef HAVE_RINDEX
-+
-+/* Define to 1 if you have the `sbrk' function. */
-+#undef HAVE_SBRK
-+
-+/* Define to 1 if you have the `setenv' function. */
-+#undef HAVE_SETENV
-+
-+/* Define to 1 if you have the `setproctitle' function. */
-+#undef HAVE_SETPROCTITLE
-+
-+/* Define to 1 if you have the `setrlimit' function. */
-+#undef HAVE_SETRLIMIT
-+
-+/* Define to 1 if you have the `sigsetmask' function. */
-+#undef HAVE_SIGSETMASK
-+
-+/* Define to 1 if you have the `snprintf' function. */
-+#undef HAVE_SNPRINTF
-+
-+/* Define to 1 if you have the `spawnve' function. */
-+#undef HAVE_SPAWNVE
-+
-+/* Define to 1 if you have the `spawnvpe' function. */
-+#undef HAVE_SPAWNVPE
-+
-+/* Define to 1 if you have the <stdint.h> header file. */
-+#undef HAVE_STDINT_H
-+
-+/* Define to 1 if you have the <stdio_ext.h> header file. */
-+#undef HAVE_STDIO_EXT_H
-+
-+/* Define to 1 if you have the <stdlib.h> header file. */
-+#undef HAVE_STDLIB_H
-+
-+/* Define to 1 if you have the `stpcpy' function. */
-+#undef HAVE_STPCPY
-+
-+/* Define to 1 if you have the `stpncpy' function. */
-+#undef HAVE_STPNCPY
-+
-+/* Define to 1 if you have the `strcasecmp' function. */
-+#undef HAVE_STRCASECMP
-+
-+/* Define to 1 if you have the `strchr' function. */
-+#undef HAVE_STRCHR
-+
-+/* Define to 1 if you have the `strdup' function. */
-+#undef HAVE_STRDUP
-+
-+/* Define to 1 if you have the `strerror' function. */
-+#undef HAVE_STRERROR
-+
-+/* Define to 1 if you have the <strings.h> header file. */
-+#undef HAVE_STRINGS_H
-+
-+/* Define to 1 if you have the <string.h> header file. */
-+#undef HAVE_STRING_H
-+
-+/* Define to 1 if you have the `strncasecmp' function. */
-+#undef HAVE_STRNCASECMP
-+
-+/* Define to 1 if you have the `strndup' function. */
-+#undef HAVE_STRNDUP
-+
-+/* Define to 1 if you have the `strnlen' function. */
-+#undef HAVE_STRNLEN
-+
-+/* Define to 1 if you have the `strrchr' function. */
-+#undef HAVE_STRRCHR
-+
-+/* Define to 1 if you have the `strsignal' function. */
-+#undef HAVE_STRSIGNAL
-+
-+/* Define to 1 if you have the `strstr' function. */
-+#undef HAVE_STRSTR
-+
-+/* Define to 1 if you have the `strtod' function. */
-+#undef HAVE_STRTOD
-+
-+/* Define to 1 if you have the `strtol' function. */
-+#undef HAVE_STRTOL
-+
-+/* Define to 1 if you have the `strtoll' function. */
-+#undef HAVE_STRTOLL
-+
-+/* Define to 1 if you have the `strtoul' function. */
-+#undef HAVE_STRTOUL
-+
-+/* Define to 1 if you have the `strtoull' function. */
-+#undef HAVE_STRTOULL
-+
-+/* Define to 1 if you have the `strverscmp' function. */
-+#undef HAVE_STRVERSCMP
-+
-+/* Define to 1 if you have the `sysconf' function. */
-+#undef HAVE_SYSCONF
-+
-+/* Define to 1 if you have the `sysctl' function. */
-+#undef HAVE_SYSCTL
-+
-+/* Define to 1 if you have the `sysmp' function. */
-+#undef HAVE_SYSMP
-+
-+/* Define if you have the sys_errlist variable. */
-+#undef HAVE_SYS_ERRLIST
-+
-+/* Define to 1 if you have the <sys/file.h> header file. */
-+#undef HAVE_SYS_FILE_H
-+
-+/* Define to 1 if you have the <sys/mman.h> header file. */
-+#undef HAVE_SYS_MMAN_H
-+
-+/* Define if you have the sys_nerr variable. */
-+#undef HAVE_SYS_NERR
-+
-+/* Define to 1 if you have the <sys/param.h> header file. */
-+#undef HAVE_SYS_PARAM_H
-+
-+/* Define to 1 if you have the <sys/prctl.h> header file. */
-+#undef HAVE_SYS_PRCTL_H
-+
-+/* Define to 1 if you have the <sys/pstat.h> header file. */
-+#undef HAVE_SYS_PSTAT_H
-+
-+/* Define to 1 if you have the <sys/resource.h> header file. */
-+#undef HAVE_SYS_RESOURCE_H
-+
-+/* Define if you have the sys_siglist variable. */
-+#undef HAVE_SYS_SIGLIST
-+
-+/* Define to 1 if you have the <sys/stat.h> header file. */
-+#undef HAVE_SYS_STAT_H
-+
-+/* Define to 1 if you have the <sys/sysctl.h> header file. */
-+#undef HAVE_SYS_SYSCTL_H
-+
-+/* Define to 1 if you have the <sys/sysinfo.h> header file. */
-+#undef HAVE_SYS_SYSINFO_H
-+
-+/* Define to 1 if you have the <sys/sysmp.h> header file. */
-+#undef HAVE_SYS_SYSMP_H
-+
-+/* Define to 1 if you have the <sys/systemcfg.h> header file. */
-+#undef HAVE_SYS_SYSTEMCFG_H
-+
-+/* Define to 1 if you have the <sys/table.h> header file. */
-+#undef HAVE_SYS_TABLE_H
-+
-+/* Define to 1 if you have the <sys/time.h> header file. */
-+#undef HAVE_SYS_TIME_H
-+
-+/* Define to 1 if you have the <sys/types.h> header file. */
-+#undef HAVE_SYS_TYPES_H
-+
-+/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
-+#undef HAVE_SYS_WAIT_H
-+
-+/* Define to 1 if you have the `table' function. */
-+#undef HAVE_TABLE
-+
-+/* Define to 1 if you have the `times' function. */
-+#undef HAVE_TIMES
-+
-+/* Define to 1 if you have the <time.h> header file. */
-+#undef HAVE_TIME_H
-+
-+/* Define to 1 if you have the `tmpnam' function. */
-+#undef HAVE_TMPNAM
-+
-+/* Define if you have the \`uintptr_t' type. */
-+#undef HAVE_UINTPTR_T
-+
-+/* Define to 1 if you have the <unistd.h> header file. */
-+#undef HAVE_UNISTD_H
-+
-+/* Define to 1 if you have the `vasprintf' function. */
-+#undef HAVE_VASPRINTF
-+
-+/* Define to 1 if you have the `vfork' function. */
-+#undef HAVE_VFORK
-+
-+/* Define to 1 if you have the <vfork.h> header file. */
-+#undef HAVE_VFORK_H
-+
-+/* Define to 1 if you have the `vfprintf' function. */
-+#undef HAVE_VFPRINTF
-+
-+/* Define to 1 if you have the `vprintf' function. */
-+#undef HAVE_VPRINTF
-+
-+/* Define to 1 if you have the `vsprintf' function. */
-+#undef HAVE_VSPRINTF
-+
-+/* Define to 1 if you have the `wait3' function. */
-+#undef HAVE_WAIT3
-+
-+/* Define to 1 if you have the `wait4' function. */
-+#undef HAVE_WAIT4
-+
-+/* Define to 1 if you have the `waitpid' function. */
-+#undef HAVE_WAITPID
-+
-+/* Define to 1 if `fork' works. */
-+#undef HAVE_WORKING_FORK
-+
-+/* Define to 1 if `vfork' works. */
-+#undef HAVE_WORKING_VFORK
-+
-+/* Define to 1 if you have the `_doprnt' function. */
-+#undef HAVE__DOPRNT
-+
-+/* Define if you have the _system_configuration variable. */
-+#undef HAVE__SYSTEM_CONFIGURATION
-+
-+/* Define to 1 if you have the `__fsetlocking' function. */
-+#undef HAVE___FSETLOCKING
-+
-+/* Define if canonicalize_file_name is not declared in system header files. */
-+#undef NEED_DECLARATION_CANONICALIZE_FILE_NAME
-+
-+/* Define if errno must be declared even when <errno.h> is included. */
-+#undef NEED_DECLARATION_ERRNO
-+
-+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-+#undef NO_MINUS_C_MINUS_O
-+
-+/* Define to the address where bug reports for this package should be sent. */
-+#undef PACKAGE_BUGREPORT
-+
-+/* Define to the full name of this package. */
-+#undef PACKAGE_NAME
-+
-+/* Define to the full name and version of this package. */
-+#undef PACKAGE_STRING
-+
-+/* Define to the one symbol short name of this package. */
-+#undef PACKAGE_TARNAME
-+
-+/* Define to the home page for this package. */
-+#undef PACKAGE_URL
-+
-+/* Define to the version of this package. */
-+#undef PACKAGE_VERSION
-+
-+/* The size of `int', as computed by sizeof. */
-+#undef SIZEOF_INT
-+
-+/* The size of `long', as computed by sizeof. */
-+#undef SIZEOF_LONG
-+
-+/* The size of `long long', as computed by sizeof. */
-+#undef SIZEOF_LONG_LONG
-+
-+/* The size of `size_t', as computed by sizeof. */
-+#undef SIZEOF_SIZE_T
-+
-+/* Define if you know the direction of stack growth for your system; otherwise
-+   it will be automatically deduced at run-time. STACK_DIRECTION > 0 => grows
-+   toward higher addresses STACK_DIRECTION < 0 => grows toward lower addresses
-+   STACK_DIRECTION = 0 => direction of growth unknown */
-+#undef STACK_DIRECTION
-+
-+/* Define to 1 if you have the ANSI C header files. */
-+#undef STDC_HEADERS
-+
-+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-+#undef TIME_WITH_SYS_TIME
-+
-+/* Define to an unsigned 64-bit type available in the compiler. */
-+#undef UNSIGNED_64BIT_TYPE
-+
-+/* Enable extensions on AIX 3, Interix.  */
-+#ifndef _ALL_SOURCE
-+# undef _ALL_SOURCE
-+#endif
-+/* Enable GNU extensions on systems that have them.  */
-+#ifndef _GNU_SOURCE
-+# undef _GNU_SOURCE
-+#endif
-+/* Enable threading extensions on Solaris.  */
-+#ifndef _POSIX_PTHREAD_SEMANTICS
-+# undef _POSIX_PTHREAD_SEMANTICS
-+#endif
-+/* Enable extensions on HP NonStop.  */
-+#ifndef _TANDEM_SOURCE
-+# undef _TANDEM_SOURCE
-+#endif
-+/* Enable general extensions on Solaris.  */
-+#ifndef __EXTENSIONS__
-+# undef __EXTENSIONS__
-+#endif
-+
-+
-+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
-+   significant byte first (like Motorola and SPARC, unlike Intel). */
-+#if defined AC_APPLE_UNIVERSAL_BUILD
-+# if defined __BIG_ENDIAN__
-+#  define WORDS_BIGENDIAN 1
-+# endif
-+#else
-+# ifndef WORDS_BIGENDIAN
-+#  undef WORDS_BIGENDIAN
-+# endif
-+#endif
-+
-+/* 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 1 if on MINIX. */
-+#undef _MINIX
-+
-+/* Define to 2 if the system does not provide POSIX.1 features except with
-+   this defined. */
-+#undef _POSIX_1_SOURCE
-+
-+/* Define to 1 if you need to in order for `stat' and other things to work. */
-+#undef _POSIX_SOURCE
-+
-+/* Define to empty if `const' does not conform to ANSI C. */
-+#undef const
-+
-+/* Define to `__inline__' or `__inline' if that's what the C compiler
-+   calls it, or to nothing if 'inline' is not supported under any name.  */
-+#ifndef __cplusplus
-+#undef inline
-+#endif
-+
-+/* Define to the type of a signed integer type wide enough to hold a pointer,
-+   if such a type exists, and if the system does not define it. */
-+#undef intptr_t
-+
-+/* Define to `int' if <sys/types.h> does not define. */
-+#undef pid_t
-+
-+/* Define to `int' if <sys/types.h> does not define. */
-+#undef ssize_t
-+
-+/* Define to the type of an unsigned integer type wide enough to hold a
-+   pointer, if such a type exists, and if the system does not define it. */
-+#undef uintptr_t
-+
-+/* Define as `fork' if `vfork' does not work. */
-+#undef vfork
-Index: b/src/gcc/prefix.c
-===================================================================
---- a/src/gcc/prefix.c
-+++ b/src/gcc/prefix.c
-@@ -70,7 +70,10 @@ License along with GCC; see the file COP
- #include <windows.h>
- #endif
- #include "prefix.h"
-+
-+#ifndef USED_FOR_TARGET
- #include "common/common-target.h"
-+#endif
- 
- static const char *std_prefix = PREFIX;
- 
-@@ -284,7 +287,11 @@ update_path (const char *path, const cha
- 	  && (p != result && IS_DIR_SEPARATOR (p[-1])))
- 	{
- 	  *p = 0;
-+#ifndef USED_FOR_TARGET
- 	  if (!targetm_common.always_strip_dotdot
-+#else
-+	  if (true
-+#endif
- 	      && access (result, X_OK) == 0)
- 	    {
- 	      *p = '.';
diff --git a/debian/patches/ada-libgnatvsn.diff b/debian/patches/ada-libgnatvsn.diff
deleted file mode 100644
index 4071d5e..0000000
--- a/debian/patches/ada-libgnatvsn.diff
+++ /dev/null
@@ -1,836 +0,0 @@
-# DP: - Introduce a new shared library named libgnatvsn, containing
-# DP:   common components of GNAT under the GNAT-Modified GPL, for
-# DP:   use in GNAT tools, ASIS, GLADE and GPS.   Link the gnat tools
-# DP:   against this new library.
-
-# This patch seems large, but the hunks in Makefile.in are actually
-# generated from Makefile.def using autogen.
-
-# !!! Must be applied after ada-link-lib.dpatch
-
-Index: b/src/libgnatvsn/configure
-===================================================================
---- /dev/null
-+++ b/src/libgnatvsn/configure
-@@ -0,0 +1,47 @@
-+#!/bin/sh
-+
-+# Minimal configure script for libgnatvsn.  We're only interested in
-+# a few parameters.
-+
-+for arg in $*; do
-+    case ${arg} in
-+	--build=*)
-+	    build=`expr ${arg} : '--build=\(.\+\)'`;;
-+	--host=*)
-+	    host=`expr ${arg} : '--host=\(.\+\)'`;;
-+	--target=*)
-+	    target=`expr ${arg} : '--target=\(.\+\)'`;;
-+	--prefix=*)
-+	    prefix=`expr ${arg} : '--prefix=\(.\+\)'`;;
-+	--srcdir=*)
-+	    srcdir=`expr ${arg} : '--srcdir=\(.\+\)'`;;
-+	--libdir=*)
-+	    libdir=`expr ${arg} : '--libdir=\(.\+\)'`;;
-+	--with-pkgversion=*)
-+	    pkgversion=`expr ${arg} : '--with-pkgversion=\(.\+\)'`;;
-+	--with-bugurl=*)
-+	    bugurl=`expr ${arg} : '--with-bugurl=\(.\+\)'`;;
-+	*)
-+	    echo "Warning: ignoring option: ${arg}"
-+    esac
-+done
-+
-+echo "build: ${build}" | tee config.log
-+echo "host: ${host}" | tee -a config.log
-+echo "target: ${target}" | tee -a config.log
-+echo "prefix: ${prefix}" | tee -a config.log
-+echo "srcdir: ${srcdir}" | tee -a config.log
-+echo "libdir: ${libdir}" | tee -a config.log
-+echo "pkgversion: ${pkgversion}" | tee -a config.log
-+echo "bugurl: ${bugurl}" | tee -a config.log
-+
-+echo "Creating Makefile..." | tee -a config.log
-+sed -e "s, at build@,${build},g" \
-+    -e "s, at host@,${host},g" \
-+    -e "s, at target@,${target},g" \
-+    -e "s, at prefix@,${prefix},g" \
-+    -e "s, at srcdir@,${srcdir},g" \
-+    -e "s, at libdir@,${libdir},g" \
-+    -e "s, at PKGVERSION@,${pkgversion},g" \
-+    -e "s, at REPORT_BUGS_TO@,${bugurl},g" \
-+    < ${srcdir}/Makefile.in > Makefile
-Index: b/src/libgnatvsn/Makefile.in
-===================================================================
---- /dev/null
-+++ b/src/libgnatvsn/Makefile.in
-@@ -0,0 +1,153 @@
-+# Makefile for libgnatvsn.
-+#   Copyright (c) 2006 Ludovic Brenta <ludovic at ludovic-brenta.org>
-+#
-+# This file is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+# 
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+# 
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-+
-+# Default target; must be first.
-+all: libgnatvsn
-+
-+.SUFFIXES:
-+
-+CPUS := $(shell getconf _NPROCESSORS_ONLN)
-+LIB_VERSION := $(strip $(shell grep ' Library_Version :' \
-+                 @srcdir@/../gcc/ada/gnatvsn.ads | \
-+	         sed -e 's/.*"\(.*\)".*/\1/'))
-+GCC:=$(CC)
-+LIBGNAT_JUST_BUILT := -nostdinc -I../../gcc/ada/rts
-+CFLAGS := -g -O2 -gnatn
-+FULLVER := $(shell cat @srcdir@/../gcc/FULL-VER)
-+DEVPHASE := $(shell cat @srcdir@/../gcc/DEV-PHASE)
-+DATESTAMP := $(shell cat @srcdir@/../gcc/DATESTAMP)
-+
-+# For use in version.c - double quoted strings, with appropriate
-+# surrounding punctuation and spaces, and with the datestamp and
-+# development phase collapsed to the empty string in release mode
-+# (i.e. if DEVPHASE_c is empty).  The space immediately after the
-+# comma in the $(if ...) constructs is significant - do not remove it.
-+FULLVER_s   := "\"$(FULLVER)\""
-+DEVPHASE_s  := "\"$(if $(DEVPHASE), ($(DEVPHASE)))\""
-+DATESTAMP_s := "\"$(if $(DEVPHASE), $(DATESTAMP))\""
-+PKGVERSION_s:= "\"@PKGVERSION@\""
-+BUGURL_s    := "\"@REPORT_BUGS_TO@\""
-+
-+.PHONY: libgnatvsn install
-+libgnatvsn: libgnatvsn.so.$(LIB_VERSION) libgnatvsn.a
-+
-+VSN_SOURCES := alloc.ads aspects.adb atree.adb casing.adb csets.adb debug.adb einfo.adb \
-+elists.adb fname.adb gnatvsn.adb hostparm.ads krunch.adb lib.adb namet.adb \
-+nlists.adb opt.adb output.adb repinfo.adb scans.adb sinfo.adb sem_aux.adb \
-+sinput.adb stand.adb stringt.adb table.adb tree_in.adb tree_io.adb types.adb \
-+uintp.adb uname.adb urealp.adb widechar.adb
-+
-+VSN_SEPARATES := lib-list.adb lib-sort.adb
-+
-+VSN_GENERATED_SOURCES := snames.adb
-+
-+OBJECTS=$(patsubst %.ads,%.o,$(VSN_SOURCES:.adb=.o) $(VSN_GENERATED_SOURCES:.adb=.o)) version.o
-+
-+vpath %.c @srcdir@/../gcc
-+
-+libgnatvsn.so.$(LIB_VERSION): $(addprefix obj-shared/,$(OBJECTS))
-+	: # Make libgnatvsn.so
-+	$(GCC) -o $@ -shared -fPIC -Wl,--soname,$@ $^ \
-+	   -L../../gcc/ada/rts -lgnat-$(LIB_VERSION) $(LDFLAGS)
-+	ln -s libgnatvsn.so.$(LIB_VERSION) libgnatvsn.so
-+	chmod a=r obj-shared/*.ali
-+# Make the .ali files, but not the .o files, visible to the gnat tools.
-+	cp -lp obj-shared/*.ali .
-+
-+$(addprefix obj-shared/,$(OBJECTS)): | stamp-libgnatvsn-sources obj-shared
-+
-+obj-shared/%.o: %.adb
-+	$(GCC) -c -fPIC $(CFLAGS) $(LIBGNAT_JUST_BUILT) $< -o $@
-+
-+obj-shared/%.o: %.ads
-+	$(GCC) -c -fPIC $(CFLAGS) $(LIBGNAT_JUST_BUILT) $< -o $@
-+
-+obj-shared/version.o: version.c
-+	$(GCC) -c -fPIC -g -O2 \
-+	   -DBASEVER=$(FULLVER_s) \
-+	   -DDATESTAMP=$(DATESTAMP_s) \
-+	   -DDEVPHASE=$(DEVPHASE_s) \
-+	   -DPKGVERSION=$(PKGVERSION_s) \
-+	   -DBUGURL=$(BUGURL_s) \
-+	   -DREVISION= \
-+	   $(realpath $<) -o $@
-+
-+obj-shared:
-+	-mkdir $@
-+
-+libgnatvsn.a: $(addprefix obj-static/,$(OBJECTS))
-+	: # Make libgnatvsn.a
-+	ar rc $@ $^
-+	ranlib $@
-+
-+$(addprefix obj-static/,$(OBJECTS)): | stamp-libgnatvsn-sources obj-static
-+
-+obj-static/%.o: %.adb
-+	$(GCC) -c $(CFLAGS) $(LIBGNAT_JUST_BUILT) $< -o $@
-+
-+obj-static/%.o: %.ads
-+	$(GCC) -c $(CFLAGS) $(LIBGNAT_JUST_BUILT) $< -o $@
-+
-+obj-static/version.o: version.c
-+	$(GCC) -c -g -O2 \
-+	   -DBASEVER=$(FULLVER_s) \
-+	   -DDATESTAMP=$(DATESTAMP_s) \
-+	   -DDEVPHASE=$(DEVPHASE_s) \
-+	   -DPKGVERSION=$(PKGVERSION_s) \
-+	   -DBUGURL=$(BUGURL_s) \
-+	   -DREVISION= \
-+	   $< -o $@
-+
-+obj-static:
-+	-mkdir $@
-+
-+$(VSN_SOURCES) $(VSN_SEPARATES) $(VSN_GENERATED_SOURCES): stamp-libgnatvsn-sources
-+
-+stamp-libgnatvsn-sources:
-+	for file in $(VSN_SOURCES) $(VSN_SEPARATES); do \
-+	   ads=$$(echo $$file | sed 's/\.adb/.ads/'); \
-+	   if [ -f @srcdir@/../gcc/ada/$$file -a ! -L $$file ] ; then ln -s @srcdir@/../gcc/ada/$$file .; fi; \
-+	   if [ -f @srcdir@/../gcc/ada/$$ads -a ! -L $$ads ] ; then ln -s @srcdir@/../gcc/ada/$$ads .; fi; \
-+	done
-+	for file in $(VSN_GENERATED_SOURCES); do \
-+	   ads=$$(echo $$file | sed 's/\.adb/.ads/'); \
-+	   if [ -f ../../gcc/ada/$$file -a ! -L $$file ] ; then ln -s ../../gcc/ada/$$file .; fi; \
-+	   if [ -f ../../gcc/ada/$$ads -a ! -L $$ads ] ; then ln -s ../../gcc/ada/$$ads .; fi; \
-+	done
-+	touch $@
-+
-+libdir = @libdir@
-+
-+install: libgnatvsn
-+	$(INSTALL_DATA) libgnatvsn.a $(DESTDIR)$(libdir)
-+	$(INSTALL_DATA) libgnatvsn.so.$(LIB_VERSION) $(DESTDIR)$(libdir)
-+	cd $(DESTDIR)$(libdir); ln -sf libgnatvsn.so.$(LIB_VERSION) libgnatvsn.so
-+	mkdir -p $(DESTDIR)$(prefix)/share/ada/adainclude/gnatvsn
-+	$(INSTALL_DATA) \
-+	   $(addprefix @srcdir@/../gcc/ada/,$(VSN_SOURCES) $(VSN_SEPARATES)) \
-+	   $(addprefix @srcdir@/../gcc/ada/,$(patsubst %.adb,%.ads,$(filter %.adb,$(VSN_SOURCES)))) \
-+	   $(addprefix ../../gcc/ada/,$(VSN_GENERATED_SOURCES)) \
-+	   $(addprefix ../../gcc/ada/,$(patsubst %.adb,%.ads,$(VSN_GENERATED_SOURCES))) \
-+	   $(DESTDIR)$(prefix)/share/ada/adainclude/gnatvsn
-+	mkdir -p $(DESTDIR)$(prefix)/lib/ada/adalib/gnatvsn
-+	$(INSTALL) -m 0444 obj-shared/*.ali \
-+	   $(DESTDIR)$(prefix)/lib/ada/adalib/gnatvsn
-+	chmod a=r $(DESTDIR)$(prefix)/lib/ada/adalib/gnatvsn/*.ali
-+
-+.PHONY: clean
-+clean:
-+	rm -rf *.ali obj-static obj-shared libgnatvsn* *.adb *.ads stamp*
-Index: b/src/Makefile.def
-===================================================================
---- a/src/Makefile.def
-+++ b/src/Makefile.def
-@@ -183,6 +183,13 @@ target_modules = { module= libada; no_in
- 		   missing= TAGS;
- 		   missing= install-info;
- 		   missing= installcheck; };
-+target_modules = { module= libgnatvsn; no_check=true;
-+		   missing= info;
-+		   missing= dvi;
-+		   missing= html;
-+		   missing= TAGS;
-+		   missing= install-info;
-+		   missing= installcheck; };
- target_modules = { module= libgomp; bootstrap= true; lib_path=.libs; };
- target_modules = { module= libitm; lib_path=.libs; };
- target_modules = { module= libatomic; lib_path=.libs; };
-@@ -381,6 +388,8 @@ dependencies = { module=all-fixincludes;
- 
- dependencies = { module=all-target-libada; on=all-gcc; };
- dependencies = { module=all-gnattools; on=all-target-libada; };
-+dependencies = { module=all-gnattools; on=all-target-libgnatvsn; };
-+dependencies = { module=all-target-libgnatvsn; on=all-target-libada; };
- dependencies = { module=all-gnattools; on=all-target-libstdc++-v3; };
- 
- // Depending on the specific configuration, the LTO plugin will either use the
-Index: b/src/configure.ac
-===================================================================
---- a/src/configure.ac
-+++ b/src/configure.ac
-@@ -176,6 +176,7 @@ target_libraries="target-libgcc \
- 		target-libobjc \
- 		target-libada \
- 		${target_libiberty} \
-+		target-libgnatvsn \
- 		target-libgo"
- 
- # these tools are built using the target libraries, and are intended to
-@@ -460,7 +461,7 @@ AC_ARG_ENABLE(libada,
- ENABLE_LIBADA=$enableval,
- ENABLE_LIBADA=yes)
- if test "${ENABLE_LIBADA}" != "yes" ; then
--  noconfigdirs="$noconfigdirs gnattools"
-+  noconfigdirs="$noconfigdirs target-libgnatvsn gnattools"
- fi
- 
- AC_ARG_ENABLE(libssp,
-Index: b/src/gcc/ada/gcc-interface/config-lang.in
-===================================================================
---- a/src/gcc/ada/gcc-interface/config-lang.in
-+++ b/src/gcc/ada/gcc-interface/config-lang.in
-@@ -34,8 +34,8 @@ gtfiles="\$(srcdir)/ada/gcc-interface/ad
- 
- outputs="ada/gcc-interface/Makefile ada/Makefile"
- 
--target_libs="target-libada"
--lang_dirs="libada gnattools"
-+target_libs="target-libada target-libgnatvsn"
-+lang_dirs="libada libgnatvsn gnattools"
- 
- # Ada is not enabled by default for the time being.
- build_by_default=no
-Index: b/src/Makefile.in
-===================================================================
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -976,6 +976,7 @@ configure-target:  \
-     maybe-configure-target-boehm-gc \
-     maybe-configure-target-rda \
-     maybe-configure-target-libada \
-+    maybe-configure-target-libgnatvsn \
-     maybe-configure-target-libgomp \
-     maybe-configure-target-libitm \
-     maybe-configure-target-libatomic
-@@ -1144,6 +1145,7 @@ all-target: maybe-all-target-zlib
- all-target: maybe-all-target-boehm-gc
- all-target: maybe-all-target-rda
- all-target: maybe-all-target-libada
-+all-target: maybe-all-target-libgnatvsn
- @if target-libgomp-no-bootstrap
- all-target: maybe-all-target-libgomp
- @endif target-libgomp-no-bootstrap
-@@ -1239,6 +1241,7 @@ info-target: maybe-info-target-zlib
- info-target: maybe-info-target-boehm-gc
- info-target: maybe-info-target-rda
- info-target: maybe-info-target-libada
-+info-target: maybe-info-target-libgnatvsn
- info-target: maybe-info-target-libgomp
- info-target: maybe-info-target-libitm
- info-target: maybe-info-target-libatomic
-@@ -1327,6 +1330,7 @@ dvi-target: maybe-dvi-target-zlib
- dvi-target: maybe-dvi-target-boehm-gc
- dvi-target: maybe-dvi-target-rda
- dvi-target: maybe-dvi-target-libada
-+dvi-target: maybe-dvi-target-libgnatvsn
- dvi-target: maybe-dvi-target-libgomp
- dvi-target: maybe-dvi-target-libitm
- dvi-target: maybe-dvi-target-libatomic
-@@ -1415,6 +1419,7 @@ pdf-target: maybe-pdf-target-zlib
- pdf-target: maybe-pdf-target-boehm-gc
- pdf-target: maybe-pdf-target-rda
- pdf-target: maybe-pdf-target-libada
-+pdf-target: maybe-pdf-target-libgnatvsn
- pdf-target: maybe-pdf-target-libgomp
- pdf-target: maybe-pdf-target-libitm
- pdf-target: maybe-pdf-target-libatomic
-@@ -1503,6 +1508,7 @@ html-target: maybe-html-target-zlib
- html-target: maybe-html-target-boehm-gc
- html-target: maybe-html-target-rda
- html-target: maybe-html-target-libada
-+html-target: maybe-html-target-libgnatvsn
- html-target: maybe-html-target-libgomp
- html-target: maybe-html-target-libitm
- html-target: maybe-html-target-libatomic
-@@ -1591,6 +1597,7 @@ TAGS-target: maybe-TAGS-target-zlib
- TAGS-target: maybe-TAGS-target-boehm-gc
- TAGS-target: maybe-TAGS-target-rda
- TAGS-target: maybe-TAGS-target-libada
-+TAGS-target: maybe-TAGS-target-libgnatvsn
- TAGS-target: maybe-TAGS-target-libgomp
- TAGS-target: maybe-TAGS-target-libitm
- TAGS-target: maybe-TAGS-target-libatomic
-@@ -1679,6 +1686,7 @@ install-info-target: maybe-install-info-
- install-info-target: maybe-install-info-target-boehm-gc
- install-info-target: maybe-install-info-target-rda
- install-info-target: maybe-install-info-target-libada
-+install-info-target: maybe-install-info-target-libgnatvsn
- install-info-target: maybe-install-info-target-libgomp
- install-info-target: maybe-install-info-target-libitm
- install-info-target: maybe-install-info-target-libatomic
-@@ -1767,6 +1775,7 @@ install-pdf-target: maybe-install-pdf-ta
- install-pdf-target: maybe-install-pdf-target-boehm-gc
- install-pdf-target: maybe-install-pdf-target-rda
- install-pdf-target: maybe-install-pdf-target-libada
-+install-pdf-target: maybe-install-pdf-target-libgnatvsn
- install-pdf-target: maybe-install-pdf-target-libgomp
- install-pdf-target: maybe-install-pdf-target-libitm
- install-pdf-target: maybe-install-pdf-target-libatomic
-@@ -1855,6 +1864,7 @@ install-html-target: maybe-install-html-
- install-html-target: maybe-install-html-target-boehm-gc
- install-html-target: maybe-install-html-target-rda
- install-html-target: maybe-install-html-target-libada
-+install-html-target: maybe-install-html-target-libgnatvsn
- install-html-target: maybe-install-html-target-libgomp
- install-html-target: maybe-install-html-target-libitm
- install-html-target: maybe-install-html-target-libatomic
-@@ -1943,6 +1953,7 @@ installcheck-target: maybe-installcheck-
- installcheck-target: maybe-installcheck-target-boehm-gc
- installcheck-target: maybe-installcheck-target-rda
- installcheck-target: maybe-installcheck-target-libada
-+installcheck-target: maybe-installcheck-target-libgnatvsn
- installcheck-target: maybe-installcheck-target-libgomp
- installcheck-target: maybe-installcheck-target-libitm
- installcheck-target: maybe-installcheck-target-libatomic
-@@ -2031,6 +2042,7 @@ mostlyclean-target: maybe-mostlyclean-ta
- mostlyclean-target: maybe-mostlyclean-target-boehm-gc
- mostlyclean-target: maybe-mostlyclean-target-rda
- mostlyclean-target: maybe-mostlyclean-target-libada
-+mostlyclean-target: maybe-mostlyclean-target-libgnatvsn
- mostlyclean-target: maybe-mostlyclean-target-libgomp
- mostlyclean-target: maybe-mostlyclean-target-libitm
- mostlyclean-target: maybe-mostlyclean-target-libatomic
-@@ -2119,6 +2131,7 @@ clean-target: maybe-clean-target-zlib
- clean-target: maybe-clean-target-boehm-gc
- clean-target: maybe-clean-target-rda
- clean-target: maybe-clean-target-libada
-+clean-target: maybe-clean-target-libgnatvsn
- clean-target: maybe-clean-target-libgomp
- clean-target: maybe-clean-target-libitm
- clean-target: maybe-clean-target-libatomic
-@@ -2207,6 +2220,7 @@ distclean-target: maybe-distclean-target
- distclean-target: maybe-distclean-target-boehm-gc
- distclean-target: maybe-distclean-target-rda
- distclean-target: maybe-distclean-target-libada
-+distclean-target: maybe-distclean-target-libgnatvsn
- distclean-target: maybe-distclean-target-libgomp
- distclean-target: maybe-distclean-target-libitm
- distclean-target: maybe-distclean-target-libatomic
-@@ -2295,6 +2309,7 @@ maintainer-clean-target: maybe-maintaine
- maintainer-clean-target: maybe-maintainer-clean-target-boehm-gc
- maintainer-clean-target: maybe-maintainer-clean-target-rda
- maintainer-clean-target: maybe-maintainer-clean-target-libada
-+maintainer-clean-target: maybe-maintainer-clean-target-libgnatvsn
- maintainer-clean-target: maybe-maintainer-clean-target-libgomp
- maintainer-clean-target: maybe-maintainer-clean-target-libitm
- maintainer-clean-target: maybe-maintainer-clean-target-libatomic
-@@ -2439,6 +2454,7 @@ check-target:  \
-     maybe-check-target-boehm-gc \
-     maybe-check-target-rda \
-     maybe-check-target-libada \
-+    maybe-check-target-libgnatvsn \
-     maybe-check-target-libgomp \
-     maybe-check-target-libitm \
-     maybe-check-target-libatomic
-@@ -2623,6 +2639,7 @@ install-target:  \
-     maybe-install-target-boehm-gc \
-     maybe-install-target-rda \
-     maybe-install-target-libada \
-+    maybe-install-target-libgnatvsn \
-     maybe-install-target-libgomp \
-     maybe-install-target-libitm \
-     maybe-install-target-libatomic
-@@ -2731,6 +2748,7 @@ install-strip-target:  \
-     maybe-install-strip-target-boehm-gc \
-     maybe-install-strip-target-rda \
-     maybe-install-strip-target-libada \
-+    maybe-install-strip-target-libgnatvsn \
-     maybe-install-strip-target-libgomp \
-     maybe-install-strip-target-libitm \
-     maybe-install-strip-target-libatomic
-@@ -46041,6 +46059,362 @@ maintainer-clean-target-libada:
- 
- 
- 
-+.PHONY: configure-target-libgnatvsn maybe-configure-target-libgnatvsn
-+maybe-configure-target-libgnatvsn:
-+ at if gcc-bootstrap
-+configure-target-libgnatvsn: stage_current
-+ at endif gcc-bootstrap
-+ at if target-libgnatvsn
-+maybe-configure-target-libgnatvsn: configure-target-libgnatvsn
-+configure-target-libgnatvsn: 
-+	@: $(MAKE); $(unstage)
-+	@r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	echo "Checking multilib configuration for libgnatvsn..."; \
-+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgnatvsn ; \
-+	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgnatvsn/multilib.tmp 2> /dev/null ; \
-+	if test -r $(TARGET_SUBDIR)/libgnatvsn/multilib.out; then \
-+	  if cmp -s $(TARGET_SUBDIR)/libgnatvsn/multilib.tmp $(TARGET_SUBDIR)/libgnatvsn/multilib.out; then \
-+	    rm -f $(TARGET_SUBDIR)/libgnatvsn/multilib.tmp; \
-+	  else \
-+	    rm -f $(TARGET_SUBDIR)/libgnatvsn/Makefile; \
-+	    mv $(TARGET_SUBDIR)/libgnatvsn/multilib.tmp $(TARGET_SUBDIR)/libgnatvsn/multilib.out; \
-+	  fi; \
-+	else \
-+	  mv $(TARGET_SUBDIR)/libgnatvsn/multilib.tmp $(TARGET_SUBDIR)/libgnatvsn/multilib.out; \
-+	fi; \
-+	test ! -f $(TARGET_SUBDIR)/libgnatvsn/Makefile || exit 0; \
-+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgnatvsn ; \
-+	$(NORMAL_TARGET_EXPORTS)  \
-+	echo Configuring in $(TARGET_SUBDIR)/libgnatvsn; \
-+	cd "$(TARGET_SUBDIR)/libgnatvsn" || exit 1; \
-+	case $(srcdir) in \
-+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-+	  *) topdir=`echo $(TARGET_SUBDIR)/libgnatvsn/ | \
-+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-+	esac; \
-+	module_srcdir=libgnatvsn; \
-+	rm -f no-such-file || : ; \
-+	CONFIG_SITE=no-such-file $(SHELL) \
-+	  $$s/$$module_srcdir/configure \
-+	  --srcdir=$${topdir}/$$module_srcdir \
-+	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-+	  --target=${target_alias}  \
-+	  || exit 1
-+ at endif target-libgnatvsn
-+
-+
-+
-+
-+
-+.PHONY: all-target-libgnatvsn maybe-all-target-libgnatvsn
-+maybe-all-target-libgnatvsn:
-+ at if gcc-bootstrap
-+all-target-libgnatvsn: stage_current
-+ at endif gcc-bootstrap
-+ at if target-libgnatvsn
-+TARGET-target-libgnatvsn=all
-+maybe-all-target-libgnatvsn: all-target-libgnatvsn
-+all-target-libgnatvsn: configure-target-libgnatvsn
-+	@: $(MAKE); $(unstage)
-+	@r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	$(NORMAL_TARGET_EXPORTS)  \
-+	(cd $(TARGET_SUBDIR)/libgnatvsn && \
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
-+		$(TARGET-target-libgnatvsn))
-+ at endif target-libgnatvsn
-+
-+
-+
-+
-+
-+.PHONY: check-target-libgnatvsn maybe-check-target-libgnatvsn
-+maybe-check-target-libgnatvsn:
-+ at if target-libgnatvsn
-+maybe-check-target-libgnatvsn: check-target-libgnatvsn
-+
-+# Dummy target for uncheckable module.
-+check-target-libgnatvsn:
-+
-+ at endif target-libgnatvsn
-+
-+.PHONY: install-target-libgnatvsn maybe-install-target-libgnatvsn
-+maybe-install-target-libgnatvsn:
-+ at if target-libgnatvsn
-+maybe-install-target-libgnatvsn: install-target-libgnatvsn
-+
-+install-target-libgnatvsn: installdirs
-+	@: $(MAKE); $(unstage)
-+	@r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	$(NORMAL_TARGET_EXPORTS) \
-+	(cd $(TARGET_SUBDIR)/libgnatvsn && \
-+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
-+
-+ at endif target-libgnatvsn
-+
-+.PHONY: install-strip-target-libgnatvsn maybe-install-strip-target-libgnatvsn
-+maybe-install-strip-target-libgnatvsn:
-+ at if target-libgnatvsn
-+maybe-install-strip-target-libgnatvsn: install-strip-target-libgnatvsn
-+
-+install-strip-target-libgnatvsn: installdirs
-+	@: $(MAKE); $(unstage)
-+	@r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	$(NORMAL_TARGET_EXPORTS) \
-+	(cd $(TARGET_SUBDIR)/libgnatvsn && \
-+	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
-+
-+ at endif target-libgnatvsn
-+
-+# Other targets (info, dvi, pdf, etc.)
-+
-+.PHONY: maybe-info-target-libgnatvsn info-target-libgnatvsn
-+maybe-info-target-libgnatvsn:
-+ at if target-libgnatvsn
-+maybe-info-target-libgnatvsn: info-target-libgnatvsn
-+
-+# libgnatvsn doesn't support info.
-+info-target-libgnatvsn:
-+
-+ at endif target-libgnatvsn
-+
-+.PHONY: maybe-dvi-target-libgnatvsn dvi-target-libgnatvsn
-+maybe-dvi-target-libgnatvsn:
-+ at if target-libgnatvsn
-+maybe-dvi-target-libgnatvsn: dvi-target-libgnatvsn
-+
-+# libgnatvsn doesn't support dvi.
-+dvi-target-libgnatvsn:
-+
-+ at endif target-libgnatvsn
-+
-+.PHONY: maybe-pdf-target-libgnatvsn pdf-target-libgnatvsn
-+maybe-pdf-target-libgnatvsn:
-+ at if target-libgnatvsn
-+maybe-pdf-target-libgnatvsn: pdf-target-libgnatvsn
-+
-+pdf-target-libgnatvsn: \
-+    configure-target-libgnatvsn 
-+	@: $(MAKE); $(unstage)
-+	@[ -f $(TARGET_SUBDIR)/libgnatvsn/Makefile ] || exit 0 ; \
-+	r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	$(NORMAL_TARGET_EXPORTS) \
-+	echo "Doing pdf in $(TARGET_SUBDIR)/libgnatvsn" ; \
-+	for flag in $(EXTRA_TARGET_FLAGS); do \
-+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-+	done; \
-+	(cd $(TARGET_SUBDIR)/libgnatvsn && \
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-+	          "RANLIB=$${RANLIB}" \
-+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-+	           pdf) \
-+	  || exit 1
-+
-+ at endif target-libgnatvsn
-+
-+.PHONY: maybe-html-target-libgnatvsn html-target-libgnatvsn
-+maybe-html-target-libgnatvsn:
-+ at if target-libgnatvsn
-+maybe-html-target-libgnatvsn: html-target-libgnatvsn
-+
-+# libgnatvsn doesn't support html.
-+html-target-libgnatvsn:
-+
-+ at endif target-libgnatvsn
-+
-+.PHONY: maybe-TAGS-target-libgnatvsn TAGS-target-libgnatvsn
-+maybe-TAGS-target-libgnatvsn:
-+ at if target-libgnatvsn
-+maybe-TAGS-target-libgnatvsn: TAGS-target-libgnatvsn
-+
-+# libgnatvsn doesn't support TAGS.
-+TAGS-target-libgnatvsn:
-+
-+ at endif target-libgnatvsn
-+
-+.PHONY: maybe-install-info-target-libgnatvsn install-info-target-libgnatvsn
-+maybe-install-info-target-libgnatvsn:
-+ at if target-libgnatvsn
-+maybe-install-info-target-libgnatvsn: install-info-target-libgnatvsn
-+
-+# libgnatvsn doesn't support install-info.
-+install-info-target-libgnatvsn:
-+
-+ at endif target-libgnatvsn
-+
-+.PHONY: maybe-install-pdf-target-libgnatvsn install-pdf-target-libgnatvsn
-+maybe-install-pdf-target-libgnatvsn:
-+ at if target-libgnatvsn
-+maybe-install-pdf-target-libgnatvsn: install-pdf-target-libgnatvsn
-+
-+install-pdf-target-libgnatvsn: \
-+    configure-target-libgnatvsn \
-+    pdf-target-libgnatvsn 
-+	@: $(MAKE); $(unstage)
-+	@[ -f $(TARGET_SUBDIR)/libgnatvsn/Makefile ] || exit 0 ; \
-+	r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	$(NORMAL_TARGET_EXPORTS) \
-+	echo "Doing install-pdf in $(TARGET_SUBDIR)/libgnatvsn" ; \
-+	for flag in $(EXTRA_TARGET_FLAGS); do \
-+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-+	done; \
-+	(cd $(TARGET_SUBDIR)/libgnatvsn && \
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-+	          "RANLIB=$${RANLIB}" \
-+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-+	           install-pdf) \
-+	  || exit 1
-+
-+ at endif target-libgnatvsn
-+
-+.PHONY: maybe-install-html-target-libgnatvsn install-html-target-libgnatvsn
-+maybe-install-html-target-libgnatvsn:
-+ at if target-libgnatvsn
-+maybe-install-html-target-libgnatvsn: install-html-target-libgnatvsn
-+
-+install-html-target-libgnatvsn: \
-+    configure-target-libgnatvsn \
-+    html-target-libgnatvsn 
-+	@: $(MAKE); $(unstage)
-+	@[ -f $(TARGET_SUBDIR)/libgnatvsn/Makefile ] || exit 0 ; \
-+	r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	$(NORMAL_TARGET_EXPORTS) \
-+	echo "Doing install-html in $(TARGET_SUBDIR)/libgnatvsn" ; \
-+	for flag in $(EXTRA_TARGET_FLAGS); do \
-+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-+	done; \
-+	(cd $(TARGET_SUBDIR)/libgnatvsn && \
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-+	          "RANLIB=$${RANLIB}" \
-+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-+	           install-html) \
-+	  || exit 1
-+
-+ at endif target-libgnatvsn
-+
-+.PHONY: maybe-installcheck-target-libgnatvsn installcheck-target-libgnatvsn
-+maybe-installcheck-target-libgnatvsn:
-+ at if target-libgnatvsn
-+maybe-installcheck-target-libgnatvsn: installcheck-target-libgnatvsn
-+
-+# libgnatvsn doesn't support installcheck.
-+installcheck-target-libgnatvsn:
-+
-+ at endif target-libgnatvsn
-+
-+.PHONY: maybe-mostlyclean-target-libgnatvsn mostlyclean-target-libgnatvsn
-+maybe-mostlyclean-target-libgnatvsn:
-+ at if target-libgnatvsn
-+maybe-mostlyclean-target-libgnatvsn: mostlyclean-target-libgnatvsn
-+
-+mostlyclean-target-libgnatvsn: 
-+	@: $(MAKE); $(unstage)
-+	@[ -f $(TARGET_SUBDIR)/libgnatvsn/Makefile ] || exit 0 ; \
-+	r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	$(NORMAL_TARGET_EXPORTS) \
-+	echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgnatvsn" ; \
-+	for flag in $(EXTRA_TARGET_FLAGS); do \
-+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-+	done; \
-+	(cd $(TARGET_SUBDIR)/libgnatvsn && \
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-+	          "RANLIB=$${RANLIB}" \
-+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-+	           mostlyclean) \
-+	  || exit 1
-+
-+ at endif target-libgnatvsn
-+
-+.PHONY: maybe-clean-target-libgnatvsn clean-target-libgnatvsn
-+maybe-clean-target-libgnatvsn:
-+ at if target-libgnatvsn
-+maybe-clean-target-libgnatvsn: clean-target-libgnatvsn
-+
-+clean-target-libgnatvsn: 
-+	@: $(MAKE); $(unstage)
-+	@[ -f $(TARGET_SUBDIR)/libgnatvsn/Makefile ] || exit 0 ; \
-+	r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	$(NORMAL_TARGET_EXPORTS) \
-+	echo "Doing clean in $(TARGET_SUBDIR)/libgnatvsn" ; \
-+	for flag in $(EXTRA_TARGET_FLAGS); do \
-+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-+	done; \
-+	(cd $(TARGET_SUBDIR)/libgnatvsn && \
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-+	          "RANLIB=$${RANLIB}" \
-+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-+	           clean) \
-+	  || exit 1
-+
-+ at endif target-libgnatvsn
-+
-+.PHONY: maybe-distclean-target-libgnatvsn distclean-target-libgnatvsn
-+maybe-distclean-target-libgnatvsn:
-+ at if target-libgnatvsn
-+maybe-distclean-target-libgnatvsn: distclean-target-libgnatvsn
-+
-+distclean-target-libgnatvsn: 
-+	@: $(MAKE); $(unstage)
-+	@[ -f $(TARGET_SUBDIR)/libgnatvsn/Makefile ] || exit 0 ; \
-+	r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	$(NORMAL_TARGET_EXPORTS) \
-+	echo "Doing distclean in $(TARGET_SUBDIR)/libgnatvsn" ; \
-+	for flag in $(EXTRA_TARGET_FLAGS); do \
-+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-+	done; \
-+	(cd $(TARGET_SUBDIR)/libgnatvsn && \
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-+	          "RANLIB=$${RANLIB}" \
-+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-+	           distclean) \
-+	  || exit 1
-+
-+ at endif target-libgnatvsn
-+
-+.PHONY: maybe-maintainer-clean-target-libgnatvsn maintainer-clean-target-libgnatvsn
-+maybe-maintainer-clean-target-libgnatvsn:
-+ at if target-libgnatvsn
-+maybe-maintainer-clean-target-libgnatvsn: maintainer-clean-target-libgnatvsn
-+
-+maintainer-clean-target-libgnatvsn: 
-+	@: $(MAKE); $(unstage)
-+	@[ -f $(TARGET_SUBDIR)/libgnatvsn/Makefile ] || exit 0 ; \
-+	r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	$(NORMAL_TARGET_EXPORTS) \
-+	echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libgnatvsn" ; \
-+	for flag in $(EXTRA_TARGET_FLAGS); do \
-+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-+	done; \
-+	(cd $(TARGET_SUBDIR)/libgnatvsn && \
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-+	          "RANLIB=$${RANLIB}" \
-+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-+	           maintainer-clean) \
-+	  || exit 1
-+
-+ at endif target-libgnatvsn
-+
-+
-+
-+
-+
- .PHONY: configure-target-libgomp maybe-configure-target-libgomp
- maybe-configure-target-libgomp:
- @if gcc-bootstrap
-@@ -50245,6 +50619,7 @@ configure-target-zlib: stage_last
- configure-target-boehm-gc: stage_last
- configure-target-rda: stage_last
- configure-target-libada: stage_last
-+configure-target-libgnatvsn: stage_last
- configure-stage1-target-libgomp: maybe-all-stage1-gcc
- configure-stage2-target-libgomp: maybe-all-stage2-gcc
- configure-stage3-target-libgomp: maybe-all-stage3-gcc
-@@ -50280,6 +50655,7 @@ configure-target-zlib: maybe-all-gcc
- configure-target-boehm-gc: maybe-all-gcc
- configure-target-rda: maybe-all-gcc
- configure-target-libada: maybe-all-gcc
-+configure-target-libgnatvsn: maybe-all-gcc
- configure-target-libgomp: maybe-all-gcc
- configure-target-libitm: maybe-all-gcc
- configure-target-libatomic: maybe-all-gcc
-@@ -50653,6 +51029,8 @@ all-stageprofile-fixincludes: maybe-all-
- all-stagefeedback-fixincludes: maybe-all-stagefeedback-libiberty
- all-target-libada: maybe-all-gcc
- all-gnattools: maybe-all-target-libada
-+all-gnattools: maybe-all-target-libgnatvsn
-+all-target-libgnatvsn: maybe-all-target-libada
- all-gnattools: maybe-all-target-libstdc++-v3
- all-lto-plugin: maybe-all-libiberty
- 
-@@ -51249,6 +51627,7 @@ configure-target-zlib: maybe-all-target-
- configure-target-boehm-gc: maybe-all-target-libgcc
- configure-target-rda: maybe-all-target-libgcc
- configure-target-libada: maybe-all-target-libgcc
-+configure-target-libgnatvsn: maybe-all-target-libgcc
- configure-target-libgomp: maybe-all-target-libgcc
- configure-target-libitm: maybe-all-target-libgcc
- configure-target-libatomic: maybe-all-target-libgcc
-@@ -51303,6 +51682,8 @@ configure-target-rda: maybe-all-target-n
- 
- configure-target-libada: maybe-all-target-newlib maybe-all-target-libgloss
- 
-+configure-target-libgnatvsn: maybe-all-target-newlib maybe-all-target-libgloss
-+
- configure-target-libgomp: maybe-all-target-newlib maybe-all-target-libgloss
- 
- configure-target-libitm: maybe-all-target-newlib maybe-all-target-libgloss
diff --git a/debian/patches/ada-link-lib.diff b/debian/patches/ada-link-lib.diff
index 4775abb..79f8eb1 100644
--- a/debian/patches/ada-link-lib.diff
+++ b/debian/patches/ada-link-lib.diff
@@ -11,10 +11,10 @@
 # This patch seems large, but the hunks in Makefile.in are actually
 # generated from Makefile.def using autogen.
 
-Index: b/src/gcc/ada/gcc-interface/config-lang.in
+Index: gcc-7-7-20161112/src/gcc/ada/gcc-interface/config-lang.in
 ===================================================================
---- a/src/gcc/ada/gcc-interface/config-lang.in
-+++ b/src/gcc/ada/gcc-interface/config-lang.in
+--- gcc-7-7-20161112.orig/src/gcc/ada/gcc-interface/config-lang.in
++++ gcc-7-7-20161112/src/gcc/ada/gcc-interface/config-lang.in
 @@ -35,7 +35,7 @@ gtfiles="\$(srcdir)/ada/gcc-interface/ad
  outputs="ada/gcc-interface/Makefile ada/Makefile"
  
@@ -24,10 +24,10 @@ Index: b/src/gcc/ada/gcc-interface/config-lang.in
  
  # Ada is not enabled by default for the time being.
  build_by_default=no
-Index: b/src/gcc/ada/link.c
+Index: gcc-7-7-20161112/src/gcc/ada/link.c
 ===================================================================
---- a/src/gcc/ada/link.c
-+++ b/src/gcc/ada/link.c
+--- gcc-7-7-20161112.orig/src/gcc/ada/link.c
++++ gcc-7-7-20161112/src/gcc/ada/link.c
 @@ -106,9 +106,9 @@ const char *__gnat_default_libgcc_subdir
  #elif defined (__FreeBSD__) || defined (__DragonFly__) \
     || defined (__NetBSD__) || defined (__OpenBSD__)
@@ -54,10 +54,10 @@ Index: b/src/gcc/ada/link.c
  int __gnat_link_max = 8192;
  unsigned char __gnat_objlist_file_supported = 1;
  const char *__gnat_object_library_extension = ".a";
-Index: b/src/libada/Makefile.in
+Index: gcc-7-7-20161112/src/libada/Makefile.in
 ===================================================================
---- a/src/libada/Makefile.in
-+++ b/src/libada/Makefile.in
+--- gcc-7-7-20161112.orig/src/libada/Makefile.in
++++ gcc-7-7-20161112/src/libada/Makefile.in
 @@ -60,7 +60,7 @@ CFLAGS=-g
  PICFLAG = @PICFLAG@
  GNATLIBFLAGS= -W -Wall -gnatpg -nostdinc
@@ -67,11 +67,20 @@ Index: b/src/libada/Makefile.in
  	-fexceptions -DIN_RTS @have_getipinfo@
  
  host_subdir = @host_subdir@
-Index: b/src/Makefile.def
+@@ -122,7 +122,7 @@ osconstool:
+ 	$(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) ./bldtools/oscons/xoscons
+ 
+ install-gnatlib: $(GCC_DIR)/ada/Makefile
+-	$(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) install-gnatlib
++	$(MAKE) -C $(GCC_DIR)/ada $(AM_MAKEFLAGS) $(LIBADA_FLAGS_TO_PASS) install-gnatlib
+ 
+ # Check uninstalled version.
+ check:
+Index: gcc-7-7-20161112/src/Makefile.def
 ===================================================================
---- a/src/Makefile.def
-+++ b/src/Makefile.def
-@@ -121,7 +121,13 @@ host_modules= { module= libtermcap; no_c
+--- gcc-7-7-20161112.orig/src/Makefile.def
++++ gcc-7-7-20161112/src/Makefile.def
+@@ -122,7 +122,13 @@ host_modules= { module= libtermcap; no_c
                  missing=distclean;
                  missing=maintainer-clean; };
  host_modules= { module= utils; no_check=true; };
@@ -86,28 +95,7 @@ Index: b/src/Makefile.def
  host_modules= { module= lto-plugin; bootstrap=true;
  		extra_configure_flags='--enable-shared @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@';
  		extra_make_flags='@extra_linker_plugin_flags@'; };
-@@ -164,12 +170,19 @@ target_modules = { module= libtermcap; n
- target_modules = { module= winsup; };
- target_modules = { module= libgloss; no_check=true; };
- target_modules = { module= libffi; no_install=true; };
-+target_modules = { module= libiberty; no_install=true; no_check=true; };
- target_modules = { module= libjava; raw_cxx=true;
-                    extra_configure_flags="$(EXTRA_CONFIGARGS_LIBJAVA)"; };
- target_modules = { module= zlib; };
- target_modules = { module= boehm-gc; };
- target_modules = { module= rda; };
--target_modules = { module= libada; };
-+target_modules = { module= libada; no_install=true; no_check=true;
-+		   missing= info;
-+		   missing= dvi;
-+		   missing= html;
-+		   missing= TAGS;
-+		   missing= install-info;
-+		   missing= installcheck; };
- target_modules = { module= libgomp; bootstrap= true; lib_path=.libs; };
- target_modules = { module= libitm; lib_path=.libs; };
- target_modules = { module= libatomic; lib_path=.libs; };
-@@ -366,6 +379,7 @@ dependencies = { module=all-libcpp; on=a
+@@ -365,6 +371,7 @@ dependencies = { module=all-libcpp; on=a
  
  dependencies = { module=all-fixincludes; on=all-libiberty; };
  
@@ -115,155 +103,11 @@ Index: b/src/Makefile.def
  dependencies = { module=all-gnattools; on=all-target-libada; };
  dependencies = { module=all-gnattools; on=all-target-libstdc++-v3; };
  
-Index: b/src/Makefile.in
+Index: gcc-7-7-20161112/src/Makefile.in
 ===================================================================
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -970,6 +970,7 @@ configure-target:  \
-     maybe-configure-target-winsup \
-     maybe-configure-target-libgloss \
-     maybe-configure-target-libffi \
-+    maybe-configure-target-libiberty \
-     maybe-configure-target-libjava \
-     maybe-configure-target-zlib \
-     maybe-configure-target-boehm-gc \
-@@ -1137,6 +1138,7 @@ all-target: maybe-all-target-libtermcap
- all-target: maybe-all-target-winsup
- all-target: maybe-all-target-libgloss
- all-target: maybe-all-target-libffi
-+all-target: maybe-all-target-libiberty
- all-target: maybe-all-target-libjava
- all-target: maybe-all-target-zlib
- all-target: maybe-all-target-boehm-gc
-@@ -1231,6 +1233,7 @@ info-target: maybe-info-target-libtermca
- info-target: maybe-info-target-winsup
- info-target: maybe-info-target-libgloss
- info-target: maybe-info-target-libffi
-+info-target: maybe-info-target-libiberty
- info-target: maybe-info-target-libjava
- info-target: maybe-info-target-zlib
- info-target: maybe-info-target-boehm-gc
-@@ -1318,6 +1321,7 @@ dvi-target: maybe-dvi-target-libtermcap
- dvi-target: maybe-dvi-target-winsup
- dvi-target: maybe-dvi-target-libgloss
- dvi-target: maybe-dvi-target-libffi
-+dvi-target: maybe-dvi-target-libiberty
- dvi-target: maybe-dvi-target-libjava
- dvi-target: maybe-dvi-target-zlib
- dvi-target: maybe-dvi-target-boehm-gc
-@@ -1405,6 +1409,7 @@ pdf-target: maybe-pdf-target-libtermcap
- pdf-target: maybe-pdf-target-winsup
- pdf-target: maybe-pdf-target-libgloss
- pdf-target: maybe-pdf-target-libffi
-+pdf-target: maybe-pdf-target-libiberty
- pdf-target: maybe-pdf-target-libjava
- pdf-target: maybe-pdf-target-zlib
- pdf-target: maybe-pdf-target-boehm-gc
-@@ -1492,6 +1497,7 @@ html-target: maybe-html-target-libtermca
- html-target: maybe-html-target-winsup
- html-target: maybe-html-target-libgloss
- html-target: maybe-html-target-libffi
-+html-target: maybe-html-target-libiberty
- html-target: maybe-html-target-libjava
- html-target: maybe-html-target-zlib
- html-target: maybe-html-target-boehm-gc
-@@ -1579,6 +1585,7 @@ TAGS-target: maybe-TAGS-target-libtermca
- TAGS-target: maybe-TAGS-target-winsup
- TAGS-target: maybe-TAGS-target-libgloss
- TAGS-target: maybe-TAGS-target-libffi
-+TAGS-target: maybe-TAGS-target-libiberty
- TAGS-target: maybe-TAGS-target-libjava
- TAGS-target: maybe-TAGS-target-zlib
- TAGS-target: maybe-TAGS-target-boehm-gc
-@@ -1666,6 +1673,7 @@ install-info-target: maybe-install-info-
- install-info-target: maybe-install-info-target-winsup
- install-info-target: maybe-install-info-target-libgloss
- install-info-target: maybe-install-info-target-libffi
-+install-info-target: maybe-install-info-target-libiberty
- install-info-target: maybe-install-info-target-libjava
- install-info-target: maybe-install-info-target-zlib
- install-info-target: maybe-install-info-target-boehm-gc
-@@ -1753,6 +1761,7 @@ install-pdf-target: maybe-install-pdf-ta
- install-pdf-target: maybe-install-pdf-target-winsup
- install-pdf-target: maybe-install-pdf-target-libgloss
- install-pdf-target: maybe-install-pdf-target-libffi
-+install-pdf-target: maybe-install-pdf-target-libiberty
- install-pdf-target: maybe-install-pdf-target-libjava
- install-pdf-target: maybe-install-pdf-target-zlib
- install-pdf-target: maybe-install-pdf-target-boehm-gc
-@@ -1840,6 +1849,7 @@ install-html-target: maybe-install-html-
- install-html-target: maybe-install-html-target-winsup
- install-html-target: maybe-install-html-target-libgloss
- install-html-target: maybe-install-html-target-libffi
-+install-html-target: maybe-install-html-target-libiberty
- install-html-target: maybe-install-html-target-libjava
- install-html-target: maybe-install-html-target-zlib
- install-html-target: maybe-install-html-target-boehm-gc
-@@ -1927,6 +1937,7 @@ installcheck-target: maybe-installcheck-
- installcheck-target: maybe-installcheck-target-winsup
- installcheck-target: maybe-installcheck-target-libgloss
- installcheck-target: maybe-installcheck-target-libffi
-+installcheck-target: maybe-installcheck-target-libiberty
- installcheck-target: maybe-installcheck-target-libjava
- installcheck-target: maybe-installcheck-target-zlib
- installcheck-target: maybe-installcheck-target-boehm-gc
-@@ -2014,6 +2025,7 @@ mostlyclean-target: maybe-mostlyclean-ta
- mostlyclean-target: maybe-mostlyclean-target-winsup
- mostlyclean-target: maybe-mostlyclean-target-libgloss
- mostlyclean-target: maybe-mostlyclean-target-libffi
-+mostlyclean-target: maybe-mostlyclean-target-libiberty
- mostlyclean-target: maybe-mostlyclean-target-libjava
- mostlyclean-target: maybe-mostlyclean-target-zlib
- mostlyclean-target: maybe-mostlyclean-target-boehm-gc
-@@ -2101,6 +2113,7 @@ clean-target: maybe-clean-target-libterm
- clean-target: maybe-clean-target-winsup
- clean-target: maybe-clean-target-libgloss
- clean-target: maybe-clean-target-libffi
-+clean-target: maybe-clean-target-libiberty
- clean-target: maybe-clean-target-libjava
- clean-target: maybe-clean-target-zlib
- clean-target: maybe-clean-target-boehm-gc
-@@ -2188,6 +2201,7 @@ distclean-target: maybe-distclean-target
- distclean-target: maybe-distclean-target-winsup
- distclean-target: maybe-distclean-target-libgloss
- distclean-target: maybe-distclean-target-libffi
-+distclean-target: maybe-distclean-target-libiberty
- distclean-target: maybe-distclean-target-libjava
- distclean-target: maybe-distclean-target-zlib
- distclean-target: maybe-distclean-target-boehm-gc
-@@ -2275,6 +2289,7 @@ maintainer-clean-target: maybe-maintaine
- maintainer-clean-target: maybe-maintainer-clean-target-winsup
- maintainer-clean-target: maybe-maintainer-clean-target-libgloss
- maintainer-clean-target: maybe-maintainer-clean-target-libffi
-+maintainer-clean-target: maybe-maintainer-clean-target-libiberty
- maintainer-clean-target: maybe-maintainer-clean-target-libjava
- maintainer-clean-target: maybe-maintainer-clean-target-zlib
- maintainer-clean-target: maybe-maintainer-clean-target-boehm-gc
-@@ -2418,6 +2433,7 @@ check-target:  \
-     maybe-check-target-winsup \
-     maybe-check-target-libgloss \
-     maybe-check-target-libffi \
-+    maybe-check-target-libiberty \
-     maybe-check-target-libjava \
-     maybe-check-target-zlib \
-     maybe-check-target-boehm-gc \
-@@ -2601,6 +2617,7 @@ install-target:  \
-     maybe-install-target-winsup \
-     maybe-install-target-libgloss \
-     maybe-install-target-libffi \
-+    maybe-install-target-libiberty \
-     maybe-install-target-libjava \
-     maybe-install-target-zlib \
-     maybe-install-target-boehm-gc \
-@@ -2708,6 +2725,7 @@ install-strip-target:  \
-     maybe-install-strip-target-winsup \
-     maybe-install-strip-target-libgloss \
-     maybe-install-strip-target-libffi \
-+    maybe-install-strip-target-libiberty \
-     maybe-install-strip-target-libjava \
-     maybe-install-strip-target-zlib \
-     maybe-install-strip-target-boehm-gc \
-@@ -30607,12 +30625,6 @@ maybe-check-gnattools:
+--- gcc-7-7-20161112.orig/src/Makefile.in
++++ gcc-7-7-20161112/src/Makefile.in
+@@ -33918,12 +33918,6 @@ maybe-check-gnattools:
  maybe-check-gnattools: check-gnattools
  
  check-gnattools:
@@ -276,7 +120,7 @@ Index: b/src/Makefile.in
  
  @endif gnattools
  
-@@ -30653,24 +30665,8 @@ maybe-info-gnattools:
+@@ -33964,24 +33958,8 @@ maybe-info-gnattools:
  @if gnattools
  maybe-info-gnattools: info-gnattools
  
@@ -303,7 +147,7 @@ Index: b/src/Makefile.in
  
  @endif gnattools
  
-@@ -30679,24 +30675,8 @@ maybe-dvi-gnattools:
+@@ -33990,24 +33968,8 @@ maybe-dvi-gnattools:
  @if gnattools
  maybe-dvi-gnattools: dvi-gnattools
  
@@ -330,7 +174,7 @@ Index: b/src/Makefile.in
  
  @endif gnattools
  
-@@ -30731,24 +30711,8 @@ maybe-html-gnattools:
+@@ -34042,24 +34004,8 @@ maybe-html-gnattools:
  @if gnattools
  maybe-html-gnattools: html-gnattools
  
@@ -357,7 +201,7 @@ Index: b/src/Makefile.in
  
  @endif gnattools
  
-@@ -30757,24 +30721,8 @@ maybe-TAGS-gnattools:
+@@ -34068,24 +34014,8 @@ maybe-TAGS-gnattools:
  @if gnattools
  maybe-TAGS-gnattools: TAGS-gnattools
  
@@ -384,7 +228,7 @@ Index: b/src/Makefile.in
  
  @endif gnattools
  
-@@ -30783,25 +30731,8 @@ maybe-install-info-gnattools:
+@@ -34094,25 +34024,8 @@ maybe-install-info-gnattools:
  @if gnattools
  maybe-install-info-gnattools: install-info-gnattools
  
@@ -412,7 +256,7 @@ Index: b/src/Makefile.in
  
  @endif gnattools
  
-@@ -30864,24 +30795,8 @@ maybe-installcheck-gnattools:
+@@ -34175,24 +34088,8 @@ maybe-installcheck-gnattools:
  @if gnattools
  maybe-installcheck-gnattools: installcheck-gnattools
  
@@ -439,713 +283,31 @@ Index: b/src/Makefile.in
  
  @endif gnattools
  
-@@ -43505,6 +43420,449 @@ maintainer-clean-target-libffi:
- 
+@@ -47871,6 +47768,9 @@ maintainer-clean-target-libffi:
+ @endif target-libffi
  
  
-+.PHONY: configure-target-libiberty maybe-configure-target-libiberty
-+maybe-configure-target-libiberty:
-+ at if gcc-bootstrap
-+configure-target-libiberty: stage_current
-+ at endif gcc-bootstrap
-+ at if target-libiberty
-+maybe-configure-target-libiberty: configure-target-libiberty
-+configure-target-libiberty: 
-+	@: $(MAKE); $(unstage)
-+	@r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	echo "Checking multilib configuration for libiberty..."; \
-+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libiberty; \
-+	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libiberty/multilib.tmp 2> /dev/null; \
-+	if test -r $(TARGET_SUBDIR)/libiberty/multilib.out; then \
-+	  if cmp -s $(TARGET_SUBDIR)/libiberty/multilib.tmp $(TARGET_SUBDIR)/libiberty/multilib.out; then \
-+	    rm -f $(TARGET_SUBDIR)/libiberty/multilib.tmp; \
-+	  else \
-+	    rm -f $(TARGET_SUBDIR)/libiberty/Makefile; \
-+	    mv $(TARGET_SUBDIR)/libiberty/multilib.tmp $(TARGET_SUBDIR)/libiberty/multilib.out; \
-+	  fi; \
-+	else \
-+	  mv $(TARGET_SUBDIR)/libiberty/multilib.tmp $(TARGET_SUBDIR)/libiberty/multilib.out; \
-+	fi; \
-+	test ! -f $(TARGET_SUBDIR)/libiberty/Makefile || exit 0; \
-+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libiberty; \
-+	$(NORMAL_TARGET_EXPORTS)  \
-+	echo Configuring in $(TARGET_SUBDIR)/libiberty; \
-+	cd "$(TARGET_SUBDIR)/libiberty" || exit 1; \
-+	case $(srcdir) in \
-+	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-+	  *) topdir=`echo $(TARGET_SUBDIR)/libiberty/ | \
-+		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-+	esac; \
-+	module_srcdir=libiberty; \
-+	rm -f no-such-file || : ; \
-+	CONFIG_SITE=no-such-file $(SHELL) \
-+	  $$s/$$module_srcdir/configure \
-+	  --srcdir=$${topdir}/$$module_srcdir \
-+	  $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
-+	  --target=${target_alias}  \
-+	  || exit 1
-+ at endif target-libiberty
-+
-+
-+
-+
-+
-+.PHONY: all-target-libiberty maybe-all-target-libiberty
-+maybe-all-target-libiberty:
-+ at if gcc-bootstrap
-+all-target-libiberty: stage_current
-+ at endif gcc-bootstrap
-+ at if target-libiberty
-+TARGET-target-libiberty=all
-+maybe-all-target-libiberty: all-target-libiberty
-+all-target-libiberty: configure-target-libiberty
-+	@: $(MAKE); $(unstage)
-+	@r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	$(NORMAL_TARGET_EXPORTS)  \
-+	(cd $(TARGET_SUBDIR)/libiberty && \
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS)   \
-+		$(TARGET-target-libiberty))
-+ at endif target-libiberty
-+
-+
-+
-+
-+
-+.PHONY: check-target-libiberty maybe-check-target-libiberty
-+maybe-check-target-libiberty:
-+ at if target-libiberty
-+maybe-check-target-libiberty: check-target-libiberty
-+
-+# Dummy target for uncheckable module.
-+check-target-libiberty:
-+
-+ at endif target-libiberty
-+
-+.PHONY: install-target-libiberty maybe-install-target-libiberty
-+maybe-install-target-libiberty:
-+ at if target-libiberty
-+maybe-install-target-libiberty: install-target-libiberty
-+
-+# Dummy target for uninstallable.
-+install-target-libiberty:
-+
-+ at endif target-libiberty
-+
-+.PHONY: install-strip-target-libiberty maybe-install-strip-target-libiberty
-+maybe-install-strip-target-libiberty:
-+ at if target-libiberty
-+maybe-install-strip-target-libiberty: install-strip-target-libiberty
-+
-+# Dummy target for uninstallable.
-+install-strip-target-libiberty:
-+
-+ at endif target-libiberty
-+
-+# Other targets (info, dvi, pdf, etc.)
-+
-+.PHONY: maybe-info-target-libiberty info-target-libiberty
-+maybe-info-target-libiberty:
-+ at if target-libiberty
-+maybe-info-target-libiberty: info-target-libiberty
-+
-+info-target-libiberty: \
-+    configure-target-libiberty 
-+	@: $(MAKE); $(unstage)
-+	@[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0; \
-+	r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	$(NORMAL_TARGET_EXPORTS) \
-+	echo "Doing info in $(TARGET_SUBDIR)/libiberty"; \
-+	for flag in $(EXTRA_TARGET_FLAGS); do \
-+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-+	done; \
-+	(cd $(TARGET_SUBDIR)/libiberty && \
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-+	          "RANLIB=$${RANLIB}" \
-+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-+	           info) \
-+	  || exit 1
-+
-+ at endif target-libiberty
-+
-+.PHONY: maybe-dvi-target-libiberty dvi-target-libiberty
-+maybe-dvi-target-libiberty:
-+ at if target-libiberty
-+maybe-dvi-target-libiberty: dvi-target-libiberty
-+
-+dvi-target-libiberty: \
-+    configure-target-libiberty 
-+	@: $(MAKE); $(unstage)
-+	@[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0; \
-+	r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	$(NORMAL_TARGET_EXPORTS) \
-+	echo "Doing dvi in $(TARGET_SUBDIR)/libiberty"; \
-+	for flag in $(EXTRA_TARGET_FLAGS); do \
-+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-+	done; \
-+	(cd $(TARGET_SUBDIR)/libiberty && \
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-+	          "RANLIB=$${RANLIB}" \
-+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-+	           dvi) \
-+	  || exit 1
-+
-+ at endif target-libiberty
-+
-+.PHONY: maybe-pdf-target-libiberty pdf-target-libiberty
-+maybe-pdf-target-libiberty:
-+ at if target-libiberty
-+maybe-pdf-target-libiberty: pdf-target-libiberty
-+
-+pdf-target-libiberty: \
-+    configure-target-libiberty 
-+	@: $(MAKE); $(unstage)
-+	@[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0; \
-+	r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	$(NORMAL_TARGET_EXPORTS) \
-+	echo "Doing pdf in $(TARGET_SUBDIR)/libiberty"; \
-+	for flag in $(EXTRA_TARGET_FLAGS); do \
-+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-+	done; \
-+	(cd $(TARGET_SUBDIR)/libiberty && \
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-+	          "RANLIB=$${RANLIB}" \
-+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-+	           pdf) \
-+	  || exit 1
-+
-+ at endif target-libiberty
-+
-+.PHONY: maybe-html-target-libiberty html-target-libiberty
-+maybe-html-target-libiberty:
-+ at if target-libiberty
-+maybe-html-target-libiberty: html-target-libiberty
-+
-+html-target-libiberty: \
-+    configure-target-libiberty 
-+	@: $(MAKE); $(unstage)
-+	@[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0; \
-+	r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	$(NORMAL_TARGET_EXPORTS) \
-+	echo "Doing html in $(TARGET_SUBDIR)/libiberty"; \
-+	for flag in $(EXTRA_TARGET_FLAGS); do \
-+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-+	done; \
-+	(cd $(TARGET_SUBDIR)/libiberty && \
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-+	          "RANLIB=$${RANLIB}" \
-+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-+	           html) \
-+	  || exit 1
-+
-+ at endif target-libiberty
-+
-+.PHONY: maybe-TAGS-target-libiberty TAGS-target-libiberty
-+maybe-TAGS-target-libiberty:
-+ at if target-libiberty
-+maybe-TAGS-target-libiberty: TAGS-target-libiberty
-+
-+TAGS-target-libiberty: \
-+    configure-target-libiberty 
-+	@: $(MAKE); $(unstage)
-+	@[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0; \
-+	r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	$(NORMAL_TARGET_EXPORTS) \
-+	echo "Doing TAGS in $(TARGET_SUBDIR)/libiberty"; \
-+	for flag in $(EXTRA_TARGET_FLAGS); do \
-+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-+	done; \
-+	(cd $(TARGET_SUBDIR)/libiberty && \
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-+	          "RANLIB=$${RANLIB}" \
-+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-+	           TAGS) \
-+	  || exit 1
-+
-+ at endif target-libiberty
-+
-+.PHONY: maybe-install-info-target-libiberty install-info-target-libiberty
-+maybe-install-info-target-libiberty:
-+ at if target-libiberty
-+maybe-install-info-target-libiberty: install-info-target-libiberty
-+
-+install-info-target-libiberty: \
-+    configure-target-libiberty \
-+    info-target-libiberty 
-+	@: $(MAKE); $(unstage)
-+	@[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0; \
-+	r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	$(NORMAL_TARGET_EXPORTS) \
-+	echo "Doing install-info in $(TARGET_SUBDIR)/libiberty"; \
-+	for flag in $(EXTRA_TARGET_FLAGS); do \
-+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-+	done; \
-+	(cd $(TARGET_SUBDIR)/libiberty && \
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-+	          "RANLIB=$${RANLIB}" \
-+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-+	           install-info) \
-+	  || exit 1
-+
-+ at endif target-libiberty
-+
-+.PHONY: maybe-install-pdf-target-libiberty install-pdf-target-libiberty
-+maybe-install-pdf-target-libiberty:
-+ at if target-libiberty
-+maybe-install-pdf-target-libiberty: install-pdf-target-libiberty
 +
-+install-pdf-target-libiberty: \
-+    configure-target-libiberty \
-+    pdf-target-libiberty 
-+	@: $(MAKE); $(unstage)
-+	@[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0; \
-+	r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	$(NORMAL_TARGET_EXPORTS) \
-+	echo "Doing install-pdf in $(TARGET_SUBDIR)/libiberty"; \
-+	for flag in $(EXTRA_TARGET_FLAGS); do \
-+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-+	done; \
-+	(cd $(TARGET_SUBDIR)/libiberty && \
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-+	          "RANLIB=$${RANLIB}" \
-+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-+	           install-pdf) \
-+	  || exit 1
 +
-+ at endif target-libiberty
 +
-+.PHONY: maybe-install-html-target-libiberty install-html-target-libiberty
-+maybe-install-html-target-libiberty:
-+ at if target-libiberty
-+maybe-install-html-target-libiberty: install-html-target-libiberty
-+
-+install-html-target-libiberty: \
-+    configure-target-libiberty \
-+    html-target-libiberty 
-+	@: $(MAKE); $(unstage)
-+	@[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0; \
-+	r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	$(NORMAL_TARGET_EXPORTS) \
-+	echo "Doing install-html in $(TARGET_SUBDIR)/libiberty"; \
-+	for flag in $(EXTRA_TARGET_FLAGS); do \
-+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-+	done; \
-+	(cd $(TARGET_SUBDIR)/libiberty && \
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-+	          "RANLIB=$${RANLIB}" \
-+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-+	           install-html) \
-+	  || exit 1
-+
-+ at endif target-libiberty
-+
-+.PHONY: maybe-installcheck-target-libiberty installcheck-target-libiberty
-+maybe-installcheck-target-libiberty:
-+ at if target-libiberty
-+maybe-installcheck-target-libiberty: installcheck-target-libiberty
-+
-+installcheck-target-libiberty: \
-+    configure-target-libiberty 
-+	@: $(MAKE); $(unstage)
-+	@[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0; \
-+	r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	$(NORMAL_TARGET_EXPORTS) \
-+	echo "Doing installcheck in $(TARGET_SUBDIR)/libiberty"; \
-+	for flag in $(EXTRA_TARGET_FLAGS); do \
-+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-+	done; \
-+	(cd $(TARGET_SUBDIR)/libiberty && \
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-+	          "RANLIB=$${RANLIB}" \
-+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-+	           installcheck) \
-+	  || exit 1
-+
-+ at endif target-libiberty
-+
-+.PHONY: maybe-mostlyclean-target-libiberty mostlyclean-target-libiberty
-+maybe-mostlyclean-target-libiberty:
-+ at if target-libiberty
-+maybe-mostlyclean-target-libiberty: mostlyclean-target-libiberty
-+
-+mostlyclean-target-libiberty: 
-+	@: $(MAKE); $(unstage)
-+	@[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0; \
-+	r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	$(NORMAL_TARGET_EXPORTS) \
-+	echo "Doing mostlyclean in $(TARGET_SUBDIR)/libiberty"; \
-+	for flag in $(EXTRA_TARGET_FLAGS); do \
-+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-+	done; \
-+	(cd $(TARGET_SUBDIR)/libiberty && \
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-+	          "RANLIB=$${RANLIB}" \
-+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-+	           mostlyclean) \
-+	  || exit 1
-+
-+ at endif target-libiberty
-+
-+.PHONY: maybe-clean-target-libiberty clean-target-libiberty
-+maybe-clean-target-libiberty:
-+ at if target-libiberty
-+maybe-clean-target-libiberty: clean-target-libiberty
-+
-+clean-target-libiberty: 
-+	@: $(MAKE); $(unstage)
-+	@[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0; \
-+	r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	$(NORMAL_TARGET_EXPORTS) \
-+	echo "Doing clean in $(TARGET_SUBDIR)/libiberty"; \
-+	for flag in $(EXTRA_TARGET_FLAGS); do \
-+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-+	done; \
-+	(cd $(TARGET_SUBDIR)/libiberty && \
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-+	          "RANLIB=$${RANLIB}" \
-+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-+	           clean) \
-+	  || exit 1
-+
-+ at endif target-libiberty
-+
-+.PHONY: maybe-distclean-target-libiberty distclean-target-libiberty
-+maybe-distclean-target-libiberty:
-+ at if target-libiberty
-+maybe-distclean-target-libiberty: distclean-target-libiberty
-+
-+distclean-target-libiberty: 
-+	@: $(MAKE); $(unstage)
-+	@[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0; \
-+	r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	$(NORMAL_TARGET_EXPORTS) \
-+	echo "Doing distclean in $(TARGET_SUBDIR)/libiberty"; \
-+	for flag in $(EXTRA_TARGET_FLAGS); do \
-+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-+	done; \
-+	(cd $(TARGET_SUBDIR)/libiberty && \
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-+	          "RANLIB=$${RANLIB}" \
-+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-+	           distclean) \
-+	  || exit 1
-+
-+ at endif target-libiberty
-+
-+.PHONY: maybe-maintainer-clean-target-libiberty maintainer-clean-target-libiberty
-+maybe-maintainer-clean-target-libiberty:
-+ at if target-libiberty
-+maybe-maintainer-clean-target-libiberty: maintainer-clean-target-libiberty
-+
-+maintainer-clean-target-libiberty: 
-+	@: $(MAKE); $(unstage)
-+	@[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0; \
-+	r=`${PWD_COMMAND}`; export r; \
-+	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+	$(NORMAL_TARGET_EXPORTS) \
-+	echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libiberty"; \
-+	for flag in $(EXTRA_TARGET_FLAGS); do \
-+	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-+	done; \
-+	(cd $(TARGET_SUBDIR)/libiberty && \
-+	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-+	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-+	          "RANLIB=$${RANLIB}" \
-+	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-+	           maintainer-clean) \
-+	  || exit 1
-+
-+ at endif target-libiberty
-+
-+
-+
-+
-+
- .PHONY: configure-target-libjava maybe-configure-target-libjava
- maybe-configure-target-libjava:
+ .PHONY: configure-target-zlib maybe-configure-target-zlib
+ maybe-configure-target-zlib:
  @if gcc-bootstrap
-@@ -45412,13 +45770,8 @@ maybe-check-target-libada:
- @if target-libada
- maybe-check-target-libada: check-target-libada
- 
-+# Dummy target for uncheckable module.
- check-target-libada:
--	@: $(MAKE); $(unstage)
--	@r=`${PWD_COMMAND}`; export r; \
--	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
--	$(NORMAL_TARGET_EXPORTS) \
--	(cd $(TARGET_SUBDIR)/libada && \
--	  $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
- 
- @endif target-libada
- 
-@@ -45427,13 +45780,8 @@ maybe-install-target-libada:
- @if target-libada
- maybe-install-target-libada: install-target-libada
- 
--install-target-libada: installdirs
--	@: $(MAKE); $(unstage)
--	@r=`${PWD_COMMAND}`; export r; \
--	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
--	$(NORMAL_TARGET_EXPORTS) \
--	(cd $(TARGET_SUBDIR)/libada && \
--	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
-+# Dummy target for uninstallable.
-+install-target-libada:
- 
- @endif target-libada
- 
-@@ -45442,13 +45790,8 @@ maybe-install-strip-target-libada:
- @if target-libada
- maybe-install-strip-target-libada: install-strip-target-libada
- 
--install-strip-target-libada: installdirs
--	@: $(MAKE); $(unstage)
--	@r=`${PWD_COMMAND}`; export r; \
--	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
--	$(NORMAL_TARGET_EXPORTS) \
--	(cd $(TARGET_SUBDIR)/libada && \
--	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
-+# Dummy target for uninstallable.
-+install-strip-target-libada:
- 
- @endif target-libada
- 
-@@ -45459,24 +45802,8 @@ maybe-info-target-libada:
- @if target-libada
- maybe-info-target-libada: info-target-libada
- 
--info-target-libada: \
--    configure-target-libada 
--	@: $(MAKE); $(unstage)
--	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0; \
--	r=`${PWD_COMMAND}`; export r; \
--	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
--	$(NORMAL_TARGET_EXPORTS) \
--	echo "Doing info in $(TARGET_SUBDIR)/libada"; \
--	for flag in $(EXTRA_TARGET_FLAGS); do \
--	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
--	done; \
--	(cd $(TARGET_SUBDIR)/libada && \
--	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
--	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
--	          "RANLIB=$${RANLIB}" \
--	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
--	           info) \
--	  || exit 1
-+# libada doesn't support info.
-+info-target-libada:
- 
- @endif target-libada
- 
-@@ -45485,24 +45812,8 @@ maybe-dvi-target-libada:
- @if target-libada
- maybe-dvi-target-libada: dvi-target-libada
- 
--dvi-target-libada: \
--    configure-target-libada 
--	@: $(MAKE); $(unstage)
--	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0; \
--	r=`${PWD_COMMAND}`; export r; \
--	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
--	$(NORMAL_TARGET_EXPORTS) \
--	echo "Doing dvi in $(TARGET_SUBDIR)/libada"; \
--	for flag in $(EXTRA_TARGET_FLAGS); do \
--	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
--	done; \
--	(cd $(TARGET_SUBDIR)/libada && \
--	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
--	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
--	          "RANLIB=$${RANLIB}" \
--	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
--	           dvi) \
--	  || exit 1
-+# libada doesn't support dvi.
-+dvi-target-libada:
- 
- @endif target-libada
- 
-@@ -45537,24 +45848,8 @@ maybe-html-target-libada:
- @if target-libada
- maybe-html-target-libada: html-target-libada
- 
--html-target-libada: \
--    configure-target-libada 
--	@: $(MAKE); $(unstage)
--	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0; \
--	r=`${PWD_COMMAND}`; export r; \
--	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
--	$(NORMAL_TARGET_EXPORTS) \
--	echo "Doing html in $(TARGET_SUBDIR)/libada"; \
--	for flag in $(EXTRA_TARGET_FLAGS); do \
--	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
--	done; \
--	(cd $(TARGET_SUBDIR)/libada && \
--	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
--	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
--	          "RANLIB=$${RANLIB}" \
--	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
--	           html) \
--	  || exit 1
-+# libada doesn't support html.
-+html-target-libada:
- 
- @endif target-libada
- 
-@@ -45563,24 +45858,8 @@ maybe-TAGS-target-libada:
- @if target-libada
- maybe-TAGS-target-libada: TAGS-target-libada
- 
--TAGS-target-libada: \
--    configure-target-libada 
--	@: $(MAKE); $(unstage)
--	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0; \
--	r=`${PWD_COMMAND}`; export r; \
--	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
--	$(NORMAL_TARGET_EXPORTS) \
--	echo "Doing TAGS in $(TARGET_SUBDIR)/libada"; \
--	for flag in $(EXTRA_TARGET_FLAGS); do \
--	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
--	done; \
--	(cd $(TARGET_SUBDIR)/libada && \
--	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
--	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
--	          "RANLIB=$${RANLIB}" \
--	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
--	           TAGS) \
--	  || exit 1
-+# libada doesn't support TAGS.
-+TAGS-target-libada:
- 
- @endif target-libada
- 
-@@ -45589,25 +45868,8 @@ maybe-install-info-target-libada:
- @if target-libada
- maybe-install-info-target-libada: install-info-target-libada
- 
--install-info-target-libada: \
--    configure-target-libada \
--    info-target-libada 
--	@: $(MAKE); $(unstage)
--	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0; \
--	r=`${PWD_COMMAND}`; export r; \
--	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
--	$(NORMAL_TARGET_EXPORTS) \
--	echo "Doing install-info in $(TARGET_SUBDIR)/libada"; \
--	for flag in $(EXTRA_TARGET_FLAGS); do \
--	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
--	done; \
--	(cd $(TARGET_SUBDIR)/libada && \
--	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
--	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
--	          "RANLIB=$${RANLIB}" \
--	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
--	           install-info) \
--	  || exit 1
-+# libada doesn't support install-info.
-+install-info-target-libada:
- 
- @endif target-libada
- 
-@@ -45670,24 +45932,8 @@ maybe-installcheck-target-libada:
- @if target-libada
- maybe-installcheck-target-libada: installcheck-target-libada
- 
--installcheck-target-libada: \
--    configure-target-libada 
--	@: $(MAKE); $(unstage)
--	@[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0; \
--	r=`${PWD_COMMAND}`; export r; \
--	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
--	$(NORMAL_TARGET_EXPORTS) \
--	echo "Doing installcheck in $(TARGET_SUBDIR)/libada"; \
--	for flag in $(EXTRA_TARGET_FLAGS); do \
--	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
--	done; \
--	(cd $(TARGET_SUBDIR)/libada && \
--	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
--	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
--	          "RANLIB=$${RANLIB}" \
--	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
--	           installcheck) \
--	  || exit 1
-+# libada doesn't support installcheck.
-+installcheck-target-libada:
- 
- @endif target-libada
- 
-@@ -49993,6 +50239,7 @@ configure-target-libtermcap: stage_last
- configure-target-winsup: stage_last
- configure-target-libgloss: stage_last
- configure-target-libffi: stage_last
-+configure-target-libiberty: stage_last
- configure-target-libjava: stage_last
- configure-target-zlib: stage_last
- configure-target-boehm-gc: stage_last
-@@ -50027,6 +50274,7 @@ configure-target-libtermcap: maybe-all-g
- configure-target-winsup: maybe-all-gcc
- configure-target-libgloss: maybe-all-gcc
- configure-target-libffi: maybe-all-gcc
-+configure-target-libiberty: maybe-all-gcc
- configure-target-libjava: maybe-all-gcc
- configure-target-zlib: maybe-all-gcc
- configure-target-boehm-gc: maybe-all-gcc
-@@ -50403,6 +50651,7 @@ all-stage3-fixincludes: maybe-all-stage3
- all-stage4-fixincludes: maybe-all-stage4-libiberty
- all-stageprofile-fixincludes: maybe-all-stageprofile-libiberty
+@@ -55238,6 +55138,7 @@ all-stageprofile-fixincludes: maybe-all-
  all-stagefeedback-fixincludes: maybe-all-stagefeedback-libiberty
+ all-stageautoprofile-fixincludes: maybe-all-stageautoprofile-libiberty
+ all-stageautofeedback-fixincludes: maybe-all-stageautofeedback-libiberty
 +all-target-libada: maybe-all-gcc
  all-gnattools: maybe-all-target-libada
  all-gnattools: maybe-all-target-libstdc++-v3
  all-lto-plugin: maybe-all-libiberty
-@@ -50994,6 +51243,7 @@ configure-target-libtermcap: maybe-all-t
- configure-target-winsup: maybe-all-target-libgcc
- configure-target-libgloss: maybe-all-target-libgcc
- configure-target-libffi: maybe-all-target-libgcc
-+configure-target-libiberty: maybe-all-target-libgcc
- configure-target-libjava: maybe-all-target-libgcc
- configure-target-zlib: maybe-all-target-libgcc
- configure-target-boehm-gc: maybe-all-target-libgcc
-@@ -51041,6 +51291,7 @@ configure-target-winsup: maybe-all-targe
- configure-target-libffi: maybe-all-target-newlib maybe-all-target-libgloss
- configure-target-libffi: maybe-all-target-libstdc++-v3
- 
-+
- configure-target-libjava: maybe-all-target-newlib maybe-all-target-libgloss
- configure-target-libjava: maybe-all-target-libstdc++-v3
- 
-Index: b/src/configure.ac
+Index: gcc-7-7-20161112/src/configure.ac
 ===================================================================
---- a/src/configure.ac
-+++ b/src/configure.ac
-@@ -147,6 +147,11 @@ libgcj="target-libffi \
- 	target-zlib \
- 	target-libjava"
+--- gcc-7-7-20161112.orig/src/configure.ac
++++ gcc-7-7-20161112/src/configure.ac
+@@ -142,6 +142,11 @@ host_libs="intl libiberty opcodes bfd re
+ # If --enable-gold is used, "gold" may replace "ld".
+ host_tools="texinfo flex bison binutils gas ld fixincludes gcc cgen sid sim gdb gprof etc expect dejagnu m4 utils guile fastjar gnattools libcc1 gotools"
  
 +case "${target}" in
 +  hppa64-*linux*) ;;
@@ -1155,18 +317,18 @@ Index: b/src/configure.ac
  # these libraries are built for the target environment, and are built after
  # the host libraries and the host tools (which may be a cross compiler)
  # Note that libiberty is not a target library.
-@@ -170,6 +175,7 @@ target_libraries="target-libgcc \
- 		${libgcj} \
+@@ -165,6 +170,7 @@ target_libraries="target-libgcc \
+ 		target-libffi \
  		target-libobjc \
  		target-libada \
 +		${target_libiberty} \
  		target-libgo"
  
  # these tools are built using the target libraries, and are intended to
-Index: b/src/gcc/ada/gcc-interface/Make-lang.in
+Index: gcc-7-7-20161112/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
+--- gcc-7-7-20161112.orig/src/gcc/ada/gcc-interface/Make-lang.in
++++ gcc-7-7-20161112/src/gcc/ada/gcc-interface/Make-lang.in
 @@ -58,11 +58,7 @@ WARN_ADAFLAGS= -W -Wall
  # need to be built by a recent/matching native so we might as well leave the
  # checks fully active.
@@ -1179,10 +341,10 @@ Index: b/src/gcc/ada/gcc-interface/Make-lang.in
  
  ALL_ADAFLAGS = \
    $(CFLAGS) $(ADA_CFLAGS) $(ADAFLAGS) $(CHECKING_ADAFLAGS) $(WARN_ADAFLAGS)
-Index: b/src/libada/configure.ac
+Index: gcc-7-7-20161112/src/libada/configure.ac
 ===================================================================
---- a/src/libada/configure.ac
-+++ b/src/libada/configure.ac
+--- gcc-7-7-20161112.orig/src/libada/configure.ac
++++ gcc-7-7-20161112/src/libada/configure.ac
 @@ -127,8 +127,7 @@ AC_PROG_AWK
  AC_PROG_LN_S
  
diff --git a/debian/patches/ada-link-shlib.diff b/debian/patches/ada-link-shlib.diff
index 2a258d2..a152adb 100644
--- a/debian/patches/ada-link-shlib.diff
+++ b/debian/patches/ada-link-shlib.diff
@@ -1,10 +1,10 @@
 # DP: In gnatlink, pass the options and libraries after objects to the
 # DP: linker to avoid link failures with --as-needed. Closes: #680292.
 
-Index: b/src/gcc/ada/mlib-tgt-specific-linux.adb
+Index: gcc-7-7-20161112/src/gcc/ada/mlib-tgt-specific-linux.adb
 ===================================================================
---- a/src/gcc/ada/mlib-tgt-specific-linux.adb
-+++ b/src/gcc/ada/mlib-tgt-specific-linux.adb
+--- gcc-7-7-20161112.orig/src/gcc/ada/mlib-tgt-specific-linux.adb
++++ gcc-7-7-20161112/src/gcc/ada/mlib-tgt-specific-linux.adb
 @@ -81,19 +81,54 @@ package body MLib.Tgt.Specific is
        Version_Arg          : String_Access;
        Symbolic_Link_Needed : Boolean := False;
@@ -87,3 +87,62 @@ Index: b/src/gcc/ada/mlib-tgt-specific-linux.adb
                 Symbolic_Link_Needed :=
                   Lib_Dir & Directory_Separator & Lib_Version /= Lib_Path;
              end if;
+Index: gcc-7-7-20161112/src/gcc/ada/gcc-interface/Makefile.in
+===================================================================
+--- gcc-7-7-20161112.orig/src/gcc/ada/gcc-interface/Makefile.in
++++ gcc-7-7-20161112/src/gcc/ada/gcc-interface/Makefile.in
+@@ -2644,8 +2644,8 @@ install-gnatlib: ../stamp-gnatlib-$(RTSD
+ #     Also install the .dSYM directories if they exist (these directories
+ #     contain the debug information for the shared libraries on darwin)
+ 	for file in gnat gnarl; do \
+-	   if [ -f $(RTSDIR)/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext) ]; then \
+-	      $(INSTALL) $(RTSDIR)/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext) \
++	   if [ -f $(RTSDIR)/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext).1 ]; then \
++	      $(INSTALL) $(RTSDIR)/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext).1 \
+ 			 $(DESTDIR)$(ADA_RTL_OBJ_DIR); \
+ 	   fi; \
+ 	   if [ -f $(RTSDIR)/lib$${file}$(soext) ]; then \
+@@ -2697,7 +2697,6 @@ install-gnatlib-sjlj: ../stamp-gnatlib-$
+ 	cd $(DESTDIR)$(ADA_INCLUDE_DIR_SJLJ); $(CHMOD) a-wx *.ads
+ 
+ ../stamp-gnatlib1-$(RTSDIR): Makefile ../stamp-gnatlib2-$(RTSDIR)
+-	$(RMDIR) $(RTSDIR)
+ 	$(MKDIR) $(RTSDIR)
+ 	$(CHMOD) u+w $(RTSDIR)
+ # Copy target independent sources
+@@ -2806,25 +2805,26 @@ gnatlib-shared-default:
+ 	     MULTISUBDIR="$(MULTISUBDIR)" \
+ 	     THREAD_KIND="$(THREAD_KIND)" \
+              gnatlib
+-	$(RM) $(RTSDIR)/libgna*$(soext)
++	$(RM) $(RTSDIR)/libgna*$(soext) $(RTSDIR)/libgna*$(soext).1
+ 	cd $(RTSDIR); `echo "$(GCC_FOR_TARGET)" \
+                 | sed -e 's,\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'` -shared $(GNATLIBCFLAGS) \
+ 		$(PICFLAG_FOR_TARGET) \
+-		-o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
++		-o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext).1 \
+ 		$(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) \
+-		$(SO_OPTS)libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
++		$(SO_OPTS)libgnat$(hyphen)$(LIBRARY_VERSION)$(soext).1 \
+ 		$(MISCLIB) -lm $(GNATLIBLDFLAGS)
+ 	cd $(RTSDIR); `echo "$(GCC_FOR_TARGET)" \
+                 | sed -e 's,\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'` -shared $(GNATLIBCFLAGS) \
+ 		$(PICFLAG_FOR_TARGET) \
+-		-o libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
++		-o libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext).1 \
+ 		$(GNATRTL_TASKING_OBJS) \
+-		$(SO_OPTS)libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
++		$(SO_OPTS)libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext).1 \
+ 		$(THREADSLIB) $(GNATLIBLDFLAGS)
+-	cd $(RTSDIR); $(LN_S) libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
+-		libgnat$(soext)
+-	cd $(RTSDIR); $(LN_S) libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
+-		libgnarl$(soext)
++	cd $(RTSDIR); for lib in gnat gnarl; do \
++		ls -l *.so*; \
++		l=lib$${lib}$(hyphen)$(LIBRARY_VERSION)$(soext); \
++		$(LN_S) $$l.1 $$l; \
++	done
+ 
+ 	# Create static libgnat and libgnarl compiled with -fPIC
+ 	$(RM) $(RTSDIR)/libgnat_pic$(arext) $(RTSDIR)/libgnarl_pic$(arext)
diff --git a/debian/patches/ada-sjlj.diff b/debian/patches/ada-sjlj.diff
index 655793d..a01c362 100644
--- a/debian/patches/ada-sjlj.diff
+++ b/debian/patches/ada-sjlj.diff
@@ -1,7 +1,7 @@
-Index: b/src/libada-sjlj/Makefile.in
+Index: gcc-7-7-20161112/src/libada-sjlj/Makefile.in
 ===================================================================
 --- /dev/null
-+++ b/src/libada-sjlj/Makefile.in
++++ gcc-7-7-20161112/src/libada-sjlj/Makefile.in
 @@ -0,0 +1,201 @@
 +# Makefile for libada.
 +#   Copyright (C) 2003-2015 Free Software Foundation, Inc.
@@ -128,7 +128,7 @@ Index: b/src/libada-sjlj/Makefile.in
 +	$(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) ./bldtools/oscons/xoscons
 +
 +install-gnatlib: $(GCC_DIR)/ada/Makefile
-+	$(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) install-gnatlib-sjlj
++	$(MAKE) -C $(GCC_DIR)/ada $(AM_MAKEFLAGS) $(LIBADA_FLAGS_TO_PASS) install-gnatlib-sjlj
 +
 +# Check uninstalled version.
 +check:
@@ -204,13 +204,13 @@ Index: b/src/libada-sjlj/Makefile.in
 +# Don't export variables to the environment, in order to not confuse
 +# configure.
 +.NOEXPORT:
-Index: b/src/libada-sjlj/configure.ac
+Index: gcc-7-7-20161112/src/libada-sjlj/configure.ac
 ===================================================================
 --- /dev/null
-+++ b/src/libada-sjlj/configure.ac
-@@ -0,0 +1,140 @@
++++ gcc-7-7-20161112/src/libada-sjlj/configure.ac
+@@ -0,0 +1,149 @@
 +# Configure script for libada.
-+#   Copyright (C) 2003-2015 Free Software Foundation, Inc.
++#   Copyright (C) 2003-2016 Free Software Foundation, Inc.
 +#
 +# This file is free software; you can redistribute it and/or modify it
 +# under the terms of the GNU General Public License as published by
@@ -337,6 +337,15 @@ Index: b/src/libada-sjlj/configure.ac
 +AC_PROG_AWK
 +AC_PROG_LN_S
 +
++# Determine what to build for 'gnatlib'
++if test ${enable_shared} = yes ; then
++  # Note that build=target is almost certainly the wrong test; FIXME
++  default_gnatlib_target="gnatlib-shared"
++else
++  default_gnatlib_target="gnatlib-plain"
++fi
++AC_SUBST([default_gnatlib_target])
++
 +# Check for _Unwind_GetIPInfo
 +GCC_CHECK_UNWIND_GETIPINFO
 +have_getipinfo=
@@ -349,181 +358,289 @@ Index: b/src/libada-sjlj/configure.ac
 +AC_CONFIG_FILES([Makefile])
 +
 +AC_OUTPUT
-Index: b/src/Makefile.def
+Index: gcc-7-7-20161112/src/Makefile.def
 ===================================================================
---- a/src/Makefile.def
-+++ b/src/Makefile.def
-@@ -183,6 +183,13 @@ target_modules = { module= libada; no_in
- 		   missing= TAGS;
- 		   missing= install-info;
- 		   missing= installcheck; };
-+target_modules = { module= libada-sjlj; no_install=true; no_check=true;
-+		   missing= info;
-+		   missing= dvi;
-+		   missing= html;
-+		   missing= TAGS;
-+		   missing= install-info;
-+		   missing= installcheck; };
- target_modules = { module= libgnatvsn; no_check=true;
- 		   missing= info;
- 		   missing= dvi;
-@@ -394,6 +401,7 @@ dependencies = { module=all-libcpp; on=a
+--- gcc-7-7-20161112.orig/src/Makefile.def
++++ gcc-7-7-20161112/src/Makefile.def
+@@ -175,6 +175,7 @@ target_modules = { module= zlib; };
+ target_modules = { module= boehm-gc; };
+ target_modules = { module= rda; };
+ target_modules = { module= libada; };
++target_modules = { module= libada-sjlj; };
+ target_modules = { module= libgomp; bootstrap= true; lib_path=.libs; };
+ target_modules = { module= libitm; lib_path=.libs; };
+ target_modules = { module= libatomic; lib_path=.libs; };
+@@ -372,6 +373,7 @@ dependencies = { module=all-libcpp; on=a
  dependencies = { module=all-fixincludes; on=all-libiberty; };
  
  dependencies = { module=all-target-libada; on=all-gcc; };
 +dependencies = { module=all-target-libada-sjlj; on=all-target-libada; };
  dependencies = { module=all-gnattools; on=all-target-libada; };
- dependencies = { module=all-gnattools; on=all-target-libgnatvsn; };
- dependencies = { module=all-gnattools; on=all-target-libgnatprj; };
-Index: b/src/Makefile.in
+ dependencies = { module=all-gnattools; on=all-target-libstdc++-v3; };
+ 
+Index: gcc-7-7-20161112/src/configure.ac
+===================================================================
+--- gcc-7-7-20161112.orig/src/configure.ac
++++ gcc-7-7-20161112/src/configure.ac
+@@ -170,6 +170,7 @@ target_libraries="target-libgcc \
+ 		target-libffi \
+ 		target-libobjc \
+ 		target-libada \
++		target-libada-sjlj \
+ 		${target_libiberty} \
+ 		target-libgo"
+ 
+@@ -455,7 +456,7 @@ AC_ARG_ENABLE(libada,
+ ENABLE_LIBADA=$enableval,
+ ENABLE_LIBADA=yes)
+ if test "${ENABLE_LIBADA}" != "yes" ; then
+-  noconfigdirs="$noconfigdirs gnattools"
++  noconfigdirs="$noconfigdirs gnattools target-libada-sjlj"
+ fi
+ 
+ AC_ARG_ENABLE(libssp,
+Index: gcc-7-7-20161112/src/gcc/ada/gcc-interface/Makefile.in
+===================================================================
+--- gcc-7-7-20161112.orig/src/gcc/ada/gcc-interface/Makefile.in
++++ gcc-7-7-20161112/src/gcc/ada/gcc-interface/Makefile.in
+@@ -190,7 +190,7 @@ TOOLSCASE =
+ 
+ # Multilib handling
+ MULTISUBDIR =
+-RTSDIR = rts$(subst /,_,$(MULTISUBDIR))
++RTSDIR := rts$(subst /,_,$(MULTISUBDIR))
+ 
+ # Link flags used to build gnat tools.  By default we prefer to statically
+ # link with libgcc to avoid a dependency on shared libgcc (which is tricky
+@@ -2676,6 +2676,26 @@ install-gnatlib: ../stamp-gnatlib-$(RTSD
+ 	touch ../stamp-gnatlib2-$(RTSDIR)
+ 	$(RM) ../stamp-gnatlib-$(RTSDIR)
+ 
++install-gnatlib-sjlj: ../stamp-gnatlib-$(RTSDIR)
++#	Create the directory before deleting it, in case the directory is
++#	a list of directories (as it may be on VMS). This ensures we are
++#	deleting the right one.
++	-$(MKDIR) $(DESTDIR)$(ADA_RTL_OBJ_DIR_SJLJ)
++	-$(MKDIR) $(DESTDIR)$(ADA_INCLUDE_DIR_SJLJ)
++	$(RMDIR) $(DESTDIR)$(ADA_RTL_OBJ_DIR_SJLJ)
++	$(RMDIR) $(DESTDIR)$(ADA_INCLUDE_DIR_SJLJ)
++	-$(MKDIR) $(DESTDIR)$(ADA_RTL_OBJ_DIR_SJLJ)
++	-$(MKDIR) $(DESTDIR)$(ADA_INCLUDE_DIR_SJLJ)
++	for file in $(RTSDIR)/*.ali; do \
++	    $(INSTALL_DATA_DATE) $$file $(DESTDIR)$(ADA_RTL_OBJ_DIR_SJLJ); \
++	done
++	# This copy must be done preserving the date on the original file.
++	for file in $(RTSDIR)/*.ad?; do \
++	    $(INSTALL_DATA_DATE) $$file $(DESTDIR)$(ADA_INCLUDE_DIR_SJLJ); \
++	done
++	cd $(DESTDIR)$(ADA_INCLUDE_DIR_SJLJ); $(CHMOD) a-wx *.adb
++	cd $(DESTDIR)$(ADA_INCLUDE_DIR_SJLJ); $(CHMOD) a-wx *.ads
++
+ ../stamp-gnatlib1-$(RTSDIR): Makefile ../stamp-gnatlib2-$(RTSDIR)
+ 	$(RMDIR) $(RTSDIR)
+ 	$(MKDIR) $(RTSDIR)
+@@ -2938,7 +2958,7 @@ gnatlib-shared:
+ # commenting the pragma instead of deleting the line, as the latter might
+ # result in getting multiple blank lines, hence possible style check errors.
+ gnatlib-sjlj:
+-	$(MAKE) $(FLAGS_TO_PASS) EH_MECHANISM="" \
++	$(MAKE) $(FLAGS_TO_PASS) EH_MECHANISM="" RTSDIR="$(RTSDIR)" \
+ 	THREAD_KIND="$(THREAD_KIND)" ../stamp-gnatlib1-$(RTSDIR)
+ 	sed \
+ 	  -e 's/Frontend_Exceptions.*/Frontend_Exceptions       : constant Boolean := True;/' \
+@@ -2947,6 +2967,7 @@ gnatlib-sjlj:
+ 	  $(RTSDIR)/system.ads > $(RTSDIR)/s.ads
+ 	$(MV) $(RTSDIR)/s.ads $(RTSDIR)/system.ads
+ 	$(MAKE) $(FLAGS_TO_PASS) \
++	     RTSDIR="$(RTSDIR)" \
+ 	     EH_MECHANISM="" \
+ 	     GNATLIBFLAGS="$(GNATLIBFLAGS)" \
+ 	     GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \
+@@ -2999,6 +3020,8 @@ b_gnatm.o : b_gnatm.adb
+ 
+ ADA_INCLUDE_DIR = $(libsubdir)/adainclude
+ ADA_RTL_OBJ_DIR = $(libsubdir)/adalib
++ADA_INCLUDE_DIR_SJLJ = $(libsubdir)/rts-sjlj/adainclude
++ADA_RTL_OBJ_DIR_SJLJ = $(libsubdir)/rts-sjlj/adalib
+ 
+ # Special flags
+ 
+Index: gcc-7-7-20161112/src/gcc/ada/gcc-interface/config-lang.in
+===================================================================
+--- gcc-7-7-20161112.orig/src/gcc/ada/gcc-interface/config-lang.in
++++ gcc-7-7-20161112/src/gcc/ada/gcc-interface/config-lang.in
+@@ -34,8 +34,8 @@ gtfiles="\$(srcdir)/ada/gcc-interface/ad
+ 
+ outputs="ada/gcc-interface/Makefile ada/Makefile"
+ 
+-target_libs="target-libada"
+-lang_dirs="libada gnattools"
++target_libs="target-libada target-libada-sjlj"
++lang_dirs="libada gnattools libada-sjlj"
+ 
+ # Ada is not enabled by default for the time being.
+ build_by_default=no
+Index: gcc-7-7-20161112/src/gcc/ada/gcc-interface/Make-lang.in
+===================================================================
+--- gcc-7-7-20161112.orig/src/gcc/ada/gcc-interface/Make-lang.in
++++ gcc-7-7-20161112/src/gcc/ada/gcc-interface/Make-lang.in
+@@ -784,6 +784,7 @@ ada.install-common:
+ 
+ install-gnatlib:
+ 	$(MAKE) -C ada $(COMMON_FLAGS_TO_PASS) $(ADA_FLAGS_TO_PASS) install-gnatlib$(LIBGNAT_TARGET)
++	$(MAKE) -C ada $(COMMON_FLAGS_TO_PASS) $(ADA_FLAGS_TO_PASS) RTSDIR="rts-sjlj" install-gnatlib-sjlj$(LIBGNAT_TARGET)
+ 
+ install-gnatlib-obj:
+ 	$(MAKE) -C ada $(COMMON_FLAGS_TO_PASS) $(ADA_FLAGS_TO_PASS) install-gnatlib-obj
+Index: gcc-7-7-20161112/src/Makefile.in
 ===================================================================
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -976,6 +976,7 @@ configure-target:  \
+--- gcc-7-7-20161112.orig/src/Makefile.in
++++ gcc-7-7-20161112/src/Makefile.in
+@@ -1009,6 +1009,7 @@ configure-target:  \
      maybe-configure-target-boehm-gc \
      maybe-configure-target-rda \
      maybe-configure-target-libada \
 +    maybe-configure-target-libada-sjlj \
-     maybe-configure-target-libgnatvsn \
-     maybe-configure-target-libgnatprj \
      maybe-configure-target-libgomp \
-@@ -1146,6 +1147,7 @@ all-target: maybe-all-target-zlib
+     maybe-configure-target-libitm \
+     maybe-configure-target-libatomic
+@@ -1175,6 +1176,7 @@ all-target: maybe-all-target-zlib
  all-target: maybe-all-target-boehm-gc
  all-target: maybe-all-target-rda
  all-target: maybe-all-target-libada
 +all-target: maybe-all-target-libada-sjlj
- all-target: maybe-all-target-libgnatvsn
- all-target: maybe-all-target-libgnatprj
  @if target-libgomp-no-bootstrap
-@@ -1243,6 +1245,7 @@ info-target: maybe-info-target-zlib
+ all-target: maybe-all-target-libgomp
+ @endif target-libgomp-no-bootstrap
+@@ -1268,6 +1270,7 @@ info-target: maybe-info-target-zlib
  info-target: maybe-info-target-boehm-gc
  info-target: maybe-info-target-rda
  info-target: maybe-info-target-libada
 +info-target: maybe-info-target-libada-sjlj
- info-target: maybe-info-target-libgnatvsn
- info-target: maybe-info-target-libgnatprj
  info-target: maybe-info-target-libgomp
-@@ -1333,6 +1336,7 @@ dvi-target: maybe-dvi-target-zlib
+ info-target: maybe-info-target-libitm
+ info-target: maybe-info-target-libatomic
+@@ -1354,6 +1357,7 @@ dvi-target: maybe-dvi-target-zlib
  dvi-target: maybe-dvi-target-boehm-gc
  dvi-target: maybe-dvi-target-rda
  dvi-target: maybe-dvi-target-libada
 +dvi-target: maybe-dvi-target-libada-sjlj
- dvi-target: maybe-dvi-target-libgnatvsn
- dvi-target: maybe-dvi-target-libgnatprj
  dvi-target: maybe-dvi-target-libgomp
-@@ -1423,6 +1427,7 @@ pdf-target: maybe-pdf-target-zlib
+ dvi-target: maybe-dvi-target-libitm
+ dvi-target: maybe-dvi-target-libatomic
+@@ -1440,6 +1444,7 @@ pdf-target: maybe-pdf-target-zlib
  pdf-target: maybe-pdf-target-boehm-gc
  pdf-target: maybe-pdf-target-rda
  pdf-target: maybe-pdf-target-libada
 +pdf-target: maybe-pdf-target-libada-sjlj
- pdf-target: maybe-pdf-target-libgnatvsn
- pdf-target: maybe-pdf-target-libgnatprj
  pdf-target: maybe-pdf-target-libgomp
-@@ -1513,6 +1518,7 @@ html-target: maybe-html-target-zlib
+ pdf-target: maybe-pdf-target-libitm
+ pdf-target: maybe-pdf-target-libatomic
+@@ -1526,6 +1531,7 @@ html-target: maybe-html-target-zlib
  html-target: maybe-html-target-boehm-gc
  html-target: maybe-html-target-rda
  html-target: maybe-html-target-libada
 +html-target: maybe-html-target-libada-sjlj
- html-target: maybe-html-target-libgnatvsn
- html-target: maybe-html-target-libgnatprj
  html-target: maybe-html-target-libgomp
-@@ -1603,6 +1609,7 @@ TAGS-target: maybe-TAGS-target-zlib
+ html-target: maybe-html-target-libitm
+ html-target: maybe-html-target-libatomic
+@@ -1612,6 +1618,7 @@ TAGS-target: maybe-TAGS-target-zlib
  TAGS-target: maybe-TAGS-target-boehm-gc
  TAGS-target: maybe-TAGS-target-rda
  TAGS-target: maybe-TAGS-target-libada
 +TAGS-target: maybe-TAGS-target-libada-sjlj
- TAGS-target: maybe-TAGS-target-libgnatvsn
- TAGS-target: maybe-TAGS-target-libgnatprj
  TAGS-target: maybe-TAGS-target-libgomp
-@@ -1693,6 +1700,7 @@ install-info-target: maybe-install-info-
+ TAGS-target: maybe-TAGS-target-libitm
+ TAGS-target: maybe-TAGS-target-libatomic
+@@ -1698,6 +1705,7 @@ install-info-target: maybe-install-info-
  install-info-target: maybe-install-info-target-boehm-gc
  install-info-target: maybe-install-info-target-rda
  install-info-target: maybe-install-info-target-libada
 +install-info-target: maybe-install-info-target-libada-sjlj
- install-info-target: maybe-install-info-target-libgnatvsn
- install-info-target: maybe-install-info-target-libgnatprj
  install-info-target: maybe-install-info-target-libgomp
-@@ -1783,6 +1791,7 @@ install-pdf-target: maybe-install-pdf-ta
+ install-info-target: maybe-install-info-target-libitm
+ install-info-target: maybe-install-info-target-libatomic
+@@ -1784,6 +1792,7 @@ install-pdf-target: maybe-install-pdf-ta
  install-pdf-target: maybe-install-pdf-target-boehm-gc
  install-pdf-target: maybe-install-pdf-target-rda
  install-pdf-target: maybe-install-pdf-target-libada
 +install-pdf-target: maybe-install-pdf-target-libada-sjlj
- install-pdf-target: maybe-install-pdf-target-libgnatvsn
- install-pdf-target: maybe-install-pdf-target-libgnatprj
  install-pdf-target: maybe-install-pdf-target-libgomp
-@@ -1873,6 +1882,7 @@ install-html-target: maybe-install-html-
+ install-pdf-target: maybe-install-pdf-target-libitm
+ install-pdf-target: maybe-install-pdf-target-libatomic
+@@ -1870,6 +1879,7 @@ install-html-target: maybe-install-html-
  install-html-target: maybe-install-html-target-boehm-gc
  install-html-target: maybe-install-html-target-rda
  install-html-target: maybe-install-html-target-libada
 +install-html-target: maybe-install-html-target-libada-sjlj
- install-html-target: maybe-install-html-target-libgnatvsn
- install-html-target: maybe-install-html-target-libgnatprj
  install-html-target: maybe-install-html-target-libgomp
-@@ -1963,6 +1973,7 @@ installcheck-target: maybe-installcheck-
+ install-html-target: maybe-install-html-target-libitm
+ install-html-target: maybe-install-html-target-libatomic
+@@ -1956,6 +1966,7 @@ installcheck-target: maybe-installcheck-
  installcheck-target: maybe-installcheck-target-boehm-gc
  installcheck-target: maybe-installcheck-target-rda
  installcheck-target: maybe-installcheck-target-libada
 +installcheck-target: maybe-installcheck-target-libada-sjlj
- installcheck-target: maybe-installcheck-target-libgnatvsn
- installcheck-target: maybe-installcheck-target-libgnatprj
  installcheck-target: maybe-installcheck-target-libgomp
-@@ -2053,6 +2064,7 @@ mostlyclean-target: maybe-mostlyclean-ta
+ installcheck-target: maybe-installcheck-target-libitm
+ installcheck-target: maybe-installcheck-target-libatomic
+@@ -2042,6 +2053,7 @@ mostlyclean-target: maybe-mostlyclean-ta
  mostlyclean-target: maybe-mostlyclean-target-boehm-gc
  mostlyclean-target: maybe-mostlyclean-target-rda
  mostlyclean-target: maybe-mostlyclean-target-libada
 +mostlyclean-target: maybe-mostlyclean-target-libada-sjlj
- mostlyclean-target: maybe-mostlyclean-target-libgnatvsn
- mostlyclean-target: maybe-mostlyclean-target-libgnatprj
  mostlyclean-target: maybe-mostlyclean-target-libgomp
-@@ -2143,6 +2155,7 @@ clean-target: maybe-clean-target-zlib
+ mostlyclean-target: maybe-mostlyclean-target-libitm
+ mostlyclean-target: maybe-mostlyclean-target-libatomic
+@@ -2128,6 +2140,7 @@ clean-target: maybe-clean-target-zlib
  clean-target: maybe-clean-target-boehm-gc
  clean-target: maybe-clean-target-rda
  clean-target: maybe-clean-target-libada
 +clean-target: maybe-clean-target-libada-sjlj
- clean-target: maybe-clean-target-libgnatvsn
- clean-target: maybe-clean-target-libgnatprj
  clean-target: maybe-clean-target-libgomp
-@@ -2233,6 +2246,7 @@ distclean-target: maybe-distclean-target
+ clean-target: maybe-clean-target-libitm
+ clean-target: maybe-clean-target-libatomic
+@@ -2214,6 +2227,7 @@ distclean-target: maybe-distclean-target
  distclean-target: maybe-distclean-target-boehm-gc
  distclean-target: maybe-distclean-target-rda
  distclean-target: maybe-distclean-target-libada
 +distclean-target: maybe-distclean-target-libada-sjlj
- distclean-target: maybe-distclean-target-libgnatvsn
- distclean-target: maybe-distclean-target-libgnatprj
  distclean-target: maybe-distclean-target-libgomp
-@@ -2323,6 +2337,7 @@ maintainer-clean-target: maybe-maintaine
+ distclean-target: maybe-distclean-target-libitm
+ distclean-target: maybe-distclean-target-libatomic
+@@ -2300,6 +2314,7 @@ maintainer-clean-target: maybe-maintaine
  maintainer-clean-target: maybe-maintainer-clean-target-boehm-gc
  maintainer-clean-target: maybe-maintainer-clean-target-rda
  maintainer-clean-target: maybe-maintainer-clean-target-libada
 +maintainer-clean-target: maybe-maintainer-clean-target-libada-sjlj
- maintainer-clean-target: maybe-maintainer-clean-target-libgnatvsn
- maintainer-clean-target: maybe-maintainer-clean-target-libgnatprj
  maintainer-clean-target: maybe-maintainer-clean-target-libgomp
-@@ -2469,6 +2484,7 @@ check-target:  \
+ maintainer-clean-target: maybe-maintainer-clean-target-libitm
+ maintainer-clean-target: maybe-maintainer-clean-target-libatomic
+@@ -2442,6 +2457,7 @@ check-target:  \
      maybe-check-target-boehm-gc \
      maybe-check-target-rda \
      maybe-check-target-libada \
 +    maybe-check-target-libada-sjlj \
-     maybe-check-target-libgnatvsn \
-     maybe-check-target-libgnatprj \
      maybe-check-target-libgomp \
-@@ -2655,6 +2671,7 @@ install-target:  \
+     maybe-check-target-libitm \
+     maybe-check-target-libatomic
+@@ -2624,6 +2640,7 @@ install-target:  \
      maybe-install-target-boehm-gc \
      maybe-install-target-rda \
      maybe-install-target-libada \
 +    maybe-install-target-libada-sjlj \
-     maybe-install-target-libgnatvsn \
-     maybe-install-target-libgnatprj \
      maybe-install-target-libgomp \
-@@ -2765,6 +2782,7 @@ install-strip-target:  \
+     maybe-install-target-libitm \
+     maybe-install-target-libatomic
+@@ -2730,6 +2747,7 @@ install-strip-target:  \
      maybe-install-strip-target-boehm-gc \
      maybe-install-strip-target-rda \
      maybe-install-strip-target-libada \
 +    maybe-install-strip-target-libada-sjlj \
-     maybe-install-strip-target-libgnatvsn \
-     maybe-install-strip-target-libgnatprj \
      maybe-install-strip-target-libgomp \
-@@ -46077,6 +46095,352 @@ maintainer-clean-target-libada:
+     maybe-install-strip-target-libitm \
+     maybe-install-strip-target-libatomic
+@@ -49603,6 +49621,464 @@ maintainer-clean-target-libada:
  
  
  
@@ -539,8 +656,8 @@ Index: b/src/Makefile.in
 +	@r=`${PWD_COMMAND}`; export r; \
 +	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 +	echo "Checking multilib configuration for libada-sjlj..."; \
-+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libada-sjlj ; \
-+	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libada-sjlj/multilib.tmp 2> /dev/null ; \
++	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libada-sjlj; \
++	$(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libada-sjlj/multilib.tmp 2> /dev/null; \
 +	if test -r $(TARGET_SUBDIR)/libada-sjlj/multilib.out; then \
 +	  if cmp -s $(TARGET_SUBDIR)/libada-sjlj/multilib.tmp $(TARGET_SUBDIR)/libada-sjlj/multilib.out; then \
 +	    rm -f $(TARGET_SUBDIR)/libada-sjlj/multilib.tmp; \
@@ -552,7 +669,7 @@ Index: b/src/Makefile.in
 +	  mv $(TARGET_SUBDIR)/libada-sjlj/multilib.tmp $(TARGET_SUBDIR)/libada-sjlj/multilib.out; \
 +	fi; \
 +	test ! -f $(TARGET_SUBDIR)/libada-sjlj/Makefile || exit 0; \
-+	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libada-sjlj ; \
++	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libada-sjlj; \
 +	$(NORMAL_TARGET_EXPORTS)  \
 +	echo Configuring in $(TARGET_SUBDIR)/libada-sjlj; \
 +	cd "$(TARGET_SUBDIR)/libada-sjlj" || exit 1; \
@@ -602,8 +719,13 @@ Index: b/src/Makefile.in
 + at if target-libada-sjlj
 +maybe-check-target-libada-sjlj: check-target-libada-sjlj
 +
-+# Dummy target for uncheckable module.
 +check-target-libada-sjlj:
++	@: $(MAKE); $(unstage)
++	@r=`${PWD_COMMAND}`; export r; \
++	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++	$(NORMAL_TARGET_EXPORTS) \
++	(cd $(TARGET_SUBDIR)/libada-sjlj && \
++	  $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
 +
 + at endif target-libada-sjlj
 +
@@ -612,8 +734,13 @@ Index: b/src/Makefile.in
 + at if target-libada-sjlj
 +maybe-install-target-libada-sjlj: install-target-libada-sjlj
 +
-+# Dummy target for uninstallable.
-+install-target-libada-sjlj:
++install-target-libada-sjlj: installdirs
++	@: $(MAKE); $(unstage)
++	@r=`${PWD_COMMAND}`; export r; \
++	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++	$(NORMAL_TARGET_EXPORTS) \
++	(cd $(TARGET_SUBDIR)/libada-sjlj && \
++	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
 +
 + at endif target-libada-sjlj
 +
@@ -622,8 +749,13 @@ Index: b/src/Makefile.in
 + at if target-libada-sjlj
 +maybe-install-strip-target-libada-sjlj: install-strip-target-libada-sjlj
 +
-+# Dummy target for uninstallable.
-+install-strip-target-libada-sjlj:
++install-strip-target-libada-sjlj: installdirs
++	@: $(MAKE); $(unstage)
++	@r=`${PWD_COMMAND}`; export r; \
++	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++	$(NORMAL_TARGET_EXPORTS) \
++	(cd $(TARGET_SUBDIR)/libada-sjlj && \
++	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install-strip)
 +
 + at endif target-libada-sjlj
 +
@@ -634,8 +766,24 @@ Index: b/src/Makefile.in
 + at if target-libada-sjlj
 +maybe-info-target-libada-sjlj: info-target-libada-sjlj
 +
-+# libada-sjlj doesn't support info.
-+info-target-libada-sjlj:
++info-target-libada-sjlj: \
++    configure-target-libada-sjlj 
++	@: $(MAKE); $(unstage)
++	@[ -f $(TARGET_SUBDIR)/libada-sjlj/Makefile ] || exit 0; \
++	r=`${PWD_COMMAND}`; export r; \
++	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++	$(NORMAL_TARGET_EXPORTS) \
++	echo "Doing info in $(TARGET_SUBDIR)/libada-sjlj"; \
++	for flag in $(EXTRA_TARGET_FLAGS); do \
++	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
++	done; \
++	(cd $(TARGET_SUBDIR)/libada-sjlj && \
++	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
++	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
++	          "RANLIB=$${RANLIB}" \
++	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
++	           info) \
++	  || exit 1
 +
 + at endif target-libada-sjlj
 +
@@ -644,8 +792,24 @@ Index: b/src/Makefile.in
 + at if target-libada-sjlj
 +maybe-dvi-target-libada-sjlj: dvi-target-libada-sjlj
 +
-+# libada-sjlj doesn't support dvi.
-+dvi-target-libada-sjlj:
++dvi-target-libada-sjlj: \
++    configure-target-libada-sjlj 
++	@: $(MAKE); $(unstage)
++	@[ -f $(TARGET_SUBDIR)/libada-sjlj/Makefile ] || exit 0; \
++	r=`${PWD_COMMAND}`; export r; \
++	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++	$(NORMAL_TARGET_EXPORTS) \
++	echo "Doing dvi in $(TARGET_SUBDIR)/libada-sjlj"; \
++	for flag in $(EXTRA_TARGET_FLAGS); do \
++	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
++	done; \
++	(cd $(TARGET_SUBDIR)/libada-sjlj && \
++	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
++	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
++	          "RANLIB=$${RANLIB}" \
++	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
++	           dvi) \
++	  || exit 1
 +
 + at endif target-libada-sjlj
 +
@@ -657,11 +821,11 @@ Index: b/src/Makefile.in
 +pdf-target-libada-sjlj: \
 +    configure-target-libada-sjlj 
 +	@: $(MAKE); $(unstage)
-+	@[ -f $(TARGET_SUBDIR)/libada-sjlj/Makefile ] || exit 0 ; \
++	@[ -f $(TARGET_SUBDIR)/libada-sjlj/Makefile ] || exit 0; \
 +	r=`${PWD_COMMAND}`; export r; \
 +	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 +	$(NORMAL_TARGET_EXPORTS) \
-+	echo "Doing pdf in $(TARGET_SUBDIR)/libada-sjlj" ; \
++	echo "Doing pdf in $(TARGET_SUBDIR)/libada-sjlj"; \
 +	for flag in $(EXTRA_TARGET_FLAGS); do \
 +	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 +	done; \
@@ -680,8 +844,24 @@ Index: b/src/Makefile.in
 + at if target-libada-sjlj
 +maybe-html-target-libada-sjlj: html-target-libada-sjlj
 +
-+# libada-sjlj doesn't support html.
-+html-target-libada-sjlj:
++html-target-libada-sjlj: \
++    configure-target-libada-sjlj 
++	@: $(MAKE); $(unstage)
++	@[ -f $(TARGET_SUBDIR)/libada-sjlj/Makefile ] || exit 0; \
++	r=`${PWD_COMMAND}`; export r; \
++	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++	$(NORMAL_TARGET_EXPORTS) \
++	echo "Doing html in $(TARGET_SUBDIR)/libada-sjlj"; \
++	for flag in $(EXTRA_TARGET_FLAGS); do \
++	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
++	done; \
++	(cd $(TARGET_SUBDIR)/libada-sjlj && \
++	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
++	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
++	          "RANLIB=$${RANLIB}" \
++	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
++	           html) \
++	  || exit 1
 +
 + at endif target-libada-sjlj
 +
@@ -690,8 +870,24 @@ Index: b/src/Makefile.in
 + at if target-libada-sjlj
 +maybe-TAGS-target-libada-sjlj: TAGS-target-libada-sjlj
 +
-+# libada-sjlj doesn't support TAGS.
-+TAGS-target-libada-sjlj:
++TAGS-target-libada-sjlj: \
++    configure-target-libada-sjlj 
++	@: $(MAKE); $(unstage)
++	@[ -f $(TARGET_SUBDIR)/libada-sjlj/Makefile ] || exit 0; \
++	r=`${PWD_COMMAND}`; export r; \
++	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++	$(NORMAL_TARGET_EXPORTS) \
++	echo "Doing TAGS in $(TARGET_SUBDIR)/libada-sjlj"; \
++	for flag in $(EXTRA_TARGET_FLAGS); do \
++	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
++	done; \
++	(cd $(TARGET_SUBDIR)/libada-sjlj && \
++	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
++	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
++	          "RANLIB=$${RANLIB}" \
++	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
++	           TAGS) \
++	  || exit 1
 +
 + at endif target-libada-sjlj
 +
@@ -700,8 +896,25 @@ Index: b/src/Makefile.in
 + at if target-libada-sjlj
 +maybe-install-info-target-libada-sjlj: install-info-target-libada-sjlj
 +
-+# libada-sjlj doesn't support install-info.
-+install-info-target-libada-sjlj:
++install-info-target-libada-sjlj: \
++    configure-target-libada-sjlj \
++    info-target-libada-sjlj 
++	@: $(MAKE); $(unstage)
++	@[ -f $(TARGET_SUBDIR)/libada-sjlj/Makefile ] || exit 0; \
++	r=`${PWD_COMMAND}`; export r; \
++	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++	$(NORMAL_TARGET_EXPORTS) \
++	echo "Doing install-info in $(TARGET_SUBDIR)/libada-sjlj"; \
++	for flag in $(EXTRA_TARGET_FLAGS); do \
++	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
++	done; \
++	(cd $(TARGET_SUBDIR)/libada-sjlj && \
++	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
++	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
++	          "RANLIB=$${RANLIB}" \
++	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
++	           install-info) \
++	  || exit 1
 +
 + at endif target-libada-sjlj
 +
@@ -714,11 +927,11 @@ Index: b/src/Makefile.in
 +    configure-target-libada-sjlj \
 +    pdf-target-libada-sjlj 
 +	@: $(MAKE); $(unstage)
-+	@[ -f $(TARGET_SUBDIR)/libada-sjlj/Makefile ] || exit 0 ; \
++	@[ -f $(TARGET_SUBDIR)/libada-sjlj/Makefile ] || exit 0; \
 +	r=`${PWD_COMMAND}`; export r; \
 +	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 +	$(NORMAL_TARGET_EXPORTS) \
-+	echo "Doing install-pdf in $(TARGET_SUBDIR)/libada-sjlj" ; \
++	echo "Doing install-pdf in $(TARGET_SUBDIR)/libada-sjlj"; \
 +	for flag in $(EXTRA_TARGET_FLAGS); do \
 +	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 +	done; \
@@ -741,11 +954,11 @@ Index: b/src/Makefile.in
 +    configure-target-libada-sjlj \
 +    html-target-libada-sjlj 
 +	@: $(MAKE); $(unstage)
-+	@[ -f $(TARGET_SUBDIR)/libada-sjlj/Makefile ] || exit 0 ; \
++	@[ -f $(TARGET_SUBDIR)/libada-sjlj/Makefile ] || exit 0; \
 +	r=`${PWD_COMMAND}`; export r; \
 +	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 +	$(NORMAL_TARGET_EXPORTS) \
-+	echo "Doing install-html in $(TARGET_SUBDIR)/libada-sjlj" ; \
++	echo "Doing install-html in $(TARGET_SUBDIR)/libada-sjlj"; \
 +	for flag in $(EXTRA_TARGET_FLAGS); do \
 +	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 +	done; \
@@ -764,8 +977,24 @@ Index: b/src/Makefile.in
 + at if target-libada-sjlj
 +maybe-installcheck-target-libada-sjlj: installcheck-target-libada-sjlj
 +
-+# libada-sjlj doesn't support installcheck.
-+installcheck-target-libada-sjlj:
++installcheck-target-libada-sjlj: \
++    configure-target-libada-sjlj 
++	@: $(MAKE); $(unstage)
++	@[ -f $(TARGET_SUBDIR)/libada-sjlj/Makefile ] || exit 0; \
++	r=`${PWD_COMMAND}`; export r; \
++	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
++	$(NORMAL_TARGET_EXPORTS) \
++	echo "Doing installcheck in $(TARGET_SUBDIR)/libada-sjlj"; \
++	for flag in $(EXTRA_TARGET_FLAGS); do \
++	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
++	done; \
++	(cd $(TARGET_SUBDIR)/libada-sjlj && \
++	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
++	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
++	          "RANLIB=$${RANLIB}" \
++	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
++	           installcheck) \
++	  || exit 1
 +
 + at endif target-libada-sjlj
 +
@@ -776,11 +1005,11 @@ Index: b/src/Makefile.in
 +
 +mostlyclean-target-libada-sjlj: 
 +	@: $(MAKE); $(unstage)
-+	@[ -f $(TARGET_SUBDIR)/libada-sjlj/Makefile ] || exit 0 ; \
++	@[ -f $(TARGET_SUBDIR)/libada-sjlj/Makefile ] || exit 0; \
 +	r=`${PWD_COMMAND}`; export r; \
 +	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 +	$(NORMAL_TARGET_EXPORTS) \
-+	echo "Doing mostlyclean in $(TARGET_SUBDIR)/libada-sjlj" ; \
++	echo "Doing mostlyclean in $(TARGET_SUBDIR)/libada-sjlj"; \
 +	for flag in $(EXTRA_TARGET_FLAGS); do \
 +	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 +	done; \
@@ -801,11 +1030,11 @@ Index: b/src/Makefile.in
 +
 +clean-target-libada-sjlj: 
 +	@: $(MAKE); $(unstage)
-+	@[ -f $(TARGET_SUBDIR)/libada-sjlj/Makefile ] || exit 0 ; \
++	@[ -f $(TARGET_SUBDIR)/libada-sjlj/Makefile ] || exit 0; \
 +	r=`${PWD_COMMAND}`; export r; \
 +	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 +	$(NORMAL_TARGET_EXPORTS) \
-+	echo "Doing clean in $(TARGET_SUBDIR)/libada-sjlj" ; \
++	echo "Doing clean in $(TARGET_SUBDIR)/libada-sjlj"; \
 +	for flag in $(EXTRA_TARGET_FLAGS); do \
 +	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 +	done; \
@@ -826,11 +1055,11 @@ Index: b/src/Makefile.in
 +
 +distclean-target-libada-sjlj: 
 +	@: $(MAKE); $(unstage)
-+	@[ -f $(TARGET_SUBDIR)/libada-sjlj/Makefile ] || exit 0 ; \
++	@[ -f $(TARGET_SUBDIR)/libada-sjlj/Makefile ] || exit 0; \
 +	r=`${PWD_COMMAND}`; export r; \
 +	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 +	$(NORMAL_TARGET_EXPORTS) \
-+	echo "Doing distclean in $(TARGET_SUBDIR)/libada-sjlj" ; \
++	echo "Doing distclean in $(TARGET_SUBDIR)/libada-sjlj"; \
 +	for flag in $(EXTRA_TARGET_FLAGS); do \
 +	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 +	done; \
@@ -851,11 +1080,11 @@ Index: b/src/Makefile.in
 +
 +maintainer-clean-target-libada-sjlj: 
 +	@: $(MAKE); $(unstage)
-+	@[ -f $(TARGET_SUBDIR)/libada-sjlj/Makefile ] || exit 0 ; \
++	@[ -f $(TARGET_SUBDIR)/libada-sjlj/Makefile ] || exit 0; \
 +	r=`${PWD_COMMAND}`; export r; \
 +	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 +	$(NORMAL_TARGET_EXPORTS) \
-+	echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libada-sjlj" ; \
++	echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libada-sjlj"; \
 +	for flag in $(EXTRA_TARGET_FLAGS); do \
 +	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
 +	done; \
@@ -873,162 +1102,47 @@ Index: b/src/Makefile.in
 +
 +
 +
- .PHONY: configure-target-libgnatvsn maybe-configure-target-libgnatvsn
- maybe-configure-target-libgnatvsn:
+ .PHONY: configure-target-libgomp maybe-configure-target-libgomp
+ maybe-configure-target-libgomp:
  @if gcc-bootstrap
-@@ -50993,6 +51357,7 @@ configure-target-zlib: stage_last
+@@ -54648,6 +55124,7 @@ configure-target-zlib: stage_last
  configure-target-boehm-gc: stage_last
  configure-target-rda: stage_last
  configure-target-libada: stage_last
 +configure-target-libada-sjlj: stage_last
- configure-target-libgnatvsn: stage_last
- configure-target-libgnatprj: stage_last
  configure-stage1-target-libgomp: maybe-all-stage1-gcc
-@@ -51030,6 +51395,7 @@ configure-target-zlib: maybe-all-gcc
+ configure-stage2-target-libgomp: maybe-all-stage2-gcc
+ configure-stage3-target-libgomp: maybe-all-stage3-gcc
+@@ -54683,6 +55160,7 @@ configure-target-zlib: maybe-all-gcc
  configure-target-boehm-gc: maybe-all-gcc
  configure-target-rda: maybe-all-gcc
  configure-target-libada: maybe-all-gcc
 +configure-target-libada-sjlj: maybe-all-gcc
- configure-target-libgnatvsn: maybe-all-gcc
- configure-target-libgnatprj: maybe-all-gcc
  configure-target-libgomp: maybe-all-gcc
-@@ -51404,6 +51770,7 @@ all-stage4-fixincludes: maybe-all-stage4
- all-stageprofile-fixincludes: maybe-all-stageprofile-libiberty
- all-stagefeedback-fixincludes: maybe-all-stagefeedback-libiberty
+ configure-target-libitm: maybe-all-gcc
+ configure-target-libatomic: maybe-all-gcc
+@@ -55139,6 +55617,7 @@ all-stagefeedback-fixincludes: maybe-all
+ all-stageautoprofile-fixincludes: maybe-all-stageautoprofile-libiberty
+ all-stageautofeedback-fixincludes: maybe-all-stageautofeedback-libiberty
  all-target-libada: maybe-all-gcc
 +all-target-libada-sjlj: maybe-all-target-libada
  all-gnattools: maybe-all-target-libada
- all-gnattools: maybe-all-target-libgnatvsn
- all-gnattools: maybe-all-target-libgnatprj
-@@ -52007,6 +52374,7 @@ configure-target-zlib: maybe-all-target-
+ all-gnattools: maybe-all-target-libstdc++-v3
+ all-lto-plugin: maybe-all-libiberty
+@@ -55840,6 +56319,7 @@ configure-target-zlib: maybe-all-target-
  configure-target-boehm-gc: maybe-all-target-libgcc
  configure-target-rda: maybe-all-target-libgcc
  configure-target-libada: maybe-all-target-libgcc
 +configure-target-libada-sjlj: maybe-all-target-libgcc
- configure-target-libgnatvsn: maybe-all-target-libgcc
- configure-target-libgnatprj: maybe-all-target-libgcc
  configure-target-libgomp: maybe-all-target-libgcc
-@@ -52063,6 +52431,8 @@ configure-target-rda: maybe-all-target-n
+ configure-target-libitm: maybe-all-target-libgcc
+ configure-target-libatomic: maybe-all-target-libgcc
+@@ -55890,6 +56370,8 @@ configure-target-rda: maybe-all-target-n
  
  configure-target-libada: maybe-all-target-newlib maybe-all-target-libgloss
  
 +configure-target-libada-sjlj: maybe-all-target-newlib maybe-all-target-libgloss
 +
- configure-target-libgnatvsn: maybe-all-target-newlib maybe-all-target-libgloss
- 
- configure-target-libgnatprj: maybe-all-target-newlib maybe-all-target-libgloss
-Index: b/src/configure.ac
-===================================================================
---- a/src/configure.ac
-+++ b/src/configure.ac
-@@ -175,6 +175,7 @@ target_libraries="target-libgcc \
- 		${libgcj} \
- 		target-libobjc \
- 		target-libada \
-+		target-libada-sjlj \
- 		${target_libiberty} \
- 		target-libgnatvsn \
- 		target-libgnatprj \
-@@ -462,7 +463,7 @@ AC_ARG_ENABLE(libada,
- ENABLE_LIBADA=$enableval,
- ENABLE_LIBADA=yes)
- if test "${ENABLE_LIBADA}" != "yes" ; then
--  noconfigdirs="$noconfigdirs target-libgnatvsn target-libgnatprj gnattools"
-+  noconfigdirs="$noconfigdirs target-libgnatvsn target-libgnatprj gnattools target-libada-sjlj"
- fi
- 
- AC_ARG_ENABLE(libssp,
-Index: b/src/gcc/ada/gcc-interface/Makefile.in
-===================================================================
---- a/src/gcc/ada/gcc-interface/Makefile.in
-+++ b/src/gcc/ada/gcc-interface/Makefile.in
-@@ -192,7 +192,7 @@ TOOLSCASE =
- 
- # Multilib handling
- MULTISUBDIR =
--RTSDIR = rts$(subst /,_,$(MULTISUBDIR))
-+RTSDIR := rts$(subst /,_,$(MULTISUBDIR))
- 
- # Link flags used to build gnat tools.  By default we prefer to statically
- # link with libgcc to avoid a dependency on shared libgcc (which is tricky
-@@ -2607,6 +2607,27 @@ install-gnatlib: ../stamp-gnatlib-$(RTSD
- 	cd $(DESTDIR)$(ADA_INCLUDE_DIR); $(CHMOD) a-wx *.adb
- 	cd $(DESTDIR)$(ADA_INCLUDE_DIR); $(CHMOD) a-wx *.ads
- 
-+install-gnatlib-sjlj: ../stamp-gnatlib-$(RTSDIR)
-+#	Create the directory before deleting it, in case the directory is
-+#	a list of directories (as it may be on VMS). This ensures we are
-+#	deleting the right one.
-+	-$(MKDIR) $(DESTDIR)$(ADA_RTL_OBJ_DIR_SJLJ)
-+	-$(MKDIR) $(DESTDIR)$(ADA_INCLUDE_DIR_SJLJ)
-+	$(RMDIR) $(DESTDIR)$(ADA_RTL_OBJ_DIR_SJLJ)
-+	$(RMDIR) $(DESTDIR)$(ADA_INCLUDE_DIR_SJLJ)
-+	-$(MKDIR) $(DESTDIR)$(ADA_RTL_OBJ_DIR_SJLJ)
-+	-$(MKDIR) $(DESTDIR)$(ADA_INCLUDE_DIR_SJLJ)
-+	for file in $(RTSDIR)/*.ali; do \
-+	    $(INSTALL_DATA_DATE) $$file $(DESTDIR)$(ADA_RTL_OBJ_DIR_SJLJ); \
-+	done
-+	# This copy must be done preserving the date on the original file.
-+	for file in $(RTSDIR)/*.ad?; do \
-+	    $(INSTALL_DATA_DATE) $$file $(DESTDIR)$(ADA_INCLUDE_DIR_SJLJ); \
-+	done
-+	cd $(DESTDIR)$(ADA_INCLUDE_DIR_SJLJ); $(CHMOD) a-wx *.adb
-+	cd $(DESTDIR)$(ADA_INCLUDE_DIR_SJLJ); $(CHMOD) a-wx *.ads
-+
-+
- ../stamp-gnatlib1-$(RTSDIR): Makefile
- 	$(RMDIR) $(RTSDIR)
- 	$(MKDIR) $(RTSDIR)
-@@ -2863,7 +2884,7 @@ gnatlib-shared:
- # in getting multiple blank lines, hence a style check error, as a
- # result.
- gnatlib-sjlj:
--	$(MAKE) $(FLAGS_TO_PASS) EH_MECHANISM="" \
-+	$(MAKE) $(FLAGS_TO_PASS) EH_MECHANISM="" RTSDIR="$(RTSDIR)" \
- 	THREAD_KIND="$(THREAD_KIND)" ../stamp-gnatlib1-$(RTSDIR)
- 	sed \
- 	  -e 's/Frontend_Exceptions.*/Frontend_Exceptions       : constant Boolean := True;/' \
-@@ -2872,6 +2893,7 @@ gnatlib-sjlj:
- 	  $(RTSDIR)/system.ads > $(RTSDIR)/s.ads
- 	$(MV) $(RTSDIR)/s.ads $(RTSDIR)/system.ads
- 	$(MAKE) $(FLAGS_TO_PASS) \
-+	     RTSDIR="$(RTSDIR)" \
- 	     EH_MECHANISM="" \
- 	     GNATLIBFLAGS="$(GNATLIBFLAGS)" \
- 	     GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \
-@@ -2924,6 +2946,8 @@ b_gnatm.o : b_gnatm.adb
+ configure-target-libgomp: maybe-all-target-newlib maybe-all-target-libgloss
  
- ADA_INCLUDE_DIR = $(libsubdir)/adainclude
- ADA_RTL_OBJ_DIR = $(libsubdir)/adalib
-+ADA_INCLUDE_DIR_SJLJ = $(libsubdir)/rts-sjlj/adainclude
-+ADA_RTL_OBJ_DIR_SJLJ = $(libsubdir)/rts-sjlj/adalib
- 
- # Special flags
- 
-Index: b/src/gcc/ada/gcc-interface/config-lang.in
-===================================================================
---- a/src/gcc/ada/gcc-interface/config-lang.in
-+++ b/src/gcc/ada/gcc-interface/config-lang.in
-@@ -34,8 +34,8 @@ gtfiles="\$(srcdir)/ada/gcc-interface/ad
- 
- outputs="ada/gcc-interface/Makefile ada/Makefile"
- 
--target_libs="target-libada target-libgnatvsn target-libgnatprj"
--lang_dirs="libada libgnatvsn libgnatprj gnattools"
-+target_libs="target-libada target-libgnatvsn target-libgnatprj target-libada-sjlj"
-+lang_dirs="libada libgnatvsn libgnatprj gnattools libada-sjlj"
- 
- # Ada is not enabled by default for the time being.
- build_by_default=no
-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
-@@ -784,6 +784,7 @@ ada.install-common:
- 
- install-gnatlib:
- 	$(MAKE) -C ada $(COMMON_FLAGS_TO_PASS) $(ADA_FLAGS_TO_PASS) install-gnatlib$(LIBGNAT_TARGET)
-+	$(MAKE) -C ada $(COMMON_FLAGS_TO_PASS) $(ADA_FLAGS_TO_PASS) RTSDIR="rts-sjlj" install-gnatlib-sjlj$(LIBGNAT_TARGET)
- 
- install-gnatlib-obj:
- 	$(MAKE) -C ada $(COMMON_FLAGS_TO_PASS) $(ADA_FLAGS_TO_PASS) install-gnatlib-obj
+ configure-target-libitm: maybe-all-target-newlib maybe-all-target-libgloss
diff --git a/debian/patches/libgnatprj-cross-hack.diff b/debian/patches/libgnatprj-cross-hack.diff
deleted file mode 100644
index d24be75..0000000
--- a/debian/patches/libgnatprj-cross-hack.diff
+++ /dev/null
@@ -1,66 +0,0 @@
-This is a gross hack to cross build libgnatprj without having the
-gmp.h header for the target architecture.  Are libgnatvsn and libgnatprj
-really target libraries, or host libraries? The odd thing is that
-the gnat cross build tools are not linked against these two libraries.
-
-Index: b/src/gcc/wide-int.h
-===================================================================
---- a/src/gcc/wide-int.h
-+++ b/src/gcc/wide-int.h
-@@ -3106,8 +3106,10 @@ namespace wi
-   wide_int from_buffer (const unsigned char *, unsigned int);
- 
- #ifndef GENERATOR_FILE
-+#ifndef LIBGNATPRJ_CROSS_HACK
-   void to_mpz (const wide_int_ref &, mpz_t, signop);
- #endif
-+#endif
- 
-   wide_int mask (unsigned int, bool, unsigned int);
-   wide_int shifted_mask (unsigned int, unsigned int, bool, unsigned int);
-Index: b/src/gcc/system.h
-===================================================================
---- a/src/gcc/system.h
-+++ b/src/gcc/system.h
-@@ -678,8 +678,10 @@ extern int vsnprintf (char *, size_t, co
- 
- /* Do not introduce a gmp.h dependency on the build system.  */
- #ifndef GENERATOR_FILE
-+#ifndef LIBGNATPRJ_CROSS_HACK
- #include <gmp.h>
- #endif
-+#endif
- 
- /* Get libiberty declarations.  */
- #include "libiberty.h"
-Index: b/src/libgnatprj/Makefile.in
-===================================================================
---- a/src/libgnatprj/Makefile.in
-+++ b/src/libgnatprj/Makefile.in
-@@ -37,7 +37,7 @@ TOOLS_TARGET_PAIRS := @TOOLS_TARGET_PAIR
- LN_S := @LN_S@
- 
- ifneq (@build@, at host@)
--   CFLAGS += -b @host@
-+   override CFLAGS += -DLIBGNATPRJ_CROSS_HACK
- endif
- 
- .PHONY: libgnatprj install
-Index: b/src/gcc/double-int.h
-===================================================================
---- a/src/gcc/double-int.h
-+++ b/src/gcc/double-int.h
-@@ -429,11 +429,13 @@ double_int::popcount () const
- 
- 
- #ifndef GENERATOR_FILE
-+#ifndef LIBGNATPRJ_CROSS_HACK
- /* Conversion to and from GMP integer representations.  */
- 
- void mpz_set_double_int (mpz_t, double_int, bool);
- double_int mpz_get_double_int (const_tree, mpz_t, bool);
- #endif
-+#endif
- 
- namespace wi
- {
diff --git a/debian/patches/libgnatprj-link.diff b/debian/patches/libgnatprj-link.diff
deleted file mode 100644
index abf026f..0000000
--- a/debian/patches/libgnatprj-link.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-# DP: Don't link libgnatprj using --no-allow-shlib-undefined on older releases.
-
-in precise:
-/lib/x86_64-linux-gnu/libc.so.6: undefined reference to `_rtld_global at GLIBC_PRIVATE'
-/lib/x86_64-linux-gnu/libc.so.6: undefined reference to `_dl_argv at GLIBC_PRIVATE'
-/lib/x86_64-linux-gnu/libc.so.6: undefined reference to `_rtld_global_ro at GLIBC_PRIVATE'
-/lib/x86_64-linux-gnu/libc.so.6: undefined reference to `__libc_enable_secure at GLIBC_PRIVATE'
-/lib/x86_64-linux-gnu/libc.so.6: undefined reference to `__tls_get_addr at GLIBC_2.3'
-collect2: error: ld returned 1 exit status
-
---- a/src/libgnatprj/Makefile.in
-+++ b/src/libgnatprj/Makefile.in
-@@ -74,7 +74,7 @@
- 
- libgnatprj.so.$(LIB_VERSION): $(addprefix obj-shared/,$(OBJECTS))
- 	: # Make libgnatprj.so
--	$(GCC) -o $@ -shared -fPIC -Wl,--soname,$@ -Wl,--no-allow-shlib-undefined \
-+	$(GCC) -o $@ -shared -fPIC -Wl,--soname,$@ \
- 	   $^ $(addprefix ../libiberty/pic/,$(LIBIBERTY_OBJECTS)) \
- 	   -L../gcc/ada/rts -lgnat-$(LIB_VERSION) \
- 	   -L../libgnatvsn -lgnatvsn
diff --git a/debian/rules.d/binary-ada.mk b/debian/rules.d/binary-ada.mk
index f02bc20..159dc34 100644
--- a/debian/rules.d/binary-ada.mk
+++ b/debian/rules.d/binary-ada.mk
@@ -3,7 +3,7 @@ ifeq ($(with_separate_gnat),yes)
 endif
 
 ifeq ($(with_libgnat),yes)
-  $(lib_binaries) += libgnat libgnatvsn libgnatprj
+  $(lib_binaries) += libgnat 
 endif
 
 arch_binaries := $(arch_binaries) ada
@@ -24,12 +24,6 @@ p_gnat	= gnat-$(GNAT_VERSION)$(cross_bin_arch)
 p_gnatsjlj= gnat-$(GNAT_VERSION)-sjlj$(cross_bin_arch)
 p_lgnat	= libgnat-$(GNAT_VERSION)$(cross_lib_arch)
 p_lgnat_dbg = libgnat-$(GNAT_VERSION)-dbg$(cross_lib_arch)
-p_lgnatvsn = libgnatvsn$(GNAT_VERSION)$(cross_lib_arch)
-p_lgnatvsn_dev = libgnatvsn$(GNAT_VERSION)-dev$(cross_lib_arch)
-p_lgnatvsn_dbg = libgnatvsn$(GNAT_VERSION)-dbg$(cross_lib_arch)
-p_lgnatprj = libgnatprj$(GNAT_VERSION)$(cross_lib_arch)
-p_lgnatprj_dev = libgnatprj$(GNAT_VERSION)-dev$(cross_lib_arch)
-p_lgnatprj_dbg = libgnatprj$(GNAT_VERSION)-dbg$(cross_lib_arch)
 p_gnatd	= $(p_gnat)-doc
 
 d_gbase	= debian/$(p_gbase)
@@ -141,104 +135,6 @@ endif
 
 	trap '' 1 2 3 15; touch $@; mv $(install_stamp)-tmp $(install_stamp)
 
-
-$(binary_stamp)-libgnatvsn: $(install_stamp)
-	: # $(p_lgnatvsn_dev)
-ifneq (,$(filter $(build_type), build-native cross-build-native))
-	$(dh_compat2) dh_movefiles -p$(p_lgnatvsn_dev) usr/lib/ada/adalib/gnatvsn
-	$(dh_compat2) dh_movefiles -p$(p_lgnatvsn_dev) usr/share/ada/adainclude/gnatvsn
-	dh_install -p$(p_lgnatvsn_dev) \
-	   debian/gnatvsn.gpr usr/share/ada/adainclude
-else
-	mkdir -p $(d_lgnatvsn_dev)/$(gcc_lib_dir)/{adalib,adainclude}/gnatvsn
-	mv $(d)/usr/lib/ada/adalib/gnatvsn $(d_lgnatvsn_dev)/$(gcc_lib_dir)/adalib/.
-	mv $(d)/usr/share/ada/adainclude/gnatvsn $(d_lgnatvsn_dev)/$(gcc_lib_dir)/adainclude/.
-	dh_install -p$(p_lgnatvsn_dev) \
-	   debian/gnatvsn.gpr $(gcc_lib_dir)/adainclude
-endif
-	$(dh_compat2) dh_movefiles -p$(p_lgnatvsn_dev) $(usr_lib)/libgnatvsn.a
-	dh_link -p$(p_lgnatvsn_dev) \
-	   $(usr_lib)/libgnatvsn.so.$(GNAT_VERSION) \
-	   $(usr_lib)/libgnatvsn.so
-	debian/dh_doclink -p$(p_lgnatvsn_dev) $(p_glbase)
-	dh_strip -p$(p_lgnatvsn_dev) -X.a --keep-debug
-
-	: # $(p_lgnatvsn)
-ifneq (,$(filter $(build_type), build-native cross-build-native))
-	mkdir -p $(d_lgnatvsn)/usr/share/lintian/overrides
-	cp -p debian/$(p_lgnatvsn).overrides \
-		$(d_lgnatvsn)/usr/share/lintian/overrides/$(p_lgnatvsn)
-endif
-	$(dh_compat2) dh_movefiles -p$(p_lgnatvsn) $(usr_lib)/libgnatvsn.so.$(GNAT_VERSION)
-	debian/dh_doclink -p$(p_lgnatvsn) $(p_glbase)
-	dh_strip -p$(p_lgnatvsn) --dbg-package=$(p_lgnatvsn_dbg)
-	$(cross_makeshlibs) dh_makeshlibs $(ldconfig_arg) -p$(p_lgnatvsn) \
-		-V '$(p_lgnatvsn) (>= $(DEB_VERSION))'
-	$(call cross_mangle_shlibs,$(p_lgnatvsn))
-	cat debian/$(p_lgnatvsn)/DEBIAN/shlibs >> debian/shlibs.local
-	$(cross_shlibdeps) dh_shlibdeps -p$(p_lgnatvsn) \
-		$(call shlibdirs_to_search, \
-			$(subst gnatvsn$(GNAT_SONAME),gcc$(GCC_SONAME),$(p_lgnatvsn)) \
-			$(subst gnatvsn$(GNAT_SONAME),gnat-$(GNAT_SONAME),$(p_lgnatvsn)) \
-		,) \
-		$(if $(filter yes, $(with_common_libs)),,-- -Ldebian/shlibs.common$(2))
-	$(call cross_mangle_substvars,$(p_lgnatvsn))
-
-	: # $(p_lgnatvsn_dbg)
-	debian/dh_doclink -p$(p_lgnatvsn_dbg) $(p_glbase)
-
-	echo $(p_lgnatvsn) $(p_lgnatvsn_dev) $(p_lgnatvsn_dbg) >> debian/$(lib_binaries)
-	touch $@
-
-$(binary_stamp)-libgnatprj: $(install_stamp)
-	: # $(p_lgnatprj_dev)
-ifneq (,$(filter $(build_type), build-native cross-build-native))
-	$(dh_compat2) dh_movefiles -p$(p_lgnatprj_dev) usr/lib/ada/adalib/gnatprj
-	$(dh_compat2) dh_movefiles -p$(p_lgnatprj_dev) usr/share/ada/adainclude/gnatprj
-	dh_install -p$(p_lgnatprj_dev) \
-	   debian/gnatprj.gpr usr/share/ada/adainclude
-else
-	mkdir -p $(d_lgnatprj_dev)/$(gcc_lib_dir)/{adalib,adainclude}/gnatvsn
-	mv $(d)/usr/lib/ada/adalib/gnatprj $(d_lgnatprj_dev)/$(gcc_lib_dir)/adalib/.
-	mv $(d)/usr/share/ada/adainclude/gnatprj $(d_lgnatprj_dev)/$(gcc_lib_dir)/adainclude/.
-	dh_install -p$(p_lgnatprj_dev) \
-	   debian/gnatprj.gpr $(gcc_lib_dir)/adainclude
-endif
-	$(dh_compat2) dh_movefiles -p$(p_lgnatprj_dev) $(usr_lib)/libgnatprj.a
-	dh_link -p$(p_lgnatprj_dev) \
-	   $(usr_lib)/libgnatprj.so.$(GNAT_VERSION) \
-	   $(usr_lib)/libgnatprj.so
-	dh_strip -p$(p_lgnatprj_dev) -X.a --keep-debug
-	debian/dh_doclink -p$(p_lgnatprj_dev) $(p_glbase)
-
-	: # $(p_lgnatprj)
-ifneq (,$(filter $(build_type), build-native cross-build-native))
-	mkdir -p $(d_lgnatprj)/usr/share/lintian/overrides
-	cp -p debian/$(p_lgnatprj).overrides \
-		$(d_lgnatprj)/usr/share/lintian/overrides/$(p_lgnatprj)
-endif
-	$(dh_compat2) dh_movefiles -p$(p_lgnatprj) $(usr_lib)/libgnatprj.so.$(GNAT_VERSION)
-	debian/dh_doclink -p$(p_lgnatprj) $(p_glbase)
-	dh_strip -p$(p_lgnatprj) --dbg-package=$(p_lgnatprj_dbg)
-	$(cross_makeshlibs) dh_makeshlibs $(ldconfig_arg) -p$(p_lgnatprj) \
-		-V '$(p_lgnatprj) (>= $(DEB_VERSION))'
-	$(call cross_mangle_shlibs,$(p_lgnatprj))
-	cat debian/$(p_lgnatprj)/DEBIAN/shlibs >> debian/shlibs.local
-	$(cross_shlibdeps) dh_shlibdeps -p$(p_lgnatprj) \
-		$(call shlibdirs_to_search, \
-			$(subst gnatprj$(GNAT_SONAME),gcc$(GCC_SONAME),$(p_lgnatprj)) \
-			$(subst gnatprj$(GNAT_SONAME),gnat-$(GNAT_SONAME),$(p_lgnatprj)) \
-			$(subst gnatprj$(GNAT_SONAME),gnatvsn$(GNAT_SONAME),$(p_lgnatprj)) \
-		,) \
-		$(if $(filter yes, $(with_common_libs)),,-- -Ldebian/shlibs.common$(2))
-	$(call cross_mangle_substvars,$(p_lgnatprj))
-
-	: # $(p_lgnatprj_dbg)
-	debian/dh_doclink -p$(p_lgnatprj_dbg) $(p_glbase)
-
-	echo $(p_lgnatprj) $(p_lgnatprj_dev) $(p_lgnatprj_dbg) >> debian/$(lib_binaries)
-	touch $@
-
 $(binary_stamp)-ada: $(install_stamp)
 	dh_testdir
 	dh_testroot
diff --git a/debian/rules.defs b/debian/rules.defs
index 0c8fb74..98a7401 100644
--- a/debian/rules.defs
+++ b/debian/rules.defs
@@ -679,8 +679,6 @@ ifneq (,$(filter $(build_type), build-cross cross-build-cross))
 endif
 with_ada := $(call envfilt, ada, , , $(with_ada))
 
-with_ada := disabled for GCC 7
-
 ifeq ($(DEB_STAGE)-$(filter libgnat, $(with_rtlibs)),rtlibs-)
   with_ada := disabled for rtlibs stage
 endif
diff --git a/debian/rules.patch b/debian/rules.patch
index f704983..6c1f52d 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -123,7 +123,6 @@ ifeq ($(with_ada),yes)
   debian_patches += \
 	ada-driver-check \
 	ada-gcc-name \
-	ada-default-project-path \
 	ada-library-project-files-soname
 
 	# FIXME: needs update
@@ -137,15 +136,7 @@ ifeq ($(with_ada),yes)
   ifeq ($(with_libgnat),yes)
     debian_patches += \
 	ada-link-lib \
-	ada-libgnatvsn \
-	ada-libgnatprj \
-	ada-gnattools-cross \
-	ada-acats \
-	libgnatprj-cross-hack
-    ifneq (,$(filter $(distrelease),lucid precise))
-      debian_patches += \
-	libgnatprj-link
-    endif
+	ada-acats
   endif
   ifeq ($(with_gnatsjlj),yes)
     debian_patches += \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/gcc-7.git



More information about the Reproducible-commits mailing list