mirror of
https://forge.sourceware.org/marek/gcc.git
synced 2026-02-22 12:00:11 -05:00
72a376da3b
Many fixincludes fixes are no longer applied on Solaris 11.4, usually because they have been incorporated into the system headers. Sometimes this happened as early as Solaris 10 already. A few still were applied although unnecessarily, usually because they have been applied to system headers in a slightly different way. This patch removes all such fixes or disables the unnecessary ones that aren't Solaris-specific on Solaris only. While the solaris_math_12 fix isn't necessary in current Solaris 11.4 SRUs, it was kept since it still applies to Solaris 11.4 FCS. Bootstrapped without regressions on i386-pc-solaris2.11 and sparc-sun-solaris2.11. I've also checked that the fixes applied to the 11.4 FCS headers are identical to those before this patch, with the exception of those that are no longer actually needed. 2026-01-06 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> fixincludes: * inclhack.def (AAB_solaris_sys_varargs_h): Remove. (solaris___restrict): Likewise. (solaris_complex): Likewise. (solaris_complex_cxx): Likewise. (solaris_cxx_linkage): Likewise. (solaris_getc_strict_stdc): Likewise. (solaris_gets_c11): Likewise. (solaris_gets_cxx14): Likewise. (solaris_int_limits_2): Likewise. (solaris_math_1): Likewise. (solaris_math_10): Likewise. (solaris_math_2): Likewise. (solaris_math_3): Likewise. (solaris_math_4): Likewise. (solaris_math_8): Likewise. (solaris_math_9): Likewise. (solaris_math_11): Likewise. (solaris_once_init_1): Likewise. (solaris_posix_spawn_restrict): Likewise. (solaris_rwlock_init_1): Likewise. (solaris_std___filbuf): Likewise. (solaris_std_gets_cxx14): Likewise. (solaris_stdio_tag): Likewise. (solaris_stdlib_noreturn): Likewise. (gnu_types): Simplify Solaris guard. (stdio_stdarg_h): Likewise. (stdio_va_list): Likewise. (stdio_va_list_clients): Bypass on Solaris. (strict_ansi_only): Likewise. * fixincl.x: Regenerate. * tests/base/iso/math_c99.h: Remove. * tests/base/iso/stdio_iso.h: Likewise. * tests/base/iso/stdlib_c99.h: Likewise. * tests/base/iso/stdlib_iso.h: Likewise. * tests/base/spawn.h: Likewise. * tests/base/stdio_tag.h: Likewise. * tests/base/sys/feature_tests.h: Likewise. * tests/base/complex.h [SOLARIS_COMPLEX_CHECK]: Remove. [SOLARIS_COMPLEX_CXX_CHECK]: Likewise. * tests/base/pthread.h [SOLARIS_ONCE_INIT_1_CHECK]: Likewise. [SOLARIS_RWLOCK_INIT_1_CHECK]: Likewise * tests/base/stdio.h [SOLARIS_STD___FILBUF_CHECK]: Likewise. [SOLARIS_GETS_CXX14_CHECK]: Likewise. * tests/base/sys/int_limits.h [SOLARIS_INT_LIMITS_2_CHECK]: Likewise.
104 lines
2.7 KiB
C
104 lines
2.7 KiB
C
/* DO NOT EDIT THIS FILE.
|
|
|
|
It has been auto-edited by fixincludes from:
|
|
|
|
"fixinc/tests/inc/pthread.h"
|
|
|
|
This had to be done to correct non-standard usages in the
|
|
original, manufacturer supplied header file. */
|
|
|
|
|
|
|
|
#if defined( AIX_ONCE_INIT_1_CHECK )
|
|
#define PTHREAD_ONCE_INIT \
|
|
{{ \
|
|
|
|
#endif /* AIX_ONCE_INIT_1_CHECK */
|
|
|
|
|
|
#if defined( AIX_ONCE_INIT_2_CHECK )
|
|
0 \
|
|
}}
|
|
|
|
#endif /* AIX_ONCE_INIT_2_CHECK */
|
|
|
|
|
|
#if defined( AIX_MUTEX_INITIALIZER_1_CHECK )
|
|
#define PTHREAD_MUTEX_INITIALIZER \
|
|
{{ \
|
|
|
|
#endif /* AIX_MUTEX_INITIALIZER_1_CHECK */
|
|
|
|
|
|
#if defined( AIX_COND_INITIALIZER_1_CHECK )
|
|
#define PTHREAD_COND_INITIALIZER \
|
|
{{ \
|
|
|
|
#endif /* AIX_COND_INITIALIZER_1_CHECK */
|
|
|
|
|
|
#if defined( AIX_RWLOCK_INITIALIZER_1_CHECK )
|
|
#define PTHREAD_RWLOCK_INITIALIZER \
|
|
{{ \
|
|
|
|
#endif /* AIX_RWLOCK_INITIALIZER_1_CHECK */
|
|
|
|
|
|
#if defined( AIX_PTHREAD_CHECK )
|
|
#define PTHREAD_MUTEX_INITIALIZER \
|
|
{...init stuff...}
|
|
#endif /* AIX_PTHREAD_CHECK */
|
|
|
|
|
|
#if defined( GLIBC_MUTEX_INIT_CHECK )
|
|
#define PTHREAD_MUTEX_INITIALIZER \
|
|
{ { 0, 0, 0, 0, 0, 0 } }
|
|
#ifdef __USE_GNU
|
|
# if __WORDSIZE == 64
|
|
# define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP \
|
|
{ { 0, 0, 0, 0, PTHREAD_MUTEX_RECURSIVE_NP, 0 } }
|
|
# define PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP \
|
|
{ { 0, 0, 0, 0, PTHREAD_MUTEX_ERRORCHECK_NP, 0 } }
|
|
# define PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP \
|
|
{ { 0, 0, 0, 0, PTHREAD_MUTEX_ADAPTIVE_NP, 0 } }
|
|
# else
|
|
# define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP \
|
|
{ { 0, 0, 0, PTHREAD_MUTEX_RECURSIVE_NP, 0, 0 } }
|
|
# define PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP \
|
|
{ { 0, 0, 0, PTHREAD_MUTEX_ERRORCHECK_NP, 0, 0 } }
|
|
# define PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP \
|
|
{ { 0, 0, 0, PTHREAD_MUTEX_ADAPTIVE_NP, 0, 0 } }
|
|
# endif
|
|
#endif
|
|
# if __WORDSIZE == 64
|
|
# define PTHREAD_RWLOCK_INITIALIZER \
|
|
{ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }
|
|
# else
|
|
# define PTHREAD_RWLOCK_INITIALIZER \
|
|
{ { 0, 0, 0, 0, 0, 0, 0, 0 } }
|
|
# endif
|
|
# ifdef __USE_GNU
|
|
# if __WORDSIZE == 64
|
|
# define PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP \
|
|
{ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \
|
|
PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP } }
|
|
# else
|
|
# define PTHREAD_RWLOCK_WRITER_NONRECURSIVE_INITIALIZER_NP \
|
|
{ { 0, 0, 0, 0, 0, 0, PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP, 0 } }
|
|
# endif
|
|
# endif
|
|
#define PTHREAD_COND_INITIALIZER { { 0, 0, 0, 0, 0, (void *) 0, 0, 0 } }
|
|
#endif /* GLIBC_MUTEX_INIT_CHECK */
|
|
|
|
|
|
#if defined( PTHREAD_INCOMPLETE_STRUCT_ARGUMENT_CHECK )
|
|
extern int __sigsetjmp (struct __jmp_buf_tag *__env, int __savemask);
|
|
#endif /* PTHREAD_INCOMPLETE_STRUCT_ARGUMENT_CHECK */
|
|
|
|
|
|
#if defined( THREAD_KEYWORD_CHECK )
|
|
extern int pthread_create (pthread_t *__restrict __thr,
|
|
extern int pthread_kill (pthread_t __thr, int __signo);
|
|
extern int pthread_cancel (pthread_t __thr);
|
|
#endif /* THREAD_KEYWORD_CHECK */
|