gitignore *.so

.gitignore

@@ -4,3 +4,4 @@
 *.a
 *.tar.*
 *.tar
+*.so

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:
@@ -89,6 +89,16 @@ ifeq ($(ARCH),amd64)
   override ARCH := x86_64
 endif
 
+GCCVERSION   := $(shell $(CC) -dumpversion | cut -f1 -d.)
+GCCMINOR     := $(shell $(CC) -dumpversion | cut -f2 -d.)
+USING_CLANG  := $(shell $(CC) -v 2>&1 | grep -q 'clang version' && echo clang)
+
+# Rely on GCC MS ABI support?
+GCCNEWENOUGH := $(shell ( [ $(GCCVERSION) -gt "4" ]           \
+                          || ( [ $(GCCVERSION) -eq "4" ]      \
+                          && [ $(GCCMINOR) -ge "7" ] ) ) \
+                          && echo 1)
+
 #
 # Where to build the package
 #
@@ -114,20 +124,15 @@ ifeq ($(ARCH),ia32)
   endif
 endif
 
+# Set ISO C mode
+CPPFLAGS += -std=c11
+
 ifeq ($(ARCH),x86_64)
-  GCCVERSION   := $(shell $(CC) -dumpversion | cut -f1 -d.)
-  GCCMINOR     := $(shell $(CC) -dumpversion | cut -f2 -d.)
-  USING_CLANG  := $(shell $(CC) -v 2>&1 | grep -q 'clang version' && echo clang)
-
-  # Rely on GCC MS ABI support?
-  GCCNEWENOUGH := $(shell ( [ $(GCCVERSION) -gt "4" ]           \
-                            || ( [ $(GCCVERSION) -eq "4" ]      \
-                                 && [ $(GCCMINOR) -ge "7" ] ) ) \
-                          && echo 1)
   ifeq ($(GCCNEWENOUGH),1)
-    CPPFLAGS += -DGNU_EFI_USE_MS_ABI -maccumulate-outgoing-args -std=c11
-  else ifeq ($(USING_CLANG),clang)
-    CPPFLAGS += -DGNU_EFI_USE_MS_ABI -std=c11
+    CPPFLAGS += -DGNU_EFI_USE_MS_ABI
+    ifneq ($(USING_CLANG),clang)
+      CPPFLAGS +=  -maccumulate-outgoing-args
+    endif
   endif
 
   CFLAGS += -mno-red-zone
@@ -156,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
 
-ifeq ($(ARCH),aarch64)
+ifneq (,$(filter $(ARCH),aarch64 arm loongarch64))
 LDFLAGS += -z common-page-size=4096
 LDFLAGS += -z max-page-size=4096
 endif
@@ -190,7 +193,6 @@ else
 CFLAGS  += $(ARCH3264) -g -O2 -Wall -Wextra -Wno-pointer-sign -Werror \
            -funsigned-char -fshort-wchar -fno-strict-aliasing \
 	   -ffreestanding -fno-stack-protector -fno-stack-check \
-           -fno-stack-check \
            $(if $(findstring gcc,$(CC)),-fno-merge-all-constants,)
 endif
 

Make.rules

@@ -37,9 +37,9 @@
 .SECONDARY:
 
 %.efi: %.so
-	$(OBJCOPY) -j .text -j .sdata -j .data -j .dynamic -j .dynsym -j .rel \
+	$(OBJCOPY) -j .text -j .sdata -j .data -j .dynamic -j .rodata -j .rel \
 		    -j .rela -j .rel.* -j .rela.* -j .rel* -j .rela* \
-		    -j .reloc $(FORMAT) $*.so $@
+		    -j .areloc -j .reloc $(FORMAT) $*.so $@
 
 %.efi.debug: %.so
 	$(OBJCOPY) -j .debug_info -j .debug_abbrev -j .debug_aranges \

Makefile

@@ -34,7 +34,7 @@
 #    SUCH DAMAGE.
 #
 
-export VERSION = 3.0.17
+export VERSION = 3.0.18
 
 MKFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
 SRCDIR = $(dir $(MKFILE_PATH))
@@ -82,7 +82,7 @@ $(SUBDIRS):
 	$(MAKE) -C $(OBJDIR)/$@ -f $(SRCDIR)/$@/Makefile SRCDIR=$(SRCDIR)/$@ ARCH=$(ARCH)
 
 clean:
-	rm -f *~
+	@rm -vrf *~
 	@set -e ; for d in $(SUBDIRS); do \
 		if [ -d $(OBJDIR)/$$d ]; then \
 			$(MAKE) -C $(OBJDIR)/$$d -f $(SRCDIR)/$$d/Makefile SRCDIR=$(SRCDIR)/$$d clean; \

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)
@@ -92,7 +90,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)

apps/ctors_dtors_priority_test.c

@@ -2,22 +2,22 @@
 #include <efilib.h>
 
 // 101 in init_array, 65434 in ctors
-static void __attribute__((constructor(101))) ctors101() {
+static void __attribute__((constructor(101))) EFI_NO_TAIL_CALL ctors101() {
     Print(L"1) ctor with lower numbered priority \r\n");
 }
 
 // 65434 in init_array, 101 in ctors
-static void __attribute__((constructor(65434))) ctors65434() {
+static void __attribute__((constructor(65434))) EFI_NO_TAIL_CALL ctors65434() {
     Print(L"2) ctor with higher numbered priority \r\n");
 }
 
 // 101 in fini_array, 65434 in dtors
-static void __attribute__((destructor(101))) dtors101() {
+static void __attribute__((destructor(101))) EFI_NO_TAIL_CALL dtors101() {
     Print(L"4) dtor with lower numbered priority \r\n");
 }
 
 // 65434 in fini_array, 101 in dtors
-static void __attribute__((destructor(65434))) dtors65434() {
+static void __attribute__((destructor(65434))) EFI_NO_TAIL_CALL dtors65434() {
     Print(L"3) dtor with higher numbered priority \r\n");
 }
 

apps/ctors_fns.c

@@ -9,14 +9,14 @@
 
 int constructed_value = 0;
 
-static void __attribute__((__constructor__)) ctor(void)
+static void __attribute__((__constructor__)) EFI_NO_TAIL_CALL ctor(void)
 {
 	Print(L"%a:%d:%a() constructed_value:%d\n", __FILE__, __LINE__, __func__, constructed_value);
 	constructed_value = 1;
 	Print(L"%a:%d:%a() constructed_value:%d\n", __FILE__, __LINE__, __func__, constructed_value);
 }
 
-static void __attribute__((__destructor__)) dtor(void)
+static void __attribute__((__destructor__)) EFI_NO_TAIL_CALL dtor(void)
 {
 	Print(L"%a:%d:%a() constructed_value:%d\n", __FILE__, __LINE__, __func__, constructed_value);
 	constructed_value = 0;

apps/debughook.c

@@ -37,13 +37,7 @@ GetVariable(CHAR16 *var, UINT8 **data, UINTN *len, EFI_GUID owner)
 EFI_GUID DUMMY_GUID =
 {0x55aad538, 0x8f82, 0x4e2a, {0xa4,0xf0,0xbe, 0x59, 0x13, 0xb6, 0x5f, 0x1e}};
 
-#if defined(__clang__)
-# define _OPTNONE __attribute__((optnone))
-#else
-# define _OPTNONE __attribute__((__optimize__("0")))
-#endif
-
-static _OPTNONE void
+static EFI_OPTNONE void
 DebugHook(void)
 {
 	EFI_GUID guid = DUMMY_GUID;

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-aarch64.S

@@ -20,6 +20,7 @@
 	.align		12
 
 	.globl _start
+	.type _start,%function
 _start:
 	stp		x29, x30, [sp, #-32]!
 	mov		x29, sp
@@ -42,15 +43,15 @@ _start:
 	// hand-craft a dummy .reloc section so EFI knows it's a relocatable executable:
 
  	.data
-dummy:	.long	0
+dummy:	.4byte	0
 
 #define IMAGE_REL_ABSOLUTE	0
  	.section .reloc, "a"
 label1:
-	.long	dummy-label1				// Page RVA
-	.long	12					// Block Size (2*4+2*2), must be aligned by 32 Bits
-	.word	(IMAGE_REL_ABSOLUTE<<12) +  0		// reloc for dummy
-	.word	(IMAGE_REL_ABSOLUTE<<12) +  0		// reloc for dummy
+	.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