diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/riscv/flush-icache.c | 6 |
3 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 8de81aa559..967050e2c9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2018-12-31 H.J. Lu <hongjiu.lu@intel.com> + + [BZ #24022] + * sysdeps/unix/sysv/linux/riscv/flush-icache.c: Check if + <asm/syscalls.h> exists with __has_include__ before including it. + 2019-01-02 Florian Weimer <fweimer@redhat.com> [BZ #24018] diff --git a/NEWS b/NEWS index 865c075c82..388ac09060 100644 --- a/NEWS +++ b/NEWS @@ -29,6 +29,7 @@ The following bugs are resolved with this release: [23927] Linux if_nametoindex() does not close descriptor (CVE-2018-19591) [23972] __old_getdents64 uses wrong d_off value on overflow [24018] gettext may return NULL + [24022] riscv may lack <asm/syscalls.h> [24027] malloc: Integer overflow in realloc Security related changes: diff --git a/sysdeps/unix/sysv/linux/riscv/flush-icache.c b/sysdeps/unix/sysv/linux/riscv/flush-icache.c index d612ef4c6c..0b2042620b 100644 --- a/sysdeps/unix/sysv/linux/riscv/flush-icache.c +++ b/sysdeps/unix/sysv/linux/riscv/flush-icache.c @@ -21,7 +21,11 @@ #include <stdlib.h> #include <atomic.h> #include <sys/cachectl.h> -#include <asm/syscalls.h> +#if __has_include__ (<asm/syscalls.h>) +# include <asm/syscalls.h> +#else +# include <asm/unistd.h> +#endif typedef int (*func_type) (void *, void *, unsigned long int); |