aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2014-01-20 11:05:22 -0800
committerH.J. Lu <hjl.tools@gmail.com>2014-01-20 11:13:43 -0800
commit2a8396b962b8c57a2581023b62766a3ac44c3ba4 (patch)
tree09b202a6e8f047277ea80d270318117ba57919e5
parent0553c6642be2cdf6bac776fac5fd50164cb28709 (diff)
downloadglibc-2a8396b962b8c57a2581023b62766a3ac44c3ba4.tar
glibc-2a8396b962b8c57a2581023b62766a3ac44c3ba4.tar.gz
glibc-2a8396b962b8c57a2581023b62766a3ac44c3ba4.tar.bz2
glibc-2a8396b962b8c57a2581023b62766a3ac44c3ba4.zip
Include generic symbol-hacks.h for x32
In BZ #15605 fix with addding memset/memmove alias in symbol-hacks.h, x32 symbol-hacks.h change was missing. Fixed by including <sysdeps/generic/symbol-hacks.h> in x32 symbol-hacks.h.
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/x86_64/x32/symbol-hacks.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 74d433076e..15ce0b6aa2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-20 H.J. Lu <hongjiu.lu@intel.com>
+
+ [BZ #15605]
+ * sysdeps/x86_64/x32/symbol-hacks.h: Include generic symbol-hacks.h.
+
2014-01-04 Maxim Kuvyrkov <maxim@kugelworks.com>
Ondřej Bílka <neleai@seznam.cz>
diff --git a/sysdeps/x86_64/x32/symbol-hacks.h b/sysdeps/x86_64/x32/symbol-hacks.h
index bc7b4c4441..22aad04437 100644
--- a/sysdeps/x86_64/x32/symbol-hacks.h
+++ b/sysdeps/x86_64/x32/symbol-hacks.h
@@ -1 +1 @@
-/* Fortunately nothing to do. */
+#include <sysdeps/generic/symbol-hacks.h>