From bc0117c9624449190d5314a8621f9d88cfbd3a0d Mon Sep 17 00:00:00 2001
From: Jari Vetoniemi <mailroxas@gmail.com>
Date: Mon, 25 Feb 2019 10:43:40 +0200
Subject: make/readme: refactor makefile and building

It's nicer now, and we can specify the android abis
---
 Makefile  | 42 ++++++++++++++++++++++++++++++++++--------
 README.md |  3 ++-
 2 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index ce0523e..6ac2186 100644
--- a/Makefile
+++ b/Makefile
@@ -3,17 +3,43 @@ BINDIR ?= /bin
 
 MAKEFLAGS += --no-builtin-rules
 
-# GCC 7: -Wstringop-overflow=, -Walloc-size-larger-than=, -Wduplicated-{branches,cond}
-WARNINGS := -Wall -Wextra -Wpedantic -Wformat=2 -Wstrict-aliasing=3 -Wstrict-overflow=3 -Wstack-usage=4096000 \
+WARNINGS = -Wall -Wextra -Wpedantic -Wformat=2 -Wstrict-aliasing=3 -Wstrict-overflow=3 -Wstack-usage=4096000 \
 	-Wfloat-equal -Wcast-align -Wpointer-arith -Wchar-subscripts -Warray-bounds=2 -Wno-unused-parameter
 
-override CFLAGS ?= -g
-override CFLAGS += -std=c11 $(WARNINGS)
+override CFLAGS ?= -g -O2 $(WARNINGS)
+override CFLAGS += -std=c11
+override CPPFLAGS ?= -D_FORTIFY_SOURCE=2
 override CPPFLAGS += -Isrc -DANDROID_X86_LINKER # -DVERBOSE_FUNCTIONS
 
 bins = andre
 all: $(bins)
 
+# https://developer.android.com/ndk/guides/abis
+# https://android.googlesource.com/platform/ndk/+/ics-mr0/docs/STANDALONE-TOOLCHAIN.html
+# https://android.googlesource.com/platform/ndk/+/ics-mr0/docs/CPU-ARCH-ABIS.html
+# you can also try compiling with your custom ABI with the all target,
+# but compatibility with android binaries is not guaranteed
+
+x86: override CFLAGS += -march=i686 -mtune=intel -mssse3 -mstackrealign -mfpmath=sse -m32
+x86: override LDFLAGS += -march=i686 -m32
+x86: all
+
+x86_64: override CFLAGS += -march=x86-64 -msse4.2 -mpopcnt -m64 -mtune=intel -fPIC
+x86_64: override LDFLAGS += -march=x86-64 -m64
+x86_64: all
+
+armeabi: override CFLAGS += -march=armv5te -mthumb
+armeabi: override LDFLAGS += -march=armv5te
+armeabi: all
+
+armeabi-v7a: override CFLAGS += -march=armv7-a -mfloat-abi=softfp -mthumb
+armeabi-v7a: override LDFLAGS += -march=armv7-a -Wl,--fix-cortex-a8
+armeabi-v7a: all
+armeabi-v7a-neon: override CFLAGS += -mfpu=neon
+armeabi-v7a-neon: armeabi-v7a
+
+arm64-v8a: all
+
 %.a:
 	$(LINK.c) -c $(filter %.c,$^) -o $@
 
@@ -34,7 +60,7 @@ runtime/libpthread.so: private override CPPFLAGS += -D_GNU_SOURCE
 runtime/libpthread.so: private override LDLIBS += -lpthread -lrt
 runtime/libpthread.so: src/libpthread.c
 runtime/libdl.so: private override CPPFLAGS += -D_GNU_SOURCE -DLINKER_DEBUG=1
-runtime/libdl.so: private override CFLAGS += -Wno-pedantic -Wno-variadic-macros -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast
+runtime/libdl.so: private WARNINGS += -Wno-pedantic -Wno-variadic-macros -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast
 runtime/libdl.so: private override LDLIBS += -ldl -lpthread
 runtime/libdl.so: wrapper.a src/linker/dlfcn.c src/linker/linker.c src/linker/linker_environ.c src/linker/rt.c src/linker/strlcpy.c
 runtime/libc.so: private override CPPFLAGS += -D_GNU_SOURCE
@@ -49,11 +75,11 @@ runtime/liblog.so: src/liblog.c
 runtime/libEGL.so: private override CPPFLAGS += -D_GNU_SOURCE
 runtime/libEGL.so: private override LDLIBS += -lEGL `pkg-config --libs glfw3`
 runtime/libEGL.so: src/libEGL.c
-runtime/libOpenSLES.so: private override CFLAGS += -Wno-pedantic
+runtime/libOpenSLES.so: private WARNINGS += -Wno-pedantic
 runtime/libOpenSLES.so: wrapper.a src/libOpenSLES.c
 
 runtime/libjvm.so: private override CPPFLAGS += -D_GNU_SOURCE
-runtime/libjvm.so: private override CFLAGS += -Wno-pedantic
+runtime/libjvm.so: private WARNINGS += -Wno-pedantic
 runtime/libjvm.so: wrapper.a src/jvm/jvm.c
 runtime/libjvm-java.so: private override CPPFLAGS += -D_GNU_SOURCE
 runtime/libjvm-java.so: src/libjvm-java.c
@@ -86,5 +112,5 @@ clean:
 	$(RM) $(bins) *.a
 	$(RM) -r runtime
 
-.PHONY: all clean install
+.PHONY: all x86 x86_64 armeabi armeabi-v7a armeabi-v7a-neon arm64-v8a clean install
 .INTERMEDIATE: libdl.so libpthread.so
diff --git a/README.md b/README.md
index 794c6fb..fbf160d 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,8 @@ forgiving for incorrect implementation :D.
 ## Building
 
 ```shell
-make CFLAGS="-m32 -g" LDFLAGS="-m32"
+# to compile for android ABI x86 <https://developer.android.com/ndk/guides/abis>
+make x86
 ```
 
 Other than x86 is currently untested and probably doesn't work.
-- 
cgit v1.2.3