X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/0c97bd6a43547764cf38583a88203cc8a5f2d545..88cd462dc6e6ed9441337f496f818b5fee5f5912:/src/unexsunos4.c

diff --git a/src/unexsunos4.c b/src/unexsunos4.c
index e36ddeed9e..6ceab884a9 100644
--- a/src/unexsunos4.c
+++ b/src/unexsunos4.c
@@ -1,5 +1,5 @@
 /* Unexec for Sunos 4 using shared libraries.
-   Copyright (C) 1990, 1994 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1994, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -15,7 +15,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* Contributed by Viktor Dukhovni.  */
 /*
@@ -42,6 +43,11 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
  *  is somewhat abused here) is loaded first!
  *
  */
+
+#ifdef emacs
+#include <config.h>
+#endif
+
 #include <sys/param.h>
 #include <sys/mman.h>
 #include <sys/file.h>
@@ -50,13 +56,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <stdio.h>
 #include <a.out.h>
 
-/* Do this after the above #include's in case a configuration file wants
-   to define things for this file based on what <a.out.h> defines.  */
-#ifdef emacs
-#include <config.h>
-#endif
-
-#if defined (SUNOS4) || defined (__FreeBSD__)
+#if defined (SUNOS4) || defined (__FreeBSD__) || defined (__NetBSD__)
 #define UNDO_RELOCATION
 #endif
 
@@ -98,7 +98,7 @@ static int rd_only_len;
 static long cookie;
 
 
-unexec (new_name, a_name, bndry, bss_start, entry) 
+unexec (new_name, a_name, bndry, bss_start, entry)
      char *new_name, *a_name;
      unsigned bndry, bss_start, entry;
 {
@@ -163,7 +163,7 @@ unexec (new_name, a_name, bndry, bss_start, entry)
   /* Have to do this some time before dumping the data */
   initialized = 1;
 #endif
-  
+
   /* Handle new data and bss sizes and optional new entry point.
      No one actually uses bss_start and entry,  but tradition compels
      one to support them.
@@ -171,7 +171,7 @@ unexec (new_name, a_name, bndry, bss_start, entry)
      but the caller is *supposed* to know what she is doing.  */
   nhdr.a_data = (bss_start ? bss_start : brk_value) - N_DATADDR (nhdr);
   nhdr.a_bss  = bss_start ? brk_value - bss_start : 0;
-  if (entry) 
+  if (entry)
     nhdr.a_entry = entry;
 
   /*
@@ -215,10 +215,14 @@ unexec (new_name, a_name, bndry, bss_start, entry)
     unsigned long daddr = N_DATADDR (ohdr);
     unsigned long rel, erel;
 #ifdef SUNOS4
+#ifdef SUNOS4_SHARED_LIBRARIES
     extern struct link_dynamic _DYNAMIC;
 
     /*  SunOS4.x's ld_rel is relative to N_TXTADDR. */
-    if (_DYNAMIC.ld_version < 2)
+    if (!ohdr.a_dynamic)
+      /* This was statically linked.  */
+      rel = erel = 0;
+    else if (_DYNAMIC.ld_version < 2)
       {
 	rel = _DYNAMIC.ld_un.ld_1->ld_rel + N_TXTADDR (ohdr);
 	erel = _DYNAMIC.ld_un.ld_1->ld_hash + N_TXTADDR (ohdr);
@@ -228,6 +232,9 @@ unexec (new_name, a_name, bndry, bss_start, entry)
 	rel = _DYNAMIC.ld_un.ld_2->ld_rel + N_TXTADDR (ohdr);
 	erel = _DYNAMIC.ld_un.ld_2->ld_hash + N_TXTADDR (ohdr);
       }
+#else /* not SUNOS4_SHARED_LIBRARIES */
+    rel = erel = 0;
+#endif /* not SUNOS4_SHARED_LIBRARIES */
 #ifdef sparc
 #define REL_INFO_TYPE		struct reloc_info_sparc
 #else
@@ -235,7 +242,7 @@ unexec (new_name, a_name, bndry, bss_start, entry)
 #endif /* sparc */
 #define REL_TARGET_ADDRESS(r)	(((REL_INFO_TYPE *)(r))->r_address)
 #endif /* SUNOS4 */
-#ifdef __FreeBSD__
+#if defined (__FreeBSD__) || defined (__NetBSD__)
     extern struct _dynamic _DYNAMIC;
 
     /*  FreeBSD's LD_REL is a virtual address itself. */
@@ -289,14 +296,14 @@ run_time_remap (progname)
    * First try argv[0],  will almost always succeed as shells tend to give
    * the full path from the hash list rather than using execvp ()
    */
-  if (is_it (progname)) 
+  if (is_it (progname))
     return;
 
   /*
    * If argv[0] is a full path and does not exist,  not much sense in
    * searching further
    */
-  if (strchr (progname, '/')) 
+  if (strchr (progname, '/'))
     return;
 
   /*