===================================================================
@@ -24,6 +24,10 @@
#undef TARGET_AIX
#define TARGET_AIX 1
+/* Linux64.h wants to redefine TARGET_AIX based on -m64, but it can't be used
+ in the #if conditional in options-default.h, so provide another macro. */
+#define TARGET_AIX_OS 1
+
/* AIX always has a TOC. */
#define TARGET_NO_TOC 0
#define TARGET_TOC 1
===================================================================
@@ -46,6 +46,10 @@
#define TARGET_AIX 0
#endif
+#ifndef TARGET_AIX_OS
+#define TARGET_AIX_OS 0
+#endif
+
/* Control whether function entry points use a "dot" symbol when
ABI_AIX. */
#define DOT_SYMBOLS 1
===================================================================
@@ -27,7 +27,7 @@
/* This header needs to be included after any other headers affecting
TARGET_DEFAULT. */
-#if TARGET_AIX
+#if TARGET_AIX_OS
#define OPT_64 "maix64"
#define OPT_32 "maix32"
#else