Drop "hf" from arm-riscos-gnueabihf ABI triplet

The way we configure this toolchain means that it will generate
Risc PC-compatible ARMv4 binaries using the soft-float ABI. These
are not compatible with the ARMv7 hard-float binaries produced by
the upstream compiler, so change the triplet to avoid confusion.

25 files changed, 10 insertions, 10 deletions

diff --git a/arm-riscos-gnueabihf/.gitignore b/arm-riscos-gnueabi/.gitignore
index e6483c4..e6483c4 100644
--- a/arm-riscos-gnueabihf/.gitignore
+++ b/arm-riscos-gnueabi/.gitignore
diff --git a/arm-riscos-gnueabihf/Makefile b/arm-riscos-gnueabi/Makefile
index 1deec0f..74e64c2 100644
--- a/arm-riscos-gnueabihf/Makefile
+++ b/arm-riscos-gnueabi/Makefile
@@ -44,7 +44,7 @@ SOURCESDIR := $(TOP)/sources
 BUILDDIR := $(TOP)/builddir
 BUILDSTEPS := $(BUILDDIR)/build-steps
 
-TARGET_NAME := arm-riscos-gnueabihf
+TARGET_NAME := arm-riscos-gnueabi
 
 PREFIX ?= /opt/netsurf/$(TARGET_NAME)
 
diff --git a/arm-riscos-gnueabihf/fetchsrc b/arm-riscos-gnueabi/fetchsrc
index 92ae5bf..92ae5bf 100755
--- a/arm-riscos-gnueabihf/fetchsrc
+++ b/arm-riscos-gnueabi/fetchsrc
diff --git a/arm-riscos-gnueabihf/recipes/files/gccsdk/Makefile b/arm-riscos-gnueabi/recipes/files/gccsdk/Makefile
index 4e3467b..01b4cbd 100644
--- a/arm-riscos-gnueabihf/recipes/files/gccsdk/Makefile
+++ b/arm-riscos-gnueabi/recipes/files/gccsdk/Makefile
@@ -11,8 +11,8 @@
 #   - gcc 10.2 needs at least GMP 6.1.0, ISL 0.18, MPFR 3.1.4 and MPC 1.0.3 (MPFR needs GMP, MPC needs GMP & MPFR)
 #     For MPFR/GMP/ISL/MPC version numbers, a good set can be found mentioned at gcc/contrib/download_prerequisites.
 
-# TARGET can have following values: arm-riscos-gnueabihf
-TARGET=arm-riscos-gnueabihf
+# TARGET can have following values: arm-riscos-gnueabi
+TARGET=arm-riscos-gnueabi
 GCC_LANGUAGES="c,c++"
 # Enable shared library support in the cross compiler ?
 CROSS_ENABLE_SHARED=yes
diff --git a/arm-riscos-gnueabihf/recipes/files/gccsdk/config.sub.p b/arm-riscos-gnueabi/recipes/files/gccsdk/config.sub.p
index 181b56f..181b56f 100644
--- a/arm-riscos-gnueabihf/recipes/files/gccsdk/config.sub.p
+++ b/arm-riscos-gnueabi/recipes/files/gccsdk/config.sub.p
diff --git a/arm-riscos-gnueabihf/recipes/files/gccsdk/gccsdk-params b/arm-riscos-gnueabi/recipes/files/gccsdk/gccsdk-params
index 4f48c3c..4f48c3c 100644
--- a/arm-riscos-gnueabihf/recipes/files/gccsdk/gccsdk-params
+++ b/arm-riscos-gnueabi/recipes/files/gccsdk/gccsdk-params
diff --git a/arm-riscos-gnueabihf/recipes/patches/gccsdk/elf2aif-eabi-support.p b/arm-riscos-gnueabi/recipes/patches/gccsdk/elf2aif-eabi-support.p
index 1d8b841..1d8b841 100644
--- a/arm-riscos-gnueabihf/recipes/patches/gccsdk/elf2aif-eabi-support.p
+++ b/arm-riscos-gnueabi/recipes/patches/gccsdk/elf2aif-eabi-support.p
diff --git a/arm-riscos-gnueabihf/recipes/patches/gccsdk/gcc-add-mhalfword-access.p b/arm-riscos-gnueabi/recipes/patches/gccsdk/gcc-add-mhalfword-access.p
index 43061b9..43061b9 100644
--- a/arm-riscos-gnueabihf/recipes/patches/gccsdk/gcc-add-mhalfword-access.p
+++ b/arm-riscos-gnueabi/recipes/patches/gccsdk/gcc-add-mhalfword-access.p
diff --git a/arm-riscos-gnueabihf/recipes/patches/gccsdk/gcc-default-no-halfword-access.p b/arm-riscos-gnueabi/recipes/patches/gccsdk/gcc-default-no-halfword-access.p
index 400341f..400341f 100644
--- a/arm-riscos-gnueabihf/recipes/patches/gccsdk/gcc-default-no-halfword-access.p
+++ b/arm-riscos-gnueabi/recipes/patches/gccsdk/gcc-default-no-halfword-access.p
diff --git a/arm-riscos-gnueabihf/recipes/patches/gccsdk/gcc-libgcc-no-linux-atomics.p b/arm-riscos-gnueabi/recipes/patches/gccsdk/gcc-libgcc-no-linux-atomics.p
index 12a88ac..5f93dbe 100644
--- a/arm-riscos-gnueabihf/recipes/patches/gccsdk/gcc-libgcc-no-linux-atomics.p
+++ b/arm-riscos-gnueabi/recipes/patches/gccsdk/gcc-libgcc-no-linux-atomics.p
@@ -47,7 +47,7 @@ Index: gcc/libgcc.config.host.p
 +++ gcc/libgcc.config.host.p	(working copy)
 @@ -20,7 +20,7 @@
   	;;
