0013-Fix-build-with-gnu-efi-version-3.0.9.patch 1.4 KB

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