[gcc-7] 64/354: * GCC 7 snapshot build, taken from the trunk 20161201.
Ximin Luo
infinity0 at debian.org
Thu Nov 23 15:50:31 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 8d2e1ef52cce4365218eb86407acff50982c34e5
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date: Thu Dec 1 14:00:20 2016 +0000
* GCC 7 snapshot build, taken from the trunk 20161201.
git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9161 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
debian/changelog | 6 +-
debian/patches/PR55947-revert.diff | 56 +-
debian/patches/ada-arm.diff | 2 +-
debian/patches/ada-bootstrap-compare.diff | 2 +-
debian/patches/ada-driver-check.diff | 2 +-
debian/patches/ada-gcc-name.diff | 4 +-
debian/patches/ada-gnattools-ldflags.diff | 14 +-
debian/patches/ada-kfreebsd.diff | 4 +-
debian/patches/ada-link-lib.diff | 72 +-
debian/patches/ada-link-shlib.diff | 18 +-
debian/patches/ada-mips.diff | 2 +-
debian/patches/ada-sjlj.diff | 154 +--
debian/patches/alpha-no-ev4-directive.diff | 4 +-
debian/patches/arm-multilib-defaults.diff | 8 +-
debian/patches/g++-multiarch-incdir.diff | 6 +-
debian/patches/gcc-auto-build.diff | 2 +-
debian/patches/gcc-base-version.diff | 24 +-
debian/patches/gcc-gfdl-build.diff | 2 +-
debian/patches/gcc-ice-apport.diff | 2 +-
debian/patches/gcc-ice-dump.diff | 4 +-
debian/patches/gcc-multiarch.diff | 4 +-
debian/patches/gcc-target-include-asm.diff | 2 +-
debian/patches/gcc-textdomain.diff | 2 +-
debian/patches/gccgo-version.diff | 4 +-
debian/patches/gdc-7.diff | 16 +-
debian/patches/gdc-libphobos-build.diff | 12 +-
debian/patches/gdc-versym-cpu.diff | 2 +-
debian/patches/gdc-versym-os.diff | 8 +-
debian/patches/libgo-setcontext-config.diff | 2 +-
debian/patches/libgo-testsuite.diff | 8 +-
debian/patches/libobjc-system-gc.diff | 1909 --------------------------
debian/patches/libstdc++-test-installed.diff | 6 +-
debian/patches/pr66368.diff | 2 +-
debian/patches/skip-bootstrap-multilib.diff | 2 +-
debian/patches/sys-auxv-header.diff | 4 +-
debian/rules.patch | 1 -
36 files changed, 233 insertions(+), 2139 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index aa9e197..66ebf80 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,11 @@
-gcc-7 (7-20161125-2) UNRELEASED; urgency=medium
+gcc-7 (7-20161201-1) experimental; urgency=medium
+
+ * GCC 7 snapshot build, taken from the trunk 20161201.
* Install missing vecintrin.h header on s390x.
* Install missing avx512 intrinsics headers on x86*. Closes: #846075.
- -- Matthias Klose <doko at debian.org> Mon, 28 Nov 2016 16:14:15 +0100
+ -- Matthias Klose <doko at debian.org> Thu, 01 Dec 2016 14:38:26 +0100
gcc-7 (7-20161125-1) experimental; urgency=medium
diff --git a/debian/patches/PR55947-revert.diff b/debian/patches/PR55947-revert.diff
index a4861a7..0056e32 100644
--- a/debian/patches/PR55947-revert.diff
+++ b/debian/patches/PR55947-revert.diff
@@ -12,9 +12,11 @@ libstdc++-v3/
compare_exchange_strong, fetch_add, fetch_sub, fetch_and,
fetch_or, fetch_xor): Mark _GLIBCXX_ALWAYS_INLINE.
---- a/src/libstdc++-v3/include/bits/atomic_base.h (revision 198733)
-+++ b/src/libstdc++-v3/include/bits/atomic_base.h (revision 198731)
-@@ -97,11 +97,11 @@
+Index: b/src/libstdc++-v3/include/bits/atomic_base.h
+===================================================================
+--- a/src/libstdc++-v3/include/bits/atomic_base.h
++++ b/src/libstdc++-v3/include/bits/atomic_base.h
+@@ -97,11 +97,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
| (__m & __memory_order_modifier_mask));
}
@@ -28,7 +30,7 @@ libstdc++-v3/
atomic_signal_fence(memory_order __m) noexcept
{ __atomic_signal_fence(__m); }
-@@ -170,19 +170,19 @@
+@@ -170,19 +170,19 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
: __atomic_flag_base{ _S_init(__i) }
{ }
@@ -51,7 +53,7 @@ libstdc++-v3/
clear(memory_order __m = memory_order_seq_cst) noexcept
{
memory_order __b = __m & __memory_order_mask;
-@@ -193,7 +193,7 @@
+@@ -193,7 +193,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
__atomic_clear (&_M_i, __m);
}
@@ -60,7 +62,7 @@ libstdc++-v3/
clear(memory_order __m = memory_order_seq_cst) volatile noexcept
{
memory_order __b = __m & __memory_order_mask;
-@@ -363,7 +363,7 @@
+@@ -363,7 +363,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
reinterpret_cast<void *>(-__alignof(_M_i)));
}
@@ -69,7 +71,7 @@ libstdc++-v3/
store(__int_type __i, memory_order __m = memory_order_seq_cst) noexcept
{
memory_order __b = __m & __memory_order_mask;
-@@ -374,7 +374,7 @@
+@@ -374,7 +374,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
__atomic_store_n(&_M_i, __i, __m);
}
@@ -78,7 +80,7 @@ libstdc++-v3/
store(__int_type __i,
memory_order __m = memory_order_seq_cst) volatile noexcept
{
-@@ -386,7 +386,7 @@
+@@ -386,7 +386,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
__atomic_store_n(&_M_i, __i, __m);
}
@@ -87,7 +89,7 @@ libstdc++-v3/
load(memory_order __m = memory_order_seq_cst) const noexcept
{
memory_order __b = __m & __memory_order_mask;
-@@ -396,7 +396,7 @@
+@@ -396,7 +396,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
return __atomic_load_n(&_M_i, __m);
}
@@ -96,7 +98,7 @@ libstdc++-v3/
load(memory_order __m = memory_order_seq_cst) const volatile noexcept
{
memory_order __b = __m & __memory_order_mask;
-@@ -406,7 +406,7 @@
+@@ -406,7 +406,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
return __atomic_load_n(&_M_i, __m);
}
@@ -105,7 +107,7 @@ libstdc++-v3/
exchange(__int_type __i,
memory_order __m = memory_order_seq_cst) noexcept
{
-@@ -414,14 +414,14 @@
+@@ -414,14 +414,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
@@ -122,7 +124,7 @@ libstdc++-v3/
compare_exchange_weak(__int_type& __i1, __int_type __i2,
memory_order __m1, memory_order __m2) noexcept
{
-@@ -434,7 +434,7 @@
+@@ -434,7 +434,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
return __atomic_compare_exchange_n(&_M_i, &__i1, __i2, 1, __m1, __m2);
}
@@ -131,7 +133,7 @@ libstdc++-v3/
compare_exchange_weak(__int_type& __i1, __int_type __i2,
memory_order __m1,
memory_order __m2) volatile noexcept
-@@ -448,7 +448,7 @@
+@@ -448,7 +448,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
return __atomic_compare_exchange_n(&_M_i, &__i1, __i2, 1, __m1, __m2);
}
@@ -140,7 +142,7 @@ libstdc++-v3/
compare_exchange_weak(__int_type& __i1, __int_type __i2,
memory_order __m = memory_order_seq_cst) noexcept
{
-@@ -456,7 +456,7 @@
+@@ -456,7 +456,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
__cmpexch_failure_order(__m));
}
@@ -149,7 +151,7 @@ libstdc++-v3/
compare_exchange_weak(__int_type& __i1, __int_type __i2,
memory_order __m = memory_order_seq_cst) volatile noexcept
{
-@@ -464,7 +464,7 @@
+@@ -464,7 +464,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
__cmpexch_failure_order(__m));
}
@@ -158,7 +160,7 @@ libstdc++-v3/
compare_exchange_strong(__int_type& __i1, __int_type __i2,
memory_order __m1, memory_order __m2) noexcept
{
-@@ -477,7 +477,7 @@
+@@ -477,7 +477,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
return __atomic_compare_exchange_n(&_M_i, &__i1, __i2, 0, __m1, __m2);
}
@@ -167,7 +169,7 @@ libstdc++-v3/
compare_exchange_strong(__int_type& __i1, __int_type __i2,
memory_order __m1,
memory_order __m2) volatile noexcept
-@@ -492,7 +492,7 @@
+@@ -492,7 +492,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
return __atomic_compare_exchange_n(&_M_i, &__i1, __i2, 0, __m1, __m2);
}
@@ -176,7 +178,7 @@ libstdc++-v3/
compare_exchange_strong(__int_type& __i1, __int_type __i2,
memory_order __m = memory_order_seq_cst) noexcept
{
-@@ -500,7 +500,7 @@
+@@ -500,7 +500,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
__cmpexch_failure_order(__m));
}
@@ -185,7 +187,7 @@ libstdc++-v3/
compare_exchange_strong(__int_type& __i1, __int_type __i2,
memory_order __m = memory_order_seq_cst) volatile noexcept
{
-@@ -508,52 +508,52 @@
+@@ -508,52 +508,52 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
__cmpexch_failure_order(__m));
}
@@ -248,7 +250,7 @@ libstdc++-v3/
fetch_xor(__int_type __i,
memory_order __m = memory_order_seq_cst) volatile noexcept
{ return __atomic_fetch_xor(&_M_i, __i, __m); }
-@@ -678,7 +678,7 @@
+@@ -678,7 +678,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
reinterpret_cast<void *>(-__alignof(_M_p)));
}
@@ -257,7 +259,7 @@ libstdc++-v3/
store(__pointer_type __p,
memory_order __m = memory_order_seq_cst) noexcept
{
-@@ -691,7 +691,7 @@
+@@ -691,7 +691,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
__atomic_store_n(&_M_p, __p, __m);
}
@@ -266,7 +268,7 @@ libstdc++-v3/
store(__pointer_type __p,
memory_order __m = memory_order_seq_cst) volatile noexcept
{
-@@ -703,7 +703,7 @@
+@@ -703,7 +703,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
__atomic_store_n(&_M_p, __p, __m);
}
@@ -275,7 +277,7 @@ libstdc++-v3/
load(memory_order __m = memory_order_seq_cst) const noexcept
{
memory_order __b = __m & __memory_order_mask;
-@@ -713,7 +713,7 @@
+@@ -713,7 +713,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
return __atomic_load_n(&_M_p, __m);
}
@@ -284,7 +286,7 @@ libstdc++-v3/
load(memory_order __m = memory_order_seq_cst) const volatile noexcept
{
memory_order __b = __m & __memory_order_mask;
-@@ -723,7 +723,7 @@
+@@ -723,7 +723,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
return __atomic_load_n(&_M_p, __m);
}
@@ -293,7 +295,7 @@ libstdc++-v3/
exchange(__pointer_type __p,
memory_order __m = memory_order_seq_cst) noexcept
{
-@@ -731,14 +731,14 @@
+@@ -731,14 +731,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
@@ -310,7 +312,7 @@ libstdc++-v3/
compare_exchange_strong(__pointer_type& __p1, __pointer_type __p2,
memory_order __m1,
memory_order __m2) noexcept
-@@ -752,7 +752,7 @@
+@@ -752,7 +752,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
return __atomic_compare_exchange_n(&_M_p, &__p1, __p2, 0, __m1, __m2);
}
@@ -319,7 +321,7 @@ libstdc++-v3/
compare_exchange_strong(__pointer_type& __p1, __pointer_type __p2,
memory_order __m1,
memory_order __m2) volatile noexcept
-@@ -767,22 +767,22 @@
+@@ -767,22 +767,22 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
return __atomic_compare_exchange_n(&_M_p, &__p1, __p2, 0, __m1, __m2);
}
diff --git a/debian/patches/ada-arm.diff b/debian/patches/ada-arm.diff
index 0795eb4..1015392 100644
--- a/debian/patches/ada-arm.diff
+++ b/debian/patches/ada-arm.diff
@@ -4,7 +4,7 @@ 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
-@@ -1938,7 +1938,10 @@ ifeq ($(strip $(filter-out arm% linux-gn
+@@ -1939,7 +1939,10 @@ ifeq ($(strip $(filter-out arm% linux-gn
LIBGNAT_TARGET_PAIRS += \
system.ads<system-linux-armeb.ads
else
diff --git a/debian/patches/ada-bootstrap-compare.diff b/debian/patches/ada-bootstrap-compare.diff
index 5a67dc4..ef77da9 100644
--- a/debian/patches/ada-bootstrap-compare.diff
+++ b/debian/patches/ada-bootstrap-compare.diff
@@ -5,7 +5,7 @@ Index: b/src/configure.ac
===================================================================
--- a/src/configure.ac
+++ b/src/configure.ac
-@@ -3480,6 +3480,9 @@ compare_exclusions="gcc/cc*-checksum\$(o
+@@ -3502,6 +3502,9 @@ compare_exclusions="gcc/cc*-checksum\$(o
case "$target" in
hppa*64*-*-hpux*) ;;
hppa*-*-hpux*) compare_exclusions="gcc/cc*-checksum\$(objext) | */libgcc/lib2funcs* | gcc/ada/*tools/*" ;;
diff --git a/debian/patches/ada-driver-check.diff b/debian/patches/ada-driver-check.diff
index e6279b9..8f77dc1 100644
--- a/debian/patches/ada-driver-check.diff
+++ b/debian/patches/ada-driver-check.diff
@@ -18,7 +18,7 @@ Index: b/src/configure
===================================================================
--- a/src/configure
+++ b/src/configure
-@@ -5355,7 +5355,7 @@ acx_cv_cc_gcc_supports_ada=no
+@@ -5251,7 +5251,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.
diff --git a/debian/patches/ada-gcc-name.diff b/debian/patches/ada-gcc-name.diff
index f44dce7..6f5390d 100644
--- a/debian/patches/ada-gcc-name.diff
+++ b/debian/patches/ada-gcc-name.diff
@@ -13,7 +13,7 @@ Index: b/src/gcc/ada/gnatlink.adb
Read_Mode : constant String := "r" & ASCII.NUL;
-@@ -1412,7 +1412,8 @@ procedure Gnatlink is
+@@ -1414,7 +1414,8 @@ procedure Gnatlink is
end if;
Write_Line (" --GCC=comp Use comp as the compiler");
@@ -27,7 +27,7 @@ Index: b/src/gcc/ada/make.adb
===================================================================
--- a/src/gcc/ada/make.adb
+++ b/src/gcc/ada/make.adb
-@@ -667,9 +667,9 @@ package body Make is
+@@ -670,9 +670,9 @@ package body Make is
-- Compiler, Binder & Linker Data and Subprograms --
----------------------------------------------------
diff --git a/debian/patches/ada-gnattools-ldflags.diff b/debian/patches/ada-gnattools-ldflags.diff
index ea9d6cf..e2b7ebd 100644
--- a/debian/patches/ada-gnattools-ldflags.diff
+++ b/debian/patches/ada-gnattools-ldflags.diff
@@ -4,7 +4,7 @@ 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
-@@ -111,6 +111,7 @@ NO_SIBLING_ADAFLAGS = -fno-optimize-sibl
+@@ -112,6 +112,7 @@ NO_SIBLING_ADAFLAGS = -fno-optimize-sibl
NO_REORDER_ADAFLAGS = -fno-toplevel-reorder
GNATLIBFLAGS = -W -Wall -gnatpg -nostdinc
GNATLIBCFLAGS = -g -O2
@@ -12,7 +12,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
# Pretend that _Unwind_GetIPInfo is available for the target by default. This
# should be autodetected during the configuration of libada and passed down to
# here, but we need something for --disable-libada and hope for the best.
-@@ -2545,23 +2546,23 @@ common-tools: ../stamp-tools
+@@ -2546,23 +2547,23 @@ common-tools: ../stamp-tools
gnatchop gnatcmd gnatkr gnatls gnatprep gnatxref gnatfind gnatname \
gnatclean -bargs $(ADA_INCLUDES) $(GNATBIND_FLAGS)
$(GNATLINK) -v gnatcmd -o ../../gnat$(exeext) \
@@ -45,7 +45,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
../../gnatdll$(exeext): ../stamp-tools
$(GNATMAKE) -c $(ADA_INCLUDES) gnatdll --GCC="$(CC) $(ALL_ADAFLAGS)"
-@@ -2789,14 +2790,14 @@ gnatlib-shared-default:
+@@ -2790,14 +2791,14 @@ gnatlib-shared-default:
-o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
$(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) \
$(SO_OPTS)libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
@@ -62,7 +62,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
cd $(RTSDIR); $(LN_S) libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \
libgnat$(soext)
cd $(RTSDIR); $(LN_S) libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \
-@@ -2817,6 +2818,7 @@ gnatlib-shared-dual:
+@@ -2818,6 +2819,7 @@ gnatlib-shared-dual:
GNATLIBFLAGS="$(GNATLIBFLAGS)" \
GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \
GNATLIBCFLAGS_FOR_C="$(GNATLIBCFLAGS_FOR_C)" \
@@ -70,7 +70,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
MULTISUBDIR="$(MULTISUBDIR)" \
THREAD_KIND="$(THREAD_KIND)" \
gnatlib-shared-default
-@@ -2828,6 +2830,7 @@ gnatlib-shared-dual:
+@@ -2829,6 +2831,7 @@ gnatlib-shared-dual:
GNATLIBFLAGS="$(GNATLIBFLAGS)" \
GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \
GNATLIBCFLAGS_FOR_C="$(GNATLIBCFLAGS_FOR_C)" \
@@ -78,7 +78,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
MULTISUBDIR="$(MULTISUBDIR)" \
THREAD_KIND="$(THREAD_KIND)" \
gnatlib
-@@ -2919,6 +2922,7 @@ gnatlib-shared:
+@@ -2920,6 +2923,7 @@ gnatlib-shared:
GNATLIBFLAGS="$(GNATLIBFLAGS)" \
GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \
GNATLIBCFLAGS_FOR_C="$(GNATLIBCFLAGS_FOR_C)" \
@@ -86,7 +86,7 @@ Index: b/src/gcc/ada/gcc-interface/Makefile.in
MULTISUBDIR="$(MULTISUBDIR)" \
THREAD_KIND="$(THREAD_KIND)" \
PICFLAG_FOR_TARGET="$(PICFLAG_FOR_TARGET)" \
-@@ -2962,6 +2966,7 @@ gnatlib-zcx:
+@@ -2963,6 +2967,7 @@ gnatlib-zcx:
GNATLIBFLAGS="$(GNATLIBFLAGS)" \
GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \
GNATLIBCFLAGS_FOR_C="$(GNATLIBCFLAGS_FOR_C)" \
diff --git a/debian/patches/ada-kfreebsd.diff b/debian/patches/ada-kfreebsd.diff
index 527d257..4e95387 100644
--- a/debian/patches/ada-kfreebsd.diff
+++ b/debian/patches/ada-kfreebsd.diff
@@ -181,7 +181,7 @@ 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
-@@ -1401,7 +1401,7 @@ ifeq ($(strip $(filter-out %86 kfreebsd%
+@@ -1402,7 +1402,7 @@ ifeq ($(strip $(filter-out %86 kfreebsd%
a-intnam.ads<a-intnam-freebsd.ads \
s-inmaop.adb<s-inmaop-posix.adb \
s-intman.adb<s-intman-posix.adb \
@@ -190,7 +190,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 \
-@@ -1461,7 +1461,7 @@ ifeq ($(strip $(filter-out x86_64 kfreeb
+@@ -1462,7 +1462,7 @@ ifeq ($(strip $(filter-out x86_64 kfreeb
a-numaux.ads<a-numaux-x86.ads \
s-inmaop.adb<s-inmaop-posix.adb \
s-intman.adb<s-intman-posix.adb \
diff --git a/debian/patches/ada-link-lib.diff b/debian/patches/ada-link-lib.diff
index 79f8eb1..eb3496a 100644
--- a/debian/patches/ada-link-lib.diff
+++ b/debian/patches/ada-link-lib.diff
@@ -11,10 +11,10 @@
# This patch seems large, but the hunks in Makefile.in are actually
# generated from Makefile.def using autogen.
-Index: gcc-7-7-20161112/src/gcc/ada/gcc-interface/config-lang.in
+Index: b/src/gcc/ada/gcc-interface/config-lang.in
===================================================================
---- gcc-7-7-20161112.orig/src/gcc/ada/gcc-interface/config-lang.in
-+++ gcc-7-7-20161112/src/gcc/ada/gcc-interface/config-lang.in
+--- 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
outputs="ada/gcc-interface/Makefile ada/Makefile"
@@ -24,10 +24,10 @@ Index: gcc-7-7-20161112/src/gcc/ada/gcc-interface/config-lang.in
# Ada is not enabled by default for the time being.
build_by_default=no
-Index: gcc-7-7-20161112/src/gcc/ada/link.c
+Index: b/src/gcc/ada/link.c
===================================================================
---- gcc-7-7-20161112.orig/src/gcc/ada/link.c
-+++ gcc-7-7-20161112/src/gcc/ada/link.c
+--- a/src/gcc/ada/link.c
++++ b/src/gcc/ada/link.c
@@ -106,9 +106,9 @@ const char *__gnat_default_libgcc_subdir
#elif defined (__FreeBSD__) || defined (__DragonFly__) \
|| defined (__NetBSD__) || defined (__OpenBSD__)
@@ -54,10 +54,10 @@ Index: gcc-7-7-20161112/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: gcc-7-7-20161112/src/libada/Makefile.in
+Index: b/src/libada/Makefile.in
===================================================================
---- gcc-7-7-20161112.orig/src/libada/Makefile.in
-+++ gcc-7-7-20161112/src/libada/Makefile.in
+--- a/src/libada/Makefile.in
++++ b/src/libada/Makefile.in
@@ -60,7 +60,7 @@ CFLAGS=-g
PICFLAG = @PICFLAG@
GNATLIBFLAGS= -W -Wall -gnatpg -nostdinc
@@ -76,10 +76,10 @@ Index: gcc-7-7-20161112/src/libada/Makefile.in
# Check uninstalled version.
check:
-Index: gcc-7-7-20161112/src/Makefile.def
+Index: b/src/Makefile.def
===================================================================
---- gcc-7-7-20161112.orig/src/Makefile.def
-+++ gcc-7-7-20161112/src/Makefile.def
+--- a/src/Makefile.def
++++ b/src/Makefile.def
@@ -122,7 +122,13 @@ host_modules= { module= libtermcap; no_c
missing=distclean;
missing=maintainer-clean; };
@@ -95,7 +95,7 @@ Index: gcc-7-7-20161112/src/Makefile.def
host_modules= { module= lto-plugin; bootstrap=true;
extra_configure_flags='--enable-shared @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@';
extra_make_flags='@extra_linker_plugin_flags@'; };
-@@ -365,6 +371,7 @@ dependencies = { module=all-libcpp; on=a
+@@ -363,6 +369,7 @@ dependencies = { module=all-libcpp; on=a
dependencies = { module=all-fixincludes; on=all-libiberty; };
@@ -103,11 +103,11 @@ Index: gcc-7-7-20161112/src/Makefile.def
dependencies = { module=all-gnattools; on=all-target-libada; };
dependencies = { module=all-gnattools; on=all-target-libstdc++-v3; };
-Index: gcc-7-7-20161112/src/Makefile.in
+Index: b/src/Makefile.in
===================================================================
---- gcc-7-7-20161112.orig/src/Makefile.in
-+++ gcc-7-7-20161112/src/Makefile.in
-@@ -33918,12 +33918,6 @@ maybe-check-gnattools:
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -33892,12 +33892,6 @@ maybe-check-gnattools:
maybe-check-gnattools: check-gnattools
check-gnattools:
@@ -120,7 +120,7 @@ Index: gcc-7-7-20161112/src/Makefile.in
@endif gnattools
-@@ -33964,24 +33958,8 @@ maybe-info-gnattools:
+@@ -33938,24 +33932,8 @@ maybe-info-gnattools:
@if gnattools
maybe-info-gnattools: info-gnattools
@@ -147,7 +147,7 @@ Index: gcc-7-7-20161112/src/Makefile.in
@endif gnattools
-@@ -33990,24 +33968,8 @@ maybe-dvi-gnattools:
+@@ -33964,24 +33942,8 @@ maybe-dvi-gnattools:
@if gnattools
maybe-dvi-gnattools: dvi-gnattools
@@ -174,7 +174,7 @@ Index: gcc-7-7-20161112/src/Makefile.in
@endif gnattools
-@@ -34042,24 +34004,8 @@ maybe-html-gnattools:
+@@ -34016,24 +33978,8 @@ maybe-html-gnattools:
@if gnattools
maybe-html-gnattools: html-gnattools
@@ -201,7 +201,7 @@ Index: gcc-7-7-20161112/src/Makefile.in
@endif gnattools
-@@ -34068,24 +34014,8 @@ maybe-TAGS-gnattools:
+@@ -34042,24 +33988,8 @@ maybe-TAGS-gnattools:
@if gnattools
maybe-TAGS-gnattools: TAGS-gnattools
@@ -228,7 +228,7 @@ Index: gcc-7-7-20161112/src/Makefile.in
@endif gnattools
-@@ -34094,25 +34024,8 @@ maybe-install-info-gnattools:
+@@ -34068,25 +33998,8 @@ maybe-install-info-gnattools:
@if gnattools
maybe-install-info-gnattools: install-info-gnattools
@@ -256,7 +256,7 @@ Index: gcc-7-7-20161112/src/Makefile.in
@endif gnattools
-@@ -34175,24 +34088,8 @@ maybe-installcheck-gnattools:
+@@ -34149,24 +34062,8 @@ maybe-installcheck-gnattools:
@if gnattools
maybe-installcheck-gnattools: installcheck-gnattools
@@ -283,8 +283,8 @@ Index: gcc-7-7-20161112/src/Makefile.in
@endif gnattools
-@@ -47871,6 +47768,9 @@ maintainer-clean-target-libffi:
- @endif target-libffi
+@@ -47848,6 +47745,9 @@ maintainer-clean-target-libffi:
+
+
@@ -293,7 +293,7 @@ Index: gcc-7-7-20161112/src/Makefile.in
.PHONY: configure-target-zlib maybe-configure-target-zlib
maybe-configure-target-zlib:
@if gcc-bootstrap
-@@ -55238,6 +55138,7 @@ all-stageprofile-fixincludes: maybe-all-
+@@ -54755,6 +54655,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
@@ -301,10 +301,10 @@ Index: gcc-7-7-20161112/src/Makefile.in
all-gnattools: maybe-all-target-libada
all-gnattools: maybe-all-target-libstdc++-v3
all-lto-plugin: maybe-all-libiberty
-Index: gcc-7-7-20161112/src/configure.ac
+Index: b/src/configure.ac
===================================================================
---- gcc-7-7-20161112.orig/src/configure.ac
-+++ gcc-7-7-20161112/src/configure.ac
+--- a/src/configure.ac
++++ b/src/configure.ac
@@ -142,6 +142,11 @@ host_libs="intl libiberty opcodes bfd re
# If --enable-gold is used, "gold" may replace "ld".
host_tools="texinfo flex bison binutils gas ld fixincludes gcc cgen sid sim gdb gprof etc expect dejagnu m4 utils guile fastjar gnattools libcc1 gotools"
@@ -317,7 +317,7 @@ Index: gcc-7-7-20161112/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 \
+@@ -164,6 +169,7 @@ target_libraries="target-libgcc \
target-libffi \
target-libobjc \
target-libada \
@@ -325,10 +325,10 @@ Index: gcc-7-7-20161112/src/configure.ac
target-libgo"
# these tools are built using the target libraries, and are intended to
-Index: gcc-7-7-20161112/src/gcc/ada/gcc-interface/Make-lang.in
+Index: b/src/gcc/ada/gcc-interface/Make-lang.in
===================================================================
---- gcc-7-7-20161112.orig/src/gcc/ada/gcc-interface/Make-lang.in
-+++ gcc-7-7-20161112/src/gcc/ada/gcc-interface/Make-lang.in
+--- 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
# need to be built by a recent/matching native so we might as well leave the
# checks fully active.
@@ -341,10 +341,10 @@ Index: gcc-7-7-20161112/src/gcc/ada/gcc-interface/Make-lang.in
ALL_ADAFLAGS = \
$(CFLAGS) $(ADA_CFLAGS) $(ADAFLAGS) $(CHECKING_ADAFLAGS) $(WARN_ADAFLAGS)
-Index: gcc-7-7-20161112/src/libada/configure.ac
+Index: b/src/libada/configure.ac
===================================================================
---- gcc-7-7-20161112.orig/src/libada/configure.ac
-+++ gcc-7-7-20161112/src/libada/configure.ac
+--- a/src/libada/configure.ac
++++ b/src/libada/configure.ac
@@ -127,8 +127,7 @@ AC_PROG_AWK
AC_PROG_LN_S
diff --git a/debian/patches/ada-link-shlib.diff b/debian/patches/ada-link-shlib.diff
index a152adb..c8c1ec1 100644
--- a/debian/patches/ada-link-shlib.diff
+++ b/debian/patches/ada-link-shlib.diff
@@ -1,10 +1,10 @@
# DP: In gnatlink, pass the options and libraries after objects to the
# DP: linker to avoid link failures with --as-needed. Closes: #680292.
-Index: gcc-7-7-20161112/src/gcc/ada/mlib-tgt-specific-linux.adb
+Index: b/src/gcc/ada/mlib-tgt-specific-linux.adb
===================================================================
---- gcc-7-7-20161112.orig/src/gcc/ada/mlib-tgt-specific-linux.adb
-+++ gcc-7-7-20161112/src/gcc/ada/mlib-tgt-specific-linux.adb
+--- 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
Version_Arg : String_Access;
Symbolic_Link_Needed : Boolean := False;
@@ -87,11 +87,11 @@ Index: gcc-7-7-20161112/src/gcc/ada/mlib-tgt-specific-linux.adb
Symbolic_Link_Needed :=
Lib_Dir & Directory_Separator & Lib_Version /= Lib_Path;
end if;
-Index: gcc-7-7-20161112/src/gcc/ada/gcc-interface/Makefile.in
+Index: b/src/gcc/ada/gcc-interface/Makefile.in
===================================================================
---- gcc-7-7-20161112.orig/src/gcc/ada/gcc-interface/Makefile.in
-+++ gcc-7-7-20161112/src/gcc/ada/gcc-interface/Makefile.in
-@@ -2644,8 +2644,8 @@ install-gnatlib: ../stamp-gnatlib-$(RTSD
+--- a/src/gcc/ada/gcc-interface/Makefile.in
++++ b/src/gcc/ada/gcc-interface/Makefile.in
+@@ -2645,8 +2645,8 @@ install-gnatlib: ../stamp-gnatlib-$(RTSD
# Also install the .dSYM directories if they exist (these directories
# contain the debug information for the shared libraries on darwin)
for file in gnat gnarl; do \
@@ -102,7 +102,7 @@ Index: gcc-7-7-20161112/src/gcc/ada/gcc-interface/Makefile.in
$(DESTDIR)$(ADA_RTL_OBJ_DIR); \
fi; \
if [ -f $(RTSDIR)/lib$${file}$(soext) ]; then \
-@@ -2697,7 +2697,6 @@ install-gnatlib-sjlj: ../stamp-gnatlib-$
+@@ -2698,7 +2698,6 @@ install-gnatlib-sjlj: ../stamp-gnatlib-$
cd $(DESTDIR)$(ADA_INCLUDE_DIR_SJLJ); $(CHMOD) a-wx *.ads
../stamp-gnatlib1-$(RTSDIR): Makefile ../stamp-gnatlib2-$(RTSDIR)
@@ -110,7 +110,7 @@ Index: gcc-7-7-20161112/src/gcc/ada/gcc-interface/Makefile.in
$(MKDIR) $(RTSDIR)
$(CHMOD) u+w $(RTSDIR)
# Copy target independent sources
-@@ -2806,25 +2805,26 @@ gnatlib-shared-default:
+@@ -2807,25 +2806,26 @@ gnatlib-shared-default:
MULTISUBDIR="$(MULTISUBDIR)" \
THREAD_KIND="$(THREAD_KIND)" \
gnatlib
diff --git a/debian/patches/ada-mips.diff b/debian/patches/ada-mips.diff
index 94764a5..2f999b4 100644
--- a/debian/patches/ada-mips.diff
+++ b/debian/patches/ada-mips.diff
@@ -4,7 +4,7 @@ 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
-@@ -1825,10 +1825,15 @@ ifeq ($(strip $(filter-out mips linux%,$
+@@ -1826,10 +1826,15 @@ ifeq ($(strip $(filter-out mips linux%,$
s-taprop.adb<s-taprop-linux.adb \
s-tasinf.ads<s-tasinf-linux.ads \
s-tasinf.adb<s-tasinf-linux.adb \
diff --git a/debian/patches/ada-sjlj.diff b/debian/patches/ada-sjlj.diff
index a01c362..1b60b90 100644
--- a/debian/patches/ada-sjlj.diff
+++ b/debian/patches/ada-sjlj.diff
@@ -1,7 +1,7 @@
-Index: gcc-7-7-20161112/src/libada-sjlj/Makefile.in
+Index: b/src/libada-sjlj/Makefile.in
===================================================================
--- /dev/null
-+++ gcc-7-7-20161112/src/libada-sjlj/Makefile.in
++++ b/src/libada-sjlj/Makefile.in
@@ -0,0 +1,201 @@
+# Makefile for libada.
+# Copyright (C) 2003-2015 Free Software Foundation, Inc.
@@ -204,10 +204,10 @@ Index: gcc-7-7-20161112/src/libada-sjlj/Makefile.in
+# Don't export variables to the environment, in order to not confuse
+# configure.
+.NOEXPORT:
-Index: gcc-7-7-20161112/src/libada-sjlj/configure.ac
+Index: b/src/libada-sjlj/configure.ac
===================================================================
--- /dev/null
-+++ gcc-7-7-20161112/src/libada-sjlj/configure.ac
++++ b/src/libada-sjlj/configure.ac
@@ -0,0 +1,149 @@
+# Configure script for libada.
+# Copyright (C) 2003-2016 Free Software Foundation, Inc.
@@ -358,19 +358,19 @@ Index: gcc-7-7-20161112/src/libada-sjlj/configure.ac
+AC_CONFIG_FILES([Makefile])
+
+AC_OUTPUT
-Index: gcc-7-7-20161112/src/Makefile.def
+Index: b/src/Makefile.def
===================================================================
---- gcc-7-7-20161112.orig/src/Makefile.def
-+++ gcc-7-7-20161112/src/Makefile.def
-@@ -175,6 +175,7 @@ target_modules = { module= zlib; };
- target_modules = { module= boehm-gc; };
+--- a/src/Makefile.def
++++ b/src/Makefile.def
+@@ -174,6 +174,7 @@ target_modules = { module= libffi; no_in
+ target_modules = { module= zlib; };
target_modules = { module= rda; };
target_modules = { module= libada; };
+target_modules = { module= libada-sjlj; };
target_modules = { module= libgomp; bootstrap= true; lib_path=.libs; };
target_modules = { module= libitm; lib_path=.libs; };
target_modules = { module= libatomic; lib_path=.libs; };
-@@ -372,6 +373,7 @@ dependencies = { module=all-libcpp; on=a
+@@ -370,6 +371,7 @@ dependencies = { module=all-libcpp; on=a
dependencies = { module=all-fixincludes; on=all-libiberty; };
dependencies = { module=all-target-libada; on=all-gcc; };
@@ -378,11 +378,11 @@ Index: gcc-7-7-20161112/src/Makefile.def
dependencies = { module=all-gnattools; on=all-target-libada; };
dependencies = { module=all-gnattools; on=all-target-libstdc++-v3; };
-Index: gcc-7-7-20161112/src/configure.ac
+Index: b/src/configure.ac
===================================================================
---- gcc-7-7-20161112.orig/src/configure.ac
-+++ gcc-7-7-20161112/src/configure.ac
-@@ -170,6 +170,7 @@ target_libraries="target-libgcc \
+--- a/src/configure.ac
++++ b/src/configure.ac
+@@ -169,6 +169,7 @@ target_libraries="target-libgcc \
target-libffi \
target-libobjc \
target-libada \
@@ -390,7 +390,7 @@ Index: gcc-7-7-20161112/src/configure.ac
${target_libiberty} \
target-libgo"
-@@ -455,7 +456,7 @@ AC_ARG_ENABLE(libada,
+@@ -454,7 +455,7 @@ AC_ARG_ENABLE(libada,
ENABLE_LIBADA=$enableval,
ENABLE_LIBADA=yes)
if test "${ENABLE_LIBADA}" != "yes" ; then
@@ -399,11 +399,11 @@ Index: gcc-7-7-20161112/src/configure.ac
fi
AC_ARG_ENABLE(libssp,
-Index: gcc-7-7-20161112/src/gcc/ada/gcc-interface/Makefile.in
+Index: b/src/gcc/ada/gcc-interface/Makefile.in
===================================================================
---- gcc-7-7-20161112.orig/src/gcc/ada/gcc-interface/Makefile.in
-+++ gcc-7-7-20161112/src/gcc/ada/gcc-interface/Makefile.in
-@@ -190,7 +190,7 @@ TOOLSCASE =
+--- a/src/gcc/ada/gcc-interface/Makefile.in
++++ b/src/gcc/ada/gcc-interface/Makefile.in
+@@ -191,7 +191,7 @@ TOOLSCASE =
# Multilib handling
MULTISUBDIR =
@@ -412,7 +412,7 @@ Index: gcc-7-7-20161112/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
-@@ -2676,6 +2676,26 @@ install-gnatlib: ../stamp-gnatlib-$(RTSD
+@@ -2677,6 +2677,26 @@ install-gnatlib: ../stamp-gnatlib-$(RTSD
touch ../stamp-gnatlib2-$(RTSDIR)
$(RM) ../stamp-gnatlib-$(RTSDIR)
@@ -439,7 +439,7 @@ Index: gcc-7-7-20161112/src/gcc/ada/gcc-interface/Makefile.in
../stamp-gnatlib1-$(RTSDIR): Makefile ../stamp-gnatlib2-$(RTSDIR)
$(RMDIR) $(RTSDIR)
$(MKDIR) $(RTSDIR)
-@@ -2938,7 +2958,7 @@ gnatlib-shared:
+@@ -2939,7 +2959,7 @@ gnatlib-shared:
# commenting the pragma instead of deleting the line, as the latter might
# result in getting multiple blank lines, hence possible style check errors.
gnatlib-sjlj:
@@ -448,7 +448,7 @@ Index: gcc-7-7-20161112/src/gcc/ada/gcc-interface/Makefile.in
THREAD_KIND="$(THREAD_KIND)" ../stamp-gnatlib1-$(RTSDIR)
sed \
-e 's/Frontend_Exceptions.*/Frontend_Exceptions : constant Boolean := True;/' \
-@@ -2947,6 +2967,7 @@ gnatlib-sjlj:
+@@ -2948,6 +2968,7 @@ gnatlib-sjlj:
$(RTSDIR)/system.ads > $(RTSDIR)/s.ads
$(MV) $(RTSDIR)/s.ads $(RTSDIR)/system.ads
$(MAKE) $(FLAGS_TO_PASS) \
@@ -456,7 +456,7 @@ Index: gcc-7-7-20161112/src/gcc/ada/gcc-interface/Makefile.in
EH_MECHANISM="" \
GNATLIBFLAGS="$(GNATLIBFLAGS)" \
GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \
-@@ -2999,6 +3020,8 @@ b_gnatm.o : b_gnatm.adb
+@@ -3000,6 +3021,8 @@ b_gnatm.o : b_gnatm.adb
ADA_INCLUDE_DIR = $(libsubdir)/adainclude
ADA_RTL_OBJ_DIR = $(libsubdir)/adalib
@@ -465,10 +465,10 @@ Index: gcc-7-7-20161112/src/gcc/ada/gcc-interface/Makefile.in
# Special flags
-Index: gcc-7-7-20161112/src/gcc/ada/gcc-interface/config-lang.in
+Index: b/src/gcc/ada/gcc-interface/config-lang.in
===================================================================
---- gcc-7-7-20161112.orig/src/gcc/ada/gcc-interface/config-lang.in
-+++ gcc-7-7-20161112/src/gcc/ada/gcc-interface/config-lang.in
+--- a/src/gcc/ada/gcc-interface/config-lang.in
++++ b/src/gcc/ada/gcc-interface/config-lang.in
@@ -34,8 +34,8 @@ gtfiles="\$(srcdir)/ada/gcc-interface/ad
outputs="ada/gcc-interface/Makefile ada/Makefile"
@@ -480,10 +480,10 @@ Index: gcc-7-7-20161112/src/gcc/ada/gcc-interface/config-lang.in
# Ada is not enabled by default for the time being.
build_by_default=no
-Index: gcc-7-7-20161112/src/gcc/ada/gcc-interface/Make-lang.in
+Index: b/src/gcc/ada/gcc-interface/Make-lang.in
===================================================================
---- gcc-7-7-20161112.orig/src/gcc/ada/gcc-interface/Make-lang.in
-+++ gcc-7-7-20161112/src/gcc/ada/gcc-interface/Make-lang.in
+--- a/src/gcc/ada/gcc-interface/Make-lang.in
++++ b/src/gcc/ada/gcc-interface/Make-lang.in
@@ -784,6 +784,7 @@ ada.install-common:
install-gnatlib:
@@ -492,155 +492,155 @@ Index: gcc-7-7-20161112/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: gcc-7-7-20161112/src/Makefile.in
+Index: b/src/Makefile.in
===================================================================
---- gcc-7-7-20161112.orig/src/Makefile.in
-+++ gcc-7-7-20161112/src/Makefile.in
-@@ -1009,6 +1009,7 @@ configure-target: \
- maybe-configure-target-boehm-gc \
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -1000,6 +1000,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
-@@ -1175,6 +1176,7 @@ all-target: maybe-all-target-zlib
- all-target: maybe-all-target-boehm-gc
+@@ -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
-@@ -1268,6 +1270,7 @@ info-target: maybe-info-target-zlib
- info-target: maybe-info-target-boehm-gc
+@@ -1257,6 +1259,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
-@@ -1354,6 +1357,7 @@ dvi-target: maybe-dvi-target-zlib
- dvi-target: maybe-dvi-target-boehm-gc
+@@ -1342,6 +1345,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
-@@ -1440,6 +1444,7 @@ pdf-target: maybe-pdf-target-zlib
- pdf-target: maybe-pdf-target-boehm-gc
+@@ -1427,6 +1431,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
-@@ -1526,6 +1531,7 @@ html-target: maybe-html-target-zlib
- html-target: maybe-html-target-boehm-gc
+@@ -1512,6 +1517,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
-@@ -1612,6 +1618,7 @@ TAGS-target: maybe-TAGS-target-zlib
- TAGS-target: maybe-TAGS-target-boehm-gc
+@@ -1597,6 +1603,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
-@@ -1698,6 +1705,7 @@ install-info-target: maybe-install-info-
- install-info-target: maybe-install-info-target-boehm-gc
+@@ -1682,6 +1689,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
-@@ -1784,6 +1792,7 @@ install-pdf-target: maybe-install-pdf-ta
- install-pdf-target: maybe-install-pdf-target-boehm-gc
+@@ -1767,6 +1775,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
-@@ -1870,6 +1879,7 @@ install-html-target: maybe-install-html-
- install-html-target: maybe-install-html-target-boehm-gc
+@@ -1852,6 +1861,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
-@@ -1956,6 +1966,7 @@ installcheck-target: maybe-installcheck-
- installcheck-target: maybe-installcheck-target-boehm-gc
+@@ -1937,6 +1947,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
-@@ -2042,6 +2053,7 @@ mostlyclean-target: maybe-mostlyclean-ta
- mostlyclean-target: maybe-mostlyclean-target-boehm-gc
+@@ -2022,6 +2033,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
-@@ -2128,6 +2140,7 @@ clean-target: maybe-clean-target-zlib
- clean-target: maybe-clean-target-boehm-gc
+@@ -2107,6 +2119,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
-@@ -2214,6 +2227,7 @@ distclean-target: maybe-distclean-target
- distclean-target: maybe-distclean-target-boehm-gc
+@@ -2192,6 +2205,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
-@@ -2300,6 +2314,7 @@ maintainer-clean-target: maybe-maintaine
- maintainer-clean-target: maybe-maintainer-clean-target-boehm-gc
+@@ -2277,6 +2291,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
-@@ -2442,6 +2457,7 @@ check-target: \
- maybe-check-target-boehm-gc \
+@@ -2418,6 +2433,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
-@@ -2624,6 +2640,7 @@ install-target: \
- maybe-install-target-boehm-gc \
+@@ -2599,6 +2615,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
-@@ -2730,6 +2747,7 @@ install-strip-target: \
- maybe-install-strip-target-boehm-gc \
+@@ -2704,6 +2721,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
-@@ -49603,6 +49621,464 @@ maintainer-clean-target-libada:
+@@ -49122,6 +49140,464 @@ maintainer-clean-target-libada:
@@ -1105,23 +1105,23 @@ Index: gcc-7-7-20161112/src/Makefile.in
.PHONY: configure-target-libgomp maybe-configure-target-libgomp
maybe-configure-target-libgomp:
@if gcc-bootstrap
-@@ -54648,6 +55124,7 @@ configure-target-zlib: stage_last
- configure-target-boehm-gc: stage_last
+@@ -54166,6 +54642,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
-@@ -54683,6 +55160,7 @@ configure-target-zlib: maybe-all-gcc
- configure-target-boehm-gc: maybe-all-gcc
+@@ -54200,6 +54677,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
-@@ -55139,6 +55617,7 @@ all-stagefeedback-fixincludes: maybe-all
+@@ -54656,6 +55134,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
@@ -1129,15 +1129,15 @@ Index: gcc-7-7-20161112/src/Makefile.in
all-gnattools: maybe-all-target-libada
all-gnattools: maybe-all-target-libstdc++-v3
all-lto-plugin: maybe-all-libiberty
-@@ -55840,6 +56319,7 @@ configure-target-zlib: maybe-all-target-
- configure-target-boehm-gc: maybe-all-target-libgcc
+@@ -55353,6 +55832,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
-@@ -55890,6 +56370,8 @@ configure-target-rda: maybe-all-target-n
+@@ -55401,6 +55881,8 @@ configure-target-rda: maybe-all-target-n
configure-target-libada: maybe-all-target-newlib maybe-all-target-libgloss
diff --git a/debian/patches/alpha-no-ev4-directive.diff b/debian/patches/alpha-no-ev4-directive.diff
index 648b8c7..d67498a 100644
--- a/debian/patches/alpha-no-ev4-directive.diff
+++ b/debian/patches/alpha-no-ev4-directive.diff
@@ -8,7 +8,7 @@ Index: b/src/gcc/config/alpha/alpha.c
===================================================================
--- a/src/gcc/config/alpha/alpha.c
+++ b/src/gcc/config/alpha/alpha.c
-@@ -9473,7 +9473,7 @@ alpha_file_start (void)
+@@ -9471,7 +9471,7 @@ alpha_file_start (void)
fputs ("\t.set nomacro\n", asm_out_file);
if (TARGET_SUPPORT_ARCH | TARGET_BWX | TARGET_MAX | TARGET_FIX | TARGET_CIX)
{
@@ -17,7 +17,7 @@ Index: b/src/gcc/config/alpha/alpha.c
if (alpha_cpu == PROCESSOR_EV6 || TARGET_FIX || TARGET_CIX)
arch = "ev6";
-@@ -9483,10 +9483,9 @@ alpha_file_start (void)
+@@ -9481,10 +9481,9 @@ alpha_file_start (void)
arch = "ev56";
else if (alpha_cpu == PROCESSOR_EV5)
arch = "ev5";
diff --git a/debian/patches/arm-multilib-defaults.diff b/debian/patches/arm-multilib-defaults.diff
index 117e3e3..52e6fe3 100644
--- a/debian/patches/arm-multilib-defaults.diff
+++ b/debian/patches/arm-multilib-defaults.diff
@@ -4,7 +4,7 @@ Index: b/src/gcc/config.gcc
===================================================================
--- a/src/gcc/config.gcc
+++ b/src/gcc/config.gcc
-@@ -3673,10 +3673,18 @@ case "${target}" in
+@@ -3677,10 +3677,18 @@ case "${target}" in
fi
case "$with_float" in
@@ -25,7 +25,7 @@ Index: b/src/gcc/config.gcc
*)
echo "Unknown floating point type used in --with-float=$with_float" 1>&2
exit 1
-@@ -3710,6 +3718,9 @@ case "${target}" in
+@@ -3714,6 +3722,9 @@ case "${target}" in
"" \
| arm | thumb )
#OK
@@ -39,7 +39,7 @@ Index: b/src/gcc/config/arm/linux-eabi.h
===================================================================
--- a/src/gcc/config/arm/linux-eabi.h
+++ b/src/gcc/config/arm/linux-eabi.h
-@@ -34,7 +34,21 @@
+@@ -43,7 +43,21 @@
target hardware. If you override this to use the hard-float ABI then
change the setting of GLIBC_DYNAMIC_LINKER_DEFAULT as well. */
#undef TARGET_DEFAULT_FLOAT_ABI
@@ -61,7 +61,7 @@ Index: b/src/gcc/config/arm/linux-eabi.h
/* We default to the "aapcs-linux" ABI so that enums are int-sized by
default. */
-@@ -88,6 +102,28 @@
+@@ -97,6 +111,28 @@
#define MUSL_DYNAMIC_LINKER \
"/lib/ld-musl-arm" MUSL_DYNAMIC_LINKER_E "%{mfloat-abi=hard:hf}.so.1"
diff --git a/debian/patches/g++-multiarch-incdir.diff b/debian/patches/g++-multiarch-incdir.diff
index 9ca7dc6..25437ad 100644
--- a/debian/patches/g++-multiarch-incdir.diff
+++ b/debian/patches/g++-multiarch-incdir.diff
@@ -31,7 +31,7 @@ Index: b/src/gcc/Makefile.in
===================================================================
--- a/src/gcc/Makefile.in
+++ b/src/gcc/Makefile.in
-@@ -1151,6 +1151,7 @@ FLAGS_TO_PASS = \
+@@ -1152,6 +1152,7 @@ FLAGS_TO_PASS = \
"prefix=$(prefix)" \
"local_prefix=$(local_prefix)" \
"gxx_include_dir=$(gcc_gxx_include_dir)" \
@@ -39,7 +39,7 @@ Index: b/src/gcc/Makefile.in
"build_tooldir=$(build_tooldir)" \
"gcc_tooldir=$(gcc_tooldir)" \
"bindir=$(bindir)" \
-@@ -1673,6 +1674,14 @@ ifneq ($(xmake_file),)
+@@ -1674,6 +1675,14 @@ ifneq ($(xmake_file),)
include $(xmake_file)
endif
@@ -54,7 +54,7 @@ Index: b/src/gcc/Makefile.in
# all-tree.def includes all the tree.def files.
all-tree.def: s-alltree; @true
s-alltree: Makefile
-@@ -2751,7 +2760,7 @@ PREPROCESSOR_DEFINES = \
+@@ -2752,7 +2761,7 @@ PREPROCESSOR_DEFINES = \
-DFIXED_INCLUDE_DIR=\"$(libsubdir)/include-fixed\" \
-DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \
-DGPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT=$(gcc_gxx_include_dir_add_sysroot) \
diff --git a/debian/patches/gcc-auto-build.diff b/debian/patches/gcc-auto-build.diff
index 7df1083..c13e2d1 100644
--- a/debian/patches/gcc-auto-build.diff
+++ b/debian/patches/gcc-auto-build.diff
@@ -4,7 +4,7 @@ Index: b/src/gcc/configure.ac
===================================================================
--- a/src/gcc/configure.ac
+++ b/src/gcc/configure.ac
-@@ -1698,7 +1698,7 @@ else
+@@ -1705,7 +1705,7 @@ else
# Clearing GMPINC is necessary to prevent host headers being
# used by the build compiler. Defining GENERATOR_FILE stops
# system.h from including gmp.h.
diff --git a/debian/patches/gcc-base-version.diff b/debian/patches/gcc-base-version.diff
index 4e1e954..d6327b5 100644
--- a/debian/patches/gcc-base-version.diff
+++ b/debian/patches/gcc-base-version.diff
@@ -40,7 +40,7 @@ Index: b/src/gcc/Makefile.in
DEVPHASE_s := "\"$(if $(DEVPHASE_c), ($(DEVPHASE_c)))\""
DATESTAMP_s := \
"\"$(if $(DEVPHASE_c)$(filter-out 0,$(PATCHLEVEL_c)), $(DATESTAMP_c))\""
-@@ -2089,8 +2092,8 @@ default-c.o: config/default-c.c
+@@ -2090,8 +2093,8 @@ default-c.o: config/default-c.c
# Files used by all variants of C and some other languages.
@@ -51,7 +51,7 @@ Index: b/src/gcc/Makefile.in
# Language-independent files.
-@@ -2098,7 +2101,8 @@ DRIVER_DEFINES = \
+@@ -2099,7 +2102,8 @@ DRIVER_DEFINES = \
-DSTANDARD_STARTFILE_PREFIX=\"$(unlibsubdir)/\" \
-DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc/\" \
-DSTANDARD_LIBEXEC_PREFIX=\"$(libexecdir)/gcc/\" \
@@ -61,7 +61,7 @@ Index: b/src/gcc/Makefile.in
-DDEFAULT_REAL_TARGET_MACHINE=\"$(real_target_noncanonical)\" \
-DDEFAULT_TARGET_MACHINE=\"$(target_noncanonical)\" \
-DSTANDARD_BINDIR_PREFIX=\"$(bindir)/\" \
-@@ -2148,20 +2152,20 @@ s-options-h: optionlist $(srcdir)/opt-fu
+@@ -2149,20 +2153,20 @@ s-options-h: optionlist $(srcdir)/opt-fu
dumpvers: dumpvers.c
@@ -88,7 +88,7 @@ Index: b/src/gcc/Makefile.in
echo "#define BUILDING_GCC_VERSION (BUILDING_GCC_MAJOR * 1000 + BUILDING_GCC_MINOR)" >> bversion.h
$(STAMP) s-bversion
-@@ -2532,9 +2536,9 @@ build/%.o : # dependencies provided by
+@@ -2533,9 +2537,9 @@ build/%.o : # dependencies provided by
## build/version.o is compiled by the $(COMPILER_FOR_BUILD) but needs
## several C macro definitions, just like version.o
build/version.o: version.c version.h \
@@ -100,7 +100,7 @@ Index: b/src/gcc/Makefile.in
-DREVISION=$(REVISION_s) \
-DDEVPHASE=$(DEVPHASE_s) -DPKGVERSION=$(PKGVERSION_s) \
-DBUGURL=$(BUGURL_s) -o $@ $<
-@@ -2757,8 +2761,8 @@ PREPROCESSOR_DEFINES = \
+@@ -2758,8 +2762,8 @@ PREPROCESSOR_DEFINES = \
-DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc/\" \
@TARGET_SYSTEM_ROOT_DEFINE@
@@ -111,7 +111,7 @@ Index: b/src/gcc/Makefile.in
CFLAGS-cppdefault.o += $(PREPROCESSOR_DEFINES)
-@@ -2774,8 +2778,8 @@ build/gcov-iov$(build_exeext): build/gco
+@@ -2775,8 +2779,8 @@ build/gcov-iov$(build_exeext): build/gco
build/gcov-iov.o -o $@
gcov-iov.h: s-iov; @true
@@ -122,7 +122,7 @@ Index: b/src/gcc/Makefile.in
> tmp-gcov-iov.h
$(SHELL) $(srcdir)/../move-if-change tmp-gcov-iov.h gcov-iov.h
$(STAMP) s-iov
-@@ -3054,8 +3058,8 @@ TEXI_GCCINSTALL_FILES = install.texi ins
+@@ -3055,8 +3059,8 @@ TEXI_GCCINSTALL_FILES = install.texi ins
TEXI_CPPINT_FILES = cppinternals.texi gcc-common.texi gcc-vers.texi
# gcc-vers.texi is generated from the version files.
@@ -147,7 +147,7 @@ Index: b/src/gcc/gcc.c
/* The target machine. */
-@@ -4537,7 +4538,7 @@ process_command (unsigned int decoded_op
+@@ -4533,7 +4534,7 @@ process_command (unsigned int decoded_op
running, or, if that is not available, the configured prefix. */
tooldir_prefix
= concat (gcc_exec_prefix ? gcc_exec_prefix : standard_exec_prefix,
@@ -156,7 +156,7 @@ Index: b/src/gcc/gcc.c
accel_dir_suffix, dir_separator_str, tooldir_prefix2, NULL);
free (tooldir_prefix2);
-@@ -7412,7 +7413,7 @@ driver::set_up_specs () const
+@@ -7408,7 +7409,7 @@ driver::set_up_specs () const
/* Read specs from a file if there is one. */
@@ -165,7 +165,7 @@ Index: b/src/gcc/gcc.c
accel_dir_suffix, dir_separator_str, NULL);
just_machine_suffix = concat (spec_machine, dir_separator_str, NULL);
-@@ -7617,7 +7618,7 @@ driver::set_up_specs () const
+@@ -7613,7 +7614,7 @@ driver::set_up_specs () const
/* If we have a GCC_EXEC_PREFIX envvar, modify it for cpp's sake. */
if (gcc_exec_prefix)
gcc_exec_prefix = concat (gcc_exec_prefix, spec_host_machine,
@@ -187,7 +187,7 @@ Index: b/src/gcc/configure.ac
if test x$host != x$target; then
libstdcxx_incdir="$target_alias/$libstdcxx_incdir"
fi
-@@ -1758,6 +1758,7 @@ changequote([,])dnl
+@@ -1765,6 +1765,7 @@ changequote([,])dnl
changequote(,)dnl
gcc_BASEVER=`cat $srcdir/BASE-VER`
@@ -195,7 +195,7 @@ Index: b/src/gcc/configure.ac
gcc_DEVPHASE=`cat $srcdir/DEV-PHASE`
gcc_DATESTAMP=`cat $srcdir/DATESTAMP`
if test -f $srcdir/REVISION ; then
-@@ -1768,12 +1769,12 @@ fi
+@@ -1775,12 +1776,12 @@ fi
cat > plugin-version.h <<EOF
#include "configargs.h"
diff --git a/debian/patches/gcc-gfdl-build.diff b/debian/patches/gcc-gfdl-build.diff
index 279105b..5ab9189 100644
--- a/debian/patches/gcc-gfdl-build.diff
+++ b/debian/patches/gcc-gfdl-build.diff
@@ -4,7 +4,7 @@ Index: b/src/gcc/Makefile.in
===================================================================
--- a/src/gcc/Makefile.in
+++ b/src/gcc/Makefile.in
-@@ -2387,30 +2387,8 @@ s-tm-texi: $(srcdir)/doc/../doc/tm.texi
+@@ -2388,30 +2388,8 @@ s-tm-texi: $(srcdir)/doc/../doc/tm.texi
# \r is not portable to Solaris tr, therefore we have a special
# case for ASCII. We use \r for other encodings like EBCDIC.
s-tm-texi: build/genhooks$(build_exeext) $(srcdir)/doc/tm.texi.in
diff --git a/debian/patches/gcc-ice-apport.diff b/debian/patches/gcc-ice-apport.diff
index 53ae07b..9b729af 100644
--- a/debian/patches/gcc-ice-apport.diff
+++ b/debian/patches/gcc-ice-apport.diff
@@ -5,7 +5,7 @@ Index: b/src/gcc/gcc.c
===================================================================
--- a/src/gcc/gcc.c
+++ b/src/gcc/gcc.c
-@@ -6880,6 +6880,16 @@ do_report_bug (const char **new_argv, co
+@@ -6877,6 +6877,16 @@ do_report_bug (const char **new_argv, co
fflush(stderr);
free(cmd);
}
diff --git a/debian/patches/gcc-ice-dump.diff b/debian/patches/gcc-ice-dump.diff
index 399230e..1edd391 100644
--- a/debian/patches/gcc-ice-dump.diff
+++ b/debian/patches/gcc-ice-dump.diff
@@ -5,7 +5,7 @@ Index: b/src/gcc/gcc.c
===================================================================
--- a/src/gcc/gcc.c
+++ b/src/gcc/gcc.c
-@@ -3155,7 +3155,8 @@ execute (void)
+@@ -3152,7 +3152,8 @@ execute (void)
/* For ICEs in cc1, cc1obj, cc1plus see if it is
reproducible or not. */
const char *p;
@@ -15,7 +15,7 @@ Index: b/src/gcc/gcc.c
&& WEXITSTATUS (status) == ICE_EXIT_CODE
&& i == 0
&& (p = strrchr (commands[0].argv[0], DIR_SEPARATOR))
-@@ -6862,8 +6863,23 @@ do_report_bug (const char **new_argv, co
+@@ -6859,8 +6860,23 @@ do_report_bug (const char **new_argv, co
if (status == ATTEMPT_STATUS_SUCCESS)
{
diff --git a/debian/patches/gcc-multiarch.diff b/debian/patches/gcc-multiarch.diff
index 20b852b..a0cf630 100644
--- a/debian/patches/gcc-multiarch.diff
+++ b/debian/patches/gcc-multiarch.diff
@@ -145,7 +145,7 @@ Index: b/src/gcc/config.gcc
mips64*-*-linux* | mipsisa64*-*-linux*)
default_mips_abi=n32
enable_mips_multilibs="yes"
-@@ -4351,7 +4360,7 @@ case ${target} in
+@@ -4366,7 +4375,7 @@ case ${target} in
i[34567]86-*-darwin* | x86_64-*-darwin*)
;;
i[34567]86-*-linux* | x86_64-*-linux*)
@@ -173,7 +173,7 @@ Index: b/src/gcc/config/mips/mips.h
===================================================================
--- a/src/gcc/config/mips/mips.h
+++ b/src/gcc/config/mips/mips.h
-@@ -3407,16 +3407,6 @@ struct GTY(()) machine_function {
+@@ -3481,16 +3481,6 @@ struct GTY(()) machine_function {
#define PMODE_INSN(NAME, ARGS) \
(Pmode == SImode ? NAME ## _si ARGS : NAME ## _di ARGS)
diff --git a/debian/patches/gcc-target-include-asm.diff b/debian/patches/gcc-target-include-asm.diff
index fd304b9..e0f96d9 100644
--- a/debian/patches/gcc-target-include-asm.diff
+++ b/debian/patches/gcc-target-include-asm.diff
@@ -4,7 +4,7 @@ Index: b/src/configure.ac
===================================================================
--- a/src/configure.ac
+++ b/src/configure.ac
-@@ -3124,7 +3124,7 @@ fi
+@@ -3133,7 +3133,7 @@ fi
# being built; programs in there won't even run.
if test "${build}" = "${host}" && test -d ${srcdir}/gcc; then
# Search for pre-installed headers if nothing else fits.
diff --git a/debian/patches/gcc-textdomain.diff b/debian/patches/gcc-textdomain.diff
index 7bb33d6..cc201dc 100644
--- a/debian/patches/gcc-textdomain.diff
+++ b/debian/patches/gcc-textdomain.diff
@@ -19,7 +19,7 @@ Index: b/src/gcc/Makefile.in
===================================================================
--- a/src/gcc/Makefile.in
+++ b/src/gcc/Makefile.in
-@@ -4080,8 +4080,8 @@ install-po:
+@@ -4081,8 +4081,8 @@ install-po:
dir=$(localedir)/$$lang/LC_MESSAGES; \
echo $(mkinstalldirs) $(DESTDIR)$$dir; \
$(mkinstalldirs) $(DESTDIR)$$dir || exit 1; \
diff --git a/debian/patches/gccgo-version.diff b/debian/patches/gccgo-version.diff
index 93c9d0d..9e15acb 100644
--- a/debian/patches/gccgo-version.diff
+++ b/debian/patches/gccgo-version.diff
@@ -4,7 +4,7 @@ Index: b/src/gcc/go/Make-lang.in
===================================================================
--- a/src/gcc/go/Make-lang.in
+++ b/src/gcc/go/Make-lang.in
-@@ -221,7 +221,9 @@ go.stageprofile: stageprofile-start
+@@ -222,7 +222,9 @@ go.stageprofile: stageprofile-start
go.stagefeedback: stagefeedback-start
-mv go/*$(objext) stagefeedback/go
@@ -19,7 +19,7 @@ Index: b/src/libgo/Makefile.in
===================================================================
--- a/src/libgo/Makefile.in
+++ b/src/libgo/Makefile.in
-@@ -445,14 +445,15 @@ SUFFIXES = .c .go .gox .o .obj .lo .a
+@@ -441,14 +441,15 @@ SUFFIXES = .c .go .gox .o .obj .lo .a
@LIBGO_IS_RTEMS_TRUE at subdirs = testsuite
SUBDIRS = ${subdirs}
gcc_version := $(shell $(GOC) -dumpversion)
diff --git a/debian/patches/gdc-7.diff b/debian/patches/gdc-7.diff
index d4c2be7..4bfb9e0 100644
--- a/debian/patches/gdc-7.diff
+++ b/debian/patches/gdc-7.diff
@@ -49,7 +49,7 @@ Index: b/src/gcc/config/rs6000/rs6000.c
===================================================================
--- a/src/gcc/config/rs6000/rs6000.c
+++ b/src/gcc/config/rs6000/rs6000.c
-@@ -30292,7 +30292,8 @@ rs6000_output_function_epilogue (FILE *f
+@@ -30376,7 +30376,8 @@ rs6000_output_function_epilogue (FILE *f
if (lang_GNU_C ()
|| ! strcmp (language_string, "GNU GIMPLE")
|| ! strcmp (language_string, "GNU Go")
@@ -63,7 +63,7 @@ Index: b/src/gcc/dwarf2out.c
===================================================================
--- a/src/gcc/dwarf2out.c
+++ b/src/gcc/dwarf2out.c
-@@ -5023,6 +5023,16 @@ is_ada (void)
+@@ -5024,6 +5024,16 @@ is_ada (void)
return lang == DW_LANG_Ada95 || lang == DW_LANG_Ada83;
}
@@ -80,7 +80,7 @@ Index: b/src/gcc/dwarf2out.c
/* Remove the specified attribute if present. Return TRUE if removal
was successful. */
-@@ -23407,6 +23417,8 @@ gen_compile_unit_die (const char *filena
+@@ -23428,6 +23438,8 @@ gen_compile_unit_die (const char *filena
language = DW_LANG_ObjC;
else if (strcmp (language_string, "GNU Objective-C++") == 0)
language = DW_LANG_ObjC_plus_plus;
@@ -89,7 +89,7 @@ Index: b/src/gcc/dwarf2out.c
else if (dwarf_version >= 5 || !dwarf_strict)
{
if (strcmp (language_string, "GNU Go") == 0)
-@@ -24927,7 +24939,7 @@ declare_in_namespace (tree thing, dw_die
+@@ -24948,7 +24960,7 @@ declare_in_namespace (tree thing, dw_die
if (ns_context != context_die)
{
@@ -98,7 +98,7 @@ Index: b/src/gcc/dwarf2out.c
return ns_context;
if (DECL_P (thing))
gen_decl_die (thing, NULL, NULL, ns_context);
-@@ -24950,7 +24962,7 @@ gen_namespace_die (tree decl, dw_die_ref
+@@ -24971,7 +24983,7 @@ gen_namespace_die (tree decl, dw_die_ref
{
/* Output a real namespace or module. */
context_die = setup_namespace_context (decl, comp_unit_die ());
@@ -107,7 +107,7 @@ Index: b/src/gcc/dwarf2out.c
? DW_TAG_module : DW_TAG_namespace,
context_die, decl);
/* For Fortran modules defined in different CU don't add src coords. */
-@@ -25017,7 +25029,7 @@ gen_decl_die (tree decl, tree origin, st
+@@ -25038,7 +25050,7 @@ gen_decl_die (tree decl, tree origin, st
break;
case CONST_DECL:
@@ -116,7 +116,7 @@ Index: b/src/gcc/dwarf2out.c
{
/* The individual enumerators of an enum type get output when we output
the Dwarf representation of the relevant enum type itself. */
-@@ -25562,7 +25574,7 @@ dwarf2out_decl (tree decl)
+@@ -25583,7 +25595,7 @@ dwarf2out_decl (tree decl)
case CONST_DECL:
if (debug_info_level <= DINFO_LEVEL_TERSE)
return;
@@ -129,7 +129,7 @@ Index: b/src/gcc/gcc.c
===================================================================
--- a/src/gcc/gcc.c
+++ b/src/gcc/gcc.c
-@@ -1304,6 +1304,7 @@ static const struct compiler default_com
+@@ -1300,6 +1300,7 @@ static const struct compiler default_com
{".java", "#Java", 0, 0, 0}, {".class", "#Java", 0, 0, 0},
{".zip", "#Java", 0, 0, 0}, {".jar", "#Java", 0, 0, 0},
{".go", "#Go", 0, 1, 0},
diff --git a/debian/patches/gdc-libphobos-build.diff b/debian/patches/gdc-libphobos-build.diff
index ff640e6..5c163f1 100644
--- a/debian/patches/gdc-libphobos-build.diff
+++ b/debian/patches/gdc-libphobos-build.diff
@@ -904,7 +904,7 @@ Index: b/src/configure.ac
===================================================================
--- a/src/configure.ac
+++ b/src/configure.ac
-@@ -172,7 +172,9 @@ target_libraries="target-libgcc \
+@@ -171,7 +171,9 @@ target_libraries="target-libgcc \
target-libada \
target-libada-sjlj \
${target_libiberty} \
@@ -915,7 +915,7 @@ Index: b/src/configure.ac
# these tools are built using the target libraries, and are intended to
# run only in the target environment
-@@ -1265,6 +1267,7 @@ if test "${build}" != "${host}" ; then
+@@ -1264,6 +1266,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 +923,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}
-@@ -1278,6 +1281,7 @@ else
+@@ -1277,6 +1280,7 @@ else
CXX_FOR_BUILD="\$(CXX)"
GFORTRAN_FOR_BUILD="\$(GFORTRAN)"
GOC_FOR_BUILD="\$(GOC)"
@@ -931,7 +931,7 @@ Index: b/src/configure.ac
DLLTOOL_FOR_BUILD="\$(DLLTOOL)"
LD_FOR_BUILD="\$(LD)"
NM_FOR_BUILD="\$(NM)"
-@@ -3204,6 +3208,7 @@ AC_SUBST(CXX_FOR_BUILD)
+@@ -3201,6 +3205,7 @@ AC_SUBST(CXX_FOR_BUILD)
AC_SUBST(DLLTOOL_FOR_BUILD)
AC_SUBST(GFORTRAN_FOR_BUILD)
AC_SUBST(GOC_FOR_BUILD)
@@ -939,7 +939,7 @@ Index: b/src/configure.ac
AC_SUBST(LDFLAGS_FOR_BUILD)
AC_SUBST(LD_FOR_BUILD)
AC_SUBST(NM_FOR_BUILD)
-@@ -3313,6 +3318,7 @@ NCN_STRICT_CHECK_TARGET_TOOLS(CXX_FOR_TA
+@@ -3310,6 +3315,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 +947,7 @@ Index: b/src/configure.ac
ACX_CHECK_INSTALLED_TARGET_TOOL(AR_FOR_TARGET, ar)
ACX_CHECK_INSTALLED_TARGET_TOOL(AS_FOR_TARGET, as)
-@@ -3346,6 +3352,8 @@ GCC_TARGET_TOOL(gfortran, GFORTRAN_FOR_T
+@@ -3343,6 +3349,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/patches/gdc-versym-cpu.diff b/debian/patches/gdc-versym-cpu.diff
index a8f7753..d7909af 100644
--- a/debian/patches/gdc-versym-cpu.diff
+++ b/debian/patches/gdc-versym-cpu.diff
@@ -130,7 +130,7 @@ Index: b/src/gcc/config/i386/i386.h
===================================================================
--- a/src/gcc/config/i386/i386.h
+++ b/src/gcc/config/i386/i386.h
-@@ -660,6 +660,24 @@ extern const char *host_detect_local_cpu
+@@ -664,6 +664,24 @@ extern const char *host_detect_local_cpu
/* Target CPU builtins. */
#define TARGET_CPU_CPP_BUILTINS() ix86_target_macros ()
diff --git a/debian/patches/gdc-versym-os.diff b/debian/patches/gdc-versym-os.diff
index 83472b8..9fe64c1 100644
--- a/debian/patches/gdc-versym-os.diff
+++ b/debian/patches/gdc-versym-os.diff
@@ -77,9 +77,9 @@ Index: b/src/gcc/config/darwin.h
===================================================================
--- a/src/gcc/config/darwin.h
+++ b/src/gcc/config/darwin.h
-@@ -929,4 +929,10 @@ extern void darwin_driver_init (unsigned
- fall-back default. */
- #define DEF_MIN_OSX_VERSION "10.5"
+@@ -972,4 +972,10 @@ extern void darwin_driver_init (unsigned
+ #define DEF_LD64 LD64_VERSION
+ #endif
+#define TARGET_OS_D_BUILTINS() \
+ do { \
@@ -349,7 +349,7 @@ Index: b/src/gcc/config/rs6000/aix.h
===================================================================
--- a/src/gcc/config/rs6000/aix.h
+++ b/src/gcc/config/rs6000/aix.h
-@@ -129,6 +129,13 @@
+@@ -164,6 +164,13 @@
} \
while (0)
diff --git a/debian/patches/libgo-setcontext-config.diff b/debian/patches/libgo-setcontext-config.diff
index 64e0042..d1e577f 100644
--- a/debian/patches/libgo-setcontext-config.diff
+++ b/debian/patches/libgo-setcontext-config.diff
@@ -4,7 +4,7 @@ Index: b/src/libgo/configure.ac
===================================================================
--- a/src/libgo/configure.ac
+++ b/src/libgo/configure.ac
-@@ -843,6 +843,14 @@ main ()
+@@ -840,6 +840,14 @@ main ()
CFLAGS="$CFLAGS_hold"
LIBS="$LIBS_hold"
])
diff --git a/debian/patches/libgo-testsuite.diff b/debian/patches/libgo-testsuite.diff
index fe0ef04..96246cd 100644
--- a/debian/patches/libgo-testsuite.diff
+++ b/debian/patches/libgo-testsuite.diff
@@ -4,7 +4,7 @@ Index: b/src/libgo/Makefile.am
===================================================================
--- a/src/libgo/Makefile.am
+++ b/src/libgo/Makefile.am
-@@ -948,7 +948,12 @@ CHECK = \
+@@ -931,7 +931,12 @@ CHECK = \
$(MKDIR_P) $(@D); \
rm -f $@-testsum $@-testlog; \
files=`$(SHELL) $(srcdir)/match.sh --goarch=$(GOARCH) --goos=$(GOOS) --srcdir=$(srcdir)/go/$(@D) --extrafiles="$(extra_go_files_$(subst /,_,$(@D)))" $(matchargs_$(subst /,_,$(@D)))`; \
@@ -18,7 +18,7 @@ Index: b/src/libgo/Makefile.am
$(SHELL) $(srcdir)/testsuite/gotest --goarch=$(GOARCH) --goos=$(GOOS) --dejagnu=yes --basedir=$(srcdir) --srcdir=$(srcdir)/go/$(@D) --pkgpath="$(@D)" --pkgfiles="$$files" --testname="$(@D)" $(GOTESTFLAGS); \
elif test "$(GOBENCH)" != ""; then \
$(SHELL) $(srcdir)/testsuite/gotest --goarch=$(GOARCH) --goos=$(GOOS) --basedir=$(srcdir) --srcdir=$(srcdir)/go/$(@D) --pkgpath="$(@D)" --pkgfiles="$$files" --bench="$(GOBENCH)" $(GOTESTFLAGS); \
-@@ -963,6 +968,7 @@ CHECK = \
+@@ -946,6 +951,7 @@ CHECK = \
echo "FAIL: $(@D)" > $@-testsum; \
exit 1; \
fi; \
@@ -30,7 +30,7 @@ Index: b/src/libgo/Makefile.in
===================================================================
--- a/src/libgo/Makefile.in
+++ b/src/libgo/Makefile.in
-@@ -1103,7 +1103,12 @@ CHECK = \
+@@ -1085,7 +1085,12 @@ CHECK = \
$(MKDIR_P) $(@D); \
rm -f $@-testsum $@-testlog; \
files=`$(SHELL) $(srcdir)/match.sh --goarch=$(GOARCH) --goos=$(GOOS) --srcdir=$(srcdir)/go/$(@D) --extrafiles="$(extra_go_files_$(subst /,_,$(@D)))" $(matchargs_$(subst /,_,$(@D)))`; \
@@ -44,7 +44,7 @@ Index: b/src/libgo/Makefile.in
$(SHELL) $(srcdir)/testsuite/gotest --goarch=$(GOARCH) --goos=$(GOOS) --dejagnu=yes --basedir=$(srcdir) --srcdir=$(srcdir)/go/$(@D) --pkgpath="$(@D)" --pkgfiles="$$files" --testname="$(@D)" $(GOTESTFLAGS); \
elif test "$(GOBENCH)" != ""; then \
$(SHELL) $(srcdir)/testsuite/gotest --goarch=$(GOARCH) --goos=$(GOOS) --basedir=$(srcdir) --srcdir=$(srcdir)/go/$(@D) --pkgpath="$(@D)" --pkgfiles="$$files" --bench="$(GOBENCH)" $(GOTESTFLAGS); \
-@@ -1118,6 +1123,7 @@ CHECK = \
+@@ -1100,6 +1105,7 @@ CHECK = \
echo "FAIL: $(@D)" > $@-testsum; \
exit 1; \
fi; \
diff --git a/debian/patches/libobjc-system-gc.diff b/debian/patches/libobjc-system-gc.diff
deleted file mode 100644
index c4ff300..0000000
--- a/debian/patches/libobjc-system-gc.diff
+++ /dev/null
@@ -1,1909 +0,0 @@
-<toplevel>
-
-2016-11-19 Matthias Klose <doko at ubuntu.com>
-
- * Makefile.def: Remove reference to boehm-gc target module.
- * configure.ac: Include pkg.m4, check for --with-target-bdw-gc
- options and for the bdw-gc pkg-config module.
- * configure: Regenerate.
- * Makefile.in: Regenerate.
-
-gcc/
-
-2016-11-19 Matthias Klose <doko at ubuntu.com>
-
- * doc/install.texi: Document configure options --enable-objc-gc
- and --with-target-bdw-gc.
-
-config/
-
-2016-11-19 Matthias Klose <doko at ubuntu.com>
-
- * pkg.m4: New file.
-
-libobjc/
-
-2016-11-19 Matthias Klose <doko at ubuntu.com>
-
- * configure.ac (--enable-objc-gc): Allow to configure with a
- system provided boehm-gc.
- * configure: Regenerate.
- * Makefile.in (OBJC_BOEHM_GC_LIBS): Get value from configure.
- * gc.c: Include system bdw-gc headers.
- * memory.c: Likewise
- * objects.c: Likewise
-
-boehm-gc/
-
-2016-11-19 Matthias Klose <doko at ubuntu.com>
-
- Remove
-
-Index: b/src/Makefile.def
-===================================================================
---- a/src/Makefile.def
-+++ b/src/Makefile.def
-@@ -166,7 +166,6 @@ target_modules = { module= winsup; };
- target_modules = { module= libgloss; no_check=true; };
- target_modules = { module= libffi; no_install=true; };
- target_modules = { module= zlib; };
--target_modules = { module= boehm-gc; };
- target_modules = { module= rda; };
- target_modules = { module= libada; };
- target_modules = { module= libgomp; bootstrap= true; lib_path=.libs; };
-@@ -543,7 +542,6 @@ lang_env_dependencies = { module=libgcc;
- // a dependency on libgcc for native targets to configure.
- lang_env_dependencies = { module=libiberty; no_c=true; };
-
--dependencies = { module=configure-target-boehm-gc; on=all-target-libstdc++-v3; };
- dependencies = { module=configure-target-fastjar; on=configure-target-zlib; };
- dependencies = { module=all-target-fastjar; on=all-target-zlib; };
- dependencies = { module=configure-target-libgo; on=configure-target-libffi; };
-@@ -551,8 +549,6 @@ 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; };
--dependencies = { module=configure-target-libobjc; on=configure-target-boehm-gc; };
--dependencies = { module=all-target-libobjc; on=all-target-boehm-gc; };
- 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; };
-Index: b/src/Makefile.in
-===================================================================
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -998,7 +998,6 @@ configure-target: \
- maybe-configure-target-libgloss \
- maybe-configure-target-libffi \
- maybe-configure-target-zlib \
-- maybe-configure-target-boehm-gc \
- maybe-configure-target-rda \
- maybe-configure-target-libada \
- maybe-configure-target-libgomp \
-@@ -1164,7 +1163,6 @@ all-target: maybe-all-target-winsup
- all-target: maybe-all-target-libgloss
- all-target: maybe-all-target-libffi
- all-target: maybe-all-target-zlib
--all-target: maybe-all-target-boehm-gc
- all-target: maybe-all-target-rda
- all-target: maybe-all-target-libada
- @if target-libgomp-no-bootstrap
-@@ -1257,7 +1255,6 @@ info-target: maybe-info-target-winsup
- info-target: maybe-info-target-libgloss
- info-target: maybe-info-target-libffi
- info-target: maybe-info-target-zlib
--info-target: maybe-info-target-boehm-gc
- info-target: maybe-info-target-rda
- info-target: maybe-info-target-libada
- info-target: maybe-info-target-libgomp
-@@ -1343,7 +1340,6 @@ dvi-target: maybe-dvi-target-winsup
- dvi-target: maybe-dvi-target-libgloss
- dvi-target: maybe-dvi-target-libffi
- dvi-target: maybe-dvi-target-zlib
--dvi-target: maybe-dvi-target-boehm-gc
- dvi-target: maybe-dvi-target-rda
- dvi-target: maybe-dvi-target-libada
- dvi-target: maybe-dvi-target-libgomp
-@@ -1429,7 +1425,6 @@ pdf-target: maybe-pdf-target-winsup
- pdf-target: maybe-pdf-target-libgloss
- pdf-target: maybe-pdf-target-libffi
- pdf-target: maybe-pdf-target-zlib
--pdf-target: maybe-pdf-target-boehm-gc
- pdf-target: maybe-pdf-target-rda
- pdf-target: maybe-pdf-target-libada
- pdf-target: maybe-pdf-target-libgomp
-@@ -1515,7 +1510,6 @@ html-target: maybe-html-target-winsup
- html-target: maybe-html-target-libgloss
- html-target: maybe-html-target-libffi
- html-target: maybe-html-target-zlib
--html-target: maybe-html-target-boehm-gc
- html-target: maybe-html-target-rda
- html-target: maybe-html-target-libada
- html-target: maybe-html-target-libgomp
-@@ -1601,7 +1595,6 @@ TAGS-target: maybe-TAGS-target-winsup
- TAGS-target: maybe-TAGS-target-libgloss
- TAGS-target: maybe-TAGS-target-libffi
- TAGS-target: maybe-TAGS-target-zlib
--TAGS-target: maybe-TAGS-target-boehm-gc
- TAGS-target: maybe-TAGS-target-rda
- TAGS-target: maybe-TAGS-target-libada
- TAGS-target: maybe-TAGS-target-libgomp
-@@ -1687,7 +1680,6 @@ install-info-target: maybe-install-info-
- install-info-target: maybe-install-info-target-libgloss
- install-info-target: maybe-install-info-target-libffi
- install-info-target: maybe-install-info-target-zlib
--install-info-target: maybe-install-info-target-boehm-gc
- install-info-target: maybe-install-info-target-rda
- install-info-target: maybe-install-info-target-libada
- install-info-target: maybe-install-info-target-libgomp
-@@ -1773,7 +1765,6 @@ install-pdf-target: maybe-install-pdf-ta
- install-pdf-target: maybe-install-pdf-target-libgloss
- install-pdf-target: maybe-install-pdf-target-libffi
- install-pdf-target: maybe-install-pdf-target-zlib
--install-pdf-target: maybe-install-pdf-target-boehm-gc
- install-pdf-target: maybe-install-pdf-target-rda
- install-pdf-target: maybe-install-pdf-target-libada
- install-pdf-target: maybe-install-pdf-target-libgomp
-@@ -1859,7 +1850,6 @@ install-html-target: maybe-install-html-
- install-html-target: maybe-install-html-target-libgloss
- install-html-target: maybe-install-html-target-libffi
- install-html-target: maybe-install-html-target-zlib
--install-html-target: maybe-install-html-target-boehm-gc
- install-html-target: maybe-install-html-target-rda
- install-html-target: maybe-install-html-target-libada
- install-html-target: maybe-install-html-target-libgomp
-@@ -1945,7 +1935,6 @@ installcheck-target: maybe-installcheck-
- installcheck-target: maybe-installcheck-target-libgloss
- installcheck-target: maybe-installcheck-target-libffi
- installcheck-target: maybe-installcheck-target-zlib
--installcheck-target: maybe-installcheck-target-boehm-gc
- installcheck-target: maybe-installcheck-target-rda
- installcheck-target: maybe-installcheck-target-libada
- installcheck-target: maybe-installcheck-target-libgomp
-@@ -2031,7 +2020,6 @@ mostlyclean-target: maybe-mostlyclean-ta
- mostlyclean-target: maybe-mostlyclean-target-libgloss
- mostlyclean-target: maybe-mostlyclean-target-libffi
- mostlyclean-target: maybe-mostlyclean-target-zlib
--mostlyclean-target: maybe-mostlyclean-target-boehm-gc
- mostlyclean-target: maybe-mostlyclean-target-rda
- mostlyclean-target: maybe-mostlyclean-target-libada
- mostlyclean-target: maybe-mostlyclean-target-libgomp
-@@ -2117,7 +2105,6 @@ clean-target: maybe-clean-target-winsup
- clean-target: maybe-clean-target-libgloss
- clean-target: maybe-clean-target-libffi
- clean-target: maybe-clean-target-zlib
--clean-target: maybe-clean-target-boehm-gc
- clean-target: maybe-clean-target-rda
- clean-target: maybe-clean-target-libada
- clean-target: maybe-clean-target-libgomp
-@@ -2203,7 +2190,6 @@ distclean-target: maybe-distclean-target
- distclean-target: maybe-distclean-target-libgloss
- distclean-target: maybe-distclean-target-libffi
- distclean-target: maybe-distclean-target-zlib
--distclean-target: maybe-distclean-target-boehm-gc
- distclean-target: maybe-distclean-target-rda
- distclean-target: maybe-distclean-target-libada
- distclean-target: maybe-distclean-target-libgomp
-@@ -2289,7 +2275,6 @@ maintainer-clean-target: maybe-maintaine
- maintainer-clean-target: maybe-maintainer-clean-target-libgloss
- maintainer-clean-target: maybe-maintainer-clean-target-libffi
- maintainer-clean-target: maybe-maintainer-clean-target-zlib
--maintainer-clean-target: maybe-maintainer-clean-target-boehm-gc
- maintainer-clean-target: maybe-maintainer-clean-target-rda
- maintainer-clean-target: maybe-maintainer-clean-target-libada
- maintainer-clean-target: maybe-maintainer-clean-target-libgomp
-@@ -2431,7 +2416,6 @@ check-target: \
- maybe-check-target-libgloss \
- maybe-check-target-libffi \
- maybe-check-target-zlib \
-- maybe-check-target-boehm-gc \
- maybe-check-target-rda \
- maybe-check-target-libada \
- maybe-check-target-libgomp \
-@@ -2613,7 +2597,6 @@ install-target: \
- maybe-install-target-libgloss \
- maybe-install-target-libffi \
- maybe-install-target-zlib \
-- maybe-install-target-boehm-gc \
- maybe-install-target-rda \
- maybe-install-target-libada \
- maybe-install-target-libgomp \
-@@ -2719,7 +2702,6 @@ install-strip-target: \
- maybe-install-strip-target-libgloss \
- maybe-install-strip-target-libffi \
- maybe-install-strip-target-zlib \
-- maybe-install-strip-target-boehm-gc \
- maybe-install-strip-target-rda \
- maybe-install-strip-target-libada \
- maybe-install-strip-target-libgomp \
-@@ -48324,464 +48306,6 @@ maintainer-clean-target-zlib:
-
-
-
--.PHONY: configure-target-boehm-gc maybe-configure-target-boehm-gc
--maybe-configure-target-boehm-gc:
-- at if gcc-bootstrap
--configure-target-boehm-gc: stage_current
-- at endif gcc-bootstrap
-- at if target-boehm-gc
--maybe-configure-target-boehm-gc: configure-target-boehm-gc
--configure-target-boehm-gc:
-- @: $(MAKE); $(unstage)
-- @r=`${PWD_COMMAND}`; export r; \
-- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-- echo "Checking multilib configuration for boehm-gc..."; \
-- $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/boehm-gc; \
-- $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/boehm-gc/multilib.tmp 2> /dev/null; \
-- if test -r $(TARGET_SUBDIR)/boehm-gc/multilib.out; then \
-- if cmp -s $(TARGET_SUBDIR)/boehm-gc/multilib.tmp $(TARGET_SUBDIR)/boehm-gc/multilib.out; then \
-- rm -f $(TARGET_SUBDIR)/boehm-gc/multilib.tmp; \
-- else \
-- rm -f $(TARGET_SUBDIR)/boehm-gc/Makefile; \
-- mv $(TARGET_SUBDIR)/boehm-gc/multilib.tmp $(TARGET_SUBDIR)/boehm-gc/multilib.out; \
-- fi; \
-- else \
-- mv $(TARGET_SUBDIR)/boehm-gc/multilib.tmp $(TARGET_SUBDIR)/boehm-gc/multilib.out; \
-- fi; \
-- test ! -f $(TARGET_SUBDIR)/boehm-gc/Makefile || exit 0; \
-- $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/boehm-gc; \
-- $(NORMAL_TARGET_EXPORTS) \
-- echo Configuring in $(TARGET_SUBDIR)/boehm-gc; \
-- cd "$(TARGET_SUBDIR)/boehm-gc" || exit 1; \
-- case $(srcdir) in \
-- /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
-- *) topdir=`echo $(TARGET_SUBDIR)/boehm-gc/ | \
-- sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
-- esac; \
-- module_srcdir=boehm-gc; \
-- 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-boehm-gc
--
--
--
--
--
--.PHONY: all-target-boehm-gc maybe-all-target-boehm-gc
--maybe-all-target-boehm-gc:
-- at if gcc-bootstrap
--all-target-boehm-gc: stage_current
-- at endif gcc-bootstrap
-- at if target-boehm-gc
--TARGET-target-boehm-gc=all
--maybe-all-target-boehm-gc: all-target-boehm-gc
--all-target-boehm-gc: configure-target-boehm-gc
-- @: $(MAKE); $(unstage)
-- @r=`${PWD_COMMAND}`; export r; \
-- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-- $(NORMAL_TARGET_EXPORTS) \
-- (cd $(TARGET_SUBDIR)/boehm-gc && \
-- $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \
-- $(TARGET-target-boehm-gc))
-- at endif target-boehm-gc
--
--
--
--
--
--.PHONY: check-target-boehm-gc maybe-check-target-boehm-gc
--maybe-check-target-boehm-gc:
-- at if target-boehm-gc
--maybe-check-target-boehm-gc: check-target-boehm-gc
--
--check-target-boehm-gc:
-- @: $(MAKE); $(unstage)
-- @r=`${PWD_COMMAND}`; export r; \
-- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-- $(NORMAL_TARGET_EXPORTS) \
-- (cd $(TARGET_SUBDIR)/boehm-gc && \
-- $(MAKE) $(TARGET_FLAGS_TO_PASS) check)
--
-- at endif target-boehm-gc
--
--.PHONY: install-target-boehm-gc maybe-install-target-boehm-gc
--maybe-install-target-boehm-gc:
-- at if target-boehm-gc
--maybe-install-target-boehm-gc: install-target-boehm-gc
--
--install-target-boehm-gc: installdirs
-- @: $(MAKE); $(unstage)
-- @r=`${PWD_COMMAND}`; export r; \
-- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-- $(NORMAL_TARGET_EXPORTS) \
-- (cd $(TARGET_SUBDIR)/boehm-gc && \
-- $(MAKE) $(TARGET_FLAGS_TO_PASS) install)
--
-- at endif target-boehm-gc
--
--.PHONY: install-strip-target-boehm-gc maybe-install-strip-target-boehm-gc
--maybe-install-strip-target-boehm-gc:
-- at if target-boehm-gc
--maybe-install-strip-target-boehm-gc: install-strip-target-boehm-gc
--
--install-strip-target-boehm-gc: installdirs
-- @: $(MAKE); $(unstage)
-- @r=`${PWD_COMMAND}`; export r; \
-- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-- $(NORMAL_TARGET_EXPORTS) \
-- (cd $(TARGET_SUBDIR)/boehm-gc && \
-- $(MAKE) $(TARGET_FLAGS_TO_PASS) install-strip)
--
-- at endif target-boehm-gc
--
--# Other targets (info, dvi, pdf, etc.)
--
--.PHONY: maybe-info-target-boehm-gc info-target-boehm-gc
--maybe-info-target-boehm-gc:
-- at if target-boehm-gc
--maybe-info-target-boehm-gc: info-target-boehm-gc
--
--info-target-boehm-gc: \
-- configure-target-boehm-gc
-- @: $(MAKE); $(unstage)
-- @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0; \
-- r=`${PWD_COMMAND}`; export r; \
-- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-- $(NORMAL_TARGET_EXPORTS) \
-- echo "Doing info in $(TARGET_SUBDIR)/boehm-gc"; \
-- for flag in $(EXTRA_TARGET_FLAGS); do \
-- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-- done; \
-- (cd $(TARGET_SUBDIR)/boehm-gc && \
-- $(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-boehm-gc
--
--.PHONY: maybe-dvi-target-boehm-gc dvi-target-boehm-gc
--maybe-dvi-target-boehm-gc:
-- at if target-boehm-gc
--maybe-dvi-target-boehm-gc: dvi-target-boehm-gc
--
--dvi-target-boehm-gc: \
-- configure-target-boehm-gc
-- @: $(MAKE); $(unstage)
-- @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0; \
-- r=`${PWD_COMMAND}`; export r; \
-- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-- $(NORMAL_TARGET_EXPORTS) \
-- echo "Doing dvi in $(TARGET_SUBDIR)/boehm-gc"; \
-- for flag in $(EXTRA_TARGET_FLAGS); do \
-- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-- done; \
-- (cd $(TARGET_SUBDIR)/boehm-gc && \
-- $(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-boehm-gc
--
--.PHONY: maybe-pdf-target-boehm-gc pdf-target-boehm-gc
--maybe-pdf-target-boehm-gc:
-- at if target-boehm-gc
--maybe-pdf-target-boehm-gc: pdf-target-boehm-gc
--
--pdf-target-boehm-gc: \
-- configure-target-boehm-gc
-- @: $(MAKE); $(unstage)
-- @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0; \
-- r=`${PWD_COMMAND}`; export r; \
-- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-- $(NORMAL_TARGET_EXPORTS) \
-- echo "Doing pdf in $(TARGET_SUBDIR)/boehm-gc"; \
-- for flag in $(EXTRA_TARGET_FLAGS); do \
-- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-- done; \
-- (cd $(TARGET_SUBDIR)/boehm-gc && \
-- $(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-boehm-gc
--
--.PHONY: maybe-html-target-boehm-gc html-target-boehm-gc
--maybe-html-target-boehm-gc:
-- at if target-boehm-gc
--maybe-html-target-boehm-gc: html-target-boehm-gc
--
--html-target-boehm-gc: \
-- configure-target-boehm-gc
-- @: $(MAKE); $(unstage)
-- @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0; \
-- r=`${PWD_COMMAND}`; export r; \
-- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-- $(NORMAL_TARGET_EXPORTS) \
-- echo "Doing html in $(TARGET_SUBDIR)/boehm-gc"; \
-- for flag in $(EXTRA_TARGET_FLAGS); do \
-- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-- done; \
-- (cd $(TARGET_SUBDIR)/boehm-gc && \
-- $(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-boehm-gc
--
--.PHONY: maybe-TAGS-target-boehm-gc TAGS-target-boehm-gc
--maybe-TAGS-target-boehm-gc:
-- at if target-boehm-gc
--maybe-TAGS-target-boehm-gc: TAGS-target-boehm-gc
--
--TAGS-target-boehm-gc: \
-- configure-target-boehm-gc
-- @: $(MAKE); $(unstage)
-- @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0; \
-- r=`${PWD_COMMAND}`; export r; \
-- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-- $(NORMAL_TARGET_EXPORTS) \
-- echo "Doing TAGS in $(TARGET_SUBDIR)/boehm-gc"; \
-- for flag in $(EXTRA_TARGET_FLAGS); do \
-- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-- done; \
-- (cd $(TARGET_SUBDIR)/boehm-gc && \
-- $(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-boehm-gc
--
--.PHONY: maybe-install-info-target-boehm-gc install-info-target-boehm-gc
--maybe-install-info-target-boehm-gc:
-- at if target-boehm-gc
--maybe-install-info-target-boehm-gc: install-info-target-boehm-gc
--
--install-info-target-boehm-gc: \
-- configure-target-boehm-gc \
-- info-target-boehm-gc
-- @: $(MAKE); $(unstage)
-- @[ -f $(TARGET_SUBDIR)/boehm-gc/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)/boehm-gc"; \
-- for flag in $(EXTRA_TARGET_FLAGS); do \
-- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-- done; \
-- (cd $(TARGET_SUBDIR)/boehm-gc && \
-- $(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-boehm-gc
--
--.PHONY: maybe-install-pdf-target-boehm-gc install-pdf-target-boehm-gc
--maybe-install-pdf-target-boehm-gc:
-- at if target-boehm-gc
--maybe-install-pdf-target-boehm-gc: install-pdf-target-boehm-gc
--
--install-pdf-target-boehm-gc: \
-- configure-target-boehm-gc \
-- pdf-target-boehm-gc
-- @: $(MAKE); $(unstage)
-- @[ -f $(TARGET_SUBDIR)/boehm-gc/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)/boehm-gc"; \
-- for flag in $(EXTRA_TARGET_FLAGS); do \
-- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-- done; \
-- (cd $(TARGET_SUBDIR)/boehm-gc && \
-- $(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-boehm-gc
--
--.PHONY: maybe-install-html-target-boehm-gc install-html-target-boehm-gc
--maybe-install-html-target-boehm-gc:
-- at if target-boehm-gc
--maybe-install-html-target-boehm-gc: install-html-target-boehm-gc
--
--install-html-target-boehm-gc: \
-- configure-target-boehm-gc \
-- html-target-boehm-gc
-- @: $(MAKE); $(unstage)
-- @[ -f $(TARGET_SUBDIR)/boehm-gc/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)/boehm-gc"; \
-- for flag in $(EXTRA_TARGET_FLAGS); do \
-- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-- done; \
-- (cd $(TARGET_SUBDIR)/boehm-gc && \
-- $(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-boehm-gc
--
--.PHONY: maybe-installcheck-target-boehm-gc installcheck-target-boehm-gc
--maybe-installcheck-target-boehm-gc:
-- at if target-boehm-gc
--maybe-installcheck-target-boehm-gc: installcheck-target-boehm-gc
--
--installcheck-target-boehm-gc: \
-- configure-target-boehm-gc
-- @: $(MAKE); $(unstage)
-- @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0; \
-- r=`${PWD_COMMAND}`; export r; \
-- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-- $(NORMAL_TARGET_EXPORTS) \
-- echo "Doing installcheck in $(TARGET_SUBDIR)/boehm-gc"; \
-- for flag in $(EXTRA_TARGET_FLAGS); do \
-- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-- done; \
-- (cd $(TARGET_SUBDIR)/boehm-gc && \
-- $(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-boehm-gc
--
--.PHONY: maybe-mostlyclean-target-boehm-gc mostlyclean-target-boehm-gc
--maybe-mostlyclean-target-boehm-gc:
-- at if target-boehm-gc
--maybe-mostlyclean-target-boehm-gc: mostlyclean-target-boehm-gc
--
--mostlyclean-target-boehm-gc:
-- @: $(MAKE); $(unstage)
-- @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0; \
-- r=`${PWD_COMMAND}`; export r; \
-- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-- $(NORMAL_TARGET_EXPORTS) \
-- echo "Doing mostlyclean in $(TARGET_SUBDIR)/boehm-gc"; \
-- for flag in $(EXTRA_TARGET_FLAGS); do \
-- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-- done; \
-- (cd $(TARGET_SUBDIR)/boehm-gc && \
-- $(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-boehm-gc
--
--.PHONY: maybe-clean-target-boehm-gc clean-target-boehm-gc
--maybe-clean-target-boehm-gc:
-- at if target-boehm-gc
--maybe-clean-target-boehm-gc: clean-target-boehm-gc
--
--clean-target-boehm-gc:
-- @: $(MAKE); $(unstage)
-- @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0; \
-- r=`${PWD_COMMAND}`; export r; \
-- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-- $(NORMAL_TARGET_EXPORTS) \
-- echo "Doing clean in $(TARGET_SUBDIR)/boehm-gc"; \
-- for flag in $(EXTRA_TARGET_FLAGS); do \
-- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-- done; \
-- (cd $(TARGET_SUBDIR)/boehm-gc && \
-- $(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-boehm-gc
--
--.PHONY: maybe-distclean-target-boehm-gc distclean-target-boehm-gc
--maybe-distclean-target-boehm-gc:
-- at if target-boehm-gc
--maybe-distclean-target-boehm-gc: distclean-target-boehm-gc
--
--distclean-target-boehm-gc:
-- @: $(MAKE); $(unstage)
-- @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0; \
-- r=`${PWD_COMMAND}`; export r; \
-- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
-- $(NORMAL_TARGET_EXPORTS) \
-- echo "Doing distclean in $(TARGET_SUBDIR)/boehm-gc"; \
-- for flag in $(EXTRA_TARGET_FLAGS); do \
-- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-- done; \
-- (cd $(TARGET_SUBDIR)/boehm-gc && \
-- $(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-boehm-gc
--
--.PHONY: maybe-maintainer-clean-target-boehm-gc maintainer-clean-target-boehm-gc
--maybe-maintainer-clean-target-boehm-gc:
-- at if target-boehm-gc
--maybe-maintainer-clean-target-boehm-gc: maintainer-clean-target-boehm-gc
--
--maintainer-clean-target-boehm-gc:
-- @: $(MAKE); $(unstage)
-- @[ -f $(TARGET_SUBDIR)/boehm-gc/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)/boehm-gc"; \
-- for flag in $(EXTRA_TARGET_FLAGS); do \
-- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
-- done; \
-- (cd $(TARGET_SUBDIR)/boehm-gc && \
-- $(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-boehm-gc
--
--
--
--
--
- .PHONY: configure-target-rda maybe-configure-target-rda
- maybe-configure-target-rda:
- @if gcc-bootstrap
-@@ -54740,7 +54264,6 @@ configure-target-winsup: stage_last
- configure-target-libgloss: stage_last
- configure-target-libffi: stage_last
- configure-target-zlib: stage_last
--configure-target-boehm-gc: stage_last
- configure-target-rda: stage_last
- configure-target-libada: stage_last
- configure-stage1-target-libgomp: maybe-all-stage1-gcc
-@@ -54775,7 +54298,6 @@ configure-target-winsup: maybe-all-gcc
- configure-target-libgloss: maybe-all-gcc
- configure-target-libffi: maybe-all-gcc
- configure-target-zlib: maybe-all-gcc
--configure-target-boehm-gc: maybe-all-gcc
- configure-target-rda: maybe-all-gcc
- configure-target-libada: maybe-all-gcc
- configure-target-libgomp: maybe-all-gcc
-@@ -55790,7 +55312,6 @@ all-flex: maybe-all-m4
- all-flex: maybe-all-build-texinfo
- all-m4: maybe-all-intl
- all-m4: maybe-all-build-texinfo
--configure-target-boehm-gc: maybe-all-target-libstdc++-v3
- configure-target-fastjar: maybe-configure-target-zlib
- all-target-fastjar: maybe-all-target-zlib
- configure-target-libgo: maybe-configure-target-libffi
-@@ -55798,8 +55319,6 @@ 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-libobjc: maybe-configure-target-boehm-gc
--all-target-libobjc: maybe-all-target-boehm-gc
- configure-target-libstdc++-v3: maybe-configure-target-libgomp
-
- configure-stage1-target-libstdc++-v3: maybe-configure-stage1-target-libgomp
-@@ -55931,7 +55450,6 @@ configure-target-winsup: maybe-all-targe
- configure-target-libgloss: maybe-all-target-libgcc
- configure-target-libffi: maybe-all-target-libgcc
- configure-target-zlib: maybe-all-target-libgcc
--configure-target-boehm-gc: maybe-all-target-libgcc
- configure-target-rda: maybe-all-target-libgcc
- configure-target-libada: maybe-all-target-libgcc
- configure-target-libgomp: maybe-all-target-libgcc
-@@ -55978,8 +55496,6 @@ configure-target-libffi: maybe-all-targe
-
- configure-target-zlib: maybe-all-target-newlib maybe-all-target-libgloss
-
--configure-target-boehm-gc: maybe-all-target-newlib maybe-all-target-libgloss
--
- configure-target-rda: maybe-all-target-newlib maybe-all-target-libgloss
-
- configure-target-libada: maybe-all-target-newlib maybe-all-target-libgloss
-Index: b/src/config/pkg.m4
-===================================================================
---- /dev/null
-+++ b/src/config/pkg.m4
-@@ -0,0 +1,825 @@
-+dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
-+dnl serial 11 (pkg-config-0.29)
-+dnl
-+dnl Copyright © 2004 Scott James Remnant <scott at netsplit.com>.
-+dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists at gmail.com>
-+dnl
-+dnl This program is free software; you can redistribute it and/or modify
-+dnl it under the terms of the GNU General Public License as published by
-+dnl the Free Software Foundation; either version 2 of the License, or
-+dnl (at your option) any later version.
-+dnl
-+dnl This program is distributed in the hope that it will be useful, but
-+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
-+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+dnl General Public License for more details.
-+dnl
-+dnl You should have received a copy of the GNU General Public License
-+dnl along with this program; if not, write to the Free Software
-+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+dnl 02111-1307, USA.
-+dnl
-+dnl As a special exception to the GNU General Public License, if you
-+dnl distribute this file as part of a program that contains a
-+dnl configuration script generated by Autoconf, you may include it under
-+dnl the same distribution terms that you use for the rest of that
-+dnl program.
-+
-+dnl PKG_PREREQ(MIN-VERSION)
-+dnl -----------------------
-+dnl Since: 0.29
-+dnl
-+dnl Verify that the version of the pkg-config macros are at least
-+dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's
-+dnl installed version of pkg-config, this checks the developer's version
-+dnl of pkg.m4 when generating configure.
-+dnl
-+dnl To ensure that this macro is defined, also add:
-+dnl m4_ifndef([PKG_PREREQ],
-+dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])])
-+dnl
-+dnl See the "Since" comment for each macro you use to see what version
-+dnl of the macros you require.
-+m4_defun([PKG_PREREQ],
-+[m4_define([PKG_MACROS_VERSION], [0.29])
-+m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
-+ [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
-+])dnl PKG_PREREQ
-+
-+dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])
-+dnl ----------------------------------
-+dnl Since: 0.16
-+dnl
-+dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
-+dnl first found in the path. Checks that the version of pkg-config found
-+dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
-+dnl used since that's the first version where most current features of
-+dnl pkg-config existed.
-+AC_DEFUN([PKG_PROG_PKG_CONFIG],
-+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
-+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
-+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
-+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
-+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
-+
-+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-+fi
-+if test -n "$PKG_CONFIG"; then
-+ _pkg_min_version=m4_default([$1], [0.9.0])
-+ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
-+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-+ AC_MSG_RESULT([yes])
-+ else
-+ AC_MSG_RESULT([no])
-+ PKG_CONFIG=""
-+ fi
-+fi[]dnl
-+])dnl PKG_PROG_PKG_CONFIG
-+
-+dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-+dnl -------------------------------------------------------------------
-+dnl Since: 0.18
-+dnl
-+dnl Check to see whether a particular set of modules exists. Similar to
-+dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
-+dnl
-+dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-+dnl only at the first occurence in configure.ac, so if the first place
-+dnl it's called might be skipped (such as if it is within an "if", you
-+dnl have to call PKG_CHECK_EXISTS manually
-+AC_DEFUN([PKG_CHECK_EXISTS],
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-+if test -n "$PKG_CONFIG" && \
-+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-+ m4_default([$2], [:])
-+m4_ifvaln([$3], [else
-+ $3])dnl
-+fi])
-+
-+dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-+dnl ---------------------------------------------
-+dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting
-+dnl pkg_failed based on the result.
-+m4_define([_PKG_CONFIG],
-+[if test -n "$$1"; then
-+ pkg_cv_[]$1="$$1"
-+ elif test -n "$PKG_CONFIG"; then
-+ PKG_CHECK_EXISTS([$3],
-+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
-+ test "x$?" != "x0" && pkg_failed=yes ],
-+ [pkg_failed=yes])
-+ else
-+ pkg_failed=untried
-+fi[]dnl
-+])dnl _PKG_CONFIG
-+
-+dnl _PKG_SHORT_ERRORS_SUPPORTED
-+dnl ---------------------------
-+dnl Internal check to see if pkg-config supports short errors.
-+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi[]dnl
-+])dnl _PKG_SHORT_ERRORS_SUPPORTED
-+
-+
-+dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-+dnl [ACTION-IF-NOT-FOUND])
-+dnl --------------------------------------------------------------
-+dnl Since: 0.4.0
-+dnl
-+dnl Note that if there is a possibility the first call to
-+dnl PKG_CHECK_MODULES might not happen, you should be sure to include an
-+dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-+AC_DEFUN([PKG_CHECK_MODULES],
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-+
-+pkg_failed=no
-+AC_MSG_CHECKING([for $1])
-+
-+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-+
-+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-+and $1[]_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.])
-+
-+if test $pkg_failed = yes; then
-+ AC_MSG_RESULT([no])
-+ _PKG_SHORT_ERRORS_SUPPORTED
-+ if test $_pkg_short_errors_supported = yes; then
-+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
-+ else
-+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-+
-+ m4_default([$4], [AC_MSG_ERROR(
-+[Package requirements ($2) were not met:
-+
-+$$1_PKG_ERRORS
-+
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-+
-+_PKG_TEXT])[]dnl
-+ ])
-+elif test $pkg_failed = untried; then
-+ AC_MSG_RESULT([no])
-+ m4_default([$4], [AC_MSG_FAILURE(
-+[The pkg-config script could not be found or is too old. Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
-+
-+_PKG_TEXT
-+
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
-+ ])
-+else
-+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
-+ AC_MSG_RESULT([yes])
-+ $3
-+fi[]dnl
-+])dnl PKG_CHECK_MODULES
-+
-+
-+dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-+dnl [ACTION-IF-NOT-FOUND])
-+dnl ---------------------------------------------------------------------
-+dnl Since: 0.29
-+dnl
-+dnl Checks for existence of MODULES and gathers its build flags with
-+dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags
-+dnl and VARIABLE-PREFIX_LIBS from --libs.
-+dnl
-+dnl Note that if there is a possibility the first call to
-+dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to
-+dnl include an explicit call to PKG_PROG_PKG_CONFIG in your
-+dnl configure.ac.
-+AC_DEFUN([PKG_CHECK_MODULES_STATIC],
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-+_save_PKG_CONFIG=$PKG_CONFIG
-+PKG_CONFIG="$PKG_CONFIG --static"
-+PKG_CHECK_MODULES($@)
-+PKG_CONFIG=$_save_PKG_CONFIG[]dnl
-+])dnl PKG_CHECK_MODULES_STATIC
-+
-+
-+dnl PKG_INSTALLDIR([DIRECTORY])
-+dnl -------------------------
-+dnl Since: 0.27
-+dnl
-+dnl Substitutes the variable pkgconfigdir as the location where a module
-+dnl should install pkg-config .pc files. By default the directory is
-+dnl $libdir/pkgconfig, but the default can be changed by passing
-+dnl DIRECTORY. The user can override through the --with-pkgconfigdir
-+dnl parameter.
-+AC_DEFUN([PKG_INSTALLDIR],
-+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
-+m4_pushdef([pkg_description],
-+ [pkg-config installation directory @<:@]pkg_default[@:>@])
-+AC_ARG_WITH([pkgconfigdir],
-+ [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
-+ [with_pkgconfigdir=]pkg_default)
-+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
-+m4_popdef([pkg_default])
-+m4_popdef([pkg_description])
-+])dnl PKG_INSTALLDIR
-+
-+
-+dnl PKG_NOARCH_INSTALLDIR([DIRECTORY])
-+dnl --------------------------------
-+dnl Since: 0.27
-+dnl
-+dnl Substitutes the variable noarch_pkgconfigdir as the location where a
-+dnl module should install arch-independent pkg-config .pc files. By
-+dnl default the directory is $datadir/pkgconfig, but the default can be
-+dnl changed by passing DIRECTORY. The user can override through the
-+dnl --with-noarch-pkgconfigdir parameter.
-+AC_DEFUN([PKG_NOARCH_INSTALLDIR],
-+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
-+m4_pushdef([pkg_description],
-+ [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
-+AC_ARG_WITH([noarch-pkgconfigdir],
-+ [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
-+ [with_noarch_pkgconfigdir=]pkg_default)
-+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
-+m4_popdef([pkg_default])
-+m4_popdef([pkg_description])
-+])dnl PKG_NOARCH_INSTALLDIR
-+
-+
-+dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
-+dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-+dnl -------------------------------------------
-+dnl Since: 0.28
-+dnl
-+dnl Retrieves the value of the pkg-config variable for the given module.
-+AC_DEFUN([PKG_CHECK_VAR],
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-+AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
-+
-+_PKG_CONFIG([$1], [variable="][$3]["], [$2])
-+AS_VAR_COPY([$1], [pkg_cv_][$1])
-+
-+AS_VAR_IF([$1], [""], [$5], [$4])dnl
-+])dnl PKG_CHECK_VAR
-+dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
-+dnl serial 11 (pkg-config-0.29)
-+dnl
-+dnl Copyright © 2004 Scott James Remnant <scott at netsplit.com>.
-+dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists at gmail.com>
-+dnl
-+dnl This program is free software; you can redistribute it and/or modify
-+dnl it under the terms of the GNU General Public License as published by
-+dnl the Free Software Foundation; either version 2 of the License, or
-+dnl (at your option) any later version.
-+dnl
-+dnl This program is distributed in the hope that it will be useful, but
-+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
-+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+dnl General Public License for more details.
-+dnl
-+dnl You should have received a copy of the GNU General Public License
-+dnl along with this program; if not, write to the Free Software
-+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+dnl 02111-1307, USA.
-+dnl
-+dnl As a special exception to the GNU General Public License, if you
-+dnl distribute this file as part of a program that contains a
-+dnl configuration script generated by Autoconf, you may include it under
-+dnl the same distribution terms that you use for the rest of that
-+dnl program.
-+
-+dnl PKG_PREREQ(MIN-VERSION)
-+dnl -----------------------
-+dnl Since: 0.29
-+dnl
-+dnl Verify that the version of the pkg-config macros are at least
-+dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's
-+dnl installed version of pkg-config, this checks the developer's version
-+dnl of pkg.m4 when generating configure.
-+dnl
-+dnl To ensure that this macro is defined, also add:
-+dnl m4_ifndef([PKG_PREREQ],
-+dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])])
-+dnl
-+dnl See the "Since" comment for each macro you use to see what version
-+dnl of the macros you require.
-+m4_defun([PKG_PREREQ],
-+[m4_define([PKG_MACROS_VERSION], [0.29])
-+m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
-+ [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
-+])dnl PKG_PREREQ
-+
-+dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])
-+dnl ----------------------------------
-+dnl Since: 0.16
-+dnl
-+dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
-+dnl first found in the path. Checks that the version of pkg-config found
-+dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
-+dnl used since that's the first version where most current features of
-+dnl pkg-config existed.
-+AC_DEFUN([PKG_PROG_PKG_CONFIG],
-+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
-+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
-+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
-+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
-+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
-+
-+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-+fi
-+if test -n "$PKG_CONFIG"; then
-+ _pkg_min_version=m4_default([$1], [0.9.0])
-+ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
-+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-+ AC_MSG_RESULT([yes])
-+ else
-+ AC_MSG_RESULT([no])
-+ PKG_CONFIG=""
-+ fi
-+fi[]dnl
-+])dnl PKG_PROG_PKG_CONFIG
-+
-+dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-+dnl -------------------------------------------------------------------
-+dnl Since: 0.18
-+dnl
-+dnl Check to see whether a particular set of modules exists. Similar to
-+dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
-+dnl
-+dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-+dnl only at the first occurence in configure.ac, so if the first place
-+dnl it's called might be skipped (such as if it is within an "if", you
-+dnl have to call PKG_CHECK_EXISTS manually
-+AC_DEFUN([PKG_CHECK_EXISTS],
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-+if test -n "$PKG_CONFIG" && \
-+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-+ m4_default([$2], [:])
-+m4_ifvaln([$3], [else
-+ $3])dnl
-+fi])
-+
-+dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-+dnl ---------------------------------------------
-+dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting
-+dnl pkg_failed based on the result.
-+m4_define([_PKG_CONFIG],
-+[if test -n "$$1"; then
-+ pkg_cv_[]$1="$$1"
-+ elif test -n "$PKG_CONFIG"; then
-+ PKG_CHECK_EXISTS([$3],
-+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
-+ test "x$?" != "x0" && pkg_failed=yes ],
-+ [pkg_failed=yes])
-+ else
-+ pkg_failed=untried
-+fi[]dnl
-+])dnl _PKG_CONFIG
-+
-+dnl _PKG_SHORT_ERRORS_SUPPORTED
-+dnl ---------------------------
-+dnl Internal check to see if pkg-config supports short errors.
-+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi[]dnl
-+])dnl _PKG_SHORT_ERRORS_SUPPORTED
-+
-+
-+dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-+dnl [ACTION-IF-NOT-FOUND])
-+dnl --------------------------------------------------------------
-+dnl Since: 0.4.0
-+dnl
-+dnl Note that if there is a possibility the first call to
-+dnl PKG_CHECK_MODULES might not happen, you should be sure to include an
-+dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-+AC_DEFUN([PKG_CHECK_MODULES],
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-+
-+pkg_failed=no
-+AC_MSG_CHECKING([for $1])
-+
-+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-+
-+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-+and $1[]_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.])
-+
-+if test $pkg_failed = yes; then
-+ AC_MSG_RESULT([no])
-+ _PKG_SHORT_ERRORS_SUPPORTED
-+ if test $_pkg_short_errors_supported = yes; then
-+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
-+ else
-+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-+
-+ m4_default([$4], [AC_MSG_ERROR(
-+[Package requirements ($2) were not met:
-+
-+$$1_PKG_ERRORS
-+
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-+
-+_PKG_TEXT])[]dnl
-+ ])
-+elif test $pkg_failed = untried; then
-+ AC_MSG_RESULT([no])
-+ m4_default([$4], [AC_MSG_FAILURE(
-+[The pkg-config script could not be found or is too old. Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
-+
-+_PKG_TEXT
-+
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
-+ ])
-+else
-+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
-+ AC_MSG_RESULT([yes])
-+ $3
-+fi[]dnl
-+])dnl PKG_CHECK_MODULES
-+
-+
-+dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-+dnl [ACTION-IF-NOT-FOUND])
-+dnl ---------------------------------------------------------------------
-+dnl Since: 0.29
-+dnl
-+dnl Checks for existence of MODULES and gathers its build flags with
-+dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags
-+dnl and VARIABLE-PREFIX_LIBS from --libs.
-+dnl
-+dnl Note that if there is a possibility the first call to
-+dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to
-+dnl include an explicit call to PKG_PROG_PKG_CONFIG in your
-+dnl configure.ac.
-+AC_DEFUN([PKG_CHECK_MODULES_STATIC],
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-+_save_PKG_CONFIG=$PKG_CONFIG
-+PKG_CONFIG="$PKG_CONFIG --static"
-+PKG_CHECK_MODULES($@)
-+PKG_CONFIG=$_save_PKG_CONFIG[]dnl
-+])dnl PKG_CHECK_MODULES_STATIC
-+
-+
-+dnl PKG_INSTALLDIR([DIRECTORY])
-+dnl -------------------------
-+dnl Since: 0.27
-+dnl
-+dnl Substitutes the variable pkgconfigdir as the location where a module
-+dnl should install pkg-config .pc files. By default the directory is
-+dnl $libdir/pkgconfig, but the default can be changed by passing
-+dnl DIRECTORY. The user can override through the --with-pkgconfigdir
-+dnl parameter.
-+AC_DEFUN([PKG_INSTALLDIR],
-+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
-+m4_pushdef([pkg_description],
-+ [pkg-config installation directory @<:@]pkg_default[@:>@])
-+AC_ARG_WITH([pkgconfigdir],
-+ [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
-+ [with_pkgconfigdir=]pkg_default)
-+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
-+m4_popdef([pkg_default])
-+m4_popdef([pkg_description])
-+])dnl PKG_INSTALLDIR
-+
-+
-+dnl PKG_NOARCH_INSTALLDIR([DIRECTORY])
-+dnl --------------------------------
-+dnl Since: 0.27
-+dnl
-+dnl Substitutes the variable noarch_pkgconfigdir as the location where a
-+dnl module should install arch-independent pkg-config .pc files. By
-+dnl default the directory is $datadir/pkgconfig, but the default can be
-+dnl changed by passing DIRECTORY. The user can override through the
-+dnl --with-noarch-pkgconfigdir parameter.
-+AC_DEFUN([PKG_NOARCH_INSTALLDIR],
-+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
-+m4_pushdef([pkg_description],
-+ [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
-+AC_ARG_WITH([noarch-pkgconfigdir],
-+ [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
-+ [with_noarch_pkgconfigdir=]pkg_default)
-+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
-+m4_popdef([pkg_default])
-+m4_popdef([pkg_description])
-+])dnl PKG_NOARCH_INSTALLDIR
-+
-+
-+dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
-+dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-+dnl -------------------------------------------
-+dnl Since: 0.28
-+dnl
-+dnl Retrieves the value of the pkg-config variable for the given module.
-+AC_DEFUN([PKG_CHECK_VAR],
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-+AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
-+
-+_PKG_CONFIG([$1], [variable="][$3]["], [$2])
-+AS_VAR_COPY([$1], [pkg_cv_][$1])
-+
-+AS_VAR_IF([$1], [""], [$5], [$4])dnl
-+])dnl PKG_CHECK_VAR
-+dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
-+dnl serial 11 (pkg-config-0.29)
-+dnl
-+dnl Copyright © 2004 Scott James Remnant <scott at netsplit.com>.
-+dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists at gmail.com>
-+dnl
-+dnl This program is free software; you can redistribute it and/or modify
-+dnl it under the terms of the GNU General Public License as published by
-+dnl the Free Software Foundation; either version 2 of the License, or
-+dnl (at your option) any later version.
-+dnl
-+dnl This program is distributed in the hope that it will be useful, but
-+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
-+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+dnl General Public License for more details.
-+dnl
-+dnl You should have received a copy of the GNU General Public License
-+dnl along with this program; if not, write to the Free Software
-+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+dnl 02111-1307, USA.
-+dnl
-+dnl As a special exception to the GNU General Public License, if you
-+dnl distribute this file as part of a program that contains a
-+dnl configuration script generated by Autoconf, you may include it under
-+dnl the same distribution terms that you use for the rest of that
-+dnl program.
-+
-+dnl PKG_PREREQ(MIN-VERSION)
-+dnl -----------------------
-+dnl Since: 0.29
-+dnl
-+dnl Verify that the version of the pkg-config macros are at least
-+dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's
-+dnl installed version of pkg-config, this checks the developer's version
-+dnl of pkg.m4 when generating configure.
-+dnl
-+dnl To ensure that this macro is defined, also add:
-+dnl m4_ifndef([PKG_PREREQ],
-+dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])])
-+dnl
-+dnl See the "Since" comment for each macro you use to see what version
-+dnl of the macros you require.
-+m4_defun([PKG_PREREQ],
-+[m4_define([PKG_MACROS_VERSION], [0.29])
-+m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
-+ [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
-+])dnl PKG_PREREQ
-+
-+dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])
-+dnl ----------------------------------
-+dnl Since: 0.16
-+dnl
-+dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
-+dnl first found in the path. Checks that the version of pkg-config found
-+dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
-+dnl used since that's the first version where most current features of
-+dnl pkg-config existed.
-+AC_DEFUN([PKG_PROG_PKG_CONFIG],
-+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
-+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
-+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
-+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
-+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
-+
-+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-+fi
-+if test -n "$PKG_CONFIG"; then
-+ _pkg_min_version=m4_default([$1], [0.9.0])
-+ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
-+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-+ AC_MSG_RESULT([yes])
-+ else
-+ AC_MSG_RESULT([no])
-+ PKG_CONFIG=""
-+ fi
-+fi[]dnl
-+])dnl PKG_PROG_PKG_CONFIG
-+
-+dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-+dnl -------------------------------------------------------------------
-+dnl Since: 0.18
-+dnl
-+dnl Check to see whether a particular set of modules exists. Similar to
-+dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
-+dnl
-+dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-+dnl only at the first occurence in configure.ac, so if the first place
-+dnl it's called might be skipped (such as if it is within an "if", you
-+dnl have to call PKG_CHECK_EXISTS manually
-+AC_DEFUN([PKG_CHECK_EXISTS],
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-+if test -n "$PKG_CONFIG" && \
-+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-+ m4_default([$2], [:])
-+m4_ifvaln([$3], [else
-+ $3])dnl
-+fi])
-+
-+dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-+dnl ---------------------------------------------
-+dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting
-+dnl pkg_failed based on the result.
-+m4_define([_PKG_CONFIG],
-+[if test -n "$$1"; then
-+ pkg_cv_[]$1="$$1"
-+ elif test -n "$PKG_CONFIG"; then
-+ PKG_CHECK_EXISTS([$3],
-+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
-+ test "x$?" != "x0" && pkg_failed=yes ],
-+ [pkg_failed=yes])
-+ else
-+ pkg_failed=untried
-+fi[]dnl
-+])dnl _PKG_CONFIG
-+
-+dnl _PKG_SHORT_ERRORS_SUPPORTED
-+dnl ---------------------------
-+dnl Internal check to see if pkg-config supports short errors.
-+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi[]dnl
-+])dnl _PKG_SHORT_ERRORS_SUPPORTED
-+
-+
-+dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-+dnl [ACTION-IF-NOT-FOUND])
-+dnl --------------------------------------------------------------
-+dnl Since: 0.4.0
-+dnl
-+dnl Note that if there is a possibility the first call to
-+dnl PKG_CHECK_MODULES might not happen, you should be sure to include an
-+dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-+AC_DEFUN([PKG_CHECK_MODULES],
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-+
-+pkg_failed=no
-+AC_MSG_CHECKING([for $1])
-+
-+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-+
-+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-+and $1[]_LIBS to avoid the need to call pkg-config.
-+See the pkg-config man page for more details.])
-+
-+if test $pkg_failed = yes; then
-+ AC_MSG_RESULT([no])
-+ _PKG_SHORT_ERRORS_SUPPORTED
-+ if test $_pkg_short_errors_supported = yes; then
-+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
-+ else
-+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-+
-+ m4_default([$4], [AC_MSG_ERROR(
-+[Package requirements ($2) were not met:
-+
-+$$1_PKG_ERRORS
-+
-+Consider adjusting the PKG_CONFIG_PATH environment variable if you
-+installed software in a non-standard prefix.
-+
-+_PKG_TEXT])[]dnl
-+ ])
-+elif test $pkg_failed = untried; then
-+ AC_MSG_RESULT([no])
-+ m4_default([$4], [AC_MSG_FAILURE(
-+[The pkg-config script could not be found or is too old. Make sure it
-+is in your PATH or set the PKG_CONFIG environment variable to the full
-+path to pkg-config.
-+
-+_PKG_TEXT
-+
-+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
-+ ])
-+else
-+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
-+ AC_MSG_RESULT([yes])
-+ $3
-+fi[]dnl
-+])dnl PKG_CHECK_MODULES
-+
-+
-+dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-+dnl [ACTION-IF-NOT-FOUND])
-+dnl ---------------------------------------------------------------------
-+dnl Since: 0.29
-+dnl
-+dnl Checks for existence of MODULES and gathers its build flags with
-+dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags
-+dnl and VARIABLE-PREFIX_LIBS from --libs.
-+dnl
-+dnl Note that if there is a possibility the first call to
-+dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to
-+dnl include an explicit call to PKG_PROG_PKG_CONFIG in your
-+dnl configure.ac.
-+AC_DEFUN([PKG_CHECK_MODULES_STATIC],
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-+_save_PKG_CONFIG=$PKG_CONFIG
-+PKG_CONFIG="$PKG_CONFIG --static"
-+PKG_CHECK_MODULES($@)
-+PKG_CONFIG=$_save_PKG_CONFIG[]dnl
-+])dnl PKG_CHECK_MODULES_STATIC
-+
-+
-+dnl PKG_INSTALLDIR([DIRECTORY])
-+dnl -------------------------
-+dnl Since: 0.27
-+dnl
-+dnl Substitutes the variable pkgconfigdir as the location where a module
-+dnl should install pkg-config .pc files. By default the directory is
-+dnl $libdir/pkgconfig, but the default can be changed by passing
-+dnl DIRECTORY. The user can override through the --with-pkgconfigdir
-+dnl parameter.
-+AC_DEFUN([PKG_INSTALLDIR],
-+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
-+m4_pushdef([pkg_description],
-+ [pkg-config installation directory @<:@]pkg_default[@:>@])
-+AC_ARG_WITH([pkgconfigdir],
-+ [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
-+ [with_pkgconfigdir=]pkg_default)
-+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
-+m4_popdef([pkg_default])
-+m4_popdef([pkg_description])
-+])dnl PKG_INSTALLDIR
-+
-+
-+dnl PKG_NOARCH_INSTALLDIR([DIRECTORY])
-+dnl --------------------------------
-+dnl Since: 0.27
-+dnl
-+dnl Substitutes the variable noarch_pkgconfigdir as the location where a
-+dnl module should install arch-independent pkg-config .pc files. By
-+dnl default the directory is $datadir/pkgconfig, but the default can be
-+dnl changed by passing DIRECTORY. The user can override through the
-+dnl --with-noarch-pkgconfigdir parameter.
-+AC_DEFUN([PKG_NOARCH_INSTALLDIR],
-+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
-+m4_pushdef([pkg_description],
-+ [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
-+AC_ARG_WITH([noarch-pkgconfigdir],
-+ [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
-+ [with_noarch_pkgconfigdir=]pkg_default)
-+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
-+m4_popdef([pkg_default])
-+m4_popdef([pkg_description])
-+])dnl PKG_NOARCH_INSTALLDIR
-+
-+
-+dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
-+dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-+dnl -------------------------------------------
-+dnl Since: 0.28
-+dnl
-+dnl Retrieves the value of the pkg-config variable for the given module.
-+AC_DEFUN([PKG_CHECK_VAR],
-+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-+AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
-+
-+_PKG_CONFIG([$1], [variable="][$3]["], [$2])
-+AS_VAR_COPY([$1], [pkg_cv_][$1])
-+
-+AS_VAR_IF([$1], [""], [$5], [$4])dnl
-+])dnl PKG_CHECK_VAR
-Index: b/src/configure.ac
-===================================================================
---- a/src/configure.ac
-+++ b/src/configure.ac
-@@ -29,6 +29,7 @@ m4_include([ltsugar.m4])
- m4_include([ltversion.m4])
- m4_include([lt~obsolete.m4])
- m4_include([config/isl.m4])
-+m4_include([config/pkg.m4])
-
- AC_INIT(move-if-change)
- AC_PREREQ(2.64)
-@@ -161,7 +162,6 @@ target_libraries="target-libgcc \
- target-libssp \
- target-libquadmath \
- target-libgfortran \
-- target-boehm-gc \
- target-libffi \
- target-libobjc \
- target-libada \
-@@ -2060,22 +2060,36 @@ done
- AC_ARG_ENABLE(objc-gc,
- [AS_HELP_STRING([--enable-objc-gc],
- [enable use of Boehm's garbage collector with the
-- GNU Objective-C runtime])],
--[case ,${enable_languages},:${enable_objc_gc}:${noconfigdirs} in
-- *,objc,*:*:yes:*target-boehm-gc*)
-- AC_MSG_ERROR([Boehm's garbage collector was requested yet not supported in this configuration])
-- ;;
--esac])
--
--# Make sure we only build Boehm's garbage collector if required.
--case ,${enable_languages},:${enable_objc_gc} in
-- *,objc,*:yes)
-- # Keep target-boehm-gc if requested for Objective-C.
-- ;;
-- *)
-- # Otherwise remove target-boehm-gc.
-- noconfigdirs="$noconfigdirs target-boehm-gc"
-- ;;
-+ GNU Objective-C runtime])])
-+AC_ARG_WITH([target-bdw-gc],
-+[AS_HELP_STRING([--with-target-bdw-gc=PATHLIST],
-+ [specify prefix directory for installed bdw-gc package.
-+ Equivalent to --with-target-bdw-gc-include=PATH/include
-+ plus --with-target-bdw-gc-lib=PATH/lib])])
-+AC_ARG_WITH([target-bdw-gc-include],
-+[AS_HELP_STRING([--with-target-bdw-gc-include=PATHLIST],
-+ [specify directories for installed bdw-gc include files])])
-+AC_ARG_WITH([target-bdw-gc-lib],
-+[AS_HELP_STRING([--with-target-bdw-gc-lib=PATHLIST],
-+ [specify directories for installed bdw-gc library])])
-+
-+case ,${enable_languages},:${enable_objc_gc} in *,objc,*:yes|*,objc,*:auto)
-+ AC_MSG_CHECKING([for bdw garbage collector])
-+ if test "x$with_target_bdw_gc$with_target_bdw_gc_include$with_target_bdw_gc_lib" = x; then
-+ dnl no bdw-gw options, fall back to the bdw-gc pkg-config module
-+ PKG_CHECK_EXISTS(bdw-gc,
-+ AC_MSG_RESULT([using bdw-gc pkg-config module]),
-+ AC_MSG_ERROR([no --with-target-bdw-gc options and no bdw-gc pkg-config module found]))
-+ else
-+ dnl bdw-gw options, first error checking, complete checking in libobjc
-+ if test "x$with_target_bdw_gc_include" = x && test "x$with_target_bdw_gc_lib" != x; then
-+ AC_MSG_ERROR([found --with-target-bdw-gc-lib but --with-target-bdw-gc-include missing])
-+ elif test "x$with_target_bdw_gc_include" != x && test "x$with_target_bdw_gc_lib" = x; then
-+ AC_MSG_ERROR([found --with-target-bdw-gc-include but --with-target-bdw-gc-lib missing])
-+ else
-+ AC_MSG_RESULT([using paths configured with --with-target-bdw-gc options])
-+ fi
-+ fi
- esac
-
- # Disable libcilkrts, libitm, libsanitizer, libvtv, liboffloadmic if we're not building C++
-Index: b/src/libobjc/Makefile.in
-===================================================================
---- a/src/libobjc/Makefile.in
-+++ b/src/libobjc/Makefile.in
-@@ -47,8 +47,6 @@ extra_ldflags_libobjc = @extra_ldflags_l
-
- top_builddir = .
-
---include ../boehm-gc/threads.mk
--
- libdir = $(exec_prefix)/lib
- libsubdir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)
-
-@@ -95,7 +93,7 @@ LIBTOOL_CLEAN = $(LIBTOOL) --mode=clea
- OBJC_GCFLAGS=@OBJC_GCFLAGS@
- OBJC_BOEHM_GC=@OBJC_BOEHM_GC@
- OBJC_BOEHM_GC_INCLUDES=@OBJC_BOEHM_GC_INCLUDES@
--OBJC_BOEHM_GC_LIBS=../boehm-gc/libgcjgc_convenience.la $(thread_libs_and_flags)
-+OBJC_BOEHM_GC_LIBS=@OBJC_BOEHM_GC_LIBS@
-
- INCLUDES = -I$(srcdir)/$(MULTISRCTOP)../gcc \
- -I$(srcdir)/$(MULTISRCTOP)../gcc/config \
-Index: b/src/libobjc/configure.ac
-===================================================================
---- a/src/libobjc/configure.ac
-+++ b/src/libobjc/configure.ac
-@@ -18,6 +18,8 @@
- #along with GCC; see the file COPYING3. If not see
- #<http://www.gnu.org/licenses/>.
-
-+m4_include([../config/pkg.m4])
-+
- AC_PREREQ(2.64)
- AC_INIT(package-unused, version-unused,, libobjc)
- AC_CONFIG_SRCDIR([objc/objc.h])
-@@ -57,26 +59,6 @@ AC_ARG_ENABLE(version-specific-runtime-l
- [version_specific_libs=no])
- AC_MSG_RESULT($version_specific_libs)
-
--AC_ARG_ENABLE(objc-gc,
--[ --enable-objc-gc enable the use of Boehm's garbage collector with
-- the GNU Objective-C runtime.],
--[case $enable_objc_gc in
-- no)
-- OBJC_GCFLAGS=''
-- OBJC_BOEHM_GC=''
-- OBJC_BOEHM_GC_INCLUDES=''
-- ;;
-- *)
-- OBJC_GCFLAGS='-DOBJC_WITH_GC=1'
-- OBJC_BOEHM_GC='libobjc_gc$(libsuffix).la'
-- OBJC_BOEHM_GC_INCLUDES='-I$(top_srcdir)/../boehm-gc/include -I../boehm-gc/include'
-- ;;
--esac],
--[OBJC_GCFLAGS=''; OBJC_BOEHM_GC=''; OBJC_BOEHM_GC_INCLUDES=''])
--AC_SUBST(OBJC_GCFLAGS)
--AC_SUBST(OBJC_BOEHM_GC)
--AC_SUBST(OBJC_BOEHM_GC_INCLUDES)
--
- # -----------
- # Directories
- # -----------
-@@ -214,6 +196,160 @@ GCC_CHECK_TLS
-
- gt_BITFIELD_TYPE_MATTERS
-
-+# -----------
-+# boehm-gc
-+# -----------
-+
-+AC_ARG_ENABLE(objc-gc,
-+[AS_HELP_STRING([--enable-objc-gc],
-+ [enable use of Boehm's garbage collector with the
-+ GNU Objective-C runtime])])
-+AC_ARG_WITH([target-bdw-gc],
-+[AS_HELP_STRING([--with-target-bdw-gc=PATHLIST],
-+ [specify prefix directory for installed bdw-gc package.
-+ Equivalent to --with-target-bdw-gc-include=PATH/include
-+ plus --with-target-bdw-gc-lib=PATH/lib])])
-+AC_ARG_WITH([target-bdw-gc-include],
-+[AS_HELP_STRING([--with-target-bdw-gc-include=PATHLIST],
-+ [specify directories for installed bdw-gc include files])])
-+AC_ARG_WITH([target-bdw-gc-lib],
-+[AS_HELP_STRING([--with-target-bdw-gc-lib=PATHLIST],
-+ [specify directories for installed bdw-gc library])])
-+
-+case "$enable_objc_gc" in
-+no)
-+ use_bdw_gc=no
-+ ;;
-+*)
-+ AC_MSG_CHECKING([for bdw garbage collector])
-+ if test "x$with_target_bdw_gc$with_target_bdw_gc_include$with_target_bdw_gc_lib" = x; then
-+ dnl no bdw-gw options, fall back to the bdw-gc pkg-config module
-+ PKG_CHECK_EXISTS(bdw-gc,
-+ AC_MSG_RESULT([using bdw-gc pkg-config module]),
-+ AC_MSG_ERROR([no --with-target-bdw-gc options and no bdw-gc pkg-config module found]))
-+ else
-+ dnl bdw-gw options passed by configure flags
-+ if test "x$with_target_bdw_gc_include" = x && test "x$with_target_bdw_gc_lib" != x; then
-+ AC_MSG_ERROR([found --with-target-bdw-gc-lib but --with-target-bdw-gc-include missing])
-+ elif test "x$with_target_bdw_gc_include" != x && test "x$with_target_bdw_gc_lib" = x; then
-+ AC_MSG_ERROR([found --with-target-bdw-gc-include but --with-target-bdw-gc-lib missing])
-+ else
-+ AC_MSG_RESULT([using paths configured with --with-target-bdw-gc options])
-+ fi
-+ mldir=`${CC-gcc} --print-multi-directory 2>/dev/null`
-+ bdw_val=
-+ if test "x$with_target_bdw_gc" != x; then
-+ for i in `echo $with_target_bdw_gc | tr ',' ' '`; do
-+ case "$i" in
-+ *=*) sd=${i%%=*}; d=${i#*=} ;;
-+ *) sd=.; d=$i ;;
-+ esac
-+ if test "$mldir" = "$sd"; then
-+ bdw_val=$d
-+ fi
-+ done
-+ if test "x$bdw_val" = x; then
-+ AC_MSG_ERROR([no multilib path ($mldir) found in --with-target-bdw-gc])
-+ fi
-+ bdw_inc_dir="$bdw_val/include"
-+ bdw_lib_dir="$bdw_val/lib"
-+ fi
-+ bdw_val=
-+ if test "x$with_target_bdw_gc_include" != x; then
-+ for i in `echo $with_target_bdw_gc_include | tr ',' ' '`; do
-+ case "$i" in
-+ *=*) sd=${i%%=*}; d=${i#*=} ;;
-+ *) sd=.; d=$i ;;
-+ esac
-+ if test "$mldir" = "$sd"; then
-+ bdw_val=$d
-+ fi
-+ done
-+ if test "x$bdw_val" = x; then
-+ AC_MSG_ERROR([no multilib path ($mldir) found in --with-target-bdw-gc-include])
-+ fi
-+ bdw_inc_dir="$bdw_val"
-+ fi
-+ bdw_val=
-+ if test "x$with_target_bdw_gc_lib" != x; then
-+ for i in `echo $with_target_bdw_gc_lib | tr ',' ' '`; do
-+ case "$i" in
-+ *=*) sd=${i%%=*}; d=${i#*=} ;;
-+ *) sd=.; d=$i ;;
-+ esac
-+ if test "$mldir" = "$sd"; then
-+ bdw_val=$d
-+ fi
-+ done
-+ if test "x$bdw_val" = x; then
-+ AC_MSG_ERROR([no multilib path ($mldir) found in --with-target-bdw-gc-lib])
-+ fi
-+ bdw_lib_dir="$bdw_val"
-+ fi
-+ if test "x$bdw_inc_dir" = x; then
-+ AC_MSG_ERROR([no multilib path ($mldir) found in --with-target-bdw-gc-include])
-+ fi
-+ if test "x$bdw_lib_dir" = x; then
-+ AC_MSG_ERROR([no multilib path ($mldir) found in --with-target-bdw-gc-lib])
-+ fi
-+ BDW_GC_CFLAGS="-I$bdw_inc_dir"
-+ BDW_GC_LIBS="-L$bdw_lib_dir -lgc"
-+ AC_MSG_RESULT([found])
-+ fi
-+
-+ AC_MSG_CHECKING([for system boehm-gc])
-+ save_CFLAGS=$CFLAGS
-+ save_LIBS=$LIBS
-+ CFLAGS="$CFLAGS $BDW_GC_CFLAGS"
-+ LIBS="$LIBS $BDW_GC_LIBS"
-+ dnl the link test is not good enough for ARM32 multilib detection,
-+ dnl first check to link, then to run
-+ AC_LINK_IFELSE(
-+ [AC_LANG_PROGRAM([#include <gc/gc.h>],[GC_init()])],
-+ [
-+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
-+ #include <gc/gc.h>
-+ int main() {
-+ GC_init();
-+ return 0;
-+ }
-+ ]])],
-+ [system_bdw_gc_found=yes],
-+ [system_bdw_gc_found=no],
-+ dnl assume no system boehm-gc for cross builds ...
-+ [system_bdw_gc_found=no]
-+ )
-+ ],
-+ [system_bdw_gc_found=no])
-+ CFLAGS=$save_CFLAGS
-+ LIBS=$save_LIBS
-+ if test x$enable_objc_gc = xauto && test x$system_bdw_gc_found = xno; then
-+ AC_MSG_WARN([system bdw-gc not found, not building libobjc_gc])
-+ use_bdw_gc=no
-+ elif test x$enable_objc_gc = xyes && test x$system_bdw_gc_found = xno; then
-+ AC_MSG_ERROR([system bdw-gc required but not found])
-+ else
-+ use_bdw_gc=yes
-+ AC_MSG_RESULT([found])
-+ fi
-+esac
-+
-+if test "$use_bdw_gc" = no; then
-+ OBJC_GCFLAGS=''
-+ OBJC_BOEHM_GC=''
-+ OBJC_BOEHM_GC_INCLUDES=''
-+ OBJC_BOEHM_GC_LIBS=''
-+else
-+ OBJC_GCFLAGS='-DOBJC_WITH_GC=1'
-+ OBJC_BOEHM_GC='libobjc_gc$(libsuffix).la'
-+ OBJC_BOEHM_GC_INCLUDES=$BDW_GC_CFLAGS
-+ OBJC_BOEHM_GC_LIBS=$BDW_GC_LIBS
-+fi
-+AC_SUBST(OBJC_GCFLAGS)
-+AC_SUBST(OBJC_BOEHM_GC)
-+AC_SUBST(OBJC_BOEHM_GC_INCLUDES)
-+AC_SUBST(OBJC_BOEHM_GC_LIBS)
-+
- # ------
- # Output
- # ------
-Index: b/src/libobjc/gc.c
-===================================================================
---- a/src/libobjc/gc.c
-+++ b/src/libobjc/gc.c
-@@ -36,7 +36,7 @@ see the files COPYING3 and COPYING.RUNTI
- #include "objc/runtime.h"
- #include "objc-private/module-abi-8.h"
-
--#include <gc.h>
-+#include <gc/gc.h>
- #include <limits.h>
-
- /* gc_typed.h uses the following but doesn't declare them */
-@@ -44,7 +44,7 @@ typedef GC_word word;
- typedef GC_signed_word signed_word;
- #define BITS_PER_WORD (CHAR_BIT * sizeof (word))
-
--#include <gc_typed.h>
-+#include <gc/gc_typed.h>
-
- /* The following functions set up in `mask` the corresponding pointers.
- The offset is incremented with the size of the type. */
-Index: b/src/libobjc/memory.c
-===================================================================
---- a/src/libobjc/memory.c
-+++ b/src/libobjc/memory.c
-@@ -41,7 +41,7 @@ see the files COPYING3 and COPYING.RUNTI
- #include "objc/runtime.h"
-
- #if OBJC_WITH_GC
--#include <gc.h>
-+#include <gc/gc.h>
-
- void *
- objc_malloc (size_t size)
-Index: b/src/libobjc/objects.c
-===================================================================
---- a/src/libobjc/objects.c
-+++ b/src/libobjc/objects.c
-@@ -31,8 +31,8 @@ see the files COPYING3 and COPYING.RUNTI
- #include <string.h> /* For memcpy() */
-
- #if OBJC_WITH_GC
--# include <gc.h>
--# include <gc_typed.h>
-+# include <gc/gc.h>
-+# include <gc/gc_typed.h>
- #endif
-
- /* FIXME: The semantics of extraBytes are not really clear. */
diff --git a/debian/patches/libstdc++-test-installed.diff b/debian/patches/libstdc++-test-installed.diff
index 8bc0a1d..b73e8a8 100644
--- a/debian/patches/libstdc++-test-installed.diff
+++ b/debian/patches/libstdc++-test-installed.diff
@@ -36,7 +36,7 @@ Index: b/src/libstdc++-v3/testsuite/lib/libstdc++.exp
set shlib_ext [get_shlib_extension]
v3track flags_file 2
-@@ -151,7 +161,11 @@ proc libstdc++_init { testfile } {
+@@ -154,7 +164,11 @@ proc libstdc++_init { testfile } {
# Locate libgcc.a so we don't need to account for different values of
# SHLIB_EXT on different platforms
@@ -49,7 +49,7 @@ Index: b/src/libstdc++-v3/testsuite/lib/libstdc++.exp
if {$gccdir != ""} {
set gccdir [file dirname $gccdir]
append ld_library_path_tmp ":${gccdir}"
-@@ -160,7 +174,11 @@ proc libstdc++_init { testfile } {
+@@ -163,7 +177,11 @@ proc libstdc++_init { testfile } {
# Locate libgomp. This is only required for parallel mode.
set v3-libgomp 0
@@ -62,7 +62,7 @@ Index: b/src/libstdc++-v3/testsuite/lib/libstdc++.exp
if {$libgompdir != ""} {
set v3-libgomp 1
set libgompdir [file dirname $libgompdir]
-@@ -182,7 +200,12 @@ proc libstdc++_init { testfile } {
+@@ -185,7 +203,12 @@ proc libstdc++_init { testfile } {
# Locate libstdc++ shared library. (ie libstdc++.so.)
set v3-sharedlib 0
diff --git a/debian/patches/pr66368.diff b/debian/patches/pr66368.diff
index 78c1439..c6bed26 100644
--- a/debian/patches/pr66368.diff
+++ b/debian/patches/pr66368.diff
@@ -16,7 +16,7 @@ Index: b/src/libgo/Makefile.in
===================================================================
--- a/src/libgo/Makefile.in
+++ b/src/libgo/Makefile.in
-@@ -460,6 +460,7 @@ WARN_CFLAGS = $(WARN_FLAGS) $(WERROR)
+@@ -456,6 +456,7 @@ WARN_CFLAGS = $(WARN_FLAGS) $(WERROR)
AM_CPPFLAGS = -I $(srcdir)/runtime $(LIBFFIINCS) $(PTHREAD_CFLAGS)
ACLOCAL_AMFLAGS = -I ./config -I ../config
AM_CFLAGS = -fexceptions -fnon-call-exceptions -fplan9-extensions \
diff --git a/debian/patches/skip-bootstrap-multilib.diff b/debian/patches/skip-bootstrap-multilib.diff
index 402d88c..8567224 100644
--- a/debian/patches/skip-bootstrap-multilib.diff
+++ b/debian/patches/skip-bootstrap-multilib.diff
@@ -26,7 +26,7 @@ Index: b/src/libstdc++-v3/acinclude.m4
===================================================================
--- a/src/libstdc++-v3/acinclude.m4
+++ b/src/libstdc++-v3/acinclude.m4
-@@ -2848,7 +2848,20 @@ dnl
+@@ -2901,7 +2901,20 @@ dnl
AC_DEFUN([GLIBCXX_ENABLE_DEBUG], [
AC_MSG_CHECKING([for additional debug build])
GLIBCXX_ENABLE(libstdcxx-debug,$1,,[build extra debug library])
diff --git a/debian/patches/sys-auxv-header.diff b/debian/patches/sys-auxv-header.diff
index 9ce1baa..d3c3287 100644
--- a/debian/patches/sys-auxv-header.diff
+++ b/debian/patches/sys-auxv-header.diff
@@ -4,7 +4,7 @@ Index: b/src/gcc/configure.ac
===================================================================
--- a/src/gcc/configure.ac
+++ b/src/gcc/configure.ac
-@@ -1105,6 +1105,7 @@ AC_HEADER_TIOCGWINSZ
+@@ -1112,6 +1112,7 @@ AC_HEADER_TIOCGWINSZ
AC_CHECK_HEADERS(limits.h stddef.h string.h strings.h stdlib.h time.h iconv.h \
fcntl.h ftw.h unistd.h sys/file.h sys/time.h sys/mman.h \
sys/resource.h sys/param.h sys/times.h sys/stat.h \
@@ -16,7 +16,7 @@ Index: b/src/gcc/config.in
===================================================================
--- a/src/gcc/config.in
+++ b/src/gcc/config.in
-@@ -1761,6 +1761,12 @@
+@@ -1768,6 +1768,12 @@
#endif
diff --git a/debian/rules.patch b/debian/rules.patch
index 1a60aa8..ac3be21 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -13,7 +13,6 @@ series_file ?= $(patchdir)/series
# which patches should be applied?
debian_patches = \
- libobjc-system-gc \
$(if $(with_linaro_branch),gcc-linaro) \
$(if $(with_linaro_branch),gcc-linaro-no-macros) \
$(if $(with_linaro_branch),linaro-issue2575) \
--
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