mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-25 20:21:07 +00:00
41e77f36d4
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.
50 lines
1.8 KiB
C
50 lines
1.8 KiB
C
/* Copyright (C) 2015-2016 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<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.
|
|
We use -1l, instead of -1, so that it can be casted to (void *). */
|
|
#define INLINE_SYSCALL_ERROR_RETURN_VALUE(err) \
|
|
({ \
|
|
__set_errno (err); \
|
|
-1l; \
|
|
})
|
|
|
|
/* Provide a dummy argument that can be used to force register
|
|
alignment for register pairs if required by the syscall ABI. */
|
|
#ifdef __ASSUME_ALIGNED_REGISTER_PAIRS
|
|
#define __ALIGNMENT_ARG 0,
|
|
#define __ALIGNMENT_COUNT(a,b) b
|
|
#else
|
|
#define __ALIGNMENT_ARG
|
|
#define __ALIGNMENT_COUNT(a,b) a
|
|
#endif
|
|
|
|
/* Provide a common macro to pass 64-bit value on syscalls. */
|
|
#if __WORDSIZE == 64 || defined __ASSUME_WORDSIZE64_ILP32
|
|
# define SYSCALL_LL(val) (val)
|
|
# define SYSCALL_LL64(val) (val)
|
|
#else
|
|
#define SYSCALL_LL(val) \
|
|
__LONG_LONG_PAIR ((val) >> 31, (val))
|
|
#define SYSCALL_LL64(val) \
|
|
__LONG_LONG_PAIR ((long) ((val) >> 32), (long) ((val) & 0xffffffff))
|
|
#endif
|