Gitweb links:

...log 
http://git.netsurf-browser.org/toolchains.git/shortlog/f3df1663ab3e3a102d7903f9ab60b63eb964948e
...commit 
http://git.netsurf-browser.org/toolchains.git/commit/f3df1663ab3e3a102d7903f9ab60b63eb964948e
...tree 
http://git.netsurf-browser.org/toolchains.git/tree/f3df1663ab3e3a102d7903f9ab60b63eb964948e

The branch, jmb/arm-riscos-gnueabihf has been updated
       via  f3df1663ab3e3a102d7903f9ab60b63eb964948e (commit)
       via  108ca67a62fde03373749c6070e0be12784bc567 (commit)
       via  9007b76ef30584fafa8d50c2b25d70a86db6a1b3 (commit)
       via  475c571bf9c7e927cc15688f629b408b69733f5f (commit)
       via  47ba3fab779ff40cdfa1983780f3716d9c20a885 (commit)
      from  c60d44f2b9f15efdca4e19f5281091284a54f7e2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commitdiff 
http://git.netsurf-browser.org/toolchains.git/commit/?id=f3df1663ab3e3a102d7903f9ab60b63eb964948e
commit f3df1663ab3e3a102d7903f9ab60b63eb964948e
Author: John-Mark Bell <[email protected]>
Commit: John-Mark Bell <[email protected]>

    SDK build runes for arm-riscos-gnueabihf
    
    Follows the existing arm-unknown-riscos setup.

diff --git a/sdk/Makefile b/sdk/Makefile
index a00c029..aa89519 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -7,6 +7,7 @@
 # GCCSDK_INSTALL_CROSSBIN -- /path/to/toolchain/bin
 #
 # supported targets are:
+#                       arm-riscos-gnueabihf
 #                       arm-unknown-riscos  
 #                       m68k-atari-mint
 #                      m5475-atari-mint
@@ -116,6 +117,13 @@ FREETYPE_ENV := 
LIBPNG_CFLAGS=$$($(GCCSDK_INSTALL_ENV)/bin/libpng-config --cflag
 LIBJPEG_TURBO_BUILDDIR:=$(BUILDDIR)/libjpegturbo
 
 # Target Specific setup
+ifeq ($(TARGET),arm-riscos-gnueabihf)
+  SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, $(COMMON_SDK_ITEMS) libjpeg-turbo.d 
libwebp.d)
+  EXTRAARGS_LIBCARES := --disable-shared
+  EXTRAARGS_LIBCURL := --enable-nonblocking --enable-ares 
--with-random="/dev/urandom" $(LIBCURL_DISABLES)
+  EXTRAARGS_OPENSSL := no-asm
+endif
+
 ifeq ($(TARGET),arm-unknown-riscos)
   SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, $(COMMON_SDK_ITEMS) libjpeg-turbo.d 
libwebp.d)
   EXTRAARGS_LIBCARES := --disable-shared
diff --git a/sdk/recipes/patches/openssl/Configurations-50-riscos.conf.p 
b/sdk/recipes/patches/openssl/Configurations-50-riscos.conf.p
index c05a4ad..f3d4dc1 100644
--- a/sdk/recipes/patches/openssl/Configurations-50-riscos.conf.p
+++ b/sdk/recipes/patches/openssl/Configurations-50-riscos.conf.p
@@ -1,6 +1,6 @@
 --- /dev/null  2017-10-10 15:19:45.611896396 +0100
 +++ Configurations/50-riscos.conf      2017-10-17 15:42:25.304921197 +0100
-@@ -0,0 +1,14 @@
+@@ -0,0 +1,26 @@
 +my %targets = (
 +
 +    "arm-unknown-riscos" => {
@@ -14,4 +14,16 @@
 +        sys_id           => "RISCOS",
 +        bn_ops           => "BN_LLONG",
 +    },
++
++    "arm-riscos-gnueabihf" => {
++        inherit_from     => [ "BASE_unix" ],
++        cc               => "arm-riscos-gnueabihf-gcc",
++        cflags           => picker(default => "-DL_ENDIAN -DTERMIOS 
-DNO_SYS_UN_H",
++                                   debug   => "-O0 -g",
++                                   release => "-O3 ",
++                                 threads("-D_REENTRANT")),
++        thread_scheme    => "(unknown)",
++        sys_id           => "RISCOS",
++        bn_ops           => "BN_LLONG",
++    },
 +);
diff --git a/sdk/recipes/patches/openssl/Configure.p 
b/sdk/recipes/patches/openssl/Configure.p
index 6b1a39e..f44d99d 100644
--- a/sdk/recipes/patches/openssl/Configure.p
+++ b/sdk/recipes/patches/openssl/Configure.p
@@ -1,9 +1,10 @@
 --- Configure.orig     2017-10-17 14:53:18.369801491 +0100
 +++ Configure  2017-10-17 15:11:04.312242542 +0100
-@@ -1329,6 +1329,7 @@
+@@ -1329,6 +1329,8 @@
  $target{cxxflags}//=$target{cflags} if $target{CXX};
  $target{exe_extension}=".exe" if ($config{target} eq "DJGPP");
  $target{exe_extension}=".pm"  if ($config{target} =~ /vos/);
++$target{exe_extension}=",e1f" if ($config{target} eq "arm-riscos-gnueabihf");
 +$target{exe_extension}=",e1f" if ($config{target} eq "arm-unknown-riscos");
  
  # Fill %config with values from %user, and in case those are undefined or
diff --git a/sdk/recipes/patches/zlib/arm-riscos-gnueabihf/configure.p 
b/sdk/recipes/patches/zlib/arm-riscos-gnueabihf/configure.p
new file mode 100644
index 0000000..24d7a7e
--- /dev/null
+++ b/sdk/recipes/patches/zlib/arm-riscos-gnueabihf/configure.p
@@ -0,0 +1,42 @@
+--- configure.orig     2012-05-02 05:17:08.000000000 +0100
++++ configure  2012-07-17 17:57:01.000000000 +0100
+@@ -423,18 +423,18 @@
+ echo >> configure.log
+ 
+ # check for large file support, and if none, check for fseeko()
+-cat > $test.c <<EOF
+-#include <sys/types.h>
+-off64_t dummy = 0;
+-EOF
+-if try $CC -c $CFLAGS -D_LARGEFILE64_SOURCE=1 $test.c; then
+-  CFLAGS="${CFLAGS} -D_LARGEFILE64_SOURCE=1"
+-  SFLAGS="${SFLAGS} -D_LARGEFILE64_SOURCE=1"
+-  ALL="${ALL} all64"
+-  TEST="${TEST} test64"
+-  echo "Checking for off64_t... Yes." | tee -a configure.log
+-  echo "Checking for fseeko... Yes." | tee -a configure.log
+-else
++#cat > $test.c <<EOF
++##include <sys/types.h>
++#off64_t dummy = 0;
++#EOF
++#if try $CC -c $CFLAGS -D_LARGEFILE64_SOURCE=1 $test.c; then
++#  CFLAGS="${CFLAGS} -D_LARGEFILE64_SOURCE=1"
++#  SFLAGS="${SFLAGS} -D_LARGEFILE64_SOURCE=1"
++#  ALL="${ALL} all64"
++#  TEST="${TEST} test64"
++#  echo "Checking for off64_t... Yes." | tee -a configure.log
++#  echo "Checking for fseeko... Yes." | tee -a configure.log
++#else
+   echo "Checking for off64_t... No." | tee -a configure.log
+   echo >> configure.log
+   cat > $test.c <<EOF
+@@ -451,7 +451,7 @@
+     SFLAGS="${SFLAGS} -DNO_FSEEKO"
+     echo "Checking for fseeko... No." | tee -a configure.log
+   fi
+-fi
++##fi
+ 
+ echo >> configure.log
+ 


commitdiff 
http://git.netsurf-browser.org/toolchains.git/commit/?id=108ca67a62fde03373749c6070e0be12784bc567
commit 108ca67a62fde03373749c6070e0be12784bc567
Author: John-Mark Bell <[email protected]>
Commit: John-Mark Bell <[email protected]>

    Make ro-install available
    
    The OSLib buildsystem expects this to exist, so ensure it does,
    patching the original to find the correct objdump binary.

diff --git a/arm-riscos-gnueabihf/Makefile b/arm-riscos-gnueabihf/Makefile
index 6c53c9b..1deec0f 100644
--- a/arm-riscos-gnueabihf/Makefile
+++ b/arm-riscos-gnueabihf/Makefile
@@ -3,6 +3,7 @@ UPSTREAM_GCCSDK_VERSION := 7698
 UPSTREAM_GCCSDK_TARBALL := gccsdk$(UPSTREAM_GCCSDK_VERSION).tar.gz
 UPSTREAM_GCCSDK_URI := 
svn://svn.riscos.info/gccsdk/trunk/autobuilder/develop/gcc@$(UPSTREAM_GCCSDK_VERSION)
 UPSTREAM_GCCSDK_SGP_URI := 
svn://svn.riscos.info/gccsdk/trunk/gcc4/setup-gccsdk-params@$(UPSTREAM_GCCSDK_VERSION)
+UPSTREAM_GCCSDK_ROINSTALL_URI := 
svn://svn.riscos.info/gccsdk/trunk/gcc4/porting-scripts/ro-install@$(UPSTREAM_GCCSDK_VERSION)
 UPSTREAM_GCCSDK_AMP_URI := 
svn://svn.riscos.info/gccsdk/trunk/gcc4/recipe/patches/automake-for-binutils@$(UPSTREAM_GCCSDK_VERSION)
 UPSTREAM_GCCSDK_UNIXLIB_URI := 
