about summary refs log tree commit diff
diff options
context:
space:
mode:
authorWill Newton <will.newton@linaro.org>2014-05-09 13:53:56 +0100
committerWill Newton <will.newton@linaro.org>2014-05-09 16:57:12 +0100
commit28162f4dac274a4b635d95fc2442bef888df1d57 (patch)
treecae3ec8519468def877fead91accf1eea89bb738
parent5a414ff70c3a45e52b5f5c0741bd459a84cf56b8 (diff)
downloadglibc-28162f4dac274a4b635d95fc2442bef888df1d57.tar.gz
glibc-28162f4dac274a4b635d95fc2442bef888df1d57.tar.xz
glibc-28162f4dac274a4b635d95fc2442bef888df1d57.zip
ARM: Allow auto-detection of linker relro feature
Set values for libc_commonpagesize and libc_relro_required for the
ARM port to enable relro by default and suppress a warning at
configure time.

ChangeLog:

2014-05-09  Will Newton  <will.newton@linaro.org>

	* sysdeps/arm/preconfigure.ac: Set libc_commonpagesize
	and libc_relro_required for ARM.
	* sysdeps/arm/preconfigure: Regenerate.
-rw-r--r--ChangeLog6
-rw-r--r--sysdeps/arm/preconfigure8
-rw-r--r--sysdeps/arm/preconfigure.ac8
3 files changed, 22 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index a64ca9f269..307aabb69e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-05-09  Will Newton  <will.newton@linaro.org>
+
+	* sysdeps/arm/preconfigure.ac: Set libc_commonpagesize
+	and libc_relro_required for ARM.
+	* sysdeps/arm/preconfigure: Regenerate.
+
 2014-05-09  Dominik Vogt  <vogt@linux.vnet.ibm.com>
 	    Stefan Liebler  <stli@linux.vnet.ibm.com>
 
diff --git a/sysdeps/arm/preconfigure b/sysdeps/arm/preconfigure
index b3124edae2..74869b10a8 100644
--- a/sysdeps/arm/preconfigure
+++ b/sysdeps/arm/preconfigure
@@ -61,3 +61,11 @@ $as_echo "$as_me: WARNING: arm/preconfigure: Did not find ARM architecture type;
 
   machine=arm/$machine
 esac
+
+case "$machine" in
+arm*)
+	# Parameters to allow auto-detection of -z relro.
+	libc_commonpagesize=0x1000
+	libc_relro_required=yes
+	;;
+esac
diff --git a/sysdeps/arm/preconfigure.ac b/sysdeps/arm/preconfigure.ac
index 39c86218aa..29a260c30b 100644
--- a/sysdeps/arm/preconfigure.ac
+++ b/sysdeps/arm/preconfigure.ac
@@ -56,3 +56,11 @@ arm*)
 
   machine=arm/$machine
 esac
+
+case "$machine" in
+arm*)
+	# Parameters to allow auto-detection of -z relro.
+	libc_commonpagesize=0x1000
+	libc_relro_required=yes
+	;;
+esac