diff options
author | Daniel Silverstone <dsilvers@digital-scurf.org> | 2017-09-19 12:01:06 +0100 |
---|---|---|
committer | Daniel Silverstone <dsilvers@digital-scurf.org> | 2017-09-19 12:01:06 +0100 |
commit | 6814210a1140fc2ed7ac46a220fc1919b59de938 (patch) | |
tree | 2b45cd8bfc143c337508c991f360124ebd0945ad | |
parent | 9c34f5d39dd828f307117401234e917627b95101 (diff) | |
download | toolchains-6814210a1140fc2ed7ac46a220fc1919b59de938.tar.gz toolchains-6814210a1140fc2ed7ac46a220fc1919b59de938.tar.bz2 |
Update RISC OS toolchain a bit, hopefully it can build more now
-rw-r--r-- | arm-unknown-riscos/Makefile | 1 | ||||
-rw-r--r-- | arm-unknown-riscos/recipes/files/gcc4/cp_cfns_gperf.p | 17 | ||||
-rw-r--r-- | arm-unknown-riscos/recipes/files/gcc4/cp_cfns_h.p | 17 | ||||
-rw-r--r-- | arm-unknown-riscos/recipes/files/gcc4/gcc_texi.p | 20 | ||||
-rw-r--r-- | arm-unknown-riscos/recipes/patches/oslib/vapi.p | 10 |
5 files changed, 65 insertions, 0 deletions
diff --git a/arm-unknown-riscos/Makefile b/arm-unknown-riscos/Makefile index 052a414..3dd334a 100644 --- a/arm-unknown-riscos/Makefile +++ b/arm-unknown-riscos/Makefile @@ -121,6 +121,7 @@ $(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/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 $@ 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/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" + |