svn://svn.riscos.info/gccsdk/trunk/gcc4/recipe/files/gcc/libunixlib@$(UPSTREAM_GCCSDK_VERSION)
 UPSTREAM_GCCSDK_LD_URI := 
svn://svn.riscos.info/gccsdk/trunk/gcc4/riscos/soloader/dynamic/ld.so-1.9.9@$(UPSTREAM_GCCSDK_VERSION)
@@ -124,6 +125,10 @@ $(BUILDSTEPS)/oslib.d: $(BUILDSTEPS)/gcc.d 
$(SOURCESDIR)/$(UPSTREAM_OSLIB_TARBAL
 
 $(BUILDSTEPS)/gcc.d: $(BUILDSTEPS)/gccsdk-srcdir.d
        cd $(BUILDDIR)/gccsdk && make
+       @# Install ro-install
+       mkdir -p $(PREFIX)/env
+       sed -e s:GCCSDK_ENV:$(PREFIX)/env:g < $(BUILDDIR)/gccsdk/ro-install > 
$(PREFIX)/env/ro-install
+       chmod 755 $(PREFIX)/env/ro-install
        @# Install empty libraries needed to fool configure scripts
        for l in c pthread gcc_s ; do $(PREFIX)/cross/bin/$(TARGET_NAME)-ar mv 
$(PREFIX)/cross/$(TARGET_NAME)/lib/lib$$l.a ; done
        @# Newer GCCSDK adds these trampoline binaries that for us
@@ -152,6 +157,7 @@ $(BUILDSTEPS)/gccsdk-srcdir.d: $(BUILDSTEPS)/buildsteps.d 
$(SOURCESDIR)/$(UPSTRE
 $(SOURCESDIR)/$(UPSTREAM_GCCSDK_TARBALL):
        svn export $(UPSTREAM_GCCSDK_URI) $(SOURCESDIR)/gccsdk/gcc
        svn export $(UPSTREAM_GCCSDK_SGP_URI) $(SOURCESDIR)/gccsdk/
+       svn export $(UPSTREAM_GCCSDK_ROINSTALL_URI) $(SOURCESDIR)/gccsdk/
        svn export $(UPSTREAM_GCCSDK_AMP_URI) $(SOURCESDIR)/gccsdk/automake
        svn export $(UPSTREAM_GCCSDK_UNIXLIB_URI) 
$(SOURCESDIR)/gccsdk/libunixlib
        svn export $(UPSTREAM_GCCSDK_LD_URI) $(SOURCESDIR)/gccsdk/ld
diff --git 
a/arm-riscos-gnueabihf/recipes/patches/gccsdk/roinstall-objdump-name.p 
b/arm-riscos-gnueabihf/recipes/patches/gccsdk/roinstall-objdump-name.p
new file mode 100644
index 0000000..7451829
--- /dev/null
+++ b/arm-riscos-gnueabihf/recipes/patches/gccsdk/roinstall-objdump-name.p
@@ -0,0 +1,13 @@
+Index: ro-install
+===================================================================
+--- ro-install (revision 7698)
++++ ro-install (working copy)
+@@ -72,7 +72,7 @@
+ 
+     # Check that static libraries really do contain static objects
+     if grep -q "\.a\$" <<< $param || grep -q "\.a-static" <<< $param ; then
+-      if GCCSDK_BIN/arm-unknown-riscos-objdump -p $param | grep -q "position 
independent"; then
++      if GCCSDK_BIN/arm-riscos-gnueabihf-objdump -p $param | grep -q 
"position independent"; then
+         echo "RISC OS Cross installer: static archive $param contains 
position independent code" 1>&2
+         exit 1
+       fi


commitdiff 
http://git.netsurf-browser.org/toolchains.git/commit/?id=9007b76ef30584fafa8d50c2b25d70a86db6a1b3
commit 9007b76ef30584fafa8d50c2b25d70a86db6a1b3
Author: John-Mark Bell <[email protected]>
Commit: John-Mark Bell <[email protected]>

    Teach OSLib about EABI
    
    This introduces a new asmtype to defmod which invokes the correct
    GCC for the task. It may be necessary to perform further surgery
    to defmod's assembler generation to address places where the EABI
    calling conventions don't match APCS-32 (note that there is no
    floating point involved here, so that's one headache avoided).
    
    Update the OSLib build system to allow building for an EABI target.

diff --git a/arm-riscos-gnueabihf/Makefile b/arm-riscos-gnueabihf/Makefile
index 1a9b4a2..6c53c9b 100644
--- a/arm-riscos-gnueabihf/Makefile
+++ b/arm-riscos-gnueabihf/Makefile
@@ -115,7 +115,7 @@ $(BUILDSTEPS)/ccres.d: $(BUILDSTEPS)/oslib.d 
$(SOURCESDIR)/$(UPSTREAM_CCRES_TARB
 $(BUILDSTEPS)/oslib.d: $(BUILDSTEPS)/gcc.d 
$(SOURCESDIR)/$(UPSTREAM_OSLIB_TARBALL)
        tar -C $(BUILDDIR) -xaf $(SOURCESDIR)/$(UPSTREAM_OSLIB_TARBALL)
        for p in `ls $(RECIPES)/patches/oslib/*.p` ; do patch -d 
$(BUILDDIR)/oslib -p0 <$$p ; done
-       cd $(BUILDDIR)/oslib && GCCSDK_INSTALL_ENV=$(PREFIX)/env 
GCCSDK_INSTALL_CROSSBIN=$(PREFIX)/cross/bin make install
+       cd $(BUILDDIR)/oslib && GCCSDK_INSTALL_ENV=$(PREFIX)/env 
GCCSDK_INSTALL_CROSSBIN=$(PREFIX)/cross/bin make install-elfeabi
        touch $@
 
 ###
diff --git a/arm-riscos-gnueabihf/recipes/patches/oslib/buildsystem-elfeabi.p 
b/arm-riscos-gnueabihf/recipes/patches/oslib/buildsystem-elfeabi.p
new file mode 100644
index 0000000..a729f9e
--- /dev/null
+++ b/arm-riscos-gnueabihf/recipes/patches/oslib/buildsystem-elfeabi.p
@@ -0,0 +1,144 @@
+Index: Source/Makefile
+===================================================================
+--- Source/Makefile    (revision 477)
++++ Source/Makefile    (working copy)
+@@ -3,8 +3,8 @@
+ # already be built upfront.
+ # Written by OSLib Development Team.
+ 
+-# Build type: CROSSGCC_AOF, CROSSGCC_ELF (default), [NORCROFT_AOF: not
+-# supported yet]
++# Build type: CROSSGCC_AOF, CROSSGCC_ELF (default), CROSSGCC_ELFEABI,
++# [NORCROFT_AOF: not supported yet]
+ export BUILDTYPE ?= CROSSGCC_ELF
+ # Possible values: "SOFTFPU" (e.g. for UnixLib usage), "HARDFPU" (e.g. for
+ # SharedCLibrary usage) and "MODULE" (latter also meaning HARDFPU but the
+@@ -12,9 +12,10 @@
+ export ELFOBJECTTYPE ?= SOFTFPU
+ 
+ ifeq ($(BUILDTYPE),CROSSGCC_ELF)
++else ifeq ($(BUILDTYPE),CROSSGCC_ELFEABI)
+ else ifeq ($(BUILDTYPE),CROSSGCC_AOF)
+ else
+-$(error Unknown BUILDTYPE value, possible values are CROSSGCC_AOF and 
CROSSGCC_ELF)
++$(error Unknown BUILDTYPE value, possible values are CROSSGCC_AOF, 
CROSSGCC_ELF, and CROSSGCC_ELFEABI)
+ endif
+ include Makefile.setup.$(BUILDTYPE)
+ 
+Index: Source/Makefile.inc
+===================================================================
+--- Source/Makefile.inc        (revision 477)
++++ Source/Makefile.inc        (working copy)
+@@ -65,6 +65,9 @@
+ ifeq ($(BUILDTYPE),CROSSGCC_ELF)
+ .ELFHdr.Hdr:
+               if [ -s "$<" ]; then $(CP) $< $@; fi
++else ifeq ($(BUILDTYPE),CROSSGCC_ELFEABI)
++.ELFHdr.Hdr:
++              if [ -s "$<" ]; then $(CP) $< $@; fi
+ else
+ .AOFHdr.Hdr:
+               if [ -s "$<" ]; then $(CP) $< $@; fi
+@@ -98,6 +101,9 @@
+ ifeq ($(BUILDTYPE),CROSSGCC_ELF)
+ .gas.o:
+               $(AS) -o $@ $<
++else ifeq ($(BUILDTYPE),CROSSGCC_ELFEABI)
++.gas.o:
++              $(AS) -o $@ $<
+ else
+ .asm.o:
+               $(AS) -o $@ $<
+Index: Source/Makefile.setup.CROSSGCC_ELFEABI
+===================================================================
+--- Source/Makefile.setup.CROSSGCC_ELFEABI     (nonexistent)
++++ Source/Makefile.setup.CROSSGCC_ELFEABI     (working copy)
+@@ -0,0 +1,62 @@
++# Settings for ELF building
++
++ifndef GCCSDK_INSTALL_CROSSBIN
++$(error Environment variable GCCSDK_INSTALL_CROSSBIN is not defined)
++endif
++ifndef GCCSDK_INSTALL_ENV
++$(error Environment variable GCCSDK_INSTALL_ENV is not defined)
++endif
++
++ifeq ($(ELFOBJECTTYPE),SOFTFPU)
++CCFLAGS = -mfloat-abi=soft
++DEFMODFLAGS = -float-abi soft
++else ifeq ($(ELFOBJECTTYPE),HARDFPU)
++CCFLAGS = -mlibscl
++DEFMODFLAGS = -float-abi hard
++else ifeq ($(ELFOBJECTTYPE),MODULE)
++CCFLAGS = -mmodule
++DEFMODFLAGS = -float-abi hard
++else
++$(error Unknown ELFOBJECTTYPE value, possible values are SOFTFPU, HARDFPU and 
MODULE)
++endif
++
++export SOURCEDIR := $(abspath .)
++export BINDIR := $(SOURCEDIR)/../Bin
++export BUILDDIR := $(SOURCEDIR)/../Build
++export RELEASEDIR := $(SOURCEDIR)/../Release
++export RELEASEBINDIR := $(SOURCEDIR)/../Release/$(BUILDTYPE)/$(ELFOBJECTTYPE)
++export EXAMPLESDIR := $(SOURCEDIR)/../examples
++export DOCSDIR := $(SOURCEDIR)/../docs
++
++export TOPHEADERDIR := $(BUILDDIR)/Header
++export HEADERDIR := $(TOPHEADERDIR)/oslib
++export CSTRONGDIR := $(BUILDDIR)/CStrong
++export VAPIDIR := $(BUILDDIR)/\!Vala/vapi
++export VAPIHDIR := $(BUILDDIR)/vapih
++export OBJDIR := $(BUILDDIR)/Objs
++export OBJEXCEPTDIR := $(BUILDDIR)/Objs/Exceptions
++export OSLIBSUPPORTDIR := $(BUILDDIR)/OSLibSupport
++
++export BYTEWIDE := $(SOURCEDIR)/ByteWide
++export DEFMOD := $(BINDIR)/defmod -asmtype gccelfeabi $(DEFMODFLAGS)
++export REDUCEAOF := @echo Not needed for ELF build: reduceaof
++export BINDHELP := $(BINDIR)/bindhelp
++
++export PATH := $(GCCSDK_INSTALL_CROSSBIN):$(PATH)
++
++export CC := arm-riscos-gnueabihf-gcc $(CCFLAGS)
++export CXX := arm-riscos-gnueabihf-g++ $(CCFLAGS)
++export AS := arm-riscos-gnueabihf-gcc -c -xassembler-with-cpp $(CCFLAGS) -I.. 
-I$(SOURCEDIR)/Types
++export LIBFILE := arm-riscos-gnueabihf-ar rs
++export MKDIR := mkdir -p
++export RM := rm -rf
++export CP := cp -r
++export INSTALL := $(GCCSDK_INSTALL_ENV)/ro-install
++
++export ASMEXT := .gas
++export EXEEXT := ,e1f
++export LIBSUFFIX := a
++
++export OSLIBLIB := $(BUILDDIR)/libOSLib32.$(LIBSUFFIX)
++export OSLIBSUPPORTLIB := $(OSLIBSUPPORTDIR)/libOSLibSupport32.$(LIBSUFFIX)
++export OSLIBCSTRONG := $(BUILDDIR)/OSLib,3d6
+Index: Makefile
+===================================================================
+--- Makefile   (revision 477)
++++ Makefile   (working copy)
+@@ -29,6 +29,10 @@
+ install-elf: oslib-elf
+       $(MAKE) -C Source install BUILDTYPE=CROSSGCC_ELF
+ 
++# Installs the ELF headers & library in GCCSDK environment.
++install-elfeabi: oslib-elfeabi
++      $(MAKE) -C Source install BUILDTYPE=CROSSGCC_ELFEABI
++
+ # Installs the AOF headers & library in GCCSDK environment.
+ install-aof: oslib-aof
+       $(MAKE) -C Source install BUILDTYPE=CROSSGCC_AOF
+@@ -49,6 +53,10 @@
+       $(MAKE) -C Source oslib BUILDTYPE=CROSSGCC_ELF
+       $(MAKE) -C Source oslibsupport BUILDTYPE=CROSSGCC_ELF
+ 
++oslib-elfeabi: tools
++      $(MAKE) -C Source oslib BUILDTYPE=CROSSGCC_ELFEABI
++      $(MAKE) -C Source oslibsupport BUILDTYPE=CROSSGCC_ELFEABI
++
+ vapis: tools
+       $(MAKE) -C Source vapis BUILDTYPE=CROSSGCC_ELF
+ 
diff --git a/arm-riscos-gnueabihf/recipes/patches/oslib/defmod-elfeabi.p 
b/arm-riscos-gnueabihf/recipes/patches/oslib/defmod-elfeabi.p
new file mode 100644
index 0000000..97e15f8
--- /dev/null
+++ b/arm-riscos-gnueabihf/recipes/patches/oslib/defmod-elfeabi.p
@@ -0,0 +1,84 @@
+Index: Tools/DefMod2/assembler.c
+===================================================================
+--- Tools/DefMod2/assembler.c  (revision 477)
++++ Tools/DefMod2/assembler.c  (working copy)
+@@ -1242,6 +1242,21 @@
+                      goto finish;
+                      break;
+                  }
++                 case AsmType_eGCCELFEABI:
++                 {
++                     const char *floatABI = (FloatABI == FloatABI_eSoft) ? 
"soft" : "hard";
++                     if (!apcs32)
++                       {
++                         fprintf(stderr, "EABI does not support APCS-26.");
++                         goto finish;
++                       }
++                     if ((rc = sprintf (cmd,
++                              "arm-riscos-gnueabihf-gcc -c -xassembler 
-mfloat-abi=%s -o %s %s",
++                              floatABI,
++                              name2, name1)) < 0)
++                     goto finish;
++                     break;
++                 }
+                  default:
+                    fprintf (stderr, "Unknown assembler type\n");
+                    goto finish;
+Index: Tools/DefMod2/assembler.h
+===================================================================
+--- Tools/DefMod2/assembler.h  (revision 477)
++++ Tools/DefMod2/assembler.h  (working copy)
+@@ -22,8 +22,9 @@
+   AsmType_eGCCAOF,    /* Assembler used in GCCSDK 3.4 (AOF) release, called
+     'as' (predecessor of AsAsm).  */
+   AsmType_eARMASM,    /* ARM's assembler.  */
+-  AsmType_eGCCELF     /* Assembler used in GCCSDK 4 (ELF) release, called
++  AsmType_eGCCELF,    /* Assembler used in GCCSDK 4 (ELF) release, called
+     'gas' (GNU binutils assembler).  */
++  AsmType_eGCCELFEABI /* Assembler used in EABI-capable GCCSDK */
+ } AsmType_e;
+ 
+ typedef enum
+@@ -37,7 +38,7 @@
+ extern AsmType_e AsmType;
+ extern FloatABI_e FloatABI;
+   
+-#define GASSyntax (AsmType == AsmType_eGCCELF)
++#define GASSyntax (AsmType == AsmType_eGCCELF || AsmType == 
AsmType_eGCCELFEABI)
+ 
+ /*if |separate|, output is to the directory |output|; otherwise, to the file 
|file|.*/
+ extern os_error *assembler_output (FILE *file, const char *title, const char 
*author, lookup_t types, lookup_t swis, osbool separate, osbool apcs32, char 
*output);
+Index: Tools/DefMod2/defmod.y
+===================================================================
+--- Tools/DefMod2/defmod.y     (revision 477)
++++ Tools/DefMod2/defmod.y     (working copy)
+@@ -1179,7 +1179,7 @@
+                      "[-o <output-dir> | > <output-file>] "
+                      "[-byte_wide <byte-wide-file>] "
+                      "[-26bit | -32bit] "
+-                     "[-asmtype [objasm | asasmaof | asasmelf | gccaof | 
armasm | gccelf]] "
++                     "[-asmtype [objasm | asasmaof | asasmelf | gccaof | 
armasm | gccelf | gccelfeabi]] "
+                    "[-float-abi [soft | hard]] "
+                      "< <module-interface-file>\r"
+                "Purpose: generate output from a module interface file\r"
+@@ -1203,6 +1203,7 @@
+                "\tgccaof\t\t"       "...use GCC AOF toolkit (GCCSDK 3.4 
only)\r"
+                "\tarmasm\t\t"       "...use ARM ASM\r"
+                "\tgccelf\t\t"       "...use GCC ELF toolkit (GCCSDK 4 only)\r"
++               "\tgccelfeabi\t\t"   "...use GCC EABI ELF toolkit (GCCSDK 8+ 
only)\r"
+              "-float-abi\t\t"     "marks object files which float-abi is in 
use\r"
+              "\tsoft\t\t"         "...soft-float, no FP instructions used\r"
+              "\thard\t\t"         "...hard-float, FP instructions can be 
used\r"
+@@ -1345,9 +1346,11 @@
+             AsmType = AsmType_eARMASM;
+          else if (strcmp (argv[i], "gccelf") == 0)
+             AsmType = AsmType_eGCCELF;
++         else if (strcmp (argv[i], "gccelfeabi") == 0)
++            AsmType = AsmType_eGCCELFEABI;
+          else
+          {
+-            fprintf (stderr, "Unknown option value %s for -asmtype (only 
\"objasm\", \"asasmaof\", \"asasmelf\", \"armarm\", \"gccaof\" and \"gccelf\" 
are known)\n", argv[i]);
++            fprintf (stderr, "Unknown option value %s for -asmtype (only 
\"objasm\", \"asasmaof\", \"asasmelf\", \"armarm\", \"gccaof\", \"gccelf\" and 
\"gccelfeabi\" are known)\n", argv[i]);
+             Parse_Error = TRUE;
+             goto finish;
+          }


