emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] Changes to emacs/src/m/amdx86-64.h,v


From: Chong Yidong
Subject: [Emacs-diffs] Changes to emacs/src/m/amdx86-64.h,v
Date: Sun, 26 Nov 2006 22:16:49 +0000

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      06/11/26 22:16:49

Index: amdx86-64.h
===================================================================
RCS file: /cvsroot/emacs/emacs/src/m/amdx86-64.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- amdx86-64.h 29 Oct 2006 21:48:58 -0000      1.11
+++ amdx86-64.h 26 Nov 2006 22:16:49 -0000      1.12
@@ -128,7 +128,11 @@
 #else /* !__OpenBSD__ && !__FreeBSD__ */
 
 #undef START_FILES
+#ifdef HAVE_X86_64_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
 
 /* The duplicate -lgcc is intentional in the definition of LIB_STANDARD.
    The reason is that some functions in libgcc.a call functions from libc.a,
@@ -136,7 +140,11 @@
    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
 #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib64/crtn.o
+#else
+#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtn.o
+#endif
 
 #endif /* __FreeBSD__ */
 




reply via email to

[Prev in Thread] Current Thread [Next in Thread]