-patch -p1 < "$SPELL_DIRECTORY/0001-remove-libffi.patch" &&
-
-# fix build of gprbuild
-patch -p1 < "$SPELL_DIRECTORY/integer_parameter_restrictions.patch"
+patch -p1 < "$SPELL_DIRECTORY/0001-remove-libffi.patch"
diff --git a/gnu/gcc/UP_TRIGGERS b/gnu/gcc/UP_TRIGGERS
index 9d126ee..af0684c 100755
--- a/gnu/gcc/UP_TRIGGERS
+++ b/gnu/gcc/UP_TRIGGERS
@@ -15,6 +15,8 @@ if [ "$VERSION" != "$OLD_SPELL_VERSION" ]; then
# for C++ ABI change in 5.1 and, probably, for each major version change
too
if list_find "$GCC_COMPILER" c++ \
&& [[ ${OLD_SPELL_VERSION%%.*} != ${VERSION%%.*} ]]; then
+# gcc-5.x,y seems ok
+if [[ ${OLD_SPELL_VERSION%%.*} != "5" ]];then
message "This is an ABI incompatible update of g++..."
message "Determining which spells need to be recast, this may take a
while."
@@ -29,5 +31,6 @@ if [ "$VERSION" != "$OLD_SPELL_VERSION" ]; then
up_trigger $other_spell cast_self
fi
done
+fi # not v5
fi
fi
diff --git a/gnu/gcc/integer_parameter_restrictions.patch
b/gnu/gcc/integer_parameter_restrictions.patch
deleted file mode 100644
index 7516ee5..0000000
--- a/gnu/gcc/integer_parameter_restrictions.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/gcc/ada/s-rident.ads 2014-07-17 09:04:32.000000000 +0200
-+++ b/src/ada/s-rident.ads 2015-05-06 12:53:32.000000000 +0200
-@@ -6,7 +6,7 @@
- --
--
- -- S p e c
--
- --
--
---- Copyright (C) 1992-2014, Free Software Foundation, Inc.
--
-+-- Copyright (C) 1992-2015, Free Software Foundation, Inc.
--
- --
--
- -- GNAT is free software; you can redistribute it and/or modify it under
--
- -- terms of the GNU General Public License as published by the Free Soft-
--
-@@ -15,9 +15,9 @@
- -- OUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
--
- -- or FITNESS FOR A PARTICULAR PURPOSE.
--
- --
--
---- As a special exception under Section 7 of GPL version 3, you are granted
--
---- additional permissions described in the GCC Runtime Library Exception,
--
---- version 3.1, as published by the Free Software Foundation.
--
-+--
--
-+--
--
-+--
--
- --
--
- -- You should have received a copy of the GNU General Public License and
--
- -- a copy of the GCC Runtime Library Exception along with this program;
--
-@@ -255,6 +255,11 @@ package System.Rident is
- No_Specification_Of_Aspect .. Max_Storage_At_Blocking;
- -- All restrictions that take a parameter
-
-+ subtype Integer_Parameter_Restrictions is
-+ Restriction_Id range
-+ Max_Protected_Entries .. Max_Storage_At_Blocking;
-+ -- All restrictions taking an integer parameter
-+
- subtype Checked_Parameter_Restrictions is
- All_Parameter_Restrictions range
- Max_Protected_Entries .. Max_Entry_Queue_Length;
[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (1d302c824808b32399dfb5440a2414a398efe5a3),
Treeve Jelbert, 04/27/2016