[gcc-7] 240/354: ada-gcc-name.diff: unpatch gnatchop. Addresses: #856274.

[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 8ffb29d3de547ee4a357fa1d1ba157ad59b70dd5
Author: nicolas <nicolas at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Fri Jun 30 11:44:47 2017 +0000

    ada-gcc-name.diff: unpatch gnatchop. Addresses: #856274.
    
    git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9562 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog                 | 12 +++++++++++-
 debian/patches/ada-gcc-name.diff | 22 +++-------------------
 2 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5a67d58..503421e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,14 @@
-gcc-7 (7.1.0-8) UNRELEASED; urgency=medium
+gcc-7 (7.1.0-9) UNRELEASED; urgency=medium
+
+  [ Matthias Klose ]
+  * gcc-linaro-revert-r49596.diff: fix build for the linaro branch.
+
+  [ Nicolas Boulenguez ]
+  * ada-gcc-name.diff: unpatch gnatchop. Addresses: #856274.
+
+ -- Matthias Klose <doko at debian.org>  Fri, 30 Jun 2017 08:32:40 +0200
+
+gcc-7 (7.1.0-8) unstable; urgency=medium
 
   * Update to SVN 20170629 (r249793) from the gcc-7-branch.
 
diff --git a/debian/patches/ada-gcc-name.diff b/debian/patches/ada-gcc-name.diff
index bb58919..ef6c223 100644
--- a/debian/patches/ada-gcc-name.diff
+++ b/debian/patches/ada-gcc-name.diff
@@ -1,6 +1,9 @@
 Description: ensure that gnat tools execute the same GCC version
  The "gcc" default compiler may differ from "gcc-BV", where BV is the
  GCC base version of the tools.
+ .
+ Gnatchop already handles this issue by extracting parts of the resolved path
+ to its command name at run time.
 Forwarded: not-needed
 Author: Ludovic Brenta <lbrenta at debian.org>
 Author: Nicolas Boulenguez <nicolas at debian.org>
@@ -45,25 +48,6 @@ Author: Nicolas Boulenguez <nicolas at debian.org>
     --  Default compiler, binder, linker programs
  
     Saved_Gcc      : String_Access := null;
---- a/src/gcc/ada/gnatchop.adb
-+++ b/src/gcc/ada/gnatchop.adb
-@@ -36,6 +36,7 @@
- with GNAT.Heap_Sort_G;
- with GNAT.Table;
- 
-+with Gnatvsn;
- with Switch;                     use Switch;
- with Types;
- 
-@@ -44,7 +45,7 @@
-    Config_File_Name : constant String_Access := new String'("gnat.adc");
-    --  The name of the file holding the GNAT configuration pragmas
- 
--   Gcc : String_Access := new String'("gcc");
-+   Gcc : String_Access := new String'("gcc-" & Gnatvsn.Library_Version);
-    --  May be modified by switch --GCC=
- 
-    Gcc_Set : Boolean := False;
 --- a/src/gcc/ada/mdll-utl.adb
 +++ b/src/gcc/ada/mdll-utl.adb
 @@ -29,6 +29,7 @@

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