|
 |
6c0556 |
This patch is a downstream-only variant of this upstream commit:
|
|
|
6c0556 |
|
|
|
6c0556 |
commit 45b1e17e9150dbd9ac2d578579063fbfa8e1b327
|
|
|
6c0556 |
Author: Szabolcs Nagy <szabolcs.nagy@arm.com>
|
|
|
6c0556 |
Date: Thu Dec 17 10:03:05 2020 +0000
|
|
|
6c0556 |
|
|
|
6c0556 |
aarch64: use PTR_ARG and SIZE_ARG instead of DELOUSE
|
|
|
6c0556 |
|
|
|
6c0556 |
DELOUSE was added to asm code to make them compatible with non-LP64
|
|
|
6c0556 |
ABIs, but it is an unfortunate name and the code was not compatible
|
|
|
6c0556 |
with ABIs where pointer and size_t are different. Glibc currently
|
|
|
6c0556 |
only supports the LP64 ABI so these macros are not really needed or
|
|
|
6c0556 |
tested, but for now the name is changed to be more meaningful instead
|
|
|
6c0556 |
of removing them completely.
|
|
|
6c0556 |
|
|
|
6c0556 |
Some DELOUSE macros were dropped: clone, strlen and strnlen used it
|
|
|
6c0556 |
unnecessarily.
|
|
|
6c0556 |
|
|
|
6c0556 |
The out of tree ILP32 patches are currently not maintained and will
|
|
|
6c0556 |
likely need a rework to rebase them on top of the time64 changes.
|
|
|
6c0556 |
|
|
|
6c0556 |
Keeping the DELOUSE macro avoids the need to update all string
|
|
|
6c0556 |
functions. Lack of BTI markers and architecture variants cause many
|
|
|
6c0556 |
conflicts in a full upstream backport.
|
|
|
6c0556 |
|
|
|
6c0556 |
diff --git a/sysdeps/aarch64/sysdep.h b/sysdeps/aarch64/sysdep.h
|
|
|
6c0556 |
index 5b30709436d3acea..1bcf15d4f18586ba 100644
|
|
|
6c0556 |
--- a/sysdeps/aarch64/sysdep.h
|
|
|
6c0556 |
+++ b/sysdeps/aarch64/sysdep.h
|
|
|
6c0556 |
@@ -32,6 +32,8 @@
|
|
|
6c0556 |
# define PTR_LOG_SIZE 2
|
|
|
6c0556 |
# define DELOUSE(n) mov w##n, w##n
|
|
|
6c0556 |
#endif
|
|
|
6c0556 |
+#define PTR_ARG(n) DELOUSE(n)
|
|
|
6c0556 |
+#define SIZE_ARG(n) DELOUSE(n)
|
|
|
6c0556 |
|
|
|
6c0556 |
#define PTR_SIZE (1<
|
|
|
6c0556 |
|