shim/0003-bug-Remove-extraneous-configuration-from-RISC-V.patch

34 lines
1.1 KiB
Diff
Raw Normal View History

From cab715f714617abaaa600ad5658dadf85c4fe46f Mon Sep 17 00:00:00 2001
From: Brian 'redbeard' Harrington <redbeard@dead-city.org>
Date: Tue, 26 Mar 2024 17:13:50 -0700
Subject: [PATCH 3/7] bug: Remove extraneous configuration from RISC-V
@davidlt and @xypron pointed out prior changed to binutils 2.42 which
added support for RISC-V EFI objects. This reflects the upstream
preference to avoid adding additional architectures which are emitting
flat binary files via `objcopy` (i.e. `-O binary` architectures).
(cherry picked from commit 9f9813bcd29bf196cd2e92c0d05947fafaf32efe)
---
Make.defaults | 4 ----
1 file changed, 4 deletions(-)
diff --git a/Make.defaults b/Make.defaults
index 54a483d..17b53d8 100644
--- a/Make.defaults
+++ b/Make.defaults
@@ -101,10 +101,6 @@ ifeq ($(ARCH),riscv64)
ARCH_GNUEFI ?= riscv64
ARCH_SUFFIX ?= riscv64
ARCH_SUFFIX_UPPER ?= RISCV64
- FORMAT := -O binary
- SUBSYSTEM := 0xa
- ARCH_LDFLAGS += --defsym=EFI_SUBSYSTEM=$(SUBSYSTEM)
- TIMESTAMP_LOCATION := 72
endif
DEFINES = -DDEFAULT_LOADER='L"$(DEFAULT_LOADER)"' \
--
2.44.0