From: Richard Henderson <rth@twiddle.net>
Date: Thu, 17 Apr 2014 04:28:50 +0000 (-0700)
Subject: alpha: Fix __pointer_chk_guard definition for the testsuite
X-Git-Tag: glibc-2.20~615
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a3df56fcae737c71508c7f8d38f0728642b66d66;p=thirdparty%2Fglibc.git

alpha: Fix __pointer_chk_guard definition for the testsuite
---

diff --git a/ChangeLog b/ChangeLog
index 3f9b7eaf84d..31731d3d102 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2014-04-16  Richard Henderson  <rth@redhat.com>
 
+	* sysdeps/unix/alpha/sysdep.h (__pointer_chk_guard): Remove
+	const from the non-libc, non-ldso copy.
+
 	* sysdeps/alpha/libm-test-ulps: Regenerate.
 
 2014-04-16  Marcus Shawcroft  <marcus.shawcroft@arm.com>
diff --git a/sysdeps/unix/alpha/sysdep.h b/sysdeps/unix/alpha/sysdep.h
index 7425026241b..0c40ca64bc6 100644
--- a/sysdeps/unix/alpha/sysdep.h
+++ b/sysdeps/unix/alpha/sysdep.h
@@ -377,7 +377,7 @@ extern uintptr_t __pointer_chk_guard_local attribute_relro attribute_hidden;
 #  define PTR_MANGLE(var) \
 	(var) = (__typeof (var)) ((uintptr_t) (var) ^ __pointer_chk_guard_local)
 # else
-extern const uintptr_t __pointer_chk_guard attribute_relro;
+extern uintptr_t __pointer_chk_guard attribute_relro;
 #  define PTR_MANGLE(var) \
 	(var) = (__typeof(var)) ((uintptr_t) (var) ^ __pointer_chk_guard)
 # endif