diff options
| author | CoprDistGit <infra@openeuler.org> | 2024-08-05 02:16:15 +0000 |
|---|---|---|
| committer | CoprDistGit <infra@openeuler.org> | 2024-08-05 02:16:15 +0000 |
| commit | 64a1be29a5d22a92b1830144fedfdf8884a2b20d (patch) | |
| tree | 27f8b13b5d4fb5359c31c7c1ff60a9563cd8361d /0015-Fix-ARCH-on-ARMv6.patch | |
| parent | 453c495bceb89952108be7452da3d072d3336eab (diff) | |
automatic import of gnu-efiopeneuler24.03_LTS
Diffstat (limited to '0015-Fix-ARCH-on-ARMv6.patch')
| -rw-r--r-- | 0015-Fix-ARCH-on-ARMv6.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/0015-Fix-ARCH-on-ARMv6.patch b/0015-Fix-ARCH-on-ARMv6.patch new file mode 100644 index 0000000..6bbb80e --- /dev/null +++ b/0015-Fix-ARCH-on-ARMv6.patch @@ -0,0 +1,32 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ben Wolsieffer <benwolsieffer@gmail.com> +Date: Tue, 5 Nov 2019 00:09:12 -0500 +Subject: [PATCH] Fix ARCH on ARMv6. + +Extends the armv7 ARCH sed expression to work correctly on armv6. + +Signed-off-by: Ben Wolsieffer <benwolsieffer@gmail.com> +--- + Make.defaults | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Make.defaults b/Make.defaults +index ba743f17893..5695b2ac1ab 100755 +--- a/Make.defaults ++++ b/Make.defaults +@@ -62,12 +62,12 @@ OBJCOPY := $(prefix)$(CROSS_COMPILE)objcopy + + # Host/target identification + OS := $(shell uname -s) +-HOSTARCH ?= $(shell $(HOSTCC) -dumpmachine | cut -f1 -d- | sed -e s,i[3456789]86,ia32, -e 's,armv7.*,arm,' ) +-ARCH ?= $(shell $(HOSTCC) -dumpmachine | cut -f1 -d- | sed -e s,i[3456789]86,ia32, -e 's,armv7.*,arm,' ) ++HOSTARCH ?= $(shell $(HOSTCC) -dumpmachine | cut -f1 -d- | sed -e s,i[3456789]86,ia32, -e 's,armv[67].*,arm,' ) ++ARCH ?= $(shell $(HOSTCC) -dumpmachine | cut -f1 -d- | sed -e s,i[3456789]86,ia32, -e 's,armv[67].*,arm,' ) + + # Get ARCH from the compiler if cross compiling + ifneq ($(CROSS_COMPILE),) +- override ARCH := $(shell $(CC) -dumpmachine | cut -f1 -d-| sed -e s,i[3456789]86,ia32, -e 's,armv7.*,arm,' ) ++ override ARCH := $(shell $(CC) -dumpmachine | cut -f1 -d-| sed -e s,i[3456789]86,ia32, -e 's,armv[67].*,arm,' ) + endif + + # FreeBSD (and possibly others) reports amd64 instead of x86_64 |