From patchwork Mon May 22 11:59:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zack Weinberg X-Patchwork-Id: 20529 Received: (qmail 49080 invoked by alias); 22 May 2017 11:59:30 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 47041 invoked by uid 89); 22 May 2017 11:59:28 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.1 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_SORBS_SPAM, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 spammy=thoroughly, inconvenience, reserved X-HELO: mailbackend.panix.com X-Gm-Message-State: AODbwcAOXMZAIpxiKVKzUgcPGoYBECxp6ouG8m46GL3ClwNv8gxdJb/v NwurLkAG2fQ+NnhjFo3WEgns4KnQ4g== X-Received: by 10.107.153.148 with SMTP id b142mr19981994ioe.200.1495454367574; Mon, 22 May 2017 04:59:27 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: References: <20170520231823.20924-1-zackw@panix.com> <20170520231823.20924-3-zackw@panix.com> From: Zack Weinberg Date: Mon, 22 May 2017 07:59:27 -0400 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH 2/6] Committed: Remove __need macros from signal.h. To: Joseph Myers Cc: GNU C Library I'm testing this patch now. It will take all day to test thoroughly. I apologize for the inconvenience. diff --git a/sysdeps/unix/sysv/linux/bits/siginfo-consts.h b/sysdeps/unix/sysv/linux/bits/siginfo-consts.h index a7a31bfe5f..525840cea1 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 +#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 1bb6da5264..bed69148f9 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 +#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 f824adb77a..8b5647062c 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 4292d7c9cd..cd3af7db06 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 92fe30f11e..9f79715ebe 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 013ad7187d..7d0c24c84b 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 6c85dbb6e8..7688a8d66d 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