diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 82b803d737b..b6720524b66 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2018-04-15  Simon Marchi  <simon.marchi@polymtl.ca>
+
+	* configure.tgt (x86_tobjs): New variable.
+	(amd64_tobjs, i386_tobjs): Use it.
+
 2018-04-13  Andreas Arnez  <arnez@linux.vnet.ibm.com>
 
 	* symtab.c (print_symbol_info): Precede the symbol definition by
diff --git a/gdb/configure.tgt b/gdb/configure.tgt
index ba904117828..b252809b222 100644
--- a/gdb/configure.tgt
+++ b/gdb/configure.tgt
@@ -37,8 +37,9 @@ case $targ in
     ;;
 esac
 
-i386_tobjs="i386-tdep.o arch/i386.o i387-tdep.o"
-amd64_tobjs="amd64-tdep.o arch/amd64.o"
+x86_tobjs="x86-tdep.o"
+i386_tobjs="i386-tdep.o arch/i386.o i387-tdep.o ${x86_tobjs}"
+amd64_tobjs="amd64-tdep.o arch/amd64.o ${x86_tobjs}"
 
 # Here are three sections to get a list of target specific object
 # files according to target triplet $TARG.