From efc3f8dc424f9cf90608c84adf49febc207766ef Mon Sep 17 00:00:00 2001
From: Markham <markham001@gmx.de>
Date: Sat, 19 Mar 2016 12:36:23 +0100
Subject: [PATCH] add target cortex-strings for ARM and AArch64

---
 make/archives.mk      | 10 ++++++++++
 make/libraries.mk     | 11 +++++++++++
 make/neutrino.mk      |  3 +++
 make/versions.mk      |  3 +++
 scripts/ld.so.preload |  1 +
 5 files changed, 28 insertions(+)
 create mode 100644 scripts/ld.so.preload

diff --git a/make/archives.mk b/make/archives.mk
index 180a4e3..441b4ca 100755
--- a/make/archives.mk
+++ b/make/archives.mk
@@ -81,6 +81,16 @@ $(ARCHIVE)/procps-3.2.8.tar.gz:
 $(ARCHIVE)/busybox-$(BUSYBOX_VER).tar.bz2:
 	$(WGET) https://busybox.net/downloads/busybox-$(BUSYBOX_VER).tar.bz2
 
+$(ARCHIVE)/cortex-strings-git-$(CRTXSTR_GIT).tar.gz:
+	set -e; cd $(BUILD_TMP); \
+		rm -rf cortex-strings-git-$(CRTXSTR_GIT); \
+		git clone http://git.linaro.org/git-ro/toolchain/cortex-strings.git cortex-strings-git-$(CRTXSTR_GIT)
+	set -e; cd $(BUILD_TMP)/cortex-strings-git-$(CRTXSTR_GIT); \
+		git reset --hard $(CRTXSTR_GIT)
+	set -e; cd $(BUILD_TMP); \
+		tar cvpzf $@ cortex-strings-git-$(CRTXSTR_GIT)
+	$(REMOVE)/cortex-strings-git-$(CRTXSTR_GIT)
+
 $(ARCHIVE)/samba-$(SAMBA2_VER).tar.gz:
 	$(WGET) http://samba.org/samba/ftp/old-versions/samba-$(SAMBA2_VER).tar.gz
 
diff --git a/make/libraries.mk b/make/libraries.mk
index 5ba8f0a..890361a 100755
--- a/make/libraries.mk
+++ b/make/libraries.mk
@@ -242,6 +242,17 @@ $(D)/libjpeg: $(ARCHIVE)/libjpeg-turbo-$(JPEG_TURBO_VER).tar.gz | $(TARGETPREFIX
 	$(REMOVE)/libjpeg-turbo-$(JPEG_TURBO_VER)
 	touch $@
 
+$(D)/cortex-strings: $(ARCHIVE)/cortex-strings-git-$(CRTXSTR_GIT).tar.gz | $(TARGETPREFIX)
+	$(UNTAR)/cortex-strings-git-$(CRTXSTR_GIT).tar.gz
+	set -e; cd $(BUILD_TMP)/cortex-strings-git-$(CRTXSTR_GIT); \
+		$(CONFIGURE) --prefix= --enable-shared --disable-static --without-neon; \
+		$(MAKE); \
+		make install DESTDIR=$(TARGETPREFIX)
+	$(REWRITE_LIBTOOL)/libcortex-strings.la
+	install -m 0644 -D $(SCRIPTS)/ld.so.preload $(TARGETPREFIX)/etc/ld.so.preload
+	$(REMOVE)/cortex-strings-git-$(CRTXSTR_GIT)
+	touch $@
+
 ifeq ($(PLATFORM), nevis)
 NEVIS_XML2_FLAGS = --with-minimum
 endif
diff --git a/make/neutrino.mk b/make/neutrino.mk
index 8f15dd6..5adaf37 100755
--- a/make/neutrino.mk
+++ b/make/neutrino.mk
@@ -58,6 +58,9 @@ NEUTRINO_DEPS += libvorbis
 N_CONFIG_OPTS += --enable-flac
 NEUTRINO_DEPS += libflac
 endif
+ifeq ($(PLATFORM), $(filter $(PLATFORM), apollo kronos))
+  NEUTRINO_DEPS += cortex-strings
+endif
 
 neutrino-deps: $(NEUTRINO_DEPS)
 
diff --git a/make/versions.mk b/make/versions.mk
index 7bfcba6..c72264d 100644
--- a/make/versions.mk
+++ b/make/versions.mk
@@ -1,6 +1,9 @@
 
 BUSYBOX_VER = 1.24.1
 
+# cortex-strings; optimized string routines for ARM and AArch64
+CRTXSTR_GIT=48fd30c
+
 # crosstool-ng versions
 #CT_VER_NEVIS  = 1.20.0_20150218-2311_git-master_41722f5
 CT_VER_NEVIS   = 1.20.0
diff --git a/scripts/ld.so.preload b/scripts/ld.so.preload
new file mode 100644
index 0000000..edd9a21
--- /dev/null
+++ b/scripts/ld.so.preload
@@ -0,0 +1 @@
+/lib/libcortex-strings.so.1.0.0
-- 
2.39.5