commitdiff 
http://git.netsurf-browser.org/toolchains.git/commit/?id=475c571bf9c7e927cc15688f629b408b69733f5f
commit 475c571bf9c7e927cc15688f629b408b69733f5f
Author: John-Mark Bell <[email protected]>
Commit: John-Mark Bell <[email protected]>

    Fix OS ABI check when building elf2aif for EABI
    
    Binaries built with the arm-riscos-gnueabihf toolchain have an
    OS ABI of none (i.e. Sys-V) in the ELF header. elf2aif expected
    the declared ABI to be ARM as that is what the previous tooling
    emitted. Fix up this check to reflect the new reality.

diff --git a/arm-riscos-gnueabihf/recipes/patches/gccsdk/elf2aif-no-abi-check.p 
b/arm-riscos-gnueabihf/recipes/patches/gccsdk/elf2aif-no-abi-check.p
new file mode 100644
index 0000000..3ad6372
--- /dev/null
+++ b/arm-riscos-gnueabihf/recipes/patches/gccsdk/elf2aif-no-abi-check.p
@@ -0,0 +1,16 @@
+Index: elf2aif/src/elf2aif.c
+===================================================================
+--- elf2aif/src/elf2aif.c      (revision 7698)
++++ elf2aif/src/elf2aif.c      (working copy)
+@@ -201,7 +201,11 @@
+       return EXIT_FAILURE;
+     }
+ 
++#ifndef __ARM_EABI__
+   if (elf_ehdr.e_ident[EI_OSABI] != ELFOSABI_ARM)
++#else
++  if (elf_ehdr.e_ident[EI_OSABI] != ELFOSABI_NONE)
++#endif
+     {
+       fprintf (stderr, "ELF file '%s' is not for ARM\n", elf_filename);
+       return EXIT_FAILURE;


commitdiff 
http://git.netsurf-browser.org/toolchains.git/commit/?id=47ba3fab779ff40cdfa1983780f3716d9c20a885
commit 47ba3fab779ff40cdfa1983780f3716d9c20a885
Author: John-Mark Bell <[email protected]>
Commit: John-Mark Bell <[email protected]>

    Fetch and build additional tools
    
    Specifically: asasm, elf2aif, ln, mkres

diff --git a/arm-riscos-gnueabihf/Makefile b/arm-riscos-gnueabihf/Makefile
index 0c9eadb..1a9b4a2 100644
--- a/arm-riscos-gnueabihf/Makefile
+++ b/arm-riscos-gnueabihf/Makefile
@@ -2,10 +2,14 @@
 UPSTREAM_GCCSDK_VERSION := 7698
 UPSTREAM_GCCSDK_TARBALL := gccsdk$(UPSTREAM_GCCSDK_VERSION).tar.gz
 UPSTREAM_GCCSDK_URI := 
svn://svn.riscos.info/gccsdk/trunk/autobuilder/develop/gcc@$(UPSTREAM_GCCSDK_VERSION)
-UPSTREAM_GCCSDK_AMP_URI := 
svn://svn.riscos.info/gccsdk/trunk/gcc4/recipe/patches/automake-for-binutils@$(UPSTREAM_GCCSDK_VERSION)
-UPSTREAM_GCCSDK_LD_URI := 
svn://svn.riscos.info/gccsdk/trunk/gcc4/riscos/soloader/dynamic/ld.so-1.9.9@$(UPSTREAM_GCCSDK_VERSION)
 UPSTREAM_GCCSDK_SGP_URI := 
svn://svn.riscos.info/gccsdk/trunk/gcc4/setup-gccsdk-params@$(UPSTREAM_GCCSDK_VERSION)
+UPSTREAM_GCCSDK_AMP_URI := 
svn://svn.riscos.info/gccsdk/trunk/gcc4/recipe/patches/automake-for-binutils@$(UPSTREAM_GCCSDK_VERSION)
 UPSTREAM_GCCSDK_UNIXLIB_URI := 
svn://svn.riscos.info/gccsdk/trunk/gcc4/recipe/files/gcc/libunixlib@$(UPSTREAM_GCCSDK_VERSION)
+UPSTREAM_GCCSDK_LD_URI := 
svn://svn.riscos.info/gccsdk/trunk/gcc4/riscos/soloader/dynamic/ld.so-1.9.9@$(UPSTREAM_GCCSDK_VERSION)
+UPSTREAM_GCCSDK_ASASM_URI := 
svn://svn.riscos.info/gccsdk/trunk/tools/asasm@$(UPSTREAM_GCCSDK_VERSION)
+UPSTREAM_GCCSDK_ELF2AIF_URI := 
svn://svn.riscos.info/gccsdk/trunk/gcc4/riscos/elf2aif@$(UPSTREAM_GCCSDK_VERSION)
+UPSTREAM_GCCSDK_LN_URI := 
svn://svn.riscos.info/gccsdk/trunk/gcc4/riscos/ln@$(UPSTREAM_GCCSDK_VERSION)
+UPSTREAM_GCCSDK_MKRESFS_URI := 
svn://svn.riscos.info/gccsdk/trunk/gcc4/riscos/mkresfs@$(UPSTREAM_GCCSDK_VERSION)
 
 # OSLib 7.00
 UPSTREAM_OSLIB_VERSION := 700
@@ -147,10 +151,14 @@ $(BUILDSTEPS)/gccsdk-srcdir.d: $(BUILDSTEPS)/buildsteps.d 
$(SOURCESDIR)/$(UPSTRE
 
 $(SOURCESDIR)/$(UPSTREAM_GCCSDK_TARBALL):
        svn export $(UPSTREAM_GCCSDK_URI) $(SOURCESDIR)/gccsdk/gcc
-       svn export $(UPSTREAM_GCCSDK_AMP_URI) $(SOURCESDIR)/gccsdk/automake
-       svn export $(UPSTREAM_GCCSDK_LD_URI) $(SOURCESDIR)/gccsdk/ld
        svn export $(UPSTREAM_GCCSDK_SGP_URI) $(SOURCESDIR)/gccsdk/
+       svn export $(UPSTREAM_GCCSDK_AMP_URI) $(SOURCESDIR)/gccsdk/automake
        svn export $(UPSTREAM_GCCSDK_UNIXLIB_URI) 
$(SOURCESDIR)/gccsdk/libunixlib
+       svn export $(UPSTREAM_GCCSDK_LD_URI) $(SOURCESDIR)/gccsdk/ld
+       svn export $(UPSTREAM_GCCSDK_ASASM_URI) $(SOURCESDIR)/gccsdk/asasm
+       svn export $(UPSTREAM_GCCSDK_ELF2AIF_URI) $(SOURCESDIR)/gccsdk/elf2aif
+       svn export $(UPSTREAM_GCCSDK_LN_URI) $(SOURCESDIR)/gccsdk/ln
+       svn export $(UPSTREAM_GCCSDK_MKRESFS_URI) $(SOURCESDIR)/gccsdk/mkresfs
        tar -C $(SOURCESDIR) -caf $@ gccsdk
 
 $(SOURCESDIR)/$(UPSTREAM_OSLIB_TARBALL):
diff --git a/arm-riscos-gnueabihf/recipes/files/gccsdk/Makefile 
b/arm-riscos-gnueabihf/recipes/files/gccsdk/Makefile
index 5f2740b..4e3467b 100644
--- a/arm-riscos-gnueabihf/recipes/files/gccsdk/Makefile
+++ b/arm-riscos-gnueabihf/recipes/files/gccsdk/Makefile
@@ -247,14 +247,38 @@ cross-gcc-built: cross-gcc-configured
        cd $(BUILDDIR)/cross-gcc && 
PATH="$(PREFIX_BUILDTOOL_GCC)/bin:$(PREFIX_CROSS)/bin:$(PATH)" && $(MAKE) 
$(GCC_BUILD_FLAGS) && $(MAKE) install
        touch $(BUILDSTEPSDIR)/$@
 
-# Build the RISC OS related tools (cmunge, elf2aif, asasm, etc) cross:
-# XXX: currently, this just builds ld -- what more do we need?
+# Build the RISC OS related tools (elf2aif, asasm, etc) cross:
 cross-riscostools-built: cross-gcc-built
+       @# LD
        -rm -rf $(BUILDDIR)/cross-ld
        mkdir -p $(BUILDDIR)/cross-ld
-       cd $(ROOT)/ld && 
PATH="$(PREFIX_CROSS)/bin:$(PREFIX_BUILDTOOL_BINUTILS)/bin:$(PATH)" autoreconf 
--install
+       cd $(ROOT)/ld && 
PATH="$(PREFIX_CROSS)/bin:$(PREFIX_BUILDTOOL_BINUTILS)/bin:$(PATH)" autoreconf 
-f --install
        cd $(BUILDDIR)/cross-ld && 
PATH="$(PREFIX_CROSS)/bin:$(PREFIX_BUILDTOOL_BINUTILS)/bin:$(PATH)" 
CC=$(GCCSDK_INSTALL_CROSSBIN)/$(TARGET)-gcc $(ROOT)/ld/configure 
--prefix=$(PREFIX_CROSS)/$(TARGET) --host=$(TARGET) --target=$(TARGET)
        cd $(BUILDDIR)/cross-ld && 
PATH="$(PREFIX_CROSS)/bin:$(PREFIX_BUILDTOOL_BINUTILS)/bin:$(PATH)" make install
+       @# asasm
+       -rm -rf $(BUILDDIR)/cross-asasm
+       mkdir -p $(BUILDDIR)/cross-asasm
+       cd $(ROOT)/asasm && 
PATH="$(PREFIX_CROSS)/bin:$(PREFIX_BUILDTOOL_BINUTILS)/bin:$(PATH)" 
ACLOCAL='aclocal -I $(ROOT)/asasm/m4' autoreconf -f --install
+       cd $(BUILDDIR)/cross-asasm && 
PATH="$(PREFIX_CROSS)/bin:$(PREFIX_BUILDTOOL_BINUTILS)/bin:$(PATH)" 
$(ROOT)/asasm/configure --prefix=$(PREFIX_CROSS) --target=$(TARGET) 
--disable-building-tools
+       cd $(BUILDDIR)/cross-asasm && 
PATH="$(PREFIX_CROSS)/bin:$(PREFIX_BUILDTOOL_BINUTILS)/bin:$(PATH)" make 
install-minimum
+       @# elf2aif
+       -rm -rf $(BUILDDIR)/cross-elf2aif
+       mkdir -p $(BUILDDIR)/cross-elf2aif
+       cd $(ROOT)/elf2aif && 
PATH="$(PREFIX_CROSS)/bin:$(PREFIX_BUILDTOOL_BINUTILS)/bin:$(PATH)" autoreconf 
-f --install
+       cd $(BUILDDIR)/cross-elf2aif && 
PATH="$(PREFIX_CROSS)/bin:$(PREFIX_BUILDTOOL_BINUTILS)/bin:$(PATH)" 
$(ROOT)/elf2aif/configure --prefix=$(PREFIX_CROSS) --target=$(TARGET)
+       cd $(BUILDDIR)/cross-elf2aif && 
PATH="$(PREFIX_CROSS)/bin:$(PREFIX_BUILDTOOL_BINUTILS)/bin:$(PATH)" make install
+       @# ln
+       -rm -rf $(BUILDDIR)/cross-ln
+       mkdir -p $(BUILDDIR)/cross-ln
+       cd $(ROOT)/ln && 
PATH="$(PREFIX_CROSS)/bin:$(PREFIX_BUILDTOOL_BINUTILS)/bin:$(PATH)" autoreconf 
-f --install
+       cd $(BUILDDIR)/cross-ln && 
PATH="$(PREFIX_CROSS)/bin:$(PREFIX_BUILDTOOL_BINUTILS)/bin:$(PATH)" 
$(ROOT)/ln/configure --prefix=$(PREFIX_CROSS) --target=$(TARGET)
+       cd $(BUILDDIR)/cross-ln && 
PATH="$(PREFIX_CROSS)/bin:$(PREFIX_BUILDTOOL_BINUTILS)/bin:$(PATH)" make install
+       @# mkresfs
+       -rm -rf $(BUILDDIR)/cross-mkresfs
+       mkdir -p $(BUILDDIR)/cross-mkresfs
+       cd $(ROOT)/mkresfs && 
PATH="$(PREFIX_CROSS)/bin:$(PREFIX_BUILDTOOL_BINUTILS)/bin:$(PATH)" autoreconf 
-f --install
+       cd $(BUILDDIR)/cross-mkresfs && 
PATH="$(PREFIX_CROSS)/bin:$(PREFIX_BUILDTOOL_BINUTILS)/bin:$(PATH)" 
$(ROOT)/mkresfs/configure --prefix=$(PREFIX_CROSS) --target=$(TARGET)
+       cd $(BUILDDIR)/cross-mkresfs && 
PATH="$(PREFIX_CROSS)/bin:$(PREFIX_BUILDTOOL_BINUTILS)/bin:$(PATH)" make install
        touch $(BUILDSTEPSDIR)/$@
 
 # -- Source unpacking.


-----------------------------------------------------------------------

Summary of changes:
 arm-riscos-gnueabihf/Makefile                      |   24 +++-
 arm-riscos-gnueabihf/recipes/files/gccsdk/Makefile |   30 +++-
 .../recipes/patches/gccsdk/elf2aif-no-abi-check.p  |   16 +++
 .../patches/gccsdk/roinstall-objdump-name.p        |   13 ++
 .../recipes/patches/oslib/buildsystem-elfeabi.p    |  144 ++++++++++++++++++++
 .../recipes/patches/oslib/defmod-elfeabi.p         |   84 ++++++++++++
 sdk/Makefile                                       |    8 ++
 .../openssl/Configurations-50-riscos.conf.p        |   14 +-
 sdk/recipes/patches/openssl/Configure.p            |    3 +-
 .../configure.p                                    |    0
 10 files changed, 326 insertions(+), 10 deletions(-)
 create mode 100644 
arm-riscos-gnueabihf/recipes/patches/gccsdk/elf2aif-no-abi-check.p
 create mode 100644 
arm-riscos-gnueabihf/recipes/patches/gccsdk/roinstall-objdump-name.p
 create mode 100644 
arm-riscos-gnueabihf/recipes/patches/oslib/buildsystem-elfeabi.p
 create mode 100644 arm-riscos-gnueabihf/recipes/patches/oslib/defmod-elfeabi.p
 copy sdk/recipes/patches/zlib/{arm-unknown-riscos => 
arm-riscos-gnueabihf}/configure.p (100%)

diff --git a/arm-riscos-gnueabihf/Makefile b/arm-riscos-gnueabihf/Makefile
index 0c9eadb..1deec0f 100644
--- a/arm-riscos-gnueabihf/Makefile
+++ b/arm-riscos-gnueabihf/Makefile
@@ -2,10 +2,15 @@
 UPSTREAM_GCCSDK_VERSION := 7698
 UPSTREAM_GCCSDK_TARBALL := gccsdk$(UPSTREAM_GCCSDK_VERSION).tar.gz
 UPSTREAM_GCCSDK_URI := 
svn://svn.riscos.info/gccsdk/trunk/autobuilder/develop/gcc@$(UPSTREAM_GCCSDK_VERSION)
-UPSTREAM_GCCSDK_AMP_URI := 
svn://svn.riscos.info/gccsdk/trunk/gcc4/recipe/patches/automake-for-binutils@$(UPSTREAM_GCCSDK_VERSION)
-UPSTREAM_GCCSDK_LD_URI := 
svn://svn.riscos.info/gccsdk/trunk/gcc4/riscos/soloader/dynamic/ld.so-1.9.9@$(UPSTREAM_GCCSDK_VERSION)
 UPSTREAM_GCCSDK_SGP_URI := 
svn://svn.riscos.info/gccsdk/trunk/gcc4/setup-gccsdk-params@$(UPSTREAM_GCCSDK_VERSION)
+UPSTREAM_GCCSDK_ROINSTALL_URI := 
svn://svn.riscos.info/gccsdk/trunk/gcc4/porting-scripts/ro-install@$(UPSTREAM_GCCSDK_VERSION)
+UPSTREAM_GCCSDK_AMP_URI := 
svn://svn.riscos.info/gccsdk/trunk/gcc4/recipe/patches/automake-for-binutils@$(UPSTREAM_GCCSDK_VERSION)
 UPSTREAM_GCCSDK_UNIXLIB_URI := 
svn://svn.riscos.info/gccsdk/trunk/gcc4/recipe/files/gcc/libunixlib@$(UPSTREAM_GCCSDK_VERSION)
+UPSTREAM_GCCSDK_LD_URI := 
svn://svn.riscos.info/gccsdk/trunk/gcc4/riscos/soloader/dynamic/ld.so-1.9.9@$(UPSTREAM_GCCSDK_VERSION)
+UPSTREAM_GCCSDK_ASASM_URI := 
svn://svn.riscos.info/gccsdk/trunk/tools/asasm@$(UPSTREAM_GCCSDK_VERSION)
+UPSTREAM_GCCSDK_ELF2AIF_URI := 
svn://svn.riscos.info/gccsdk/trunk/gcc4/riscos/elf2aif@$(UPSTREAM_GCCSDK_VERSION)
+UPSTREAM_GCCSDK_LN_URI := 
svn://svn.riscos.info/gccsdk/trunk/gcc4/riscos/ln@$(UPSTREAM_GCCSDK_VERSION)
+UPSTREAM_GCCSDK_MKRESFS_URI := 
svn://svn.riscos.info/gccsdk/trunk/gcc4/riscos/mkresfs@$(UPSTREAM_GCCSDK_VERSION)
 
 # OSLib 7.00
 UPSTREAM_OSLIB_VERSION := 700
@@ -111,7 +116,7 @@ $(BUILDSTEPS)/ccres.d: $(BUILDSTEPS)/oslib.d 
$(SOURCESDIR)/$(UPSTREAM_CCRES_TARB
 $(BUILDSTEPS)/oslib.d: $(BUILDSTEPS)/gcc.d 
$(SOURCESDIR)/$(UPSTREAM_OSLIB_TARBALL)
        tar -C $(BUILDDIR) -xaf $(SOURCESDIR)/$(UPSTREAM_OSLIB_TARBALL)
        for p in `ls $(RECIPES)/patches/oslib/*.p` ; do patch -d 
$(BUILDDIR)/oslib -p0 <$$p ; done
-       cd $(BUILDDIR)/oslib && GCCSDK_INSTALL_ENV=$(PREFIX)/env 
GCCSDK_INSTALL_CROSSBIN=$(PREFIX)/cross/bin make install
+       cd $(BUILDDIR)/oslib && GCCSDK_INSTALL_ENV=$(PREFIX)/env 
GCCSDK_INSTALL_CROSSBIN=$(PREFIX)/cross/bin make install-elfeabi
        touch $@
 
 ###
@@ -120,6 +125,10 @@ $(BUILDSTEPS)/oslib.d: $(BUILDSTEPS)/gcc.d 
$(SOURCESDIR)/$(UPSTREAM_OSLIB_TARBAL
 
 $(BUILDSTEPS)/gcc.d: $(BUILDSTEPS)/gccsdk-srcdir.d
        cd $(BUILDDIR)/gccsdk && make
+       @# Install ro-install
+       mkdir -p $(PREFIX)/env
+       sed -e s:GCCSDK_ENV:$(PREFIX)/env:g < $(BUILDDIR)/gccsdk/ro-install > 
$(PREFIX)/env/ro-install
+       chmod 755 $(PREFIX)/env/ro-install
        @# Install empty libraries needed to fool configure scripts
        for l in c pthread gcc_s ; do $(PREFIX)/cross/bin/$(TARGET_NAME)-ar mv 
$(PREFIX)/cross/$(TARGET_NAME)/lib/lib$$l.a ; done
        @# Newer GCCSDK adds these trampoline binaries that for us
@@ -147,10 +156,15 @@ $(BUILDSTEPS)/gccsdk-srcdir.d: $(BUILDSTEPS)/buildsteps.d 
$(SOURCESDIR)/$(UPSTRE
 
 $(SOURCESDIR)/$(UPSTREAM_GCCSDK_TARBALL):
        svn export $(UPSTREAM_GCCSDK_URI) $(SOURCESDIR)/gccsdk/gcc
-       svn export $(UPSTREAM_GCCSDK_AMP_URI) $(SOURCESDIR)/gccsdk/automake
-       svn export $(UPSTREAM_GCCSDK_LD_URI) $(SOURCESDIR)/gccsdk/ld
        svn export $(UPSTREAM_GCCSDK_SGP_URI) $(SOURCESDIR)/gccsdk/
+       svn export $(UPSTREAM_GCCSDK_ROINSTALL_URI) $(SOURCESDIR)/gccsdk/
+       svn export $(UPSTREAM_GCCSDK_AMP_URI) $(SOURCESDIR)/gccsdk/automake
        svn export $(UPSTREAM_GCCSDK_UNIXLIB_URI) 
$(SOURCESDIR)/gccsdk/libunixlib
+       svn export $(UPSTREAM_GCCSDK_LD_URI) $(SOURCESDIR)/gccsdk/ld
+       svn export $(UPSTREAM_GCCSDK_ASASM_URI) $(SOURCESDIR)/gccsdk/asasm
+       svn export $(UPSTREAM_GCCSDK_ELF2AIF_URI) $(SOURCESDIR)/gccsdk/elf2aif
+       svn export $(UPSTREAM_GCCSDK_LN_URI) $(SOURCESDIR)/gccsdk/ln
+       svn export $(UPSTREAM_GCCSDK_MKRESFS_URI) $(SOURCESDIR)/gccsdk/mkresfs
        tar -C $(SOURCESDIR) -caf $@ gccsdk
 
 $(SOURCESDIR)/$(UPSTREAM_OSLIB_TARBALL):
diff --git a/arm-riscos-gnueabihf/recipes/files/gccsdk/Makefile 
b/arm-riscos-gnueabihf/recipes/files/gccsdk/Makefile
index 5f2740b..4e3467b 100644
--- a/arm-riscos-gnueabihf/recipes/files/gccsdk/Makefile
+++ b/arm-riscos-gnueabihf/recipes/files/gccsdk/Makefile
@@ -247,14 +247,38 @@ cross-gcc-built: cross-gcc-configured
        cd $(BUILDDIR)/cross-gcc && 
PATH="$(PREFIX_BUILDTOOL_GCC)/bin:$(PREFIX_CROSS)/bin:$(PATH)" && $(MAKE) 
$(GCC_BUILD_FLAGS) && $(MAKE) install
        touch $(BUILDSTEPSDIR)/$@
 
-# Build the RISC OS related tools (cmunge, elf2aif, asasm, etc) cross:
-# XXX: currently, this just builds ld -- what more do we need?
+# Build the RISC OS related tools (elf2aif, asasm, etc) cross:
 cross-riscostools-built: cross-gcc-built
+       @# LD
        -rm -rf $(BUILDDIR)/cross-ld
        mkdir -p $(BUILDDIR)/cross-ld
-       cd $(ROOT)/ld && 
PATH="$(PREFIX_CROSS)/bin:$(PREFIX_BUILDTOOL_BINUTILS)/bin:$(PATH)" autoreconf 
--install
+       cd $(ROOT)/ld && 
PATH="$(PREFIX_CROSS)/bin:$(PREFIX_BUILDTOOL_BINUTILS)/bin:$(PATH)" autoreconf 
-f --install
        cd $(BUILDDIR)/cross-ld && 
PATH="$(PREFIX_CROSS)/bin:$(PREFIX_BUILDTOOL_BINUTILS)/bin:$(PATH)" 
CC=$(GCCSDK_INSTALL_CROSSBIN)/$(TARGET)-gcc $(ROOT)/ld/configure 
--prefix=$(PREFIX_CROSS)/$(TARGET) --host=$(TARGET) --target=$(TARGET)
        cd $(BUILDDIR)/cross-ld && 
PATH="$(PREFIX_CROSS)/bin:$(PREFIX_BUILDTOOL_BINUTILS)/bin:$(PATH)" make install
+       @# asasm
+       -rm -rf $(BUILDDIR)/cross-asasm
+       mkdir -p $(BUILDDIR)/cross-asasm
+       cd $(ROOT)/asasm && 
PATH="$(PREFIX_CROSS)/bin:$(PREFIX_BUILDTOOL_BINUTILS)/bin:$(PATH)" 
ACLOCAL='aclocal -I $(ROOT)/asasm/m4' autoreconf -f --install
+       cd $(BUILDDIR)/cross-asasm && 
PATH="$(PREFIX_CROSS)/bin:$(PREFIX_BUILDTOOL_BINUTILS)/bin:$(PATH)" 
$(ROOT)/asasm/configure --prefix=$(PREFIX_CROSS) --target=$(TARGET) 
--disable-building-tools
+       cd $(BUILDDIR)/cross-asasm && 
PATH="$(PREFIX_CROSS)/bin:$(PREFIX_BUILDTOOL_BINUTILS)/bin:$(PATH)" make 
install-minimum
+       @# elf2aif
+       -rm -rf $(BUILDDIR)/cross-elf2aif
+       mkdir -p $(BUILDDIR)/cross-elf2aif
+       cd $(ROOT)/elf2aif && 
PATH="$(PREFIX_CROSS)/bin:$(PREFIX_BUILDTOOL_BINUTILS)/bin:$(PATH)" autoreconf 
-f --install
+       cd $(BUILDDIR)/cross-elf2aif && 
PATH="$(PREFIX_CROSS)/bin:$(PREFIX_BUILDTOOL_BINUTILS)/bin:$(PATH)" 
$(ROOT)/elf2aif/configure --prefix=$(PREFIX_CROSS) --target=$(TARGET)
+       cd $(BUILDDIR)/cross-elf2aif && 
PATH="$(PREFIX_CROSS)/bin:$(PREFIX_BUILDTOOL_BINUTILS)/bin:$(PATH)" make install
+       @# ln
+       -rm -rf $(BUILDDIR)/cross-ln
+       mkdir -p $(BUILDDIR)/cross-ln
+       cd $(ROOT)/ln && 
PATH="$(PREFIX_CROSS)/bin:$(PREFIX_BUILDTOOL_BINUTILS)/bin:$(PATH)" autoreconf 
-f --install
+       cd $(BUILDDIR)/cross-ln && 
PATH="$(PREFIX_CROSS)/bin:$(PREFIX_BUILDTOOL_BINUTILS)/bin:$(PATH)" 
$(ROOT)/ln/configure --prefix=$(PREFIX_CROSS) --target=$(TARGET)
+       cd $(BUILDDIR)/cross-ln && 
PATH="$(PREFIX_CROSS)/bin:$(PREFIX_BUILDTOOL_BINUTILS)/bin:$(PATH)" make install
+       @# mkresfs
+       -rm -rf $(BUILDDIR)/cross-mkresfs
+       mkdir -p $(BUILDDIR)/cross-mkresfs
+       cd $(ROOT)/mkresfs && 
PATH="$(PREFIX_CROSS)/bin:$(PREFIX_BUILDTOOL_BINUTILS)/bin:$(PATH)" autoreconf 
-f --install
+       cd $(BUILDDIR)/cross-mkresfs && 
PATH="$(PREFIX_CROSS)/bin:$(PREFIX_BUILDTOOL_BINUTILS)/bin:$(PATH)" 
$(ROOT)/mkresfs/configure --prefix=$(PREFIX_CROSS) --target=$(TARGET)
+       cd $(BUILDDIR)/cross-mkresfs && 
PATH="$(PREFIX_CROSS)/bin:$(PREFIX_BUILDTOOL_BINUTILS)/bin:$(PATH)" make install
        touch $(BUILDSTEPSDIR)/$@
 
 # -- Source unpacking.
diff --git a/arm-riscos-gnueabihf/recipes/patches/gccsdk/elf2aif-no-abi-check.p 
b/arm-riscos-gnueabihf/recipes/patches/gccsdk/elf2aif-no-abi-check.p
new file mode 100644
index 0000000..3ad6372
--- /dev/null
+++ b/arm-riscos-gnueabihf/recipes/patches/gccsdk/elf2aif-no-abi-check.p
@@ -0,0 +1,16 @@
+Index: elf2aif/src/elf2aif.c
+===================================================================
+--- elf2aif/src/elf2aif.c      (revision 7698)
++++ elf2aif/src/elf2aif.c      (working copy)
+@@ -201,7 +201,11 @@
+       return EXIT_FAILURE;
+     }
+ 
++#ifndef __ARM_EABI__
+   if (elf_ehdr.e_ident[EI_OSABI] != ELFOSABI_ARM)
++#else
++  if (elf_ehdr.e_ident[EI_OSABI] != ELFOSABI_NONE)
++#endif
+     {
+       fprintf (stderr, "ELF file '%s' is not for ARM\n", elf_filename);
+       return EXIT_FAILURE;
diff --git 
a/arm-riscos-gnueabihf/recipes/patches/gccsdk/roinstall-objdump-name.p 
b/arm-riscos-gnueabihf/recipes/patches/gccsdk/roinstall-objdump-name.p
new file mode 100644
index 0000000..7451829
--- /dev/null
+++ b/arm-riscos-gnueabihf/recipes/patches/gccsdk/roinstall-objdump-name.p
@@ -0,0 +1,13 @@
+Index: ro-install
+===================================================================
+--- ro-install (revision 7698)
++++ ro-install (working copy)
+@@ -72,7 +72,7 @@
+ 
+     # Check that static libraries really do contain static objects
+     if grep -q "\.a\$" <<< $param || grep -q "\.a-static" <<< $param ; then
+-      if GCCSDK_BIN/arm-unknown-riscos-objdump -p $param | grep -q "position 
independent"; then
++      if GCCSDK_BIN/arm-riscos-gnueabihf-objdump -p $param | grep -q 
"position independent"; then
+         echo "RISC OS Cross installer: static archive $param contains 
position independent code" 1>&2
+         exit 1
+       fi
diff --git a/arm-riscos-gnueabihf/recipes/patches/oslib/buildsystem-elfeabi.p 
b/arm-riscos-gnueabihf/recipes/patches/oslib/buildsystem-elfeabi.p
new file mode 100644
index 0000000..a729f9e
--- /dev/null
+++ b/arm-riscos-gnueabihf/recipes/patches/oslib/buildsystem-elfeabi.p
@@ -0,0 +1,144 @@
+Index: Source/Makefile
+===================================================================
+--- Source/Makefile    (revision 477)
++++ Source/Makefile    (working copy)
+@@ -3,8 +3,8 @@
+ # already be built upfront.
+ # Written by OSLib Development Team.
+ 
+-# Build type: CROSSGCC_AOF, CROSSGCC_ELF (default), [NORCROFT_AOF: not
+-# supported yet]
++# Build type: CROSSGCC_AOF, CROSSGCC_ELF (default), CROSSGCC_ELFEABI,
++# [NORCROFT_AOF: not supported yet]
+ export BUILDTYPE ?= CROSSGCC_ELF
+ # Possible values: "SOFTFPU" (e.g. for UnixLib usage), "HARDFPU" (e.g. for
+ # SharedCLibrary usage) and "MODULE" (latter also meaning HARDFPU but the
+@@ -12,9 +12,10 @@
+ export ELFOBJECTTYPE ?= SOFTFPU
+ 
+ ifeq ($(BUILDTYPE),CROSSGCC_ELF)
++else ifeq ($(BUILDTYPE),CROSSGCC_ELFEABI)
+ else ifeq ($(BUILDTYPE),CROSSGCC_AOF)
+ else
+-$(error Unknown BUILDTYPE value, possible values are CROSSGCC_AOF and 
CROSSGCC_ELF)
++$(error Unknown BUILDTYPE value, possible values are CROSSGCC_AOF, 
CROSSGCC_ELF, and CROSSGCC_ELFEABI)
+ endif
+ include Makefile.setup.$(BUILDTYPE)
+ 
+Index: Source/Makefile.inc
+===================================================================
+--- Source/Makefile.inc        (revision 477)
++++ Source/Makefile.inc        (working copy)
+@@ -65,6 +65,9 @@
+ ifeq ($(BUILDTYPE),CROSSGCC_ELF)
+ .ELFHdr.Hdr:
+               if [ -s "$<" ]; then $(CP) $< $@; fi
++else ifeq ($(BUILDTYPE),CROSSGCC_ELFEABI)
++.ELFHdr.Hdr:
++              if [ -s "$<" ]; then $(CP) $< $@; fi
+ else
+ .AOFHdr.Hdr:
+               if [ -s "$<" ]; then $(CP) $< $@; fi
+@@ -98,6 +101,9 @@
+ ifeq ($(BUILDTYPE),CROSSGCC_ELF)
+ .gas.o:
+               $(AS) -o $@ $<
++else ifeq ($(BUILDTYPE),CROSSGCC_ELFEABI)
++.gas.o:
++              $(AS) -o $@ $<
+ else
+ .asm.o:
+               $(AS) -o $@ $<
+Index: Source/Makefile.setup.CROSSGCC_ELFEABI
+===================================================================
+--- Source/Makefile.setup.CROSSGCC_ELFEABI     (nonexistent)
++++ Source/Makefile.setup.CROSSGCC_ELFEABI     (working copy)
+@@ -0,0 +1,62 @@
++# Settings for ELF building
++
++ifndef GCCSDK_INSTALL_CROSSBIN
++$(error Environment variable GCCSDK_INSTALL_CROSSBIN is not defined)
++endif
++ifndef GCCSDK_INSTALL_ENV
++$(error Environment variable GCCSDK_INSTALL_ENV is not defined)
++endif
++
++ifeq ($(ELFOBJECTTYPE),SOFTFPU)
++CCFLAGS = -mfloat-abi=soft
++DEFMODFLAGS = -float-abi soft
++else ifeq ($(ELFOBJECTTYPE),HARDFPU)
++CCFLAGS = -mlibscl
++DEFMODFLAGS = -float-abi hard
++else ifeq ($(ELFOBJECTTYPE),MODULE)
++CCFLAGS = -mmodule
++DEFMODFLAGS = -float-abi hard
++else
++$(error Unknown ELFOBJECTTYPE value, possible values are SOFTFPU, HARDFPU and 
MODULE)
++endif
++
++export SOURCEDIR := $(abspath .)
++export BINDIR := $(SOURCEDIR)/../Bin
++export BUILDDIR := $(SOURCEDIR)/../Build
++export RELEASEDIR := $(SOURCEDIR)/../Release
++export RELEASEBINDIR := $(SOURCEDIR)/../Release/$(BUILDTYPE)/$(ELFOBJECTTYPE)
++export EXAMPLESDIR := $(SOURCEDIR)/../examples
++export DOCSDIR := $(SOURCEDIR)/../docs
++
++export TOPHEADERDIR := $(BUILDDIR)/Header
++export HEADERDIR := $(TOPHEADERDIR)/oslib
++export CSTRONGDIR := $(BUILDDIR)/CStrong
++export VAPIDIR := $(BUILDDIR)/\!Vala/vapi
++export VAPIHDIR := $(BUILDDIR)/vapih
++export OBJDIR := $(BUILDDIR)/Objs
++export OBJEXCEPTDIR := $(BUILDDIR)/Objs/Exceptions
++export OSLIBSUPPORTDIR := $(BUILDDIR)/OSLibSupport
++
++export BYTEWIDE := $(SOURCEDIR)/ByteWide
++export DEFMOD := $(BINDIR)/defmod -asmtype gccelfeabi $(DEFMODFLAGS)
++export REDUCEAOF := @echo Not needed for ELF build: reduceaof
++export BINDHELP := $(BINDIR)/bindhelp
++
++export PATH := $(GCCSDK_INSTALL_CROSSBIN):$(PATH)
++
++export CC := arm-riscos-gnueabihf-gcc $(CCFLAGS)
++export CXX := arm-riscos-gnueabihf-g++ $(CCFLAGS)
++export AS := arm-riscos-gnueabihf-gcc -c -xassembler-with-cpp $(CCFLAGS) -I.. 
-I$(SOURCEDIR)/Types
++export LIBFILE := arm-riscos-gnueabihf-ar rs
++export MKDIR := mkdir -p
++export RM := rm -rf
++export CP := cp -r
++export INSTALL := $(GCCSDK_INSTALL_ENV)/ro-install
++
++export ASMEXT := .gas
++export EXEEXT := ,e1f
++export LIBSUFFIX := a
++
++export OSLIBLIB := $(BUILDDIR)/libOSLib32.$(LIBSUFFIX)
++export OSLIBSUPPORTLIB := $(OSLIBSUPPORTDIR)/libOSLibSupport32.$(LIBSUFFIX)
++export OSLIBCSTRONG := $(BUILDDIR)/OSLib,3d6
+Index: Makefile
+===================================================================
+--- Makefile   (revision 477)
++++ Makefile   (working copy)
+@@ -29,6 +29,10 @@
+ install-elf: oslib-elf
+       $(MAKE) -C Source install BUILDTYPE=CROSSGCC_ELF
+ 
++# Installs the ELF headers & library in GCCSDK environment.
++install-elfeabi: oslib-elfeabi
++      $(MAKE) -C Source install BUILDTYPE=CROSSGCC_ELFEABI
++
+ # Installs the AOF headers & library in GCCSDK environment.
+ install-aof: oslib-aof
+       $(MAKE) -C Source install BUILDTYPE=CROSSGCC_AOF
+@@ -49,6 +53,10 @@
+       $(MAKE) -C Source oslib BUILDTYPE=CROSSGCC_ELF
+       $(MAKE) -C Source oslibsupport BUILDTYPE=CROSSGCC_ELF
+ 
++oslib-elfeabi: tools
++      $(MAKE) -C Source oslib BUILDTYPE=CROSSGCC_ELFEABI
++      $(MAKE) -C Source oslibsupport BUILDTYPE=CROSSGCC_ELFEABI
++
+ vapis: tools
+       $(MAKE) -C Source vapis BUILDTYPE=CROSSGCC_ELF
+ 
diff --git a/arm-riscos-gnueabihf/recipes/patches/oslib/defmod-elfeabi.p 
b/arm-riscos-gnueabihf/recipes/patches/oslib/defmod-elfeabi.p
new file mode 100644
index 0000000..97e15f8
--- /dev/null
+++ b/arm-riscos-gnueabihf/recipes/patches/oslib/defmod-elfeabi.p
@@ -0,0 +1,84 @@
+Index: Tools/DefMod2/assembler.c
+===================================================================
+--- Tools/DefMod2/assembler.c  (revision 477)
++++ Tools/DefMod2/assembler.c  (working copy)
+@@ -1242,6 +1242,21 @@
+                      goto finish;
+                      break;
+                  }
++                 case AsmType_eGCCELFEABI:
++                 {
++                     const char *floatABI = (FloatABI == FloatABI_eSoft) ? 
"soft" : "hard";
++                     if (!apcs32)
++                       {
++                         fprintf(stderr, "EABI does not support APCS-26.");
++                         goto finish;
++                       }
++                     if ((rc = sprintf (cmd,
++                              "arm-riscos-gnueabihf-gcc -c -xassembler 
-mfloat-abi=%s -o %s %s",
++                              floatABI,
++                              name2, name1)) < 0)
++                     goto finish;
++                     break;
++                 }
+                  default:
+                    fprintf (stderr, "Unknown assembler type\n");
+                    goto finish;
+Index: Tools/DefMod2/assembler.h
+===================================================================
+--- Tools/DefMod2/assembler.h  (revision 477)
++++ Tools/DefMod2/assembler.h  (working copy)
+@@ -22,8 +22,9 @@
+   AsmType_eGCCAOF,    /* Assembler used in GCCSDK 3.4 (AOF) release, called
+     'as' (predecessor of AsAsm).  */
+   AsmType_eARMASM,    /* ARM's assembler.  */
+-  AsmType_eGCCELF     /* Assembler used in GCCSDK 4 (ELF) release, called
++  AsmType_eGCCELF,    /* Assembler used in GCCSDK 4 (ELF) release, called
+     'gas' (GNU binutils assembler).  */
++  AsmType_eGCCELFEABI /* Assembler used in EABI-capable GCCSDK */
+ } AsmType_e;
+ 
+ typedef enum
+@@ -37,7 +38,7 @@
+ extern AsmType_e AsmType;
+ extern FloatABI_e FloatABI;
+   
+-#define GASSyntax (AsmType == AsmType_eGCCELF)
++#define GASSyntax (AsmType == AsmType_eGCCELF || AsmType == 
AsmType_eGCCELFEABI)
+ 
+ /*if |separate|, output is to the directory |output|; otherwise, to the file 
|file|.*/
+ extern os_error *assembler_output (FILE *file, const char *title, const char 
*author, lookup_t types, lookup_t swis, osbool separate, osbool apcs32, char 
*output);
+Index: Tools/DefMod2/defmod.y
+===================================================================
+--- Tools/DefMod2/defmod.y     (revision 477)
++++ Tools/DefMod2/defmod.y     (working copy)
+@@ -1179,7 +1179,7 @@
+                      "[-o <output-dir> | > <output-file>] "
+                      "[-byte_wide <byte-wide-file>] "
+                      "[-26bit | -32bit] "
+-                     "[-asmtype [objasm | asasmaof | asasmelf | gccaof | 
armasm | gccelf]] "
++                     "[-asmtype [objasm | asasmaof | asasmelf | gccaof | 
armasm | gccelf | gccelfeabi]] "
+                    "[-float-abi [soft | hard]] "
+                      "< <module-interface-file>\r"
+                "Purpose: generate output from a module interface file\r"
+@@ -1203,6 +1203,7 @@
+                "\tgccaof\t\t"       "...use GCC AOF toolkit (GCCSDK 3.4 
only)\r"
+                "\tarmasm\t\t"       "...use ARM ASM\r"
+                "\tgccelf\t\t"       "...use GCC ELF toolkit (GCCSDK 4 only)\r"
++               "\tgccelfeabi\t\t"   "...use GCC EABI ELF toolkit (GCCSDK 8+ 
only)\r"
+              "-float-abi\t\t"     "marks object files which float-abi is in 
use\r"
+              "\tsoft\t\t"         "...soft-float, no FP instructions used\r"
+              "\thard\t\t"         "...hard-float, FP instructions can be 
used\r"
+@@ -1345,9 +1346,11 @@
+             AsmType = AsmType_eARMASM;
+          else if (strcmp (argv[i], "gccelf") == 0)
+             AsmType = AsmType_eGCCELF;
++         else if (strcmp (argv[i], "gccelfeabi") == 0)
++            AsmType = AsmType_eGCCELFEABI;
+          else
+          {
+-            fprintf (stderr, "Unknown option value %s for -asmtype (only 
\"objasm\", \"asasmaof\", \"asasmelf\", \"armarm\", \"gccaof\" and \"gccelf\" 
are known)\n", argv[i]);
++            fprintf (stderr, "Unknown option value %s for -asmtype (only 
\"objasm\", \"asasmaof\", \"asasmelf\", \"armarm\", \"gccaof\", \"gccelf\" and 
\"gccelfeabi\" are known)\n", argv[i]);
+             Parse_Error = TRUE;
+             goto finish;
+          }
diff --git a/sdk/Makefile b/sdk/Makefile
index a00c029..aa89519 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -7,6 +7,7 @@
 # GCCSDK_INSTALL_CROSSBIN -- /path/to/toolchain/bin
 #
 # supported targets are:
