From 8febf474b7346aa573bda65dbb36687ad4f25063 Mon Sep 17 00:00:00 2001 From: hexdump Date: Mon, 27 Sep 2021 23:59:14 +0200 Subject: [PATCH] some squinkylabs patch updates --- prepare-modules.sh | 2 ++ squinkylabs-plug1.armv7l.patch | 37 +++++++++++++++++++++++----------- 2 files changed, 27 insertions(+), 12 deletions(-) diff --git a/prepare-modules.sh b/prepare-modules.sh index 4c4a508..933d4fd 100755 --- a/prepare-modules.sh +++ b/prepare-modules.sh @@ -113,6 +113,8 @@ echo "===> squinkylabs-plug1 extra steps" echo "" cd squinkylabs-plug1 find * -type f -exec ../../../../simde-ify.sh {} \; +# this file gets accidently simde-ified :) +git checkout -- gfx/Cheby.ai cd .. # go back to a defined starting point to be on the safe side diff --git a/squinkylabs-plug1.armv7l.patch b/squinkylabs-plug1.armv7l.patch index 064ec52..5fd1477 100644 --- a/squinkylabs-plug1.armv7l.patch +++ b/squinkylabs-plug1.armv7l.patch @@ -1,8 +1,8 @@ diff --git a/Makefile b/Makefile -index 7c4d4e5..d587bdf 100644 +index 2443733..ae34a23 100644 --- a/Makefile +++ b/Makefile -@@ -66,9 +66,7 @@ ifdef ARCH_WIN +@@ -76,13 +76,11 @@ ifdef ARCH_WIN FLAGS += -fmax-errors=5 endif @@ -11,17 +11,30 @@ index 7c4d4e5..d587bdf 100644 -LDFLAGS += -flto +FLAGS += -finline-limit=500000 -finline-functions-called-once - include test.mk + # this will turn O3 into O1. can't get no opt to compile + # to totally remove lto you need to remove it from test.mak also +-# FLAGS:=$(filter-out -flto,$(FLAGS)) ++FLAGS:=$(filter-out -flto,$(FLAGS)) + # FLAGS:=$(filter-out -O3,$(FLAGS)) + # FLAGS += -O1 diff --git a/test.mk b/test.mk -index c34c0b2..35159d6 100644 +index 8ac6285..468a677 100644 --- a/test.mk +++ b/test.mk -@@ -29,7 +29,6 @@ perf.exe : PERFFLAG = -D _PERF - perf.exe : FLAGS += $(ASSERTOFF) - - FLAGS += $(PERFFLAG) --FLAGS += -flto - - test.exe : FLAGS += -D _TESTEX - +@@ -32,7 +32,7 @@ perf.exe : PERFFLAG = -D _PERF + perf.exe : FLAGS += $(ASSERTOFF) + + FLAGS += $(PERFFLAG) +-FLAGS += -flto ++#FLAGS += -flto + + test.exe : FLAGS += -D _TESTEX + +@@ -73,4 +73,4 @@ test.exe : $(TEST_OBJECTS) + $(CXX) -o $@ $^ $(LDFLAGS) + + perf.exe : $(TEST_OBJECTS) +- $(CXX) -o $@ $^ $(LDFLAGS) +\ No newline at end of file ++ $(CXX) -o $@ $^ $(LDFLAGS)