diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 8db2966c0f8..5afdccfb91a 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-08  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* i386-gen.c (set_bitfield): Use fail () on error.
+
 2008-01-08  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* i386-gen.c (lineno): New.
diff --git a/opcodes/i386-gen.c b/opcodes/i386-gen.c
index 1db96603563..d7e3d16f69b 100644
--- a/opcodes/i386-gen.c
+++ b/opcodes/i386-gen.c
@@ -451,9 +451,7 @@ set_bitfield (const char *f, bitfield *array, unsigned int size)
 	return;
       }
 
-  printf ("%s: %d: Unknown bitfield: %s\n",
-	  filename, lineno, f);
-  abort ();
+  fail (_("%s: %d: Unknown bitfield: %s\n"), filename, lineno, f);
 }
 
 static void