gnu/gcc: fix build of gprbuild

5 files changed, 56 insertions, 4 deletions

diff --git a/gnu/gcc/DETAILS b/gnu/gcc/DETAILS
index 162f78fd6d..458bfb7358 100755
--- a/gnu/gcc/DETAILS
+++ b/gnu/gcc/DETAILS
@@ -1,6 +1,6 @@
            SPELL=gcc
          VERSION=5.1.0
-      PATCHLEVEL=0
+      PATCHLEVEL=1
  BASE_SOURCE_URL="ftp://ftp.gnu.org/pub/gnu/gcc/gcc-$VERSION"
           SOURCE=gcc-$VERSION.tar.bz2
          SOURCE2=$SOURCE.sig
@@ -42,7 +42,7 @@ if list_find "$GCC_COMPILER" "ada" ; then
 #
 
   case "${SMGL_COMPAT_ARCHS[1]}" in
-    x86_64) VERSION13=4.9.1 ARCH13=x86_64 ;;
+    x86_64) VERSION13=5.1.0 ARCH13=x86_64 ;;
     *)      VERSION13=4.7.1 ARCH13=i686 ;;
   esac
       SOURCE13=ada-$VERSION13-$ARCH13-pc-linux-gnu.tar.bz2
diff --git a/gnu/gcc/HISTORY b/gnu/gcc/HISTORY
index 57788d2216..759d4872c4 100644
--- a/gnu/gcc/HISTORY
+++ b/gnu/gcc/HISTORY
@@ -1,3 +1,8 @@
+2015-06-20 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de>
+	* PRE_BUILD, integer_parameter_restrictions.patch: fix build of gprbuild 2015
+	* DETAILS: PATCHLEVEL++
+	* INSTALL: create versioned symlinks for libgnat and libgnarl
+
 2015-05-29 Remko van der Vossen <wich@sourcemage.org>
 	* UP_TRIGGERS: find C++ ELF objects based on ELF DT_NEEDED entries
 	  Probably more successful at finding all C++ ELF objects
diff --git a/gnu/gcc/INSTALL b/gnu/gcc/INSTALL
index 18870957bf..56151fa8e3 100755
--- a/gnu/gcc/INSTALL
+++ b/gnu/gcc/INSTALL
@@ -17,4 +17,12 @@ if [[ "$HOST" == x86_64-* ]]; then
   true  # see bug 8626 for info about this conditional
 fi &&
 
-ln -vsf ${TRACK_ROOT}/usr/bin/cpp ${INSTALL_ROOT}/lib/cpp
+ln -vsf ${TRACK_ROOT}/usr/bin/cpp ${INSTALL_ROOT}/lib/cpp &&
+
+if list_find "$GCC_COMPILER" "ada" ; then
+  cd ${INSTALL_ROOT}/usr/lib/gcc/${BUILD}/${VERSION}/adalib &&
+  local MAJOR_VERSION="$(echo $VERSION | cut -f1 -d.)" &&
+  local MINOR_VERSION="$(echo $VERSION | cut -f2 -d.)" &&
+  ln -sfn libgnat-${MAJOR_VERSION}.so libgnat-${MAJOR_VERSION}.${MINOR_VERSION}.so &&
+  ln -sfn libgnarl-${MAJOR_VERSION}.so libgnarl-${MAJOR_VERSION}.${MINOR_VERSION}.so
+fi
diff --git a/gnu/gcc/PRE_BUILD b/gnu/gcc/PRE_BUILD
index 781e3b4870..e383466776 100755
--- a/gnu/gcc/PRE_BUILD
+++ b/gnu/gcc/PRE_BUILD
@@ -45,4 +45,7 @@ if list_find "$GCC_COMPILER" "go"; then
   patch -p1 < "$SPELL_DIRECTORY/0003-fix-header-generation-for-libgo.patch"
 fi &&
 
-patch -p1 < "$SPELL_DIRECTORY/0001-remove-libffi.patch"
+patch -p1 < "$SPELL_DIRECTORY/0001-remove-libffi.patch" &&
+
+# fix build of gprbuild
+patch -p1 < "$SPELL_DIRECTORY/integer_parameter_restrictions.patch"
diff --git a/gnu/gcc/integer_parameter_restrictions.patch b/gnu/gcc/integer_parameter_restrictions.patch
new file mode 100644
index 0000000000..7516ee591c
--- /dev/null
+++ b/gnu/gcc/integer_parameter_restrictions.patch
@@ -0,0 +1,36 @@
+--- 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;