Merge remote-tracking branch 'gnuefi/master' into patch-upgrade-to-3.0.18

Make.defaults

@@ -34,7 +34,7 @@
 #    SUCH DAMAGE.
 #
 
-TOPDIR := $(shell if [ "$$PWD" != "" ]; then echo $$PWD; else pwd; fi)
+TOPDIR ?= $(shell if [ "$$PWD" != "" ]; then echo $$PWD; else pwd; fi)
 
 #
 # Variables below overridable from command-line:
@@ -161,18 +161,16 @@ endif
 ifneq ($(ARCH),arm)
 ifneq ($(ARCH),mips64el)
 ifneq ($(ARCH),riscv64)
-ifneq ($(ARCH),loongarch64)
 export HAVE_EFI_OBJCOPY=y
 endif
 endif
 endif
-endif
 
 ifeq ($(ARCH),arm)
 CFLAGS += -marm
 endif
 
-ifneq (,$(filter $(ARCH),aarch64 arm))
+ifneq (,$(filter $(ARCH),aarch64 arm loongarch64))
 LDFLAGS += -z common-page-size=4096
 LDFLAGS += -z max-page-size=4096
 endif

Makefile

@@ -37,7 +37,7 @@
 include env.mk
 
 
-export VERSION = 3.0.17
+export VERSION = 3.0.18
 
 MKFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
 SRCDIR = $(dir $(MKFILE_PATH))
@@ -114,7 +114,7 @@ $(SUBDIRS):
 	$(MAKE) -C $(OBJDIR)/$@ -f $(SRCDIR)/$@/Makefile SRCDIR=$(SRCDIR)/$@ ARCH=$(ARCH)
 
 clean:
-	rm -f *~
+	rm -vrf *~
 	rm -f $(shell find . -name "*.o")
 	@set -e ; for d in $(SUBDIRS); do \
 		if [ -d $(OBJDIR)/$$d ]; then \

apps/Makefile

@@ -37,23 +37,21 @@
 SRCDIR = .
 
 VPATH = $(SRCDIR)
+TOPDIR = $(SRCDIR)/..
 
 include $(SRCDIR)/../Make.defaults
 
-TOPDIR = $(SRCDIR)/..
-
-CDIR=$(TOPDIR)/..
 LINUX_HEADERS	= /usr/src/sys/build
 APPSDIR		= $(LIBDIR)/gnuefi/apps
 CPPFLAGS	+= -D__KERNEL__ -I$(LINUX_HEADERS)/include
-CRTOBJS		= ../gnuefi/crt0-efi-$(ARCH).o
+CRTOBJS		= $(TOPDIR)/$(ARCH)/gnuefi/crt0-efi-$(ARCH).o
 
 LDSCRIPT	= $(TOPDIR)/gnuefi/elf_$(ARCH)_efi.lds
 ifneq (,$(findstring FreeBSD,$(OS)))
 LDSCRIPT	= $(TOPDIR)/gnuefi/elf_$(ARCH)_fbsd_efi.lds
 endif
 
-LDFLAGS		+= -shared -Bsymbolic -L../lib -L../gnuefi $(CRTOBJS)
+LDFLAGS		+= -shared -Bsymbolic -L$(TOPDIR)/$(ARCH)/lib -L$(TOPDIR)/$(ARCH)/gnuefi $(CRTOBJS)
 
 LOADLIBES	+= -lefi -lgnuefi
 LOADLIBES	+= $(LIBGCC)
@@ -132,7 +130,7 @@ all:	$(TARGETS)
 ctors_test.so : ctors_fns.o ctors_test.o
 
 clean:
-	rm -f $(TARGETS) *~ *.o *.so
+	@rm -vf $(TARGETS) *~ *.o *.so
 
 install:
 	mkdir -p $(INSTALLROOT)$(APPSDIR)

gnuefi/Makefile

@@ -37,12 +37,10 @@
 SRCDIR = .
 
 VPATH = $(SRCDIR)
+TOPDIR = $(SRCDIR)/..
 
 include $(SRCDIR)/../Make.defaults
 
