This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch master updated. glibc-2.24-360-g0a557c1


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, master has been updated
       via  0a557c105cad94758543e18b4834c15da2c39eb8 (commit)
      from  3e06601fedba07d837089daa5c71fe397d6c8389 (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=0a557c105cad94758543e18b4834c15da2c39eb8

commit 0a557c105cad94758543e18b4834c15da2c39eb8
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date:   Wed Nov 9 10:33:34 2016 -0200

    Fix sh4 build with __ASSUME_ST_INO_64_BIT redefinition
    
    Since 327792c sh4 builds fails with:
    
    ../sysdeps/unix/sysv/linux/kernel-features.h:49:0: error: "__ASSUME_ST_INO_64_BIT" redefined [-Werror]
     #define __ASSUME_ST_INO_64_BIT  1
     ^
    In file included from ../sysdeps/unix/sysv/linux/sysdep.h:19:0,
                     from ../sysdeps/unix/sysv/linux/sh/sysdep.h:24,
                     from ../sysdeps/unix/sysv/linux/sh/sh4/sysdep.h:4,
                     from <stdin>:1:
    ../sysdeps/unix/sysv/linux/sh/kernel-features.h:47:0: note: this is the location of the previous definition
     #define __ASSUME_ST_INO_64_BIT 0
    
    It is because sh4 kernel-features.sh is included multiple times
    without guards and this patch fixes by adding them.
    
    Tested on a sh4-linux-gnu build.
    
    	* sysdeps/unix/sysv/linux/sh/kernel-features.h: Add include
    	guards.

diff --git a/ChangeLog b/ChangeLog
index 4b93266..e2a8e0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2016-11-10  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
 
+	* sysdeps/unix/sysv/linux/sh/kernel-features.h: Add include
+	guards.
+
 	* sysdeps/unix/sysv/linux/access.c: New file.
 	* sysdeps/unix/sysv/linux/generic/access.c: Remove file.
 
diff --git a/sysdeps/unix/sysv/linux/sh/kernel-features.h b/sysdeps/unix/sysv/linux/sh/kernel-features.h
index ea4fdbc..d03aafa 100644
--- a/sysdeps/unix/sysv/linux/sh/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/sh/kernel-features.h
@@ -17,6 +17,9 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
+#ifndef __KERNEL_FEATURES_SH__
+# define __KERNEL_FEATURES_SH__
+
 /* SH uses socketcall.  */
 #define __ASSUME_SOCKETCALL		1
 
@@ -50,3 +53,5 @@
    the kernel interface for p{read,write}64 adds a dummy long argument
    before the offset.  */
 #define __ASSUME_PRW_DUMMY_ARG	1
+
+#endif

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

Summary of changes:
 ChangeLog                                    |    3 +++
 sysdeps/unix/sysv/linux/sh/kernel-features.h |    5 +++++
 2 files changed, 8 insertions(+), 0 deletions(-)


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


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]