summaryrefslogtreecommitdiff
path: root/arm-unknown-riscos
diff options
context:
space:
mode:
authorJohn-Mark Bell <jmb@netsurf-browser.org>2015-11-13 03:11:30 +0000
committerJohn-Mark Bell <jmb@netsurf-browser.org>2015-11-13 03:11:30 +0000
commitb9b1084efe62a75c566bc4b72e9d6beac48955bc (patch)
tree40128ac69d507b82bd4826bb501f97001cdf6517 /arm-unknown-riscos
parent4b747316f5135ecfcd461ea1ee0abcb92470c58c (diff)
downloadtoolchains-b9b1084efe62a75c566bc4b72e9d6beac48955bc.tar.gz
toolchains-b9b1084efe62a75c566bc4b72e9d6beac48955bc.tar.bz2
RISC OS: fix up tooling for GCCSDK 4.7.4r2
* Makefile: Update to reflect upstream tree structure * recipes/patches/gcc4/binutils-plugins.p, recipes/patches/gcc4/gmp-force-build.p: Refresh context * recipes/patches/gcc4/python2.5.p: Drop: Python 2.5 is ancient * recipes/patches/gcc4/riscos.md.p: Drop: merged upstream
Diffstat (limited to 'arm-unknown-riscos')
-rw-r--r--arm-unknown-riscos/Makefile8
-rw-r--r--arm-unknown-riscos/recipes/patches/gcc4/binutils-plugins.p8
-rw-r--r--arm-unknown-riscos/recipes/patches/gcc4/gmp-force-build.p4
-rw-r--r--arm-unknown-riscos/recipes/patches/gcc4/python2.5.p11
-rw-r--r--arm-unknown-riscos/recipes/patches/gcc4/riscos.md.p10
5 files changed, 10 insertions, 31 deletions
diff --git a/arm-unknown-riscos/Makefile b/arm-unknown-riscos/Makefile
index 78d4814..052a414 100644
--- a/arm-unknown-riscos/Makefile
+++ b/arm-unknown-riscos/Makefile
@@ -111,8 +111,8 @@ $(BUILDSTEPS)/oslib.d: $(BUILDSTEPS)/gcc.d $(SOURCESDIR)/$(UPSTREAM_OSLIB_TARBAL
###
$(BUILDSTEPS)/gcc.d: $(BUILDSTEPS)/gccsdk-srcdir.d
- cd $(BUILDDIR)/gcc4 && make
- cd $(BUILDDIR)/gcc4 && ./install-env
+ cd $(BUILDDIR)/gcc4/gcc4 && make
+ cd $(BUILDDIR)/gcc4/gcc4 && ./install-env
@# Newer GCCSDK adds these trampoline binaries that for us
@# serve no purpose and get in the way.
$(RM) $(PREFIX)/cross/bin/arm-unknown-riscos-gcc-ar $(PREFIX)/cross/bin/arm-unknown-riscos-gcc-nm $(PREFIX)/cross/bin/arm-unknown-riscos-gcc-ranlib
@@ -120,8 +120,8 @@ $(BUILDSTEPS)/gcc.d: $(BUILDSTEPS)/gccsdk-srcdir.d
$(BUILDSTEPS)/gccsdk-srcdir.d: $(BUILDSTEPS)/buildsteps.d $(SOURCESDIR)/$(UPSTREAM_GCCSDK_TARBALL)
cp -r $(SOURCESDIR)/$(UPSTREAM_GCCSDK_TARBALL) $(BUILDDIR)/gcc4
- cp -p $(RECIPES)/files/gcc4/gccsdk-params $(BUILDDIR)/gcc4/gccsdk-params
- sed -i 's#{PREFIX}#$(PREFIX)#' $(BUILDDIR)/gcc4/gccsdk-params
+ cp -p $(RECIPES)/files/gcc4/gccsdk-params $(BUILDDIR)/gcc4/gcc4/gccsdk-params
+ 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 $@
diff --git a/arm-unknown-riscos/recipes/patches/gcc4/binutils-plugins.p b/arm-unknown-riscos/recipes/patches/gcc4/binutils-plugins.p
index 0dbc257..397a736 100644
--- a/arm-unknown-riscos/recipes/patches/gcc4/binutils-plugins.p
+++ b/arm-unknown-riscos/recipes/patches/gcc4/binutils-plugins.p
@@ -1,8 +1,8 @@
---- Makefile (revision 6747)
-+++ Makefile (working copy)
+--- gcc4/Makefile (revision 6747)
++++ gcc4/Makefile (working copy)
@@ -73,7 +73,7 @@
- --disable-libstdcxx-pch \
- --disable-tls
+ --disable-tls \
+ --enable-__cxa_atexit
# FIXME: for Java support: --without-x --enable-libgcj
-BINUTILS_CONFIG_ARGS :=
+BINUTILS_CONFIG_ARGS := --enable-plugins
diff --git a/arm-unknown-riscos/recipes/patches/gcc4/gmp-force-build.p b/arm-unknown-riscos/recipes/patches/gcc4/gmp-force-build.p
index 5b1ec2b..ae58235 100644
--- a/arm-unknown-riscos/recipes/patches/gcc4/gmp-force-build.p
+++ b/arm-unknown-riscos/recipes/patches/gcc4/gmp-force-build.p
@@ -1,5 +1,5 @@
---- Makefile.orig 2014-12-09 22:08:21.680152640 +0000
-+++ Makefile 2014-12-10 00:21:11.194955257 +0000
+--- gcc4/Makefile.orig 2014-12-09 22:08:21.680152640 +0000
++++ gcc4/Makefile 2014-12-10 00:21:11.194955257 +0000
@@ -163,7 +163,7 @@
RONATIVE_CONFIG_ARGS := --host=$(TARGET) --target=$(TARGET) --prefix=$(PREFIX_RONATIVE)
diff --git a/arm-unknown-riscos/recipes/patches/gcc4/python2.5.p b/arm-unknown-riscos/recipes/patches/gcc4/python2.5.p
deleted file mode 100644
index 457009e..0000000
--- a/arm-unknown-riscos/recipes/patches/gcc4/python2.5.p
+++ /dev/null
@@ -1,11 +0,0 @@
---- scripts/do-patch-and-copy.old 2012-11-06 23:18:20.000000000 +0000
-+++ scripts/do-patch-and-copy 2012-11-06 23:18:54.000000000 +0000
-@@ -36,7 +36,7 @@
- # lndir has the advantage to be way more quicker and it is also very easy
- # to create relative symbolic links which is nicer when we create a source
- # snapshot for publication.
-- FILESRELTODSTDIR=`python -c "import os.path; print os.path.relpath('${FILESDIR}','${DSTDIR}')"`
-+ FILESRELTODSTDIR=`python -c "import os.path; prefix = os.path.commonprefix([ '${FILESDIR}', '${DSTDIR}' ]); print '/'.join([ '/'.join([ '..' for _ in '${DSTDIR}'[len(prefix):].split('/') ]), '${FILESDIR}'[len(prefix):] ]);"`
- pushd $DSTDIR/.. > /dev/null
- lndir -silent $FILESRELTODSTDIR $DSTDIR
- popd > /dev/null
diff --git a/arm-unknown-riscos/recipes/patches/gcc4/riscos.md.p b/arm-unknown-riscos/recipes/patches/gcc4/riscos.md.p
deleted file mode 100644
index 9c5e9f1..0000000
--- a/arm-unknown-riscos/recipes/patches/gcc4/riscos.md.p
+++ /dev/null
@@ -1,10 +0,0 @@
---- recipe/files/gcc/gcc/config/arm/riscos.md (revision 6894)
-+++ recipe/files/gcc/gcc/config/arm/riscos.md (working copy)
-@@ -127,6 +127,7 @@
- (match_operand 3 "" "")] UNSPEC_STK)
- (clobber (reg:SI 8))
- (clobber (reg:SI SL_REGNUM))
-+ (use (reg:SI 11))
- (clobber (reg:SI IP_REGNUM))
- (clobber (reg:SI LR_REGNUM))
- (clobber (reg:CC CC_REGNUM))]