diff --git a/libatomic/ChangeLog b/libatomic/ChangeLog
index f476a6fa8b4..70a7f7ceca1 100644
--- a/libatomic/ChangeLog
+++ b/libatomic/ChangeLog
@@ -1,3 +1,9 @@
+2016-04-20  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR target/70454
+	* configure.tgt (XCFLAGS): Don't add -march=i486 to compile
+	32-bit x86 target library on x86-64.
+
 2016-01-06  Szabolcs Nagy  <szabolcs.nagy@arm.com>
 
 	PR other/67627
diff --git a/libatomic/configure.tgt b/libatomic/configure.tgt
index c5470d7ef8c..49233a4f45a 100644
--- a/libatomic/configure.tgt
+++ b/libatomic/configure.tgt
@@ -81,14 +81,8 @@ case "${target_cpu}" in
 	try_ifunc=yes
 	;;
   x86_64)
-	case " ${CC} ${CFLAGS} " in
-	  *" -m32 "*)
-	    XCFLAGS="${XCFLAGS} -march=i486 -mtune=generic"
-	    XCFLAGS="${XCFLAGS} -fomit-frame-pointer"
-	    ;;
-	  *)
-	    ;;
-	esac
+	# x86_64 compiler passes -march=x86_64 by default when building
+	# 32bit target libraries.
 	ARCH=x86
 	# ??? Detect when -mcx16 is already enabled.
 	try_ifunc=yes