[PATCH] Add missing include guards to <dl-tls.h>

Sam James sam@gentoo.org
Fri Jan 10 18:30:14 GMT 2025



> On 10 Jan 2025, at 18:06, Florian Weimer <fweimer@redhat.com> wrote:
> 
> Some architecture-specific variants lack header inclusion guards.
> Add them for consistency with the generic version.
> 
ok

> ---
> sysdeps/i386/dl-tls.h  | 4 ++++
> sysdeps/m68k/dl-tls.h  | 4 ++++
> sysdeps/mips/dl-tls.h  | 4 ++++
> sysdeps/riscv/dl-tls.h | 4 ++++
> sysdeps/s390/dl-tls.h  | 4 ++++
> 5 files changed, 20 insertions(+)
> 
> diff --git a/sysdeps/i386/dl-tls.h b/sysdeps/i386/dl-tls.h
> index 2dac81bbd2..f453931d78 100644
> --- a/sysdeps/i386/dl-tls.h
> +++ b/sysdeps/i386/dl-tls.h
> @@ -16,6 +16,8 @@
>    License along with the GNU C Library; if not, see
>    <https://www.gnu.org/licenses/>.  */
> 
> +#ifndef _DL_TLS_H
> +#define _DL_TLS_H
> 
> /* Type used for the representation of TLS information in the GOT.  */
> typedef struct dl_tls_index
> @@ -65,3 +67,5 @@ rtld_hidden_def (___tls_get_addr)
> 
> # endif
> #endif
> +
> +#endif /* _DL_TLS_H */
> diff --git a/sysdeps/m68k/dl-tls.h b/sysdeps/m68k/dl-tls.h
> index 458027868f..85817fcce9 100644
> --- a/sysdeps/m68k/dl-tls.h
> +++ b/sysdeps/m68k/dl-tls.h
> @@ -16,6 +16,8 @@
>    License along with the GNU C Library.  If not, see
>    <https://www.gnu.org/licenses/>.  */
> 
> +#ifndef _DL_TLS_H
> +#define _DL_TLS_H
> 
> /* Type used for the representation of TLS information in the GOT.  */
> typedef struct
> @@ -43,3 +45,5 @@ typedef struct
> extern void *__tls_get_addr (tls_index *ti);
> 
> #define __TLS_GET_ADDR(__ti)    (__tls_get_addr (__ti) - TLS_DTV_OFFSET)
> +
> +#endif /* _DL_TLS_H */
> diff --git a/sysdeps/mips/dl-tls.h b/sysdeps/mips/dl-tls.h
> index 1ce3054bbb..c1859719f5 100644
> --- a/sysdeps/mips/dl-tls.h
> +++ b/sysdeps/mips/dl-tls.h
> @@ -16,6 +16,8 @@
>    License along with the GNU C Library.  If not, see
>    <https://www.gnu.org/licenses/>.  */
> 
> +#ifndef _DL_TLS_H
> +#define _DL_TLS_H
> 
> /* Type used for the representation of TLS information in the GOT.  */
> typedef struct
> @@ -42,3 +44,5 @@ typedef struct
> extern void *__tls_get_addr (tls_index *ti);
> 
> #define __TLS_GET_ADDR(__ti)    (__tls_get_addr (__ti) - TLS_DTV_OFFSET)
> +
> +#endif /* _DL_TLS_H */
> diff --git a/sysdeps/riscv/dl-tls.h b/sysdeps/riscv/dl-tls.h
> index 467c0b6179..b8931a0fa5 100644
> --- a/sysdeps/riscv/dl-tls.h
> +++ b/sysdeps/riscv/dl-tls.h
> @@ -16,6 +16,8 @@
>    License along with the GNU C Library.  If not, see
>    <https://www.gnu.org/licenses/>.  */
> 
> +#ifndef _DL_TLS_H
> +#define _DL_TLS_H
> 
> /* Type used for the representation of TLS information in the GOT.  */
> typedef struct
> @@ -45,3 +47,5 @@ extern void *__tls_get_addr (tls_index *ti);
> 
> /* Value used for dtv entries for which the allocation is delayed.  */
> #define TLS_DTV_UNALLOCATED    ((void *) -1l)
> +
> +#endif /* _DL_TLS_H */
> diff --git a/sysdeps/s390/dl-tls.h b/sysdeps/s390/dl-tls.h
> index 53fd362475..34bf840d53 100644
> --- a/sysdeps/s390/dl-tls.h
> +++ b/sysdeps/s390/dl-tls.h
> @@ -16,6 +16,8 @@
>    License along with the GNU C Library; if not, see
>    <https://www.gnu.org/licenses/>.  */
> 
> +#ifndef _DL_TLS_H
> +#define _DL_TLS_H
> 
> /* Type used for the representation of TLS information in the GOT.  */
> typedef struct
> @@ -105,3 +107,5 @@ extern void *__tls_get_addr_internal (tls_index *ti);
>       + (unsigned long) __builtin_thread_pointer (); })
> 
> #endif
> +
> +#endif /* _DL_TLS_H */
> 
> base-commit: c3d1dac96bdd10250aa37bb367d5ef8334a093a1
> 


More information about the Libc-alpha mailing list