aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvanhauser-thc <vh@thc.org>2021-02-09 08:38:33 +0100
committervanhauser-thc <vh@thc.org>2021-02-09 08:38:33 +0100
commit2cd462477981648b5e22749e66369ff99114a813 (patch)
tree51b9a8f8e0393988fe4c13fbda77965b2aa887ca
parente11665564b750c1b42e1ab2edf4877d3cb833455 (diff)
downloadafl++-2cd462477981648b5e22749e66369ff99114a813.tar.gz
build docker without march=native
-rw-r--r--Dockerfile2
-rw-r--r--GNUmakefile16
-rw-r--r--README.md1
3 files changed, 10 insertions, 9 deletions
diff --git a/Dockerfile b/Dockerfile
index dec952af..d2a5ca55 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,6 +11,8 @@ LABEL "about"="AFLplusplus docker image"
ARG DEBIAN_FRONTEND=noninteractive
+env NO_ARCH_OPT 1
+
RUN apt-get update && \
apt-get -y install --no-install-suggests --no-install-recommends \
automake \
diff --git a/GNUmakefile b/GNUmakefile
index 7b05a1d5..f586733f 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -57,8 +57,6 @@ ifdef MSAN_BUILD
override LDFLAGS += -fsanitize=memory
endif
-
-
ifeq "$(findstring android, $(shell $(CC) --version 2>/dev/null))" ""
ifeq "$(shell echo 'int main() {return 0; }' | $(CC) $(CFLAGS) -Werror -x c - -flto=full -o .test 2>/dev/null && echo 1 || echo 0 ; rm -f .test )" "1"
CFLAGS_FLTO ?= -flto=full
@@ -77,17 +75,16 @@ ifeq "$(shell echo 'int main() {return 0; }' | $(CC) -fno-move-loop-invariants -
SPECIAL_PERFORMANCE += -fno-move-loop-invariants -fdisable-tree-cunrolli
endif
-ifeq "$(shell echo 'int main() {return 0; }' | $(CC) $(CFLAGS) -Werror -x c - -march=native -o .test 2>/dev/null && echo 1 || echo 0 ; rm -f .test )" "1"
- ifndef SOURCE_DATE_EPOCH
- HAVE_MARCHNATIVE = 1
- CFLAGS_OPT += -march=native
+ifndef SOURCE_DATE_EPOCH
+ ifndef NO_ARCH_OPT
+ ifeq "$(shell echo 'int main() {return 0; }' | $(CC) $(CFLAGS) -Werror -x c - -march=native -o .test 2>/dev/null && echo 1 || echo 0 ; rm -f .test )" "1"
+ HAVE_MARCHNATIVE = 1
+ CFLAGS_OPT += -march=native
+ endif
endif
endif
ifneq "$(shell uname)" "Darwin"
- ifeq "$(HAVE_MARCHNATIVE)" "1"
- SPECIAL_PERFORMANCE += -march=native
- endif
# OS X does not like _FORTIFY_SOURCE=2
ifndef DEBUG
CFLAGS_OPT += -D_FORTIFY_SOURCE=2
@@ -366,6 +363,7 @@ help:
@echo NO_PYTHON - disable python support
@echo NO_SPLICING - disables splicing mutation in afl-fuzz, not recommended for normal fuzzing
@echo AFL_NO_X86 - if compiling on non-intel/amd platforms
+ @echo NO_ARCH_OPT - builds afl++ without machine architecutre optimizations
@echo "LLVM_CONFIG - if your distro doesn't use the standard name for llvm-config (e.g. Debian)"
@echo "=========================================="
@echo e.g.: make ASAN_BUILD=1
diff --git a/README.md b/README.md
index 348577df..d60253b3 100644
--- a/README.md
+++ b/README.md
@@ -217,6 +217,7 @@ These build options exist:
* NO_PYTHON - disable python support
* NO_SPLICING - disables splicing mutation in afl-fuzz, not recommended for normal fuzzing
* AFL_NO_X86 - if compiling on non-intel/amd platforms
+* NO_ARCH_OPT - builds afl++ without machine architecutre optimizations
* LLVM_CONFIG - if your distro doesn't use the standard name for llvm-config (e.g. Debian)
e.g.: make ASAN_BUILD=1