From: Roland McGrath <roland@hack.frob.com>
Date: Tue, 12 Jul 2011 01:38:13 +0000 (-0700)
Subject: Fix a braino in new relro configure test.
X-Git-Tag: glibc-2.15~468
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=defe906180bad4e356bb55b60b10abd41b7ee3a1;p=thirdparty%2Fglibc.git

Fix a braino in new relro configure test.
---

diff --git a/ChangeLog b/ChangeLog
index 31902a0a3f1..9738f7bd51d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-07-11  Roland McGrath  <roland@hack.frob.com>
+
+	* configure.in (-z relro check): Fix test code to make the variable
+	truly const.
+	* configure: Regenerated.
+
 2011-07-11  Ulrich Drepper  <drepper@gmail.com>
 
 	* nscd/nscd.h (struct traced_file): Define.
diff --git a/configure b/configure
index ffeb89057f5..d44659bb2c1 100755
--- a/configure
+++ b/configure
@@ -6404,7 +6404,7 @@ else
 
 int _start (void) { return 42; }
 extern void _exit (int);
-const void *relro[] = { &_start, &_exit, 0 };
+const void *const relro[] = { &_start, &_exit, 0 };
 
 _ACEOF
     cat > conftest.awk <<\EOF
diff --git a/configure.in b/configure.in
index e18b3434160..d40bc64ca20 100644
--- a/configure.in
+++ b/configure.in
@@ -1607,7 +1607,7 @@ EOF
     AC_LANG_CONFTEST([AC_LANG_SOURCE([[
 int _start (void) { return 42; }
 extern void _exit (int);
-const void *relro[] = { &_start, &_exit, 0 };
+const void *const relro[] = { &_start, &_exit, 0 };
 ]])])
     cat > conftest.awk <<\EOF
 BEGIN {