From: Rainer Orth Date: Wed, 10 Dec 2025 08:05:55 +0000 (+0100) Subject: Fix PID_TYPE on 32-bit Solaris X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89889bff20f43c30b4711ba6cb492620e5ec3349;p=thirdparty%2Fgcc.git Fix PID_TYPE on 32-bit Solaris The pid_t type on 32-bit Solaris differs from gcc's builtin. has typedef int pid_t; /* process id type */ typedef long pid_t; /* (historical version) */ while gcc/defaults.h uses on all targets. This patch fixes this by providing a Solaris definition. g++.dg/lookup/extern-c-redecl3.C had to be adjusted accordingly. Bootstrapped without regressions on i386-pc-solaris2.11, sparc-sun-solaris2.11, and x86_64-pc-linux-gnu. 2025-11-17 Rainer Orth gcc: * config/sol2.h (PID_TYPE): Define. * doc/tm.texi.in (Type Layout): Document PID_TYPE. * doc/tm.texi: Regenerate. gcc/testsuite: * g++.dg/lookup/extern-c-redecl3.C (pid_t): Define. Use it for fork return type. terms of __builtin_fork. * g++.dg/pid_t-1.C: New test. * gcc.dg/pid_t-1.c: Likewise. --- diff --git a/gcc/config/sol2.h b/gcc/config/sol2.h index 4e3199d2c8c..026d363ff6b 100644 --- a/gcc/config/sol2.h +++ b/gcc/config/sol2.h @@ -41,6 +41,12 @@ along with GCC; see the file COPYING3. If not see #undef WINT_TYPE_SIZE #define WINT_TYPE_SIZE 32 +/* Same for pid_t. See SCD 2.4.2, p. 6P-12, Figure 6-59 (64-bit). There's + no corresponding 32-bit definition, but this is what Solaris 8 + uses. */ + +#define PID_TYPE (TARGET_64BIT ? "int" : "long int") + #define SIG_ATOMIC_TYPE "int" /* ??? This definition of int8_t follows the system header but does diff --git a/gcc/doc/tm.texi b/gcc/doc/tm.texi index 25aad2eb74b..bbb1182117d 100644 --- a/gcc/doc/tm.texi +++ b/gcc/doc/tm.texi @@ -1825,6 +1825,7 @@ int}. @defmacx UINT_FAST64_TYPE @defmacx INTPTR_TYPE @defmacx UINTPTR_TYPE +@defmacx PID_TYPE C expressions for the standard types @code{sig_atomic_t}, @code{int8_t}, @code{int16_t}, @code{int32_t}, @code{int64_t}, @code{uint8_t}, @code{uint16_t}, @code{uint32_t}, @code{uint64_t}, @@ -1833,8 +1834,8 @@ C expressions for the standard types @code{sig_atomic_t}, @code{uint_least32_t}, @code{uint_least64_t}, @code{int_fast8_t}, @code{int_fast16_t}, @code{int_fast32_t}, @code{int_fast64_t}, @code{uint_fast8_t}, @code{uint_fast16_t}, @code{uint_fast32_t}, -@code{uint_fast64_t}, @code{intptr_t}, and @code{uintptr_t}. See -@code{SIZE_TYPE} above for more information. +@code{uint_fast64_t}, @code{intptr_t}, and @code{uintptr_t} and the +built-in type @code{pid_t}. See @code{SIZE_TYPE} above for more information. If any of these macros evaluates to a null pointer, the corresponding type is not supported; if GCC is configured to provide diff --git a/gcc/doc/tm.texi.in b/gcc/doc/tm.texi.in index 24d47b19e5f..253965bdafc 100644 --- a/gcc/doc/tm.texi.in +++ b/gcc/doc/tm.texi.in @@ -1553,6 +1553,7 @@ int}. @defmacx UINT_FAST64_TYPE @defmacx INTPTR_TYPE @defmacx UINTPTR_TYPE +@defmacx PID_TYPE C expressions for the standard types @code{sig_atomic_t}, @code{int8_t}, @code{int16_t}, @code{int32_t}, @code{int64_t}, @code{uint8_t}, @code{uint16_t}, @code{uint32_t}, @code{uint64_t}, @@ -1561,8 +1562,8 @@ C expressions for the standard types @code{sig_atomic_t}, @code{uint_least32_t}, @code{uint_least64_t}, @code{int_fast8_t}, @code{int_fast16_t}, @code{int_fast32_t}, @code{int_fast64_t}, @code{uint_fast8_t}, @code{uint_fast16_t}, @code{uint_fast32_t}, -@code{uint_fast64_t}, @code{intptr_t}, and @code{uintptr_t}. See -@code{SIZE_TYPE} above for more information. +@code{uint_fast64_t}, @code{intptr_t}, and @code{uintptr_t} and the +built-in type @code{pid_t}. See @code{SIZE_TYPE} above for more information. If any of these macros evaluates to a null pointer, the corresponding type is not supported; if GCC is configured to provide diff --git a/gcc/testsuite/g++.dg/lookup/extern-c-redecl3.C b/gcc/testsuite/g++.dg/lookup/extern-c-redecl3.C index 56dcefa7670..c9c9bd5ba2e 100644 --- a/gcc/testsuite/g++.dg/lookup/extern-c-redecl3.C +++ b/gcc/testsuite/g++.dg/lookup/extern-c-redecl3.C @@ -5,17 +5,19 @@ // { dg-final { scan-assembler-not "call\[\t \]+\[^\$\]*?_Z4forkv" { target i?86-*-* x86_64-*-* } } } // { dg-final { scan-assembler "call\[\t \]+_?fork" { target i?86-*-* x86_64-*-* } } } -extern "C" int fork (void); +typedef __typeof (__builtin_fork ()) pid_t; + +extern "C" pid_t fork (void); void foo () { - extern int fork (void); + extern pid_t fork (void); fork (); } extern "C" -int +pid_t fork (void) { return 0; diff --git a/gcc/testsuite/g++.dg/pid_t-1.C b/gcc/testsuite/g++.dg/pid_t-1.C new file mode 100644 index 00000000000..cb32eb4b44a --- /dev/null +++ b/gcc/testsuite/g++.dg/pid_t-1.C @@ -0,0 +1,3 @@ +/* { dg-options "-Wall" } */ + +extern "C" int fork (void); // { dg-warning "conflicts with built-in declaration" "" { target { *-*-solaris2* && ilp32 } } } diff --git a/gcc/testsuite/gcc.dg/pid_t-1.c b/gcc/testsuite/gcc.dg/pid_t-1.c new file mode 100644 index 00000000000..f4f3f688100 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pid_t-1.c @@ -0,0 +1,19 @@ +/* { dg-do compile } */ +/* { dg-options "-Wall" } */ +/* { dg-require-fork "" } */ + +/* Compile with -Wall to get a warning if built-in and system pid_t don't + match. */ + +#include + +typedef __typeof (__builtin_fork ()) __builtin_pid_t; + +__builtin_pid_t __p_t__; +pid_t *p_t_p; + +void +pt (void) +{ + p_t_p = &__p_t__; +}