[PATCH 0/3] aarch64 related fixes and cleanups

[Jan Kiszka]

Primarily fixes the binary name on aarch64 but also clean ups a few
buildsystem aspects along that.

Jan

Jan Kiszka (3):
configure: Fix aarch64 EFI arch
configure: Match arch without wildcards
Drop redundant include

Makefile.am | 1 -
configure.ac | 12 ++++++------
2 files changed, 6 insertions(+), 7 deletions(-)

--
2.34.1

[Jan Kiszka]

From: Jan Kiszka <jan.k...@siemens.com>

The include under $ARCH is what we want an need. See also systemd-boot.

Signed-off-by: Jan Kiszka <jan.k...@siemens.com>
---
Makefile.am | 1 -
1 file changed, 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 9eb1263..591f5b5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -172,7 +172,6 @@ efi_cppflags = \
-I$(GNUEFI_SYS_DIR)/usr/include \
-I$(GNUEFI_INC_DIR) \
-I$(GNUEFI_INC_DIR)/$(ARCH) \
- -I$(GNUEFI_INC_DIR)/$(MACHINE_TYPE_NAME) \
$(LIBPCI_CFLAGS)

efi_cflags = \
--
2.34.1

[Jan Kiszka]

From: Jan Kiszka <jan.k...@siemens.com>

For x86_64 and aarch64, we rely on ARCH having no suffix anyway. So,
avoid confusion of the reader by matching on the full arch string.

Signed-off-by: Jan Kiszka <jan.k...@siemens.com>
---

configure.ac | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 09d06d7..31340ae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -82,11 +82,11 @@ AC_SUBST(GNUEFI_LIB_DIR)
AC_DEFINE_UNQUOTED(GNUEFI_LIB_DIR, ["$GNUEFI_LIB_DIR"], [The lib directory for gnuefi])

dnl Define ARCH_<NAME> conditionals
-SET_ARCH(I586, i586*)
-SET_ARCH(I686, i686*)
-SET_ARCH(X86_64, x86_64*)
-SET_ARCH(IA64, ia64*)
-SET_ARCH(AARCH64, aarch64*)
+SET_ARCH(I586, i586)
+SET_ARCH(I686, i686)
+SET_ARCH(X86_64, x86_64)
+SET_ARCH(IA64, ia64)
+SET_ARCH(AARCH64, aarch64)

ARCH=$(echo $host | sed "s/\(-\).*$//")

--
2.34.1

[Jan Kiszka]

From: Jan Kiszka <jan.k...@siemens.com>

It's aa64 here according to the UEFI spec.

Signed-off-by: Jan Kiszka <jan.k...@siemens.com>
---

configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index a1a83e9..09d06d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -102,7 +102,7 @@ AM_COND_IF(ARCH_X86_64, [
MACHINE_TYPE_NAME=x64])

AM_COND_IF(ARCH_AARCH64, [
- MACHINE_TYPE_NAME=aarch64])
+ MACHINE_TYPE_NAME=aa64])

AC_SUBST([ARCH])
AC_SUBST([MACHINE_TYPE_NAME])
--
2.34.1

[Jan Kiszka]

This one was pre-coffee non-sense: The suffix cut-off happens after the
match and has no impact on it. I'm dropping this patch.

Jan

--
Siemens AG, Technology
Competence Center Embedded Linux