From 2a8396b962b8c57a2581023b62766a3ac44c3ba4 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Mon, 20 Jan 2014 11:05:22 -0800
Subject: [PATCH] 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.
---
 ChangeLog                         | 5 +++++
 sysdeps/x86_64/x32/symbol-hacks.h | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 74d433076e2..15ce0b6aa23 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 bc7b4c44411..22aad044376 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>
-- 
2.47.2