summaryrefslogtreecommitdiff
path: root/gnu/packages/patches/glibc-bootstrap-arm-2.2.5.patch
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2022-12-13 13:10:26 +0200
committerEfraim Flashner <efraim@flashner.co.il>2022-12-14 10:59:04 +0200
commit6c1b6a6fc17843ccbb6479558b792b5651b20499 (patch)
tree1b887d5247880261f9d8e181c080a746e1274031 /gnu/packages/patches/glibc-bootstrap-arm-2.2.5.patch
parent19122da25de6808b5e9ddfb2785a0bec4b7cb3d4 (diff)
fixup glibc-mesboot0
(%current-system) evaluated too early
Diffstat (limited to 'gnu/packages/patches/glibc-bootstrap-arm-2.2.5.patch')
-rw-r--r--gnu/packages/patches/glibc-bootstrap-arm-2.2.5.patch17
1 files changed, 17 insertions, 0 deletions
diff --git a/gnu/packages/patches/glibc-bootstrap-arm-2.2.5.patch b/gnu/packages/patches/glibc-bootstrap-arm-2.2.5.patch
index e8b34a6166..2f4de348d3 100644
--- a/gnu/packages/patches/glibc-bootstrap-arm-2.2.5.patch
+++ b/gnu/packages/patches/glibc-bootstrap-arm-2.2.5.patch
@@ -877,6 +877,14 @@ diff --git a/sysdeps/unix/sysv/linux/arm/mmap.S b/sysdeps/unix/sysv/linux/arm/mm
index af93c7b..97b4a55 100644
--- a/sysdeps/unix/sysv/linux/arm/mmap.S
+++ b/sysdeps/unix/sysv/linux/arm/mmap.S
+@@ -21,6 +21,7 @@
+ .text
+
+ ENTRY (__mmap)
++#ifdef __NR_mmap
+
+ /* Because we can only get five args through the syscall interface, and
+ mmap() takes six, we need to build a parameter block and pass its
@@ -41,7 +41,14 @@ ENTRY (__mmap)
/* do the syscall */
@@ -892,6 +900,15 @@ index af93c7b..97b4a55 100644
/* pop args off the stack. */
add sp, sp, #16
+@@ -50,6 +59,7 @@ ENTRY (__mmap)
+ RETINSTR(movcc, pc, lr)
+ b PLTJMP(syscall_error);
+
++#endif
+ PSEUDO_END (__mmap)
+
+ weak_alias (__mmap, mmap)
+
diff --git a/sysdeps/unix/sysv/linux/arm/mmap64.S b/sysdeps/unix/sysv/linux/arm/mmap64.S
index 1f19bf0..8cb40f5 100644
--- a/sysdeps/unix/sysv/linux/arm/mmap64.S