Merge pull request torvalds#104 from ngkaho1234/fix-makefile

Octavian Purdila · Octavian Purdila · commit 403be24caa44 · 2016-03-01T19:07:19.000+02:00
lkl: Don't specify different compiler/linker flags for elf32-littlearm.
diff --git a/tools/lkl/Makefile b/tools/lkl/Makefile
@@ -41,12 +41,12 @@ export CFLAGS += -Iinclude -Wall -g -O2 -Wextra -Wno-unused-parameter \
 
 OUTPUT_FORMAT = $(shell $(LD) -r -print-output-format)
 
-ifneq (,$(filter $(OUTPUT_FORMAT),elf64-x86-64 elf32-i386 elf64-x86-64-freebsd))
+ifneq (,$(filter $(OUTPUT_FORMAT),elf64-x86-64 elf32-i386 elf64-x86-64-freebsd elf32-littlearm))
+  OUTPUT_DEF = $(shell echo | $(CC) -dM -E -)
   CFLAGS   += -fPIC -pthread
-  LDLIBS   += -lrt -lpthread
-  export CONFIG_AUTO_LKL_POSIX_HOST=y
-else ifneq (,$(filter $(OUTPUT_FORMAT),elf32-littlearm))
-  CFLAGS   += -fPIC
+  ifeq (,$(filter $(OUTPUT_DEF),__ANDROID__))
+    LDLIBS   += -lrt -lpthread
+  endif
   export CONFIG_AUTO_LKL_POSIX_HOST=y
 else ifneq (,$(filter $(OUTPUT_FORMAT),pe-i386))
   KOPT      = "KALLSYMS_EXTRA_PASS=1"
@@ -118,8 +118,12 @@ cpfromfs$(EXESUF): cptofs$(EXESUF)
 # because of argp and fuse, none of the binaries will compile on windows
 # because of libdl, liblkl-hijack will not compile on windows
 # arm-android neither for the moment
-ifneq (,$(filter $(OUTPUT_FORMAT),pe-i386 elf32-littlearm))
+ifneq (,$(filter $(OUTPUT_FORMAT),pe-i386))
   all: $(filter-out liblkl-hijack$(SOSUF), $(ALL_LIBRARIES))
+else ifneq (,$(filter $(OUTPUT_DEF),__ANDROID__))
+  all: $(filter-out liblkl-hijack$(SOSUF), $(ALL_LIBRARIES))
+else ifneq (,$(filter $(OUTPUT_FORMAT),elf32-littlearm))
+  all: $(filter-out liblkl-hijack$(SOSUF), $(ALL_LIBRARIES)) $(ALL_PROGRAMS)
 else
   all: $(ALL_PROGRAMS) $(ALL_LIBRARIES)
 endif
