From: Dan Nicolaescu <dann@ics.uci.edu>
Date: Wed, 11 Nov 2009 19:13:50 +0000 (+0000)
Subject: * s/freebsd.h:
X-Git-Tag: emacs-pretest-23.1.90~481
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=04420943de5a7a92f94c7642b76990c77ca751f8;p=emacs.git

* s/freebsd.h:
* s/netbsd.h: Remove code referring to non-existent file: unexsunos4.o.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index a2c1d8722cd..b174073a82f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2009-11-11  Dan Nicolaescu  <dann@ics.uci.edu>
 
+	* s/freebsd.h:
+	* s/netbsd.h: Remove code referring to non-existent file: unexsunos4.o.
+
 	* Makefile.in: Add dependencies to lisp.h.  Remove dependencies
 	for non-existent files: unexmips.c, unexnext.c, abbrev.c, malloc.c.
 
diff --git a/src/s/freebsd.h b/src/s/freebsd.h
index b3ca5a8c890..fad81406040 100644
--- a/src/s/freebsd.h
+++ b/src/s/freebsd.h
@@ -84,19 +84,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #else /* not __ELF__ */
 
-#ifndef NO_SHARED_LIBS
-#define LD_SWITCH_SYSTEM -e start -dc -L/usr/local/lib
-#define HAVE_TEXT_START		/* No need to define `start_of_text'. */
-#if __FreeBSD_version >= 300002
-#define START_FILES pre-crt0.o /usr/lib/aout/crt0.o
-#else /* __FreeBSD_version < 300002 */
-#define START_FILES pre-crt0.o /usr/lib/crt0.o
-#endif /* __FreeBSD_version < 300002 */
-#define UNEXEC unexsunos4.o
-#define RUN_TIME_REMAP
-#define LIB_GCC -lgcc
-
-#else /* NO_SHARED_LIBS */
+#ifdef NO_SHARED_LIBS
 #ifdef __FreeBSD__  /* shared libs are available, but the user prefers
                      not to use them.  */
 #define LD_SWITCH_SYSTEM -Bstatic -L/usr/local/lib
diff --git a/src/s/netbsd.h b/src/s/netbsd.h
index 81fba0440f7..0d4d8724b1a 100644
--- a/src/s/netbsd.h
+++ b/src/s/netbsd.h
@@ -53,16 +53,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Netbsd has POSIX-style pgrp behavior.  */
 #undef BSD_PGRPS
 
-#if !defined (NO_SHARED_LIBS) && ! defined (__ELF__)
-/* These definitions should work for either dynamic or static linking,
-   whichever is the default for `cc -nostdlib'.  */
-#define HAVE_TEXT_START		/* No need to define `start_of_text'.  */
-#define START_FILES pre-crt0.o /usr/lib/crt0.o
-#define UNEXEC unexsunos4.o
-#define RUN_TIME_REMAP
-
-#endif /* not NO_SHARED_LIBS and not ELF */
-
 #if !defined (NO_SHARED_LIBS) && defined (__ELF__)
 #define START_FILES pre-crt0.o /usr/lib/crt0.o START_FILES_1 /usr/lib/crtbegin.o
 #define UNEXEC unexelf.o