-TOPDIR = $(SRCDIR)/..
-
-CDIR=$(TOPDIR)/..
 PKGCONFIGDIR ?= $(LIBDIR)/pkgconfig
 FILES	= reloc_$(ARCH)  
 
@@ -69,7 +67,7 @@ gnu-efi.pc:
 
 
 clean:
-	rm -f $(TARGETS) *~ *.o $(OBJS)
+	@rm -vf $(TARGETS) *~ *.o $(OBJS)
 
 install:
 	mkdir -p $(INSTALLROOT)$(LIBDIR)

gnuefi/crt0-efi-loongarch64.S

@@ -17,125 +17,8 @@
  * either version 2 of the License, or (at your option) any later version.
  */
 
-#ifndef EFI_SUBSYSTEM
-#define EFI_SUBSYSTEM 0xa
-#endif
-	.section	.text.head
-
-	/*
-	 * Magic "MZ" signature for PE/COFF
-	 */
-	.globl	ImageBase
-ImageBase:
-	.ascii	"MZ"
-	.skip	58				// 'MZ' + pad + offset == 64
-	.4byte	pe_header - ImageBase		// Offset to the PE header.
-pe_header:
-	.ascii	"PE"
-	.2byte 	0
-coff_header:
-	.2byte	0x6264				// loongarch64 little endian
-	.2byte	2				// nr_sections
-	.4byte	0 				// TimeDateStamp
-	.4byte	0				// PointerToSymbolTable
-	.4byte	1				// NumberOfSymbols
-	.2byte	section_table - optional_header	// SizeOfOptionalHeader
-	.2byte	0x206				// Characteristics.
-						// IMAGE_FILE_DEBUG_STRIPPED |
-						// IMAGE_FILE_EXECUTABLE_IMAGE |
-						// IMAGE_FILE_LINE_NUMS_STRIPPED
-optional_header:
-	.2byte	0x20b				// PE32+ format
-	.byte	0x02				// MajorLinkerVersion
-	.byte	0x14				// MinorLinkerVersion
-	.4byte	_edata - _start			// SizeOfCode
-	.4byte	0				// SizeOfInitializedData
-	.4byte	0				// SizeOfUninitializedData
-	.4byte	_start - ImageBase		// AddressOfEntryPoint
-	.4byte	_start - ImageBase		// BaseOfCode
-
-extra_header_fields:
-	.8byte	0				// ImageBase
-	.4byte	0x20				// SectionAlignment
-	.4byte	0x8				// FileAlignment
-	.2byte	0				// MajorOperatingSystemVersion
-	.2byte	0				// MinorOperatingSystemVersion
-	.2byte	0				// MajorImageVersion
-	.2byte	0				// MinorImageVersion
-	.2byte	0				// MajorSubsystemVersion
-	.2byte	0				// MinorSubsystemVersion
-	.4byte	0				// Win32VersionValue
-
-	.4byte	_edata - ImageBase		// SizeOfImage
-
-	// Everything before the kernel image is considered part of the header
-	.4byte	_start - ImageBase		// SizeOfHeaders
-	.4byte	0				// CheckSum
-	.2byte	EFI_SUBSYSTEM			// Subsystem
-	.2byte	0				// DllCharacteristics
-	.8byte	0				// SizeOfStackReserve
-	.8byte	0				// SizeOfStackCommit
-	.8byte	0				// SizeOfHeapReserve
-	.8byte	0				// SizeOfHeapCommit
-	.4byte	0				// LoaderFlags
-	.4byte	0x10				// NumberOfRvaAndSizes
-
-	.8byte	0				// ExportTable
-	.8byte	0				// ImportTable
-	.8byte	0				// ResourceTable
-	.8byte	0				// ExceptionTable
-	.8byte	0				// CertificationTable
-	.8byte	0				// BaseRelocationTable
-	.8byte	0				// Debug
-	.8byte	0				// Architecture
-	.8byte	0				// Global Ptr
-	.8byte	0				// TLS Table
-	.8byte	0				// Load Config Table
-	.8byte	0				// Bound Import
-	.8byte	0				// IAT
-	.8byte	0				// Delay Import Descriptor
-	.8byte	0				// CLR Runtime Header
-	.8byte	0				// Reserved, must be zero
-
-	// Section table
-section_table:
-
-	/*
-	 * The EFI application loader requires a relocation section
-	 * because EFI applications must be relocatable.  This is a
-	 * dummy section as far as we are concerned.
-	 */
-	.ascii	".reloc"
-	.byte	0
-	.byte	0			// end of 0 padding of section name
-	.4byte	0
-	.4byte	0
-	.4byte	0			// SizeOfRawData
-	.4byte	0			// PointerToRawData
-	.4byte	0			// PointerToRelocations
-	.4byte	0			// PointerToLineNumbers
-	.2byte	0			// NumberOfRelocations
-	.2byte	0			// NumberOfLineNumbers
-	.4byte	0x42100040		// Characteristics (section flags)
-
-
-	.ascii	".text"
-	.byte	0
-	.byte	0
-	.byte	0        		// end of 0 padding of section name
-	.4byte	_edata - _start		// VirtualSize
-	.4byte	_start - ImageBase	// VirtualAddress
-	.4byte	_edata - _start		// SizeOfRawData
-	.4byte	_start - ImageBase	// PointerToRawData
-
-	.4byte	0			// PointerToRelocations (0 for executables)
-	.4byte	0			// PointerToLineNumbers (0 for executables)
-	.2byte	0			// NumberOfRelocations  (0 for executables)
-	.2byte	0			// NumberOfLineNumbers  (0 for executables)
-	.4byte	0xe0500020		// Characteristics (section flags)
-
-	.align  4
-
+	.text
+	.align		12
 	.globl	_start
 	.type	_start, @function
 _start:
