(START_FILES, LIB_STANDARD): Use HAVE_LIB64_DIR

instead of HAVE_X86_64_LIB64_DIR.

diff --git a/src/m/amdx86-64.h b/src/m/amdx86-64.h
index 37ae8ebb148bffbb8033dd0b6b1518fede62a098..cdf8599e9b6f98ca2907f4d278880b80267ecfec 100644 (file)
--- a/src/m/amdx86-64.h
+++ b/src/m/amdx86-64.h
@@ -146,7 +146,7 @@ Boston, MA 02110-1301, USA.  */
 #else /* !__OpenBSD__ && !__FreeBSD__ && !__NetBSD__ && !sun */
 
 #undef START_FILES
-#ifdef HAVE_X86_64_LIB64_DIR
+#ifdef HAVE_LIB64_DIR
 #define START_FILES pre-crt0.o /usr/lib64/crt1.o /usr/lib64/crti.o
 #else
 #define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o
@@ -158,7 +158,7 @@ Boston, MA 02110-1301, USA.  */
    versions of ld are one-pass linkers, we need to mention -lgcc twice,
    or else we risk getting unresolved externals.  */
 #undef LIB_STANDARD
-#ifdef HAVE_X86_64_LIB64_DIR
+#ifdef HAVE_LIB64_DIR
 #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib64/crtn.o
 #else
 #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtn.o

diff --git a/src/m/ibms390x.h b/src/m/ibms390x.h
index 9c4a14895fd7e202e1787a8de98b676d58652a96..443357966b67d1177d98f530030258862a2ef9be 100644 (file)
--- a/src/m/ibms390x.h
+++ b/src/m/ibms390x.h
@@ -152,14 +152,14 @@ NOTE-END */
 #define XPNTR(a) XUINT (a)
 
 #undef START_FILES
-#ifdef HAVE_X86_64_LIB64_DIR
+#ifdef HAVE_LIB64_DIR
 #define START_FILES pre-crt0.o /usr/lib64/crt1.o /usr/lib64/crti.o
 #else
 #define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o
 #endif
 
 #undef LIB_STANDARD
-#ifdef HAVE_X86_64_LIB64_DIR
+#ifdef HAVE_LIB64_DIR
 #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib64/crtn.o
 #else
 #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtn.o