+#                       arm-riscos-gnueabihf
 #                       arm-unknown-riscos  
 #                       m68k-atari-mint
 #                      m5475-atari-mint
@@ -116,6 +117,13 @@ FREETYPE_ENV := 
LIBPNG_CFLAGS=$$($(GCCSDK_INSTALL_ENV)/bin/libpng-config --cflag
 LIBJPEG_TURBO_BUILDDIR:=$(BUILDDIR)/libjpegturbo
 
 # Target Specific setup
+ifeq ($(TARGET),arm-riscos-gnueabihf)
+  SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, $(COMMON_SDK_ITEMS) libjpeg-turbo.d 
libwebp.d)
+  EXTRAARGS_LIBCARES := --disable-shared
+  EXTRAARGS_LIBCURL := --enable-nonblocking --enable-ares 
--with-random="/dev/urandom" $(LIBCURL_DISABLES)
+  EXTRAARGS_OPENSSL := no-asm
+endif
+
 ifeq ($(TARGET),arm-unknown-riscos)
   SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, $(COMMON_SDK_ITEMS) libjpeg-turbo.d 
libwebp.d)
   EXTRAARGS_LIBCARES := --disable-shared
diff --git a/sdk/recipes/patches/openssl/Configurations-50-riscos.conf.p 
b/sdk/recipes/patches/openssl/Configurations-50-riscos.conf.p
index c05a4ad..f3d4dc1 100644
--- a/sdk/recipes/patches/openssl/Configurations-50-riscos.conf.p
+++ b/sdk/recipes/patches/openssl/Configurations-50-riscos.conf.p
@@ -1,6 +1,6 @@
 --- /dev/null  2017-10-10 15:19:45.611896396 +0100
 +++ Configurations/50-riscos.conf      2017-10-17 15:42:25.304921197 +0100