- +arm*-riscos-gnueabihf)
+ +arm*-riscos-gnueabi*)
  +	tmake_file="${tmake_file} arm/t-arm t-fixedpoint-gnu-prefix t-crtfm"
 -+	tmake_file="${tmake_file} arm/t-elf arm/t-bpabi arm/t-linux-eabi t-slibgcc-libgcc t-slibgcc-nolc-override"
 ++	tmake_file="${tmake_file} arm/t-elf arm/t-bpabi arm/t-riscos-gnueabihf t-slibgcc-libgcc t-slibgcc-nolc-override"
diff --git a/arm-riscos-gnueabihf/recipes/patches/gccsdk/ld-armv4.p b/arm-riscos-gnueabi/recipes/patches/gccsdk/ld-armv4.p
index ae85eb0..ae85eb0 100644
--- a/arm-riscos-gnueabihf/recipes/patches/gccsdk/ld-armv4.p
+++ b/arm-riscos-gnueabi/recipes/patches/gccsdk/ld-armv4.p
diff --git a/arm-riscos-gnueabihf/recipes/patches/gccsdk/libtool.m4.p.p b/arm-riscos-gnueabi/recipes/patches/gccsdk/libtool.m4.p.p
index 8061b92..8061b92 100644
--- a/arm-riscos-gnueabihf/recipes/patches/gccsdk/libtool.m4.p.p
+++ b/arm-riscos-gnueabi/recipes/patches/gccsdk/libtool.m4.p.p
diff --git a/arm-riscos-gnueabihf/recipes/patches/gccsdk/posix-extended-locale.p b/arm-riscos-gnueabi/recipes/patches/gccsdk/posix-extended-locale.p
index e422786..e422786 100644
--- a/arm-riscos-gnueabihf/recipes/patches/gccsdk/posix-extended-locale.p
+++ b/arm-riscos-gnueabi/recipes/patches/gccsdk/posix-extended-locale.p
diff --git a/arm-riscos-gnueabihf/recipes/patches/gccsdk/roinstall-objdump-name.p b/arm-riscos-gnueabi/recipes/patches/gccsdk/roinstall-objdump-name.p
index 7451829..73a9abe 100644
--- a/arm-riscos-gnueabihf/recipes/patches/gccsdk/roinstall-objdump-name.p
+++ b/arm-riscos-gnueabi/recipes/patches/gccsdk/roinstall-objdump-name.p
@@ -7,7 +7,7 @@ Index: ro-install
      # 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
