[gcc-7] 241/354: Link libgnat with libatomic on armel. Closes: #861734.

[Ximin Luo]

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

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

commit fb6fd5c74f1e7aab2f91c41e708b9c1ba2b6b7ca
Author: nicolas <nicolas at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Fri Jun 30 11:44:57 2017 +0000

    Link libgnat with libatomic on armel. Closes: #861734.
    
    git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9563 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog                        |  1 +
 debian/patches/ada-armel-libatomic.diff | 33 +++++++++++++++++++++++++++++++++
 debian/rules.patch                      |  1 +
 3 files changed, 35 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 503421e..c6a185c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ gcc-7 (7.1.0-9) UNRELEASED; urgency=medium
 
   [ Nicolas Boulenguez ]
   * ada-gcc-name.diff: unpatch gnatchop. Addresses: #856274.
+  * Link libgnat with libatomic on armel. Closes: #861734.
 
  -- Matthias Klose <doko at debian.org>  Fri, 30 Jun 2017 08:32:40 +0200
 
diff --git a/debian/patches/ada-armel-libatomic.diff b/debian/patches/ada-armel-libatomic.diff
new file mode 100644
index 0000000..a4a4316
--- /dev/null
+++ b/debian/patches/ada-armel-libatomic.diff
@@ -0,0 +1,33 @@
+Description: link libgnat with libatomic on armel
+ On other architectures, the link step does not change because we link
+ with --as-needed (ada-link-lib.diff).
+ .
+ Libatomic becomes an artificial dependency for Ada in Makefile.def,
+ so a better solution is welcome.
+ .
+ Please read ada-changes-in-autogen-output.diff about src/Makefile.def.
+Bug-Debian: https://bugs.debian.org/861734
+Author: Matthias Klose <doko at debian.org>
+Author: Nicolas Boulenguez <nicolas at debian.org>
+
+--- a/src/gcc/ada/gcc-interface/Makefile.in
++++ b/src/gcc/ada/gcc-interface/Makefile.in
+@@ -1948,6 +1948,7 @@
+
+ # ARM linux, GNU eabi
+ ifeq ($(strip $(filter-out arm% linux-gnueabi%,$(target_cpu) $(target_os))),)
++  MISCLIB = -L../../../$(target_alias)/libatomic/.libs -latomic
+   LIBGNAT_TARGET_PAIRS = \
+   a-intnam.ads<a-intnam-linux.ads \
+   s-inmaop.adb<s-inmaop-posix.adb \
+--- a/src/Makefile.def
++++ b/src/Makefile.def
+@@ -367,6 +367,8 @@
+ dependencies = { module=all-gnattools; on=all-target-libgnatvsn; };
+ dependencies = { module=all-target-libgnatvsn; on=all-target-libada; };
+ 
++dependencies = { module=all-target-libada; on=all-libatomic; };
++
+ // Depending on the specific configuration, the LTO plugin will either use the
+ // generic libiberty build or the specific build for linker plugins.
+ dependencies = { module=all-lto-plugin; on=all-libiberty; };
diff --git a/debian/rules.patch b/debian/rules.patch
index 3d5031a..62dc977 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -146,6 +146,7 @@ debian_patches += ada-arm
 
   debian_patches += ada-link-shlib
   debian_patches += ada-lib-info-source-date-epoch
+  debian_patches += ada-armel-libatomic
 #endif
 
 

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