diff --git a/gas/ChangeLog b/gas/ChangeLog
index 9764a243faf..556c927eb0b 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2015-04-30  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* config/tc-i386.c (i386_target_format): Use "else if" on
+	cpu_arch_isa.
+
 2015-04-30  Nick Clifton  <nickc@redhat.com>
 
 	PR gas/18347
diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index 82abaef2303..4bcf4169dfc 100644
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -10049,7 +10049,7 @@ i386_target_format (void)
 	      as_fatal (_("Intel L1OM is 64bit only"));
 	    return ELF_TARGET_L1OM_FORMAT;
 	  }
-	if (cpu_arch_isa == PROCESSOR_K1OM)
+	else if (cpu_arch_isa == PROCESSOR_K1OM)
 	  {
 	    if (x86_elf_abi != X86_64_ABI)
 	      as_fatal (_("Intel K1OM is 64bit only"));