summaryrefslogtreecommitdiff
path: root/arm-unknown-riscos
diff options
context:
space:
mode:
Diffstat (limited to 'arm-unknown-riscos')
-rw-r--r--arm-unknown-riscos/Makefile17
-rwxr-xr-xarm-unknown-riscos/fetchsrc16
-rw-r--r--arm-unknown-riscos/recipes/files/gcc4/cp_cfns_gperf.p17
-rw-r--r--arm-unknown-riscos/recipes/files/gcc4/cp_cfns_h.p17
-rw-r--r--arm-unknown-riscos/recipes/files/gcc4/gcc_texi.p20
-rw-r--r--arm-unknown-riscos/recipes/patches/gcc4/binutils-download.p12
-rw-r--r--arm-unknown-riscos/recipes/patches/gcc4/cloog-ppl-download.p12
-rw-r--r--arm-unknown-riscos/recipes/patches/gcc4/gmp-download.p11
-rw-r--r--arm-unknown-riscos/recipes/patches/gcc4/ppl-download.p27
-rw-r--r--arm-unknown-riscos/recipes/patches/gcc4/ppl-version.p175
-rw-r--r--arm-unknown-riscos/recipes/patches/oslib/vapi.p10
11 files changed, 328 insertions, 6 deletions
diff --git a/arm-unknown-riscos/Makefile b/arm-unknown-riscos/Makefile
index 052a414..dc7c72d 100644
--- a/arm-unknown-riscos/Makefile
+++ b/arm-unknown-riscos/Makefile
@@ -1,6 +1,6 @@
# Use a tested trunk version of GCCSDK
-UPSTREAM_GCCSDK_TARBALL := gcc4
UPSTREAM_GCCSDK_VERSION := release_4_7_4_v2
+UPSTREAM_GCCSDK_TARBALL := gcc4$(UPSTREAM_GCCSDK_VERSION).tar.gz
UPSTREAM_GCCSDK_URI := svn://svn.riscos.info/gccsdk/tags/$(UPSTREAM_GCCSDK_VERSION)
# OSLib 7.00
@@ -38,6 +38,9 @@ TARGET_NAME := arm-unknown-riscos
PREFIX ?= /opt/netsurf/$(TARGET_NAME)
+# tools
+FETCHSRC:=$(CURDIR)/fetchsrc
+
.PHONY: all clean distclean
all: $(BUILDSTEPS)/toolchain.d
@@ -59,7 +62,7 @@ $(BUILDSTEPS)/toolchain.d: $(BUILDSTEPS)/ccres.d $(BUILDSTEPS)/makerun.d $(BUILD
###
$(BUILDSTEPS)/infozip.d: $(BUILDSTEPS)/gcc.d $(SOURCESDIR)/$(UPSTREAM_INFOZIP_TARBALL)
- tar -C $(BUILDDIR) -xzf $(SOURCESDIR)/$(UPSTREAM_INFOZIP_TARBALL)
+ tar -C $(BUILDDIR) -xaf $(SOURCESDIR)/$(UPSTREAM_INFOZIP_TARBALL)
for p in `ls $(RECIPES)/patches/infozip/*.p` ; do patch -d $(BUILDDIR)/zip$(UPSTREAM_INFOZIP_VERSION) -p0 <$$p ; done
cd $(BUILDDIR)/zip$(UPSTREAM_INFOZIP_VERSION) && make -f unix/Makefile generic LOCAL_ZIP=-DFORRISCOS
cp $(BUILDDIR)/zip$(UPSTREAM_INFOZIP_VERSION)/zip $(PREFIX)/cross/bin/zip
@@ -119,8 +122,9 @@ $(BUILDSTEPS)/gcc.d: $(BUILDSTEPS)/gccsdk-srcdir.d
touch $@
$(BUILDSTEPS)/gccsdk-srcdir.d: $(BUILDSTEPS)/buildsteps.d $(SOURCESDIR)/$(UPSTREAM_GCCSDK_TARBALL)
- cp -r $(SOURCESDIR)/$(UPSTREAM_GCCSDK_TARBALL) $(BUILDDIR)/gcc4
+ tar -C $(BUILDDIR) -xaf $(SOURCESDIR)/$(UPSTREAM_GCCSDK_TARBALL)
cp -p $(RECIPES)/files/gcc4/gccsdk-params $(BUILDDIR)/gcc4/gcc4/gccsdk-params
+ cp -p $(RECIPES)/files/gcc4/*.p $(BUILDDIR)/gcc4/gcc4/recipe/patches/gcc/
sed -i 's#{PREFIX}#$(PREFIX)#' $(BUILDDIR)/gcc4/gcc4/gccsdk-params
for p in `ls $(RECIPES)/patches/gcc4/*.p` ; do patch -d $(BUILDDIR)/gcc4 -p0 <$$p ; done
touch $@
@@ -130,7 +134,8 @@ $(BUILDSTEPS)/gccsdk-srcdir.d: $(BUILDSTEPS)/buildsteps.d $(SOURCESDIR)/$(UPSTRE
###
$(SOURCESDIR)/$(UPSTREAM_GCCSDK_TARBALL):
- svn co $(UPSTREAM_GCCSDK_URI) $@
+ svn co $(UPSTREAM_GCCSDK_URI) $(SOURCESDIR)/gcc4
+ tar -C $(SOURCESDIR) -caf $@ gcc4
$(SOURCESDIR)/$(UPSTREAM_OSLIB_TARBALL):
svn co $(UPSTREAM_OSLIB_URI) $@
@@ -144,8 +149,8 @@ $(SOURCESDIR)/$(UPSTREAM_MAKERUN_TARBALL):
$(SOURCESDIR)/$(UPSTREAM_SQUEEZE_TARBALL):
git clone $(UPSTREAM_SQUEEZE_URI) $@
-$(SOURCESDIR)/$(UPSTREAM_INFOZIP_TARBALL):
- wget -q -O $@ $(UPSTREAM_INFOZIP_URI)
+$(SOURCEDIR)/$(UPSTREAM_INFOZIP_TARBALL):
+ $(FETCHSRC) arm-unknown-riscos $(subst $(SOURCEDIR)/,,$@) $(UPSTREAM_INFOZIP_URI) $@
###
# Rule to create buildsteps dir
diff --git a/arm-unknown-riscos/fetchsrc b/arm-unknown-riscos/fetchsrc
new file mode 100755
index 0000000..e71d85f
--- /dev/null
+++ b/arm-unknown-riscos/fetchsrc
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# script to fetch toolchain source tar using ci.netsurf-browser.org as a cache
+
+# Usage fetchsrc <target> <source> <upstream> <output>
+
+NSSRV="http://ci.netsurf-browser.org/toolchain/"
+
+wget -q -O ${4} ${NSSRV}/${1}/${2}
+if [ $? -ne 0 ];then
+ wget -q -O ${4} ${3}
+ if [ $? -ne 0 ];then
+ rm ${4}
+ exit 1
+ fi
+fi
diff --git a/arm-unknown-riscos/recipes/files/gcc4/cp_cfns_gperf.p b/arm-unknown-riscos/recipes/files/gcc4/cp_cfns_gperf.p
new file mode 100644
index 0000000..f0598e5
--- /dev/null
+++ b/arm-unknown-riscos/recipes/files/gcc4/cp_cfns_gperf.p
@@ -0,0 +1,17 @@
+--- gcc/cp/cfns.gperf.orig 2017-09-15 16:17:49.249145794 +0100
++++ gcc/cp/cfns.gperf 2017-09-15 16:18:26.468005263 +0100
+@@ -16,14 +16,6 @@
+ You should have received a copy of the GNU General Public License
+ along with GCC; see the file COPYING3. If not see
+ <http://www.gnu.org/licenses/>. */
+-#ifdef __GNUC__
+-__inline
+-#endif
+-static unsigned int hash (const char *, unsigned int);
+-#ifdef __GNUC__
+-__inline
+-#endif
+-const char * libc_name_p (const char *, unsigned int);
+ %}
+ %%
+ # The standard C library functions, for feeding to gperf; the result is used
diff --git a/arm-unknown-riscos/recipes/files/gcc4/cp_cfns_h.p b/arm-unknown-riscos/recipes/files/gcc4/cp_cfns_h.p
new file mode 100644
index 0000000..8f89f8a
--- /dev/null
+++ b/arm-unknown-riscos/recipes/files/gcc4/cp_cfns_h.p
@@ -0,0 +1,17 @@
+--- gcc/cp/cfns.h.orig 2017-09-15 16:50:55.872127506 +0100
++++ gcc/cp/cfns.h 2017-09-15 16:51:18.147443810 +0100
+@@ -47,14 +47,6 @@
+ You should have received a copy of the GNU General Public License
+ along with GCC; see the file COPYING3. If not see
+ <http://www.gnu.org/licenses/>. */
+-#ifdef __GNUC__
+-__inline
+-#endif
+-static unsigned int hash (const char *, unsigned int);
+-#ifdef __GNUC__
+-__inline
+-#endif
+-const char * libc_name_p (const char *, unsigned int);
+ /* maximum key range = 391, duplicates = 0 */
+
+ #ifdef __GNUC__
diff --git a/arm-unknown-riscos/recipes/files/gcc4/gcc_texi.p b/arm-unknown-riscos/recipes/files/gcc4/gcc_texi.p
new file mode 100644
index 0000000..056edfa
--- /dev/null
+++ b/arm-unknown-riscos/recipes/files/gcc4/gcc_texi.p
@@ -0,0 +1,20 @@
+--- gcc/doc/gcc.texi.orig 2017-09-15 17:46:47.157490325 +0100
++++ gcc/doc/gcc.texi 2017-09-15 17:47:58.714929743 +0100
+@@ -85,9 +85,15 @@
+ @item GNU Press
+ @tab Website: www.gnupress.org
+ @item a division of the
+-@tab General: @tex press@@gnu.org @end tex
++@tab General:
++@tex
++press@@gnu.org
++@end tex
+ @item Free Software Foundation
+-@tab Orders: @tex sales@@gnu.org @end tex
++@tab Orders:
++@tex
++sales@@gnu.org
++@end tex
+ @item 51 Franklin Street, Fifth Floor
+ @tab Tel 617-542-5942
+ @item Boston, MA 02110-1301 USA
diff --git a/arm-unknown-riscos/recipes/patches/gcc4/binutils-download.p b/arm-unknown-riscos/recipes/patches/gcc4/binutils-download.p
new file mode 100644
index 0000000..54720f5
--- /dev/null
+++ b/arm-unknown-riscos/recipes/patches/gcc4/binutils-download.p
@@ -0,0 +1,12 @@
+--- gcc4/Makefile.orig 2018-01-26 10:37:32.006594122 +0000
++++ gcc4/Makefile 2018-01-26 10:38:42.316723336 +0000
+@@ -677,8 +677,7 @@
+ # Download binutils source:
+ $(SRCORIGDIR)/binutils-$(BINUTILS_VERSION).tar.bz2:
+ -mkdir -p $(SRCORIGDIR)
+- cd $(SRCORIGDIR) && wget -c http://ftpmirror.gnu.org/binutils/binutils-$(BINUTILS_VERSION).tar.bz2
+- touch $@
++ wget -O $@ -c http://ci.netsurf-browser.org/toolchain/arm-unknown-riscos/binutils-$(BINUTILS_VERSION).tar.bz2
+
+ ifeq "$(GCC_USE_SCM)" "yes"
+ # Checkout gcc source:
diff --git a/arm-unknown-riscos/recipes/patches/gcc4/cloog-ppl-download.p b/arm-unknown-riscos/recipes/patches/gcc4/cloog-ppl-download.p
new file mode 100644
index 0000000..194ef7f
--- /dev/null
+++ b/arm-unknown-riscos/recipes/patches/gcc4/cloog-ppl-download.p
@@ -0,0 +1,12 @@
+--- gcc4/Makefile.orig 2018-01-26 10:40:26.623881778 +0000
++++ gcc4/Makefile 2018-01-26 10:41:24.141623273 +0000
+@@ -719,8 +719,7 @@
+ # Download CLooG source:
+ $(SRCORIGDIR)/cloog-ppl-$(CLOOG_VERSION).tar.gz:
+ -mkdir -p $(SRCORIGDIR)
+- cd $(SRCORIGDIR) && wget -c ftp://gcc.gnu.org/pub/gcc/infrastructure/cloog-ppl-$(CLOOG_VERSION).tar.gz
+- touch $@
++ wget -O $@ -c http://ci.netsurf-browser.org/toolchain/arm-unknown-riscos/cloog-ppl-$(CLOOG_VERSION).tar.gz
+
+ # Download newlib source:
+ $(SRCORIGDIR)/newlib-$(NEWLIB_VERSION).tar.gz:
diff --git a/arm-unknown-riscos/recipes/patches/gcc4/gmp-download.p b/arm-unknown-riscos/recipes/patches/gcc4/gmp-download.p
new file mode 100644
index 0000000..0bfd4ec
--- /dev/null
+++ b/arm-unknown-riscos/recipes/patches/gcc4/gmp-download.p
@@ -0,0 +1,11 @@
+--- gcc4/Makefile.orig 2018-01-25 22:42:43.937180762 +0000
++++ gcc4/Makefile 2018-01-25 22:44:46.680863288 +0000
+@@ -703,7 +703,7 @@
+ # Download mpc source:
+ $(SRCORIGDIR)/mpc-$(MPC_VERSION).tar.gz:
+ -mkdir -p $(SRCORIGDIR)
+- cd $(SRCORIGDIR) && wget -c http://www.multiprecision.org/mpc/download/mpc-$(MPC_VERSION).tar.gz
++ cd $(SRCORIGDIR) && wget -c http://ci.netsurf-browser.org/toolchain/arm-unknown-riscos/mpc-$(MPC_VERSION).tar.gz
+ touch $@
+
+ # Download mpfr source:
diff --git a/arm-unknown-riscos/recipes/patches/gcc4/ppl-download.p b/arm-unknown-riscos/recipes/patches/gcc4/ppl-download.p
new file mode 100644
index 0000000..7eb77c3
--- /dev/null
+++ b/arm-unknown-riscos/recipes/patches/gcc4/ppl-download.p
@@ -0,0 +1,27 @@
+--- gcc4/Makefile.orig 2018-01-26 08:03:49.745541843 +0000
++++ gcc4/Makefile 2018-01-26 08:05:15.256056177 +0000
+@@ -586,9 +586,9 @@
+ touch $(BUILDSTEPSDIR)/$@
+
+ # Unpack & copy ppl source:
+-src-ppl-copied: $(SRCORIGDIR)/ppl-$(PPL_VERSION).tar.gz
++src-ppl-copied: $(SRCORIGDIR)/ppl-$(PPL_VERSION).tar.xz
+ -rm -rf $(SRCORIGDIR)/ppl-$(PPL_VERSION) $(SRCDIR)/ppl
+- cd $(SRCORIGDIR) && tar xf $<
++ cd $(SRCORIGDIR) && tar axf $<
+ -mkdir -p $(SRCDIR)/ppl
+ cp -T -p -r $(SRCORIGDIR)/ppl-$(PPL_VERSION) $(SRCDIR)/ppl
+ cd $(SRCDIR)/ppl && PATH="$(PREFIX_BUILDTOOL_GCC)/bin:$(PATH)" && $(SCRIPTSDIR)/do-patch-and-copy $(RECIPEDIR)
+@@ -713,10 +713,9 @@
+ touch $@
+
+ # Download ppl source:
+-$(SRCORIGDIR)/ppl-$(PPL_VERSION).tar.gz:
++$(SRCORIGDIR)/ppl-$(PPL_VERSION).tar.xz:
+ -mkdir -p $(SRCORIGDIR)
+- cd $(SRCORIGDIR) && wget -c http://www.cs.unipr.it/ppl/download/ftp/releases/$(PPL_VERSION)/ppl-$(PPL_VERSION).tar.gz
+- touch $@
++ wget -O $@ -c http://ci.netsurf-browser.org/toolchain/arm-unknown-riscos/ppl-$(PPL_VERSION).tar.xz
+
+ # Download CLooG source:
+ $(SRCORIGDIR)/cloog-ppl-$(CLOOG_VERSION).tar.gz:
diff --git a/arm-unknown-riscos/recipes/patches/gcc4/ppl-version.p b/arm-unknown-riscos/recipes/patches/gcc4/ppl-version.p
new file mode 100644
index 0000000..7631c68
--- /dev/null
+++ b/arm-unknown-riscos/recipes/patches/gcc4/ppl-version.p
@@ -0,0 +1,175 @@
+Index: gcc4/Makefile
+===================================================================
+--- gcc4/Makefile (revision 7156)
++++ gcc4/Makefile (working copy)
+@@ -45,7 +45,7 @@
+ MPFR_VERSION=3.0.1
+ MPC_VERSION=0.8.2
+ GCC_USE_PPL_CLOOG=yes
+-PPL_VERSION=0.11.2
++PPL_VERSION=1.2
+ CLOOG_VERSION=0.15.11
+ GCC_USE_LTO=yes
+
+@@ -182,8 +182,8 @@
+ RONATIVE_MPFR_CONFIG_ARGS := --disable-shared --with-gmp=$(PREFIX_RONATIVEGCC_LIBS) --host=$(TARGET) --prefix=$(PREFIX_RONATIVEGCC_LIBS)
+
+ # Configure arguments PPL:
+-CROSS_PPL_CONFIG_ARGS := --disable-shared --disable-watchdog --with-gnu-ld --with-gmp-prefix=$(PREFIX_CROSSGCC_LIBS) --prefix=$(PREFIX_CROSSGCC_LIBS)
+-RONATIVE_PPL_CONFIG_ARGS := --disable-shared --disable-watchdog --with-gnu-ld --with-gmp-prefix=$(PREFIX_RONATIVEGCC_LIBS) --host=$(TARGET) --prefix=$(PREFIX_RONATIVEGCC_LIBS)
++CROSS_PPL_CONFIG_ARGS := --disable-shared --disable-watchdog --with-gnu-ld --with-gmp=$(PREFIX_CROSSGCC_LIBS) --prefix=$(PREFIX_CROSSGCC_LIBS)
++RONATIVE_PPL_CONFIG_ARGS := --disable-shared --disable-watchdog --with-gnu-ld --with-gmp=$(PREFIX_RONATIVEGCC_LIBS) --host=$(TARGET) --prefix=$(PREFIX_RONATIVEGCC_LIBS)
+
+ # Configure arguments CLooG:
+ CROSS_CLOOG_CONFIG_ARGS := --disable-shared --with-gmp=$(PREFIX_CROSSGCC_LIBS) --with-bits=gmp --with-ppl=$(PREFIX_CROSSGCC_LIBS) --with-host-libstdcxx='-lstdc++' --prefix=$(PREFIX_CROSSGCC_LIBS)
+Index: gcc4/recipe/patches/cloog/configure.in.p
+===================================================================
+--- gcc4/recipe/patches/cloog/configure.in.p (revision 7156)
++++ gcc4/recipe/patches/cloog/configure.in.p (working copy)
+@@ -1,5 +1,5 @@
+---- configure.in.orig 2013-05-01 16:15:33.235945936 +0200
+-+++ configure.in 2013-05-01 16:15:15.484169106 +0200
++--- configure.in.orig 2017-04-23 11:55:00.956204411 +0100
+++++ configure.in 2017-04-23 11:50:39.385519538 +0100
+ @@ -41,7 +41,7 @@ dnl ************************************
+ AC_PREREQ(2.13)
+ AC_INIT(source/cloog.c)
+@@ -9,7 +9,13 @@
+ dnl Every other copy of the package version number gets its value from here.
+ AM_INIT_AUTOMAKE(cloog, 0.15)
+ AC_CONFIG_HEADER(include/cloog/cloog-config.h)
+-@@ -343,7 +343,7 @@ if test "x$with_ppl" != "x" -a "x$with_p
++@@ -338,12 +338,12 @@ if test "x$with_ppl" != "x" -a "x$with_p
++
++ AC_MSG_CHECKING([for version 0.10 (or later revision) of PPL])
++ AC_TRY_COMPILE([#include "ppl_c.h"],[
++- #if PPL_VERSION_MAJOR != 0 || PPL_VERSION_MINOR < 10
+++ #if PPL_VERSION_MAJOR == 0 && PPL_VERSION_MINOR < 10
++ choke me
+ #endif
+ ], [AC_MSG_RESULT([yes])], [AC_MSG_ERROR(Can't find correct version of PPL.) ])
+
+Index: gcc4/recipe/patches/gcc/configure.ac.p
+===================================================================
+--- gcc4/recipe/patches/gcc/configure.ac.p (revision 7156)
++++ gcc4/recipe/patches/gcc/configure.ac.p (working copy)
+@@ -1,6 +1,6 @@
+ Index: configure.ac
+ ===================================================================
+---- configure.ac (revision 197339)
++--- configure.ac (revision 247077)
+ +++ configure.ac (working copy)
+ @@ -152,6 +152,7 @@
+ # Note that libiberty is not a target library.
+@@ -34,6 +34,15 @@
+
+ if test "$enable_ppl_version_check" != no; then
+ saved_CFLAGS="$CFLAGS"
++@@ -1577,7 +1586,7 @@
++ CFLAGS="$CFLAGS $pplinc $gmpinc"
++ AC_MSG_CHECKING([for version 0.11 (revision 0 or later) of PPL])
++ AC_TRY_COMPILE([#include "ppl_c.h"],[
++- #if PPL_VERSION_MAJOR != 0 || PPL_VERSION_MINOR < 11
+++ #if PPL_VERSION_MAJOR == 0 && PPL_VERSION_MINOR < 11
++ choke me
++ #endif
++ ], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); ppllibs= ; pplinc= ; with_ppl=no ])
+ @@ -2895,6 +2904,10 @@
+ ;;
+ esac
+Index: gcc4/recipe/patches/ppl/src.Congruence_System.defs.hh.p
+===================================================================
+--- gcc4/recipe/patches/ppl/src.Congruence_System.defs.hh.p (revision 7156)
++++ gcc4/recipe/patches/ppl/src.Congruence_System.defs.hh.p (nonexistent)
+@@ -1,19 +0,0 @@
+---- src/Congruence_System.defs.hh.orig 2015-03-01 19:57:52.887328139 +0100
+-+++ src/Congruence_System.defs.hh 2015-03-01 19:57:12.315328259 +0100
+-@@ -33,6 +33,7 @@ site: http://www.cs.unipr.it/ppl/ . */
+- #include "Grid.types.hh"
+- #include "Grid_Certificate.types.hh"
+- #include <iosfwd>
+-+#include <cstddef>
+-
+- namespace Parma_Polyhedra_Library {
+-
+-@@ -235,7 +236,7 @@ public:
+- class const_iterator
+- : public std::iterator<std::forward_iterator_tag,
+- Congruence,
+-- ptrdiff_t,
+-+ std::ptrdiff_t,
+- const Congruence*,
+- const Congruence&> {
+- public:
+Index: gcc4/recipe/patches/ppl/src.Constraint_System.defs.hh.p
+===================================================================
+--- gcc4/recipe/patches/ppl/src.Constraint_System.defs.hh.p (revision 7156)
++++ gcc4/recipe/patches/ppl/src.Constraint_System.defs.hh.p (nonexistent)
+@@ -1,19 +0,0 @@
+---- src/Constraint_System.defs.hh.orig 2015-03-01 19:58:03.831328106 +0100
+-+++ src/Constraint_System.defs.hh 2015-03-01 19:57:12.315328259 +0100
+-@@ -33,6 +33,7 @@ site: http://www.cs.unipr.it/ppl/ . */
+- #include "Congruence_System.types.hh"
+- #include <iterator>
+- #include <iosfwd>
+-+#include <cstddef>
+-
+- namespace Parma_Polyhedra_Library {
+-
+-@@ -204,7 +205,7 @@ public:
+- class const_iterator
+- : public std::iterator<std::forward_iterator_tag,
+- Constraint,
+-- ptrdiff_t,
+-+ std::ptrdiff_t,
+- const Constraint*,
+- const Constraint&> {
+- public:
+Index: gcc4/recipe/patches/ppl/src.Generator_System.defs.hh.p
+===================================================================
+--- gcc4/recipe/patches/ppl/src.Generator_System.defs.hh.p (revision 7156)
++++ gcc4/recipe/patches/ppl/src.Generator_System.defs.hh.p (nonexistent)
+@@ -1,19 +0,0 @@
+---- src/Generator_System.defs.hh.orig 2015-03-01 19:58:13.511328077 +0100
+-+++ src/Generator_System.defs.hh 2015-03-01 19:57:12.319328259 +0100
+-@@ -33,6 +33,7 @@ site: http://www.cs.unipr.it/ppl/ . */
+- #include "Polyhedron.types.hh"
+- #include "Poly_Con_Relation.defs.hh"
+- #include <iosfwd>
+-+#include <cstddef>
+-
+- namespace Parma_Polyhedra_Library {
+-
+-@@ -250,7 +251,7 @@ public:
+- class const_iterator
+- : public std::iterator<std::forward_iterator_tag,
+- Generator,
+-- ptrdiff_t,
+-+ std::ptrdiff_t,
+- const Generator*,
+- const Generator&> {
+- public:
+Index: gcc4/recipe/patches/ppl/src.Grid_Generator_System.defs.hh.p
+===================================================================
+--- gcc4/recipe/patches/ppl/src.Grid_Generator_System.defs.hh.p (revision 7156)
++++ gcc4/recipe/patches/ppl/src.Grid_Generator_System.defs.hh.p (nonexistent)
+@@ -1,19 +0,0 @@
+---- src/Grid_Generator_System.defs.hh.orig 2015-03-01 19:57:31.127328203 +0100
+-+++ src/Grid_Generator_System.defs.hh 2015-03-01 19:57:12.315328259 +0100
+-@@ -30,6 +30,7 @@ site: http://www.cs.unipr.it/ppl/ . */
+- #include "Variables_Set.types.hh"
+- #include "Grid.types.hh"
+- #include <iosfwd>
+-+#include <cstddef>
+-
+- namespace Parma_Polyhedra_Library {
+-
+-@@ -267,7 +268,7 @@ public:
+- class const_iterator
+- : public std::iterator<std::forward_iterator_tag,
+- Grid_Generator,
+-- ptrdiff_t,
+-+ std::ptrdiff_t,
+- const Grid_Generator*,
+- const Grid_Generator&>,
+- private Generator_System::const_iterator {
diff --git a/arm-unknown-riscos/recipes/patches/oslib/vapi.p b/arm-unknown-riscos/recipes/patches/oslib/vapi.p
new file mode 100644
index 0000000..a3daf40
--- /dev/null
+++ b/arm-unknown-riscos/recipes/patches/oslib/vapi.p
@@ -0,0 +1,10 @@
+--- Tools/DefMod2/vapi.c.orig 2017-09-19 11:57:15.559547484 +0100
++++ Tools/DefMod2/vapi.c 2017-09-19 11:57:31.067750029 +0100
+@@ -23,6 +23,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <ctype.h>
++#include <stdbool.h>
+
+ #include "oslib/os.h"
+