Commit a2cc9655 authored by Thomas Petazzoni's avatar Thomas Petazzoni
Browse files

gcc: simplify musl patches for SSP support 



Now that we are always explicitly passing gcc_cv_libc_provides_ssp,
there is no longer any reason to modify the gcc configure/configure.ac
to take into account the musl case. When a musl toolchain is being
built, BR2_TOOLCHAIN_HAS_SSP is always 'y', and therefore
gcc_cv_libc_provides_ssp=yes is always passed when building
gcc-initial and gcc-final.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent a7463a6c

package/gcc/4.7.4/900-musl-support.patch

+0 −36
Original line number Diff line number Diff line
@@ -323,24 +323,6 @@ Index: b/gcc/configure 
===================================================================

--- a/gcc/configure

+++ b/gcc/configure

@@ -26791,6 +26791,9 @@

 else

   gcc_cv_libc_provides_ssp=no

     case "$target" in

+       *-*-musl*)

+         # All versions of musl provide stack protector

+	 gcc_cv_libc_provides_ssp=yes;;

        *-*-linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu)

       # glibc 2.4 and later provides __stack_chk_fail and

       # either __stack_chk_guard, or TLS access to stack guard canary.

@@ -26824,6 +26827,7 @@

 	 # <http://gcc.gnu.org/ml/gcc/2008-10/msg00130.html>) and for now

 	 # simply assert that glibc does provide this, which is true for all

 	 # realistically usable GNU/Hurd configurations.

+	 # All supported versions of musl provide it as well

 	 gcc_cv_libc_provides_ssp=yes;;

        *-*-darwin* | *-*-freebsd*)

 	 ac_fn_c_check_func "$LINENO" "__stack_chk_fail" "ac_cv_func___stack_chk_fail"

@@ -26906,6 +26910,9 @@

       gcc_cv_target_dl_iterate_phdr=no

     fi
@@ -355,24 +337,6 @@ Index: b/gcc/configure.ac 
===================================================================

--- a/gcc/configure.ac

+++ b/gcc/configure.ac

@@ -4669,6 +4669,9 @@

       gcc_cv_libc_provides_ssp,

       [gcc_cv_libc_provides_ssp=no

     case "$target" in

+       *-*-musl*)

+         # All versions of musl provide stack protector

+	 gcc_cv_libc_provides_ssp=yes;;

        *-*-linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu)

       [# glibc 2.4 and later provides __stack_chk_fail and

       # either __stack_chk_guard, or TLS access to stack guard canary.

@@ -4702,6 +4705,7 @@

 	 # <http://gcc.gnu.org/ml/gcc/2008-10/msg00130.html>) and for now

 	 # simply assert that glibc does provide this, which is true for all

 	 # realistically usable GNU/Hurd configurations.

+	 # All supported versions of musl provide it as well

 	 gcc_cv_libc_provides_ssp=yes;;

        *-*-darwin* | *-*-freebsd*)

 	 AC_CHECK_FUNC(__stack_chk_fail,[gcc_cv_libc_provides_ssp=yes],

@@ -4767,6 +4771,9 @@

       gcc_cv_target_dl_iterate_phdr=no

     fi

package/gcc/4.8.5/900-musl-support.patch

+0 −36
Original line number Diff line number Diff line
@@ -486,24 +486,6 @@ Index: b/gcc/configure 
===================================================================

--- a/gcc/configure

+++ b/gcc/configure

@@ -26821,6 +26821,9 @@

 else

   gcc_cv_libc_provides_ssp=no

     case "$target" in

+       *-*-musl*)

+         # All versions of musl provide stack protector

+	 gcc_cv_libc_provides_ssp=yes;;

        *-*-linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu)

       # glibc 2.4 and later provides __stack_chk_fail and

       # either __stack_chk_guard, or TLS access to stack guard canary.

@@ -26854,6 +26857,7 @@

 	 # <http://gcc.gnu.org/ml/gcc/2008-10/msg00130.html>) and for now

 	 # simply assert that glibc does provide this, which is true for all

 	 # realistically usable GNU/Hurd configurations.

+	 # All supported versions of musl provide it as well

 	 gcc_cv_libc_provides_ssp=yes;;

        *-*-darwin* | *-*-freebsd*)

 	 ac_fn_c_check_func "$LINENO" "__stack_chk_fail" "ac_cv_func___stack_chk_fail"

@@ -26936,6 +26940,9 @@

       gcc_cv_target_dl_iterate_phdr=no

     fi
@@ -518,24 +500,6 @@ Index: b/gcc/configure.ac 
===================================================================

--- a/gcc/configure.ac

+++ b/gcc/configure.ac

@@ -4750,6 +4750,9 @@

       gcc_cv_libc_provides_ssp,

       [gcc_cv_libc_provides_ssp=no

     case "$target" in

+       *-*-musl*)

+         # All versions of musl provide stack protector

