1From 44a1b42e561b9a257209300e2860b901b100cc17 Mon Sep 17 00:00:00 2001 2From: Carlos Santos <casantos@datacom.com.br> 3Date: Tue, 26 Feb 2019 08:07:22 -0300 4Subject: [PATCH] Fix build with gnu-efi version 3.0.9 5 6Adapt a patch already applied upstream to prevent multiple definitions 7of 'memset' and 'memcpy'. 8 9Signed-off-by: Carlos Santos <casantos@datacom.com.br> 10(adapted from commit 363d61c4f112b972649b19d67e96b9321f738f00) 11--- 12 mk/lib.mk | 9 +++++++-- 13 1 file changed, 7 insertions(+), 2 deletions(-) 14 15diff --git a/mk/lib.mk b/mk/lib.mk 16index ceb95bd0..c9b6eaf3 100644 17--- a/mk/lib.mk 18+++ b/mk/lib.mk 19@@ -186,9 +186,9 @@ MINLIBOBJS = \ 20 # $(LIBVESA_OBJS) 21 22 CORELIBOBJS = \ 23- memcpy.o memset.o memcmp.o printf.o strncmp.o vfprintf.o \ 24+ memcmp.o printf.o strncmp.o vfprintf.o \ 25 strlen.o vsnprintf.o snprintf.o stpcpy.o strcmp.o strdup.o \ 26- strcpy.o strncpy.o setjmp.o fopen.o fread.o fread2.o puts.o \ 27+ strcpy.o strncpy.o fopen.o fread.o fread2.o puts.o \ 28 strtoul.o strntoumax.o strcasecmp.o \ 29 sprintf.o strlcat.o strchr.o strlcpy.o strncasecmp.o ctypes.o \ 30 fputs.o fwrite2.o fwrite.o fgetc.o fclose.o lmalloc.o \ 31@@ -203,6 +203,11 @@ CORELIBOBJS = \ 32 $(LIBENTRY_OBJS) \ 33 $(LIBMODULE_OBJS) 34 35+ifndef EFI_BUILD 36+# For EFI, these are part of gnu-efi 37+CORELIBOBJS += setjmp.o memcpy.o memset.o 38+endif 39+ 40 LDFLAGS = -m elf_$(ARCH) --hash-style=gnu -T $(com32)/lib/$(ARCH)/elf.ld 41 42 .SUFFIXES: .c .o .a .so .lo .i .S .s .ls .ss .lss 43-- 442.14.5 45 46