From: Zack Weinberg Date: Mon, 27 Feb 2017 01:17:52 +0000 (-0500) Subject: Narrowing the visibility of libc-internal.h even further. X-Git-Tag: glibc-2.26~747 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9090848d0607e93fb08a1d68d9f263846ee33f02;p=thirdparty%2Fglibc.git Narrowing the visibility of libc-internal.h even further. posix/wordexp-test.c used libc-internal.h for PTR_ALIGN_DOWN; similar to what was done with libc-diag.h, I have split the definitions of cast_to_integer, ALIGN_UP, ALIGN_DOWN, PTR_ALIGN_UP, and PTR_ALIGN_DOWN to a new header, libc-pointer-arith.h. It then occurred to me that the remaining declarations in libc-internal.h are mostly to do with early initialization, and probably most of the files including it, even in the core code, don't need it anymore. Indeed, only 19 files actually need what remains of libc-internal.h. 23 others need libc-diag.h instead, and 12 need libc-pointer-arith.h instead. No file needs more than one of them, and 16 don't need any of them! So, with this patch, libc-internal.h stops including libc-diag.h as well as losing the pointer arithmetic macros, and all including files are adjusted. * include/libc-pointer-arith.h: New file. Define cast_to_integer, ALIGN_UP, ALIGN_DOWN, PTR_ALIGN_UP, and PTR_ALIGN_DOWN here. * include/libc-internal.h: Definitions of above macros moved from here. Don't include libc-diag.h anymore either. * posix/wordexp-test.c: Include stdint.h and libc-pointer-arith.h. Don't include libc-internal.h. * debug/pcprofile.c, elf/dl-tunables.c, elf/soinit.c, io/openat.c * io/openat64.c, misc/ptrace.c, nptl/pthread_clock_gettime.c * nptl/pthread_clock_settime.c, nptl/pthread_cond_common.c * string/strcoll_l.c, sysdeps/nacl/brk.c * sysdeps/unix/clock_settime.c * sysdeps/unix/sysv/linux/i386/get_clockfreq.c * sysdeps/unix/sysv/linux/ia64/get_clockfreq.c * sysdeps/unix/sysv/linux/powerpc/get_clockfreq.c * sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c: Don't include libc-internal.h. * elf/get-dynamic-info.h, iconv/loop.c * iconvdata/iso-2022-cn-ext.c, locale/weight.h, locale/weightwc.h * misc/reboot.c, nis/nis_table.c, nptl_db/thread_dbP.h * nscd/connections.c, resolv/res_send.c, soft-fp/fmadf4.c * soft-fp/fmasf4.c, soft-fp/fmatf4.c, stdio-common/vfscanf.c * sysdeps/ieee754/dbl-64/e_lgamma_r.c * sysdeps/ieee754/dbl-64/k_rem_pio2.c * sysdeps/ieee754/flt-32/e_lgammaf_r.c * sysdeps/ieee754/flt-32/k_rem_pio2f.c * sysdeps/ieee754/ldbl-128/k_tanl.c * sysdeps/ieee754/ldbl-128ibm/k_tanl.c * sysdeps/ieee754/ldbl-96/e_lgammal_r.c * sysdeps/ieee754/ldbl-96/k_tanl.c, sysdeps/nptl/futex-internal.h: Include libc-diag.h instead of libc-internal.h. * elf/dl-load.c, elf/dl-reloc.c, locale/programs/locarchive.c * nptl/nptl-init.c, string/strcspn.c, string/strspn.c * malloc/malloc.c, sysdeps/i386/nptl/tls.h * sysdeps/nacl/dl-map-segments.h, sysdeps/x86_64/atomic-machine.h * sysdeps/unix/sysv/linux/spawni.c * sysdeps/x86_64/nptl/tls.h: Include libc-pointer-arith.h instead of libc-internal.h. * elf/get-dynamic-info.h, sysdeps/nacl/dl-map-segments.h * sysdeps/x86_64/atomic-machine.h: Add multiple include guard. --- diff --git a/ChangeLog b/ChangeLog index 5bdb409ee80..a587b9a2a58 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,51 @@ 2017-03-01 Zack Weinberg + * include/libc-pointer-arith.h: New file. Define + cast_to_integer, ALIGN_UP, ALIGN_DOWN, PTR_ALIGN_UP, and + PTR_ALIGN_DOWN here. + * include/libc-internal.h: Definitions of above macros + moved from here. Don't include libc-diag.h anymore either. + * posix/wordexp-test.c: Include stdint.h and libc-pointer-arith.h. + Don't include libc-internal.h. + + * debug/pcprofile.c, elf/dl-tunables.c, elf/soinit.c, io/openat.c + * io/openat64.c, misc/ptrace.c, nptl/pthread_clock_gettime.c + * nptl/pthread_clock_settime.c, nptl/pthread_cond_common.c + * string/strcoll_l.c, sysdeps/nacl/brk.c + * sysdeps/unix/clock_settime.c + * sysdeps/unix/sysv/linux/i386/get_clockfreq.c + * sysdeps/unix/sysv/linux/ia64/get_clockfreq.c + * sysdeps/unix/sysv/linux/powerpc/get_clockfreq.c + * sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c: + Don't include libc-internal.h. + + * elf/get-dynamic-info.h, iconv/loop.c + * iconvdata/iso-2022-cn-ext.c, locale/weight.h, locale/weightwc.h + * misc/reboot.c, nis/nis_table.c, nptl_db/thread_dbP.h + * nscd/connections.c, resolv/res_send.c, soft-fp/fmadf4.c + * soft-fp/fmasf4.c, soft-fp/fmatf4.c, stdio-common/vfscanf.c + * sysdeps/ieee754/dbl-64/e_lgamma_r.c + * sysdeps/ieee754/dbl-64/k_rem_pio2.c + * sysdeps/ieee754/flt-32/e_lgammaf_r.c + * sysdeps/ieee754/flt-32/k_rem_pio2f.c + * sysdeps/ieee754/ldbl-128/k_tanl.c + * sysdeps/ieee754/ldbl-128ibm/k_tanl.c + * sysdeps/ieee754/ldbl-96/e_lgammal_r.c + * sysdeps/ieee754/ldbl-96/k_tanl.c, sysdeps/nptl/futex-internal.h: + Include libc-diag.h instead of libc-internal.h. + + * elf/dl-load.c, elf/dl-reloc.c, locale/programs/locarchive.c + * nptl/nptl-init.c, string/strcspn.c, string/strspn.c + * malloc/malloc.c, sysdeps/i386/nptl/tls.h + * sysdeps/nacl/dl-map-segments.h, sysdeps/x86_64/atomic-machine.h + * sysdeps/unix/sysv/linux/spawni.c + * sysdeps/x86_64/nptl/tls.h: + Include libc-pointer-arith.h instead of libc-internal.h. + + * elf/get-dynamic-info.h, sysdeps/nacl/dl-map-segments.h + * sysdeps/x86_64/atomic-machine.h: + Add multiple include guard. + * nss/tst-cancel-getpwuid_r.c: Include nss.h. * string/strcasestr.c: No need to include config.h. * sysdeps/powerpc/fpu/tst-setcontext-fpscr.c: Include diff --git a/debug/pcprofile.c b/debug/pcprofile.c index 1643ef652f0..b6402ef63b9 100644 --- a/debug/pcprofile.c +++ b/debug/pcprofile.c @@ -22,7 +22,6 @@ #include #include #include -#include /* Nonzero if we are actually doing something. */ static int active; diff --git a/elf/dl-load.c b/elf/dl-load.c index a5318f9c8d1..c1b6d4ba0f1 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include diff --git a/elf/dl-reloc.c b/elf/dl-reloc.c index 4ac558df525..b3c3a9bbf95 100644 --- a/elf/dl-reloc.c +++ b/elf/dl-reloc.c @@ -25,8 +25,8 @@ #include #include #include <_itoa.h> +#include #include "dynamic-link.h" -#include /* Statistics function. */ #ifdef SHARED diff --git a/elf/dl-tunables.c b/elf/dl-tunables.c index e42aa670033..ebf48bb3898 100644 --- a/elf/dl-tunables.c +++ b/elf/dl-tunables.c @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include diff --git a/elf/get-dynamic-info.h b/elf/get-dynamic-info.h index 86760d88443..64135589751 100644 --- a/elf/get-dynamic-info.h +++ b/elf/get-dynamic-info.h @@ -16,8 +16,11 @@ License along with the GNU C Library; if not, see . */ +#ifndef _GET_DYNAMIC_INFO_H +#define _GET_DYNAMIC_INFO_H 1 + #include -#include +#include #ifndef RESOLVE_MAP static @@ -179,3 +182,5 @@ elf_get_dynamic_info (struct link_map *l, ElfW(Dyn) *temp) info[DT_RPATH] = NULL; #endif } + +#endif /* get-dynamic-info.h */ diff --git a/elf/soinit.c b/elf/soinit.c index 71398308d23..fe9935732b2 100644 --- a/elf/soinit.c +++ b/elf/soinit.c @@ -4,7 +4,6 @@ calling those lists of functions. */ #ifndef NO_CTORS_DTORS_SECTIONS -# include # include static void (*const __CTOR_LIST__[1]) (void) diff --git a/iconv/loop.c b/iconv/loop.c index 42a03e79b02..0160f72cd65 100644 --- a/iconv/loop.c +++ b/iconv/loop.c @@ -56,7 +56,7 @@ #include /* For MIN. */ #define __need_size_t #include -#include +#include /* We have to provide support for machines which are not able to handled unaligned memory accesses. Some of the character encodings have diff --git a/iconvdata/iso-2022-cn-ext.c b/iconvdata/iso-2022-cn-ext.c index c9c698ee856..919524f001e 100644 --- a/iconvdata/iso-2022-cn-ext.c +++ b/iconvdata/iso-2022-cn-ext.c @@ -27,7 +27,7 @@ #include "cns11643.h" #include "cns11643l1.h" #include "cns11643l2.h" -#include +#include #include diff --git a/include/libc-internal.h b/include/libc-internal.h index be6c02186f1..cd2f2622ed0 100644 --- a/include/libc-internal.h +++ b/include/libc-internal.h @@ -53,42 +53,4 @@ extern void __init_misc (int, char **, char **); extern __typeof (__profile_frequency) __profile_frequency attribute_hidden; # endif -/* 1 if 'type' is a pointer type, 0 otherwise. */ -# define __pointer_type(type) (__builtin_classify_type ((type) 0) == 5) - -/* __intptr_t if P is true, or T if P is false. */ -# define __integer_if_pointer_type_sub(T, P) \ - __typeof__ (*(0 ? (__typeof__ (0 ? (T *) 0 : (void *) (P))) 0 \ - : (__typeof__ (0 ? (__intptr_t *) 0 : (void *) (!(P)))) 0)) - -/* __intptr_t if EXPR has a pointer type, or the type of EXPR otherwise. */ -# define __integer_if_pointer_type(expr) \ - __integer_if_pointer_type_sub(__typeof__ ((__typeof__ (expr)) 0), \ - __pointer_type (__typeof__ (expr))) - -/* Cast an integer or a pointer VAL to integer with proper type. */ -# define cast_to_integer(val) ((__integer_if_pointer_type (val)) (val)) - -/* Align a value by rounding down to closest size. - e.g. Using size of 4096, we get this behavior: - {4095, 4096, 4097} = {0, 4096, 4096}. */ -#define ALIGN_DOWN(base, size) ((base) & -((__typeof__ (base)) (size))) - -/* Align a value by rounding up to closest size. - e.g. Using size of 4096, we get this behavior: - {4095, 4096, 4097} = {4096, 4096, 8192}. - - Note: The size argument has side effects (expanded multiple times). */ -#define ALIGN_UP(base, size) ALIGN_DOWN ((base) + (size) - 1, (size)) - -/* Same as ALIGN_DOWN(), but automatically casts when base is a pointer. */ -#define PTR_ALIGN_DOWN(base, size) \ - ((__typeof__ (base)) ALIGN_DOWN ((uintptr_t) (base), (size))) - -/* Same as ALIGN_UP(), but automatically casts when base is a pointer. */ -#define PTR_ALIGN_UP(base, size) \ - ((__typeof__ (base)) ALIGN_UP ((uintptr_t) (base), (size))) - -#include - #endif /* _LIBC_INTERNAL */ diff --git a/include/libc-pointer-arith.h b/include/libc-pointer-arith.h new file mode 100644 index 00000000000..715cbc1bbec --- /dev/null +++ b/include/libc-pointer-arith.h @@ -0,0 +1,60 @@ +/* Helper macros for pointer arithmetic. + Copyright (C) 2012-2017 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 _LIBC_POINTER_ARITH_H +#define _LIBC_POINTER_ARITH_H 1 + +#include + +/* 1 if 'type' is a pointer type, 0 otherwise. */ +# define __pointer_type(type) (__builtin_classify_type ((type) 0) == 5) + +/* intptr_t if P is true, or T if P is false. */ +# define __integer_if_pointer_type_sub(T, P) \ + __typeof__ (*(0 ? (__typeof__ (0 ? (T *) 0 : (void *) (P))) 0 \ + : (__typeof__ (0 ? (intptr_t *) 0 : (void *) (!(P)))) 0)) + +/* intptr_t if EXPR has a pointer type, or the type of EXPR otherwise. */ +# define __integer_if_pointer_type(expr) \ + __integer_if_pointer_type_sub(__typeof__ ((__typeof__ (expr)) 0), \ + __pointer_type (__typeof__ (expr))) + +/* Cast an integer or a pointer VAL to integer with proper type. */ +# define cast_to_integer(val) ((__integer_if_pointer_type (val)) (val)) + +/* Align a value by rounding down to closest size. + e.g. Using size of 4096, we get this behavior: + {4095, 4096, 4097} = {0, 4096, 4096}. */ +#define ALIGN_DOWN(base, size) ((base) & -((__typeof__ (base)) (size))) + +/* Align a value by rounding up to closest size. + e.g. Using size of 4096, we get this behavior: + {4095, 4096, 4097} = {4096, 4096, 8192}. + + Note: The size argument has side effects (expanded multiple times). */ +#define ALIGN_UP(base, size) ALIGN_DOWN ((base) + (size) - 1, (size)) + +/* Same as ALIGN_DOWN(), but automatically casts when base is a pointer. */ +#define PTR_ALIGN_DOWN(base, size) \ + ((__typeof__ (base)) ALIGN_DOWN ((uintptr_t) (base), (size))) + +/* Same as ALIGN_UP(), but automatically casts when base is a pointer. */ +#define PTR_ALIGN_UP(base, size) \ + ((__typeof__ (base)) ALIGN_UP ((uintptr_t) (base), (size))) + +#endif diff --git a/io/openat.c b/io/openat.c index c54ee34678c..529f418da2e 100644 --- a/io/openat.c +++ b/io/openat.c @@ -22,7 +22,6 @@ #include #include #include -#include /* Some mostly-generic code (e.g. sysdeps/posix/getcwd.c) uses this variable if __ASSUME_ATFCTS is not defined. */ diff --git a/io/openat64.c b/io/openat64.c index 2f564b51f03..116becda986 100644 --- a/io/openat64.c +++ b/io/openat64.c @@ -21,7 +21,6 @@ #include #include #include -#include /* Open FILE with access OFLAG. Interpret relative paths relative to the directory associated with FD. If O_CREAT or O_TMPFILE is in OFLAG, a diff --git a/locale/programs/locarchive.c b/locale/programs/locarchive.c index 13c4e9ee427..f67b7b8d995 100644 --- a/locale/programs/locarchive.c +++ b/locale/programs/locarchive.c @@ -40,8 +40,8 @@ #include #include -#include #include +#include #include "../../crypt/md5.h" #include "../localeinfo.h" #include "../locarchive.h" diff --git a/locale/weight.h b/locale/weight.h index f4797180d12..0558123f348 100644 --- a/locale/weight.h +++ b/locale/weight.h @@ -19,7 +19,7 @@ #ifndef _WEIGHT_H_ #define _WEIGHT_H_ 1 -#include +#include /* Find index of weight. */ static inline int32_t __attribute__ ((always_inline)) diff --git a/locale/weightwc.h b/locale/weightwc.h index 6a726aa86b0..97ce2b3dec3 100644 --- a/locale/weightwc.h +++ b/locale/weightwc.h @@ -19,7 +19,7 @@ #ifndef _WEIGHTWC_H_ #define _WEIGHTWC_H_ 1 -#include +#include /* Find index of weight. */ static inline int32_t __attribute__ ((always_inline)) diff --git a/malloc/malloc.c b/malloc/malloc.c index 48857939057..e29105c3721 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -237,7 +237,7 @@ #include /* For ALIGN_UP et. al. */ -#include +#include #include diff --git a/misc/ptrace.c b/misc/ptrace.c index 06356c9c92a..aace1b5a34c 100644 --- a/misc/ptrace.c +++ b/misc/ptrace.c @@ -19,7 +19,6 @@ #include #include #include -#include /* Perform process tracing functions. REQUEST is one of the values in , and determines the action to be taken. diff --git a/misc/reboot.c b/misc/reboot.c index 86b0a50d655..70549c41b78 100644 --- a/misc/reboot.c +++ b/misc/reboot.c @@ -18,7 +18,7 @@ #include #include #include -#include +#include /* Reboot the system. */ int diff --git a/nis/nis_table.c b/nis/nis_table.c index c0b05db8197..caf3e6af43c 100644 --- a/nis/nis_table.c +++ b/nis/nis_table.c @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include "nis_xdr.h" #include "nis_intern.h" diff --git a/nptl/nptl-init.c b/nptl/nptl-init.c index 2f8599b3916..29216077a2c 100644 --- a/nptl/nptl-init.c +++ b/nptl/nptl-init.c @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #ifndef TLS_MULTIPLE_THREADS_IN_TCB diff --git a/nptl/pthread_clock_gettime.c b/nptl/pthread_clock_gettime.c index e3a82f7e6a5..c9abb615406 100644 --- a/nptl/pthread_clock_gettime.c +++ b/nptl/pthread_clock_gettime.c @@ -18,7 +18,6 @@ #include #include #include -#include #include "pthreadP.h" diff --git a/nptl/pthread_clock_settime.c b/nptl/pthread_clock_settime.c index 6aeb3bece00..f2722d9635e 100644 --- a/nptl/pthread_clock_settime.c +++ b/nptl/pthread_clock_settime.c @@ -18,7 +18,6 @@ #include #include #include -#include #include "pthreadP.h" diff --git a/nptl/pthread_cond_common.c b/nptl/pthread_cond_common.c index 7c63ef9b891..ffbbde4106e 100644 --- a/nptl/pthread_cond_common.c +++ b/nptl/pthread_cond_common.c @@ -19,7 +19,6 @@ #include #include #include -#include /* We need 3 least-significant bits on __wrefs for something else. */ #define __PTHREAD_COND_MAX_GROUP_SIZE ((unsigned) 1 << 29) diff --git a/nptl_db/thread_dbP.h b/nptl_db/thread_dbP.h index d359e79f728..c88ee2923ff 100644 --- a/nptl_db/thread_dbP.h +++ b/nptl_db/thread_dbP.h @@ -30,7 +30,7 @@ #include "../nptl/pthreadP.h" /* This is for *_BITMASK only. */ #include #include -#include +#include /* Indeces for the symbol names. */ enum diff --git a/nscd/connections.c b/nscd/connections.c index 26d2c0091b8..205ff423de0 100644 --- a/nscd/connections.c +++ b/nscd/connections.c @@ -59,7 +59,7 @@ #include #include -#include +#include /* Support to run nscd as an unprivileged user */ diff --git a/posix/wordexp-test.c b/posix/wordexp-test.c index 15eb233001b..17ae8123469 100644 --- a/posix/wordexp-test.c +++ b/posix/wordexp-test.c @@ -22,10 +22,11 @@ #include #include #include +#include #include #include #include -#include +#include #define IFS " \n\t" diff --git a/resolv/res_send.c b/resolv/res_send.c index 93db5b9a615..28c4cabfcb4 100644 --- a/resolv/res_send.c +++ b/resolv/res_send.c @@ -108,7 +108,7 @@ #include #include #include -#include +#include #if PACKETSZ > 65536 #define MAXPACKET PACKETSZ diff --git a/soft-fp/fmadf4.c b/soft-fp/fmadf4.c index 7b7342b2e2d..74e2360eb7c 100644 --- a/soft-fp/fmadf4.c +++ b/soft-fp/fmadf4.c @@ -25,8 +25,9 @@ License along with the GNU C Library; if not, see . */ -#include -#include +#include +#include + /* R_e is not set in cases where it is not used in packing, but the compiler does not see that it is set in all cases where it is used, resulting in warnings that it may be used uninitialized. @@ -35,7 +36,7 @@ macro is defined. */ DIAG_PUSH_NEEDS_COMMENT; DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wmaybe-uninitialized"); -#include + #include "soft-fp.h" #include "double.h" diff --git a/soft-fp/fmasf4.c b/soft-fp/fmasf4.c index 20c0ca8f5a8..2d3120eda95 100644 --- a/soft-fp/fmasf4.c +++ b/soft-fp/fmasf4.c @@ -25,8 +25,9 @@ License along with the GNU C Library; if not, see . */ -#include -#include +#include +#include + /* R_e is not set in cases where it is not used in packing, but the compiler does not see that it is set in all cases where it is used, resulting in warnings that it may be used uninitialized. @@ -35,7 +36,7 @@ macro is defined. */ DIAG_PUSH_NEEDS_COMMENT; DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wmaybe-uninitialized"); -#include + #include "soft-fp.h" #include "single.h" diff --git a/soft-fp/fmatf4.c b/soft-fp/fmatf4.c index d3a4ee4dc08..553a7ad3f8f 100644 --- a/soft-fp/fmatf4.c +++ b/soft-fp/fmatf4.c @@ -25,8 +25,9 @@ License along with the GNU C Library; if not, see . */ -#include -#include +#include +#include + /* R_e is not set in cases where it is not used in packing, but the compiler does not see that it is set in all cases where it is used, resulting in warnings that it may be used uninitialized. @@ -35,7 +36,7 @@ macro is defined. */ DIAG_PUSH_NEEDS_COMMENT; DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wmaybe-uninitialized"); -#include + #include "soft-fp.h" #include "quad.h" diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c index 214dab469d6..1adf27e11b2 100644 --- a/stdio-common/vfscanf.c +++ b/stdio-common/vfscanf.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/string/strcoll_l.c b/string/strcoll_l.c index 7e8fbf3895c..8fd55b000af 100644 --- a/string/strcoll_l.c +++ b/string/strcoll_l.c @@ -24,7 +24,6 @@ #include #include #include -#include #ifndef STRING_TYPE # define STRING_TYPE char diff --git a/string/strcspn.c b/string/strcspn.c index 06299e20988..1035552a8ec 100644 --- a/string/strcspn.c +++ b/string/strcspn.c @@ -17,7 +17,7 @@ #include #include -#include +#include #undef strcspn diff --git a/string/strspn.c b/string/strspn.c index a7fec70c65b..c63197cdf0f 100644 --- a/string/strspn.c +++ b/string/strspn.c @@ -17,7 +17,7 @@ #include #include -#include +#include #undef strspn #ifndef STRSPN diff --git a/sysdeps/i386/nptl/tls.h b/sysdeps/i386/nptl/tls.h index 2500c823055..04dc6aef915 100644 --- a/sysdeps/i386/nptl/tls.h +++ b/sysdeps/i386/nptl/tls.h @@ -26,7 +26,7 @@ # include # include # include -# include +# include /* For cast_to_integer. */ # include # include diff --git a/sysdeps/ieee754/dbl-64/e_lgamma_r.c b/sysdeps/ieee754/dbl-64/e_lgamma_r.c index c337679f7c7..b5860d8a241 100644 --- a/sysdeps/ieee754/dbl-64/e_lgamma_r.c +++ b/sysdeps/ieee754/dbl-64/e_lgamma_r.c @@ -77,9 +77,9 @@ * */ -#include #include #include +#include static const double two52= 4.50359962737049600000e+15, /* 0x43300000, 0x00000000 */ diff --git a/sysdeps/ieee754/dbl-64/k_rem_pio2.c b/sysdeps/ieee754/dbl-64/k_rem_pio2.c index d853b65a053..2b5add69767 100644 --- a/sysdeps/ieee754/dbl-64/k_rem_pio2.c +++ b/sysdeps/ieee754/dbl-64/k_rem_pio2.c @@ -132,7 +132,7 @@ static char rcsid[] = "$NetBSD: k_rem_pio2.c,v 1.7 1995/05/10 20:46:25 jtc Exp $ #include #include -#include +#include static const int init_jk[] = {2,3,4,6}; /* initial value for jk */ diff --git a/sysdeps/ieee754/flt-32/e_lgammaf_r.c b/sysdeps/ieee754/flt-32/e_lgammaf_r.c index 1bd21226637..1b30dcd84d6 100644 --- a/sysdeps/ieee754/flt-32/e_lgammaf_r.c +++ b/sysdeps/ieee754/flt-32/e_lgammaf_r.c @@ -13,9 +13,9 @@ * ==================================================== */ -#include #include #include +#include static const float two23= 8.3886080000e+06, /* 0x4b000000 */ diff --git a/sysdeps/ieee754/flt-32/k_rem_pio2f.c b/sysdeps/ieee754/flt-32/k_rem_pio2f.c index 52ffb09f0e6..a8d5b216e62 100644 --- a/sysdeps/ieee754/flt-32/k_rem_pio2f.c +++ b/sysdeps/ieee754/flt-32/k_rem_pio2f.c @@ -19,7 +19,7 @@ static char rcsid[] = "$NetBSD: k_rem_pio2f.c,v 1.4 1995/05/10 20:46:28 jtc Exp #include #include -#include +#include /* In the float version, the input parameter x contains 8 bit integers, not 24 bit integers. 113 bit precision is not supported. */ diff --git a/sysdeps/ieee754/ldbl-128/k_tanl.c b/sysdeps/ieee754/ldbl-128/k_tanl.c index dc9c457f6a2..e79023c69ad 100644 --- a/sysdeps/ieee754/ldbl-128/k_tanl.c +++ b/sysdeps/ieee754/ldbl-128/k_tanl.c @@ -57,9 +57,10 @@ */ #include -#include #include #include +#include + static const _Float128 one = 1, pio4hi = L(7.8539816339744830961566084581987569936977E-1), diff --git a/sysdeps/ieee754/ldbl-128ibm/k_tanl.c b/sysdeps/ieee754/ldbl-128ibm/k_tanl.c index 3c1bf32af95..232e00c345f 100644 --- a/sysdeps/ieee754/ldbl-128ibm/k_tanl.c +++ b/sysdeps/ieee754/ldbl-128ibm/k_tanl.c @@ -57,9 +57,10 @@ */ #include -#include #include #include +#include + static const long double one = 1.0L, pio4hi = 7.8539816339744830961566084581987569936977E-1L, diff --git a/sysdeps/ieee754/ldbl-96/e_lgammal_r.c b/sysdeps/ieee754/ldbl-96/e_lgammal_r.c index 9862fe8d5c4..4ecd63045fe 100644 --- a/sysdeps/ieee754/ldbl-96/e_lgammal_r.c +++ b/sysdeps/ieee754/ldbl-96/e_lgammal_r.c @@ -91,9 +91,9 @@ * */ -#include #include #include +#include static const long double half = 0.5L, diff --git a/sysdeps/ieee754/ldbl-96/k_tanl.c b/sysdeps/ieee754/ldbl-96/k_tanl.c index 0c050c112f2..f8641d5ce41 100644 --- a/sysdeps/ieee754/ldbl-96/k_tanl.c +++ b/sysdeps/ieee754/ldbl-96/k_tanl.c @@ -57,9 +57,10 @@ */ #include -#include #include #include +#include + static const long double one = 1.0L, pio4hi = 0xc.90fdaa22168c235p-4L, diff --git a/sysdeps/nacl/brk.c b/sysdeps/nacl/brk.c index 15e0c4fdfe4..c96c66f3b86 100644 --- a/sysdeps/nacl/brk.c +++ b/sysdeps/nacl/brk.c @@ -17,7 +17,6 @@ . */ #include -#include #include #include #include diff --git a/sysdeps/nacl/dl-map-segments.h b/sysdeps/nacl/dl-map-segments.h index 501d8be6ece..ab2ad438385 100644 --- a/sysdeps/nacl/dl-map-segments.h +++ b/sysdeps/nacl/dl-map-segments.h @@ -16,12 +16,15 @@ License along with the GNU C Library; if not, see . */ +#ifndef _NACL_DL_MAP_SEGMENTS_H +#define _NACL_DL_MAP_SEGMENTS_H 1 + #include #include #include #include #include -#include +#include /* This is basically pread, but with iteration after short reads. */ @@ -262,3 +265,5 @@ _dl_map_segments (struct link_map *l, int fd, return NULL; } + +#endif /* dl-map-segments.h */ diff --git a/sysdeps/nptl/futex-internal.h b/sysdeps/nptl/futex-internal.h index 532d47d6a33..be7a33f4604 100644 --- a/sysdeps/nptl/futex-internal.h +++ b/sysdeps/nptl/futex-internal.h @@ -23,7 +23,7 @@ #include #include #include -#include +#include /* This file defines futex operations used internally in glibc. A futex consists of the so-called futex word in userspace, which is of type diff --git a/sysdeps/unix/clock_settime.c b/sysdeps/unix/clock_settime.c index 957a4b1599e..e744cae6a9c 100644 --- a/sysdeps/unix/clock_settime.c +++ b/sysdeps/unix/clock_settime.c @@ -18,7 +18,6 @@ #include #include #include -#include #include diff --git a/sysdeps/unix/sysv/linux/i386/get_clockfreq.c b/sysdeps/unix/sysv/linux/i386/get_clockfreq.c index bee3fe84e50..88e14b5f044 100644 --- a/sysdeps/unix/sysv/linux/i386/get_clockfreq.c +++ b/sysdeps/unix/sysv/linux/i386/get_clockfreq.c @@ -20,8 +20,6 @@ #include #include #include -#include - hp_timing_t __get_clockfreq (void) diff --git a/sysdeps/unix/sysv/linux/ia64/get_clockfreq.c b/sysdeps/unix/sysv/linux/ia64/get_clockfreq.c index 5dd9c01261c..603c7d516e2 100644 --- a/sysdeps/unix/sysv/linux/ia64/get_clockfreq.c +++ b/sysdeps/unix/sysv/linux/ia64/get_clockfreq.c @@ -20,7 +20,6 @@ #include #include #include -#include hp_timing_t diff --git a/sysdeps/unix/sysv/linux/powerpc/get_clockfreq.c b/sysdeps/unix/sysv/linux/powerpc/get_clockfreq.c index ad1622d6011..b8d01d8ca60 100644 --- a/sysdeps/unix/sysv/linux/powerpc/get_clockfreq.c +++ b/sysdeps/unix/sysv/linux/powerpc/get_clockfreq.c @@ -21,7 +21,6 @@ #include #include #include -#include #include #include #include diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c b/sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c index dc9ba695bbb..a0349790dc5 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c @@ -24,7 +24,6 @@ #include #include #include -#include #include static hp_timing_t diff --git a/sysdeps/unix/sysv/linux/spawni.c b/sysdeps/unix/sysv/linux/spawni.c index 2daf0c5ef04..24f75dbd9c7 100644 --- a/sysdeps/unix/sysv/linux/spawni.c +++ b/sysdeps/unix/sysv/linux/spawni.c @@ -30,8 +30,8 @@ #include #include #include +#include #include -#include #include "spawn_int.h" /* The Linux implementation of posix_spawn{p} uses the clone syscall directly diff --git a/sysdeps/x86_64/atomic-machine.h b/sysdeps/x86_64/atomic-machine.h index 672a7eb025e..2e8a9aad040 100644 --- a/sysdeps/x86_64/atomic-machine.h +++ b/sysdeps/x86_64/atomic-machine.h @@ -16,10 +16,12 @@ License along with the GNU C Library; if not, see . */ -#include -#include /* For tcbhead_t. */ -#include +#ifndef _X86_64_ATOMIC_MACHINE_H +#define _X86_64_ATOMIC_MACHINE_H 1 +#include +#include /* For tcbhead_t. */ +#include /* For cast_to_integer. */ typedef int8_t atomic8_t; typedef uint8_t uatomic8_t; @@ -475,3 +477,5 @@ typedef uintmax_t uatomic_max_t; __asm __volatile (LOCK_PREFIX "orl $0, (%%rsp)" ::: "memory") #define atomic_read_barrier() __asm ("" ::: "memory") #define atomic_write_barrier() __asm ("" ::: "memory") + +#endif /* atomic-machine.h */ diff --git a/sysdeps/x86_64/nptl/tls.h b/sysdeps/x86_64/nptl/tls.h index f2afe856024..53b41bc84f8 100644 --- a/sysdeps/x86_64/nptl/tls.h +++ b/sysdeps/x86_64/nptl/tls.h @@ -26,7 +26,7 @@ # include # include # include -# include +# include /* For cast_to_integer. */ # include # include