diff --git a/gas/ChangeLog b/gas/ChangeLog
index 0b45805828..5887b36fc1 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2018-01-12  Gunther Nikl  <gnikl@users.sourceforge.net>
+
+	* gas/config/aout_gnu.h (USE_EXTENDED_RELOC): Explicitly
+	define to 0 and 1. Remove a dangling reference to "AMD 29000"
+	in a comment.
+
 2018-01-11  Igor Tsimbalist  <igor.v.tsimbalist@intel.com>
 
 	* testsuite/i386/avx512_4fmaps_vl-warn.l: Likewise.
diff --git a/gas/config/aout_gnu.h b/gas/config/aout_gnu.h
index 6d80d5d31e..f404d1e280 100644
--- a/gas/config/aout_gnu.h
+++ b/gas/config/aout_gnu.h
@@ -32,8 +32,6 @@
 
 */
 
-#define USE_EXTENDED_RELOC defined(TC_SPARC)
-
 #if defined(TC_SPARC)
 enum reloc_type
   {
@@ -62,6 +60,9 @@ enum reloc_type
     NO_RELOC
   };
 
+#define USE_EXTENDED_RELOC 1
+#else
+#define USE_EXTENDED_RELOC 0
 #endif /* TC_SPARC */
 
 #define __GNU_EXEC_MACROS__
@@ -303,7 +304,7 @@ struct nlist
 
 /* The following enum and struct were borrowed from SunOS's
    /usr/include/sun4/a.out.h  and extended to handle
-   other machines.  It is currently used on SPARC and AMD 29000.
+   other machines.  It is currently used on SPARC.
 
    reloc_ext_bytes is how it looks on disk.  reloc_info_extended is
    how we might process it on a native host.  */