* m/amdx86-64.h (HAVE_LIB64_DIR): Consolidate ifdefs.

* m/alpha.h (TEXT_END):
* m/ibmrs6000.h (TEXT_END):
* m/macppc.h (TEXT_END):
* s/darwin.h (TEXT_END):
* s/msdos.h (TEXT_END): Remove, unused.
* s/gnu-linux.h (BSD_PGRPS): Add a comment.
* s/cygwin.h: Remove comment.

diff --git a/src/ChangeLog b/src/ChangeLog
index 514bcd225c1079af19bffbfbfb5a0a1a7c9dfc5e..2e003a1815c30847d593e53e1530f0f80f1b5cea 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,14 @@
 2008-07-24  Dan Nicolaescu  <dann@ics.uci.edu>
 
+       * m/amdx86-64.h (HAVE_LIB64_DIR): Consolidate ifdefs.
+       * m/alpha.h (TEXT_END):
+       * m/ibmrs6000.h (TEXT_END):
+       * m/macppc.h (TEXT_END):
+       * s/darwin.h (TEXT_END):
+       * s/msdos.h (TEXT_END): Remove, unused.
+       * s/gnu-linux.h (BSD_PGRPS): Add a comment.
+       * s/cygwin.h: Remove comment.
+
        * ecrt0.c (NODOT_GLOBAL_START): Remove code, unused.
        (DOT_GLOBAL_START): Remove conditional, redundant for CRT0_DUMMIES.
        * m/intel386.h (DOT_GLOBAL_START):

diff --git a/src/m/alpha.h b/src/m/alpha.h
index 6484241b9283898cdbb21302d142fcff9d5a4518..ae869ceee367cd5d5e9ac85e7395f6b07c156609 100644 (file)
--- a/src/m/alpha.h
+++ b/src/m/alpha.h
@@ -123,7 +123,6 @@ NOTE-END
 #define NO_TERMIO
 
 #if defined (GNU_LINUX) || defined (__NetBSD__) || defined (__OpenBSD__)
-# define TEXT_END ({ extern int _etext; &_etext; })
 # ifndef __ELF__
 #  define COFF
 # endif /* notdef __ELF__ */

diff --git a/src/m/amdx86-64.h b/src/m/amdx86-64.h
index bc3886f3473cd7949389cc5754a0cf754de521be..2d97a6672de71fa9cb017c4bc3d5323ef9f31c1f 100644 (file)
--- a/src/m/amdx86-64.h
+++ b/src/m/amdx86-64.h
@@ -107,23 +107,18 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #undef LIB_STANDARD
 
 #else /* !__OpenBSD__ && !__FreeBSD__ && !__NetBSD__ && !SOLARIS2 */
-
-#undef START_FILES
-#ifdef HAVE_LIB64_DIR
-#define START_FILES pre-crt0.o /usr/lib64/crt1.o /usr/lib64/crti.o
-#else
-#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o
-#endif
-
 /* 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 START_FILES
 #undef LIB_STANDARD
 #ifdef HAVE_LIB64_DIR
+#define START_FILES pre-crt0.o /usr/lib64/crt1.o /usr/lib64/crti.o
 #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib64/crtn.o
 #else
+#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o
 #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtn.o
 #endif
 

diff --git a/src/m/ibmrs6000.h b/src/m/ibmrs6000.h
index e60b076a057def61a393937bd4f5183e421ec312..e907444230d5646dddf344df779f9a5c42f1fcc4 100644 (file)
--- a/src/m/ibmrs6000.h
+++ b/src/m/ibmrs6000.h
@@ -46,7 +46,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef USG5_4
 #define TEXT_START 0x10000000
-#define TEXT_END 0
 #define DATA_START 0x20000000
 #define WORDS_BIG_ENDIAN
 #define DATA_SEG_BITS 0x20000000

diff --git a/src/m/macppc.h b/src/m/macppc.h
index fc2c8f9d361aa44339694300f0ed87040908a812..9204fcb1c6d7c2e4285b21de7ca0cdbdbbaa30be 100644 (file)
--- a/src/m/macppc.h
+++ b/src/m/macppc.h
@@ -35,10 +35,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
 
-#if defined (GNU_LINUX) || defined (__NetBSD__) || defined (__OpenBSD__)
-# define TEXT_END ({ extern int _etext; &_etext; })
-#endif
-
 #if (defined (__NetBSD__) || defined (__OpenBSD__)) && defined (__ELF__)
 #define HAVE_TEXT_START
 #endif

diff --git a/src/s/cygwin.h b/src/s/cygwin.h
index 18f3d6f01159bc1427fd21a6b96ba5592c9c67ab..7c41571cc33a6ddc758ef8cdb6150e378da02421 100644 (file)
--- a/src/s/cygwin.h
+++ b/src/s/cygwin.h
@@ -116,9 +116,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define TERMINFO
 
 #define HAVE_SOCKETS
-/* Xaw3d causes problems -- might have been fixed by NARROWPROTO
-   above, but I haven't tried it */
-/*#undef HAVE_XAW3D*/
 
 /* vfork() interacts badly with setsid(), causing ptys to fail to
    change their controlling terminal */

diff --git a/src/s/darwin.h b/src/s/darwin.h
index 2d298aeb743881fa03ba95c1bcfcde89d3a3bab3..3c227afe6216ad36471ccf93634a2981962fc214 100644 (file)
--- a/src/s/darwin.h
+++ b/src/s/darwin.h
@@ -156,9 +156,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* start_of_text isn't actually used, so make it compile without error.  */
 #define TEXT_START (0)
 
-/* This seems to be right for end_of_text, but it may not be used anyway.  */
-#define TEXT_END get_etext()
-
 /* Definitions for how to compile & link.  */
 
 /* Link in the Carbon or AppKit lib. */

diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h
index a74d08a3c84944bb64eacedfac9ff6f223883424..09a09b2f19c2ebcb534808a3be7afd3434e6f69a 100644 (file)
--- a/src/s/gnu-linux.h
+++ b/src/s/gnu-linux.h
@@ -227,7 +227,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Use BSD process groups, but use setpgid() instead of setpgrp() to
    actually set a process group. */
-
+/* Interesting: only GNU/Linux defines this,  but the BSDs do not... */
 #define BSD_PGRPS
 
 #define NARROWPROTO 1

diff --git a/src/s/msdos.h b/src/s/msdos.h
index 055ffad98a242c5af53f66ff59cfb90a237c67e8..2d29a5548b730189997fe5f55f81677bfd4f2e17 100644 (file)
--- a/src/s/msdos.h
+++ b/src/s/msdos.h
@@ -112,7 +112,6 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */
 
 #define DATA_START  (&etext + 1)
 #define TEXT_START  &start
-#define TEXT_END    &etext
 
 #define _NAIVE_DOS_REGS