@@ -153,9 +36,25 @@ _start:
 
 	ld.d	  $a0, $sp, 8
 	ld.d	  $a1, $sp, 16
-	bl        efi_main
+	bl        _entry
 
 0:	ld.d	  $ra, $sp, 0
 	addi.d	  $sp, $sp, 24
 	jr	      $ra
-	.end	  _start
+
+// hand-craft a dummy .reloc section so EFI knows it's a relocatable executable:
+
+ 	.data
+dummy:	.4byte	0
+
+#define IMAGE_REL_ABSOLUTE	0
+ 	.section .reloc, "a"
+label1:
+	.4byte	dummy-label1				// Page RVA
+	.4byte	12					// Block Size (2*4+2*2), must be aligned by 32 Bits
+	.2byte	(IMAGE_REL_ABSOLUTE<<12) +  0		// reloc for dummy
+	.2byte	(IMAGE_REL_ABSOLUTE<<12) +  0		// reloc for dummy
+
+#if defined(__ELF__) && defined(__linux__)
+	.section .note.GNU-stack,"",%progbits
+#endif

gnuefi/elf_aarch64_efi.lds

@@ -22,12 +22,12 @@ SECTIONS
   }
   _etext = .;
   _text_size = _etext - _text;
-  . = ALIGN(4096);
+  . = ALIGN(65536);
   .reloc :
   {
     KEEP (*(.reloc))
   }
-  . = ALIGN(65536);
+  . = ALIGN(4096);
   .dynamic  : { *(.dynamic) }
   . = ALIGN(4096);
   .data :

gnuefi/elf_arm_efi.lds

@@ -27,7 +27,7 @@ SECTIONS
   } =0
   _reloc_vsize = _evreloc - _reloc;
   _reloc_size = _ereloc - _reloc;
-  . = ALIGN(65536);
+  . = ALIGN(4096);
   _data = .;
   .dynamic  : { *(.dynamic) }
   . = ALIGN(4096);

gnuefi/elf_loongarch64_efi.lds

