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