From a9bbcf0b768a90fdf9df9b20f24f0a7bc69d7344 Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Mon, 1 Oct 2012 21:08:25 +0100 Subject: Update to GCCSDK 4.1.2 v2. --- arm-unknown-riscos/Makefile | 4 +- .../recipes/patches/gcc4/binutils-version.p | 13 ---- arm-unknown-riscos/recipes/patches/gcc4/ld-patch.p | 23 ------ .../recipes/patches/gcc4/unixlib-stack-incr.p | 88 ---------------------- 4 files changed, 2 insertions(+), 126 deletions(-) delete mode 100644 arm-unknown-riscos/recipes/patches/gcc4/binutils-version.p delete mode 100644 arm-unknown-riscos/recipes/patches/gcc4/ld-patch.p delete mode 100644 arm-unknown-riscos/recipes/patches/gcc4/unixlib-stack-incr.p (limited to 'arm-unknown-riscos') diff --git a/arm-unknown-riscos/Makefile b/arm-unknown-riscos/Makefile index 4bbe1ca..cce0815 100644 --- a/arm-unknown-riscos/Makefile +++ b/arm-unknown-riscos/Makefile @@ -1,7 +1,7 @@ # Going to use a known revision of trunk, until there's a release version that suits -UPSTREAM_GCCSDK_VERSION := 4957 +UPSTREAM_GCCSDK_VERSION := release_4_1_2_v2 UPSTREAM_GCCSDK_TARBALL := gcc4 -UPSTREAM_GCCSDK_URI := svn://svn.riscos.info/gccsdk/trunk/gcc4@$(UPSTREAM_GCCSDK_VERSION) +UPSTREAM_GCCSDK_URI := svn://svn.riscos.info/gccsdk/tags/@$(UPSTREAM_GCCSDK_VERSION) # Ditto for OSLib UPSTREAM_OSLIB_VERSION := 402 diff --git a/arm-unknown-riscos/recipes/patches/gcc4/binutils-version.p b/arm-unknown-riscos/recipes/patches/gcc4/binutils-version.p deleted file mode 100644 index fe6f48c..0000000 --- a/arm-unknown-riscos/recipes/patches/gcc4/binutils-version.p +++ /dev/null @@ -1,13 +0,0 @@ -Index: setup-gccsdk-params -=================================================================== ---- setup-gccsdk-params (revision 4957) -+++ setup-gccsdk-params (working copy) -@@ -63,7 +63,7 @@ - - # Currently supported versions of gcc and binutils: - export GCCSDK_SUPPORTED_GCC_RELEASE=4.1.2 --export GCCSDK_SUPPORTED_BINUTILS_RELEASE=2.21 -+export GCCSDK_SUPPORTED_BINUTILS_RELEASE=2.21.1 - - # Release name: - export GCCSDK_RELEASE_NAME=Rel1dev diff --git a/arm-unknown-riscos/recipes/patches/gcc4/ld-patch.p b/arm-unknown-riscos/recipes/patches/gcc4/ld-patch.p deleted file mode 100644 index 0d14ece..0000000 --- a/arm-unknown-riscos/recipes/patches/gcc4/ld-patch.p +++ /dev/null @@ -1,23 +0,0 @@ -Index: recipe/patches/binutils/ld.Makefile.am.p -=================================================================== ---- recipe/patches/binutils/ld.Makefile.am.p (revision 4957) -+++ recipe/patches/binutils/ld.Makefile.am.p (working copy) -@@ -1,13 +1,13 @@ - --- ld/Makefile.am.orig 2010-11-03 04:22:01.000000000 +0100 - +++ ld/Makefile.am 2010-12-11 02:19:04.042493950 +0100 --@@ -147,6 +147,7 @@ ALL_EMULATION_SOURCES = \ -- earmelfb_linux_eabi.c \ -+@@ -144,6 +144,7 @@ ALL_EMULATION_SOURCES = \ -+ earmelf_linux.c \ -+ earmelf_linux_eabi.c \ - earmelf_nbsd.c \ -- earmelfb_nbsd.c \ - + earmelf_riscos.c \ - earmelf_vxworks.c \ -- earmnto.c \ -- earmnbsd.c \ -+ earmelfb.c \ -+ earmelfb_linux.c \ - @@ -653,6 +654,10 @@ earmelf_fbsd.c: $(srcdir)/emulparams/arm - $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \ - $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} diff --git a/arm-unknown-riscos/recipes/patches/gcc4/unixlib-stack-incr.p b/arm-unknown-riscos/recipes/patches/gcc4/unixlib-stack-incr.p deleted file mode 100644 index 8b8543a..0000000 --- a/arm-unknown-riscos/recipes/patches/gcc4/unixlib-stack-incr.p +++ /dev/null @@ -1,88 +0,0 @@ -Index: recipe/files/gcc/libunixlib/sys/stackalloc.c -=================================================================== ---- recipe/files/gcc/libunixlib/sys/stackalloc.c (revision 5392) -+++ recipe/files/gcc/libunixlib/sys/stackalloc.c (working copy) -@@ -326,9 +326,36 @@ - void - __stackalloc_init (void) - { -- /* The initial stack chunk is set up in _syslib.s -- __ul_memory.stack points 8 bytes below the base of the initial chunk -- There are also 8 bytes spare above the initial chunk */ -+ /* The stack is set up in _syslib.s as follows: -+ * -+ * appspace_himem ------------- -+ * 8 bytes - <-- dummytopblock -+ * Signalhandler SP ------------- - -+ * \ -+ * \ -+ * 3584 bytes \ -+ * \ -+ * } Signal handler chunk (4k) -+ * Signalhandler SL ------------- / -+ * / -+ * 512 bytes / -+ * / -+ * ------------- - -+ * 8 bytes - <-- signalhandlerblock (avoid!) -+ * Initial SP ------------- - -+ * \ -+ * \ -+ * 3560 bytes \ -+ * \ -+ * } Initial chunk (4k) -+ * Initial SL ------------- / -+ * / -+ * 536 bytes / -+ * / -+ * ------------- - -+ * 8 bytes - <-- initialblock -+ * __ulmemory.stack ------------- -+ */ - - #ifdef DEBUG - debug_printf ("-- stackalloc_init: stack=%08x appspace_himem=%08x " -@@ -350,9 +377,14 @@ - dummybottomblock = initialblock - 1; - dummybottomblock->startofcon = NULL; - -+ /* Initialise the signal handler block */ - dummytopblock = initialblock + 1; - dummytopblock->size = 1; -+ dummytopblock->startofcon = NULL; - -+ dummytopblock += 1; -+ dummytopblock->size = 1; -+ - freelist = NULL; - } - -Index: recipe/files/gcc/libunixlib/sys/_syslib.s -=================================================================== ---- recipe/files/gcc/libunixlib/sys/_syslib.s (revision 5392) -+++ recipe/files/gcc/libunixlib/sys/_syslib.s (working copy) -@@ -142,10 +142,11 @@ - @ in a dynamic area because GCC might generate trampolines. In USR32 - @ mode we could however. - -- @ 8 bytes are needed above the initial chunk -+ @ Reserve the top 4K for the signal handler stack -+ @ 8 bytes are needed above the signal handler stack - @ for the stackalloc heap -- @ Reserve the top 4K for the signal handler stack - SUB sp, sp, #8 -+ - STR sp, [ip, #GBL_SIGNALHANDLER_SP] - @ The signal handler stack cannot be extended, so we don't need to - @ setup the chunk structure. -@@ -153,6 +154,10 @@ - ADD sl, sp, #512 - STR sl, [ip, #GBL_SIGNALHANDLER_SL] - -+ @ Reserve a further 8 bytes above the initial chunk -+ @ for the stackalloc heap -+ SUB sp, sp, #8 -+ - SUB a1, sp, #4096 - ADD sl, a1, #512 + CHUNK_OVERHEAD - -- cgit v1.2.3