From b5c19a58f6a5badfea74f267a3c032cbd89b4bea Mon Sep 17 00:00:00 2001 From: van Hauser Date: Wed, 15 Jan 2020 15:54:54 +0100 Subject: fix for cc=clang and libradamsa optimization --- src/third_party/libradamsa/Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/third_party') diff --git a/src/third_party/libradamsa/Makefile b/src/third_party/libradamsa/Makefile index 0f56fa18..b061f8e1 100644 --- a/src/third_party/libradamsa/Makefile +++ b/src/third_party/libradamsa/Makefile @@ -2,17 +2,19 @@ CUR_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))) all: libradamsa.so +CFLAGS ?= -O3 -funroll-loops -march=native $(CFLAGS_FLTO) + libradamsa.so: libradamsa.a - $(CC) -O3 -shared libradamsa.a -o libradamsa.so + $(CC) $(CFLAGS) -shared libradamsa.a -o libradamsa.so libradamsa.a: libradamsa.c radamsa.h @echo " ***************************************************************" @echo " * Compiling libradamsa, wait some minutes (~3 on modern CPUs) *" @echo " ***************************************************************" - $(CC) -fPIC -O3 -I $(CUR_DIR) -o libradamsa.a -c libradamsa.c + $(CC) -fPIC $(CFLAGS) -I $(CUR_DIR) -o libradamsa.a -c libradamsa.c test: libradamsa.a libradamsa-test.c - cc -O3 -I $(CUR_DIR) -o libradamsa-test libradamsa-test.c libradamsa.a + cc $(CLFAGS) -I $(CUR_DIR) -o libradamsa-test libradamsa-test.c libradamsa.a ./libradamsa-test libradamsa-test.c | grep "library test passed" rm /tmp/libradamsa-*.fuzz -- cgit 1.4.1 From bd58094dbc87463680a54d99ffcff7ae2a591353 Mon Sep 17 00:00:00 2001 From: van Hauser Date: Thu, 16 Jan 2020 13:38:04 +0100 Subject: fix libradamsa Makefile typo --- src/third_party/libradamsa/Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/third_party') diff --git a/src/third_party/libradamsa/Makefile b/src/third_party/libradamsa/Makefile index b061f8e1..c5a78ead 100644 --- a/src/third_party/libradamsa/Makefile +++ b/src/third_party/libradamsa/Makefile @@ -2,7 +2,11 @@ CUR_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))) all: libradamsa.so -CFLAGS ?= -O3 -funroll-loops -march=native $(CFLAGS_FLTO) +# These can be overriden: +CFLAGS ?= -march=native $(CFLAGS_FLTO) + +# These are required: (otherwise radamsa gets very very slooooow) +CFLAGS += -O3 -funroll-loops libradamsa.so: libradamsa.a $(CC) $(CFLAGS) -shared libradamsa.a -o libradamsa.so @@ -14,7 +18,7 @@ libradamsa.a: libradamsa.c radamsa.h $(CC) -fPIC $(CFLAGS) -I $(CUR_DIR) -o libradamsa.a -c libradamsa.c test: libradamsa.a libradamsa-test.c - cc $(CLFAGS) -I $(CUR_DIR) -o libradamsa-test libradamsa-test.c libradamsa.a + $(CC) $(CFLAGS) -I $(CUR_DIR) -o libradamsa-test libradamsa-test.c libradamsa.a ./libradamsa-test libradamsa-test.c | grep "library test passed" rm /tmp/libradamsa-*.fuzz -- cgit 1.4.1