[gcc-7] 140/354: [ Nicolas Boulenguez ] * Create the libgnatsvn packages again. Closes: #857606. * Replace libgnat-BV.overrides with a fixed command. * Install gnatvsn.gpr project into /u/s/gpr instead of /u/s/ada/adainclude. Debian is migrating to GPRbuild's upstream layout. * Avoid hardcoding the version in the ada-gcc-name patch.
Ximin Luo
infinity0 at debian.org
Thu Nov 23 15:50:43 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 c478b1e45d866a5ea48b01ec0d6def8745bee0ba
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date: Mon Mar 13 12:26:35 2017 +0000
[ Nicolas Boulenguez ]
* Create the libgnatsvn packages again. Closes: #857606.
* Replace libgnat-BV.overrides with a fixed command.
* Install gnatvsn.gpr project into /u/s/gpr instead of
/u/s/ada/adainclude. Debian is migrating to GPRbuild's upstream layout.
* Avoid hardcoding the version in the ada-gcc-name patch.
git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9354 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
debian/changelog | 10 +-
debian/control | 56 +
debian/control.m4 | 63 +
debian/libgnat-BV.overrides | 1 -
debian/patches/ada-749574.diff | 4 +-
debian/patches/ada-acats.diff | 107 +-
debian/patches/ada-changes-in-autogen-output.diff | 1592 +++++++++++++++++++++
debian/patches/ada-driver-check.diff | 17 +-
debian/patches/ada-gcc-name.diff | 87 +-
debian/patches/ada-gnattools-cross.diff | 613 ++++++++
debian/patches/ada-kfreebsd.diff | 30 +-
debian/patches/ada-libgnatvsn.diff | 249 ++++
debian/patches/ada-link-lib.diff | 258 +---
debian/patches/ada-link-shlib.diff | 26 +-
debian/patches/ada-sjlj.diff | 722 +---------
debian/patches/bootstrap-no-unneeded-libs.diff | 1396 +-----------------
debian/patches/gdc-libphobos-build.diff | 768 +---------
debian/rules.d/binary-ada.mk | 56 +-
debian/rules.patch | 2 +
19 files changed, 2880 insertions(+), 3177 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7fc3286..cc059f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
gcc-7 (7-20170303-1) UNRELEASED; urgency=medium
+ [ Matthias Klose ]
* Bump binutils version requirement to 2.28.
* Fix libcc1.so symlink for cross compilers. Addresses: #856875.
* Fix base package name for rtlibs stage build (Helmut Grohne).
@@ -9,7 +10,14 @@ gcc-7 (7-20170303-1) UNRELEASED; urgency=medium
* Don't ship the gnatgcc manpage symlink when building GFDL packages.
Addresses: #857384.
- -- Matthias Klose <doko at debian.org> Fri, 03 Mar 2017 10:14:38 +0100
+ [ Nicolas Boulenguez ]
+ * Create the libgnatsvn packages again. Closes: #857606.
+ * Replace libgnat-BV.overrides with a fixed command.
+ * Install gnatvsn.gpr project into /u/s/gpr instead of
+ /u/s/ada/adainclude. Debian is migrating to GPRbuild's upstream layout.
+ * Avoid hardcoding the version in the ada-gcc-name patch.
+
+ -- Matthias Klose <doko at debian.org> Mon, 13 Mar 2017 13:22:48 +0100
gcc-7 (7-20170302-1) experimental; urgency=medium
diff --git a/debian/control b/debian/control
index bfece37..d42ec14 100644
--- a/debian/control
+++ b/debian/control
@@ -2119,6 +2119,62 @@ Description: runtime for applications compiled with GNAT (debugging symbols)
.
This package contains the debugging symbols.
+Package: libgnatvsn7-dev
+Section: libdevel
+Architecture: any
+Priority: extra
+Depends: gcc-7-base (= ${gcc:Version}), gnat-7 (= ${gnat:Version}),
+ libgnatvsn7 (= ${gnat:Version}), ${misc:Depends}
+Conflicts: libgnatvsn-dev (<< 7),
+ libgnatvsn4.1-dev, libgnatvsn4.3-dev, libgnatvsn4.4-dev,
+ libgnatvsn4.5-dev, libgnatvsn4.6-dev, libgnatvsn4.9-dev,
+ libgnatvsn5-dev, libgnatvsn6-dev,
+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: libgnatvsn7
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Priority: optional
+Section: libs
+Depends: gcc-7-base (= ${gcc:Version}), libgnat-7 (= ${gnat:Version}),
+ ${shlibs:Depends}, ${misc:Depends}
+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: libgnatvsn7-dbg
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Priority: extra
+Section: debug
+Depends: gcc-7-base (= ${gcc:Version}), libgnatvsn7 (= ${gnat:Version}), ${misc:Depends}
+Suggests: gnat
+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: gdc-7
Architecture: any
Priority: optional
diff --git a/debian/control.m4 b/debian/control.m4
index d9598e8..579cdf5 100644
--- a/debian/control.m4
+++ b/debian/control.m4
@@ -4648,6 +4648,69 @@ 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.
')`'dnl libgnat
ifenabled(`lib64gnat',`
diff --git a/debian/libgnat-BV.overrides b/debian/libgnat-BV.overrides
deleted file mode 100644
index 8038bac..0000000
--- a/debian/libgnat-BV.overrides
+++ /dev/null
@@ -1 +0,0 @@
-libgnat- at BV@ binary: package-name-doesnt-match-sonames
diff --git a/debian/patches/ada-749574.diff b/debian/patches/ada-749574.diff
index 0ff3392..2c3b943 100644
--- a/debian/patches/ada-749574.diff
+++ b/debian/patches/ada-749574.diff
@@ -14,11 +14,9 @@ Description: Constraint_Error, range check failed at gnatlink.adb:2195, when cal
investigation is required to determine whether or not to forward this
bug and patch upstream.
-Index: b/src/gcc/ada/gnatlink.adb
-===================================================================
--- a/src/gcc/ada/gnatlink.adb
+++ b/src/gcc/ada/gnatlink.adb
-@@ -268,7 +268,12 @@ procedure Gnatlink is
+@@ -269,7 +269,12 @@
Findex2 := File_Name'Last + 1;
end if;
diff --git a/debian/patches/ada-acats.diff b/debian/patches/ada-acats.diff
index 3c1ff70..ad6c23f 100644
--- a/debian/patches/ada-acats.diff
+++ b/debian/patches/ada-acats.diff
@@ -1,23 +1,93 @@
# DP: - When running the ACATS, look for the gnat tools in their new
# DP: directory (build/gnattools), and for the shared libraries in
-# DP: build/gcc/ada/rts, build/libgnatvsn and build/libgnatprj.
+# DP: build/gcc/ada/rts and build/libgnatvsn.
-Index: gcc-7-7-20161112/src/gcc/testsuite/ada/acats/run_all.sh
-===================================================================
---- 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 $*
- }
+--- a/src/gcc/testsuite/ada/acats/run_acats.sh
++++ b/src/gcc/testsuite/ada/acats/run_acats.sh
+@@ -22,45 +22,25 @@
+
+ # 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
++TARGET=`${GCC_DRIVER} -v 2>&1 |grep '^Target:' | cut -d' ' -f2`
++GNATTOOLS=`cd $BASE/../gnattools; ${PWDCMD-pwd}`
++LIBGNATVSN=`cd $BASE/../${TARGET}/libgnatvsn; ${PWDCMD-pwd}`
+
+-if [ ! -f $BASE/gnatchop ]; then
+- echo gnattools missing, exiting.
+- exit 1
+-fi
+-
+-if [ ! -f $BASE/gnatmake ]; then
+- echo gnattools missing, exiting.
+- exit 1
+-fi
++export GNATTOOLS LIBGNATVSN LIBGNATPRJ
+
+ export PATH ADA_INCLUDE_PATH ADA_OBJECTS_PATH BASE 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
+--- a/src/gcc/testsuite/ada/acats/run_all.sh
++++ b/src/gcc/testsuite/ada/acats/run_all.sh
+@@ -14,6 +14,10 @@
+
+ # End of customization section.
+RTS=`cd $GNATTOOLS/../gcc/ada/rts; ${PWDCMD-pwd}`
-+LD_LIBRARY_PATH=$RTS:$LIBGNATVSN:$LIBGNATPRJ
++LD_LIBRARY_PATH=$RTS:$LIBGNATVSN
+export LD_LIBRARY_PATH
+
- target_run () {
- eval $EXPECT -f $testdir/run_test.exp $*
+ # Perform arithmetic evaluation on the ARGs, and store the result in the
+ # global $as_val. Take advantage of shells that can avoid forks. The arguments
+ # must be portable across $(()) and expr.
+@@ -56,12 +60,16 @@
+ GCC="$BASE/xgcc -B$BASE/"
+
+ target_gnatchop () {
+- $BASE/gnatchop --GCC="$BASE/xgcc" $*
++ ADA_INCLUDE_PATH=$GNATTOOLS/../../src/gcc/ada \
++ $GNATTOOLS/gnatchop --GCC="$BASE/xgcc" $*
+ }
+
+ target_gnatmake () {
+- echo $BASE/gnatmake --GNATBIND=$BASE/gnatbind --GNATLINK=$BASE/gnatlink --GCC="$GCC" $gnatflags $gccflags $* -largs $EXTERNAL_OBJECTS --GCC="$GCC"
+- $BASE/gnatmake --GNATBIND=$BASE/gnatbind --GNATLINK=$BASE/gnatlink --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."
}
-@@ -98,8 +102,8 @@ display target gcc is $GCC
+
+ target_gcc () {
+@@ -98,8 +106,8 @@
display `$GCC -v 2>&1`
display host=`gcc -dumpmachine`
display target=$target
@@ -28,7 +98,7 @@ Index: gcc-7-7-20161112/src/gcc/testsuite/ada/acats/run_all.sh
display ""
if [ -n "$GCC_RUNTEST_PARALLELIZE_DIR" ]; then
-@@ -130,7 +134,7 @@ if [ $? -ne 0 ]; then
+@@ -130,7 +138,7 @@
exit 1
fi
target_run $dir/support/impbit > $dir/support/impbit.out 2>&1
@@ -37,11 +107,9 @@ Index: gcc-7-7-20161112/src/gcc/testsuite/ada/acats/run_all.sh
echo target_bit="$target_bit" >> $dir/acats.log
# Find out a suitable asm statement
-Index: gcc-7-7-20161112/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 } {
+--- a/src/gcc/testsuite/lib/gnat.exp
++++ b/src/gcc/testsuite/lib/gnat.exp
+@@ -88,18 +88,24 @@
global GNAT_UNDER_TEST
global TOOL_EXECUTABLE
global gnat_target_current
@@ -62,7 +130,6 @@ Index: gcc-7-7-20161112/src/gcc/testsuite/lib/gnat.exp
+ set GNAT_UNDER_TEST "$rootme/../gnattools/gnatmake -I$rootme/ada/rts --GCC=$rootme/xgcc --GNATBIND=$rootme/../gnattools/gnatbind --GNATLINK=$rootme/../gnattools/gnatlink -cargs -B$rootme -largs --GCC=$rootme/xgcc -B$rootme -margs"
+ append ld_library_path ":$rootme/ada/rts"
+ append ld_library_path ":$rootme/../$target/libgnatvsn"
-+ append ld_library_path ":$rootme/../$target/libgnatprj"
+ set_ld_library_path_env_vars
+
+ # gnatlink looks for system.ads itself and has no --RTS option, so
@@ -74,7 +141,7 @@ Index: gcc-7-7-20161112/src/gcc/testsuite/lib/gnat.exp
if ![info exists tmpdir] then {
set tmpdir /tmp
-@@ -121,31 +128,6 @@ proc gnat_target_compile { source dest t
+@@ -121,31 +127,6 @@
return [gcc_target_compile $source $dest $type $options]
}
diff --git a/debian/patches/ada-changes-in-autogen-output.diff b/debian/patches/ada-changes-in-autogen-output.diff
new file mode 100644
index 0000000..3ae42a8
--- /dev/null
+++ b/debian/patches/ada-changes-in-autogen-output.diff
@@ -0,0 +1,1592 @@
+This patch is generated.
+When any patch modifies src/Makefile.def or src/Makefile.tpl, execute
+# quilt push changes-in-autogen-output.diff
+# (cd src && autogen Makefile.def)
+# quilt refresh -p ab --no-index --no-timestamps
+
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -999,6 +999,8 @@
+ maybe-configure-target-zlib \
+ maybe-configure-target-rda \
+ maybe-configure-target-libada \
++ maybe-configure-target-libgnatvsn \
++ maybe-configure-target-libada-sjlj \
+ maybe-configure-target-libgomp \
+ maybe-configure-target-libitm \
+ maybe-configure-target-libatomic
+@@ -1165,6 +1167,8 @@
+ all-target: maybe-all-target-zlib
+ all-target: maybe-all-target-rda
+ all-target: maybe-all-target-libada
++all-target: maybe-all-target-libgnatvsn
++all-target: maybe-all-target-libada-sjlj
+ @if target-libgomp-no-bootstrap
+ all-target: maybe-all-target-libgomp
+ @endif target-libgomp-no-bootstrap
+@@ -1258,6 +1262,8 @@
+ info-target: maybe-info-target-zlib
+ info-target: maybe-info-target-rda
+ info-target: maybe-info-target-libada
++info-target: maybe-info-target-libgnatvsn
++info-target: maybe-info-target-libada-sjlj
+ info-target: maybe-info-target-libgomp
+ info-target: maybe-info-target-libitm
+ info-target: maybe-info-target-libatomic
+@@ -1344,6 +1350,8 @@
+ dvi-target: maybe-dvi-target-zlib
+ dvi-target: maybe-dvi-target-rda
+ dvi-target: maybe-dvi-target-libada
++dvi-target: maybe-dvi-target-libgnatvsn
++dvi-target: maybe-dvi-target-libada-sjlj
+ dvi-target: maybe-dvi-target-libgomp
+ dvi-target: maybe-dvi-target-libitm
+ dvi-target: maybe-dvi-target-libatomic
+@@ -1430,6 +1438,8 @@
+ pdf-target: maybe-pdf-target-zlib
+ pdf-target: maybe-pdf-target-rda
+ pdf-target: maybe-pdf-target-libada
++pdf-target: maybe-pdf-target-libgnatvsn
++pdf-target: maybe-pdf-target-libada-sjlj
+ pdf-target: maybe-pdf-target-libgomp
+ pdf-target: maybe-pdf-target-libitm
+ pdf-target: maybe-pdf-target-libatomic
+@@ -1516,6 +1526,8 @@
+ html-target: maybe-html-target-zlib
+ html-target: maybe-html-target-rda
+ html-target: maybe-html-target-libada
++html-target: maybe-html-target-libgnatvsn
++html-target: maybe-html-target-libada-sjlj
+ html-target: maybe-html-target-libgomp
+ html-target: maybe-html-target-libitm
+ html-target: maybe-html-target-libatomic
+@@ -1602,6 +1614,8 @@
+ TAGS-target: maybe-TAGS-target-zlib
+ TAGS-target: maybe-TAGS-target-rda
+ TAGS-target: maybe-TAGS-target-libada
++TAGS-target: maybe-TAGS-target-libgnatvsn
++TAGS-target: maybe-TAGS-target-libada-sjlj
+ TAGS-target: maybe-TAGS-target-libgomp
+ TAGS-target: maybe-TAGS-target-libitm
+ TAGS-target: maybe-TAGS-target-libatomic
+@@ -1688,6 +1702,8 @@
+ install-info-target: maybe-install-info-target-zlib
+ 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-libada-sjlj
+ install-info-target: maybe-install-info-target-libgomp
+ install-info-target: maybe-install-info-target-libitm
+ install-info-target: maybe-install-info-target-libatomic
+@@ -1774,6 +1790,8 @@
+ install-pdf-target: maybe-install-pdf-target-zlib
+ 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-libada-sjlj
+ install-pdf-target: maybe-install-pdf-target-libgomp
+ install-pdf-target: maybe-install-pdf-target-libitm
+ install-pdf-target: maybe-install-pdf-target-libatomic
+@@ -1860,6 +1878,8 @@
+ install-html-target: maybe-install-html-target-zlib
+ 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-libada-sjlj
+ install-html-target: maybe-install-html-target-libgomp
+ install-html-target: maybe-install-html-target-libitm
+ install-html-target: maybe-install-html-target-libatomic
+@@ -1946,6 +1966,8 @@
+ installcheck-target: maybe-installcheck-target-zlib
+ installcheck-target: maybe-installcheck-target-rda
+ installcheck-target: maybe-installcheck-target-libada
++installcheck-target: maybe-installcheck-target-libgnatvsn
++installcheck-target: maybe-installcheck-target-libada-sjlj
+ installcheck-target: maybe-installcheck-target-libgomp
+ installcheck-target: maybe-installcheck-target-libitm
+ installcheck-target: maybe-installcheck-target-libatomic
+@@ -2032,6 +2054,8 @@
+ mostlyclean-target: maybe-mostlyclean-target-zlib
+ mostlyclean-target: maybe-mostlyclean-target-rda
+ mostlyclean-target: maybe-mostlyclean-target-libada
++mostlyclean-target: maybe-mostlyclean-target-libgnatvsn
++mostlyclean-target: maybe-mostlyclean-target-libada-sjlj
+ mostlyclean-target: maybe-mostlyclean-target-libgomp
+ mostlyclean-target: maybe-mostlyclean-target-libitm
+ mostlyclean-target: maybe-mostlyclean-target-libatomic
+@@ -2118,6 +2142,8 @@
+ clean-target: maybe-clean-target-zlib
+ clean-target: maybe-clean-target-rda
+ clean-target: maybe-clean-target-libada
++clean-target: maybe-clean-target-libgnatvsn
++clean-target: maybe-clean-target-libada-sjlj
+ clean-target: maybe-clean-target-libgomp
+ clean-target: maybe-clean-target-libitm
+ clean-target: maybe-clean-target-libatomic
+@@ -2204,6 +2230,8 @@
+ distclean-target: maybe-distclean-target-zlib
+ distclean-target: maybe-distclean-target-rda
+ distclean-target: maybe-distclean-target-libada
++distclean-target: maybe-distclean-target-libgnatvsn
++distclean-target: maybe-distclean-target-libada-sjlj
+ distclean-target: maybe-distclean-target-libgomp
+ distclean-target: maybe-distclean-target-libitm
+ distclean-target: maybe-distclean-target-libatomic
+@@ -2290,6 +2318,8 @@
+ maintainer-clean-target: maybe-maintainer-clean-target-zlib
+ 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-libada-sjlj
+ maintainer-clean-target: maybe-maintainer-clean-target-libgomp
+ maintainer-clean-target: maybe-maintainer-clean-target-libitm
+ maintainer-clean-target: maybe-maintainer-clean-target-libatomic
+@@ -2432,6 +2462,8 @@
+ maybe-check-target-zlib \
+ maybe-check-target-rda \
+ maybe-check-target-libada \
++ maybe-check-target-libgnatvsn \
++ maybe-check-target-libada-sjlj \
+ maybe-check-target-libgomp \
+ maybe-check-target-libitm \
+ maybe-check-target-libatomic
+@@ -2614,6 +2646,8 @@
+ maybe-install-target-zlib \
+ maybe-install-target-rda \
+ maybe-install-target-libada \
++ maybe-install-target-libgnatvsn \
++ maybe-install-target-libada-sjlj \
+ maybe-install-target-libgomp \
+ maybe-install-target-libitm \
+ maybe-install-target-libatomic
+@@ -2720,6 +2754,8 @@
+ maybe-install-strip-target-zlib \
+ maybe-install-strip-target-rda \
+ maybe-install-strip-target-libada \
++ maybe-install-strip-target-libgnatvsn \
++ maybe-install-strip-target-libada-sjlj \
+ maybe-install-strip-target-libgomp \
+ maybe-install-strip-target-libitm \
+ maybe-install-strip-target-libatomic
+@@ -33908,12 +33944,6 @@
+ maybe-check-gnattools: check-gnattools
+
+ check-gnattools:
+- @: $(MAKE); $(unstage)
+- @r=`${PWD_COMMAND}`; export r; \
+- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+- $(HOST_EXPORTS) \
+- (cd $(HOST_SUBDIR)/gnattools && \
+- $(MAKE) $(FLAGS_TO_PASS) check)
+
+ @endif gnattools
+
+@@ -33954,24 +33984,8 @@
+ @if gnattools
+ maybe-info-gnattools: info-gnattools
+
+-info-gnattools: \
+- configure-gnattools
+- @: $(MAKE); $(unstage)
+- @[ -f ./gnattools/Makefile ] || exit 0; \
+- r=`${PWD_COMMAND}`; export r; \
+- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+- $(HOST_EXPORTS) \
+- for flag in $(EXTRA_HOST_FLAGS) ; do \
+- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+- done; \
+- echo "Doing info in gnattools"; \
+- (cd $(HOST_SUBDIR)/gnattools && \
+- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+- "RANLIB=$${RANLIB}" \
+- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+- info) \
+- || exit 1
++# gnattools doesn't support info.
++info-gnattools:
+
+ @endif gnattools
+
+@@ -33980,24 +33994,8 @@
+ @if gnattools
+ maybe-dvi-gnattools: dvi-gnattools
+
+-dvi-gnattools: \
+- configure-gnattools
+- @: $(MAKE); $(unstage)
+- @[ -f ./gnattools/Makefile ] || exit 0; \
+- r=`${PWD_COMMAND}`; export r; \
+- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+- $(HOST_EXPORTS) \
+- for flag in $(EXTRA_HOST_FLAGS) ; do \
+- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+- done; \
+- echo "Doing dvi in gnattools"; \
+- (cd $(HOST_SUBDIR)/gnattools && \
+- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+- "RANLIB=$${RANLIB}" \
+- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+- dvi) \
+- || exit 1
++# gnattools doesn't support dvi.
++dvi-gnattools:
+
+ @endif gnattools
+
+@@ -34006,24 +34004,8 @@
+ @if gnattools
+ maybe-pdf-gnattools: pdf-gnattools
+
+-pdf-gnattools: \
+- configure-gnattools
+- @: $(MAKE); $(unstage)
+- @[ -f ./gnattools/Makefile ] || exit 0; \
+- r=`${PWD_COMMAND}`; export r; \
+- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+- $(HOST_EXPORTS) \
+- for flag in $(EXTRA_HOST_FLAGS) ; do \
+- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+- done; \
+- echo "Doing pdf in gnattools"; \
+- (cd $(HOST_SUBDIR)/gnattools && \
+- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+- "RANLIB=$${RANLIB}" \
+- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+- pdf) \
+- || exit 1
++# gnattools doesn't support pdf.
++pdf-gnattools:
+
+ @endif gnattools
+
+@@ -34032,24 +34014,8 @@
+ @if gnattools
+ maybe-html-gnattools: html-gnattools
+
+-html-gnattools: \
+- configure-gnattools
+- @: $(MAKE); $(unstage)
+- @[ -f ./gnattools/Makefile ] || exit 0; \
+- r=`${PWD_COMMAND}`; export r; \
+- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+- $(HOST_EXPORTS) \
+- for flag in $(EXTRA_HOST_FLAGS) ; do \
+- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+- done; \
+- echo "Doing html in gnattools"; \
+- (cd $(HOST_SUBDIR)/gnattools && \
+- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+- "RANLIB=$${RANLIB}" \
+- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+- html) \
+- || exit 1
++# gnattools doesn't support html.
++html-gnattools:
+
+ @endif gnattools
+
+@@ -34058,24 +34024,8 @@
+ @if gnattools
+ maybe-TAGS-gnattools: TAGS-gnattools
+
+-TAGS-gnattools: \
+- configure-gnattools
+- @: $(MAKE); $(unstage)
+- @[ -f ./gnattools/Makefile ] || exit 0; \
+- r=`${PWD_COMMAND}`; export r; \
+- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+- $(HOST_EXPORTS) \
+- for flag in $(EXTRA_HOST_FLAGS) ; do \
+- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+- done; \
+- echo "Doing TAGS in gnattools"; \
+- (cd $(HOST_SUBDIR)/gnattools && \
+- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+- "RANLIB=$${RANLIB}" \
+- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+- TAGS) \
+- || exit 1
++# gnattools doesn't support TAGS.
++TAGS-gnattools:
+
+ @endif gnattools
+
+@@ -34084,25 +34034,8 @@
+ @if gnattools
+ maybe-install-info-gnattools: install-info-gnattools
+
+-install-info-gnattools: \
+- configure-gnattools \
+- info-gnattools
+- @: $(MAKE); $(unstage)
+- @[ -f ./gnattools/Makefile ] || exit 0; \
+- r=`${PWD_COMMAND}`; export r; \
+- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+- $(HOST_EXPORTS) \
+- for flag in $(EXTRA_HOST_FLAGS) ; do \
+- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+- done; \
+- echo "Doing install-info in gnattools"; \
+- (cd $(HOST_SUBDIR)/gnattools && \
+- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+- "RANLIB=$${RANLIB}" \
+- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+- install-info) \
+- || exit 1
++# gnattools doesn't support install-info.
++install-info-gnattools:
+
+ @endif gnattools
+
+@@ -34111,25 +34044,8 @@
+ @if gnattools
+ maybe-install-pdf-gnattools: install-pdf-gnattools
+
+-install-pdf-gnattools: \
+- configure-gnattools \
+- pdf-gnattools
+- @: $(MAKE); $(unstage)
+- @[ -f ./gnattools/Makefile ] || exit 0; \
+- r=`${PWD_COMMAND}`; export r; \
+- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+- $(HOST_EXPORTS) \
+- for flag in $(EXTRA_HOST_FLAGS) ; do \
+- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+- done; \
+- echo "Doing install-pdf in gnattools"; \
+- (cd $(HOST_SUBDIR)/gnattools && \
+- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+- "RANLIB=$${RANLIB}" \
+- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+- install-pdf) \
+- || exit 1
++# gnattools doesn't support install-pdf.
++install-pdf-gnattools:
+
+ @endif gnattools
+
+@@ -34138,25 +34054,8 @@
+ @if gnattools
+ maybe-install-html-gnattools: install-html-gnattools
+
+-install-html-gnattools: \
+- configure-gnattools \
+- html-gnattools
+- @: $(MAKE); $(unstage)
+- @[ -f ./gnattools/Makefile ] || exit 0; \
+- r=`${PWD_COMMAND}`; export r; \
+- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+- $(HOST_EXPORTS) \
+- for flag in $(EXTRA_HOST_FLAGS) ; do \
+- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+- done; \
+- echo "Doing install-html in gnattools"; \
+- (cd $(HOST_SUBDIR)/gnattools && \
+- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+- "RANLIB=$${RANLIB}" \
+- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+- install-html) \
+- || exit 1
++# gnattools doesn't support install-html.
++install-html-gnattools:
+
+ @endif gnattools
+
+@@ -34165,24 +34064,8 @@
+ @if gnattools
+ maybe-installcheck-gnattools: installcheck-gnattools
+
+-installcheck-gnattools: \
+- configure-gnattools
+- @: $(MAKE); $(unstage)
+- @[ -f ./gnattools/Makefile ] || exit 0; \
+- r=`${PWD_COMMAND}`; export r; \
+- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+- $(HOST_EXPORTS) \
+- for flag in $(EXTRA_HOST_FLAGS) ; do \
+- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+- done; \
+- echo "Doing installcheck in gnattools"; \
+- (cd $(HOST_SUBDIR)/gnattools && \
+- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+- "RANLIB=$${RANLIB}" \
+- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+- installcheck) \
+- || exit 1
++# gnattools doesn't support installcheck.
++installcheck-gnattools:
+
+ @endif gnattools
+
+@@ -49313,13 +49196,8 @@
+ @if target-libada
+ maybe-check-target-libada: check-target-libada
+
++# Dummy target for uncheckable module.
+ check-target-libada:
+- @: $(MAKE); $(unstage)
+- @r=`${PWD_COMMAND}`; export r; \
+- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+- $(NORMAL_TARGET_EXPORTS) \
+- (cd $(TARGET_SUBDIR)/libada && \
+- $(MAKE) $(TARGET_FLAGS_TO_PASS) check)
+
+ @endif target-libada
+
+@@ -49328,13 +49206,8 @@
+ @if target-libada
+ maybe-install-target-libada: install-target-libada
+
+-install-target-libada: installdirs
+- @: $(MAKE); $(unstage)
+- @r=`${PWD_COMMAND}`; export r; \
+- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+- $(NORMAL_TARGET_EXPORTS) \
+- (cd $(TARGET_SUBDIR)/libada && \
+- $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
++# Dummy target for uninstallable.
++install-target-libada:
+
+ @endif target-libada
+
+@@ -49343,13 +49216,8 @@
+ @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
+
+@@ -49360,14 +49228,103 @@
+ @if target-libada
+ maybe-info-target-libada: info-target-libada
+
+-info-target-libada: \
+- configure-target-libada
++# libada doesn't support info.
++info-target-libada:
++
++ at endif target-libada
++
++.PHONY: maybe-dvi-target-libada dvi-target-libada
++maybe-dvi-target-libada:
++ at if target-libada
++maybe-dvi-target-libada: dvi-target-libada
++
++# libada doesn't support dvi.
++dvi-target-libada:
++
++ at endif target-libada
++
++.PHONY: maybe-pdf-target-libada pdf-target-libada
++maybe-pdf-target-libada:
++ at if target-libada
++maybe-pdf-target-libada: pdf-target-libada
++
++# libada doesn't support pdf.
++pdf-target-libada:
++
++ at endif target-libada
++
++.PHONY: maybe-html-target-libada html-target-libada
++maybe-html-target-libada:
++ at if target-libada
++maybe-html-target-libada: html-target-libada
++
++# libada doesn't support html.
++html-target-libada:
++
++ at endif target-libada
++
++.PHONY: maybe-TAGS-target-libada TAGS-target-libada
++maybe-TAGS-target-libada:
++ at if target-libada
++maybe-TAGS-target-libada: TAGS-target-libada
++
++# libada doesn't support TAGS.
++TAGS-target-libada:
++
++ at endif target-libada
++
++.PHONY: maybe-install-info-target-libada install-info-target-libada
++maybe-install-info-target-libada:
++ at if target-libada
++maybe-install-info-target-libada: install-info-target-libada
++
++# libada doesn't support install-info.
++install-info-target-libada:
++
++ at endif target-libada
++
++.PHONY: maybe-install-pdf-target-libada install-pdf-target-libada
++maybe-install-pdf-target-libada:
++ at if target-libada
++maybe-install-pdf-target-libada: install-pdf-target-libada
++
++# libada doesn't support install-pdf.
++install-pdf-target-libada:
++
++ at endif target-libada
++
++.PHONY: maybe-install-html-target-libada install-html-target-libada
++maybe-install-html-target-libada:
++ at if target-libada
++maybe-install-html-target-libada: install-html-target-libada
++
++# libada doesn't support install-html.
++install-html-target-libada:
++
++ at endif target-libada
++
++.PHONY: maybe-installcheck-target-libada installcheck-target-libada
++maybe-installcheck-target-libada:
++ at if target-libada
++maybe-installcheck-target-libada: installcheck-target-libada
++
++# libada doesn't support installcheck.
++installcheck-target-libada:
++
++ at endif target-libada
++
++.PHONY: maybe-mostlyclean-target-libada mostlyclean-target-libada
++maybe-mostlyclean-target-libada:
++ at if target-libada
++maybe-mostlyclean-target-libada: mostlyclean-target-libada
++
++mostlyclean-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"; \
++ echo "Doing mostlyclean in $(TARGET_SUBDIR)/libada"; \
+ for flag in $(EXTRA_TARGET_FLAGS); do \
+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+ done; \
+@@ -49376,24 +49333,23 @@
+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+ "RANLIB=$${RANLIB}" \
+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+- info) \
++ mostlyclean) \
+ || exit 1
+
+ @endif target-libada
+
+-.PHONY: maybe-dvi-target-libada dvi-target-libada
+-maybe-dvi-target-libada:
++.PHONY: maybe-clean-target-libada clean-target-libada
++maybe-clean-target-libada:
+ @if target-libada
+-maybe-dvi-target-libada: dvi-target-libada
++maybe-clean-target-libada: clean-target-libada
+
+-dvi-target-libada: \
+- configure-target-libada
++clean-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"; \
++ echo "Doing clean in $(TARGET_SUBDIR)/libada"; \
+ for flag in $(EXTRA_TARGET_FLAGS); do \
+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+ done; \
+@@ -49402,24 +49358,23 @@
+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+ "RANLIB=$${RANLIB}" \
+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+- dvi) \
++ clean) \
+ || exit 1
+
+ @endif target-libada
+
+-.PHONY: maybe-pdf-target-libada pdf-target-libada
+-maybe-pdf-target-libada:
++.PHONY: maybe-distclean-target-libada distclean-target-libada
++maybe-distclean-target-libada:
+ @if target-libada
+-maybe-pdf-target-libada: pdf-target-libada
++maybe-distclean-target-libada: distclean-target-libada
+
+-pdf-target-libada: \
+- configure-target-libada
++distclean-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 pdf in $(TARGET_SUBDIR)/libada"; \
++ echo "Doing distclean in $(TARGET_SUBDIR)/libada"; \
+ for flag in $(EXTRA_TARGET_FLAGS); do \
+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+ done; \
+@@ -49428,24 +49383,23 @@
+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+ "RANLIB=$${RANLIB}" \
+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+- pdf) \
++ distclean) \
+ || exit 1
+
+ @endif target-libada
+
+-.PHONY: maybe-html-target-libada html-target-libada
+-maybe-html-target-libada:
++.PHONY: maybe-maintainer-clean-target-libada maintainer-clean-target-libada
++maybe-maintainer-clean-target-libada:
+ @if target-libada
+-maybe-html-target-libada: html-target-libada
++maybe-maintainer-clean-target-libada: maintainer-clean-target-libada
+
+-html-target-libada: \
+- configure-target-libada
++maintainer-clean-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"; \
++ echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libada"; \
+ for flag in $(EXTRA_TARGET_FLAGS); do \
+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
+ done; \
+@@ -49454,28 +49408,559 @@
+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+ "RANLIB=$${RANLIB}" \
+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
+- html) \
++ maintainer-clean) \
+ || exit 1
+
+ @endif target-libada
+
+-.PHONY: maybe-TAGS-target-libada TAGS-target-libada
+-maybe-TAGS-target-libada:
+- at if target-libada
+-maybe-TAGS-target-libada: TAGS-target-libada
+
+-TAGS-target-libada: \
+- configure-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)
+- @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0; \
++ @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
++
++# libgnatvsn doesn't support pdf.
++pdf-target-libgnatvsn:
++
++ 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
++
++# libgnatvsn doesn't support install-pdf.
++install-pdf-target-libgnatvsn:
++
++ 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
++
++# libgnatvsn doesn't support install-html.
++install-html-target-libgnatvsn:
++
++ 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 TAGS in $(TARGET_SUBDIR)/libada"; \
++ 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)/libada && \
++ (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-libada-sjlj maybe-configure-target-libada-sjlj
++maybe-configure-target-libada-sjlj:
++ at if gcc-bootstrap
++configure-target-libada-sjlj: stage_current
++ at endif gcc-bootstrap
++ at if target-libada-sjlj
++maybe-configure-target-libada-sjlj: configure-target-libada-sjlj
++configure-target-libada-sjlj:
++ @: $(MAKE); $(unstage)
++ @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; \
++ 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; \
++ else \
++ rm -f $(TARGET_SUBDIR)/libada-sjlj/Makefile; \
++ mv $(TARGET_SUBDIR)/libada-sjlj/multilib.tmp $(TARGET_SUBDIR)/libada-sjlj/multilib.out; \
++ fi; \
++ else \
++ 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; \
++ $(NORMAL_TARGET_EXPORTS) \
++ echo Configuring in $(TARGET_SUBDIR)/libada-sjlj; \
++ cd "$(TARGET_SUBDIR)/libada-sjlj" || exit 1; \
++ case $(srcdir) in \
++ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
++ *) topdir=`echo $(TARGET_SUBDIR)/libada-sjlj/ | \
++ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
++ esac; \
++ module_srcdir=libada-sjlj; \
++ 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-libada-sjlj
++
++
++
++
++
++.PHONY: all-target-libada-sjlj maybe-all-target-libada-sjlj
++maybe-all-target-libada-sjlj:
++ at if gcc-bootstrap
++all-target-libada-sjlj: stage_current
++ at endif gcc-bootstrap
++ at if target-libada-sjlj
++TARGET-target-libada-sjlj=all
++maybe-all-target-libada-sjlj: all-target-libada-sjlj
++all-target-libada-sjlj: configure-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) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \
++ $(TARGET-target-libada-sjlj))
++ at endif target-libada-sjlj
++
++
++
++
++
++.PHONY: check-target-libada-sjlj maybe-check-target-libada-sjlj
++maybe-check-target-libada-sjlj:
++ at if target-libada-sjlj
++maybe-check-target-libada-sjlj: check-target-libada-sjlj
++
++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
++
++.PHONY: install-target-libada-sjlj maybe-install-target-libada-sjlj
++maybe-install-target-libada-sjlj:
++ at if target-libada-sjlj
++maybe-install-target-libada-sjlj: 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
++
++.PHONY: install-strip-target-libada-sjlj maybe-install-strip-target-libada-sjlj
++maybe-install-strip-target-libada-sjlj:
++ at if target-libada-sjlj
++maybe-install-strip-target-libada-sjlj: 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
++
++# Other targets (info, dvi, pdf, etc.)
++
++.PHONY: maybe-info-target-libada-sjlj info-target-libada-sjlj
++maybe-info-target-libada-sjlj:
++ at if target-libada-sjlj
++maybe-info-target-libada-sjlj: 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
++
++.PHONY: maybe-dvi-target-libada-sjlj dvi-target-libada-sjlj
++maybe-dvi-target-libada-sjlj:
++ at if target-libada-sjlj
++maybe-dvi-target-libada-sjlj: 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
++
++.PHONY: maybe-pdf-target-libada-sjlj pdf-target-libada-sjlj
++maybe-pdf-target-libada-sjlj:
++ at if target-libada-sjlj
++maybe-pdf-target-libada-sjlj: pdf-target-libada-sjlj
++
++pdf-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 pdf 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}" \
++ pdf) \
++ || exit 1
++
++ at endif target-libada-sjlj
++
++.PHONY: maybe-html-target-libada-sjlj html-target-libada-sjlj
++maybe-html-target-libada-sjlj:
++ at if target-libada-sjlj
++maybe-html-target-libada-sjlj: 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
++
++.PHONY: maybe-TAGS-target-libada-sjlj TAGS-target-libada-sjlj
++maybe-TAGS-target-libada-sjlj:
++ at if target-libada-sjlj
++maybe-TAGS-target-libada-sjlj: 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}" \
+@@ -49483,26 +49968,26 @@
+ TAGS) \
+ || exit 1
+
+- at endif target-libada
++ at endif target-libada-sjlj
+
+-.PHONY: maybe-install-info-target-libada install-info-target-libada
+-maybe-install-info-target-libada:
+- at if target-libada
+-maybe-install-info-target-libada: install-info-target-libada
++.PHONY: maybe-install-info-target-libada-sjlj install-info-target-libada-sjlj
++maybe-install-info-target-libada-sjlj:
++ at if target-libada-sjlj
++maybe-install-info-target-libada-sjlj: install-info-target-libada-sjlj
+
+-install-info-target-libada: \
+- configure-target-libada \
+- info-target-libada
++install-info-target-libada-sjlj: \
++ configure-target-libada-sjlj \
++ info-target-libada-sjlj
+ @: $(MAKE); $(unstage)
+- @[ -f $(TARGET_SUBDIR)/libada/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-info in $(TARGET_SUBDIR)/libada"; \
++ 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 && \
++ (cd $(TARGET_SUBDIR)/libada-sjlj && \
+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+ "RANLIB=$${RANLIB}" \
+@@ -49510,26 +49995,26 @@
+ install-info) \
+ || exit 1
+
+- at endif target-libada
++ at endif target-libada-sjlj
+
+-.PHONY: maybe-install-pdf-target-libada install-pdf-target-libada
+-maybe-install-pdf-target-libada:
+- at if target-libada
+-maybe-install-pdf-target-libada: install-pdf-target-libada
++.PHONY: maybe-install-pdf-target-libada-sjlj install-pdf-target-libada-sjlj
++maybe-install-pdf-target-libada-sjlj:
++ at if target-libada-sjlj
++maybe-install-pdf-target-libada-sjlj: install-pdf-target-libada-sjlj
+
+-install-pdf-target-libada: \
+- configure-target-libada \
+- pdf-target-libada
++install-pdf-target-libada-sjlj: \
++ configure-target-libada-sjlj \
++ pdf-target-libada-sjlj
+ @: $(MAKE); $(unstage)
+- @[ -f $(TARGET_SUBDIR)/libada/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"; \
++ 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; \
+- (cd $(TARGET_SUBDIR)/libada && \
++ (cd $(TARGET_SUBDIR)/libada-sjlj && \
+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+ "RANLIB=$${RANLIB}" \
+@@ -49537,26 +50022,26 @@
+ install-pdf) \
+ || exit 1
+
+- at endif target-libada
++ at endif target-libada-sjlj
+
+-.PHONY: maybe-install-html-target-libada install-html-target-libada
+-maybe-install-html-target-libada:
+- at if target-libada
+-maybe-install-html-target-libada: install-html-target-libada
++.PHONY: maybe-install-html-target-libada-sjlj install-html-target-libada-sjlj
++maybe-install-html-target-libada-sjlj:
++ at if target-libada-sjlj
++maybe-install-html-target-libada-sjlj: install-html-target-libada-sjlj
+
+-install-html-target-libada: \
+- configure-target-libada \
+- html-target-libada
++install-html-target-libada-sjlj: \
++ configure-target-libada-sjlj \
++ html-target-libada-sjlj
+ @: $(MAKE); $(unstage)
+- @[ -f $(TARGET_SUBDIR)/libada/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"; \
++ 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; \
+- (cd $(TARGET_SUBDIR)/libada && \
++ (cd $(TARGET_SUBDIR)/libada-sjlj && \
+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+ "RANLIB=$${RANLIB}" \
+@@ -49564,25 +50049,25 @@
+ install-html) \
+ || exit 1
+
+- at endif target-libada
++ at endif target-libada-sjlj
+
+-.PHONY: maybe-installcheck-target-libada installcheck-target-libada
+-maybe-installcheck-target-libada:
+- at if target-libada
+-maybe-installcheck-target-libada: installcheck-target-libada
++.PHONY: maybe-installcheck-target-libada-sjlj installcheck-target-libada-sjlj
++maybe-installcheck-target-libada-sjlj:
++ at if target-libada-sjlj
++maybe-installcheck-target-libada-sjlj: installcheck-target-libada-sjlj
+
+-installcheck-target-libada: \
+- configure-target-libada
++installcheck-target-libada-sjlj: \
++ configure-target-libada-sjlj
+ @: $(MAKE); $(unstage)
+- @[ -f $(TARGET_SUBDIR)/libada/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 installcheck in $(TARGET_SUBDIR)/libada"; \
++ 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 && \
++ (cd $(TARGET_SUBDIR)/libada-sjlj && \
+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+ "RANLIB=$${RANLIB}" \
+@@ -49590,24 +50075,24 @@
+ installcheck) \
+ || exit 1
+
+- at endif target-libada
++ at endif target-libada-sjlj
+
+-.PHONY: maybe-mostlyclean-target-libada mostlyclean-target-libada
+-maybe-mostlyclean-target-libada:
+- at if target-libada
+-maybe-mostlyclean-target-libada: mostlyclean-target-libada
++.PHONY: maybe-mostlyclean-target-libada-sjlj mostlyclean-target-libada-sjlj
++maybe-mostlyclean-target-libada-sjlj:
++ at if target-libada-sjlj
++maybe-mostlyclean-target-libada-sjlj: mostlyclean-target-libada-sjlj
+
+-mostlyclean-target-libada:
++mostlyclean-target-libada-sjlj:
+ @: $(MAKE); $(unstage)
+- @[ -f $(TARGET_SUBDIR)/libada/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"; \
++ 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; \
+- (cd $(TARGET_SUBDIR)/libada && \
++ (cd $(TARGET_SUBDIR)/libada-sjlj && \
+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+ "RANLIB=$${RANLIB}" \
+@@ -49615,24 +50100,24 @@
+ mostlyclean) \
+ || exit 1
+
+- at endif target-libada
++ at endif target-libada-sjlj
+
+-.PHONY: maybe-clean-target-libada clean-target-libada
+-maybe-clean-target-libada:
+- at if target-libada
+-maybe-clean-target-libada: clean-target-libada
++.PHONY: maybe-clean-target-libada-sjlj clean-target-libada-sjlj
++maybe-clean-target-libada-sjlj:
++ at if target-libada-sjlj
++maybe-clean-target-libada-sjlj: clean-target-libada-sjlj
+
+-clean-target-libada:
++clean-target-libada-sjlj:
+ @: $(MAKE); $(unstage)
+- @[ -f $(TARGET_SUBDIR)/libada/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"; \
++ 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; \
+- (cd $(TARGET_SUBDIR)/libada && \
++ (cd $(TARGET_SUBDIR)/libada-sjlj && \
+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+ "RANLIB=$${RANLIB}" \
+@@ -49640,24 +50125,24 @@
+ clean) \
+ || exit 1
+
+- at endif target-libada
++ at endif target-libada-sjlj
+
+-.PHONY: maybe-distclean-target-libada distclean-target-libada
+-maybe-distclean-target-libada:
+- at if target-libada
+-maybe-distclean-target-libada: distclean-target-libada
++.PHONY: maybe-distclean-target-libada-sjlj distclean-target-libada-sjlj
++maybe-distclean-target-libada-sjlj:
++ at if target-libada-sjlj
++maybe-distclean-target-libada-sjlj: distclean-target-libada-sjlj
+
+-distclean-target-libada:
++distclean-target-libada-sjlj:
+ @: $(MAKE); $(unstage)
+- @[ -f $(TARGET_SUBDIR)/libada/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"; \
++ 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; \
+- (cd $(TARGET_SUBDIR)/libada && \
++ (cd $(TARGET_SUBDIR)/libada-sjlj && \
+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+ "RANLIB=$${RANLIB}" \
+@@ -49665,24 +50150,24 @@
+ distclean) \
+ || exit 1
+
+- at endif target-libada
++ at endif target-libada-sjlj
+
+-.PHONY: maybe-maintainer-clean-target-libada maintainer-clean-target-libada
+-maybe-maintainer-clean-target-libada:
+- at if target-libada
+-maybe-maintainer-clean-target-libada: maintainer-clean-target-libada
++.PHONY: maybe-maintainer-clean-target-libada-sjlj maintainer-clean-target-libada-sjlj
++maybe-maintainer-clean-target-libada-sjlj:
++ at if target-libada-sjlj
++maybe-maintainer-clean-target-libada-sjlj: maintainer-clean-target-libada-sjlj
+
+-maintainer-clean-target-libada:
++maintainer-clean-target-libada-sjlj:
+ @: $(MAKE); $(unstage)
+- @[ -f $(TARGET_SUBDIR)/libada/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"; \
++ 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; \
+- (cd $(TARGET_SUBDIR)/libada && \
++ (cd $(TARGET_SUBDIR)/libada-sjlj && \
+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
+ "RANLIB=$${RANLIB}" \
+@@ -49690,7 +50175,7 @@
+ maintainer-clean) \
+ || exit 1
+
+- at endif target-libada
++ at endif target-libada-sjlj
+
+
+
+@@ -54749,6 +55234,8 @@
+ configure-target-zlib: stage_last
+ configure-target-rda: stage_last
+ configure-target-libada: stage_last
++configure-target-libgnatvsn: stage_last
++configure-target-libada-sjlj: 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
+@@ -54784,6 +55271,8 @@
+ configure-target-zlib: maybe-all-gcc
+ configure-target-rda: maybe-all-gcc
+ configure-target-libada: maybe-all-gcc
++configure-target-libgnatvsn: maybe-all-gcc
++configure-target-libada-sjlj: maybe-all-gcc
+ configure-target-libgomp: maybe-all-gcc
+ configure-target-libitm: maybe-all-gcc
+ configure-target-libatomic: maybe-all-gcc
+@@ -55239,8 +55728,12 @@
+ 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-target-libada-sjlj: maybe-all-target-libada
+ all-gnattools: maybe-all-target-libada
+ all-gnattools: maybe-all-target-libstdc++-v3
++all-gnattools: maybe-all-target-libgnatvsn
++all-target-libgnatvsn: maybe-all-target-libada
+ all-lto-plugin: maybe-all-libiberty
+
+ all-stage1-lto-plugin: maybe-all-stage1-libiberty
+@@ -55937,6 +56430,8 @@
+ configure-target-zlib: 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-libada-sjlj: 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
+@@ -55987,6 +56482,10 @@
+
+ configure-target-libada: maybe-all-target-newlib maybe-all-target-libgloss
+
++configure-target-libgnatvsn: maybe-all-target-newlib maybe-all-target-libgloss
++
++configure-target-libada-sjlj: 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-driver-check.diff b/debian/patches/ada-driver-check.diff
index f6d6b55..caeb204 100644
--- a/debian/patches/ada-driver-check.diff
+++ b/debian/patches/ada-driver-check.diff
@@ -1,11 +1,9 @@
# DP: Simplify Ada driver check (we always build using the required
# DP: Ada version. Needed for warnings on alpha.
-Index: b/src/config/acx.m4
-===================================================================
--- a/src/config/acx.m4
+++ b/src/config/acx.m4
-@@ -407,7 +407,7 @@ acx_cv_cc_gcc_supports_ada=no
+@@ -407,7 +407,7 @@
# Other compilers, like HP Tru64 UNIX cc, exit successfully when
# given a .adb file, but produce no object file. So we must check
# if an object file was really produced to guard against this.
@@ -14,16 +12,3 @@ Index: b/src/config/acx.m4
if test x"$errors" = x && test -f conftest.$ac_objext; then
acx_cv_cc_gcc_supports_ada=yes
fi
-Index: b/src/configure
-===================================================================
---- a/src/configure
-+++ b/src/configure
-@@ -5275,7 +5275,7 @@ acx_cv_cc_gcc_supports_ada=no
- # Other compilers, like HP Tru64 UNIX cc, exit successfully when
- # given a .adb file, but produce no object file. So we must check
- # if an object file was really produced to guard against this.
--errors=`(${CC} -c conftest.adb) 2>&1 || echo failure`
-+errors=`(${CC} -c conftest.adb) 2>/dev/null || echo failure`
- if test x"$errors" = x && test -f conftest.$ac_objext; then
- acx_cv_cc_gcc_supports_ada=yes
- fi
diff --git a/debian/patches/ada-gcc-name.diff b/debian/patches/ada-gcc-name.diff
index 809b759..16422ee 100644
--- a/debian/patches/ada-gcc-name.diff
+++ b/debian/patches/ada-gcc-name.diff
@@ -1,103 +1,128 @@
# DP: use gcc-7 instead of gcc as the command name.
-Index: b/src/gcc/ada/gnatlink.adb
-===================================================================
--- a/src/gcc/ada/gnatlink.adb
+++ b/src/gcc/ada/gnatlink.adb
-@@ -136,7 +136,7 @@ procedure Gnatlink is
+@@ -136,7 +136,8 @@
-- This table collects the arguments to be passed to compile the binder
-- generated file.
- Gcc : String_Access := Program_Name ("gcc", "gnatlink");
-+ Gcc : String_Access := Program_Name ("gcc-7", "gnatlink");
++ Gcc : String_Access
++ := Program_Name ("gcc-" & Gnatvsn.Library_Version, "gnatlink");
Read_Mode : constant String := "r" & ASCII.NUL;
-@@ -1414,7 +1414,8 @@ procedure Gnatlink is
+@@ -1414,7 +1415,8 @@
end if;
Write_Line (" --GCC=comp Use comp as the compiler");
- Write_Line (" --LINK=nam Use 'nam' for the linking rather than 'gcc'");
-+ Write_Line (" --LINK=nam Use 'nam' for the linking rather " &
-+ "than 'gcc-7'");
++ Write_Line (" --LINK=nam Use 'nam' for the linking rather than 'gcc-"
++ & Gnatvsn.Library_Version & "'");
Write_Eol;
Write_Line (" [non-Ada-objects] list of non Ada object files");
Write_Line (" [linker-options] other options for the linker");
-Index: b/src/gcc/ada/make.adb
-===================================================================
--- a/src/gcc/ada/make.adb
+++ b/src/gcc/ada/make.adb
-@@ -670,9 +670,9 @@ package body Make is
+@@ -670,9 +670,12 @@
-- Compiler, Binder & Linker Data and Subprograms --
----------------------------------------------------
- Gcc : String_Access := Program_Name ("gcc", "gnatmake");
- Gnatbind : String_Access := Program_Name ("gnatbind", "gnatmake");
- Gnatlink : String_Access := Program_Name ("gnatlink", "gnatmake");
-+ Gcc : String_Access := Program_Name ("gcc-7", "gnatmake");
-+ Gnatbind : String_Access := Program_Name ("gnatbind-7", "gnatmake");
-+ Gnatlink : String_Access := Program_Name ("gnatlink-7", "gnatmake");
++ Gcc : String_Access := Program_Name
++ ("gcc-" & Gnatvsn.Library_Version, "gnatmake");
++ Gnatbind : String_Access := Program_Name
++ ("gnatbind-" & Gnatvsn.Library_Version, "gnatmake");
++ Gnatlink : String_Access := Program_Name
++ ("gnatlink-" & Gnatvsn.Library_Version, "gnatmake");
-- Default compiler, binder, linker programs
Saved_Gcc : String_Access := null;
-Index: b/src/gcc/ada/gnatchop.adb
-===================================================================
--- a/src/gcc/ada/gnatchop.adb
+++ b/src/gcc/ada/gnatchop.adb
-@@ -44,7 +44,7 @@ procedure Gnatchop is
+@@ -36,6 +36,7 @@
+ with GNAT.Heap_Sort_G;
+ with GNAT.Table;
+
++with Gnatvsn;
+ with Switch; use Switch;
+ with Types;
+
+@@ -44,7 +45,7 @@
Config_File_Name : constant String_Access := new String'("gnat.adc");
-- The name of the file holding the GNAT configuration pragmas
- Gcc : String_Access := new String'("gcc");
-+ Gcc : String_Access := new String'("gcc-7");
++ Gcc : String_Access := new String'("gcc-" & Gnatvsn.Library_Version);
-- May be modified by switch --GCC=
Gcc_Set : Boolean := False;
-Index: b/src/gcc/ada/mdll-utl.adb
-===================================================================
--- a/src/gcc/ada/mdll-utl.adb
+++ b/src/gcc/ada/mdll-utl.adb
-@@ -39,7 +39,7 @@ package body MDLL.Utl is
+@@ -29,6 +29,7 @@
+ with Ada.Exceptions;
+
+ with GNAT.Directory_Operations;
++with Gnatvsn;
+ with Osint;
+
+ package body MDLL.Utl is
+@@ -39,7 +40,7 @@
Dlltool_Name : constant String := "dlltool";
Dlltool_Exec : OS_Lib.String_Access;
- Gcc_Name : constant String := "gcc";
-+ Gcc_Name : constant String := "gcc-7";
++ Gcc_Name : constant String := "gcc-" & Gnatvsn.Library_Version;
Gcc_Exec : OS_Lib.String_Access;
Gnatbind_Name : constant String := "gnatbind";
-@@ -212,7 +212,7 @@ package body MDLL.Utl is
+@@ -212,7 +213,7 @@
end;
end if;
- Print_Command ("gcc", Arguments (1 .. A));
-+ Print_Command ("gcc-7", Arguments (1 .. A));
++ Print_Command (Gcc_Name, Arguments (1 .. A));
OS_Lib.Spawn (Gcc_Exec.all, Arguments (1 .. A), Success);
-Index: b/src/gcc/ada/mlib-utl.adb
-===================================================================
--- a/src/gcc/ada/mlib-utl.adb
+++ b/src/gcc/ada/mlib-utl.adb
-@@ -446,7 +446,7 @@ package body MLib.Utl is
+@@ -23,6 +23,7 @@
+ -- --
+ ------------------------------------------------------------------------------
+
++with Gnatvsn;
+ with MLib.Fil; use MLib.Fil;
+ with MLib.Tgt; use MLib.Tgt;
+ with Opt;
+@@ -446,7 +447,8 @@
if Driver_Name = No_Name then
if Gcc_Exec = null then
if Gcc_Name = null then
- Gcc_Name := Osint.Program_Name ("gcc", "gnatmake");
-+ Gcc_Name := Osint.Program_Name ("gcc-7", "gnatmake");
++ Gcc_Name := Osint.Program_Name
++ ("gcc-" & Gnatvsn.Library_Version, "gnatmake");
end if;
Gcc_Exec := Locate_Exec_On_Path (Gcc_Name.all);
-Index: b/src/gcc/ada/prj-makr.adb
-===================================================================
--- a/src/gcc/ada/prj-makr.adb
+++ b/src/gcc/ada/prj-makr.adb
-@@ -115,7 +115,7 @@ package body Prj.Makr is
+@@ -24,6 +24,7 @@
+ ------------------------------------------------------------------------------
+
+ with Csets;
++with Gnatvsn;
+ with Makeutl; use Makeutl;
+ with Opt;
+ with Output;
+@@ -115,7 +116,7 @@
procedure Dup2 (Old_Fd, New_Fd : File_Descriptor);
- Gcc : constant String := "gcc";
-+ Gcc : constant String := "gcc-7";
++ Gcc : constant String := "gcc-" & Gnatvsn.Library_Version;
Gcc_Path : String_Access := null;
Non_Empty_Node : constant Project_Node_Id := 1;
diff --git a/debian/patches/ada-gnattools-cross.diff b/debian/patches/ada-gnattools-cross.diff
new file mode 100644
index 0000000..0081bef
--- /dev/null
+++ b/debian/patches/ada-gnattools-cross.diff
@@ -0,0 +1,613 @@
+# DP: - When building the native gnat, link the gnat tools against
+# DP: the build tree (build/$(host_alias)/libgnatvsn).
+# DP: - When building a cross gnat, link against the libgnatvsnBV-dev
+# DP: package.
+# 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.
+
+--- a/src/gcc/ada/gcc-interface/Makefile.in
++++ b/src/gcc/ada/gcc-interface/Makefile.in
+@@ -102,7 +102,7 @@
+ 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
+@@ -142,6 +142,7 @@
+ target_cpu=@target_cpu@
+ target_vendor=@target_vendor@
+ target_os=@target_os@
++host=@host@
+ host_cpu=@host_cpu@
+ host_vendor=@host_vendor@
+ host_os=@host_os@
+@@ -236,7 +237,10 @@
+ ALL_COMPILERFLAGS = $(ALL_CFLAGS)
+
+ # This is where we get libiberty.a from.
+-LIBIBERTY = ../../libiberty/libiberty.a
++LIBIBERTY = ../../libiberty/pic/libiberty.a
++
++# Sources and ALI files for gnatvsn may be found here.
++VSN_DIR := ../../../$(target_alias)/libgnatvsn
+
+ # We need to link against libbacktrace because diagnostic.c in
+ # libcommon.a uses it.
+@@ -249,8 +253,13 @@
+ # 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)
++ ../../libcommon.a ../../../libcpp/libcpp.a \
++ ../$(LIBBACKTRACE) ../$(LIBIBERTY) \
++ ../../version.o ../../../libiberty/pic/lrealpath.o ../../libbackend.a -lstdc++
++
++ifeq ($(host),$(target))
++ TOOLS_LIBS += -L$(VSN_DIR) -lgnatvsn -L../$(RTSDIR) -lgnat-$(LIB_VERSION)
++endif
+
+ # Add -no-pie to TOOLS_LIBS since some of them are compiled with -fno-PIE.
+ TOOLS_LIBS += @NO_PIE_FLAG@
+@@ -263,6 +272,9 @@
+ -I $(ftop_srcdir)/include $(GMPINC)
+
+ ADA_INCLUDES = -I- -I. -I$(srcdir)/ada
++ifeq ($(host),$(target))
++ ADA_INCLUDES = -I../rts -I$(VSN_DIR) $(ADA_INCLUDES)
++endif
+
+ # Likewise, but valid for subdirectories of the current dir.
+ # FIXME: for VxWorks, we cannot add $(fsrcdir) because the regs.h file in
+@@ -335,6 +347,20 @@
+ uname.o urealp.o usage.o widechar.o \
+ $(EXTRA_GNATMAKE_OBJS)
+
++# Remove unneeded objects or objects provided by an shared library.
++RTS_OBJS := $(patsubst $(RTSDIR)/%.ali,%.o,$(wildcard $(RTSDIR)/*.ali))
++VSN_OBJS := $(patsubst $(VSN_DIR)/%.ali,%.o,$(wildcard $(VSN_DIR)/*.ali))
++GNATLINK_OBJS := $(filter-out $(VSN_OBJS) $(RTS_OBJS) \
++ ali butil fmap osint rident sdefault stylesw switch targparm \
++ ,$(GNATLINK_OBJS))
++GNATMAKE_OBJS := $(filter-out $(VSN_OBJS) $(RTS_OBJS) \
++ scil_ll \
++ ,$(GNATMAKE_OBJS))
++# This list is duplicated in gnattools/Makefile.in.
++
++# TODO: understand why upstream does not need this.
++GNATMAKE_OBJS += link.o
++
+ # 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
+ # with MULTILIB_DIRNAMES defined in gcc/config/target/t-*.
+@@ -437,7 +460,7 @@
+ s-atocou.adb<s-atocou-builtin.adb
+
+ # Shared library version
+-LIB_VERSION = $(strip $(shell grep ' Library_Version :' $(fsrcpfx)ada/gnatvsn.ads | sed -e 's/.*"\(.*\)".*/\1/'))
++LIB_VERSION := $(shell sed s/[^0-9].*// $(srcdir)/BASE-VER)
+
+ # Additionnal object files from C source to be added to libgnat.
+ EXTRA_LIBGNAT_OBJS=
+@@ -1642,6 +1667,11 @@
+ 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 = \
+@@ -2517,24 +2547,6 @@
+ $(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
+@@ -2552,95 +2564,36 @@
+ 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)
++ $(LDFLAGS) $(TOOLS_LIBS)
+ $(GNATLINK) -v gnatchop -o ../../gnatchop$(exeext) \
+- --GCC="$(GCC_LINK)" $(TOOLS_LIBS) $(LDFLAGS)
++ $(LDFLAGS) $(TOOLS_LIBS)
+ $(GNATLINK) -v gnatkr -o ../../gnatkr$(exeext) \
+- --GCC="$(GCC_LINK)" $(TOOLS_LIBS) $(LDFLAGS)
++ $(LDFLAGS) $(TOOLS_LIBS)
+ $(GNATLINK) -v gnatls -o ../../gnatls$(exeext) \
+- --GCC="$(GCC_LINK)" $(TOOLS_LIBS) $(LDFLAGS)
++ $(LDFLAGS) $(TOOLS_LIBS)
+ $(GNATLINK) -v gnatprep -o ../../gnatprep$(exeext) \
+- --GCC="$(GCC_LINK)" $(TOOLS_LIBS) $(LDFLAGS)
++ $(LDFLAGS) $(TOOLS_LIBS)
+ $(GNATLINK) -v gnatxref -o ../../gnatxref$(exeext) \
+- --GCC="$(GCC_LINK)" $(TOOLS_LIBS) $(LDFLAGS)
++ $(LDFLAGS) $(TOOLS_LIBS)
+ $(GNATLINK) -v gnatfind -o ../../gnatfind$(exeext) \
+- --GCC="$(GCC_LINK)" $(TOOLS_LIBS) $(LDFLAGS)
++ $(LDFLAGS) $(TOOLS_LIBS)
+ $(GNATLINK) -v gnatname -o ../../gnatname$(exeext) \
+- --GCC="$(GCC_LINK)" $(TOOLS_LIBS) $(LDFLAGS)
++ $(LDFLAGS) $(TOOLS_LIBS)
+ $(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)
++ $(LDFLAGS) $(TOOLS_LIBS)
+
+ 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)
++ $(LDFLAGS) $(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.
+@@ -2650,19 +2603,15 @@
+ $(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)
++ $(LDFLAGS) $(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)
++ +$(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) $(TOOLS1_LIBS)
++ +$(GCC_LINK) $(ALL_CFLAGS) -o $@ b_gnatl.o $(GNATLINK_OBJS) $(TOOLS_LIBS)
+
+ ../stamp-gnatlib-$(RTSDIR):
+ @if [ ! -f stamp-gnatlib-$(RTSDIR) ] ; \
+@@ -2706,10 +2655,6 @@
+ $(INSTALL) $(RTSDIR)/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext) \
+ $(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); \
+@@ -2722,19 +2667,7 @@
+ 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)
+@@ -2799,7 +2732,7 @@
+ $(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) \
+@@ -2837,13 +2770,24 @@
+
+ # 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
++ $(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)
+ cd $(RTSDIR); `echo "$(GCC_FOR_TARGET)" \
+ | sed -e 's,\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'` -shared $(GNATLIBCFLAGS) \
+@@ -2863,6 +2807,7 @@
+ libgnat$(soext)
+ cd $(RTSDIR); $(LN_S) libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
+ libgnarl$(soext)
++ $(CHMOD) a-wx $(RTSDIR)/*.ali
+
+ # Create static libgnat and libgnarl compiled with -fPIC
+ $(RM) $(RTSDIR)/libgnat_pic$(arext) $(RTSDIR)/libgnarl_pic$(arext)
+@@ -2882,11 +2827,8 @@
+ GNATLIBLDFLAGS="$(GNATLIBLDFLAGS)" \
+ MULTISUBDIR="$(MULTISUBDIR)" \
+ THREAD_KIND="$(THREAD_KIND)" \
+- gnatlib-shared-default
+- $(MV) $(RTSDIR)/libgna*$(soext) .
+- $(MV) $(RTSDIR)/libgnat_pic$(arext) .
+- $(MV) $(RTSDIR)/libgnarl_pic$(arext) .
+- $(RM) ../stamp-gnatlib2-$(RTSDIR)
++ gnatlib
++ $(RM) $(RTSDIR)/*.o $(RTSDIR)/*.ali
+ $(MAKE) $(FLAGS_TO_PASS) \
+ GNATLIBFLAGS="$(GNATLIBFLAGS)" \
+ GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \
+@@ -2894,10 +2836,7 @@
+ GNATLIBLDFLAGS="$(GNATLIBLDFLAGS)" \
+ MULTISUBDIR="$(MULTISUBDIR)" \
+ THREAD_KIND="$(THREAD_KIND)" \
+- gnatlib
+- $(MV) libgna*$(soext) $(RTSDIR)
+- $(MV) libgnat_pic$(arext) $(RTSDIR)
+- $(MV) libgnarl_pic$(arext) $(RTSDIR)
++ gnatlib-shared-default
+
+ gnatlib-shared-dual-win32:
+ $(MAKE) $(FLAGS_TO_PASS) \
+@@ -2907,17 +2846,15 @@
+ 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
+--- a/src/gnattools/Makefile.in
++++ b/src/gnattools/Makefile.in
+@@ -52,7 +52,7 @@
+ 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,166 @@
+ 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
++VSN_DIR := ../$(target_noncanonical)/libgnatvsn
++RTS_DIR := ../gcc/ada/rts
++ADA_INCLUDES := -nostdinc -I- -I. -I$(VSN_DIR) -I$(RTS_DIR)
++LIB_VERSION := $(shell sed s/[^0-9].*// $(srcdir)/../gcc/BASE-VER)
++SHARED_ADA_LIBS := -L$(VSN_DIR) -lgnatvsn -L$(RTS_DIR) -lgnat-$(LIB_VERSION)
++STATIC_ADA_LIBS := $(VSN_DIR)/libgnatvsn.a $(RTS_DIR)/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
+
+-# 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"
++# 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 \
++ 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)
++
++# Remove unneeded objects or objects provided by an shared library.
++RTS_OBJS := $(patsubst $(RTS_DIR)/%.ali,%.o,$(wildcard $(RTS_DIR)/*.ali))
++VSN_OBJS := $(patsubst $(VSN_DIR)/%.ali,%.o,$(wildcard $(VSN_DIR)/*.ali))
++GNATLINK_OBJS := $(filter-out $(VSN_OBJS) $(RTS_OBJS) \
++ ali butil fmap osint rident sdefault stylesw switch targparm \
++ ,$(GNATLINK_OBJS))
++GNATMAKE_OBJS := $(filter-out $(VSN_OBJS) $(RTS_OBJS) \
++ scil_ll \
++ ,$(GNATMAKE_OBJS))
++
++# This list is duplicated in gcc/ada/gcc-interface/Makefile.in.
++# EXTRA_GNATMAKE_OBJS should not be useful here.
++
++# TODO: understand why upstream does not need this.
++GNATMAKE_OBJS += link.o
++
++# Makefile targets
++# ----------------
++
++.PHONY: gnattools gnattools-native gnattools-cross regnattools
++gnattools: @default_gnattools_target@
++
++SOURCES := ../gcc/ada/sdefault.adb \
++ $(wildcard $(foreach u, $(basename $(GNATMAKE_OBJS) $(GNATLINK_OBJS)) \
++ bcheck binde bindgen bindusg osint-b switch-b \
++ clean \
++ xr_tabls xref_lib \
++ osint-l \
++ prj-makr \
++ gprep prep, \
++ @srcdir@/../gcc/ada/$(u).adb \
++ @srcdir@/../gcc/ada/$(u).ads)) \
++
++$(notdir $(SOURCES)): stamp-gnattools-sources
++
++stamp-gnattools-sources:
++ for file in $(SOURCES); do \
++ $(LN_S) -f $$file .; \
++ 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 $@
++
++gnattools-native: $(RTS_DIR)/libgnat-$(LIB_VERSION).so
++gnattools-native: $(VSN_DIR)/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 $@ $(ADA_CFLAGS) $^ \
++ $(LDFLAGS) $(STATIC_ADA_LIBS) $(STATIC_GCC_LIBS) $(CXX_LFLAGS)
++
++gnatlink: $(GNATLINK_OBJS) b_gnatl.o
++ $(GXX) -o $@ $(ADA_CFLAGS) $^ \
++ $(LDFLAGS) $(SHARED_ADA_LIBS) $(STATIC_GCC_LIBS) $(CXX_LFLAGS)
++
++b_gnatl.adb: $(GNATLINK_OBJS)
++ ../gcc/gnatbind -o $@ $(ADA_INCLUDES) gnatlink.ali
++
++# gnatmake
++
++gnatmake-static: $(GNATMAKE_OBJS) b_gnatm.o
++ $(GXX) -o $@ $(ADA_CFLAGS) $^ \
++ $(LDFLAGS) $(STATIC_ADA_LIBS) $(STATIC_GCC_LIBS) $(CXX_LFLAGS)
++
++gnatmake: $(GNATMAKE_OBJS) b_gnatm.o
++ $(GXX) -o $@ $(ADA_CFLAGS) $^ \
++ $(LDFLAGS) $(SHARED_ADA_LIBS) $(STATIC_GCC_LIBS) $(CXX_LFLAGS)
++
++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) $(LDFLAGS) $(SHARED_ADA_LIBS) $(STATIC_GCC_LIBS) $(CXX_LFLAGS) \
++ --GCC="$(GXX) $(ADA_INCLUDES)"
+
+ # Variables for regnattools
+ TOOLS_FLAGS_TO_PASS_RE= \
+@@ -184,20 +313,11 @@
+ $(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-kfreebsd.diff b/debian/patches/ada-kfreebsd.diff
index efbd6d4..a6928b8 100644
--- a/debian/patches/ada-kfreebsd.diff
+++ b/debian/patches/ada-kfreebsd.diff
@@ -1,10 +1,8 @@
# DP: add support for GNU/kFreeBSD.
-Index: b/src/gcc/ada/terminals.c
-===================================================================
--- a/src/gcc/ada/terminals.c
+++ b/src/gcc/ada/terminals.c
-@@ -1064,7 +1064,8 @@ __gnat_setup_winsize (void *desc, int ro
+@@ -1064,7 +1064,8 @@
/* On some system termio is either absent or including it will disable termios
(HP-UX) */
#if !defined (__hpux__) && !defined (BSD) && !defined (__APPLE__) \
@@ -14,8 +12,6 @@ Index: b/src/gcc/ada/terminals.c
# include <termio.h>
#endif
-Index: b/src/gcc/ada/s-osinte-kfreebsd-gnu.adb
-===================================================================
--- /dev/null
+++ b/src/gcc/ada/s-osinte-kfreebsd-gnu.adb
@@ -0,0 +1,158 @@
@@ -177,11 +173,9 @@ Index: b/src/gcc/ada/s-osinte-kfreebsd-gnu.adb
+ end To_Timespec;
+
+end System.OS_Interface;
-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
-@@ -1417,7 +1417,7 @@ ifeq ($(strip $(filter-out %86 kfreebsd%
+@@ -1443,7 +1443,7 @@
a-intnam.ads<a-intnam-freebsd.ads \
s-inmaop.adb<s-inmaop-posix.adb \
s-intman.adb<s-intman-posix.adb \
@@ -190,7 +184,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
s-osinte.ads<s-osinte-kfreebsd-gnu.ads \
s-osprim.adb<s-osprim-posix.adb \
s-taprop.adb<s-taprop-posix.adb \
-@@ -1477,7 +1477,7 @@ ifeq ($(strip $(filter-out x86_64 kfreeb
+@@ -1503,7 +1503,7 @@
a-numaux.ads<a-numaux-x86.ads \
s-inmaop.adb<s-inmaop-posix.adb \
s-intman.adb<s-intman-posix.adb \
@@ -199,11 +193,9 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
s-osinte.ads<s-osinte-kfreebsd-gnu.ads \
s-osprim.adb<s-osprim-posix.adb \
s-taprop.adb<s-taprop-posix.adb \
-Index: b/src/gcc/ada/s-osinte-kfreebsd-gnu.ads
-===================================================================
--- a/src/gcc/ada/s-osinte-kfreebsd-gnu.ads
+++ b/src/gcc/ada/s-osinte-kfreebsd-gnu.ads
-@@ -45,6 +45,7 @@ package System.OS_Interface is
+@@ -45,6 +45,7 @@
pragma Preelaborate;
pragma Linker_Options ("-lpthread");
@@ -211,7 +203,7 @@ Index: b/src/gcc/ada/s-osinte-kfreebsd-gnu.ads
subtype int is Interfaces.C.int;
subtype char is Interfaces.C.char;
-@@ -206,9 +207,7 @@ package System.OS_Interface is
+@@ -206,9 +207,7 @@
function nanosleep (rqtp, rmtp : access timespec) return int;
pragma Import (C, nanosleep, "nanosleep");
@@ -222,7 +214,7 @@ Index: b/src/gcc/ada/s-osinte-kfreebsd-gnu.ads
function clock_gettime
(clock_id : clockid_t;
-@@ -441,31 +440,25 @@ package System.OS_Interface is
+@@ -441,31 +440,25 @@
PTHREAD_PRIO_PROTECT : constant := 2;
PTHREAD_PRIO_INHERIT : constant := 1;
@@ -258,7 +250,7 @@ Index: b/src/gcc/ada/s-osinte-kfreebsd-gnu.ads
type struct_sched_param is record
sched_priority : int; -- scheduling priority
-@@ -592,8 +585,8 @@ private
+@@ -592,8 +585,8 @@
-- #define sa_handler __sigaction_u._handler
-- #define sa_sigaction __sigaction_u._sigaction
@@ -269,7 +261,7 @@ Index: b/src/gcc/ada/s-osinte-kfreebsd-gnu.ads
-- sigcontext type is opaque, so it is architecturally neutral.
-- It is always passed as an access type, so define it as an empty record
-- since the contents are not used anywhere.
-@@ -610,9 +603,6 @@ private
+@@ -610,9 +603,6 @@
end record;
pragma Convention (C, timespec);
@@ -279,8 +271,6 @@ Index: b/src/gcc/ada/s-osinte-kfreebsd-gnu.ads
type pthread_attr_t is record
detachstate : int;
schedpolicy : int;
-Index: b/src/gcc/ada/gsocket.h
-===================================================================
--- a/src/gcc/ada/gsocket.h
+++ b/src/gcc/ada/gsocket.h
@@ -244,6 +244,7 @@
@@ -291,11 +281,9 @@ Index: b/src/gcc/ada/gsocket.h
|| defined (__DragonFly__) || defined (__NetBSD__) || defined (__OpenBSD__)
# define Has_Sockaddr_Len 1
#else
-Index: b/src/gcc/ada/s-oscons-tmplt.c
-===================================================================
--- a/src/gcc/ada/s-oscons-tmplt.c
+++ b/src/gcc/ada/s-oscons-tmplt.c
-@@ -1441,7 +1441,7 @@ CND(CLOCK_FASTEST, "Fastest clock")
+@@ -1441,7 +1441,7 @@
CND(CLOCK_THREAD_CPUTIME_ID, "Thread CPU clock")
#if defined(__FreeBSD__) || (defined(_AIX) && defined(_AIXVERSION_530)) \
diff --git a/debian/patches/ada-libgnatvsn.diff b/debian/patches/ada-libgnatvsn.diff
new file mode 100644
index 0000000..37f798b
--- /dev/null
+++ b/debian/patches/ada-libgnatvsn.diff
@@ -0,0 +1,249 @@
+# 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.
+
+# !!! src/Makefile.def modified, run autoconf to regenerate src/Makefile.in
+
+# !!! Must be applied after ada-link-lib.diff
+
+--- /dev/null
++++ b/src/libgnatvsn/configure
+@@ -0,0 +1,34 @@
++#!/bin/sh
++
++# Minimal configure script for libgnatvsn. We're only interested in
++# a few parameters.
++
++{
++
++for arg in $*; do
++ case ${arg} in
++ --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
++
++sed_script=
++for name in prefix srcdir libdir pkgversion bugurl; do
++ eval value=\$$name
++ echo "$name: $value"
++ sed_script="$sed_script;s,@$name@,$value,"
++done
++echo "Creating Makefile..."
++sed "$sed_script" "$srcdir/Makefile.in" > Makefile
++
++} | tee -a config.log
+--- /dev/null
++++ b/src/libgnatvsn/Makefile.in
+@@ -0,0 +1,140 @@
++# Makefile for libgnatvsn.
++# Copyright (c) 2006 Ludovic Brenta <ludovic at ludovic-brenta.org>
++# Copyright (c) 2017 Nicolas Boulenguez <nicolas at debian.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
++
++# Parameters substituted by configure during Makefile generation
++prefix := @prefix@
++srcdir := @srcdir@
++libdir := @libdir@
++pkgversion := @pkgversion@
++bugurl := @bugurl@
++
++# Parameters expected in environment or command line
++GCC:=$(CC)
++CFLAGS ?= -g -O2
++ADAFLAGS ?= -g -O2 -gnatn
++CPPFLAGS ?=
++LDFLAGS ?=
++DESTDIR ?=
++
++# Parameters read from external files
++BASEVER := $(shell cat $(srcdir)/../gcc/BASE-VER)
++DEVPHASE := $(shell cat $(srcdir)/../gcc/DEV-PHASE)
++DATESTAMP := $(shell cat $(srcdir)/../gcc/DATESTAMP)
++
++# Public and default targets
++.PHONY: all install clean
++all:
++
++######################################################################
++
++LIB_VERSION := $(shell expr '$(BASEVER)' : '\([0-9]\+\)')
++
++src_inst_dir := $(DESTDIR)$(prefix)/share/ada/adainclude/gnatvsn
++ali_inst_dir := $(DESTDIR)$(prefix)/lib/ada/adalib/gnatvsn
++lib_inst_dir := $(DESTDIR)$(libdir)
++
++# 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.
++VERSION_CPP_DEFS := \
++ -DBASEVER="\"$(BASEVER)\"" \
++ -DDATESTAMP="\"$(if $(DEVPHASE), $(DATESTAMP))\"" \
++ -DDEVPHASE="\"$(if $(DEVPHASE), ($(DEVPHASE)))\"" \
++ -DPKGVERSION="\"$(pkgversion)\"" \
++ -DBUGURL="\"$(bugurl)\"" \
++ -DREVISION=
++
++# Include and link ../../gcc/ada/rts instead of the default.
++LIBGNAT_JUST_BUILT := -nostdinc -I../../gcc/ada/rts
++LDLIBS := -L../../gcc/ada/rts -lgnat-$(LIB_VERSION)
++
++# Link wanted Ada sources from source tree, so that gnat fails when new
++# dependencies are missing in the current directory, instead of silently
++# using the ones in the distant directory.
++# Let Make create all symlinks before first ada compilation,
++# because they depend on each other.
++# snames.ad[bs] is generated in the build tree.
++
++UNITS_BOTH := aspects atree casing csets debug einfo elists fname \
++ gnatvsn krunch lib namet nlists opt output repinfo scans sem_aux \
++ sinfo sinput stand stringt table tree_in tree_io types uintp \
++ uname urealp widechar
++UNITS_SPEC := alloc hostparm
++SEPARATES := lib-list lib-sort
++ADA_SRC := $(addsuffix .ads, $(UNITS_BOTH) $(UNITS_SPEC)) \
++ $(addsuffix .adb, $(UNITS_BOTH) $(SEPARATES))
++OBJECTS := $(addsuffix .o, $(UNITS_BOTH) snames $(UNITS_SPEC) version)
++
++all: libgnatvsn.a libgnatvsn.so.$(LIB_VERSION)
++
++libgnatvsn.so.$(LIB_VERSION): $(addprefix obj-shared/,$(OBJECTS))
++ : # Make libgnatvsn.so
++ $(GCC) -o $@ -shared -fPIC -Wl,--soname,$@ $^ $(LDFLAGS) $(LDLIBS)
++ 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 .
++
++$(foreach u, $(UNITS_BOTH) snames, obj-shared/$(u).o): \
++obj-shared/%.o: %.adb $(ADA_SRC) snames.adb snames.ads | obj-shared
++ $(GCC) -c -fPIC $(ADAFLAGS) $(LIBGNAT_JUST_BUILT) $< -o $@
++
++$(foreach u, $(UNITS_SPEC), obj-shared/$(u).o): \
++obj-shared/%.o: %.ads $(ADA_SRC) snames.adb snames.ads | obj-shared
++ $(GCC) -c -fPIC $(ADAFLAGS) $(LIBGNAT_JUST_BUILT) $< -o $@
++
++obj-shared/version.o: version.c version.h | obj-shared
++ $(GCC) -c -fPIC $(CFLAGS) $(CPPFLAGS) $(VERSION_CPP_DEFS) $< -o $@
++
++libgnatvsn.a: $(addprefix obj-static/,$(OBJECTS))
++ : # Make libgnatvsn.a
++ ar rc $@ $^
++ ranlib $@
++
++$(foreach u, $(UNITS_BOTH) snames, obj-static/$(u).o): \
++obj-static/%.o: %.adb $(ADA_SRC) snames.adb snames.ads | obj-static
++ $(GCC) -c $(ADAFLAGS) $(LIBGNAT_JUST_BUILT) $< -o $@
++
++$(foreach u, $(UNITS_SPEC), obj-static/$(u).o): \
++obj-static/%.o: %.ads $(ADA_SRC) snames.adb snames.ads | obj-static
++ $(GCC) -c $(ADAFLAGS) $(LIBGNAT_JUST_BUILT) $< -o $@
++
++obj-static/version.o: version.c version.h | obj-static
++ $(GCC) -c $(CFLAGS) $(CPPFLAGS) $(VERSION_CPP_DEFS) $< -o $@
++
++obj-shared obj-static:
++ mkdir $@
++
++$(ADA_SRC):
++ ln -s $(srcdir)/../gcc/ada/$@
++version.c version.h:
++ ln -s $(srcdir)/../gcc/$@
++snames.adb snames.ads:
++ ln -s ../../gcc/ada/$@
++
++install: all
++ mkdir -p $(lib_inst_dir) $(src_inst_dir) $(ali_inst_dir)
++ $(INSTALL_DATA) libgnatvsn.a libgnatvsn.so.* $(lib_inst_dir)
++ cd $(lib_inst_dir) && ln -sf libgnatvsn.so.$(LIB_SOURCE) libgnatvsn.so
++ $(INSTALL_DATA) *.adb *.ads *.c *.h $(src_inst_dir)
++ $(INSTALL) -m 0444 *.ali $(ali_inst_dir)
++
++clean:
++ rm -rf *.ali obj-static obj-shared libgnatvsn* *.adb *.ads *.c *.h
+--- a/src/Makefile.def
++++ b/src/Makefile.def
+@@ -187,6 +187,16 @@
+ missing= TAGS;
+ missing= install-info;
+ missing= installcheck; };
++target_modules = { module= libgnatvsn; no_check=true;
++ missing= info;
++ missing= dvi;
++ missing= html;
++ missing= pdf;
++ missing= install-html;
++ missing= install-pdf;
++ 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; };
+@@ -385,6 +395,8 @@
+ dependencies = { module=all-target-libada; on=all-gcc; };
+ dependencies = { module=all-gnattools; on=all-target-libada; };
+ dependencies = { module=all-gnattools; on=all-target-libstdc++-v3; };
++dependencies = { module=all-gnattools; on=all-target-libgnatvsn; };
++dependencies = { module=all-target-libgnatvsn; on=all-target-libada; };
+
+ // Depending on the specific configuration, the LTO plugin will either use the
+ // generic libiberty build or the specific build for linker plugins.
+--- a/src/configure.ac
++++ b/src/configure.ac
+@@ -171,6 +171,7 @@
+ target-libobjc \
+ target-libada \
+ ${target_libiberty} \
++ target-libgnatvsn \
+ target-libgo"
+
+ # these tools are built using the target libraries, and are intended to
+@@ -455,7 +456,7 @@
+ 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,
+--- a/src/gcc/ada/gcc-interface/config-lang.in
++++ b/src/gcc/ada/gcc-interface/config-lang.in
+@@ -34,8 +34,8 @@
+
+ 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
diff --git a/debian/patches/ada-link-lib.diff b/debian/patches/ada-link-lib.diff
index 80380e2..bcf5777 100644
--- a/debian/patches/ada-link-lib.diff
+++ b/debian/patches/ada-link-lib.diff
@@ -8,14 +8,11 @@
# DP: recursive makefiles.
# DP: - Link the GNAT tools dynamically.
-# This patch seems large, but the hunks in Makefile.in are actually
-# generated from Makefile.def using autogen.
+# !!! src/Makefile.def modified, run autoconf to regenerate src/Makefile.in
-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
-@@ -35,7 +35,7 @@ gtfiles="\$(srcdir)/ada/gcc-interface/ad
+@@ -35,7 +35,7 @@
outputs="ada/gcc-interface/Makefile ada/Makefile"
target_libs="target-libada"
@@ -24,11 +21,9 @@ 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
-===================================================================
--- a/src/gcc/ada/link.c
+++ b/src/gcc/ada/link.c
-@@ -106,9 +106,9 @@ const char *__gnat_default_libgcc_subdir
+@@ -106,9 +106,9 @@
#elif defined (__FreeBSD__) || defined (__DragonFly__) \
|| defined (__NetBSD__) || defined (__OpenBSD__)
const char *__gnat_object_file_option = "-Wl,@";
@@ -41,7 +36,7 @@ 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";
-@@ -128,9 +128,9 @@ const char *__gnat_default_libgcc_subdir
+@@ -128,9 +128,9 @@
#elif defined (__linux__) || defined (__GLIBC__)
const char *__gnat_object_file_option = "-Wl,@";
@@ -54,11 +49,9 @@ 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
-===================================================================
--- a/src/libada/Makefile.in
+++ b/src/libada/Makefile.in
-@@ -60,7 +60,7 @@ CFLAGS=-g
+@@ -60,7 +60,7 @@
PICFLAG = @PICFLAG@
GNATLIBFLAGS= -W -Wall -gnatpg -nostdinc
GNATLIBCFLAGS= -g -O2
@@ -67,7 +60,7 @@ Index: b/src/libada/Makefile.in
-fexceptions -DIN_RTS @have_getipinfo@
host_subdir = @host_subdir@
-@@ -122,7 +122,7 @@ osconstool:
+@@ -122,7 +122,7 @@
$(MAKE) -C $(GCC_DIR)/ada $(LIBADA_FLAGS_TO_PASS) ./bldtools/oscons/xoscons
install-gnatlib: $(GCC_DIR)/ada/Makefile
@@ -76,11 +69,9 @@ Index: b/src/libada/Makefile.in
# Check uninstalled version.
check:
-Index: b/src/Makefile.def
-===================================================================
--- a/src/Makefile.def
+++ b/src/Makefile.def
-@@ -122,7 +122,13 @@ host_modules= { module= libtermcap; no_c
+@@ -122,7 +122,16 @@
missing=distclean;
missing=maintainer-clean; };
host_modules= { module= utils; no_check=true; };
@@ -89,13 +80,34 @@ Index: b/src/Makefile.def
+ missing= info;
+ missing= dvi;
+ missing= html;
++ missing= pdf;
++ missing= install-pdf;
++ missing= install-html;
+ missing= TAGS;
+ missing= install-info;
+ missing= installcheck; };
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@'; };
-@@ -364,6 +370,7 @@ dependencies = { module=all-libcpp; on=a
+@@ -168,7 +177,16 @@
+ target_modules = { module= libffi; no_install=true; };
+ target_modules = { module= zlib; };
+ 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= pdf;
++ missing= install-html;
++ missing= install-pdf;
++ 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; };
+@@ -364,6 +382,7 @@
dependencies = { module=all-fixincludes; on=all-libiberty; };
@@ -103,209 +115,9 @@ 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
-===================================================================
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -33908,12 +33908,6 @@ maybe-check-gnattools:
- maybe-check-gnattools: check-gnattools
-
- check-gnattools:
-- @: $(MAKE); $(unstage)
-- @r=`${PWD_COMMAND}`; export r; \
-- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-- $(HOST_EXPORTS) \
-- (cd $(HOST_SUBDIR)/gnattools && \
-- $(MAKE) $(FLAGS_TO_PASS) check)
-
- @endif gnattools
-
-@@ -33954,24 +33948,8 @@ maybe-info-gnattools:
- @if gnattools
- maybe-info-gnattools: info-gnattools
-
--info-gnattools: \
-- configure-gnattools
-- @: $(MAKE); $(unstage)
-- @[ -f ./gnattools/Makefile ] || exit 0; \
-- r=`${PWD_COMMAND}`; export r; \
-- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-- $(HOST_EXPORTS) \
-- for flag in $(EXTRA_HOST_FLAGS) ; do \
-- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-- done; \
-- echo "Doing info in gnattools"; \
-- (cd $(HOST_SUBDIR)/gnattools && \
-- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-- "RANLIB=$${RANLIB}" \
-- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-- info) \
-- || exit 1
-+# gnattools doesn't support info.
-+info-gnattools:
-
- @endif gnattools
-
-@@ -33980,24 +33958,8 @@ maybe-dvi-gnattools:
- @if gnattools
- maybe-dvi-gnattools: dvi-gnattools
-
--dvi-gnattools: \
-- configure-gnattools
-- @: $(MAKE); $(unstage)
-- @[ -f ./gnattools/Makefile ] || exit 0; \
-- r=`${PWD_COMMAND}`; export r; \
-- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-- $(HOST_EXPORTS) \
-- for flag in $(EXTRA_HOST_FLAGS) ; do \
-- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-- done; \
-- echo "Doing dvi in gnattools"; \
-- (cd $(HOST_SUBDIR)/gnattools && \
-- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-- "RANLIB=$${RANLIB}" \
-- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-- dvi) \
-- || exit 1
-+# gnattools doesn't support dvi.
-+dvi-gnattools:
-
- @endif gnattools
-
-@@ -34032,24 +33994,8 @@ maybe-html-gnattools:
- @if gnattools
- maybe-html-gnattools: html-gnattools
-
--html-gnattools: \
-- configure-gnattools
-- @: $(MAKE); $(unstage)
-- @[ -f ./gnattools/Makefile ] || exit 0; \
-- r=`${PWD_COMMAND}`; export r; \
-- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-- $(HOST_EXPORTS) \
-- for flag in $(EXTRA_HOST_FLAGS) ; do \
-- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-- done; \
-- echo "Doing html in gnattools"; \
-- (cd $(HOST_SUBDIR)/gnattools && \
-- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-- "RANLIB=$${RANLIB}" \
-- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-- html) \
-- || exit 1
-+# gnattools doesn't support html.
-+html-gnattools:
-
- @endif gnattools
-
-@@ -34058,24 +34004,8 @@ maybe-TAGS-gnattools:
- @if gnattools
- maybe-TAGS-gnattools: TAGS-gnattools
-
--TAGS-gnattools: \
-- configure-gnattools
-- @: $(MAKE); $(unstage)
-- @[ -f ./gnattools/Makefile ] || exit 0; \
-- r=`${PWD_COMMAND}`; export r; \
-- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-- $(HOST_EXPORTS) \
-- for flag in $(EXTRA_HOST_FLAGS) ; do \
-- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-- done; \
-- echo "Doing TAGS in gnattools"; \
-- (cd $(HOST_SUBDIR)/gnattools && \
-- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-- "RANLIB=$${RANLIB}" \
-- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-- TAGS) \
-- || exit 1
-+# gnattools doesn't support TAGS.
-+TAGS-gnattools:
-
- @endif gnattools
-
-@@ -34084,25 +34014,8 @@ maybe-install-info-gnattools:
- @if gnattools
- maybe-install-info-gnattools: install-info-gnattools
-
--install-info-gnattools: \
-- configure-gnattools \
-- info-gnattools
-- @: $(MAKE); $(unstage)
-- @[ -f ./gnattools/Makefile ] || exit 0; \
-- r=`${PWD_COMMAND}`; export r; \
-- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-- $(HOST_EXPORTS) \
-- for flag in $(EXTRA_HOST_FLAGS) ; do \
-- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-- done; \
-- echo "Doing install-info in gnattools"; \
-- (cd $(HOST_SUBDIR)/gnattools && \
-- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-- "RANLIB=$${RANLIB}" \
-- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-- install-info) \
-- || exit 1
-+# gnattools doesn't support install-info.
-+install-info-gnattools:
-
- @endif gnattools
-
-@@ -34165,24 +34078,8 @@ maybe-installcheck-gnattools:
- @if gnattools
- maybe-installcheck-gnattools: installcheck-gnattools
-
--installcheck-gnattools: \
-- configure-gnattools
-- @: $(MAKE); $(unstage)
-- @[ -f ./gnattools/Makefile ] || exit 0; \
-- r=`${PWD_COMMAND}`; export r; \
-- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-- $(HOST_EXPORTS) \
-- for flag in $(EXTRA_HOST_FLAGS) ; do \
-- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-- done; \
-- echo "Doing installcheck in gnattools"; \
-- (cd $(HOST_SUBDIR)/gnattools && \
-- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
-- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
-- "RANLIB=$${RANLIB}" \
-- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \
-- installcheck) \
-- || exit 1
-+# gnattools doesn't support installcheck.
-+installcheck-gnattools:
-
- @endif gnattools
-
-@@ -48322,6 +48219,9 @@ maintainer-clean-target-libffi:
-
-
-
-+
-+
-+
- .PHONY: configure-target-zlib maybe-configure-target-zlib
- maybe-configure-target-zlib:
- @if gcc-bootstrap
-@@ -55239,6 +55139,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
-Index: b/src/configure.ac
-===================================================================
--- a/src/configure.ac
+++ b/src/configure.ac
-@@ -142,6 +142,11 @@ host_libs="intl libiberty opcodes bfd re
+@@ -142,6 +142,11 @@
# 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"
@@ -317,7 +129,7 @@ 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.
-@@ -165,6 +170,7 @@ target_libraries="target-libgcc \
+@@ -165,6 +170,7 @@
target-libffi \
target-libobjc \
target-libada \
@@ -325,11 +137,9 @@ Index: b/src/configure.ac
target-libgo"
# these tools are built using the target libraries, and are intended to
-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
-@@ -58,11 +58,7 @@ WARN_ADAFLAGS= -W -Wall
+@@ -58,11 +58,7 @@
# need to be built by a recent/matching native so we might as well leave the
# checks fully active.
@@ -341,11 +151,9 @@ 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
-===================================================================
--- a/src/libada/configure.ac
+++ b/src/libada/configure.ac
-@@ -127,8 +127,7 @@ AC_PROG_AWK
+@@ -127,8 +127,7 @@
AC_PROG_LN_S
# Determine what to build for 'gnatlib'
diff --git a/debian/patches/ada-link-shlib.diff b/debian/patches/ada-link-shlib.diff
index 2962036..1edad92 100644
--- a/debian/patches/ada-link-shlib.diff
+++ b/debian/patches/ada-link-shlib.diff
@@ -1,11 +1,9 @@
# 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
-===================================================================
--- a/src/gcc/ada/mlib-tgt-specific-linux.adb
+++ b/src/gcc/ada/mlib-tgt-specific-linux.adb
-@@ -81,19 +81,54 @@ package body MLib.Tgt.Specific is
+@@ -81,19 +81,54 @@
Version_Arg : String_Access;
Symbolic_Link_Needed : Boolean := False;
@@ -62,7 +60,7 @@ Index: b/src/gcc/ada/mlib-tgt-specific-linux.adb
else
declare
-@@ -111,18 +146,20 @@ package body MLib.Tgt.Specific is
+@@ -111,18 +146,20 @@
Utl.Gcc
(Output_File => Lib_Version,
Objects => Ofiles,
@@ -87,11 +85,9 @@ Index: b/src/gcc/ada/mlib-tgt-specific-linux.adb
Symbolic_Link_Needed :=
Lib_Dir & Directory_Separator & Lib_Version /= Lib_Path;
end if;
-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
-@@ -2702,8 +2702,8 @@ install-gnatlib: ../stamp-gnatlib-$(RTSD
+@@ -2652,8 +2652,8 @@
# 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 \
@@ -101,19 +97,19 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
+ $(INSTALL) $(RTSDIR)/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext).1 \
$(DESTDIR)$(ADA_RTL_OBJ_DIR); \
fi; \
- if [ -f $(RTSDIR)/lib$${file}$(soext) ]; then \
-@@ -2755,7 +2755,6 @@ install-gnatlib-sjlj: ../stamp-gnatlib-$
+ if [ -d $(RTSDIR)/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext).dSYM ]; then \
+@@ -2689,7 +2689,6 @@
cd $(DESTDIR)$(ADA_INCLUDE_DIR_SJLJ); $(CHMOD) a-wx *.ads
- ../stamp-gnatlib1-$(RTSDIR): Makefile ../stamp-gnatlib2-$(RTSDIR)
+ ../stamp-gnatlib1-$(RTSDIR): Makefile
- $(RMDIR) $(RTSDIR)
$(MKDIR) $(RTSDIR)
$(CHMOD) u+w $(RTSDIR)
# Copy target independent sources
-@@ -2864,25 +2863,26 @@ gnatlib-shared-default:
- MULTISUBDIR="$(MULTISUBDIR)" \
- THREAD_KIND="$(THREAD_KIND)" \
- gnatlib
+@@ -2809,25 +2808,26 @@
+ srcdir=$(fsrcdir) \
+ -f ../Makefile \
+ $(GNATRTL_OBJS)
- $(RM) $(RTSDIR)/libgna*$(soext)
+ $(RM) $(RTSDIR)/libgna*$(soext) $(RTSDIR)/libgna*$(soext).1
cd $(RTSDIR); `echo "$(GCC_FOR_TARGET)" \
@@ -143,6 +139,6 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
+ l=lib$${lib}$(hyphen)$(LIBRARY_VERSION)$(soext); \
+ $(LN_S) $$l.1 $$l; \
+ done
+ $(CHMOD) a-wx $(RTSDIR)/*.ali
# 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 fee6b4c..a9d7284 100644
--- a/debian/patches/ada-sjlj.diff
+++ b/debian/patches/ada-sjlj.diff
@@ -1,5 +1,7 @@
-Index: b/src/libada-sjlj/Makefile.in
-===================================================================
+# !!! src/Makefile.def modified, run autoconf to regenerate src/Makefile.in
+
+# !!! Must be applied after ada-libgnatvsn.diff
+
--- /dev/null
+++ b/src/libada-sjlj/Makefile.in
@@ -0,0 +1,201 @@
@@ -204,8 +206,6 @@ 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
-===================================================================
--- /dev/null
+++ b/src/libada-sjlj/configure.ac
@@ -0,0 +1,152 @@
@@ -361,52 +361,46 @@ Index: b/src/libada-sjlj/configure.ac
+AC_CONFIG_FILES([Makefile])
+
+AC_OUTPUT
-Index: b/src/Makefile.def
-===================================================================
--- a/src/Makefile.def
+++ b/src/Makefile.def
-@@ -175,6 +175,7 @@ target_modules = { module= libffi; no_in
- target_modules = { module= zlib; };
- target_modules = { module= rda; };
- target_modules = { module= libada; };
+@@ -197,6 +197,7 @@
+ missing= TAGS;
+ missing= install-info;
+ missing= installcheck; };
+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; };
-@@ -371,6 +372,7 @@ dependencies = { module=all-libcpp; on=a
+@@ -393,6 +394,7 @@
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-libstdc++-v3; };
-
-Index: b/src/configure.ac
-===================================================================
+ dependencies = { module=all-gnattools; on=all-target-libgnatvsn; };
--- a/src/configure.ac
+++ b/src/configure.ac
-@@ -170,6 +170,7 @@ target_libraries="target-libgcc \
+@@ -170,6 +170,7 @@
target-libffi \
target-libobjc \
target-libada \
+ target-libada-sjlj \
${target_libiberty} \
+ target-libgnatvsn \
target-libgo"
-
-@@ -455,7 +456,7 @@ AC_ARG_ENABLE(libada,
+@@ -456,7 +457,7 @@
ENABLE_LIBADA=$enableval,
ENABLE_LIBADA=yes)
if test "${ENABLE_LIBADA}" != "yes" ; then
-- noconfigdirs="$noconfigdirs gnattools"
-+ noconfigdirs="$noconfigdirs gnattools target-libada-sjlj"
+- noconfigdirs="$noconfigdirs target-libgnatvsn gnattools"
++ noconfigdirs="$noconfigdirs target-libgnatvsn 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
-@@ -191,7 +191,7 @@ TOOLSCASE =
+@@ -192,7 +192,7 @@
# Multilib handling
MULTISUBDIR =
@@ -415,9 +409,9 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
# 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
-@@ -2734,6 +2734,26 @@ install-gnatlib: ../stamp-gnatlib-$(RTSD
- touch ../stamp-gnatlib2-$(RTSDIR)
- $(RM) ../stamp-gnatlib-$(RTSDIR)
+@@ -2668,6 +2668,26 @@
+ 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
@@ -439,10 +433,10 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
+ 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)
+ ../stamp-gnatlib1-$(RTSDIR): Makefile
$(RMDIR) $(RTSDIR)
$(MKDIR) $(RTSDIR)
-@@ -2998,7 +3018,7 @@ gnatlib-shared:
+@@ -2936,7 +2956,7 @@
# 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:
@@ -451,7 +445,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
THREAD_KIND="$(THREAD_KIND)" ../stamp-gnatlib1-$(RTSDIR)
sed \
-e 's/Frontend_Exceptions.*/Frontend_Exceptions : constant Boolean := True;/' \
-@@ -3007,6 +3027,7 @@ gnatlib-sjlj:
+@@ -2945,6 +2965,7 @@
$(RTSDIR)/system.ads > $(RTSDIR)/s.ads
$(MV) $(RTSDIR)/s.ads $(RTSDIR)/system.ads
$(MAKE) $(FLAGS_TO_PASS) \
@@ -459,7 +453,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
EH_MECHANISM="" \
GNATLIBFLAGS="$(GNATLIBFLAGS)" \
GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \
-@@ -3059,6 +3080,8 @@ b_gnatm.o : b_gnatm.adb
+@@ -2997,6 +3018,8 @@
ADA_INCLUDE_DIR = $(libsubdir)/adainclude
ADA_RTL_OBJ_DIR = $(libsubdir)/adalib
@@ -468,26 +462,22 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
# 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
+@@ -34,8 +34,8 @@
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"
+-target_libs="target-libada target-libgnatvsn"
+-lang_dirs="libada libgnatvsn gnattools"
++target_libs="target-libada target-libgnatvsn target-libada-sjlj"
++lang_dirs="libada libgnatvsn 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:
+@@ -784,6 +784,7 @@
install-gnatlib:
$(MAKE) -C ada $(COMMON_FLAGS_TO_PASS) $(ADA_FLAGS_TO_PASS) install-gnatlib$(LIBGNAT_TARGET)
@@ -495,657 +485,3 @@ Index: b/src/gcc/ada/gcc-interface/Make-lang.in
install-gnatlib-obj:
$(MAKE) -C ada $(COMMON_FLAGS_TO_PASS) $(ADA_FLAGS_TO_PASS) install-gnatlib-obj
-Index: b/src/Makefile.in
-===================================================================
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -999,6 +999,7 @@ configure-target: \
- maybe-configure-target-zlib \
- maybe-configure-target-rda \
- maybe-configure-target-libada \
-+ maybe-configure-target-libada-sjlj \
- maybe-configure-target-libgomp \
- maybe-configure-target-libitm \
- maybe-configure-target-libatomic
-@@ -1165,6 +1166,7 @@ all-target: maybe-all-target-libffi
- all-target: maybe-all-target-zlib
- all-target: maybe-all-target-rda
- all-target: maybe-all-target-libada
-+all-target: maybe-all-target-libada-sjlj
- @if target-libgomp-no-bootstrap
- all-target: maybe-all-target-libgomp
- @endif target-libgomp-no-bootstrap
-@@ -1258,6 +1260,7 @@ info-target: maybe-info-target-libffi
- info-target: maybe-info-target-zlib
- info-target: maybe-info-target-rda
- info-target: maybe-info-target-libada
-+info-target: maybe-info-target-libada-sjlj
- info-target: maybe-info-target-libgomp
- info-target: maybe-info-target-libitm
- info-target: maybe-info-target-libatomic
-@@ -1344,6 +1347,7 @@ dvi-target: maybe-dvi-target-libffi
- dvi-target: maybe-dvi-target-zlib
- dvi-target: maybe-dvi-target-rda
- dvi-target: maybe-dvi-target-libada
-+dvi-target: maybe-dvi-target-libada-sjlj
- dvi-target: maybe-dvi-target-libgomp
- dvi-target: maybe-dvi-target-libitm
- dvi-target: maybe-dvi-target-libatomic
-@@ -1430,6 +1434,7 @@ pdf-target: maybe-pdf-target-libffi
- pdf-target: maybe-pdf-target-zlib
- pdf-target: maybe-pdf-target-rda
- pdf-target: maybe-pdf-target-libada
-+pdf-target: maybe-pdf-target-libada-sjlj
- pdf-target: maybe-pdf-target-libgomp
- pdf-target: maybe-pdf-target-libitm
- pdf-target: maybe-pdf-target-libatomic
-@@ -1516,6 +1521,7 @@ html-target: maybe-html-target-libffi
- html-target: maybe-html-target-zlib
- html-target: maybe-html-target-rda
- html-target: maybe-html-target-libada
-+html-target: maybe-html-target-libada-sjlj
- html-target: maybe-html-target-libgomp
- html-target: maybe-html-target-libitm
- html-target: maybe-html-target-libatomic
-@@ -1602,6 +1608,7 @@ TAGS-target: maybe-TAGS-target-libffi
- TAGS-target: maybe-TAGS-target-zlib
- TAGS-target: maybe-TAGS-target-rda
- TAGS-target: maybe-TAGS-target-libada
-+TAGS-target: maybe-TAGS-target-libada-sjlj
- TAGS-target: maybe-TAGS-target-libgomp
- TAGS-target: maybe-TAGS-target-libitm
- TAGS-target: maybe-TAGS-target-libatomic
-@@ -1688,6 +1695,7 @@ install-info-target: maybe-install-info-
- install-info-target: maybe-install-info-target-zlib
- 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-libgomp
- install-info-target: maybe-install-info-target-libitm
- install-info-target: maybe-install-info-target-libatomic
-@@ -1774,6 +1782,7 @@ install-pdf-target: maybe-install-pdf-ta
- install-pdf-target: maybe-install-pdf-target-zlib
- 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-libgomp
- install-pdf-target: maybe-install-pdf-target-libitm
- install-pdf-target: maybe-install-pdf-target-libatomic
-@@ -1860,6 +1869,7 @@ install-html-target: maybe-install-html-
- install-html-target: maybe-install-html-target-zlib
- 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-libgomp
- install-html-target: maybe-install-html-target-libitm
- install-html-target: maybe-install-html-target-libatomic
-@@ -1946,6 +1956,7 @@ installcheck-target: maybe-installcheck-
- installcheck-target: maybe-installcheck-target-zlib
- installcheck-target: maybe-installcheck-target-rda
- installcheck-target: maybe-installcheck-target-libada
-+installcheck-target: maybe-installcheck-target-libada-sjlj
- installcheck-target: maybe-installcheck-target-libgomp
- installcheck-target: maybe-installcheck-target-libitm
- installcheck-target: maybe-installcheck-target-libatomic
-@@ -2032,6 +2043,7 @@ mostlyclean-target: maybe-mostlyclean-ta
- mostlyclean-target: maybe-mostlyclean-target-zlib
- mostlyclean-target: maybe-mostlyclean-target-rda
- mostlyclean-target: maybe-mostlyclean-target-libada
-+mostlyclean-target: maybe-mostlyclean-target-libada-sjlj
- mostlyclean-target: maybe-mostlyclean-target-libgomp
- mostlyclean-target: maybe-mostlyclean-target-libitm
- mostlyclean-target: maybe-mostlyclean-target-libatomic
-@@ -2118,6 +2130,7 @@ clean-target: maybe-clean-target-libffi
- clean-target: maybe-clean-target-zlib
- clean-target: maybe-clean-target-rda
- clean-target: maybe-clean-target-libada
-+clean-target: maybe-clean-target-libada-sjlj
- clean-target: maybe-clean-target-libgomp
- clean-target: maybe-clean-target-libitm
- clean-target: maybe-clean-target-libatomic
-@@ -2204,6 +2217,7 @@ distclean-target: maybe-distclean-target
- distclean-target: maybe-distclean-target-zlib
- distclean-target: maybe-distclean-target-rda
- distclean-target: maybe-distclean-target-libada
-+distclean-target: maybe-distclean-target-libada-sjlj
- distclean-target: maybe-distclean-target-libgomp
- distclean-target: maybe-distclean-target-libitm
- distclean-target: maybe-distclean-target-libatomic
-@@ -2290,6 +2304,7 @@ maintainer-clean-target: maybe-maintaine
- maintainer-clean-target: maybe-maintainer-clean-target-zlib
- 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-libgomp
- maintainer-clean-target: maybe-maintainer-clean-target-libitm
- maintainer-clean-target: maybe-maintainer-clean-target-libatomic
-@@ -2432,6 +2447,7 @@ check-target: \
- maybe-check-target-zlib \
- maybe-check-target-rda \
- maybe-check-target-libada \
-+ maybe-check-target-libada-sjlj \
- maybe-check-target-libgomp \
- maybe-check-target-libitm \
- maybe-check-target-libatomic
-@@ -2614,6 +2630,7 @@ install-target: \
- maybe-install-target-zlib \
- maybe-install-target-rda \
- maybe-install-target-libada \
-+ maybe-install-target-libada-sjlj \
- maybe-install-target-libgomp \
- maybe-install-target-libitm \
- maybe-install-target-libatomic
-@@ -2720,6 +2737,7 @@ install-strip-target: \
- maybe-install-strip-target-zlib \
- maybe-install-strip-target-rda \
- maybe-install-strip-target-libada \
-+ maybe-install-strip-target-libada-sjlj \
- maybe-install-strip-target-libgomp \
- maybe-install-strip-target-libitm \
- maybe-install-strip-target-libatomic
-@@ -49596,6 +49614,464 @@ maintainer-clean-target-libada:
-
-
-
-+.PHONY: configure-target-libada-sjlj maybe-configure-target-libada-sjlj
-+maybe-configure-target-libada-sjlj:
-+ at if gcc-bootstrap
-+configure-target-libada-sjlj: stage_current
-+ at endif gcc-bootstrap
-+ at if target-libada-sjlj
-+maybe-configure-target-libada-sjlj: configure-target-libada-sjlj
-+configure-target-libada-sjlj:
-+ @: $(MAKE); $(unstage)
-+ @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; \
-+ 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; \
-+ else \
-+ rm -f $(TARGET_SUBDIR)/libada-sjlj/Makefile; \
-+ mv $(TARGET_SUBDIR)/libada-sjlj/multilib.tmp $(TARGET_SUBDIR)/libada-sjlj/multilib.out; \
-+ fi; \
-+ else \
-+ 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; \
-+ $(NORMAL_TARGET_EXPORTS) \
-+ echo Configuring in $(TARGET_SUBDIR)/libada-sjlj; \
-+ cd "$(TARGET_SUBDIR)/libada-sjlj" || exit 1; \
-+ case $(srcdir) in \
-+ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-+ *) topdir=`echo $(TARGET_SUBDIR)/libada-sjlj/ | \
-+ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-+ esac; \
-+ module_srcdir=libada-sjlj; \
-+ 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-libada-sjlj
-+
-+
-+
-+
-+
-+.PHONY: all-target-libada-sjlj maybe-all-target-libada-sjlj
-+maybe-all-target-libada-sjlj:
-+ at if gcc-bootstrap
-+all-target-libada-sjlj: stage_current
-+ at endif gcc-bootstrap
-+ at if target-libada-sjlj
-+TARGET-target-libada-sjlj=all
-+maybe-all-target-libada-sjlj: all-target-libada-sjlj
-+all-target-libada-sjlj: configure-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) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \
-+ $(TARGET-target-libada-sjlj))
-+ at endif target-libada-sjlj
-+
-+
-+
-+
-+
-+.PHONY: check-target-libada-sjlj maybe-check-target-libada-sjlj
-+maybe-check-target-libada-sjlj:
-+ at if target-libada-sjlj
-+maybe-check-target-libada-sjlj: check-target-libada-sjlj
-+
-+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
-+
-+.PHONY: install-target-libada-sjlj maybe-install-target-libada-sjlj
-+maybe-install-target-libada-sjlj:
-+ at if target-libada-sjlj
-+maybe-install-target-libada-sjlj: 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
-+
-+.PHONY: install-strip-target-libada-sjlj maybe-install-strip-target-libada-sjlj
-+maybe-install-strip-target-libada-sjlj:
-+ at if target-libada-sjlj
-+maybe-install-strip-target-libada-sjlj: 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
-+
-+# Other targets (info, dvi, pdf, etc.)
-+
-+.PHONY: maybe-info-target-libada-sjlj info-target-libada-sjlj
-+maybe-info-target-libada-sjlj:
-+ at if target-libada-sjlj
-+maybe-info-target-libada-sjlj: 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
-+
-+.PHONY: maybe-dvi-target-libada-sjlj dvi-target-libada-sjlj
-+maybe-dvi-target-libada-sjlj:
-+ at if target-libada-sjlj
-+maybe-dvi-target-libada-sjlj: 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
-+
-+.PHONY: maybe-pdf-target-libada-sjlj pdf-target-libada-sjlj
-+maybe-pdf-target-libada-sjlj:
-+ at if target-libada-sjlj
-+maybe-pdf-target-libada-sjlj: pdf-target-libada-sjlj
-+
-+pdf-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 pdf 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}" \
-+ pdf) \
-+ || exit 1
-+
-+ at endif target-libada-sjlj
-+
-+.PHONY: maybe-html-target-libada-sjlj html-target-libada-sjlj
-+maybe-html-target-libada-sjlj:
-+ at if target-libada-sjlj
-+maybe-html-target-libada-sjlj: 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
-+
-+.PHONY: maybe-TAGS-target-libada-sjlj TAGS-target-libada-sjlj
-+maybe-TAGS-target-libada-sjlj:
-+ at if target-libada-sjlj
-+maybe-TAGS-target-libada-sjlj: 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
-+
-+.PHONY: maybe-install-info-target-libada-sjlj install-info-target-libada-sjlj
-+maybe-install-info-target-libada-sjlj:
-+ at if target-libada-sjlj
-+maybe-install-info-target-libada-sjlj: 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
-+
-+.PHONY: maybe-install-pdf-target-libada-sjlj install-pdf-target-libada-sjlj
-+maybe-install-pdf-target-libada-sjlj:
-+ at if target-libada-sjlj
-+maybe-install-pdf-target-libada-sjlj: install-pdf-target-libada-sjlj
-+
-+install-pdf-target-libada-sjlj: \
-+ configure-target-libada-sjlj \
-+ pdf-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-pdf 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-pdf) \
-+ || exit 1
-+
-+ at endif target-libada-sjlj
-+
-+.PHONY: maybe-install-html-target-libada-sjlj install-html-target-libada-sjlj
-+maybe-install-html-target-libada-sjlj:
-+ at if target-libada-sjlj
-+maybe-install-html-target-libada-sjlj: install-html-target-libada-sjlj
-+
-+install-html-target-libada-sjlj: \
-+ configure-target-libada-sjlj \
-+ html-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-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}" \
-+ install-html) \
-+ || exit 1
-+
-+ at endif target-libada-sjlj
-+
-+.PHONY: maybe-installcheck-target-libada-sjlj installcheck-target-libada-sjlj
-+maybe-installcheck-target-libada-sjlj:
-+ at if target-libada-sjlj
-+maybe-installcheck-target-libada-sjlj: 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
-+
-+.PHONY: maybe-mostlyclean-target-libada-sjlj mostlyclean-target-libada-sjlj
-+maybe-mostlyclean-target-libada-sjlj:
-+ at if target-libada-sjlj
-+maybe-mostlyclean-target-libada-sjlj: mostlyclean-target-libada-sjlj
-+
-+mostlyclean-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 mostlyclean 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}" \
-+ mostlyclean) \
-+ || exit 1
-+
-+ at endif target-libada-sjlj
-+
-+.PHONY: maybe-clean-target-libada-sjlj clean-target-libada-sjlj
-+maybe-clean-target-libada-sjlj:
-+ at if target-libada-sjlj
-+maybe-clean-target-libada-sjlj: clean-target-libada-sjlj
-+
-+clean-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 clean 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}" \
-+ clean) \
-+ || exit 1
-+
-+ at endif target-libada-sjlj
-+
-+.PHONY: maybe-distclean-target-libada-sjlj distclean-target-libada-sjlj
-+maybe-distclean-target-libada-sjlj:
-+ at if target-libada-sjlj
-+maybe-distclean-target-libada-sjlj: distclean-target-libada-sjlj
-+
-+distclean-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 distclean 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}" \
-+ distclean) \
-+ || exit 1
-+
-+ at endif target-libada-sjlj
-+
-+.PHONY: maybe-maintainer-clean-target-libada-sjlj maintainer-clean-target-libada-sjlj
-+maybe-maintainer-clean-target-libada-sjlj:
-+ at if target-libada-sjlj
-+maybe-maintainer-clean-target-libada-sjlj: maintainer-clean-target-libada-sjlj
-+
-+maintainer-clean-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 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; \
-+ (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}" \
-+ maintainer-clean) \
-+ || exit 1
-+
-+ at endif target-libada-sjlj
-+
-+
-+
-+
-+
- .PHONY: configure-target-libgomp maybe-configure-target-libgomp
- maybe-configure-target-libgomp:
- @if gcc-bootstrap
-@@ -54649,6 +55125,7 @@ configure-target-libffi: stage_last
- configure-target-zlib: stage_last
- configure-target-rda: stage_last
- configure-target-libada: stage_last
-+configure-target-libada-sjlj: 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
-@@ -54684,6 +55161,7 @@ configure-target-libffi: maybe-all-gcc
- configure-target-zlib: maybe-all-gcc
- configure-target-rda: maybe-all-gcc
- configure-target-libada: maybe-all-gcc
-+configure-target-libada-sjlj: maybe-all-gcc
- configure-target-libgomp: maybe-all-gcc
- configure-target-libitm: maybe-all-gcc
- configure-target-libatomic: maybe-all-gcc
-@@ -55140,6 +55618,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-libstdc++-v3
- all-lto-plugin: maybe-all-libiberty
-@@ -55838,6 +56317,7 @@ configure-target-libffi: maybe-all-targe
- configure-target-zlib: 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-libgomp: maybe-all-target-libgcc
- configure-target-libitm: maybe-all-target-libgcc
- configure-target-libatomic: maybe-all-target-libgcc
-@@ -55888,6 +56368,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-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/bootstrap-no-unneeded-libs.diff b/debian/patches/bootstrap-no-unneeded-libs.diff
index d0eb9ba..833d7bc 100644
--- a/debian/patches/bootstrap-no-unneeded-libs.diff
+++ b/debian/patches/bootstrap-no-unneeded-libs.diff
@@ -1,8 +1,8 @@
# DP: For bootstrap builds, don't build unneeded libstdc++ things
# DP: (debug library, PCH headers).
-Index: b/src/Makefile.tpl
-===================================================================
+# !!! src/Makefile.* modified, run autoconf to regenerate src/Makefile.in
+
--- a/src/Makefile.tpl
+++ b/src/Makefile.tpl
@@ -1060,7 +1060,9 @@
@@ -16,8 +16,6 @@ Index: b/src/Makefile.tpl
@endif [+prefix+][+module+]-bootstrap
[+ ENDFOR bootstrap_stage +]
[+ ENDIF bootstrap +]
-Index: b/src/Makefile.def
-===================================================================
--- a/src/Makefile.def
+++ b/src/Makefile.def
@@ -117,7 +117,8 @@
@@ -30,1393 +28,3 @@ Index: b/src/Makefile.def
target_modules = { module= libmudflap; lib_path=.libs; };
target_modules = { module= libsanitizer; lib_path=.libs; };
target_modules = { module= libssp; lib_path=.libs; };
-Index: b/src/Makefile.in
-===================================================================
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -3007,7 +3007,8 @@
- $(SHELL) $${libsrcdir}/configure \
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
-- $(STAGE1_CONFIGURE_FLAGS)
-+ $(STAGE1_CONFIGURE_FLAGS) \
-+
- @endif bfd-bootstrap
-
- .PHONY: configure-stage2-bfd maybe-configure-stage2-bfd
-@@ -3040,7 +3041,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGE2_CONFIGURE_FLAGS)
-+ $(STAGE2_CONFIGURE_FLAGS) \
-+
- @endif bfd-bootstrap
-
- .PHONY: configure-stage3-bfd maybe-configure-stage3-bfd
-@@ -3073,7 +3075,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGE3_CONFIGURE_FLAGS)
-+ $(STAGE3_CONFIGURE_FLAGS) \
-+
- @endif bfd-bootstrap
-
- .PHONY: configure-stage4-bfd maybe-configure-stage4-bfd
-@@ -3106,7 +3109,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGE4_CONFIGURE_FLAGS)
-+ $(STAGE4_CONFIGURE_FLAGS) \
-+
- @endif bfd-bootstrap
-
- .PHONY: configure-stageprofile-bfd maybe-configure-stageprofile-bfd
-@@ -3139,7 +3143,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGEprofile_CONFIGURE_FLAGS)
-+ $(STAGEprofile_CONFIGURE_FLAGS) \
-+
- @endif bfd-bootstrap
-
- .PHONY: configure-stagefeedback-bfd maybe-configure-stagefeedback-bfd
-@@ -3172,7 +3177,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGEfeedback_CONFIGURE_FLAGS)
-+ $(STAGEfeedback_CONFIGURE_FLAGS) \
-+
- @endif bfd-bootstrap
-
-
-@@ -3879,7 +3885,8 @@
- $(SHELL) $${libsrcdir}/configure \
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
-- $(STAGE1_CONFIGURE_FLAGS)
-+ $(STAGE1_CONFIGURE_FLAGS) \
-+
- @endif opcodes-bootstrap
-
- .PHONY: configure-stage2-opcodes maybe-configure-stage2-opcodes
-@@ -3912,7 +3919,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGE2_CONFIGURE_FLAGS)
-+ $(STAGE2_CONFIGURE_FLAGS) \
-+
- @endif opcodes-bootstrap
-
- .PHONY: configure-stage3-opcodes maybe-configure-stage3-opcodes
-@@ -3945,7 +3953,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGE3_CONFIGURE_FLAGS)
-+ $(STAGE3_CONFIGURE_FLAGS) \
-+
- @endif opcodes-bootstrap
-
- .PHONY: configure-stage4-opcodes maybe-configure-stage4-opcodes
-@@ -3978,7 +3987,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGE4_CONFIGURE_FLAGS)
-+ $(STAGE4_CONFIGURE_FLAGS) \
-+
- @endif opcodes-bootstrap
-
- .PHONY: configure-stageprofile-opcodes maybe-configure-stageprofile-opcodes
-@@ -4011,7 +4021,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGEprofile_CONFIGURE_FLAGS)
-+ $(STAGEprofile_CONFIGURE_FLAGS) \
-+
- @endif opcodes-bootstrap
-
- .PHONY: configure-stagefeedback-opcodes maybe-configure-stagefeedback-opcodes
-@@ -4044,7 +4055,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGEfeedback_CONFIGURE_FLAGS)
-+ $(STAGEfeedback_CONFIGURE_FLAGS) \
-+
- @endif opcodes-bootstrap
-
-
-@@ -4751,7 +4763,8 @@
- $(SHELL) $${libsrcdir}/configure \
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
-- $(STAGE1_CONFIGURE_FLAGS)
-+ $(STAGE1_CONFIGURE_FLAGS) \
-+
- @endif binutils-bootstrap
-
- .PHONY: configure-stage2-binutils maybe-configure-stage2-binutils
-@@ -4784,7 +4797,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGE2_CONFIGURE_FLAGS)
-+ $(STAGE2_CONFIGURE_FLAGS) \
-+
- @endif binutils-bootstrap
-
- .PHONY: configure-stage3-binutils maybe-configure-stage3-binutils
-@@ -4817,7 +4831,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGE3_CONFIGURE_FLAGS)
-+ $(STAGE3_CONFIGURE_FLAGS) \
-+
- @endif binutils-bootstrap
-
- .PHONY: configure-stage4-binutils maybe-configure-stage4-binutils
-@@ -4850,7 +4865,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGE4_CONFIGURE_FLAGS)
-+ $(STAGE4_CONFIGURE_FLAGS) \
-+
- @endif binutils-bootstrap
-
- .PHONY: configure-stageprofile-binutils maybe-configure-stageprofile-binutils
-@@ -4883,7 +4899,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGEprofile_CONFIGURE_FLAGS)
-+ $(STAGEprofile_CONFIGURE_FLAGS) \
-+
- @endif binutils-bootstrap
-
- .PHONY: configure-stagefeedback-binutils maybe-configure-stagefeedback-binutils
-@@ -4916,7 +4933,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGEfeedback_CONFIGURE_FLAGS)
-+ $(STAGEfeedback_CONFIGURE_FLAGS) \
-+
- @endif binutils-bootstrap
-
-
-@@ -8696,7 +8714,8 @@
- $(SHELL) $${libsrcdir}/configure \
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
-- $(STAGE1_CONFIGURE_FLAGS)
-+ $(STAGE1_CONFIGURE_FLAGS) \
-+
- @endif gas-bootstrap
-
- .PHONY: configure-stage2-gas maybe-configure-stage2-gas
-@@ -8729,7 +8748,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGE2_CONFIGURE_FLAGS)
-+ $(STAGE2_CONFIGURE_FLAGS) \
-+
- @endif gas-bootstrap
-
- .PHONY: configure-stage3-gas maybe-configure-stage3-gas
-@@ -8762,7 +8782,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGE3_CONFIGURE_FLAGS)
-+ $(STAGE3_CONFIGURE_FLAGS) \
-+
- @endif gas-bootstrap
-
- .PHONY: configure-stage4-gas maybe-configure-stage4-gas
-@@ -8795,7 +8816,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGE4_CONFIGURE_FLAGS)
-+ $(STAGE4_CONFIGURE_FLAGS) \
-+
- @endif gas-bootstrap
-
- .PHONY: configure-stageprofile-gas maybe-configure-stageprofile-gas
-@@ -8828,7 +8850,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGEprofile_CONFIGURE_FLAGS)
-+ $(STAGEprofile_CONFIGURE_FLAGS) \
-+
- @endif gas-bootstrap
-
- .PHONY: configure-stagefeedback-gas maybe-configure-stagefeedback-gas
-@@ -8861,7 +8884,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGEfeedback_CONFIGURE_FLAGS)
-+ $(STAGEfeedback_CONFIGURE_FLAGS) \
-+
- @endif gas-bootstrap
-
-
-@@ -9568,7 +9592,8 @@
- $(SHELL) $${libsrcdir}/configure \
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
-- $(STAGE1_CONFIGURE_FLAGS)
-+ $(STAGE1_CONFIGURE_FLAGS) \
-+
- @endif gcc-bootstrap
-
- .PHONY: configure-stage2-gcc maybe-configure-stage2-gcc
-@@ -9601,7 +9626,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGE2_CONFIGURE_FLAGS)
-+ $(STAGE2_CONFIGURE_FLAGS) \
-+
- @endif gcc-bootstrap
-
- .PHONY: configure-stage3-gcc maybe-configure-stage3-gcc
-@@ -9634,7 +9660,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGE3_CONFIGURE_FLAGS)
-+ $(STAGE3_CONFIGURE_FLAGS) \
-+
- @endif gcc-bootstrap
-
- .PHONY: configure-stage4-gcc maybe-configure-stage4-gcc
-@@ -9667,7 +9694,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGE4_CONFIGURE_FLAGS)
-+ $(STAGE4_CONFIGURE_FLAGS) \
-+
- @endif gcc-bootstrap
-
- .PHONY: configure-stageprofile-gcc maybe-configure-stageprofile-gcc
-@@ -9700,7 +9728,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGEprofile_CONFIGURE_FLAGS)
-+ $(STAGEprofile_CONFIGURE_FLAGS) \
-+
- @endif gcc-bootstrap
-
- .PHONY: configure-stagefeedback-gcc maybe-configure-stagefeedback-gcc
-@@ -9733,7 +9762,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGEfeedback_CONFIGURE_FLAGS)
-+ $(STAGEfeedback_CONFIGURE_FLAGS) \
-+
- @endif gcc-bootstrap
-
-
-@@ -10441,7 +10471,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
- --target=none-${host_vendor}-${host_os} $${srcdiroption} \
- $(STAGE1_CONFIGURE_FLAGS) \
-- --disable-shared
-+ --disable-shared \
-+
- @endif gmp-bootstrap
-
- .PHONY: configure-stage2-gmp maybe-configure-stage2-gmp
-@@ -10475,7 +10506,8 @@
- --target=none-${host_vendor}-${host_os} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
- $(STAGE2_CONFIGURE_FLAGS) \
-- --disable-shared
-+ --disable-shared \
-+
- @endif gmp-bootstrap
-
- .PHONY: configure-stage3-gmp maybe-configure-stage3-gmp
-@@ -10509,7 +10541,8 @@
- --target=none-${host_vendor}-${host_os} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
- $(STAGE3_CONFIGURE_FLAGS) \
-- --disable-shared
-+ --disable-shared \
-+
- @endif gmp-bootstrap
-
- .PHONY: configure-stage4-gmp maybe-configure-stage4-gmp
-@@ -10543,7 +10576,8 @@
- --target=none-${host_vendor}-${host_os} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
- $(STAGE4_CONFIGURE_FLAGS) \
-- --disable-shared
-+ --disable-shared \
-+
- @endif gmp-bootstrap
-
- .PHONY: configure-stageprofile-gmp maybe-configure-stageprofile-gmp
-@@ -10577,7 +10611,8 @@
- --target=none-${host_vendor}-${host_os} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
- $(STAGEprofile_CONFIGURE_FLAGS) \
-- --disable-shared
-+ --disable-shared \
-+
- @endif gmp-bootstrap
-
- .PHONY: configure-stagefeedback-gmp maybe-configure-stagefeedback-gmp
-@@ -10611,7 +10646,8 @@
- --target=none-${host_vendor}-${host_os} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
- $(STAGEfeedback_CONFIGURE_FLAGS) \
-- --disable-shared
-+ --disable-shared \
-+
- @endif gmp-bootstrap
-
-
-@@ -11307,7 +11343,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- $(STAGE1_CONFIGURE_FLAGS) \
-- --disable-shared @extra_mpfr_configure_flags@
-+ --disable-shared @extra_mpfr_configure_flags@ \
-+
- @endif mpfr-bootstrap
-
- .PHONY: configure-stage2-mpfr maybe-configure-stage2-mpfr
-@@ -11341,7 +11378,8 @@
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
- $(STAGE2_CONFIGURE_FLAGS) \
-- --disable-shared @extra_mpfr_configure_flags@
-+ --disable-shared @extra_mpfr_configure_flags@ \
-+
- @endif mpfr-bootstrap
-
- .PHONY: configure-stage3-mpfr maybe-configure-stage3-mpfr
-@@ -11375,7 +11413,8 @@
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
- $(STAGE3_CONFIGURE_FLAGS) \
-- --disable-shared @extra_mpfr_configure_flags@
-+ --disable-shared @extra_mpfr_configure_flags@ \
-+
- @endif mpfr-bootstrap
-
- .PHONY: configure-stage4-mpfr maybe-configure-stage4-mpfr
-@@ -11409,7 +11448,8 @@
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
- $(STAGE4_CONFIGURE_FLAGS) \
-- --disable-shared @extra_mpfr_configure_flags@
-+ --disable-shared @extra_mpfr_configure_flags@ \
-+
- @endif mpfr-bootstrap
-
- .PHONY: configure-stageprofile-mpfr maybe-configure-stageprofile-mpfr
-@@ -11443,7 +11483,8 @@
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
- $(STAGEprofile_CONFIGURE_FLAGS) \
-- --disable-shared @extra_mpfr_configure_flags@
-+ --disable-shared @extra_mpfr_configure_flags@ \
-+
- @endif mpfr-bootstrap
-
- .PHONY: configure-stagefeedback-mpfr maybe-configure-stagefeedback-mpfr
-@@ -11477,7 +11518,8 @@
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
- $(STAGEfeedback_CONFIGURE_FLAGS) \
-- --disable-shared @extra_mpfr_configure_flags@
-+ --disable-shared @extra_mpfr_configure_flags@ \
-+
- @endif mpfr-bootstrap
-
-
-@@ -12173,7 +12215,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- $(STAGE1_CONFIGURE_FLAGS) \
-- --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@
-+ --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@ \
-+
- @endif mpc-bootstrap
-
- .PHONY: configure-stage2-mpc maybe-configure-stage2-mpc
-@@ -12207,7 +12250,8 @@
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
- $(STAGE2_CONFIGURE_FLAGS) \
-- --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@
-+ --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@ \
-+
- @endif mpc-bootstrap
-
- .PHONY: configure-stage3-mpc maybe-configure-stage3-mpc
-@@ -12241,7 +12285,8 @@
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
- $(STAGE3_CONFIGURE_FLAGS) \
-- --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@
-+ --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@ \
-+
- @endif mpc-bootstrap
-
- .PHONY: configure-stage4-mpc maybe-configure-stage4-mpc
-@@ -12275,7 +12320,8 @@
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
- $(STAGE4_CONFIGURE_FLAGS) \
-- --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@
-+ --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@ \
-+
- @endif mpc-bootstrap
-
- .PHONY: configure-stageprofile-mpc maybe-configure-stageprofile-mpc
-@@ -12309,7 +12355,8 @@
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
- $(STAGEprofile_CONFIGURE_FLAGS) \
-- --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@
-+ --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@ \
-+
- @endif mpc-bootstrap
-
- .PHONY: configure-stagefeedback-mpc maybe-configure-stagefeedback-mpc
-@@ -12343,7 +12390,8 @@
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
- $(STAGEfeedback_CONFIGURE_FLAGS) \
-- --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@
-+ --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@ \
-+
- @endif mpc-bootstrap
-
-
-@@ -13039,7 +13087,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- $(STAGE1_CONFIGURE_FLAGS) \
-- --disable-shared @extra_isl_gmp_configure_flags@
-+ --disable-shared @extra_isl_gmp_configure_flags@ \
-+
- @endif isl-bootstrap
-
- .PHONY: configure-stage2-isl maybe-configure-stage2-isl
-@@ -13073,7 +13122,8 @@
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
- $(STAGE2_CONFIGURE_FLAGS) \
-- --disable-shared @extra_isl_gmp_configure_flags@
-+ --disable-shared @extra_isl_gmp_configure_flags@ \
-+
- @endif isl-bootstrap
-
- .PHONY: configure-stage3-isl maybe-configure-stage3-isl
-@@ -13107,7 +13157,8 @@
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
- $(STAGE3_CONFIGURE_FLAGS) \
-- --disable-shared @extra_isl_gmp_configure_flags@
-+ --disable-shared @extra_isl_gmp_configure_flags@ \
-+
- @endif isl-bootstrap
-
- .PHONY: configure-stage4-isl maybe-configure-stage4-isl
-@@ -13141,7 +13192,8 @@
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
- $(STAGE4_CONFIGURE_FLAGS) \
-- --disable-shared @extra_isl_gmp_configure_flags@
-+ --disable-shared @extra_isl_gmp_configure_flags@ \
-+
- @endif isl-bootstrap
-
- .PHONY: configure-stageprofile-isl maybe-configure-stageprofile-isl
-@@ -13175,7 +13227,8 @@
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
- $(STAGEprofile_CONFIGURE_FLAGS) \
-- --disable-shared @extra_isl_gmp_configure_flags@
-+ --disable-shared @extra_isl_gmp_configure_flags@ \
-+
- @endif isl-bootstrap
-
- .PHONY: configure-stagefeedback-isl maybe-configure-stagefeedback-isl
-@@ -13209,7 +13262,8 @@
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
- $(STAGEfeedback_CONFIGURE_FLAGS) \
-- --disable-shared @extra_isl_gmp_configure_flags@
-+ --disable-shared @extra_isl_gmp_configure_flags@ \
-+
- @endif isl-bootstrap
-
-
-@@ -13905,7 +13959,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- $(STAGE1_CONFIGURE_FLAGS) \
-- --disable-shared --with-gmp=system --with-bits=gmp --with-isl=system
-+ --disable-shared --with-gmp=system --with-bits=gmp --with-isl=system \
-+
- @endif cloog-bootstrap
-
- .PHONY: configure-stage2-cloog maybe-configure-stage2-cloog
-@@ -13939,7 +13994,8 @@
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
- $(STAGE2_CONFIGURE_FLAGS) \
-- --disable-shared --with-gmp=system --with-bits=gmp --with-isl=system
-+ --disable-shared --with-gmp=system --with-bits=gmp --with-isl=system \
-+
- @endif cloog-bootstrap
-
- .PHONY: configure-stage3-cloog maybe-configure-stage3-cloog
-@@ -13973,7 +14029,8 @@
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
- $(STAGE3_CONFIGURE_FLAGS) \
-- --disable-shared --with-gmp=system --with-bits=gmp --with-isl=system
-+ --disable-shared --with-gmp=system --with-bits=gmp --with-isl=system \
-+
- @endif cloog-bootstrap
-
- .PHONY: configure-stage4-cloog maybe-configure-stage4-cloog
-@@ -14007,7 +14064,8 @@
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
- $(STAGE4_CONFIGURE_FLAGS) \
-- --disable-shared --with-gmp=system --with-bits=gmp --with-isl=system
-+ --disable-shared --with-gmp=system --with-bits=gmp --with-isl=system \
-+
- @endif cloog-bootstrap
-
- .PHONY: configure-stageprofile-cloog maybe-configure-stageprofile-cloog
-@@ -14041,7 +14099,8 @@
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
- $(STAGEprofile_CONFIGURE_FLAGS) \
-- --disable-shared --with-gmp=system --with-bits=gmp --with-isl=system
-+ --disable-shared --with-gmp=system --with-bits=gmp --with-isl=system \
-+
- @endif cloog-bootstrap
-
- .PHONY: configure-stagefeedback-cloog maybe-configure-stagefeedback-cloog
-@@ -14075,7 +14134,8 @@
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
- $(STAGEfeedback_CONFIGURE_FLAGS) \
-- --disable-shared --with-gmp=system --with-bits=gmp --with-isl=system
-+ --disable-shared --with-gmp=system --with-bits=gmp --with-isl=system \
-+
- @endif cloog-bootstrap
-
-
-@@ -14771,7 +14831,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- $(STAGE1_CONFIGURE_FLAGS) \
-- --disable-shared
-+ --disable-shared \
-+
- @endif libelf-bootstrap
-
- .PHONY: configure-stage2-libelf maybe-configure-stage2-libelf
-@@ -14805,7 +14866,8 @@
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
- $(STAGE2_CONFIGURE_FLAGS) \
-- --disable-shared
-+ --disable-shared \
-+
- @endif libelf-bootstrap
-
- .PHONY: configure-stage3-libelf maybe-configure-stage3-libelf
-@@ -14839,7 +14901,8 @@
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
- $(STAGE3_CONFIGURE_FLAGS) \
-- --disable-shared
-+ --disable-shared \
-+
- @endif libelf-bootstrap
-
- .PHONY: configure-stage4-libelf maybe-configure-stage4-libelf
-@@ -14873,7 +14936,8 @@
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
- $(STAGE4_CONFIGURE_FLAGS) \
-- --disable-shared
-+ --disable-shared \
-+
- @endif libelf-bootstrap
-
- .PHONY: configure-stageprofile-libelf maybe-configure-stageprofile-libelf
-@@ -14907,7 +14971,8 @@
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
- $(STAGEprofile_CONFIGURE_FLAGS) \
-- --disable-shared
-+ --disable-shared \
-+
- @endif libelf-bootstrap
-
- .PHONY: configure-stagefeedback-libelf maybe-configure-stagefeedback-libelf
-@@ -14941,7 +15006,8 @@
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
- $(STAGEfeedback_CONFIGURE_FLAGS) \
-- --disable-shared
-+ --disable-shared \
-+
- @endif libelf-bootstrap
-
-
-@@ -15636,7 +15702,8 @@
- $(SHELL) $${libsrcdir}/configure \
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
-- $(STAGE1_CONFIGURE_FLAGS)
-+ $(STAGE1_CONFIGURE_FLAGS) \
-+
- @endif gold-bootstrap
-
- .PHONY: configure-stage2-gold maybe-configure-stage2-gold
-@@ -15669,7 +15736,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGE2_CONFIGURE_FLAGS)
-+ $(STAGE2_CONFIGURE_FLAGS) \
-+
- @endif gold-bootstrap
-
- .PHONY: configure-stage3-gold maybe-configure-stage3-gold
-@@ -15702,7 +15770,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGE3_CONFIGURE_FLAGS)
-+ $(STAGE3_CONFIGURE_FLAGS) \
-+
- @endif gold-bootstrap
-
- .PHONY: configure-stage4-gold maybe-configure-stage4-gold
-@@ -15735,7 +15804,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGE4_CONFIGURE_FLAGS)
-+ $(STAGE4_CONFIGURE_FLAGS) \
-+
- @endif gold-bootstrap
-
- .PHONY: configure-stageprofile-gold maybe-configure-stageprofile-gold
-@@ -15768,7 +15838,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGEprofile_CONFIGURE_FLAGS)
-+ $(STAGEprofile_CONFIGURE_FLAGS) \
-+
- @endif gold-bootstrap
-
- .PHONY: configure-stagefeedback-gold maybe-configure-stagefeedback-gold
-@@ -15801,7 +15872,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGEfeedback_CONFIGURE_FLAGS)
-+ $(STAGEfeedback_CONFIGURE_FLAGS) \
-+
- @endif gold-bootstrap
-
-
-@@ -16948,7 +17020,8 @@
- $(SHELL) $${libsrcdir}/configure \
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
-- $(STAGE1_CONFIGURE_FLAGS)
-+ $(STAGE1_CONFIGURE_FLAGS) \
-+
- @endif intl-bootstrap
-
- .PHONY: configure-stage2-intl maybe-configure-stage2-intl
-@@ -16981,7 +17054,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGE2_CONFIGURE_FLAGS)
-+ $(STAGE2_CONFIGURE_FLAGS) \
-+
- @endif intl-bootstrap
-
- .PHONY: configure-stage3-intl maybe-configure-stage3-intl
-@@ -17014,7 +17088,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGE3_CONFIGURE_FLAGS)
-+ $(STAGE3_CONFIGURE_FLAGS) \
-+
- @endif intl-bootstrap
-
- .PHONY: configure-stage4-intl maybe-configure-stage4-intl
-@@ -17047,7 +17122,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGE4_CONFIGURE_FLAGS)
-+ $(STAGE4_CONFIGURE_FLAGS) \
-+
- @endif intl-bootstrap
-
- .PHONY: configure-stageprofile-intl maybe-configure-stageprofile-intl
-@@ -17080,7 +17156,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGEprofile_CONFIGURE_FLAGS)
-+ $(STAGEprofile_CONFIGURE_FLAGS) \
-+
- @endif intl-bootstrap
-
- .PHONY: configure-stagefeedback-intl maybe-configure-stagefeedback-intl
-@@ -17113,7 +17190,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGEfeedback_CONFIGURE_FLAGS)
-+ $(STAGEfeedback_CONFIGURE_FLAGS) \
-+
- @endif intl-bootstrap
-
-
-@@ -18685,7 +18763,8 @@
- $(SHELL) $${libsrcdir}/configure \
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
-- $(STAGE1_CONFIGURE_FLAGS)
-+ $(STAGE1_CONFIGURE_FLAGS) \
-+
- @endif ld-bootstrap
-
- .PHONY: configure-stage2-ld maybe-configure-stage2-ld
-@@ -18718,7 +18797,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGE2_CONFIGURE_FLAGS)
-+ $(STAGE2_CONFIGURE_FLAGS) \
-+
- @endif ld-bootstrap
-
- .PHONY: configure-stage3-ld maybe-configure-stage3-ld
-@@ -18751,7 +18831,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGE3_CONFIGURE_FLAGS)
-+ $(STAGE3_CONFIGURE_FLAGS) \
-+
- @endif ld-bootstrap
-
- .PHONY: configure-stage4-ld maybe-configure-stage4-ld
-@@ -18784,7 +18865,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGE4_CONFIGURE_FLAGS)
-+ $(STAGE4_CONFIGURE_FLAGS) \
-+
- @endif ld-bootstrap
-
- .PHONY: configure-stageprofile-ld maybe-configure-stageprofile-ld
-@@ -18817,7 +18899,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGEprofile_CONFIGURE_FLAGS)
-+ $(STAGEprofile_CONFIGURE_FLAGS) \
-+
- @endif ld-bootstrap
-
- .PHONY: configure-stagefeedback-ld maybe-configure-stagefeedback-ld
-@@ -18850,7 +18933,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGEfeedback_CONFIGURE_FLAGS)
-+ $(STAGEfeedback_CONFIGURE_FLAGS) \
-+
- @endif ld-bootstrap
-
-
-@@ -19557,7 +19641,8 @@
- $(SHELL) $${libsrcdir}/configure \
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
-- $(STAGE1_CONFIGURE_FLAGS)
-+ $(STAGE1_CONFIGURE_FLAGS) \
-+
- @endif libbacktrace-bootstrap
-
- .PHONY: configure-stage2-libbacktrace maybe-configure-stage2-libbacktrace
-@@ -19590,7 +19675,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGE2_CONFIGURE_FLAGS)
-+ $(STAGE2_CONFIGURE_FLAGS) \
-+
- @endif libbacktrace-bootstrap
-
- .PHONY: configure-stage3-libbacktrace maybe-configure-stage3-libbacktrace
-@@ -19623,7 +19709,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGE3_CONFIGURE_FLAGS)
-+ $(STAGE3_CONFIGURE_FLAGS) \
-+
- @endif libbacktrace-bootstrap
-
- .PHONY: configure-stage4-libbacktrace maybe-configure-stage4-libbacktrace
-@@ -19656,7 +19743,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGE4_CONFIGURE_FLAGS)
-+ $(STAGE4_CONFIGURE_FLAGS) \
-+
- @endif libbacktrace-bootstrap
-
- .PHONY: configure-stageprofile-libbacktrace maybe-configure-stageprofile-libbacktrace
-@@ -19689,7 +19777,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGEprofile_CONFIGURE_FLAGS)
-+ $(STAGEprofile_CONFIGURE_FLAGS) \
-+
- @endif libbacktrace-bootstrap
-
- .PHONY: configure-stagefeedback-libbacktrace maybe-configure-stagefeedback-libbacktrace
-@@ -19722,7 +19811,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGEfeedback_CONFIGURE_FLAGS)
-+ $(STAGEfeedback_CONFIGURE_FLAGS) \
-+
- @endif libbacktrace-bootstrap
-
-
-@@ -20429,7 +20519,8 @@
- $(SHELL) $${libsrcdir}/configure \
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
-- $(STAGE1_CONFIGURE_FLAGS)
-+ $(STAGE1_CONFIGURE_FLAGS) \
-+
- @endif libcpp-bootstrap
-
- .PHONY: configure-stage2-libcpp maybe-configure-stage2-libcpp
-@@ -20462,7 +20553,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGE2_CONFIGURE_FLAGS)
-+ $(STAGE2_CONFIGURE_FLAGS) \
-+
- @endif libcpp-bootstrap
-
- .PHONY: configure-stage3-libcpp maybe-configure-stage3-libcpp
-@@ -20495,7 +20587,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGE3_CONFIGURE_FLAGS)
-+ $(STAGE3_CONFIGURE_FLAGS) \
-+
- @endif libcpp-bootstrap
-
- .PHONY: configure-stage4-libcpp maybe-configure-stage4-libcpp
-@@ -20528,7 +20621,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGE4_CONFIGURE_FLAGS)
-+ $(STAGE4_CONFIGURE_FLAGS) \
-+
- @endif libcpp-bootstrap
-
- .PHONY: configure-stageprofile-libcpp maybe-configure-stageprofile-libcpp
-@@ -20561,7 +20655,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGEprofile_CONFIGURE_FLAGS)
-+ $(STAGEprofile_CONFIGURE_FLAGS) \
-+
- @endif libcpp-bootstrap
-
- .PHONY: configure-stagefeedback-libcpp maybe-configure-stagefeedback-libcpp
-@@ -20594,7 +20689,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGEfeedback_CONFIGURE_FLAGS)
-+ $(STAGEfeedback_CONFIGURE_FLAGS) \
-+
- @endif libcpp-bootstrap
-
-
-@@ -21301,7 +21397,8 @@
- $(SHELL) $${libsrcdir}/configure \
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
-- $(STAGE1_CONFIGURE_FLAGS)
-+ $(STAGE1_CONFIGURE_FLAGS) \
-+
- @endif libdecnumber-bootstrap
-
- .PHONY: configure-stage2-libdecnumber maybe-configure-stage2-libdecnumber
-@@ -21334,7 +21431,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGE2_CONFIGURE_FLAGS)
-+ $(STAGE2_CONFIGURE_FLAGS) \
-+
- @endif libdecnumber-bootstrap
-
- .PHONY: configure-stage3-libdecnumber maybe-configure-stage3-libdecnumber
-@@ -21367,7 +21465,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGE3_CONFIGURE_FLAGS)
-+ $(STAGE3_CONFIGURE_FLAGS) \
-+
- @endif libdecnumber-bootstrap
-
- .PHONY: configure-stage4-libdecnumber maybe-configure-stage4-libdecnumber
-@@ -21400,7 +21499,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGE4_CONFIGURE_FLAGS)
-+ $(STAGE4_CONFIGURE_FLAGS) \
-+
- @endif libdecnumber-bootstrap
-
- .PHONY: configure-stageprofile-libdecnumber maybe-configure-stageprofile-libdecnumber
-@@ -21433,7 +21533,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGEprofile_CONFIGURE_FLAGS)
-+ $(STAGEprofile_CONFIGURE_FLAGS) \
-+
- @endif libdecnumber-bootstrap
-
- .PHONY: configure-stagefeedback-libdecnumber maybe-configure-stagefeedback-libdecnumber
-@@ -21466,7 +21567,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGEfeedback_CONFIGURE_FLAGS)
-+ $(STAGEfeedback_CONFIGURE_FLAGS) \
-+
- @endif libdecnumber-bootstrap
-
-
-@@ -22614,7 +22716,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- $(STAGE1_CONFIGURE_FLAGS) \
-- @extra_host_libiberty_configure_flags@
-+ @extra_host_libiberty_configure_flags@ \
-+
- @endif libiberty-bootstrap
-
- .PHONY: configure-stage2-libiberty maybe-configure-stage2-libiberty
-@@ -22648,7 +22751,8 @@
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
- $(STAGE2_CONFIGURE_FLAGS) \
-- @extra_host_libiberty_configure_flags@
-+ @extra_host_libiberty_configure_flags@ \
-+
- @endif libiberty-bootstrap
-
- .PHONY: configure-stage3-libiberty maybe-configure-stage3-libiberty
-@@ -22682,7 +22786,8 @@
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
- $(STAGE3_CONFIGURE_FLAGS) \
-- @extra_host_libiberty_configure_flags@
-+ @extra_host_libiberty_configure_flags@ \
-+
- @endif libiberty-bootstrap
-
- .PHONY: configure-stage4-libiberty maybe-configure-stage4-libiberty
-@@ -22716,7 +22821,8 @@
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
- $(STAGE4_CONFIGURE_FLAGS) \
-- @extra_host_libiberty_configure_flags@
-+ @extra_host_libiberty_configure_flags@ \
-+
- @endif libiberty-bootstrap
-
- .PHONY: configure-stageprofile-libiberty maybe-configure-stageprofile-libiberty
-@@ -22750,7 +22856,8 @@
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
- $(STAGEprofile_CONFIGURE_FLAGS) \
-- @extra_host_libiberty_configure_flags@
-+ @extra_host_libiberty_configure_flags@ \
-+
- @endif libiberty-bootstrap
-
- .PHONY: configure-stagefeedback-libiberty maybe-configure-stagefeedback-libiberty
-@@ -22784,7 +22891,8 @@
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
- $(STAGEfeedback_CONFIGURE_FLAGS) \
-- @extra_host_libiberty_configure_flags@
-+ @extra_host_libiberty_configure_flags@ \
-+
- @endif libiberty-bootstrap
-
-
-@@ -26056,7 +26164,8 @@
- $(SHELL) $${libsrcdir}/configure \
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
-- $(STAGE1_CONFIGURE_FLAGS)
-+ $(STAGE1_CONFIGURE_FLAGS) \
-+
- @endif zlib-bootstrap
-
- .PHONY: configure-stage2-zlib maybe-configure-stage2-zlib
-@@ -26089,7 +26198,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGE2_CONFIGURE_FLAGS)
-+ $(STAGE2_CONFIGURE_FLAGS) \
-+
- @endif zlib-bootstrap
-
- .PHONY: configure-stage3-zlib maybe-configure-stage3-zlib
-@@ -26122,7 +26232,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGE3_CONFIGURE_FLAGS)
-+ $(STAGE3_CONFIGURE_FLAGS) \
-+
- @endif zlib-bootstrap
-
- .PHONY: configure-stage4-zlib maybe-configure-stage4-zlib
-@@ -26155,7 +26266,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGE4_CONFIGURE_FLAGS)
-+ $(STAGE4_CONFIGURE_FLAGS) \
-+
- @endif zlib-bootstrap
-
- .PHONY: configure-stageprofile-zlib maybe-configure-stageprofile-zlib
-@@ -26188,7 +26300,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGEprofile_CONFIGURE_FLAGS)
-+ $(STAGEprofile_CONFIGURE_FLAGS) \
-+
- @endif zlib-bootstrap
-
- .PHONY: configure-stagefeedback-zlib maybe-configure-stagefeedback-zlib
-@@ -26221,7 +26334,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGEfeedback_CONFIGURE_FLAGS)
-+ $(STAGEfeedback_CONFIGURE_FLAGS) \
-+
- @endif zlib-bootstrap
-
-
-@@ -29919,7 +30033,8 @@
- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=${target_alias} $${srcdiroption} \
- $(STAGE1_CONFIGURE_FLAGS) \
-- --enable-shared
-+ --enable-shared \
-+
- @endif lto-plugin-bootstrap
-
- .PHONY: configure-stage2-lto-plugin maybe-configure-stage2-lto-plugin
-@@ -29953,7 +30068,8 @@
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
- $(STAGE2_CONFIGURE_FLAGS) \
-- --enable-shared
-+ --enable-shared \
-+
- @endif lto-plugin-bootstrap
-
- .PHONY: configure-stage3-lto-plugin maybe-configure-stage3-lto-plugin
-@@ -29987,7 +30103,8 @@
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
- $(STAGE3_CONFIGURE_FLAGS) \
-- --enable-shared
-+ --enable-shared \
-+
- @endif lto-plugin-bootstrap
-
- .PHONY: configure-stage4-lto-plugin maybe-configure-stage4-lto-plugin
-@@ -30021,7 +30138,8 @@
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
- $(STAGE4_CONFIGURE_FLAGS) \
-- --enable-shared
-+ --enable-shared \
-+
- @endif lto-plugin-bootstrap
-
- .PHONY: configure-stageprofile-lto-plugin maybe-configure-stageprofile-lto-plugin
-@@ -30055,7 +30173,8 @@
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
- $(STAGEprofile_CONFIGURE_FLAGS) \
-- --enable-shared
-+ --enable-shared \
-+
- @endif lto-plugin-bootstrap
-
- .PHONY: configure-stagefeedback-lto-plugin maybe-configure-stagefeedback-lto-plugin
-@@ -30089,7 +30208,8 @@
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
- $(STAGEfeedback_CONFIGURE_FLAGS) \
-- --enable-shared
-+ --enable-shared \
-+
- @endif lto-plugin-bootstrap
-
-
-@@ -30829,7 +30949,9 @@
- $(SHELL) $${libsrcdir}/configure \
- $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
- --target=${target_alias} $${srcdiroption} \
-- $(STAGE1_CONFIGURE_FLAGS)
-+ $(STAGE1_CONFIGURE_FLAGS) \
-+ --disable-libstdcxx-debug --disable-libstdcxx-pch \
-+
- @endif target-libstdc++-v3-bootstrap
-
- .PHONY: configure-stage2-target-libstdc++-v3 maybe-configure-stage2-target-libstdc++-v3
-@@ -30874,7 +30996,9 @@
- $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGE2_CONFIGURE_FLAGS)
-+ $(STAGE2_CONFIGURE_FLAGS) \
-+ --disable-libstdcxx-debug --disable-libstdcxx-pch \
-+
- @endif target-libstdc++-v3-bootstrap
-
- .PHONY: configure-stage3-target-libstdc++-v3 maybe-configure-stage3-target-libstdc++-v3
-@@ -30919,7 +31043,9 @@
- $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGE3_CONFIGURE_FLAGS)
-+ $(STAGE3_CONFIGURE_FLAGS) \
-+ --disable-libstdcxx-debug --disable-libstdcxx-pch \
-+
- @endif target-libstdc++-v3-bootstrap
-
- .PHONY: configure-stage4-target-libstdc++-v3 maybe-configure-stage4-target-libstdc++-v3
-@@ -30964,7 +31090,9 @@
- $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGE4_CONFIGURE_FLAGS)
-+ $(STAGE4_CONFIGURE_FLAGS) \
-+ --disable-libstdcxx-debug --disable-libstdcxx-pch \
-+
- @endif target-libstdc++-v3-bootstrap
-
- .PHONY: configure-stageprofile-target-libstdc++-v3 maybe-configure-stageprofile-target-libstdc++-v3
-@@ -31009,7 +31137,9 @@
- $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGEprofile_CONFIGURE_FLAGS)
-+ $(STAGEprofile_CONFIGURE_FLAGS) \
-+ --disable-libstdcxx-debug --disable-libstdcxx-pch \
-+
- @endif target-libstdc++-v3-bootstrap
-
- .PHONY: configure-stagefeedback-target-libstdc++-v3 maybe-configure-stagefeedback-target-libstdc++-v3
-@@ -31054,7 +31184,9 @@
- $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGEfeedback_CONFIGURE_FLAGS)
-+ $(STAGEfeedback_CONFIGURE_FLAGS) \
-+ --disable-libstdcxx-debug --disable-libstdcxx-pch \
-+
- @endif target-libstdc++-v3-bootstrap
-
-
-@@ -33631,7 +33763,8 @@
- $(SHELL) $${libsrcdir}/configure \
- $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
- --target=${target_alias} $${srcdiroption} \
-- $(STAGE1_CONFIGURE_FLAGS)
-+ $(STAGE1_CONFIGURE_FLAGS) \
-+
- @endif target-libgcc-bootstrap
-
- .PHONY: configure-stage2-target-libgcc maybe-configure-stage2-target-libgcc
-@@ -33676,7 +33809,8 @@
- $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGE2_CONFIGURE_FLAGS)
-+ $(STAGE2_CONFIGURE_FLAGS) \
-+
- @endif target-libgcc-bootstrap
-
- .PHONY: configure-stage3-target-libgcc maybe-configure-stage3-target-libgcc
-@@ -33721,7 +33855,8 @@
- $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGE3_CONFIGURE_FLAGS)
-+ $(STAGE3_CONFIGURE_FLAGS) \
-+
- @endif target-libgcc-bootstrap
-
- .PHONY: configure-stage4-target-libgcc maybe-configure-stage4-target-libgcc
-@@ -33766,7 +33901,8 @@
- $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGE4_CONFIGURE_FLAGS)
-+ $(STAGE4_CONFIGURE_FLAGS) \
-+
- @endif target-libgcc-bootstrap
-
- .PHONY: configure-stageprofile-target-libgcc maybe-configure-stageprofile-target-libgcc
-@@ -33811,7 +33947,8 @@
- $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGEprofile_CONFIGURE_FLAGS)
-+ $(STAGEprofile_CONFIGURE_FLAGS) \
-+
- @endif target-libgcc-bootstrap
-
- .PHONY: configure-stagefeedback-target-libgcc maybe-configure-stagefeedback-target-libgcc
-@@ -33856,7 +33993,8 @@
- $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGEfeedback_CONFIGURE_FLAGS)
-+ $(STAGEfeedback_CONFIGURE_FLAGS) \
-+
- @endif target-libgcc-bootstrap
-
-
-@@ -40928,7 +41066,8 @@
- $(SHELL) $${libsrcdir}/configure \
- $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
- --target=${target_alias} $${srcdiroption} \
-- $(STAGE1_CONFIGURE_FLAGS)
-+ $(STAGE1_CONFIGURE_FLAGS) \
-+
- @endif target-libgomp-bootstrap
-
- .PHONY: configure-stage2-target-libgomp maybe-configure-stage2-target-libgomp
-@@ -40973,7 +41112,8 @@
- $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGE2_CONFIGURE_FLAGS)
-+ $(STAGE2_CONFIGURE_FLAGS) \
-+
- @endif target-libgomp-bootstrap
-
- .PHONY: configure-stage3-target-libgomp maybe-configure-stage3-target-libgomp
-@@ -41018,7 +41158,8 @@
- $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGE3_CONFIGURE_FLAGS)
-+ $(STAGE3_CONFIGURE_FLAGS) \
-+
- @endif target-libgomp-bootstrap
-
- .PHONY: configure-stage4-target-libgomp maybe-configure-stage4-target-libgomp
-@@ -41063,7 +41204,8 @@
- $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGE4_CONFIGURE_FLAGS)
-+ $(STAGE4_CONFIGURE_FLAGS) \
-+
- @endif target-libgomp-bootstrap
-
- .PHONY: configure-stageprofile-target-libgomp maybe-configure-stageprofile-target-libgomp
-@@ -41108,7 +41250,8 @@
- $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGEprofile_CONFIGURE_FLAGS)
-+ $(STAGEprofile_CONFIGURE_FLAGS) \
-+
- @endif target-libgomp-bootstrap
-
- .PHONY: configure-stagefeedback-target-libgomp maybe-configure-stagefeedback-target-libgomp
-@@ -41153,7 +41296,8 @@
- $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
- --target=${target_alias} $${srcdiroption} \
- --with-build-libsubdir=$(HOST_SUBDIR) \
-- $(STAGEfeedback_CONFIGURE_FLAGS)
-+ $(STAGEfeedback_CONFIGURE_FLAGS) \
-+
- @endif target-libgomp-bootstrap
-
-
diff --git a/debian/patches/gdc-libphobos-build.diff b/debian/patches/gdc-libphobos-build.diff
index 1e62f07..3d443bd 100644
--- a/debian/patches/gdc-libphobos-build.diff
+++ b/debian/patches/gdc-libphobos-build.diff
@@ -1,10 +1,12 @@
# DP: This implements building of libphobos library in GCC.
+# !!! src/Makefile.def modified, run autoconf to regenerate src/Makefile.in
+
Index: b/src/Makefile.def
===================================================================
--- a/src/Makefile.def
+++ b/src/Makefile.def
-@@ -164,6 +164,7 @@ target_modules = { module= libgfortran;
+@@ -167,6 +167,7 @@ target_modules = { module= libgfortran;
target_modules = { module= libobjc; };
target_modules = { module= libgo; };
target_modules = { module= libhsail-rt; };
@@ -12,7 +14,7 @@ Index: b/src/Makefile.def
target_modules = { module= libtermcap; no_check=true;
missing=mostlyclean;
missing=clean;
-@@ -290,6 +291,7 @@ flags_to_pass = { flag= FLAGS_FOR_TARGET
+@@ -312,6 +313,7 @@ flags_to_pass = { flag= FLAGS_FOR_TARGET
flags_to_pass = { flag= GFORTRAN_FOR_TARGET ; };
flags_to_pass = { flag= GOC_FOR_TARGET ; };
flags_to_pass = { flag= GOCFLAGS_FOR_TARGET ; };
@@ -20,7 +22,7 @@ Index: b/src/Makefile.def
flags_to_pass = { flag= LD_FOR_TARGET ; };
flags_to_pass = { flag= LIPO_FOR_TARGET ; };
flags_to_pass = { flag= LDFLAGS_FOR_TARGET ; };
-@@ -559,6 +561,8 @@ dependencies = { module=configure-target
+@@ -583,6 +585,8 @@ dependencies = { module=configure-target
dependencies = { module=all-target-libgo; on=all-target-libbacktrace; };
dependencies = { module=all-target-libgo; on=all-target-libffi; };
dependencies = { module=all-target-libgo; on=all-target-libatomic; };
@@ -29,7 +31,7 @@ Index: b/src/Makefile.def
dependencies = { module=configure-target-libstdc++-v3; on=configure-target-libgomp; };
dependencies = { module=configure-target-liboffloadmic; on=configure-target-libgomp; };
dependencies = { module=configure-target-libsanitizer; on=all-target-libstdc++-v3; };
-@@ -613,6 +617,8 @@ languages = { language=go; gcc-check-tar
+@@ -637,6 +641,8 @@ languages = { language=go; gcc-check-tar
lib-check-target=check-target-libgo; };
languages = { language=brig; gcc-check-target=check-brig;
lib-check-target=check-target-libhsail-rt; };
@@ -38,750 +40,6 @@ Index: b/src/Makefile.def
// Toplevel bootstrap
bootstrap_stage = { id=1 ; };
-Index: b/src/Makefile.in
-===================================================================
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -156,6 +156,7 @@ BUILD_EXPORTS = \
- GFORTRAN="$(GFORTRAN_FOR_BUILD)"; export GFORTRAN; \
- GOC="$(GOC_FOR_BUILD)"; export GOC; \
- GOCFLAGS="$(GOCFLAGS_FOR_BUILD)"; export GOCFLAGS; \
-+ GDC="$(GDC_FOR_BUILD)"; export GDC; \
- DLLTOOL="$(DLLTOOL_FOR_BUILD)"; export DLLTOOL; \
- LD="$(LD_FOR_BUILD)"; export LD; \
- LDFLAGS="$(LDFLAGS_FOR_BUILD)"; export LDFLAGS; \
-@@ -192,6 +193,7 @@ HOST_EXPORTS = \
- CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
- GFORTRAN="$(GFORTRAN)"; export GFORTRAN; \
- GOC="$(GOC)"; export GOC; \
-+ GDC="$(GDC)"; export GDC; \
- AR="$(AR)"; export AR; \
- AS="$(AS)"; export AS; \
- CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
-@@ -278,6 +280,7 @@ BASE_TARGET_EXPORTS = \
- CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
- GFORTRAN="$(GFORTRAN_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GFORTRAN; \
- GOC="$(GOC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GOC; \
-+ GDC="$(GDC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export GDC; \
- DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
- LD="$(COMPILER_LD_FOR_TARGET)"; export LD; \
- LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
-@@ -342,6 +345,7 @@ CXX_FOR_BUILD = @CXX_FOR_BUILD@
- DLLTOOL_FOR_BUILD = @DLLTOOL_FOR_BUILD@
- GFORTRAN_FOR_BUILD = @GFORTRAN_FOR_BUILD@
- GOC_FOR_BUILD = @GOC_FOR_BUILD@
-+GDC_FOR_BUILD = @GDC_FOR_BUILD@
- LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
- LD_FOR_BUILD = @LD_FOR_BUILD@
- NM_FOR_BUILD = @NM_FOR_BUILD@
-@@ -551,6 +555,7 @@ CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @CXX_
- RAW_CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @RAW_CXX_FOR_TARGET@
- GFORTRAN_FOR_TARGET=$(STAGE_CC_WRAPPER) @GFORTRAN_FOR_TARGET@
- GOC_FOR_TARGET=$(STAGE_CC_WRAPPER) @GOC_FOR_TARGET@
-+GDC_FOR_TARGET=$(STAGE_CC_WRAPPER) @GDC_FOR_TARGET@
- DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@
- LD_FOR_TARGET=@LD_FOR_TARGET@
-
-@@ -774,6 +779,7 @@ BASE_FLAGS_TO_PASS = \
- "GFORTRAN_FOR_TARGET=$(GFORTRAN_FOR_TARGET)" \
- "GOC_FOR_TARGET=$(GOC_FOR_TARGET)" \
- "GOCFLAGS_FOR_TARGET=$(GOCFLAGS_FOR_TARGET)" \
-+ "GDC_FOR_TARGET=$(GDC_FOR_TARGET)" \
- "LD_FOR_TARGET=$(LD_FOR_TARGET)" \
- "LIPO_FOR_TARGET=$(LIPO_FOR_TARGET)" \
- "LDFLAGS_FOR_TARGET=$(LDFLAGS_FOR_TARGET)" \
-@@ -833,6 +839,7 @@ EXTRA_HOST_FLAGS = \
- 'DLLTOOL=$(DLLTOOL)' \
- 'GFORTRAN=$(GFORTRAN)' \
- 'GOC=$(GOC)' \
-+ 'GDC=$(GDC)' \
- 'LD=$(LD)' \
- 'LIPO=$(LIPO)' \
- 'NM=$(NM)' \
-@@ -889,6 +896,7 @@ EXTRA_TARGET_FLAGS = \
- 'GFORTRAN=$$(GFORTRAN_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
- 'GOC=$$(GOC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
- 'GOCFLAGS=$$(GOCFLAGS_FOR_TARGET)' \
-+ 'GDC=$$(GDC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \
- 'LD=$(COMPILER_LD_FOR_TARGET)' \
- 'LDFLAGS=$$(LDFLAGS_FOR_TARGET)' \
- 'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET)' \
-@@ -992,6 +1000,7 @@ configure-target: \
- maybe-configure-target-libobjc \
- maybe-configure-target-libgo \
- maybe-configure-target-libhsail-rt \
-+ maybe-configure-target-libphobos \
- maybe-configure-target-libtermcap \
- maybe-configure-target-winsup \
- maybe-configure-target-libgloss \
-@@ -1159,6 +1168,7 @@ all-target: maybe-all-target-libgfortran
- all-target: maybe-all-target-libobjc
- all-target: maybe-all-target-libgo
- all-target: maybe-all-target-libhsail-rt
-+all-target: maybe-all-target-libphobos
- all-target: maybe-all-target-libtermcap
- all-target: maybe-all-target-winsup
- all-target: maybe-all-target-libgloss
-@@ -1253,6 +1263,7 @@ info-target: maybe-info-target-libgfortr
- info-target: maybe-info-target-libobjc
- info-target: maybe-info-target-libgo
- info-target: maybe-info-target-libhsail-rt
-+info-target: maybe-info-target-libphobos
- info-target: maybe-info-target-libtermcap
- info-target: maybe-info-target-winsup
- info-target: maybe-info-target-libgloss
-@@ -1340,6 +1351,7 @@ dvi-target: maybe-dvi-target-libgfortran
- dvi-target: maybe-dvi-target-libobjc
- dvi-target: maybe-dvi-target-libgo
- dvi-target: maybe-dvi-target-libhsail-rt
-+dvi-target: maybe-dvi-target-libphobos
- dvi-target: maybe-dvi-target-libtermcap
- dvi-target: maybe-dvi-target-winsup
- dvi-target: maybe-dvi-target-libgloss
-@@ -1427,6 +1439,7 @@ pdf-target: maybe-pdf-target-libgfortran
- pdf-target: maybe-pdf-target-libobjc
- pdf-target: maybe-pdf-target-libgo
- pdf-target: maybe-pdf-target-libhsail-rt
-+pdf-target: maybe-pdf-target-libphobos
- pdf-target: maybe-pdf-target-libtermcap
- pdf-target: maybe-pdf-target-winsup
- pdf-target: maybe-pdf-target-libgloss
-@@ -1514,6 +1527,7 @@ html-target: maybe-html-target-libgfortr
- html-target: maybe-html-target-libobjc
- html-target: maybe-html-target-libgo
- html-target: maybe-html-target-libhsail-rt
-+html-target: maybe-html-target-libphobos
- html-target: maybe-html-target-libtermcap
- html-target: maybe-html-target-winsup
- html-target: maybe-html-target-libgloss
-@@ -1601,6 +1615,7 @@ TAGS-target: maybe-TAGS-target-libgfortr
- TAGS-target: maybe-TAGS-target-libobjc
- TAGS-target: maybe-TAGS-target-libgo
- TAGS-target: maybe-TAGS-target-libhsail-rt
-+TAGS-target: maybe-TAGS-target-libphobos
- TAGS-target: maybe-TAGS-target-libtermcap
- TAGS-target: maybe-TAGS-target-winsup
- TAGS-target: maybe-TAGS-target-libgloss
-@@ -1688,6 +1703,7 @@ install-info-target: maybe-install-info-
- install-info-target: maybe-install-info-target-libobjc
- install-info-target: maybe-install-info-target-libgo
- install-info-target: maybe-install-info-target-libhsail-rt
-+install-info-target: maybe-install-info-target-libphobos
- install-info-target: maybe-install-info-target-libtermcap
- install-info-target: maybe-install-info-target-winsup
- install-info-target: maybe-install-info-target-libgloss
-@@ -1775,6 +1791,7 @@ install-pdf-target: maybe-install-pdf-ta
- install-pdf-target: maybe-install-pdf-target-libobjc
- install-pdf-target: maybe-install-pdf-target-libgo
- install-pdf-target: maybe-install-pdf-target-libhsail-rt
-+install-pdf-target: maybe-install-pdf-target-libphobos
- install-pdf-target: maybe-install-pdf-target-libtermcap
- install-pdf-target: maybe-install-pdf-target-winsup
- install-pdf-target: maybe-install-pdf-target-libgloss
-@@ -1862,6 +1879,7 @@ install-html-target: maybe-install-html-
- install-html-target: maybe-install-html-target-libobjc
- install-html-target: maybe-install-html-target-libgo
- install-html-target: maybe-install-html-target-libhsail-rt
-+install-html-target: maybe-install-html-target-libphobos
- install-html-target: maybe-install-html-target-libtermcap
- install-html-target: maybe-install-html-target-winsup
- install-html-target: maybe-install-html-target-libgloss
-@@ -1949,6 +1967,7 @@ installcheck-target: maybe-installcheck-
- installcheck-target: maybe-installcheck-target-libobjc
- installcheck-target: maybe-installcheck-target-libgo
- installcheck-target: maybe-installcheck-target-libhsail-rt
-+installcheck-target: maybe-installcheck-target-libphobos
- installcheck-target: maybe-installcheck-target-libtermcap
- installcheck-target: maybe-installcheck-target-winsup
- installcheck-target: maybe-installcheck-target-libgloss
-@@ -2036,6 +2055,7 @@ mostlyclean-target: maybe-mostlyclean-ta
- mostlyclean-target: maybe-mostlyclean-target-libobjc
- mostlyclean-target: maybe-mostlyclean-target-libgo
- mostlyclean-target: maybe-mostlyclean-target-libhsail-rt
-+mostlyclean-target: maybe-mostlyclean-target-libphobos
- mostlyclean-target: maybe-mostlyclean-target-libtermcap
- mostlyclean-target: maybe-mostlyclean-target-winsup
- mostlyclean-target: maybe-mostlyclean-target-libgloss
-@@ -2123,6 +2143,7 @@ clean-target: maybe-clean-target-libgfor
- clean-target: maybe-clean-target-libobjc
- clean-target: maybe-clean-target-libgo
- clean-target: maybe-clean-target-libhsail-rt
-+clean-target: maybe-clean-target-libphobos
- clean-target: maybe-clean-target-libtermcap
- clean-target: maybe-clean-target-winsup
- clean-target: maybe-clean-target-libgloss
-@@ -2210,6 +2231,7 @@ distclean-target: maybe-distclean-target
- distclean-target: maybe-distclean-target-libobjc
- distclean-target: maybe-distclean-target-libgo
- distclean-target: maybe-distclean-target-libhsail-rt
-+distclean-target: maybe-distclean-target-libphobos
- distclean-target: maybe-distclean-target-libtermcap
- distclean-target: maybe-distclean-target-winsup
- distclean-target: maybe-distclean-target-libgloss
-@@ -2297,6 +2319,7 @@ maintainer-clean-target: maybe-maintaine
- maintainer-clean-target: maybe-maintainer-clean-target-libobjc
- maintainer-clean-target: maybe-maintainer-clean-target-libgo
- maintainer-clean-target: maybe-maintainer-clean-target-libhsail-rt
-+maintainer-clean-target: maybe-maintainer-clean-target-libphobos
- maintainer-clean-target: maybe-maintainer-clean-target-libtermcap
- maintainer-clean-target: maybe-maintainer-clean-target-winsup
- maintainer-clean-target: maybe-maintainer-clean-target-libgloss
-@@ -2440,6 +2463,7 @@ check-target: \
- maybe-check-target-libobjc \
- maybe-check-target-libgo \
- maybe-check-target-libhsail-rt \
-+ maybe-check-target-libphobos \
- maybe-check-target-libtermcap \
- maybe-check-target-winsup \
- maybe-check-target-libgloss \
-@@ -2623,6 +2647,7 @@ install-target: \
- maybe-install-target-libobjc \
- maybe-install-target-libgo \
- maybe-install-target-libhsail-rt \
-+ maybe-install-target-libphobos \
- maybe-install-target-libtermcap \
- maybe-install-target-winsup \
- maybe-install-target-libgloss \
-@@ -2730,6 +2755,7 @@ install-strip-target: \
- maybe-install-strip-target-libobjc \
- maybe-install-strip-target-libgo \
- maybe-install-strip-target-libhsail-rt \
-+ maybe-install-strip-target-libphobos \
- maybe-install-strip-target-libtermcap \
- maybe-install-strip-target-winsup \
- maybe-install-strip-target-libgloss \
-@@ -46485,6 +46511,464 @@ maintainer-clean-target-libhsail-rt:
-
-
-
-+.PHONY: configure-target-libphobos maybe-configure-target-libphobos
-+maybe-configure-target-libphobos:
-+ at if gcc-bootstrap
-+configure-target-libphobos: stage_current
-+ at endif gcc-bootstrap
-+ at if target-libphobos
-+maybe-configure-target-libphobos: configure-target-libphobos
-+configure-target-libphobos:
-+ @: $(MAKE); $(unstage)
-+ @r=`${PWD_COMMAND}`; export r; \
-+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+ echo "Checking multilib configuration for libphobos..."; \
-+ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libphobos; \
-+ $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libphobos/multilib.tmp 2> /dev/null; \
-+ if test -r $(TARGET_SUBDIR)/libphobos/multilib.out; then \
-+ if cmp -s $(TARGET_SUBDIR)/libphobos/multilib.tmp $(TARGET_SUBDIR)/libphobos/multilib.out; then \
-+ rm -f $(TARGET_SUBDIR)/libphobos/multilib.tmp; \
-+ else \
-+ rm -f $(TARGET_SUBDIR)/libphobos/Makefile; \
-+ mv $(TARGET_SUBDIR)/libphobos/multilib.tmp $(TARGET_SUBDIR)/libphobos/multilib.out; \
-+ fi; \
-+ else \
-+ mv $(TARGET_SUBDIR)/libphobos/multilib.tmp $(TARGET_SUBDIR)/libphobos/multilib.out; \
-+ fi; \
-+ test ! -f $(TARGET_SUBDIR)/libphobos/Makefile || exit 0; \
-+ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libphobos; \
-+ $(NORMAL_TARGET_EXPORTS) \
-+ echo Configuring in $(TARGET_SUBDIR)/libphobos; \
-+ cd "$(TARGET_SUBDIR)/libphobos" || exit 1; \
-+ case $(srcdir) in \
-+ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-+ *) topdir=`echo $(TARGET_SUBDIR)/libphobos/ | \
-+ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-+ esac; \
-+ module_srcdir=libphobos; \
-+ 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-libphobos
-+
-+
-+
-+
-+
-+.PHONY: all-target-libphobos maybe-all-target-libphobos
-+maybe-all-target-libphobos:
-+ at if gcc-bootstrap
-+all-target-libphobos: stage_current
-+ at endif gcc-bootstrap
-+ at if target-libphobos
-+TARGET-target-libphobos=all
-+maybe-all-target-libphobos: all-target-libphobos
-+all-target-libphobos: configure-target-libphobos
-+ @: $(MAKE); $(unstage)
-+ @r=`${PWD_COMMAND}`; export r; \
-+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+ $(NORMAL_TARGET_EXPORTS) \
-+ (cd $(TARGET_SUBDIR)/libphobos && \
-+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \
-+ $(TARGET-target-libphobos))
-+ at endif target-libphobos
-+
-+
-+
-+
-+
-+.PHONY: check-target-libphobos maybe-check-target-libphobos
-+maybe-check-target-libphobos:
-+ at if target-libphobos
-+maybe-check-target-libphobos: check-target-libphobos
-+
-+check-target-libphobos:
-+ @: $(MAKE); $(unstage)
-+ @r=`${PWD_COMMAND}`; export r; \
-+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+ $(NORMAL_TARGET_EXPORTS) \
-+ (cd $(TARGET_SUBDIR)/libphobos && \
-+ $(MAKE) $(TARGET_FLAGS_TO_PASS) check)
-+
-+ at endif target-libphobos
-+
-+.PHONY: install-target-libphobos maybe-install-target-libphobos
-+maybe-install-target-libphobos:
-+ at if target-libphobos
-+maybe-install-target-libphobos: install-target-libphobos
-+
-+install-target-libphobos: installdirs
-+ @: $(MAKE); $(unstage)
-+ @r=`${PWD_COMMAND}`; export r; \
-+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+ $(NORMAL_TARGET_EXPORTS) \
-+ (cd $(TARGET_SUBDIR)/libphobos && \
-+ $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
-+
-+ at endif target-libphobos
-+
-+.PHONY: install-strip-target-libphobos maybe-install-strip-target-libphobos
-+maybe-install-strip-target-libphobos:
-+ at if target-libphobos
-+maybe-install-strip-target-libphobos: install-strip-target-libphobos
-+
-+install-strip-target-libphobos: installdirs
-+ @: $(MAKE); $(unstage)
-+ @r=`${PWD_COMMAND}`; export r; \
-+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+ $(NORMAL_TARGET_EXPORTS) \
-+ (cd $(TARGET_SUBDIR)/libphobos && \
-+ $(MAKE) $(TARGET_FLAGS_TO_PASS) install-strip)
-+
-+ at endif target-libphobos
-+
-+# Other targets (info, dvi, pdf, etc.)
-+
-+.PHONY: maybe-info-target-libphobos info-target-libphobos
-+maybe-info-target-libphobos:
-+ at if target-libphobos
-+maybe-info-target-libphobos: info-target-libphobos
-+
-+info-target-libphobos: \
-+ configure-target-libphobos
-+ @: $(MAKE); $(unstage)
-+ @[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0; \
-+ r=`${PWD_COMMAND}`; export r; \
-+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+ $(NORMAL_TARGET_EXPORTS) \
-+ echo "Doing info in $(TARGET_SUBDIR)/libphobos"; \
-+ for flag in $(EXTRA_TARGET_FLAGS); do \
-+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-+ done; \
-+ (cd $(TARGET_SUBDIR)/libphobos && \
-+ $(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-libphobos
-+
-+.PHONY: maybe-dvi-target-libphobos dvi-target-libphobos
-+maybe-dvi-target-libphobos:
-+ at if target-libphobos
-+maybe-dvi-target-libphobos: dvi-target-libphobos
-+
-+dvi-target-libphobos: \
-+ configure-target-libphobos
-+ @: $(MAKE); $(unstage)
-+ @[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0; \
-+ r=`${PWD_COMMAND}`; export r; \
-+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+ $(NORMAL_TARGET_EXPORTS) \
-+ echo "Doing dvi in $(TARGET_SUBDIR)/libphobos"; \
-+ for flag in $(EXTRA_TARGET_FLAGS); do \
-+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-+ done; \
-+ (cd $(TARGET_SUBDIR)/libphobos && \
-+ $(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-libphobos
-+
-+.PHONY: maybe-pdf-target-libphobos pdf-target-libphobos
-+maybe-pdf-target-libphobos:
-+ at if target-libphobos
-+maybe-pdf-target-libphobos: pdf-target-libphobos
-+
-+pdf-target-libphobos: \
-+ configure-target-libphobos
-+ @: $(MAKE); $(unstage)
-+ @[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0; \
-+ r=`${PWD_COMMAND}`; export r; \
-+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+ $(NORMAL_TARGET_EXPORTS) \
-+ echo "Doing pdf in $(TARGET_SUBDIR)/libphobos"; \
-+ for flag in $(EXTRA_TARGET_FLAGS); do \
-+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-+ done; \
-+ (cd $(TARGET_SUBDIR)/libphobos && \
-+ $(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-libphobos
-+
-+.PHONY: maybe-html-target-libphobos html-target-libphobos
-+maybe-html-target-libphobos:
-+ at if target-libphobos
-+maybe-html-target-libphobos: html-target-libphobos
-+
-+html-target-libphobos: \
-+ configure-target-libphobos
-+ @: $(MAKE); $(unstage)
-+ @[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0; \
-+ r=`${PWD_COMMAND}`; export r; \
-+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+ $(NORMAL_TARGET_EXPORTS) \
-+ echo "Doing html in $(TARGET_SUBDIR)/libphobos"; \
-+ for flag in $(EXTRA_TARGET_FLAGS); do \
-+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-+ done; \
-+ (cd $(TARGET_SUBDIR)/libphobos && \
-+ $(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-libphobos
-+
-+.PHONY: maybe-TAGS-target-libphobos TAGS-target-libphobos
-+maybe-TAGS-target-libphobos:
-+ at if target-libphobos
-+maybe-TAGS-target-libphobos: TAGS-target-libphobos
-+
-+TAGS-target-libphobos: \
-+ configure-target-libphobos
-+ @: $(MAKE); $(unstage)
-+ @[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0; \
-+ r=`${PWD_COMMAND}`; export r; \
-+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+ $(NORMAL_TARGET_EXPORTS) \
-+ echo "Doing TAGS in $(TARGET_SUBDIR)/libphobos"; \
-+ for flag in $(EXTRA_TARGET_FLAGS); do \
-+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-+ done; \
-+ (cd $(TARGET_SUBDIR)/libphobos && \
-+ $(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-libphobos
-+
-+.PHONY: maybe-install-info-target-libphobos install-info-target-libphobos
-+maybe-install-info-target-libphobos:
-+ at if target-libphobos
-+maybe-install-info-target-libphobos: install-info-target-libphobos
-+
-+install-info-target-libphobos: \
-+ configure-target-libphobos \
-+ info-target-libphobos
-+ @: $(MAKE); $(unstage)
-+ @[ -f $(TARGET_SUBDIR)/libphobos/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)/libphobos"; \
-+ for flag in $(EXTRA_TARGET_FLAGS); do \
-+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-+ done; \
-+ (cd $(TARGET_SUBDIR)/libphobos && \
-+ $(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-libphobos
-+
-+.PHONY: maybe-install-pdf-target-libphobos install-pdf-target-libphobos
-+maybe-install-pdf-target-libphobos:
-+ at if target-libphobos
-+maybe-install-pdf-target-libphobos: install-pdf-target-libphobos
-+
-+install-pdf-target-libphobos: \
-+ configure-target-libphobos \
-+ pdf-target-libphobos
-+ @: $(MAKE); $(unstage)
-+ @[ -f $(TARGET_SUBDIR)/libphobos/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)/libphobos"; \
-+ for flag in $(EXTRA_TARGET_FLAGS); do \
-+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-+ done; \
-+ (cd $(TARGET_SUBDIR)/libphobos && \
-+ $(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-libphobos
-+
-+.PHONY: maybe-install-html-target-libphobos install-html-target-libphobos
-+maybe-install-html-target-libphobos:
-+ at if target-libphobos
-+maybe-install-html-target-libphobos: install-html-target-libphobos
-+
-+install-html-target-libphobos: \
-+ configure-target-libphobos \
-+ html-target-libphobos
-+ @: $(MAKE); $(unstage)
-+ @[ -f $(TARGET_SUBDIR)/libphobos/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)/libphobos"; \
-+ for flag in $(EXTRA_TARGET_FLAGS); do \
-+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-+ done; \
-+ (cd $(TARGET_SUBDIR)/libphobos && \
-+ $(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-libphobos
-+
-+.PHONY: maybe-installcheck-target-libphobos installcheck-target-libphobos
-+maybe-installcheck-target-libphobos:
-+ at if target-libphobos
-+maybe-installcheck-target-libphobos: installcheck-target-libphobos
-+
-+installcheck-target-libphobos: \
-+ configure-target-libphobos
-+ @: $(MAKE); $(unstage)
-+ @[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0; \
-+ r=`${PWD_COMMAND}`; export r; \
-+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+ $(NORMAL_TARGET_EXPORTS) \
-+ echo "Doing installcheck in $(TARGET_SUBDIR)/libphobos"; \
-+ for flag in $(EXTRA_TARGET_FLAGS); do \
-+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-+ done; \
-+ (cd $(TARGET_SUBDIR)/libphobos && \
-+ $(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-libphobos
-+
-+.PHONY: maybe-mostlyclean-target-libphobos mostlyclean-target-libphobos
-+maybe-mostlyclean-target-libphobos:
-+ at if target-libphobos
-+maybe-mostlyclean-target-libphobos: mostlyclean-target-libphobos
-+
-+mostlyclean-target-libphobos:
-+ @: $(MAKE); $(unstage)
-+ @[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0; \
-+ r=`${PWD_COMMAND}`; export r; \
-+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+ $(NORMAL_TARGET_EXPORTS) \
-+ echo "Doing mostlyclean in $(TARGET_SUBDIR)/libphobos"; \
-+ for flag in $(EXTRA_TARGET_FLAGS); do \
-+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-+ done; \
-+ (cd $(TARGET_SUBDIR)/libphobos && \
-+ $(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-libphobos
-+
-+.PHONY: maybe-clean-target-libphobos clean-target-libphobos
-+maybe-clean-target-libphobos:
-+ at if target-libphobos
-+maybe-clean-target-libphobos: clean-target-libphobos
-+
-+clean-target-libphobos:
-+ @: $(MAKE); $(unstage)
-+ @[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0; \
-+ r=`${PWD_COMMAND}`; export r; \
-+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+ $(NORMAL_TARGET_EXPORTS) \
-+ echo "Doing clean in $(TARGET_SUBDIR)/libphobos"; \
-+ for flag in $(EXTRA_TARGET_FLAGS); do \
-+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-+ done; \
-+ (cd $(TARGET_SUBDIR)/libphobos && \
-+ $(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-libphobos
-+
-+.PHONY: maybe-distclean-target-libphobos distclean-target-libphobos
-+maybe-distclean-target-libphobos:
-+ at if target-libphobos
-+maybe-distclean-target-libphobos: distclean-target-libphobos
-+
-+distclean-target-libphobos:
-+ @: $(MAKE); $(unstage)
-+ @[ -f $(TARGET_SUBDIR)/libphobos/Makefile ] || exit 0; \
-+ r=`${PWD_COMMAND}`; export r; \
-+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+ $(NORMAL_TARGET_EXPORTS) \
-+ echo "Doing distclean in $(TARGET_SUBDIR)/libphobos"; \
-+ for flag in $(EXTRA_TARGET_FLAGS); do \
-+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-+ done; \
-+ (cd $(TARGET_SUBDIR)/libphobos && \
-+ $(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-libphobos
-+
-+.PHONY: maybe-maintainer-clean-target-libphobos maintainer-clean-target-libphobos
-+maybe-maintainer-clean-target-libphobos:
-+ at if target-libphobos
-+maybe-maintainer-clean-target-libphobos: maintainer-clean-target-libphobos
-+
-+maintainer-clean-target-libphobos:
-+ @: $(MAKE); $(unstage)
-+ @[ -f $(TARGET_SUBDIR)/libphobos/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)/libphobos"; \
-+ for flag in $(EXTRA_TARGET_FLAGS); do \
-+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-+ done; \
-+ (cd $(TARGET_SUBDIR)/libphobos && \
-+ $(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-libphobos
-+
-+
-+
-+
-+
- .PHONY: configure-target-libtermcap maybe-configure-target-libtermcap
- maybe-configure-target-libtermcap:
- @if gcc-bootstrap
-@@ -48237,9 +48721,6 @@ maintainer-clean-target-libffi:
-
-
-
--
--
--
- .PHONY: configure-target-zlib maybe-configure-target-zlib
- maybe-configure-target-zlib:
- @if gcc-bootstrap
-@@ -52240,6 +52721,14 @@ check-gcc-brig:
- (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-brig);
- check-brig: check-gcc-brig check-target-libhsail-rt
-
-+.PHONY: check-gcc-d check-d
-+check-gcc-d:
-+ r=`${PWD_COMMAND}`; export r; \
-+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-+ $(HOST_EXPORTS) \
-+ (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-d);
-+check-d: check-gcc-d check-target-libphobos
-+
-
- # The gcc part of install-no-fixedincludes, which relies on an intimate
- # knowledge of how a number of gcc internal targets (inter)operate. Delegate.
-@@ -55118,6 +55607,7 @@ configure-target-libgfortran: stage_last
- configure-target-libobjc: stage_last
- configure-target-libgo: stage_last
- configure-target-libhsail-rt: stage_last
-+configure-target-libphobos: stage_last
- configure-target-libtermcap: stage_last
- configure-target-winsup: stage_last
- configure-target-libgloss: stage_last
-@@ -55154,6 +55644,7 @@ configure-target-libgfortran: maybe-all-
- configure-target-libobjc: maybe-all-gcc
- configure-target-libgo: maybe-all-gcc
- configure-target-libhsail-rt: maybe-all-gcc
-+configure-target-libphobos: maybe-all-gcc
- configure-target-libtermcap: maybe-all-gcc
- configure-target-winsup: maybe-all-gcc
- configure-target-libgloss: maybe-all-gcc
-@@ -56183,6 +56674,8 @@ configure-target-libgo: maybe-all-target
- all-target-libgo: maybe-all-target-libbacktrace
- all-target-libgo: maybe-all-target-libffi
- all-target-libgo: maybe-all-target-libatomic
-+configure-target-libphobos: maybe-configure-target-zlib
-+all-target-libphobos: maybe-all-target-zlib
- configure-target-libstdc++-v3: maybe-configure-target-libgomp
-
- configure-stage1-target-libstdc++-v3: maybe-configure-stage1-target-libgomp
-@@ -56310,6 +56803,7 @@ configure-target-libgfortran: maybe-all-
- configure-target-libobjc: maybe-all-target-libgcc
- configure-target-libgo: maybe-all-target-libgcc
- configure-target-libhsail-rt: maybe-all-target-libgcc
-+configure-target-libphobos: maybe-all-target-libgcc
- configure-target-libtermcap: maybe-all-target-libgcc
- configure-target-winsup: maybe-all-target-libgcc
- configure-target-libgloss: maybe-all-target-libgcc
-@@ -56354,6 +56848,8 @@ configure-target-libgo: maybe-all-target
-
- configure-target-libhsail-rt: maybe-all-target-newlib maybe-all-target-libgloss
-
-+configure-target-libphobos: maybe-all-target-newlib maybe-all-target-libgloss
-+
- configure-target-libtermcap: maybe-all-target-newlib maybe-all-target-libgloss
-
- configure-target-winsup: maybe-all-target-newlib maybe-all-target-libgloss
Index: b/src/Makefile.tpl
===================================================================
--- a/src/Makefile.tpl
@@ -904,10 +162,10 @@ Index: b/src/configure.ac
===================================================================
--- a/src/configure.ac
+++ b/src/configure.ac
-@@ -172,7 +172,9 @@ target_libraries="target-libgcc \
- target-libada \
+@@ -173,7 +173,9 @@ target_libraries="target-libgcc \
target-libada-sjlj \
${target_libiberty} \
+ target-libgnatvsn \
- target-libgo"
+ target-libgo \
+ target-zlib \
@@ -915,7 +173,7 @@ Index: b/src/configure.ac
# these tools are built using the target libraries, and are intended to
# run only in the target environment
-@@ -1282,6 +1284,7 @@ if test "${build}" != "${host}" ; then
+@@ -1283,6 +1285,7 @@ if test "${build}" != "${host}" ; then
CXX_FOR_BUILD=${CXX_FOR_BUILD-g++}
GFORTRAN_FOR_BUILD=${GFORTRAN_FOR_BUILD-gfortran}
GOC_FOR_BUILD=${GOC_FOR_BUILD-gccgo}
@@ -923,7 +181,7 @@ Index: b/src/configure.ac
DLLTOOL_FOR_BUILD=${DLLTOOL_FOR_BUILD-dlltool}
LD_FOR_BUILD=${LD_FOR_BUILD-ld}
NM_FOR_BUILD=${NM_FOR_BUILD-nm}
-@@ -1295,6 +1298,7 @@ else
+@@ -1296,6 +1299,7 @@ else
CXX_FOR_BUILD="\$(CXX)"
GFORTRAN_FOR_BUILD="\$(GFORTRAN)"
GOC_FOR_BUILD="\$(GOC)"
@@ -931,7 +189,7 @@ Index: b/src/configure.ac
DLLTOOL_FOR_BUILD="\$(DLLTOOL)"
LD_FOR_BUILD="\$(LD)"
NM_FOR_BUILD="\$(NM)"
-@@ -3224,6 +3228,7 @@ AC_SUBST(CXX_FOR_BUILD)
+@@ -3225,6 +3229,7 @@ AC_SUBST(CXX_FOR_BUILD)
AC_SUBST(DLLTOOL_FOR_BUILD)
AC_SUBST(GFORTRAN_FOR_BUILD)
AC_SUBST(GOC_FOR_BUILD)
@@ -939,7 +197,7 @@ Index: b/src/configure.ac
AC_SUBST(LDFLAGS_FOR_BUILD)
AC_SUBST(LD_FOR_BUILD)
AC_SUBST(NM_FOR_BUILD)
-@@ -3333,6 +3338,7 @@ NCN_STRICT_CHECK_TARGET_TOOLS(CXX_FOR_TA
+@@ -3334,6 +3339,7 @@ NCN_STRICT_CHECK_TARGET_TOOLS(CXX_FOR_TA
NCN_STRICT_CHECK_TARGET_TOOLS(GCC_FOR_TARGET, gcc, ${CC_FOR_TARGET})
NCN_STRICT_CHECK_TARGET_TOOLS(GFORTRAN_FOR_TARGET, gfortran)
NCN_STRICT_CHECK_TARGET_TOOLS(GOC_FOR_TARGET, gccgo)
@@ -947,7 +205,7 @@ Index: b/src/configure.ac
ACX_CHECK_INSTALLED_TARGET_TOOL(AR_FOR_TARGET, ar)
ACX_CHECK_INSTALLED_TARGET_TOOL(AS_FOR_TARGET, as)
-@@ -3366,6 +3372,8 @@ GCC_TARGET_TOOL(gfortran, GFORTRAN_FOR_T
+@@ -3367,6 +3373,8 @@ GCC_TARGET_TOOL(gfortran, GFORTRAN_FOR_T
[gcc/gfortran -B$$r/$(HOST_SUBDIR)/gcc/], fortran)
GCC_TARGET_TOOL(gccgo, GOC_FOR_TARGET, GOC,
[gcc/gccgo -B$$r/$(HOST_SUBDIR)/gcc/], go)
diff --git a/debian/rules.d/binary-ada.mk b/debian/rules.d/binary-ada.mk
index 76678a3..46abc53 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
+ $(lib_binaries) += libgnat libgnatvsn
endif
arch_binaries := $(arch_binaries) ada
@@ -24,6 +24,9 @@ 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_gnatd = $(p_gnat)-doc
d_gbase = debian/$(p_gbase)
@@ -114,7 +117,7 @@ $(binary_stamp)-libgnat: $(install_stamp)
ifneq (,$(filter $(build_type), build-native cross-build-native))
mkdir -p $(d_lgnat)/usr/share/lintian/overrides
- cp -p debian/$(p_lgnat).overrides \
+ echo package-name-doesnt-match-sonames > \
$(d_lgnat)/usr/share/lintian/overrides/$(p_lgnat)
endif
@@ -133,6 +136,55 @@ 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/gpr
+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
+ echo missing-dependency-on-libc \
+ > $(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)-ada: $(install_stamp)
dh_testdir
dh_testroot
diff --git a/debian/rules.patch b/debian/rules.patch
index 1c9a27c..581618a 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -133,6 +133,8 @@ debian_patches += ada-arm
#ifeq ($(with_libgnat),yes)
debian_patches += \
ada-link-lib \
+ ada-libgnatvsn \
+ ada-gnattools-cross \
ada-acats
#endif
#ifeq ($(with_gnatsjlj),yes)
--
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