GNU C Library master sources branch release/2.28/master updated. glibc-2.28-67-gbe62bbb

[fw at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, release/2.28/master has been updated
       via  be62bbb621fae189f449f522512093b034cd2640 (commit)
      from  bee4baf6d7a1055f7e2819209e722c6effc9c1bf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=be62bbb621fae189f449f522512093b034cd2640

commit be62bbb621fae189f449f522512093b034cd2640
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Thu Jan 3 14:13:32 2019 +0100

    riscv: Use __has_include__ to include <asm/syscalls.h> [BZ #24022]
    
    <asm/syscalls.h> has been removed by
    
    commit 27f8899d6002e11a6e2d995e29b8deab5aa9cc25
    Author: David Abdurachmanov <david.abdurachmanov@gmail.com>
    Date:   Thu Nov 8 20:02:39 2018 +0100
    
        riscv: add asm/unistd.h UAPI header
    
        Marcin Juszkiewicz reported issues while generating syscall table for riscv
        using 4.20-rc1. The patch refactors our unistd.h files to match some other
        architectures.
    
        - Add asm/unistd.h UAPI header, which has __ARCH_WANT_NEW_STAT only for 64-bit
        - Remove asm/syscalls.h UAPI header and merge to asm/unistd.h
        - Adjust kernel asm/unistd.h
    
        So now asm/unistd.h UAPI header should show all syscalls for riscv.
    
    <asm/syscalls.h> may be restored by
    
    Subject: [PATCH] riscv: restore asm/syscalls.h UAPI header
    Date: Tue, 11 Dec 2018 09:09:35 +0100
    
    UAPI header asm/syscalls.h was merged into UAPI asm/unistd.h header,
    which did resolve issue with missing syscalls macros resulting in
    glibc (2.28) build failure. It also broke glibc in a different way:
    asm/syscalls.h is being used by glibc. I noticed this while doing
    Fedora 30/Rawhide mass rebuild.
    
    The patch returns asm/syscalls.h header and incl. it into asm/unistd.h.
    I plan to send a patch to glibc to use asm/unistd.h instead of
    asm/syscalls.h
    
    In the meantime, we use __has_include__, which was added to GCC 5, to
    check if <asm/syscalls.h> exists before including it.  Tested with
    build-many-glibcs.py for riscv against kernel 4.19.12 and 4.20-rc7.
    
    	[BZ #24022]
    	* sysdeps/unix/sysv/linux/riscv/flush-icache.c: Check if
    	<asm/syscalls.h> exists with __has_include__ before including it.
    
    (cherry picked from commit 0b9c84906f653978fb8768c7ebd0ee14a47e662e)

diff --git a/ChangeLog b/ChangeLog
index 8de81aa..967050e 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 865c075..388ac09 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 d612ef4..0b20426 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);
 

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                                    |    6 ++++++
 NEWS                                         |    1 +
 sysdeps/unix/sysv/linux/riscv/flush-icache.c |    6 +++++-
 3 files changed, 12 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources