# HG changeset patch
# User Dan Nicolaescu <dann@ics.uci.edu>
# Date 1216795156 0
# Node ID c3d63bafd46399cc08f043ce9a71bf79ded50614
# Parent  70e18d24c4963258b039cb4edda85fd5e8b00cb9
* s/netbsd.h (A_TEXT_OFFSET, A_TEXT_SEEK):
* s/freebsd.h (A_TEXT_OFFSET, A_TEXT_SEEK): Remove, unused.
(LD_SWITCH_SYSTEM_1): Remove, update users.

diff -r 70e18d24c496 -r c3d63bafd463 src/ChangeLog
--- a/src/ChangeLog	Wed Jul 23 06:34:41 2008 +0000
+++ b/src/ChangeLog	Wed Jul 23 06:39:16 2008 +0000
@@ -1,5 +1,9 @@
 2008-07-23  Dan Nicolaescu  <dann@ics.uci.edu>
 
+	* s/netbsd.h (A_TEXT_OFFSET, A_TEXT_SEEK):
+	* s/freebsd.h (A_TEXT_OFFSET, A_TEXT_SEEK): Remove, unused.
+	(LD_SWITCH_SYSTEM_1): Remove, update users.
+
 	* s/darwin.h (DATA_END):
 	* m/intel386.h (DATA_END):
 	* m/ibmrs6000.h (DATA_END):
diff -r 70e18d24c496 -r c3d63bafd463 src/s/freebsd.h
--- a/src/s/freebsd.h	Wed Jul 23 06:34:41 2008 +0000
+++ b/src/s/freebsd.h	Wed Jul 23 06:39:16 2008 +0000
@@ -68,7 +68,11 @@
 
 #ifdef __ELF__
 
-#define LD_SWITCH_SYSTEM_1
+/* Let `ld' find image libs and similar things in /usr/local/lib.  The
+   system compiler, GCC, has apparently been modified to not look
+   there, contrary to what a stock GCC would do.  */
+
+#define LD_SWITCH_SYSTEM  -L/usr/local/lib
 #define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o /usr/lib/crtbegin.o
 #define UNEXEC unexelf.o
 #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o /usr/lib/crtn.o
@@ -78,7 +82,7 @@
 #else /* not __ELF__ */
 
 #ifndef NO_SHARED_LIBS
-#define LD_SWITCH_SYSTEM_1 -e start -dc -L/usr/local/lib
+#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
@@ -92,20 +96,12 @@
 #else /* NO_SHARED_LIBS */
 #ifdef __FreeBSD__  /* shared libs are available, but the user prefers
                      not to use them.  */
-#define LD_SWITCH_SYSTEM_1 -Bstatic -L/usr/local/lib
-#define A_TEXT_OFFSET(x) (sizeof (struct exec))
-#define A_TEXT_SEEK(hdr) (N_TXTOFF(hdr) + A_TEXT_OFFSET(hdr))
+#define LD_SWITCH_SYSTEM -Bstatic -L/usr/local/lib
 #endif /* __FreeBSD__ */
 #endif /* NO_SHARED_LIBS */
 
 #endif /* not __ELF__ */
 
-/* Let `ld' find image libs and similar things in /usr/local/lib.  The
-   system compiler, GCC, has apparently been modified to not look
-   there, contrary to what a stock GCC would do.  */
-
-#define LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_1 -L/usr/local/lib
-
 #define HAVE_GETLOADAVG 1
 #define HAVE_TERMIOS
 #define NO_TERMIO
diff -r 70e18d24c496 -r c3d63bafd463 src/s/netbsd.h
--- a/src/s/netbsd.h	Wed Jul 23 06:34:41 2008 +0000
+++ b/src/s/netbsd.h	Wed Jul 23 06:39:16 2008 +0000
@@ -41,9 +41,6 @@
 #define TABDLY OXTABS
 #define TAB3 OXTABS
 
-#define A_TEXT_OFFSET(x) (sizeof (struct exec))
-#define A_TEXT_SEEK(hdr) (N_TXTOFF(hdr) + A_TEXT_OFFSET(hdr))
-
 #define HAVE_TERMIOS
 #define NO_TERMIO