diff options
| author | John Mark Bell <jmb@netsurf-browser.org> | 2011-10-27 00:19:24 +0000 |
|---|---|---|
| committer | John Mark Bell <jmb@netsurf-browser.org> | 2011-10-27 00:19:24 +0000 |
| commit | 8628a4385a35e5be74b16c54c2d109ae443481e1 (patch) | |
| tree | 2c6f38c88ecd557ee71388b8522ceda6b0530daf /arm-unknown-riscos/recipes | |
| parent | 8e969895194f9ee9773de99d3be01df0af3a2bd8 (diff) | |
| download | toolchains-8628a4385a35e5be74b16c54c2d109ae443481e1.tar.gz toolchains-8628a4385a35e5be74b16c54c2d109ae443481e1.tar.bz2 | |
Fixup bitrot:
* Makefile now uses the same scheme as the other toolchains for dependency tracking
* Binutils 2.21 is no longer available so migrate to 2.21.1 with a partial backport of GCCSDK r5195
* Introduce patch to fix bug in defmod that causes OSLib builds to fail with GAS 2.21.1 (will be upstreamed asap)
svn path=/toolchains/; revision=13080
Diffstat (limited to 'arm-unknown-riscos/recipes')
3 files changed, 51 insertions, 0 deletions
diff --git a/arm-unknown-riscos/recipes/patches/gcc4/binutils-version.p b/arm-unknown-riscos/recipes/patches/gcc4/binutils-version.p new file mode 100644 index 0000000..fe6f48c --- /dev/null +++ b/arm-unknown-riscos/recipes/patches/gcc4/binutils-version.p @@ -0,0 +1,13 @@ +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 new file mode 100644 index 0000000..0d14ece --- /dev/null +++ b/arm-unknown-riscos/recipes/patches/gcc4/ld-patch.p @@ -0,0 +1,23 @@ +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/oslib/defmod-size.p b/arm-unknown-riscos/recipes/patches/oslib/defmod-size.p new file mode 100644 index 0000000..0dbe828 --- /dev/null +++ b/arm-unknown-riscos/recipes/patches/oslib/defmod-size.p @@ -0,0 +1,15 @@ +Index: Tools/DefMod2/assembler.c +=================================================================== +--- Tools/DefMod2/assembler.c (revision 402) ++++ Tools/DefMod2/assembler.c (working copy) +@@ -880,8 +880,8 @@ + if (DoELF) + { + /* Define size of function body. */ +- sprintf (s2, ". - %s", c_name + (!nonx? 1: 0)); +- if ((rc = Emit2 (file, ".size", c_name + (!nonx? 1: 0), s2)) < 0) ++ sprintf (s2, ". - %s", c_name); ++ if ((rc = Emit2 (file, ".size", c_name, s2)) < 0) + goto finish; + } + |