* m/amdx86-64.h (START_FILES, LIB_STANDARD): Remove.

The FreeBSD is not needed, the default works, Solaris version is
not needed, and the remaining case is not supported by configure.

2 files changed, 7 insertions, 23 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 2e0a77ce187..12f15b3c2fd 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-02  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * m/amdx86-64.h (START_FILES, LIB_STANDARD): Remove.
+        The FreeBSD is not needed, the default works, Solaris version is
+        not needed, and the remaining case is not supported by configure.
+
 2010-05-02  Jan Djärv  <jan.h.d@swipnet.se>
 
         * xsmfns.c (CHDIR_OPT): New define.
diff --git a/src/m/amdx86-64.h b/src/m/amdx86-64.h
index b2e6cae48c7..376865af421 100644
--- a/src/m/amdx86-64.h
+++ b/src/m/amdx86-64.h
@@ -58,29 +58,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define XPNTR to avoid or'ing with DATA_SEG_BITS */
 #undef DATA_SEG_BITS
 
-
-/* For GNU_LINUX,  __OpenBSD__, __NetBSD__, __APPLE__, things are set
-   correctly in s/gnu-linux.h, netbsd.h, darwin.h.  */
-#ifdef SOLARIS2
-#undef START_FILES
-#undef LIB_STANDARD
-#elif defined (__FreeBSD__) || (defined (DARWIN_OS) && !defined (__APPLE__))
-/* On FreeBSD, the libraries for binaries native to the build host's
-   architecture are installed under /usr/lib, and the ones that need
-   special paths are 32-bit compatibility libraries (installed under
-   /usr/lib32).  So to build a native binary of Emacs on FreeBSD/amd64
-   we can just point to /usr/lib (the default $CRT_DIR).  */
-#undef START_FILES
-#define START_FILES pre-crt0.o $(CRT_DIR)/crt1.o $(CRT_DIR)/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 $(CRT_DIR)/crtn.o
-
-#endif /* SOLARIS2 */
+#endif /* DARWIN_OS && ! __APPLE__ */
 
 /* arch-tag: 8a5e001d-e12e-4692-a3a6-0b15ba271c6e
    (do not change this comment) */