about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>2016-04-14 16:41:33 -0300
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2016-04-14 16:49:40 -0300
commit41e77f36d47526544a5ea6486d44ef188f1efc53 (patch)
tree67541a711ba82ee79c1a50f0b9e1339d08997a8d
parent186fe877f3df0b84d57dfbf0386f6332c6aa69bc (diff)
downloadglibc-41e77f36d47526544a5ea6486d44ef188f1efc53.tar.gz
glibc-41e77f36d47526544a5ea6486d44ef188f1efc53.tar.xz
glibc-41e77f36d47526544a5ea6486d44ef188f1efc53.zip
Fix pread consolidation on ports that require argument alignment
This patch fixes the __ALIGNMENT_{ARG,COUNT} definition for ports that
define __ASSUME_ALIGNED_REGISTER_PAIRS by including the kernel-features.h
(where it is defined if the case).

This was shown on arm with failing cases:

FAIL: debug/tst-chk1
FAIL: debug/tst-chk2
FAIL: debug/tst-chk3
FAIL: debug/tst-chk4
FAIL: debug/tst-chk5
FAIL: debug/tst-chk6
FAIL: debug/tst-lfschk1
FAIL: debug/tst-lfschk2
FAIL: debug/tst-lfschk3
FAIL: debug/tst-lfschk4
FAIL: debug/tst-lfschk5
FAIL: debug/tst-lfschk6
FAIL: posix/tst-preadwrite
FAIL: posix/tst-preadwrite64

The patches fixes it.  Tested on armhf.

	* sysdeps/unix/sysv/linux/sysdep.h: Include kernel-features.h.
-rw-r--r--ChangeLog4
-rw-r--r--sysdeps/unix/sysv/linux/sysdep.h1
2 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 3d3da39ed4..5d6b787329 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-04-14  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
+
+	* sysdeps/unix/sysv/linux/sysdep.h: Include kernel-features.h.
+
 2016-04-14  Florian Weimer  <fweimer@redhat.com>
 
 	* malloc/arena.c (__malloc_fork_lock_parent)
diff --git a/sysdeps/unix/sysv/linux/sysdep.h b/sysdeps/unix/sysv/linux/sysdep.h
index 4ac4c00893..f2d7e05975 100644
--- a/sysdeps/unix/sysv/linux/sysdep.h
+++ b/sysdeps/unix/sysv/linux/sysdep.h
@@ -16,6 +16,7 @@
    <http://www.gnu.org/licenses/>.  */
 
 #include <bits/wordsize.h>
+#include <kernel-features.h>
 
 /* Set error number and return -1.  A target may choose to return the
    internal function, __syscall_error, which sets errno and returns -1.