@@ -3,9 +3,17 @@ OUTPUT_ARCH(loongarch)
 ENTRY(_start)
 SECTIONS
 {
-  .text 0x0 : {
+  . = 0;
+  ImageBase = .;
+  /* .hash and/or .gnu.hash MUST come first! */
+  .hash : { *(.hash) }
+  .gnu.hash : { *(.gnu.hash) }
+  . = ALIGN(4096);
+  .eh_frame : { *(.eh_frame) }
+  .gcc_except_table : { *(.gcc_except_table*) }
+  . = ALIGN(4096);
+  .text : {
     _text = .;
-    *(.text.head)
     *(.text)
     *(.text.*)
     *(.gnu.linkonce.t.*)
@@ -14,8 +22,15 @@ SECTIONS
   }
   _etext = .;
   _text_size = _etext - _text;
+  . = ALIGN(4096);
+  .reloc :
+  {
+    KEEP (*(.reloc))
+  }
+  . = ALIGN(65536);
   .dynamic  : { *(.dynamic) }
-  .data : ALIGN(4096)
+  . = ALIGN(4096);
+  .data :
   {
    _data = .;
    *(.sdata)
@@ -25,6 +40,33 @@ SECTIONS
    *(.got.plt)
    *(.got)
 
+   /*
+    * Note that these aren't the using the GNU "CONSTRUCTOR" output section
+    * command, so they don't start with a size.  Because of p2align and the
+    * end/END definitions, and the fact that they're mergeable, they can also
+    * have NULLs which aren't guaranteed to be at the end.
+    */
+   . = ALIGN(16);
+   __init_array_start = .;
+   *(SORT(.init_array.*))
+   *(.init_array)
+   __init_array_end = .;
+  . = ALIGN(16);
+   __CTOR_LIST__ = .;
+   *(SORT(.ctors.*))
+   *(.ctors)
+   __CTOR_END__ = .;
+  . = ALIGN(16);
+   __DTOR_LIST__ = .;
+   *(SORT(.dtors.*))
+   *(.dtors)
+   __DTOR_END__ = .;
+   . = ALIGN(16);
+   __fini_array_start = .;
+   *(SORT(.fini_array.*))
+   *(.fini_array)
+   __fini_array_end = .;
+
    /* the EFI loader doesn't seem to like a .bss section, so we stick
       it all into .data: */
    . = ALIGN(16);
@@ -32,16 +74,30 @@ SECTIONS
    *(.sbss)
    *(.scommon)
    *(.dynbss)
-   *(.bss)
+   *(.bss*)
    *(COMMON)
+   *(.rel.local)
    . = ALIGN(16);
+
    _bss_end = .;
   }
 
-  .rela.dyn : { *(.rela.dyn) }
+  . = ALIGN(4096);
+  .rela :
+  {
+    *(.rela.text*)
+    *(.rela.data*)
+    *(.rela.got)
+    *(.rela.dyn)
+    *(.rela.stab)
+    *(.rela.init_array*)
+    *(.rela.fini_array*)
+    *(.rela.ctors*)
+    *(.rela.dtors*)
+
+  }
+  . = ALIGN(4096);
   .rela.plt : { *(.rela.plt) }
-  .rela.got : { *(.rela.got) }
-  .rela.data : { *(.rela.data) *(.rela.data*) }
   . = ALIGN(4096);
   .rodata : { *(.rodata*) }
   . = ALIGN(512);
@@ -54,10 +110,9 @@ SECTIONS
   .dynstr   : { *(.dynstr) }
   . = ALIGN(4096);
   .note.gnu.build-id : { *(.note.gnu.build-id) }
-  /DISCARD/ :
+  .ignored.reloc :
   {
-    *(.rel.reloc)
-    *(.eh_frame)
+    *(.rela.reloc)
     *(.note.GNU-stack)
   }
   .comment 0 : { *(.comment) }

inc/Makefile

@@ -1,12 +1,9 @@
 SRCDIR = .
 
 VPATH = $(SRCDIR)
-
-include $(SRCDIR)/../Make.defaults
-
 TOPDIR = $(SRCDIR)/..
 
-CDIR=$(TOPDIR)/..
+include $(SRCDIR)/../Make.defaults
 
 all:
 

inc/aarch64/efisetjmp_arch.h

@@ -29,6 +29,6 @@ typedef struct {
 	UINT64	D13;
 	UINT64	D14;
 	UINT64	D15;
-} ALIGN(JMPBUF_ALIGN) jmp_buf[1];
+} EFI_ALIGN(JMPBUF_ALIGN) jmp_buf[1];
 
 #endif /* GNU_EFI_AARCH64_SETJMP_H */

inc/arm/efisetjmp_arch.h

@@ -16,6 +16,6 @@ typedef struct {
 	UINT32 R12;
 	UINT32 R13;
 	UINT32 R14;
-} ALIGN(JMPBUF_ALIGN) jmp_buf[1];
+} EFI_ALIGN(JMPBUF_ALIGN) jmp_buf[1];
 
 #endif /* GNU_EFI_ARM_SETJMP_H */

