summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn-Mark Bell <jmb@netsurf-browser.org>2022-06-02 03:32:08 +0100
committerJohn-Mark Bell <jmb@netsurf-browser.org>2022-11-03 18:29:13 +0000
commit2356a90f90395113b242cb1a81b34cc260d116dd (patch)
treef65f8ae4d0265cb3827daa4630be2d710d53ed7a
parent43d8d6fb8befb1d14947a79d4a3871ffe5bc0e4e (diff)
downloadtoolchains-2356a90f90395113b242cb1a81b34cc260d116dd.tar.gz
toolchains-2356a90f90395113b242cb1a81b34cc260d116dd.tar.bz2
Don't pull in ARMv7-specific memcpy() and friends.
Hiding this behind ARM_EABI probably isn't the complete answer as the calling convention doesn't have much to say about the platform the end result is run on.
-rw-r--r--arm-riscos-gnueabihf/recipes/patches/gccsdk/unixlib-no-armv7-memcpy.p34
1 files changed, 34 insertions, 0 deletions
diff --git a/arm-riscos-gnueabihf/recipes/patches/gccsdk/unixlib-no-armv7-memcpy.p b/arm-riscos-gnueabihf/recipes/patches/gccsdk/unixlib-no-armv7-memcpy.p
new file mode 100644
index 0000000..c89d6ab
--- /dev/null
+++ b/arm-riscos-gnueabihf/recipes/patches/gccsdk/unixlib-no-armv7-memcpy.p
@@ -0,0 +1,34 @@
+Index: libunixlib/Makefile.am
+===================================================================
+--- libunixlib/Makefile.am (revision 7698)
++++ libunixlib/Makefile.am (working copy)
+@@ -1002,18 +1002,11 @@
+ string/strtok.c \
+ string/swab.c \
+ string/_strcpy.s
+-if ARM_EABI
+ string_src += \
+- string/_memcpymove-v7l.s \
+- string/_memset-v7l.s \
+- string/_strlen-v7l.s
+-else
+-string_src += \
+ string/_memcpy.s \
+ string/_memset.s \
+ string/_strlen.s
+ endif
+-endif
+ string_src += \
+ string/memccpy.c \
+ string/memchr.c \
+@@ -1029,10 +1022,8 @@
+ string/strtok_r.c \
+ string/_ffs.s \
+ string/_ffsll.s
+-if !ARM_EABI
+ string_src += \
+ string/mempcpy.c
+-endif
+
+ if UNIXLIB_BUILDING_SCL
+ sys_src =