31 lines
818 B
Diff
31 lines
818 B
Diff
|
From d5b72b322d5b7c6c115833c518e1aa5798076309 Mon Sep 17 00:00:00 2001
|
||
|
|
From: dann frazier <dann.frazier@canonical.com>
|
||
|
|
Date: Mon, 14 Jan 2019 15:25:11 -0700
|
||
|
|
Subject: [PATCH 16/62] Fix apparent typo in ARM 32-on-64 code
|
||
|
|
|
||
|
|
The architecture is aarch64, not arch64.
|
||
|
|
|
||
|
|
Fixes: 750584c20775 ("Make 64-on-32 maybe work on x86_64.")
|
||
|
|
Signed-off-by: dann frazier <dann.frazier@canonical.com>
|
||
|
|
Upstream-commit-id: e9f67aaa75a
|
||
|
|
---
|
||
|
|
shim.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/shim.c b/shim.c
|
||
|
|
index d980cadacfc..e4d4fea226d 100644
|
||
|
|
--- a/shim.c
|
||
|
|
+++ b/shim.c
|
||
|
|
@@ -150,7 +150,7 @@ allow_32_bit(void)
|
||
|
|
#endif
|
||
|
|
#elif defined(__i386__) || defined(__i686__)
|
||
|
|
return 1;
|
||
|
|
-#elif defined(__arch64__)
|
||
|
|
+#elif defined(__aarch64__)
|
||
|
|
return 0;
|
||
|
|
#else /* assuming everything else is 32-bit... */
|
||
|
|
return 1;
|
||
|
|
--
|
||
|
|
2.26.2
|
||
|
|
|