s390/decompressor: reuse lib/mem.S for mem functions (cad5b35d) · Commits · 戴 / test

arch/s390/boot/Makefile

+3 −1

Original line number	Diff line number	Diff line
		@@ -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

+0 −37

Original line number	Diff line number	Diff line
		@@ -71,43 +71,6 @@ static int puts(const char *s)
		return 0;
		}

		void memset(void s, int c, size_t n)
		{
		char *xs;

		xs = s;
		while (n--)
		*xs++ = c;
		return s;
		}

		void memcpy(void dest, const void *src, size_t n)
		{
		const char *s = src;
		char *d = dest;

		while (n--)
		d++ = s++;
		return dest;
		}

		void memmove(void dest, const void *src, size_t n)
		{
		const char *s = src;
		char *d = dest;

		if (d <= s) {
		while (n--)
		d++ = s++;
		} else {
		d += n;
		s += n;
		while (n--)
		--d = --s;
		}
		return dest;
		}

		static void error(char *x)
		{
		unsigned long long psw = 0x000a0000deadbeefULL;

0 → 100644

+2 −0

Original line number	Diff line number	Diff line
		/* SPDX-License-Identifier: GPL-2.0 */
		#include "../lib/mem.S"