FreeBSD and m/amdx86-64.h

4 files changed, 37 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 9aea9f5ab2b..84f25e00117 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-12-25  Giorgos Keramidas  <keramida@ceid.upatras.gr> (tiny change)
+
+        * configure.in: use amdx86-64 for freebsd on x86_64.
+
 2005-11-22  Romain Francoise  <romain@orebokech.com>
 
         * make-dist: Add etc/images/icons.
diff --git a/configure.in b/configure.in
index b39a7e85678..b9d2b469f59 100644
--- a/configure.in
+++ b/configure.in
@@ -238,6 +238,7 @@ case "${canonical}" in
     case "${canonical}" in
       alpha*-*-freebsd*)        machine=alpha ;;
       i[3456]86-*-freebsd*)     machine=intel386 ;;
+      amd64-*-freebsd*|x86_64-*-freebsd*) machine=amdx86-64 ;;
     esac
   ;;
 
diff --git a/src/ChangeLog b/src/ChangeLog
index a32ed4158f6..f14f216f1d3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-25  Giorgos Keramidas  <keramida@ceid.upatras.gr>
+
+        * m/amdx86-64.h [__FreeBSD__] (START_FILES, LIB_STANDARD):
+        define for FreeBSD on this platform.
+
 2005-12-24  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         * macterm.h (TYPE_FILE_NAME): New define.
diff --git a/src/m/amdx86-64.h b/src/m/amdx86-64.h
index 2d7d86ce7c3..14ddd16406e 100644
--- a/src/m/amdx86-64.h
+++ b/src/m/amdx86-64.h
@@ -100,11 +100,38 @@ Boston, MA 02110-1301, USA.  */
 /* Define XPNTR to avoid or'ing with DATA_SEG_BITS */
 #undef DATA_SEG_BITS
 
+#ifdef __FreeBSD__
+
+/* The libraries for binaries native to the build host's architecture are
+   installed under /usr/lib in FreeBSD, and the ones that need special paths
+   are 32-bit compatibility libraries (installed under /usr/lib32).  To build
+   a native binary of Emacs on FreeBSD/amd64 we can just point to /usr/lib.  */
+
+#undef START_FILES
+#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o
+
+/* 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,
+   and some libc.a functions need functions from libgcc.a.  Since most
+   versions of ld are one-pass linkers, we need to mention -lgcc twice,
+   or else we risk getting unresolved externals.  */
+#undef LIB_STANDARD
+#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtn.o
+
+#else /* !__FreeBSD__ */
+
 #undef START_FILES
 #define START_FILES pre-crt0.o /usr/lib64/crt1.o /usr/lib64/crti.o
 
+/* 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,
+   and some libc.a functions need functions from libgcc.a.  Since most
+   versions of ld are one-pass linkers, we need to mention -lgcc twice,
+   or else we risk getting unresolved externals.  */
 #undef LIB_STANDARD
 #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib64/crtn.o
 
+#endif /* __FreeBSD__ */
+
 /* arch-tag: 8a5e001d-e12e-4692-a3a6-0b15ba271c6e
    (do not change this comment) */