-@@ -0,0 +1,14 @@
+@@ -0,0 +1,26 @@
 +my %targets = (
 +
 +    "arm-unknown-riscos" => {
@@ -14,4 +14,16 @@
 +        sys_id           => "RISCOS",
 +        bn_ops           => "BN_LLONG",
 +    },
++
++    "arm-riscos-gnueabihf" => {
++        inherit_from     => [ "BASE_unix" ],
++        cc               => "arm-riscos-gnueabihf-gcc",
++        cflags           => picker(default => "-DL_ENDIAN -DTERMIOS 
-DNO_SYS_UN_H",
++                                   debug   => "-O0 -g",
++                                   release => "-O3 ",
++                                 threads("-D_REENTRANT")),
++        thread_scheme    => "(unknown)",
++        sys_id           => "RISCOS",
++        bn_ops           => "BN_LLONG",
++    },
 +);
diff --git a/sdk/recipes/patches/openssl/Configure.p 
b/sdk/recipes/patches/openssl/Configure.p
index 6b1a39e..f44d99d 100644
--- a/sdk/recipes/patches/openssl/Configure.p
+++ b/sdk/recipes/patches/openssl/Configure.p
@@ -1,9 +1,10 @@
 --- Configure.orig     2017-10-17 14:53:18.369801491 +0100
 +++ Configure  2017-10-17 15:11:04.312242542 +0100
-@@ -1329,6 +1329,7 @@
+@@ -1329,6 +1329,8 @@
  $target{cxxflags}//=$target{cflags} if $target{CXX};
  $target{exe_extension}=".exe" if ($config{target} eq "DJGPP");
  $target{exe_extension}=".pm"  if ($config{target} =~ /vos/);
++$target{exe_extension}=",e1f" if ($config{target} eq "arm-riscos-gnueabihf");
 +$target{exe_extension}=",e1f" if ($config{target} eq "arm-unknown-riscos");
  
  # Fill %config with values from %user, and in case those are undefined or
diff --git a/sdk/recipes/patches/zlib/arm-unknown-riscos/configure.p 
b/sdk/recipes/patches/zlib/arm-riscos-gnueabihf/configure.p
similarity index 100%
copy from sdk/recipes/patches/zlib/arm-unknown-riscos/configure.p
copy to sdk/recipes/patches/zlib/arm-riscos-gnueabihf/configure.p


-- 
Cross-compilation toolchains and environments
_______________________________________________
netsurf-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to