+	 gcc_cv_libc_provides_ssp=yes;;

        *-*-linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu)

       [# glibc 2.4 and later provides __stack_chk_fail and

       # either __stack_chk_guard, or TLS access to stack guard canary.

@@ -4783,6 +4786,7 @@

 	 # <http://gcc.gnu.org/ml/gcc/2008-10/msg00130.html>) and for now

 	 # simply assert that glibc does provide this, which is true for all

 	 # realistically usable GNU/Hurd configurations.

+	 # All supported versions of musl provide it as well

 	 gcc_cv_libc_provides_ssp=yes;;

        *-*-darwin* | *-*-freebsd*)

 	 AC_CHECK_FUNC(__stack_chk_fail,[gcc_cv_libc_provides_ssp=yes],

@@ -4848,6 +4852,9 @@

       gcc_cv_target_dl_iterate_phdr=no

     fi

package/gcc/4.9.3/900-musl-support.patch

+0 −36
Original line number Diff line number Diff line
@@ -452,24 +452,6 @@ Index: b/gcc/configure 
===================================================================

--- a/gcc/configure

+++ b/gcc/configure

@@ -27328,6 +27328,9 @@

 else

   gcc_cv_libc_provides_ssp=no

     case "$target" in

+       *-*-musl*)

+         # All versions of musl provide stack protector

+	 gcc_cv_libc_provides_ssp=yes;;

        *-*-linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu)

       # glibc 2.4 and later provides __stack_chk_fail and

       # either __stack_chk_guard, or TLS access to stack guard canary.

@@ -27360,6 +27363,7 @@

 	 # <http://gcc.gnu.org/ml/gcc/2008-10/msg00130.html>) and for now

 	 # simply assert that glibc does provide this, which is true for all

 	 # realistically usable GNU/Hurd configurations.

+	 # All supported versions of musl provide it as well

 	 gcc_cv_libc_provides_ssp=yes;;

        *-*-darwin* | *-*-freebsd*)

 	 ac_fn_c_check_func "$LINENO" "__stack_chk_fail" "ac_cv_func___stack_chk_fail"

@@ -27449,6 +27453,9 @@

       gcc_cv_target_dl_iterate_phdr=no

     fi
@@ -484,24 +466,6 @@ Index: b/gcc/configure.ac 
===================================================================

--- a/gcc/configure.ac

+++ b/gcc/configure.ac

@@ -5016,6 +5016,9 @@

       gcc_cv_libc_provides_ssp,

       [gcc_cv_libc_provides_ssp=no

     case "$target" in

+       *-*-musl*)

+         # All versions of musl provide stack protector

+	 gcc_cv_libc_provides_ssp=yes;;

        *-*-linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu)

       # glibc 2.4 and later provides __stack_chk_fail and

       # either __stack_chk_guard, or TLS access to stack guard canary.

@@ -5042,6 +5045,7 @@

 	 # <http://gcc.gnu.org/ml/gcc/2008-10/msg00130.html>) and for now

 	 # simply assert that glibc does provide this, which is true for all

 	 # realistically usable GNU/Hurd configurations.

+	 # All supported versions of musl provide it as well

 	 gcc_cv_libc_provides_ssp=yes;;

        *-*-darwin* | *-*-freebsd*)

 	 AC_CHECK_FUNC(__stack_chk_fail,[gcc_cv_libc_provides_ssp=yes],

@@ -5108,6 +5112,9 @@

       gcc_cv_target_dl_iterate_phdr=no

     fi

package/gcc/5.2.0/904-musl-libc-config.patch

+0 −36
Original line number Diff line number Diff line
@@ -225,24 +225,6 @@ Index: b/gcc/configure 
===================================================================

--- a/gcc/configure

+++ b/gcc/configure

@@ -27681,6 +27681,9 @@

 else

   gcc_cv_libc_provides_ssp=no

     case "$target" in

+       *-*-musl*)

+	 # All versions of musl provide stack protector

+	 gcc_cv_libc_provides_ssp=yes;;

        *-*-linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu)

       # glibc 2.4 and later provides __stack_chk_fail and

       # either __stack_chk_guard, or TLS access to stack guard canary.

@@ -27713,6 +27716,7 @@

 	 # <http://gcc.gnu.org/ml/gcc/2008-10/msg00130.html>) and for now

 	 # simply assert that glibc does provide this, which is true for all

 	 # realistically usable GNU/Hurd configurations.

+	 # All supported versions of musl provide it as well

 	 gcc_cv_libc_provides_ssp=yes;;

        *-*-darwin* | *-*-freebsd*)

 	 ac_fn_c_check_func "$LINENO" "__stack_chk_fail" "ac_cv_func___stack_chk_fail"

@@ -27809,6 +27813,9 @@

       gcc_cv_target_dl_iterate_phdr=no

     fi
@@ -257,24 +239,6 @@ Index: b/gcc/configure.ac 
===================================================================

--- a/gcc/configure.ac

+++ b/gcc/configure.ac

@@ -5199,6 +5199,9 @@

       gcc_cv_libc_provides_ssp,

       [gcc_cv_libc_provides_ssp=no

     case "$target" in

+       *-*-musl*)

+	 # All versions of musl provide stack protector

+	 gcc_cv_libc_provides_ssp=yes;;

        *-*-linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu)

       # glibc 2.4 and later provides __stack_chk_fail and

       # either __stack_chk_guard, or TLS access to stack guard canary.

@@ -5225,6 +5228,7 @@

 	 # <http://gcc.gnu.org/ml/gcc/2008-10/msg00130.html>) and for now

 	 # simply assert that glibc does provide this, which is true for all

 	 # realistically usable GNU/Hurd configurations.

+	 # All supported versions of musl provide it as well

 	 gcc_cv_libc_provides_ssp=yes;;

        *-*-darwin* | *-*-freebsd*)

 	 AC_CHECK_FUNC(__stack_chk_fail,[gcc_cv_libc_provides_ssp=yes],

@@ -5298,6 +5302,9 @@

       gcc_cv_target_dl_iterate_phdr=no

     fi