From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 10051 invoked by alias); 16 May 2019 18:42:41 -0000 Mailing-List: contact glibc-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: , Sender: glibc-cvs-owner@sourceware.org List-Subscribe: Received: (qmail 10027 invoked by uid 9014); 16 May 2019 18:42:41 -0000 Date: Thu, 16 May 2019 18:42:00 -0000 Message-ID: <20190516184241.10026.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Zack Weinberg To: glibc-cvs@sourceware.org Subject: [glibc/zack/no-nested-includes] Split up endian.h to minimize exposure of BYTE_ORDER. X-Act-Checkin: glibc X-Git-Author: Zack Weinberg X-Git-Refname: refs/heads/zack/no-nested-includes X-Git-Oldrev: fdedb484e4e5f86fafb77e143e05857db78de071 X-Git-Newrev: be2515491a6ebd9c43974594eb4913ec0a3d6dec X-SW-Source: 2019-q2/txt/msg00166.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=be2515491a6ebd9c43974594eb4913ec0a3d6dec commit be2515491a6ebd9c43974594eb4913ec0a3d6dec Author: Zack Weinberg Date: Fri Mar 15 09:02:24 2019 -0400 Split up endian.h to minimize exposure of BYTE_ORDER. With only two exceptions (sys/types.h and sys/param.h, both of which historically might have defined BYTE_ORDER) the public headers that include only want to be able to test __BYTE_ORDER against __*_ENDIAN. This patch creates a new bits/endian.h that can be included by any header that wants to be able to test __BYTE_ORDER and/or __FLOAT_WORD_ORDER against the __*_ENDIAN constants, or needs __LONG_LONG_PAIR. It only defines macros in the implementation namespace. The existing bits/endian.h (which could not be included independently of endian.h, and only defines __BYTE_ORDER and maybe __FLOAT_WORD_ORDER) is renamed to bits/endianness.h. I also took the opportunity to canonicalize the form of this header, which we are stuck with having one copy of per architecture. Since they are so short, this means git doesn’t understand that they were renamed from existing headers, sigh. endian.h itself is a nonstandard header and its only remaining use from a standard header is guarded by __USE_MISC, so I dropped the __USE_MISC conditionals from around all of the public-namespace things it defines. (This means, an application that requests strict library conformance but includes endian.h will still see the definition of BYTE_ORDER.) A few changes to specific bits/endian(ness).h variants deserve mention: - sysdeps/unix/sysv/linux/ia64/bits/endian.h is moved to sysdeps/ia64/bits/endianness.h. If I remember correctly, ia64 did have selectable endianness, but we have assembly code in sysdeps/ia64 that assumes it’s little-endian, so there is no reason to treat the ia64 endianness.h as linux-specific. - The C-SKY port does not fully support big-endian mode, but I do not think this is sufficient reason to make csky/bits/endian(ness).h error out if __CSKYBE__ is defined, so it now defines __BYTE_ORDER appropriately for whichever mode the compiler is in. - The PowerPC port had extra logic in its bits/endian.h to detect a broken compiler, which strikes me as unnecessary, so I removed it. - The only files that defined __FLOAT_WORD_ORDER always defined it to the same value as __BYTE_ORDER, so I removed those definitions. The SH bits/endian(ness).h had comments inconsistent with the actual setting of __FLOAT_WORD_ORDER, which I also removed. - I *removed* copyright boilerplate from the few bits/endian(ness).h headers that had it; these files record a single fact in a fashion dictated by an external spec, so I do not think they are copyrightable. As long as I was changing every copy of ieee754.h in the tree, I noticed that only the MIPS variant includes float.h, so I removed that as well. * string/endian.h: Unconditionally define LITTLE_ENDIAN, BIG_ENDIAN, PDP_ENDIAN, and BYTE_ORDER. Condition byteswapping macros only on !__ASSEMBLER__. Move the definitions of __BIG_ENDIAN, __LITTLE_ENDIAN, __PDP_ENDIAN, __FLOAT_WORD_ORDER, and __LONG_LONG_PAIR to... * string/bits/endian.h: ...this new file, which includes the renamed header bits/endianness.h for the definition of __BYTE_ORDER and possibly __FLOAT_WORD_ORDER. * string/Makefile: Install bits/endianness.h. * include/bits/endian.h: New wrapper. * bits/endian.h: Rename to bits/endianness.h. Add multiple-include guard. Rewrite the comment explaining what the machine-specific variants of this file should do. * sysdeps/unix/sysv/linux/ia64/bits/endian.h: Move to sysdeps/ia64. * sysdeps/aarch64/bits/endian.h * sysdeps/alpha/bits/endian.h * sysdeps/arm/bits/endian.h * sysdeps/csky/bits/endian.h * sysdeps/hppa/bits/endian.h * sysdeps/ia64/bits/endian.h * sysdeps/m68k/bits/endian.h * sysdeps/microblaze/bits/endian.h * sysdeps/mips/bits/endian.h * sysdeps/nios2/bits/endian.h * sysdeps/powerpc/bits/endian.h * sysdeps/riscv/bits/endian.h * sysdeps/s390/bits/endian.h * sysdeps/sh/bits/endian.h * sysdeps/sparc/bits/endian.h * sysdeps/x86/bits/endian.h: Rename to endianness.h; canonicalize form of file; remove redundant definitions of __FLOAT_WORD_ORDER. * sysdeps/csky/bits/endianness.h: Do not error out if __CSKYEB__ is defined. * sysdeps/powerpc/bits/endianness.h: Remove logic to check for broken compilers. * ctype/ctype.h * inet/netinet/in.h * resolv/arpa/nameser_compat.h * sysdeps/aarch64/nptl/bits/pthreadtypes-arch.h * sysdeps/arm/nptl/bits/pthreadtypes-arch.h * sysdeps/csky/nptl/bits/pthreadtypes-arch.h * sysdeps/ia64/ieee754.h * sysdeps/ieee754/ieee754.h * sysdeps/ieee754/ldbl-128/ieee754.h * sysdeps/ieee754/ldbl-128ibm/ieee754.h * sysdeps/m68k/nptl/bits/pthreadtypes-arch.h * sysdeps/microblaze/nptl/bits/pthreadtypes-arch.h * sysdeps/mips/ieee754/ieee754.h * sysdeps/mips/nptl/bits/pthreadtypes-arch.h * sysdeps/nios2/nptl/bits/pthreadtypes-arch.h * sysdeps/nptl/pthread.h * sysdeps/riscv/nptl/bits/pthreadtypes-arch.h * sysdeps/sh/nptl/bits/pthreadtypes-arch.h * sysdeps/sparc/sparc32/ieee754.h * sysdeps/unix/sysv/linux/generic/bits/stat.h * sysdeps/unix/sysv/linux/generic/bits/statfs.h * sysdeps/unix/sysv/linux/sys/acct.h * wctype/bits/wctype-wchar.h: Include bits/endian.h, not endian.h. * sysdeps/unix/sysv/linux/hppa/pthread.h: Don’t include endian.h. * sysdeps/mips/ieee754/ieee754.h: Don’t include float.h. * scripts/check-obsolete-constructs.h: Remove most of the whitelist entries for endian.h and float.h. Diff: --- bits/endian.h | 13 ------- bits/endianness.h | 17 +++++++++ ctype/ctype.h | 2 +- include/bits/endian.h | 1 + inet/netinet/in.h | 2 +- resolv/arpa/nameser_compat.h | 2 +- scripts/check-obsolete-constructs.py | 14 ++----- string/Makefile | 3 +- string/bits/endian.h | 48 ++++++++++++++++++++++++ string/endian.h | 39 +++---------------- sysdeps/aarch64/bits/endian.h | 30 --------------- sysdeps/aarch64/bits/endianness.h | 15 ++++++++ sysdeps/aarch64/nptl/bits/pthreadtypes-arch.h | 2 +- sysdeps/alpha/bits/endian.h | 7 ---- sysdeps/alpha/bits/endianness.h | 11 ++++++ sysdeps/arm/bits/endian.h | 10 ----- sysdeps/arm/bits/endianness.h | 15 ++++++++ sysdeps/arm/nptl/bits/pthreadtypes-arch.h | 2 +- sysdeps/csky/bits/endian.h | 9 ----- sysdeps/csky/bits/endianness.h | 15 ++++++++ sysdeps/csky/nptl/bits/pthreadtypes-arch.h | 2 +- sysdeps/hppa/bits/endian.h | 7 ---- sysdeps/hppa/bits/endianness.h | 11 ++++++ sysdeps/ia64/bits/endianness.h | 11 ++++++ sysdeps/ia64/ieee754.h | 4 +- sysdeps/ieee754/ieee754.h | 4 +- sysdeps/ieee754/ldbl-128/ieee754.h | 4 +- sysdeps/ieee754/ldbl-128ibm/ieee754.h | 4 +- sysdeps/m68k/bits/endian.h | 7 ---- sysdeps/m68k/bits/endianness.h | 11 ++++++ sysdeps/m68k/nptl/bits/pthreadtypes-arch.h | 2 +- sysdeps/microblaze/bits/endian.h | 30 --------------- sysdeps/microblaze/bits/endianness.h | 15 ++++++++ sysdeps/microblaze/nptl/bits/pthreadtypes-arch.h | 2 +- sysdeps/mips/bits/endian.h | 15 -------- sysdeps/mips/bits/endianness.h | 16 ++++++++ sysdeps/mips/ieee754/ieee754.h | 6 +-- sysdeps/mips/nptl/bits/pthreadtypes-arch.h | 2 +- sysdeps/nios2/bits/endian.h | 12 ------ sysdeps/nios2/bits/endianness.h | 16 ++++++++ sysdeps/nios2/nptl/bits/pthreadtypes-arch.h | 2 +- sysdeps/nptl/pthread.h | 2 +- sysdeps/powerpc/bits/endian.h | 36 ------------------ sysdeps/powerpc/bits/endianness.h | 16 ++++++++ sysdeps/riscv/bits/endian.h | 5 --- sysdeps/riscv/bits/endianness.h | 11 ++++++ sysdeps/riscv/nptl/bits/pthreadtypes-arch.h | 2 +- sysdeps/s390/bits/endian.h | 7 ---- sysdeps/s390/bits/endianness.h | 11 ++++++ sysdeps/sh/bits/endian.h | 13 ------- sysdeps/sh/bits/endianness.h | 15 ++++++++ sysdeps/sh/nptl/bits/pthreadtypes-arch.h | 2 +- sysdeps/sparc/bits/{endian.h => endianness.h} | 12 ++++-- sysdeps/sparc/sparc32/ieee754.h | 4 +- sysdeps/unix/sysv/linux/generic/bits/stat.h | 2 +- sysdeps/unix/sysv/linux/generic/bits/statfs.h | 2 +- sysdeps/unix/sysv/linux/hppa/pthread.h | 1 - sysdeps/unix/sysv/linux/ia64/bits/endian.h | 7 ---- sysdeps/unix/sysv/linux/powerpc/htm.h | 2 +- sysdeps/unix/sysv/linux/sys/acct.h | 2 +- sysdeps/x86/bits/endian.h | 7 ---- sysdeps/x86/bits/endianness.h | 11 ++++++ wctype/bits/wctype-wchar.h | 2 +- 63 files changed, 315 insertions(+), 297 deletions(-) diff --git a/bits/endian.h b/bits/endian.h deleted file mode 100644 index 45afd4a..0000000 --- a/bits/endian.h +++ /dev/null @@ -1,13 +0,0 @@ -/* This file should define __BYTE_ORDER as appropriate for the machine - in question. See string/endian.h for how to define it. - - If only the stub bits/endian.h applies to a particular configuration, - bytesex.h is generated by running a program on the host machine. - So if cross-compiling to a machine with a different byte order, - the bits/endian.h file for that machine must exist. */ - -#ifndef _ENDIAN_H -# error "Never use directly; include instead." -#endif - -#error Machine byte order unknown. diff --git a/bits/endianness.h b/bits/endianness.h new file mode 100644 index 0000000..b83040d --- /dev/null +++ b/bits/endianness.h @@ -0,0 +1,17 @@ +/* This file must be overridden for each supported CPU architecture. + It should define __BYTE_ORDER to one of the constants defined in + string/bits/endian.h, as appropriate for the machine in + question. If floating-point quantities are not stored in the + same byte order as integer quantities, it should also define + __FLOAT_WORD_ORDER as appropriate. */ + +#ifndef _BITS_ENDIANNESS_H +#define _BITS_ENDIANNESS_H 1 + +#ifndef _BITS_ENDIAN_H +# error "Never use directly; include instead." +#endif + +#error "Machine byte order unknown." + +#endif /* bits/endianness.h */ diff --git a/ctype/ctype.h b/ctype/ctype.h index 78a455e..3d070d7 100644 --- a/ctype/ctype.h +++ b/ctype/ctype.h @@ -36,7 +36,7 @@ __BEGIN_DECLS endian). We define the bit value interpretations here dependent on the machine's byte order. */ -# include +# include # if __BYTE_ORDER == __BIG_ENDIAN # define _ISbit(bit) (1 << (bit)) # else /* __BYTE_ORDER == __LITTLE_ENDIAN */ diff --git a/include/bits/endian.h b/include/bits/endian.h new file mode 100644 index 0000000..ad614f1 --- /dev/null +++ b/include/bits/endian.h @@ -0,0 +1 @@ +#include diff --git a/inet/netinet/in.h b/inet/netinet/in.h index be87de6..da2dc0d 100644 --- a/inet/netinet/in.h +++ b/inet/netinet/in.h @@ -379,9 +379,9 @@ extern uint32_t htonl (uint32_t __hostlong) extern uint16_t htons (uint16_t __hostshort) __THROW __attribute__ ((__const__)); -#include /* Get machine dependent optimized versions of byte swapping functions. */ +#include #include #include diff --git a/resolv/arpa/nameser_compat.h b/resolv/arpa/nameser_compat.h index f1c390f..37c178b 100644 --- a/resolv/arpa/nameser_compat.h +++ b/resolv/arpa/nameser_compat.h @@ -29,7 +29,7 @@ #ifndef _ARPA_NAMESER_COMPAT_ #define _ARPA_NAMESER_COMPAT_ -#include +#include /*% * Structure for query header. The order of the fields is machine- and diff --git a/scripts/check-obsolete-constructs.py b/scripts/check-obsolete-constructs.py index 3edb1af..ad23458 100755 --- a/scripts/check-obsolete-constructs.py +++ b/scripts/check-obsolete-constructs.py @@ -511,7 +511,6 @@ HEADER_ALLOWED_INCLUDES = { # mandated: inttypes.h -> stdint.h # tgmath.h -> complex.h, math.h # threads.h -> time.h - "ctype.h": [ "endian.h" ], "inttypes.h": [ "stdint.h" ], "signal.h": [ "sys/ucontext.h" ], "stdlib.h": [ "alloca.h", "sys/types.h" ], @@ -531,8 +530,7 @@ HEADER_ALLOWED_INCLUDES = { "langinfo.h": [ "nl_types.h" ], "mqueue.h": [ "fcntl.h", "sys/types.h" ], "poll.h": [ "sys/poll.h" ], - "pthread.h": [ "endian.h", "sched.h", "time.h", - "sys/cdefs.h" ], + "pthread.h": [ "sched.h", "time.h", "sys/cdefs.h" ], "regex.h": [ "limits.h", "sys/types.h" ], "sched.h": [ "time.h" ], "semaphore.h": [ "sys/types.h" ], @@ -561,7 +559,7 @@ HEADER_ALLOWED_INCLUDES = { "netdb.h": [ "netinet/in.h", "rpc/netdb.h" ], "arpa/inet.h": [ "netinet/in.h" ], "net/if.h": [ "sys/socket.h", "sys/types.h" ], - "netinet/in.h": [ "endian.h", "sys/socket.h" ], + "netinet/in.h": [ "sys/socket.h" ], "netinet/tcp.h": [ "stdint.h", "sys/socket.h", "sys/types.h" ], @@ -576,7 +574,6 @@ HEADER_ALLOWED_INCLUDES = { "fpregdef.h": [ "sys/fpregdef.h" ], "fts.h": [ "sys/types.h" ], "gshadow.h": [ "paths.h" ], - "ieee754.h": [ "endian.h", "float.h" ], "lastlog.h": [ "utmp.h" ], "libintl.h": [ "locale.h" ], "link.h": [ "dlfcn.h", "elf.h", "sys/types.h" ], @@ -603,7 +600,7 @@ HEADER_ALLOWED_INCLUDES = { "wait.h": [ "sys/wait.h" ], # Nonstandardized sys/ headers - "sys/acct.h": [ "endian.h", "stdint.h", "sys/types.h" ], + "sys/acct.h": [ "stdint.h", "sys/types.h" ], "sys/auxv.h": [ "elf.h", "sys/cdefs.h" ], "sys/bitypes.h": [ "sys/types.h" ], "sys/dir.h": [ "dirent.h" ], @@ -652,7 +649,6 @@ HEADER_ALLOWED_INCLUDES = { "arpa/nameser.h": [ "arpa/nameser_compat.h", "stdint.h", "sys/param.h", "sys/types.h" ], - "arpa/nameser_compat.h": [ "endian.h" ], "net/ethernet.h": [ "stdint.h", "sys/types.h", "sys/cdefs.h", "net/if_ether.h" ], "net/if_arp.h": [ "stdint.h", "sys/socket.h", @@ -695,15 +691,11 @@ HEADER_ALLOWED_INCLUDES = { "bits/fcntl.h": [ "sys/types.h" ], "bits/ipc.h": [ "sys/types.h" ], "bits/procfs.h": [ "signal.h", "sys/ucontext.h" ], - "bits/pthreadtypes-arch.h": [ "endian.h" ], "bits/sem.h": [ "sys/types.h" ], "bits/socket.h": [ "sys/types.h" ], - "bits/stat.h": [ "endian.h" ], - "bits/statfs.h": [ "endian.h" ], "bits/types/res_state.h": [ "netinet/in.h", "sys/types.h" ], "bits/utmp.h": [ "paths.h", "sys/time.h", "sys/types.h" ], "bits/utmpx.h": [ "paths.h", "sys/time.h" ], - "bits/wctype-wchar.h": [ "endian.h" ], } # As above, but each group of whitelist entries is only used for diff --git a/string/Makefile b/string/Makefile index 38b26a0..3e5721e 100644 --- a/string/Makefile +++ b/string/Makefile @@ -25,7 +25,8 @@ include ../Makeconfig headers := string.h bits/string_fortified.h \ strings.h bits/strings_fortified.h \ byteswap.h bits/byteswap.h \ - endian.h bits/endian.h bits/uintn-identity.h \ + endian.h bits/endian.h bits/endianness.h \ + bits/uintn-identity.h \ memory.h argz.h envz.h routines := strcat strchr strcmp strcoll strcpy strcspn \ diff --git a/string/bits/endian.h b/string/bits/endian.h new file mode 100644 index 0000000..ed2ee57 --- /dev/null +++ b/string/bits/endian.h @@ -0,0 +1,48 @@ +/* Copyright (C) 1992-2019 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#ifndef _BITS_ENDIAN_H +#define _BITS_ENDIAN_H 1 + +/* Definitions for byte order, according to significance of bytes, + from low addresses to high addresses. The value is what you get by + putting '4' in the most significant byte, '3' in the second most + significant byte, '2' in the second least significant byte, and '1' + in the least significant byte, and then writing down one digit for + each byte, starting with the byte at the lowest address at the left, + and proceeding to the byte with the highest address at the right. */ + +#define __LITTLE_ENDIAN 1234 +#define __BIG_ENDIAN 4321 +#define __PDP_ENDIAN 3412 + +/* This file defines `__BYTE_ORDER' for the particular machine. */ +#include + +/* Some machines may need to use a different endianness for floating point + values. */ +#ifndef __FLOAT_WORD_ORDER +# define __FLOAT_WORD_ORDER __BYTE_ORDER +#endif + +#if __BYTE_ORDER == __LITTLE_ENDIAN +# define __LONG_LONG_PAIR(HI, LO) LO, HI +#elif __BYTE_ORDER == __BIG_ENDIAN +# define __LONG_LONG_PAIR(HI, LO) HI, LO +#endif + +#endif /* bits/endian.h */ diff --git a/string/endian.h b/string/endian.h index e62b735..9d6b10c 100644 --- a/string/endian.h +++ b/string/endian.h @@ -20,42 +20,15 @@ #include -/* Definitions for byte order, according to significance of bytes, - from low addresses to high addresses. The value is what you get by - putting '4' in the most significant byte, '3' in the second most - significant byte, '2' in the second least significant byte, and '1' - in the least significant byte, and then writing down one digit for - each byte, starting with the byte at the lowest address at the left, - and proceeding to the byte with the highest address at the right. */ - -#define __LITTLE_ENDIAN 1234 -#define __BIG_ENDIAN 4321 -#define __PDP_ENDIAN 3412 - -/* This file defines `__BYTE_ORDER' for the particular machine. */ +/* Get the definitions of __*_ENDIAN, __BYTE_ORDER, and __FLOAT_WORD_ORDER. */ #include -/* Some machines may need to use a different endianness for floating point - values. */ -#ifndef __FLOAT_WORD_ORDER -# define __FLOAT_WORD_ORDER __BYTE_ORDER -#endif - -#ifdef __USE_MISC -# define LITTLE_ENDIAN __LITTLE_ENDIAN -# define BIG_ENDIAN __BIG_ENDIAN -# define PDP_ENDIAN __PDP_ENDIAN -# define BYTE_ORDER __BYTE_ORDER -#endif - -#if __BYTE_ORDER == __LITTLE_ENDIAN -# define __LONG_LONG_PAIR(HI, LO) LO, HI -#elif __BYTE_ORDER == __BIG_ENDIAN -# define __LONG_LONG_PAIR(HI, LO) HI, LO -#endif - +#define LITTLE_ENDIAN __LITTLE_ENDIAN +#define BIG_ENDIAN __BIG_ENDIAN +#define PDP_ENDIAN __PDP_ENDIAN +#define BYTE_ORDER __BYTE_ORDER -#if defined __USE_MISC && !defined __ASSEMBLER__ +#ifndef __ASSEMBLER__ /* Conversion interfaces. */ # include # include diff --git a/sysdeps/aarch64/bits/endian.h b/sysdeps/aarch64/bits/endian.h deleted file mode 100644 index c0a40e0..0000000 --- a/sysdeps/aarch64/bits/endian.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright (C) 1997-2019 Free Software Foundation, Inc. - - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library. If not, see - . */ - -#ifndef _ENDIAN_H -# error "Never use directly; include instead." -#endif - -/* AArch64 can be either big or little endian. */ -#ifdef __AARCH64EB__ -# define __BYTE_ORDER __BIG_ENDIAN -#else -# define __BYTE_ORDER __LITTLE_ENDIAN -#endif - -#define __FLOAT_WORD_ORDER __BYTE_ORDER diff --git a/sysdeps/aarch64/bits/endianness.h b/sysdeps/aarch64/bits/endianness.h new file mode 100644 index 0000000..300ebc8 --- /dev/null +++ b/sysdeps/aarch64/bits/endianness.h @@ -0,0 +1,15 @@ +#ifndef _BITS_ENDIANNESS_H +#define _BITS_ENDIANNESS_H 1 + +#ifndef _BITS_ENDIAN_H +# error "Never use directly; include instead." +#endif + +/* AArch64 has selectable endianness. */ +#ifdef __AARCH64EB__ +# define __BYTE_ORDER __BIG_ENDIAN +#else +# define __BYTE_ORDER __LITTLE_ENDIAN +#endif + +#endif /* bits/endianness.h */ diff --git a/sysdeps/aarch64/nptl/bits/pthreadtypes-arch.h b/sysdeps/aarch64/nptl/bits/pthreadtypes-arch.h index 8a2a515..5b05111 100644 --- a/sysdeps/aarch64/nptl/bits/pthreadtypes-arch.h +++ b/sysdeps/aarch64/nptl/bits/pthreadtypes-arch.h @@ -19,7 +19,7 @@ #ifndef _BITS_PTHREADTYPES_ARCH_H #define _BITS_PTHREADTYPES_ARCH_H 1 -#include +#include #ifdef __ILP32__ # define __SIZEOF_PTHREAD_ATTR_T 32 diff --git a/sysdeps/alpha/bits/endian.h b/sysdeps/alpha/bits/endian.h deleted file mode 100644 index 8a16e14..0000000 --- a/sysdeps/alpha/bits/endian.h +++ /dev/null @@ -1,7 +0,0 @@ -/* Alpha is little-endian. */ - -#ifndef _ENDIAN_H -# error "Never use directly; include instead." -#endif - -#define __BYTE_ORDER __LITTLE_ENDIAN diff --git a/sysdeps/alpha/bits/endianness.h b/sysdeps/alpha/bits/endianness.h new file mode 100644 index 0000000..69f9a14 --- /dev/null +++ b/sysdeps/alpha/bits/endianness.h @@ -0,0 +1,11 @@ +#ifndef _BITS_ENDIANNESS_H +#define _BITS_ENDIANNESS_H 1 + +#ifndef _BITS_ENDIAN_H +# error "Never use directly; include instead." +#endif + +/* Alpha is little-endian. */ +#define __BYTE_ORDER __LITTLE_ENDIAN + +#endif /* bits/endianness.h */ diff --git a/sysdeps/arm/bits/endian.h b/sysdeps/arm/bits/endian.h deleted file mode 100644 index f49f6ab..0000000 --- a/sysdeps/arm/bits/endian.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef _ENDIAN_H -# error "Never use directly; include instead." -#endif - -/* ARM can be either big or little endian. */ -#ifdef __ARMEB__ -#define __BYTE_ORDER __BIG_ENDIAN -#else -#define __BYTE_ORDER __LITTLE_ENDIAN -#endif diff --git a/sysdeps/arm/bits/endianness.h b/sysdeps/arm/bits/endianness.h new file mode 100644 index 0000000..2d671ff --- /dev/null +++ b/sysdeps/arm/bits/endianness.h @@ -0,0 +1,15 @@ +#ifndef _BITS_ENDIANNESS_H +#define _BITS_ENDIANNESS_H 1 + +#ifndef _BITS_ENDIAN_H +# error "Never use directly; include instead." +#endif + +/* ARM has selectable endianness. */ +#ifdef __ARMEB__ +#define __BYTE_ORDER __BIG_ENDIAN +#else +#define __BYTE_ORDER __LITTLE_ENDIAN +#endif + +#endif /* bits/endianness.h */ diff --git a/sysdeps/arm/nptl/bits/pthreadtypes-arch.h b/sysdeps/arm/nptl/bits/pthreadtypes-arch.h index 332b288..734828a 100644 --- a/sysdeps/arm/nptl/bits/pthreadtypes-arch.h +++ b/sysdeps/arm/nptl/bits/pthreadtypes-arch.h @@ -18,7 +18,7 @@ #ifndef _BITS_PTHREADTYPES_ARCH_H #define _BITS_PTHREADTYPES_ARCH_H 1 -#include +#include #define __SIZEOF_PTHREAD_ATTR_T 36 #define __SIZEOF_PTHREAD_MUTEX_T 24 diff --git a/sysdeps/csky/bits/endian.h b/sysdeps/csky/bits/endian.h deleted file mode 100644 index 51df38d..0000000 --- a/sysdeps/csky/bits/endian.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef _ENDIAN_H -# error "Never use directly; include instead." -#endif - -#ifdef __CSKYBE__ -# error "Big endian not supported for C-SKY." -#else -# define __BYTE_ORDER __LITTLE_ENDIAN -#endif diff --git a/sysdeps/csky/bits/endianness.h b/sysdeps/csky/bits/endianness.h new file mode 100644 index 0000000..14652f5 --- /dev/null +++ b/sysdeps/csky/bits/endianness.h @@ -0,0 +1,15 @@ +#ifndef _BITS_ENDIANNESS_H +#define _BITS_ENDIANNESS_H 1 + +#ifndef _BITS_ENDIAN_H +# error "Never use directly; include instead." +#endif + +/* C-SKY has selectable endianness. */ +#ifdef __CSKYBE__ +# define __BYTE_ORDER __BIG_ENDIAN +#else +# define __BYTE_ORDER __LITTLE_ENDIAN +#endif + +#endif /* bits/endianness.h */ diff --git a/sysdeps/csky/nptl/bits/pthreadtypes-arch.h b/sysdeps/csky/nptl/bits/pthreadtypes-arch.h index 5a49114..0f737a1 100644 --- a/sysdeps/csky/nptl/bits/pthreadtypes-arch.h +++ b/sysdeps/csky/nptl/bits/pthreadtypes-arch.h @@ -19,7 +19,7 @@ #ifndef _BITS_PTHREADTYPES_ARCH_H #define _BITS_PTHREADTYPES_ARCH_H 1 -#include +#include #define __SIZEOF_PTHREAD_ATTR_T 36 #define __SIZEOF_PTHREAD_MUTEX_T 24 diff --git a/sysdeps/hppa/bits/endian.h b/sysdeps/hppa/bits/endian.h deleted file mode 100644 index 585db0c..0000000 --- a/sysdeps/hppa/bits/endian.h +++ /dev/null @@ -1,7 +0,0 @@ -/* hppa1.1 big-endian. */ - -#ifndef _ENDIAN_H -# error "Never use directly; include instead." -#endif - -#define __BYTE_ORDER __BIG_ENDIAN diff --git a/sysdeps/hppa/bits/endianness.h b/sysdeps/hppa/bits/endianness.h new file mode 100644 index 0000000..96fd5ae --- /dev/null +++ b/sysdeps/hppa/bits/endianness.h @@ -0,0 +1,11 @@ +#ifndef _BITS_ENDIANNESS_H +#define _BITS_ENDIANNESS_H 1 + +#ifndef _BITS_ENDIAN_H +# error "Never use directly; include instead." +#endif + +/* HP-PA is big-endian. */ +#define __BYTE_ORDER __BIG_ENDIAN + +#endif /* bits/endianness.h */ diff --git a/sysdeps/ia64/bits/endianness.h b/sysdeps/ia64/bits/endianness.h new file mode 100644 index 0000000..70c211e --- /dev/null +++ b/sysdeps/ia64/bits/endianness.h @@ -0,0 +1,11 @@ +#ifndef _BITS_ENDIANNESS_H +#define _BITS_ENDIANNESS_H 1 + +#ifndef _BITS_ENDIAN_H +# error "Never use directly; include instead." +#endif + +/* IA64 is little-endian. */ +#define __BYTE_ORDER __LITTLE_ENDIAN + +#endif /* bits/endianness.h */ diff --git a/sysdeps/ia64/ieee754.h b/sysdeps/ia64/ieee754.h index 3c53381..f9ff748 100644 --- a/sysdeps/ia64/ieee754.h +++ b/sysdeps/ia64/ieee754.h @@ -16,11 +16,11 @@ . */ #ifndef _IEEE754_H - #define _IEEE754_H 1 + #include -#include +#include __BEGIN_DECLS diff --git a/sysdeps/ieee754/ieee754.h b/sysdeps/ieee754/ieee754.h index a88cbb69..b457a10 100644 --- a/sysdeps/ieee754/ieee754.h +++ b/sysdeps/ieee754/ieee754.h @@ -16,11 +16,11 @@ . */ #ifndef _IEEE754_H - #define _IEEE754_H 1 + #include -#include +#include __BEGIN_DECLS diff --git a/sysdeps/ieee754/ldbl-128/ieee754.h b/sysdeps/ieee754/ldbl-128/ieee754.h index 0f206db..bda95ac 100644 --- a/sysdeps/ieee754/ldbl-128/ieee754.h +++ b/sysdeps/ieee754/ldbl-128/ieee754.h @@ -16,11 +16,11 @@ . */ #ifndef _IEEE754_H - #define _IEEE754_H 1 + #include -#include +#include __BEGIN_DECLS diff --git a/sysdeps/ieee754/ldbl-128ibm/ieee754.h b/sysdeps/ieee754/ldbl-128ibm/ieee754.h index d0438c1..eeb9d37 100644 --- a/sysdeps/ieee754/ldbl-128ibm/ieee754.h +++ b/sysdeps/ieee754/ldbl-128ibm/ieee754.h @@ -16,11 +16,11 @@ . */ #ifndef _IEEE754_H - #define _IEEE754_H 1 + #include -#include +#include __BEGIN_DECLS diff --git a/sysdeps/m68k/bits/endian.h b/sysdeps/m68k/bits/endian.h deleted file mode 100644 index bf4ecb6..0000000 --- a/sysdeps/m68k/bits/endian.h +++ /dev/null @@ -1,7 +0,0 @@ -/* m68k is big-endian. */ - -#ifndef _ENDIAN_H -# error "Never use directly; include instead." -#endif - -#define __BYTE_ORDER __BIG_ENDIAN diff --git a/sysdeps/m68k/bits/endianness.h b/sysdeps/m68k/bits/endianness.h new file mode 100644 index 0000000..7e5f0d2 --- /dev/null +++ b/sysdeps/m68k/bits/endianness.h @@ -0,0 +1,11 @@ +#ifndef _BITS_ENDIANNESS_H +#define _BITS_ENDIANNESS_H 1 + +#ifndef _BITS_ENDIAN_H +# error "Never use directly; include instead." +#endif + +/* m68k is big-endian. */ +#define __BYTE_ORDER __BIG_ENDIAN + +#endif /* bits/endianness.h */ diff --git a/sysdeps/m68k/nptl/bits/pthreadtypes-arch.h b/sysdeps/m68k/nptl/bits/pthreadtypes-arch.h index 731cdec..a8497d6 100644 --- a/sysdeps/m68k/nptl/bits/pthreadtypes-arch.h +++ b/sysdeps/m68k/nptl/bits/pthreadtypes-arch.h @@ -19,7 +19,7 @@ #ifndef _BITS_PTHREADTYPES_ARCH_H #define _BITS_PTHREADTYPES_ARCH_H 1 -#include +#include #define __SIZEOF_PTHREAD_ATTR_T 36 #define __SIZEOF_PTHREAD_MUTEX_T 24 diff --git a/sysdeps/microblaze/bits/endian.h b/sysdeps/microblaze/bits/endian.h deleted file mode 100644 index 3650f3d..0000000 --- a/sysdeps/microblaze/bits/endian.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright (C) 1997-2019 Free Software Foundation, Inc. - - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library. If not, see - . */ - -#ifndef _ENDIAN_H -# error "Never use directly; include instead." -#endif - -/* MicroBlaze can be either big or little endian. */ -#ifdef _BIG_ENDIAN -# define __BYTE_ORDER __BIG_ENDIAN -# define __FLOAT_WORD_ORDER __BIG_ENDIAN -#else -# define __BYTE_ORDER __LITTLE_ENDIAN -# define __FLOAT_WORD_ORDER __LITTLE_ENDIAN -#endif diff --git a/sysdeps/microblaze/bits/endianness.h b/sysdeps/microblaze/bits/endianness.h new file mode 100644 index 0000000..c4bb7e5 --- /dev/null +++ b/sysdeps/microblaze/bits/endianness.h @@ -0,0 +1,15 @@ +#ifndef _BITS_ENDIANNESS_H +#define _BITS_ENDIANNESS_H 1 + +#ifndef _BITS_ENDIAN_H +# error "Never use directly; include instead." +#endif + +/* MicroBlaze has selectable endianness. */ +#ifdef _BIG_ENDIAN +# define __BYTE_ORDER __BIG_ENDIAN +#else +# define __BYTE_ORDER __LITTLE_ENDIAN +#endif + +#endif /* bits/endianness.h */ diff --git a/sysdeps/microblaze/nptl/bits/pthreadtypes-arch.h b/sysdeps/microblaze/nptl/bits/pthreadtypes-arch.h index 838e71f..77b4e6c 100644 --- a/sysdeps/microblaze/nptl/bits/pthreadtypes-arch.h +++ b/sysdeps/microblaze/nptl/bits/pthreadtypes-arch.h @@ -19,7 +19,7 @@ #ifndef _BITS_PTHREADTYPES_ARCH_H # define _BITS_PTHREADTYPES_ARCH_H 1 -# include +# include # define __SIZEOF_PTHREAD_ATTR_T 36 # define __SIZEOF_PTHREAD_MUTEX_T 24 diff --git a/sysdeps/mips/bits/endian.h b/sysdeps/mips/bits/endian.h deleted file mode 100644 index 1260597..0000000 --- a/sysdeps/mips/bits/endian.h +++ /dev/null @@ -1,15 +0,0 @@ -/* The MIPS architecture has selectable endianness. - It exists in both little and big endian flavours and we - want to be able to share the installed header files between - both, so we define __BYTE_ORDER based on GCC's predefines. */ - -#ifndef _ENDIAN_H -# error "Never use directly; include instead." -#endif - -#ifdef __MIPSEB -# define __BYTE_ORDER __BIG_ENDIAN -#endif -#ifdef __MIPSEL -# define __BYTE_ORDER __LITTLE_ENDIAN -#endif diff --git a/sysdeps/mips/bits/endianness.h b/sysdeps/mips/bits/endianness.h new file mode 100644 index 0000000..09e138b --- /dev/null +++ b/sysdeps/mips/bits/endianness.h @@ -0,0 +1,16 @@ +#ifndef _BITS_ENDIANNESS_H +#define _BITS_ENDIANNESS_H 1 + +#ifndef _BITS_ENDIAN_H +# error "Never use directly; include instead." +#endif + +/* MIPS has selectable endianness. */ +#ifdef __MIPSEB +# define __BYTE_ORDER __BIG_ENDIAN +#endif +#ifdef __MIPSEL +# define __BYTE_ORDER __LITTLE_ENDIAN +#endif + +#endif /* bits/endianness.h */ diff --git a/sysdeps/mips/ieee754/ieee754.h b/sysdeps/mips/ieee754/ieee754.h index d5fb9fc..5ae7922 100644 --- a/sysdeps/mips/ieee754/ieee754.h +++ b/sysdeps/mips/ieee754/ieee754.h @@ -16,13 +16,11 @@ . */ #ifndef _IEEE754_H - #define _IEEE754_H 1 -#include -#include +#include -#include +#include __BEGIN_DECLS diff --git a/sysdeps/mips/nptl/bits/pthreadtypes-arch.h b/sysdeps/mips/nptl/bits/pthreadtypes-arch.h index bebee00..bf69766 100644 --- a/sysdeps/mips/nptl/bits/pthreadtypes-arch.h +++ b/sysdeps/mips/nptl/bits/pthreadtypes-arch.h @@ -19,7 +19,7 @@ #ifndef _BITS_PTHREADTYPES_ARCH_H #define _BITS_PTHREADTYPES_ARCH_H 1 -#include +#include #if _MIPS_SIM == _ABI64 # define __SIZEOF_PTHREAD_ATTR_T 56 diff --git a/sysdeps/nios2/bits/endian.h b/sysdeps/nios2/bits/endian.h deleted file mode 100644 index 164f9e4..0000000 --- a/sysdeps/nios2/bits/endian.h +++ /dev/null @@ -1,12 +0,0 @@ -/* The Nios II architecture has selectable endianness. */ - -#ifndef _ENDIAN_H -# error "Never use directly; include instead." -#endif - -#ifdef __nios2_big_endian__ -# define __BYTE_ORDER __BIG_ENDIAN -#endif -#ifdef __nios2_little_endian__ -# define __BYTE_ORDER __LITTLE_ENDIAN -#endif diff --git a/sysdeps/nios2/bits/endianness.h b/sysdeps/nios2/bits/endianness.h new file mode 100644 index 0000000..87e66eb --- /dev/null +++ b/sysdeps/nios2/bits/endianness.h @@ -0,0 +1,16 @@ +#ifndef _BITS_ENDIANNESS_H +#define _BITS_ENDIANNESS_H 1 + +#ifndef _BITS_ENDIAN_H +# error "Never use directly; include instead." +#endif + +/* Nios II has selectable endianness. */ +#ifdef __nios2_big_endian__ +# define __BYTE_ORDER __BIG_ENDIAN +#endif +#ifdef __nios2_little_endian__ +# define __BYTE_ORDER __LITTLE_ENDIAN +#endif + +#endif /* bits/endianness.h */ diff --git a/sysdeps/nios2/nptl/bits/pthreadtypes-arch.h b/sysdeps/nios2/nptl/bits/pthreadtypes-arch.h index 1091e63..459c8bc 100644 --- a/sysdeps/nios2/nptl/bits/pthreadtypes-arch.h +++ b/sysdeps/nios2/nptl/bits/pthreadtypes-arch.h @@ -19,7 +19,7 @@ #ifndef _BITS_PTHREADTYPES_ARCH_H #define _BITS_PTHREADTYPES_ARCH_H 1 -#include +#include #define __SIZEOF_PTHREAD_ATTR_T 36 #define __SIZEOF_PTHREAD_MUTEX_T 24 diff --git a/sysdeps/nptl/pthread.h b/sysdeps/nptl/pthread.h index 704a3c4..e5a7efc 100644 --- a/sysdeps/nptl/pthread.h +++ b/sysdeps/nptl/pthread.h @@ -19,10 +19,10 @@ #define _PTHREAD_H 1 #include -#include #include #include +#include #include #include #include diff --git a/sysdeps/powerpc/bits/endian.h b/sysdeps/powerpc/bits/endian.h deleted file mode 100644 index cd8ae4f..0000000 --- a/sysdeps/powerpc/bits/endian.h +++ /dev/null @@ -1,36 +0,0 @@ -/* Copyright (C) 1997-2019 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -/* PowerPC can be little or big endian. Hopefully gcc will know... */ - -#ifndef _ENDIAN_H -# error "Never use directly; include instead." -#endif - -#if defined __BIG_ENDIAN__ || defined _BIG_ENDIAN -# if defined __LITTLE_ENDIAN__ || defined _LITTLE_ENDIAN -# error Both BIG_ENDIAN and LITTLE_ENDIAN defined! -# endif -# define __BYTE_ORDER __BIG_ENDIAN -#else -# if defined __LITTLE_ENDIAN__ || defined _LITTLE_ENDIAN -# define __BYTE_ORDER __LITTLE_ENDIAN -# else -# warning Cannot determine current byte order, assuming big-endian. -# define __BYTE_ORDER __BIG_ENDIAN -# endif -#endif diff --git a/sysdeps/powerpc/bits/endianness.h b/sysdeps/powerpc/bits/endianness.h new file mode 100644 index 0000000..3e77352 --- /dev/null +++ b/sysdeps/powerpc/bits/endianness.h @@ -0,0 +1,16 @@ +#ifndef _BITS_ENDIANNESS_H +#define _BITS_ENDIANNESS_H 1 + +#ifndef _BITS_ENDIAN_H +# error "Never use directly; include instead." +#endif + +/* PowerPC has selectable endianness. */ +#if defined __BIG_ENDIAN__ || defined _BIG_ENDIAN +# define __BYTE_ORDER __BIG_ENDIAN +#endif +#if defined __LITTLE_ENDIAN__ || defined _LITTLE_ENDIAN +# define __BYTE_ORDER __LITTLE_ENDIAN +#endif + +#endif /* bits/endianness.h */ diff --git a/sysdeps/riscv/bits/endian.h b/sysdeps/riscv/bits/endian.h deleted file mode 100644 index 4aaf559..0000000 --- a/sysdeps/riscv/bits/endian.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifndef _ENDIAN_H -# error "Never use directly; include instead." -#endif - -#define __BYTE_ORDER __LITTLE_ENDIAN diff --git a/sysdeps/riscv/bits/endianness.h b/sysdeps/riscv/bits/endianness.h new file mode 100644 index 0000000..952d085 --- /dev/null +++ b/sysdeps/riscv/bits/endianness.h @@ -0,0 +1,11 @@ +#ifndef _BITS_ENDIANNESS_H +#define _BITS_ENDIANNESS_H 1 + +#ifndef _BITS_ENDIAN_H +# error "Never use directly; include instead." +#endif + +/* RISC-V is little-endian. */ +#define __BYTE_ORDER __LITTLE_ENDIAN + +#endif /* bits/endianness.h */ diff --git a/sysdeps/riscv/nptl/bits/pthreadtypes-arch.h b/sysdeps/riscv/nptl/bits/pthreadtypes-arch.h index e3fecc3..22dc949 100644 --- a/sysdeps/riscv/nptl/bits/pthreadtypes-arch.h +++ b/sysdeps/riscv/nptl/bits/pthreadtypes-arch.h @@ -19,7 +19,7 @@ #ifndef _BITS_PTHREADTYPES_ARCH_H #define _BITS_PTHREADTYPES_ARCH_H 1 -#include +#include #if __riscv_xlen == 64 # define __SIZEOF_PTHREAD_ATTR_T 56 diff --git a/sysdeps/s390/bits/endian.h b/sysdeps/s390/bits/endian.h deleted file mode 100644 index ac27f01..0000000 --- a/sysdeps/s390/bits/endian.h +++ /dev/null @@ -1,7 +0,0 @@ -/* s390 is big-endian */ - -#ifndef _ENDIAN_H -# error "Never use directly; include instead." -#endif - -#define __BYTE_ORDER __BIG_ENDIAN diff --git a/sysdeps/s390/bits/endianness.h b/sysdeps/s390/bits/endianness.h new file mode 100644 index 0000000..c2d34e1 --- /dev/null +++ b/sysdeps/s390/bits/endianness.h @@ -0,0 +1,11 @@ +#ifndef _BITS_ENDIANNESS_H +#define _BITS_ENDIANNESS_H 1 + +#ifndef _BITS_ENDIAN_H +# error "Never use directly; include instead." +#endif + +/* S/390 is big-endian. */ +#define __BYTE_ORDER __BIG_ENDIAN + +#endif /* bits/endianness.h */ diff --git a/sysdeps/sh/bits/endian.h b/sysdeps/sh/bits/endian.h deleted file mode 100644 index 1fef1ff..0000000 --- a/sysdeps/sh/bits/endian.h +++ /dev/null @@ -1,13 +0,0 @@ -/* SH is bi-endian but with a big-endian FPU. */ - -#ifndef _ENDIAN_H -# error "Never use directly; include instead." -#endif - -#ifdef __LITTLE_ENDIAN__ -#define __BYTE_ORDER __LITTLE_ENDIAN -#define __FLOAT_WORD_ORDER __LITTLE_ENDIAN -#else -#define __BYTE_ORDER __BIG_ENDIAN -#define __FLOAT_WORD_ORDER __BIG_ENDIAN -#endif diff --git a/sysdeps/sh/bits/endianness.h b/sysdeps/sh/bits/endianness.h new file mode 100644 index 0000000..45c7c83 --- /dev/null +++ b/sysdeps/sh/bits/endianness.h @@ -0,0 +1,15 @@ +#ifndef _BITS_ENDIANNESS_H +#define _BITS_ENDIANNESS_H 1 + +#ifndef _BITS_ENDIAN_H +# error "Never use directly; include instead." +#endif + +/* SH has selectable endianness. */ +#ifdef __LITTLE_ENDIAN__ +#define __BYTE_ORDER __LITTLE_ENDIAN +#else +#define __BYTE_ORDER __BIG_ENDIAN +#endif + +#endif /* bits/endianness.h */ diff --git a/sysdeps/sh/nptl/bits/pthreadtypes-arch.h b/sysdeps/sh/nptl/bits/pthreadtypes-arch.h index 64d9d43..3e2d826 100644 --- a/sysdeps/sh/nptl/bits/pthreadtypes-arch.h +++ b/sysdeps/sh/nptl/bits/pthreadtypes-arch.h @@ -18,7 +18,7 @@ #ifndef _BITS_PTHREADTYPES_ARCH_H #define _BITS_PTHREADTYPES_ARCH_H 1 -#include +#include #define __SIZEOF_PTHREAD_ATTR_T 36 #define __SIZEOF_PTHREAD_MUTEX_T 24 diff --git a/sysdeps/sparc/bits/endian.h b/sysdeps/sparc/bits/endianness.h similarity index 56% rename from sysdeps/sparc/bits/endian.h rename to sysdeps/sparc/bits/endianness.h index 8acfdf5..0b6f5bf 100644 --- a/sysdeps/sparc/bits/endian.h +++ b/sysdeps/sparc/bits/endianness.h @@ -1,12 +1,16 @@ -/* Sparc is big-endian, but v9 supports endian conversion on loads/stores - and GCC supports such a mode. Be prepared. */ +#ifndef _BITS_ENDIANNESS_H +#define _BITS_ENDIANNESS_H 1 -#ifndef _ENDIAN_H -# error "Never use directly; include instead." +#ifndef _BITS_ENDIAN_H +# error "Never use directly; include instead." #endif +/* Sparc is big-endian, but v9 supports endian conversion on loads/stores + and GCC supports such a mode. Be prepared. */ #ifdef __LITTLE_ENDIAN__ # define __BYTE_ORDER __LITTLE_ENDIAN #else # define __BYTE_ORDER __BIG_ENDIAN #endif + +#endif /* bits/endianness.h */ diff --git a/sysdeps/sparc/sparc32/ieee754.h b/sysdeps/sparc/sparc32/ieee754.h index 0f206db..bda95ac 100644 --- a/sysdeps/sparc/sparc32/ieee754.h +++ b/sysdeps/sparc/sparc32/ieee754.h @@ -16,11 +16,11 @@ . */ #ifndef _IEEE754_H - #define _IEEE754_H 1 + #include -#include +#include __BEGIN_DECLS diff --git a/sysdeps/unix/sysv/linux/generic/bits/stat.h b/sysdeps/unix/sysv/linux/generic/bits/stat.h index e5c2650..2570c83 100644 --- a/sysdeps/unix/sysv/linux/generic/bits/stat.h +++ b/sysdeps/unix/sysv/linux/generic/bits/stat.h @@ -23,7 +23,7 @@ #ifndef _BITS_STAT_H #define _BITS_STAT_H 1 -#include +#include #include /* 64-bit libc uses the kernel's 'struct stat', accessed via the diff --git a/sysdeps/unix/sysv/linux/generic/bits/statfs.h b/sysdeps/unix/sysv/linux/generic/bits/statfs.h index 77de4d2..c85187a 100644 --- a/sysdeps/unix/sysv/linux/generic/bits/statfs.h +++ b/sysdeps/unix/sysv/linux/generic/bits/statfs.h @@ -20,7 +20,7 @@ # error "Never include directly; use instead." #endif -#include +#include #include #include diff --git a/sysdeps/unix/sysv/linux/hppa/pthread.h b/sysdeps/unix/sysv/linux/hppa/pthread.h index 45e706c..78dad4f 100644 --- a/sysdeps/unix/sysv/linux/hppa/pthread.h +++ b/sysdeps/unix/sysv/linux/hppa/pthread.h @@ -19,7 +19,6 @@ #define _PTHREAD_H 1 #include -#include #include #include diff --git a/sysdeps/unix/sysv/linux/ia64/bits/endian.h b/sysdeps/unix/sysv/linux/ia64/bits/endian.h deleted file mode 100644 index 98a5e23..0000000 --- a/sysdeps/unix/sysv/linux/ia64/bits/endian.h +++ /dev/null @@ -1,7 +0,0 @@ -/* Linux/ia64 is little-endian. */ - -#ifndef _ENDIAN_H -# error "Never use directly; include instead." -#endif - -#define __BYTE_ORDER __LITTLE_ENDIAN diff --git a/sysdeps/unix/sysv/linux/powerpc/htm.h b/sysdeps/unix/sysv/linux/powerpc/htm.h index 93b6d40..f17c979 100644 --- a/sysdeps/unix/sysv/linux/powerpc/htm.h +++ b/sysdeps/unix/sysv/linux/powerpc/htm.h @@ -50,7 +50,7 @@ #else -#include +#include /* Official HTM intrinsics interface matching GCC, but works on older GCC compatible compilers and binutils. diff --git a/sysdeps/unix/sysv/linux/sys/acct.h b/sysdeps/unix/sysv/linux/sys/acct.h index 619824f..4c119da 100644 --- a/sysdeps/unix/sysv/linux/sys/acct.h +++ b/sysdeps/unix/sysv/linux/sys/acct.h @@ -20,7 +20,7 @@ #include #include -#include +#include #include __BEGIN_DECLS diff --git a/sysdeps/x86/bits/endian.h b/sysdeps/x86/bits/endian.h deleted file mode 100644 index 5a56c72..0000000 --- a/sysdeps/x86/bits/endian.h +++ /dev/null @@ -1,7 +0,0 @@ -/* i386/x86_64 are little-endian. */ - -#ifndef _ENDIAN_H -# error "Never use directly; include instead." -#endif - -#define __BYTE_ORDER __LITTLE_ENDIAN diff --git a/sysdeps/x86/bits/endianness.h b/sysdeps/x86/bits/endianness.h new file mode 100644 index 0000000..962a9ae --- /dev/null +++ b/sysdeps/x86/bits/endianness.h @@ -0,0 +1,11 @@ +#ifndef _BITS_ENDIANNESS_H +#define _BITS_ENDIANNESS_H 1 + +#ifndef _BITS_ENDIAN_H +# error "Never use directly; include instead." +#endif + +/* i386/x86_64 are little-endian. */ +#define __BYTE_ORDER __LITTLE_ENDIAN + +#endif /* bits/endianness.h */ diff --git a/wctype/bits/wctype-wchar.h b/wctype/bits/wctype-wchar.h index 22ae0ab..f3851a7 100644 --- a/wctype/bits/wctype-wchar.h +++ b/wctype/bits/wctype-wchar.h @@ -42,7 +42,7 @@ typedef unsigned long int wctype_t; endian). We define the bit value interpretations here dependent on the machine's byte order. */ -# include +# include # if __BYTE_ORDER == __BIG_ENDIAN # define _ISwbit(bit) (1 << (bit)) # else /* __BYTE_ORDER == __LITTLE_ENDIAN */