[17/30] Linux: consolidate ____longjmp_chk

Message ID 20221019221433.1082017-18-adhemerval.zanella@linaro.org
State Committed
Commit a33919698b8b7e556f2eaf7d8550842ee654f2ae
Headers
Series Remove Linux generic sysdep |

Checks

Context Check Description
dj/TryBot-apply_patch success Patch applied to master at the time it was sent

Commit Message

Adhemerval Zanella Oct. 19, 2022, 10:14 p.m. UTC
  Checked on x86_64-linux-gnu.
---
 sysdeps/unix/sysv/linux/{generic => }/____longjmp_chk.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename sysdeps/unix/sysv/linux/{generic => }/____longjmp_chk.c (90%)
  

Comments

Carlos O'Donell Dec. 5, 2022, 4:40 p.m. UTC | #1
On 10/19/22 18:14, Adhemerval Zanella via Libc-alpha wrote:
> Checked on x86_64-linux-gnu.

LGTM.

No regressions on x86_64 and i686.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Tested-by: Carlos O'Donell <carlos@redhat.com>


> ---
>  sysdeps/unix/sysv/linux/{generic => }/____longjmp_chk.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>  rename sysdeps/unix/sysv/linux/{generic => }/____longjmp_chk.c (90%)
> 
> diff --git a/sysdeps/unix/sysv/linux/generic/____longjmp_chk.c b/sysdeps/unix/sysv/linux/____longjmp_chk.c
> similarity index 90%
> rename from sysdeps/unix/sysv/linux/generic/____longjmp_chk.c
> rename to sysdeps/unix/sysv/linux/____longjmp_chk.c
> index aac1158853..687cb27133 100644
> --- a/sysdeps/unix/sysv/linux/generic/____longjmp_chk.c
> +++ b/sysdeps/unix/sysv/linux/____longjmp_chk.c
> @@ -1,4 +1,5 @@
> -/* Copyright (C) 2011-2022 Free Software Foundation, Inc.
> +/* longjmp fortify implementation.  Linux version.
> +   Copyright (C) 2011-2022 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
> @@ -28,8 +29,7 @@
>  #define called_from(this, saved) ((this) > (saved))
>  #endif
>  
> -extern void ____longjmp_chk (__jmp_buf __env, int __val)
> -  __attribute__ ((__noreturn__));
> +_Noreturn extern void ____longjmp_chk (__jmp_buf __env, int __val);

OK.

>  
>  void ____longjmp_chk (__jmp_buf env, int val)
>  {
  

Patch

diff --git a/sysdeps/unix/sysv/linux/generic/____longjmp_chk.c b/sysdeps/unix/sysv/linux/____longjmp_chk.c
similarity index 90%
rename from sysdeps/unix/sysv/linux/generic/____longjmp_chk.c
rename to sysdeps/unix/sysv/linux/____longjmp_chk.c
index aac1158853..687cb27133 100644
--- a/sysdeps/unix/sysv/linux/generic/____longjmp_chk.c
+++ b/sysdeps/unix/sysv/linux/____longjmp_chk.c
@@ -1,4 +1,5 @@ 
-/* Copyright (C) 2011-2022 Free Software Foundation, Inc.
+/* longjmp fortify implementation.  Linux version.
+   Copyright (C) 2011-2022 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
@@ -28,8 +29,7 @@ 
 #define called_from(this, saved) ((this) > (saved))
 #endif
 
-extern void ____longjmp_chk (__jmp_buf __env, int __val)
-  __attribute__ ((__noreturn__));
+_Noreturn extern void ____longjmp_chk (__jmp_buf __env, int __val);
 
 void ____longjmp_chk (__jmp_buf env, int val)
 {