++      if GCCSDK_BIN/arm-riscos-gnueabi-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/gccsdk/unixlib-armv4.p b/arm-riscos-gnueabi/recipes/patches/gccsdk/unixlib-armv4.p
index 1343d13..1343d13 100644
--- a/arm-riscos-gnueabihf/recipes/patches/gccsdk/unixlib-armv4.p
+++ b/arm-riscos-gnueabi/recipes/patches/gccsdk/unixlib-armv4.p
diff --git a/arm-riscos-gnueabihf/recipes/patches/gccsdk/unixlib-initial-sp.p b/arm-riscos-gnueabi/recipes/patches/gccsdk/unixlib-initial-sp.p
index f3309c2..f3309c2 100644
--- a/arm-riscos-gnueabihf/recipes/patches/gccsdk/unixlib-initial-sp.p
+++ b/arm-riscos-gnueabi/recipes/patches/gccsdk/unixlib-initial-sp.p
diff --git a/arm-riscos-gnueabihf/recipes/patches/gccsdk/unixlib-no-armv7-memcpy.p b/arm-riscos-gnueabi/recipes/patches/gccsdk/unixlib-no-armv7-memcpy.p
index c89d6ab..c89d6ab 100644
--- a/arm-riscos-gnueabihf/recipes/patches/gccsdk/unixlib-no-armv7-memcpy.p
+++ b/arm-riscos-gnueabi/recipes/patches/gccsdk/unixlib-no-armv7-memcpy.p
diff --git a/arm-riscos-gnueabihf/recipes/patches/gccsdk/unixlib-stdtime.p b/arm-riscos-gnueabi/recipes/patches/gccsdk/unixlib-stdtime.p
index 3ad890a..3ad890a 100644
--- a/arm-riscos-gnueabihf/recipes/patches/gccsdk/unixlib-stdtime.p
+++ b/arm-riscos-gnueabi/recipes/patches/gccsdk/unixlib-stdtime.p
diff --git a/arm-riscos-gnueabihf/recipes/patches/gccsdk/unixlib-sync-and-fetch-atomics.p b/arm-riscos-gnueabi/recipes/patches/gccsdk/unixlib-sync-and-fetch-atomics.p
index f9764ba..f9764ba 100644
--- a/arm-riscos-gnueabihf/recipes/patches/gccsdk/unixlib-sync-and-fetch-atomics.p
+++ b/arm-riscos-gnueabi/recipes/patches/gccsdk/unixlib-sync-and-fetch-atomics.p
diff --git a/arm-riscos-gnueabihf/recipes/patches/infozip/globals.p b/arm-riscos-gnueabi/recipes/patches/infozip/globals.p
index c10adfa..c10adfa 100644
--- a/arm-riscos-gnueabihf/recipes/patches/infozip/globals.p
+++ b/arm-riscos-gnueabi/recipes/patches/infozip/globals.p
diff --git a/arm-riscos-gnueabihf/recipes/patches/infozip/zip.p b/arm-riscos-gnueabi/recipes/patches/infozip/zip.p
index aee2b24..aee2b24 100644
--- a/arm-riscos-gnueabihf/recipes/patches/infozip/zip.p
+++ b/arm-riscos-gnueabi/recipes/patches/infozip/zip.p
diff --git a/arm-riscos-gnueabihf/recipes/patches/infozip/zipup.p b/arm-riscos-gnueabi/recipes/patches/infozip/zipup.p
index f4d43d0..f4d43d0 100644
--- a/arm-riscos-gnueabihf/recipes/patches/infozip/zipup.p
+++ b/arm-riscos-gnueabi/recipes/patches/infozip/zipup.p
diff --git a/arm-riscos-gnueabihf/recipes/patches/oslib/buildsystem-elfeabi.p b/arm-riscos-gnueabi/recipes/patches/oslib/buildsystem-elfeabi.p
index a729f9e..83bd862 100644
--- a/arm-riscos-gnueabihf/recipes/patches/oslib/buildsystem-elfeabi.p
+++ b/arm-riscos-gnueabi/recipes/patches/oslib/buildsystem-elfeabi.p
@@ -100,10 +100,10 @@ Index: Source/Makefile.setup.CROSSGCC_ELFEABI
 +
 +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 CC := arm-riscos-gnueabi-gcc $(CCFLAGS)
++export CXX := arm-riscos-gnueabi-g++ $(CCFLAGS)
++export AS := arm-riscos-gnueabi-gcc -c -xassembler-with-cpp $(CCFLAGS) -I.. -I$(SOURCEDIR)/Types
++export LIBFILE := arm-riscos-gnueabi-ar rs
 +export MKDIR := mkdir -p
 +export RM := rm -rf
 +export CP := cp -r
diff --git a/arm-riscos-gnueabihf/recipes/patches/oslib/defmod-elfeabi.p b/arm-riscos-gnueabi/recipes/patches/oslib/defmod-elfeabi.p
index 97e15f8..eadeb6d 100644
--- a/arm-riscos-gnueabihf/recipes/patches/oslib/defmod-elfeabi.p
+++ b/arm-riscos-gnueabi/recipes/patches/oslib/defmod-elfeabi.p
@@ -15,7 +15,7 @@ Index: Tools/DefMod2/assembler.c
 +                         goto finish;
 +                       }
 +                     if ((rc = sprintf (cmd,
-+				"arm-riscos-gnueabihf-gcc -c -xassembler -mfloat-abi=%s -o %s %s",
++				"arm-riscos-gnueabi-gcc -c -xassembler -mfloat-abi=%s -o %s %s",
 +				floatABI,
 +				name2, name1)) < 0)
 +		       goto finish;
diff --git a/arm-riscos-gnueabihf/recipes/patches/oslib/vapi.p b/arm-riscos-gnueabi/recipes/patches/oslib/vapi.p
index a3daf40..a3daf40 100644
--- a/arm-riscos-gnueabihf/recipes/patches/oslib/vapi.p
+++ b/arm-riscos-gnueabi/recipes/patches/oslib/vapi.p