inc/eficompiler.h

@@ -39,9 +39,19 @@ Abstract:
 #endif
 
 #ifdef _MSC_EXTENSIONS
-#define ALIGN(x) __declspec(align(x))
+#define EFI_ALIGN(x) __declspec(align(x))
 #else
-#define ALIGN(x) __attribute__((__aligned__(x)))
+#define EFI_ALIGN(x) __attribute__((__aligned__(x)))
+#endif
+
+#ifndef ALIGN
+#define ALIGN(x) EFI_ALIGN(x)
+#endif
+
+#ifdef _MSC_EXTENSIONS
+#define EFI_NORETURN __declspec(noreturn)
+#else
+#define EFI_NORETURN __attribute__((noreturn))
 #endif
 
 /* Also add a catch-all on __attribute__() for MS compilers */

inc/efisetjmp.h

@@ -5,6 +5,6 @@
 #include "efisetjmp_arch.h"
 
 extern UINTN setjmp(jmp_buf env) __attribute__((returns_twice));
-extern VOID longjmp(jmp_buf env, UINTN value) __attribute__((noreturn));
+extern VOID longjmp(jmp_buf env, UINTN value) EFI_NORETURN;
 
 #endif /* GNU_EFI_SETJMP_H */

inc/ia32/efisetjmp_arch.h

@@ -10,6 +10,6 @@ typedef struct {
 	UINT32	Ebp;
 	UINT32	Esp;
 	UINT32	Eip;
-} ALIGN(JMPBUF_ALIGN) jmp_buf[1];
+} EFI_ALIGN(JMPBUF_ALIGN) jmp_buf[1];
 
 #endif /* GNU_EFI_IA32_SETJMP_H */

inc/ia64/efisetjmp_arch.h

@@ -42,6 +42,6 @@ typedef struct {
 	UINT64	Predicates;
 	UINT64	LoopCount;
 	UINT64	FPSR;
-} ALIGN(JMPBUF_ALIGN) jmp_buf[1];
+} EFI_ALIGN(JMPBUF_ALIGN) jmp_buf[1];
 
 #endif /* GNU_EFI_IA64_SETJMP_H */

inc/loongarch64/efibind.h

@@ -42,9 +42,10 @@ typedef int64_t             intptr_t;
 // Basic EFI types of various widths
 //
 
-#ifndef __WCHAR_TYPE__
-# define __WCHAR_TYPE__ short
-#endif
+#include <stddef.h>
+
+typedef wchar_t CHAR16;
+#define WCHAR CHAR16
 
 typedef uint64_t   UINT64;
 typedef int64_t    INT64;
@@ -54,12 +55,13 @@ typedef int32_t    INT32;
 
 typedef uint16_t   UINT16;
 typedef int16_t    INT16;
+
 typedef uint8_t    UINT8;
+typedef char       CHAR8;
 typedef int8_t     INT8;
-typedef __WCHAR_TYPE__ WCHAR;
 
 #undef VOID
-#define VOID    void
+typedef void       VOID;
 
 typedef int64_t    INTN;
 typedef uint64_t   UINTN;

inc/loongarch64/efisetjmp_arch.h

