diff options
| author | Roland McGrath <roland@hack.frob.com> | 2011-07-11 18:38:13 -0700 |
|---|---|---|
| committer | Roland McGrath <roland@hack.frob.com> | 2011-07-11 18:38:13 -0700 |
| commit | defe906180bad4e356bb55b60b10abd41b7ee3a1 (patch) | |
| tree | fa666c8b5304820b49c9eaaf8e3c295958ef4720 | |
| parent | 319b9ad4bccedb2a6b1a222cf446e873b2bc6de1 (diff) | |
| download | glibc-defe906180bad4e356bb55b60b10abd41b7ee3a1.tar.gz glibc-defe906180bad4e356bb55b60b10abd41b7ee3a1.tar.xz glibc-defe906180bad4e356bb55b60b10abd41b7ee3a1.zip | |
Fix a braino in new relro configure test.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | configure.in | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 31902a0a3f..9738f7bd51 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 ffeb89057f..d44659bb2c 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 e18b343416..d40bc64ca2 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 { |