diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 04ea09f96b..da2197bbfe 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2012-05-14  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* amd64-tdep.c: Include features/i386/x32.c and
+	features/i386/x32-avx.c.
+	(_initialize_amd64_tdep): Call initialize_tdesc_x32 and
+	initialize_tdesc_x32_avx.
+
 2012-05-14  Stan Shebs  <stan@codesourcery.com>
 
 	Add dynamic printf.
diff --git a/gdb/amd64-tdep.c b/gdb/amd64-tdep.c
index b433e1f978..35d849bfd3 100644
--- a/gdb/amd64-tdep.c
+++ b/gdb/amd64-tdep.c
@@ -43,6 +43,8 @@
 
 #include "features/i386/amd64.c"
 #include "features/i386/amd64-avx.c"
+#include "features/i386/x32.c"
+#include "features/i386/x32-avx.c"
 
 #include "ax.h"
 #include "ax-gdb.h"
@@ -2736,6 +2738,8 @@ _initialize_amd64_tdep (void)
 {
   initialize_tdesc_amd64 ();
   initialize_tdesc_amd64_avx ();
+  initialize_tdesc_x32 ();
+  initialize_tdesc_x32_avx ();
 }