+2017-09-05  Yao Qi  <yao.qi@linaro.org>
+
+       * configure.tgt (gdb_target_obs): Add i386.o for x86_64-*
+       targets.
+
 2017-09-05  Pedro Alves  <palves@redhat.com>
 
        * eval.c (eval_call, evaluate_funcall): New functions, factored
 
 
 x86_64-*-darwin*)
        # Target: Darwin/x86-64
-       gdb_target_obs="amd64-tdep.o amd64.o i386-tdep.o i387-tdep.o \
+       gdb_target_obs="amd64-tdep.o amd64.o i386-tdep.o i386.o i387-tdep.o \
                        i386-darwin-tdep.o amd64-darwin-tdep.o \
                         solib-darwin.o"
        ;;
 
 x86_64-*-dicos*)
        # Target: DICOS/x86-64
-       gdb_target_obs="amd64-tdep.o amd64.o i386-tdep.o i387-tdep.o \
+       gdb_target_obs="amd64-tdep.o amd64.o i386-tdep.o i386.o i387-tdep.o \
                        dicos-tdep.o i386-dicos-tdep.o amd64-dicos-tdep.o"
        ;;
 x86_64-*-elf*)
-       gdb_target_obs="amd64-tdep.o amd64.o i386-tdep.o i387-tdep.o"
+       gdb_target_obs="amd64-tdep.o amd64.o i386-tdep.o i386.o i387-tdep.o"
        ;;
 x86_64-*-linux*)
        # Target: GNU/Linux x86-64
 x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu)
        # Target: FreeBSD/amd64
        gdb_target_obs="amd64-tdep.o amd64.o amd64-fbsd-tdep.o i386-tdep.o \
-                       i387-tdep.o i386-bsd-tdep.o i386-fbsd-tdep.o \
+                       i386.o i387-tdep.o i386-bsd-tdep.o i386-fbsd-tdep.o \
                        fbsd-tdep.o solib-svr4.o"
        ;;
 x86_64-*-mingw* | x86_64-*-cygwin*)
 x86_64-*-netbsd* | x86_64-*-knetbsd*-gnu)
        # Target: NetBSD/amd64
        gdb_target_obs="amd64-tdep.o amd64.o amd64-nbsd-tdep.o i386-tdep.o \
-                       i387-tdep.o nbsd-tdep.o solib-svr4.o"
+                       i386.o i387-tdep.o nbsd-tdep.o solib-svr4.o"
        ;;
 x86_64-*-openbsd*)
        # Target: OpenBSD/amd64
        gdb_target_obs="amd64-tdep.o amd64.o amd64-obsd-tdep.o i386-tdep.o \
                        i387-tdep.o i386-bsd-tdep.o i386-obsd-tdep.o \
-                       obsd-tdep.o bsd-uthread.o solib-svr4.o"
+                       i386.o obsd-tdep.o bsd-uthread.o solib-svr4.o"
        ;;
 x86_64-*-rtems*)
-       gdb_target_obs="amd64-tdep.o amd64.o i386-tdep.o i387-tdep.o i386-bsd-tdep.o"
+       gdb_target_obs="amd64-tdep.o amd64.o i386-tdep.o i386.o i387-tdep.o \
+                       i386-bsd-tdep.o"
        ;;
 xtensa*-*-linux*)      gdb_target=linux
        # Target: GNU/Linux Xtensa