gcc10.patch

   1 From 8bdda551dab5579a14db1d66f34356d45d5cda16 Mon Sep 17 00:00:00 2001
   2 From: Susant Sahani <ssahani@vmware.com>
   3 Date: Sat, 25 Jan 2020 11:30:08 +0100
   4 Subject: [PATCH] efi: fix build.
   5
   6 ```
   7 ninja -C build
   8 ninja: Entering directory `build'
   9 [29/101] Generating systemd_boot.so with a custom command.
  10 FAILED: src/boot/efi/systemd_boot.so
  11 /usr/bin/ld -o src/boot/efi/systemd_boot.so -T /usr/lib64/gnuefi/elf_x64_efi.lds -shared -Bsymbolic -nostdlib -znocombreloc -L /usr/lib64 /usr/lib64/gnuefi/crt0-efi-x64.o src/boot/efi/disk.c.o src/boot/efi/graphics.c.o src/boot/efi/measure.c.o src/boot/efi/pe.c.o src/boot/efi/util.c.o src/boot/efi/boot.c.o src/boot/efi/console.c.o src/boot/efi/crc32.c.o src/boot/efi/random-seed.c.o src/boot/efi/sha256.c.o src/boot/efi/shim.c.o -lefi -lgnuefi /usr/lib/gcc/x86_64-redhat-linux/10/libgcc.a
  12 /usr/bin/ld: src/boot/efi/graphics.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: multiple definition of `loader_guid'; src/boot/efi/disk.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: first defined here
  13 /usr/bin/ld: src/boot/efi/pe.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: multiple definition of `loader_guid'; src/boot/efi/disk.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: first defined here
  14 /usr/bin/ld: src/boot/efi/util.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: multiple definition of `loader_guid'; src/boot/efi/disk.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: first defined here
  15 /usr/bin/ld: src/boot/efi/boot.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: multiple definition of `loader_guid'; src/boot/efi/disk.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: first defined here
  16 /usr/bin/ld: src/boot/efi/console.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: multiple definition of `loader_guid'; src/boot/efi/disk.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: first defined here
  17 /usr/bin/ld: src/boot/efi/random-seed.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: multiple definition of `loader_guid'; src/boot/efi/disk.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: first defined here
  18 /usr/bin/ld: src/boot/efi/shim.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: multiple definition of `loader_guid'; src/boot/efi/disk.c.o:/home/sus/tt/systemd/build/../src/boot/efi/util.h:58: first defined here
  19 [31/101] Generating stub.c.o with a custom command.
  20 ninja: build stopped: subcommand failed.
  21 make: *** [Makefile:2: all] Error 1
  22
  23 ```
  24 ---
  25  src/boot/efi/util.h | 2 +-
  26  1 file changed, 1 insertion(+), 1 deletion(-)
  27
  28 diff --git a/src/boot/efi/util.h b/src/boot/efi/util.h
  29 index 8518dfde77e..b13f22476c6 100644
  30 --- a/src/boot/efi/util.h
  31 +++ b/src/boot/efi/util.h
  32 @@ -55,7 +55,7 @@ static inline void FileHandleClosep(EFI_FILE_HANDLE *handle) {
  33          uefi_call_wrapper((*handle)->Close, 1, *handle);
  34  }
  35
  36 -const EFI_GUID loader_guid;
  37 +extern const EFI_GUID loader_guid;
  38
  39  #define UINTN_MAX (~(UINTN)0)
  40  #define INTN_MAX ((INTN)(UINTN_MAX>>1))