@@ -18,6 +18,6 @@ typedef struct {
 	UINT64	S6;
 	UINT64	S7;
 	UINT64	S8;
-} ALIGN(JMPBUF_ALIGN) jmp_buf[1];
+} EFI_ALIGN(JMPBUF_ALIGN) jmp_buf[1];
 
 #endif /* GNU_EFI_LOONGARCH64_SETJMP_H */

inc/mips64el/efisetjmp_arch.h

@@ -29,6 +29,6 @@ typedef struct {
 	UINT64	F30;
 	UINT64	F31;
 #endif
-} ALIGN(JMPBUF_ALIGN) jmp_buf[1];
+} EFI_ALIGN(JMPBUF_ALIGN) jmp_buf[1];
 
 #endif /* GNU_EFI_MIPS64EL_SETJMP_H */

inc/riscv64/efisetjmp_arch.h

@@ -35,6 +35,6 @@ typedef struct {
 	UINT64	fs9;
 	UINT64	fs10;
 	UINT64	fs11;
-} ALIGN(JMPBUF_ALIGN) jmp_buf[1];
+} EFI_ALIGN(JMPBUF_ALIGN) jmp_buf[1];
 
 #endif /* GNU_EFI_RISCV64_SETJMP_H */

inc/x86_64/efisetjmp_arch.h

@@ -17,6 +17,6 @@ typedef struct {
 	UINT64	Rip;
 	UINT64	MxCsr;
 	UINT8	XmmBuffer[160]; // XMM6 - XMM15
-} ALIGN(JMPBUF_ALIGN) jmp_buf[1];
+} EFI_ALIGN(JMPBUF_ALIGN) jmp_buf[1];
 
 #endif /* GNU_EFI_X86_64_SETJMP_H */

lib/Makefile

@@ -37,12 +37,10 @@
 SRCDIR = .
 
 VPATH = $(SRCDIR)
+TOPDIR = $(SRCDIR)/..
 
 include $(SRCDIR)/../Make.defaults
 
-TOPDIR = $(SRCDIR)/..
-
-CDIR = $(TOPDIR)/..
 FILES = boxdraw smbios console crc data debug dpath \
         entry error event exit guid hand hw init lock \
         misc pause print sread str cmdline\
@@ -80,7 +78,7 @@ libefi.a: $(OBJS)
 	$(AR) $(ARFLAGS) $@ $^
 
 clean:
-	rm -f libefi.a *~ $(OBJS) */*.o
+	@rm -vf libefi.a *~ $(OBJS) */*.o
 
 $(LIBDIRINSTALL):
 	mkdir -p $@

lib/ctors.S

@@ -9,34 +9,29 @@
  * have NULLs which aren't guaranteed to be at the end.
  */
 	.section .init_array,"aw",%init_array
-	.p2align 3, 0
+	.p2align 4, 0
 	.globl __init_array_start
 __init_array_start:
-	.p2align 3, 0
 	.globl __init_array_end
 __init_array_end:
 	.section .ctors,"aw",%progbits
-	.p2align 3, 0
+	.p2align 4, 0
 	.globl __CTOR_LIST__
 __CTOR_LIST__:
-	.p2align 3, 0
 	.globl __CTOR_END__
 __CTOR_END__:
 	.section .dtors,"aw",%progbits
-	.p2align 3, 0
+	.p2align 4, 0
 	.globl __DTOR_LIST__
 __DTOR_LIST__:
-	.p2align 3, 0
 	.globl __DTOR_END__
 __DTOR_END__:
 	.section .fini_array,"aw",%fini_array
-	.p2align 3, 0
+	.p2align 4, 0
 	.globl __fini_array_start
 __fini_array_start:
-	.p2align 3, 0
 	.globl __fini_array_end
 __fini_array_end:
-	.p2align 3, 0
 
 #if defined(__ELF__) && defined(__linux__)
 	.section .note.GNU-stack,"",%progbits

lib/loongarch64/efi_stub.S

@@ -1 +1,4 @@
 /* This stub is a stub to make the build happy */
+#if defined(__ELF__) && defined(__linux__)
+       .section .note.GNU-stack,"",%progbits
+#endif