From d52c26e925297a2d1663e2293d46ce95e91c4689 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 25 Dec 2005 19:29:28 +0000 Subject: [PATCH] FreeBSD and m/amdx86-64.h --- ChangeLog | 4 ++++ configure.in | 1 + src/ChangeLog | 5 +++++ src/m/amdx86-64.h | 27 +++++++++++++++++++++++++++ 4 files changed, 37 insertions(+) diff --git a/ChangeLog b/ChangeLog index 9aea9f5ab2b..84f25e00117 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-12-25 Giorgos Keramidas (tiny change) + + * configure.in: use amdx86-64 for freebsd on x86_64. + 2005-11-22 Romain Francoise * 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 + + * m/amdx86-64.h [__FreeBSD__] (START_FILES, LIB_STANDARD): + define for FreeBSD on this platform. + 2005-12-24 YAMAMOTO Mitsuharu * 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) */ -- 2.39.5