aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/boot/Makefile
diff options
context:
space:
mode:
authorVasily Gorbik <gor@linux.ibm.com>2018-06-12 22:58:50 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2018-06-25 10:14:39 +0200
commitcad5b35da9f7e429131592421c463a93703bb02e (patch)
treefee7168c074307ea2883d158d761aaaf21dc0706 /arch/s390/boot/Makefile
parents390/decompressor: avoid reusing uncompressed image objects (diff)
downloadlinux-dev-cad5b35da9f7e429131592421c463a93703bb02e.tar.xz
linux-dev-cad5b35da9f7e429131592421c463a93703bb02e.zip
s390/decompressor: reuse lib/mem.S for mem functions
Reusing arch/s390/lib/mem.S file solves a problem that sclp_early_core.c and its dependencies have to be compiled with -march=z900 (no need to compile compressed/misc.c with -march=z900). This also allows to avoid mem functions duplicates, makes code a bit smaller and optimized mem functions are utilized. Reviewed-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Vasily Gorbik <gor@linux.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/boot/Makefile')
-rw-r--r--arch/s390/boot/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/s390/boot/Makefile b/arch/s390/boot/Makefile
index 5cf30b732eb6..70b50b41eda9 100644
--- a/arch/s390/boot/Makefile
+++ b/arch/s390/boot/Makefile
@@ -17,6 +17,8 @@ KBUILD_CFLAGS := $(KBUILD_CFLAGS_DECOMPRESSOR)
ifneq ($(CC_FLAGS_MARCH),-march=z900)
AFLAGS_REMOVE_head.o += $(CC_FLAGS_MARCH)
AFLAGS_head.o += -march=z900
+AFLAGS_REMOVE_mem.o += $(CC_FLAGS_MARCH)
+AFLAGS_mem.o += -march=z900
CFLAGS_REMOVE_als.o += $(CC_FLAGS_MARCH)
CFLAGS_als.o += -march=z900
CFLAGS_REMOVE_sclp_early_core.o += $(CC_FLAGS_MARCH)
@@ -25,7 +27,7 @@ endif
CFLAGS_sclp_early_core.o += -I$(srctree)/drivers/s390/char
-obj-y := head.o als.o ebcdic.o sclp_early_core.o
+obj-y := head.o als.o ebcdic.o sclp_early_core.o mem.o
targets := bzImage setup.a $(obj-y)
subdir- := compressed