[gcc-7] 58/354: * Drop the ada-revert-pr63225 patch, only needed for libgnatvsn. * Always apply the ada patches.

Ximin Luo infinity0 at debian.org
Thu Nov 23 15:50:30 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 d543abb9629ac0df28c3141dca13224d1f2e36b5
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Fri Nov 25 12:19:30 2016 +0000

      * Drop the ada-revert-pr63225 patch, only needed for libgnatvsn.
      * Always apply the ada patches.
    
    
    git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9144 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog                       |  2 +
 debian/patches/ada-revert-pr63225.diff | 97 ----------------------------------
 debian/rules.patch                     | 14 ++---
 3 files changed, 9 insertions(+), 104 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b4c870b..b7197da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ gcc-7 (7-20161125-1) experimental; urgency=medium
   * gdc: Link with the shared libgphobos runtime by default.
   * Fix PR middle-end/78501, proposed patch.
   * Fix dependency generation for libgphobos multilib builds.
+  * Drop the ada-revert-pr63225 patch, only needed for libgnatvsn.
+  * Always apply the ada patches.
 
   [ YunQiang Su ]
   * Update gnat patches for GCC 7, stop building libgnatvsn and libgnatprj.
diff --git a/debian/patches/ada-revert-pr63225.diff b/debian/patches/ada-revert-pr63225.diff
deleted file mode 100644
index 5355777..0000000
--- a/debian/patches/ada-revert-pr63225.diff
+++ /dev/null
@@ -1,97 +0,0 @@
-# DP: Revert the changes made to allow bootstrapping with -fno-inline.
-# DP: We allow inlining during bootstrap and this change breaks aliversion compatibility
-# DP: with earlier uploads of libgnatvsn5.  This patch shall be removed in the next
-# DP: major version of GNAT.
-
-Index: b/src/gcc/ada/uintp.adb
-===================================================================
---- a/src/gcc/ada/uintp.adb
-+++ b/src/gcc/ada/uintp.adb
-@@ -171,6 +171,22 @@ package body Uintp is
-    --  If Discard_Quotient is True, Quotient is set to No_Uint
-    --  If Discard_Remainder is True, Remainder is set to No_Uint
- 
-+   function Vector_To_Uint
-+     (In_Vec   : UI_Vector;
-+      Negative : Boolean) return Uint;
-+   --  Functions that calculate values in UI_Vectors, call this function to
-+   --  create and return the Uint value. In_Vec contains the multiple precision
-+   --  (Base) representation of a non-negative value. Leading zeroes are
-+   --  permitted. Negative is set if the desired result is the negative of the
-+   --  given value. The result will be either the appropriate directly
-+   --  represented value, or a table entry in the proper canonical format is
-+   --  created and returned.
-+   --
-+   --  Note that Init_Operand puts a signed value in the result vector, but
-+   --  Vector_To_Uint is always presented with a non-negative value. The
-+   --  processing of signs is something that is done by the caller before
-+   --  calling Vector_To_Uint.
-+
-    ------------
-    -- Direct --
-    ------------
-Index: b/src/gcc/ada/uintp.ads
-===================================================================
---- a/src/gcc/ada/uintp.ads
-+++ b/src/gcc/ada/uintp.ads
-@@ -90,18 +90,6 @@ package Uintp is
-    Uint_Minus_80  : constant Uint;
-    Uint_Minus_128 : constant Uint;
- 
--   type UI_Vector is array (Pos range <>) of Int;
--   --  Vector containing the integer values of a Uint value
--
--   --  Note: An earlier version of this package used pointers of arrays of Ints
--   --  (dynamically allocated) for the Uint type. The change leads to a few
--   --  less natural idioms used throughout this code, but eliminates all uses
--   --  of the heap except for the table package itself. For example, Uint
--   --  parameters are often converted to UI_Vectors for internal manipulation.
--   --  This is done by creating the local UI_Vector using the function N_Digits
--   --  on the Uint to find the size needed for the vector, and then calling
--   --  Init_Operand to copy the values out of the table into the vector.
--
-    -----------------
-    -- Subprograms --
-    -----------------
-@@ -264,22 +252,6 @@ package Uintp is
-    --  function is used for capacity checks, and it can be one bit off
-    --  without affecting its usage.
- 
--   function Vector_To_Uint
--     (In_Vec   : UI_Vector;
--      Negative : Boolean) return Uint;
--   --  Functions that calculate values in UI_Vectors, call this function to
--   --  create and return the Uint value. In_Vec contains the multiple precision
--   --  (Base) representation of a non-negative value. Leading zeroes are
--   --  permitted. Negative is set if the desired result is the negative of the
--   --  given value. The result will be either the appropriate directly
--   --  represented value, or a table entry in the proper canonical format is
--   --  created and returned.
--   --
--   --  Note that Init_Operand puts a signed value in the result vector, but
--   --  Vector_To_Uint is always presented with a non-negative value. The
--   --  processing of signs is something that is done by the caller before
--   --  calling Vector_To_Uint.
--
-    ---------------------
-    -- Output Routines --
-    ---------------------
-@@ -527,6 +499,18 @@ private
-    --  UI_Vector is defined for this purpose and some internal subprograms
-    --  used for converting from one to the other are defined.
- 
-+   type UI_Vector is array (Pos range <>) of Int;
-+   --  Vector containing the integer values of a Uint value
-+
-+   --  Note: An earlier version of this package used pointers of arrays of Ints
-+   --  (dynamically allocated) for the Uint type. The change leads to a few
-+   --  less natural idioms used throughout this code, but eliminates all uses
-+   --  of the heap except for the table package itself. For example, Uint
-+   --  parameters are often converted to UI_Vectors for internal manipulation.
-+   --  This is done by creating the local UI_Vector using the function N_Digits
-+   --  on the Uint to find the size needed for the vector, and then calling
-+   --  Init_Operand to copy the values out of the table into the vector.
-+
-    type Uint_Entry is record
-       Length : Pos;
-       --  Length of entry in Udigits table in digits (i.e. in words)
diff --git a/debian/rules.patch b/debian/rules.patch
index b062dd4..3aab020 100644
--- a/debian/rules.patch
+++ b/debian/rules.patch
@@ -110,9 +110,9 @@ endif
 
 debian_patches += ada-arm
 debian_patches += ada-kfreebsd
-debian_patches += ada-revert-pr63225
 
-ifeq ($(with_ada),yes)
+# there should be no harm to always apply these, except for new GCC versions
+#ifeq ($(with_ada),yes)
   debian_patches += \
 	ada-driver-check \
 	ada-gcc-name \
@@ -126,18 +126,18 @@ ifeq ($(with_ada),yes)
 	ada-nobiarch-check
   endif
 
-  ifeq ($(with_libgnat),yes)
+  #ifeq ($(with_libgnat),yes)
     debian_patches += \
 	ada-link-lib \
 	ada-acats
-  endif
-  ifeq ($(with_gnatsjlj),yes)
+  #endif
+  #ifeq ($(with_gnatsjlj),yes)
     debian_patches += \
 	ada-sjlj
-  endif
+  #endif
 
   debian_patches += ada-link-shlib
-endif
+#endif
 
 
 ifeq ($(with_d),yes)

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



More information about the Reproducible-commits mailing list