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.25-362-g231a59c

From: zack at sourceware dot org
To: glibc-cvs at sourceware dot org
Date: 23 May 2017 02:32:11 -0000
Subject: GNU C Library master sources branch master updated. glibc-2.25-362-g231a59c
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  231a59ce2c5719d2d77752c21092960e28837b4a (commit)
      from  f1a67a2c78601599be51a17250ca02c7d830d79d (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=231a59ce2c5719d2d77752c21092960e28837b4a

commit 231a59ce2c5719d2d77752c21092960e28837b4a
Author: Zack Weinberg <zackw@panix.com>
Date:   Mon May 22 22:28:09 2017 -0400

    Fix a bug in 'Remove __need macros from signal.h' (a992f506)
    
    siginfo-arch.h is included in two different places, so the default
    definitions of the macros that it might or might not define need to
    be done conditionally afterward, not unconditionally beforehand.
    
    	* sysdeps/unix/sysv/linux/bits/siginfo-consts.h
    	(__SI_ASYNCIO_AFTER_SIGIO): Define default after including
    	bits/siginfo-arch.h, only if not already defined.
    	* sysdeps/unix/sysv/linux/bits/types/siginfo_t.h
    	(__SI_ALIGNMENT, __SI_BAND_TYPE, __SI_CLOCK_T)
    	(__SI_ERRNO_THEN_CODE, __SI_HAVE_SIGSYS, __SI_SEGFAULT_ADDL):
    	Likewise.
    
    	* sysdeps/unix/sysv/linux/ia64/bits/siginfo-arch.h
    	* sysdeps/unix/sysv/linux/mips/bits/siginfo-arch.h
    	* sysdeps/unix/sysv/linux/sparc/bits/siginfo-arch.h
    	* sysdeps/unix/sysv/linux/tile/bits/siginfo-arch.h
    	* sysdeps/unix/sysv/linux/x86/bits/siginfo-arch.h:
    	Unconditionally define __SI_* macros.

diff --git a/ChangeLog b/ChangeLog
index dde43e0..f432020 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2017-05-22  Zack Weinberg  <zackw@panix.com>
+
+	* sysdeps/unix/sysv/linux/bits/siginfo-consts.h
+	(__SI_ASYNCIO_AFTER_SIGIO): Define default after including
+	bits/siginfo-arch.h, only if not already defined.
+	* sysdeps/unix/sysv/linux/bits/types/siginfo_t.h
+	(__SI_ALIGNMENT, __SI_BAND_TYPE, __SI_CLOCK_T)
+	(__SI_ERRNO_THEN_CODE, __SI_HAVE_SIGSYS, __SI_SEGFAULT_ADDL):
+	Likewise.
+
+	* sysdeps/unix/sysv/linux/ia64/bits/siginfo-arch.h
+	* sysdeps/unix/sysv/linux/mips/bits/siginfo-arch.h
+	* sysdeps/unix/sysv/linux/sparc/bits/siginfo-arch.h
+	* sysdeps/unix/sysv/linux/tile/bits/siginfo-arch.h
+	* sysdeps/unix/sysv/linux/x86/bits/siginfo-arch.h:
+	Unconditionally define __SI_* macros.
+
 2017-05-22  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
 
 	[BZ #21393]
diff --git a/sysdeps/unix/sysv/linux/bits/siginfo-consts.h b/sysdeps/unix/sysv/linux/bits/siginfo-consts.h
index a7a31bf..525840c 100644
--- a/sysdeps/unix/sysv/linux/bits/siginfo-consts.h
+++ b/sysdeps/unix/sysv/linux/bits/siginfo-consts.h
@@ -25,8 +25,10 @@
 
 /* Most of these constants are uniform across all architectures, but there
    is one exception.  */
-#define __SI_ASYNCIO_AFTER_SIGIO 1
 #include <bits/siginfo-arch.h>
+#ifndef __SI_ASYNCIO_AFTER_SIGIO
+# define __SI_ASYNCIO_AFTER_SIGIO 1
+#endif
 
 /* Values for `si_code'.  Positive values are reserved for kernel-generated
    signals.  */
diff --git a/sysdeps/unix/sysv/linux/bits/types/siginfo_t.h b/sysdeps/unix/sysv/linux/bits/types/siginfo_t.h
index 1bb6da5..bed6914 100644
--- a/sysdeps/unix/sysv/linux/bits/types/siginfo_t.h
+++ b/sysdeps/unix/sysv/linux/bits/types/siginfo_t.h
@@ -13,13 +13,25 @@
 #endif
 
 /* Some fields of siginfo_t have architecture-specific variations.  */
-#define __SI_ALIGNMENT		/* nothing */
-#define __SI_BAND_TYPE		long int
-#define __SI_CLOCK_T		__clock_t
-#define __SI_ERRNO_THEN_CODE	1
-#define __SI_HAVE_SIGSYS	1
-#define __SI_SIGFAULT_ADDL	/* nothing */
 #include <bits/siginfo-arch.h>
+#ifndef __SI_ALIGNMENT
+# define __SI_ALIGNMENT		/* nothing */
+#endif
+#ifndef __SI_BAND_TYPE
+# define __SI_BAND_TYPE		long int
+#endif
+#ifndef __SI_CLOCK_T
+# define __SI_CLOCK_T		__clock_t
+#endif
+#ifndef __SI_ERRNO_THEN_CODE
+# define __SI_ERRNO_THEN_CODE	1
+#endif
+#ifndef __SI_HAVE_SIGSYS
+# define __SI_HAVE_SIGSYS	1
+#endif
+#ifndef __SI_SIGFAULT_ADDL
+# define __SI_SIGFAULT_ADDL	/* nothing */
+#endif
 
 typedef struct
   {
diff --git a/sysdeps/unix/sysv/linux/ia64/bits/siginfo-arch.h b/sysdeps/unix/sysv/linux/ia64/bits/siginfo-arch.h
index f824adb..8b56470 100644
--- a/sysdeps/unix/sysv/linux/ia64/bits/siginfo-arch.h
+++ b/sysdeps/unix/sysv/linux/ia64/bits/siginfo-arch.h
@@ -1,10 +1,8 @@
 /* Architecture-specific adjustments to siginfo_t.  ia64 version.  */
 #ifndef _BITS_SIGINFO_ARCH_H
 
-#undef __SI_HAVE_SIGSYS
 #define __SI_HAVE_SIGSYS 0
 
-#undef __SI_SIGFAULT_ADDL
 #define __SI_SIGFAULT_ADDL			\
   int _si_imm;					\
   unsigned int _si_flags;			\
diff --git a/sysdeps/unix/sysv/linux/mips/bits/siginfo-arch.h b/sysdeps/unix/sysv/linux/mips/bits/siginfo-arch.h
index 4292d7c..cd3af7d 100644
--- a/sysdeps/unix/sysv/linux/mips/bits/siginfo-arch.h
+++ b/sysdeps/unix/sysv/linux/mips/bits/siginfo-arch.h
@@ -4,12 +4,10 @@
 
 /* MIPS has the si_code and si_errno fields in the opposite order from
    all other architectures.  */
-#undef __SI_ERRNO_THEN_CODE
 #define __SI_ERRNO_THEN_CODE 0
 
 /* MIPS also has different values for SI_ASYNCIO, SI_MESGQ, and SI_TIMER
    than all other architectures.  */
-#undef __SI_ASYNCIO_AFTER_SIGIO
 #define __SI_ASYNCIO_AFTER_SIGIO 0
 
 #endif
diff --git a/sysdeps/unix/sysv/linux/sparc/bits/siginfo-arch.h b/sysdeps/unix/sysv/linux/sparc/bits/siginfo-arch.h
index 92fe30f..9f79715 100644
--- a/sysdeps/unix/sysv/linux/sparc/bits/siginfo-arch.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/siginfo-arch.h
@@ -2,10 +2,8 @@
 #ifndef _BITS_SIGINFO_ARCH_H
 #define _BITS_SIGINFO_ARCH_H 1
 
-#undef __SI_BAND_TYPE
 #define __SI_BAND_TYPE int
 
-#undef __SI_SIGFAULT_ADDL
 #define __SI_SIGFAULT_ADDL \
   int _si_trapno;
 
diff --git a/sysdeps/unix/sysv/linux/tile/bits/siginfo-arch.h b/sysdeps/unix/sysv/linux/tile/bits/siginfo-arch.h
index 013ad71..7d0c24c 100644
--- a/sysdeps/unix/sysv/linux/tile/bits/siginfo-arch.h
+++ b/sysdeps/unix/sysv/linux/tile/bits/siginfo-arch.h
@@ -2,7 +2,6 @@
 #ifndef _BITS_SIGINFO_ARCH_H
 #define _BITS_SIGINFO_ARCH_H 1
 
-#undef __SI_SIGFAULT_ADDL
 #define __SI_SIGFAULT_ADDL \
   int _si_trapno;
 
diff --git a/sysdeps/unix/sysv/linux/x86/bits/siginfo-arch.h b/sysdeps/unix/sysv/linux/x86/bits/siginfo-arch.h
index 6c85dbb..7688a8d 100644
--- a/sysdeps/unix/sysv/linux/x86/bits/siginfo-arch.h
+++ b/sysdeps/unix/sysv/linux/x86/bits/siginfo-arch.h
@@ -10,9 +10,7 @@
    attribute would be ignored if it were put in __SI_CLOCK_T instead
    of encapsulated in a typedef.  */
 typedef __clock_t __attribute__ ((__aligned__ (4))) __sigchld_clock_t;
-# undef  __SI_ALIGNMENT
 # define __SI_ALIGNMENT __attribute__ ((__aligned__ (8)))
-# undef  __SI_CLOCK_T
 # define __SI_CLOCK_T __sigchld_clock_t
 #endif
 

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

Summary of changes:
 ChangeLog                                         |   17 ++++++++++++++
 sysdeps/unix/sysv/linux/bits/siginfo-consts.h     |    4 ++-
 sysdeps/unix/sysv/linux/bits/types/siginfo_t.h    |   24 +++++++++++++++-----
 sysdeps/unix/sysv/linux/ia64/bits/siginfo-arch.h  |    2 -
 sysdeps/unix/sysv/linux/mips/bits/siginfo-arch.h  |    2 -
 sysdeps/unix/sysv/linux/sparc/bits/siginfo-arch.h |    2 -
 sysdeps/unix/sysv/linux/tile/bits/siginfo-arch.h  |    1 -
 sysdeps/unix/sysv/linux/x86/bits/siginfo-arch.h   |    2 -
 8 files changed, 38 insertions(+), 16 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]