From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Wed, 19 May 2021 13:22:19 +0000 (-0300)
Subject: Remove --enable-stackguard-randomization (BZ #27872)
X-Git-Tag: glibc-2.34~378
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f294306ba1385b096f4e4cac9146a989f1e6d1c0;p=thirdparty%2Fglibc.git

Remove --enable-stackguard-randomization (BZ #27872)

Last ENABLE_STACKGUARD_RANDOMIZE usage was removed by 4a103975c4.
---

diff --git a/config.h.in b/config.h.in
index 99036b887ff..d54c8c5d139 100644
--- a/config.h.in
+++ b/config.h.in
@@ -160,9 +160,6 @@
 /* Define if your compiler defaults to -msecure-plt mode on ppc.  */
 #undef HAVE_PPC_SECURE_PLT
 
-/* Define if __stack_chk_guard canary should be randomized at program startup.  */
-#undef ENABLE_STACKGUARD_RANDOMIZE
-
 /* Define if memory tagging support should be enabled.  */
 #undef USE_MTAG
 
diff --git a/configure b/configure
index 4cc462613c9..5dde2ba3551 100755
--- a/configure
+++ b/configure
@@ -770,7 +770,6 @@ enable_profile
 enable_static_pie
 enable_timezone_tools
 enable_hardcoded_path_in_tests
-enable_stackguard_randomization
 enable_hidden_plt
 enable_bind_now
 enable_stack_protector
@@ -1430,9 +1429,6 @@ Optional Features:
   --enable-hardcoded-path-in-tests
                           hardcode newly built glibc path in tests
                           [default=no]
-  --enable-stackguard-randomization
-                          initialize __stack_chk_guard canary with a random
-                          number at program start
   --disable-hidden-plt    do not hide internal function calls to avoid PLT
   --enable-bind-now       disable lazy relocations in DSOs
   --enable-stack-protector=[yes|no|all|strong]
@@ -3397,18 +3393,6 @@ fi
 
 
 
-# Check whether --enable-stackguard-randomization was given.
-if test "${enable_stackguard_randomization+set}" = set; then :
-  enableval=$enable_stackguard_randomization; enable_stackguard_randomize=$enableval
-else
-  enable_stackguard_randomize=no
-fi
-
-if test "$enable_stackguard_randomize" = yes; then
-  $as_echo "#define ENABLE_STACKGUARD_RANDOMIZE 1" >>confdefs.h
-
-fi
-
 # Check whether --enable-hidden-plt was given.
 if test "${enable_hidden_plt+set}" = set; then :
   enableval=$enable_hidden_plt; hidden=$enableval
diff --git a/configure.ac b/configure.ac
index 64be29d8777..19051b8ee06 100644
--- a/configure.ac
+++ b/configure.ac
@@ -198,15 +198,6 @@ AC_ARG_ENABLE([hardcoded-path-in-tests],
 	      [hardcoded_path_in_tests=no])
 AC_SUBST(hardcoded_path_in_tests)
 
-AC_ARG_ENABLE([stackguard-randomization],
-	      AS_HELP_STRING([--enable-stackguard-randomization],
-			     [initialize __stack_chk_guard canary with a random number at program start]),
-	      [enable_stackguard_randomize=$enableval],
-	      [enable_stackguard_randomize=no])
-if test "$enable_stackguard_randomize" = yes; then
-  AC_DEFINE(ENABLE_STACKGUARD_RANDOMIZE)
-fi
-
 AC_ARG_ENABLE([hidden-plt],
 	      AS_HELP_STRING([--disable-hidden-plt],
 			     [do not hide internal function calls to avoid PLT]),