From owner-freebsd-ports  Tue Sep 29 14:11:03 1998
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
Received: (from majordom@localhost)
          by hub.freebsd.org (8.8.8/8.8.8) id OAA11437
          for freebsd-ports-outgoing; Tue, 29 Sep 1998 14:11:03 -0700 (PDT)
          (envelope-from owner-freebsd-ports@FreeBSD.ORG)
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
          by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id OAA11285
          for <freebsd-ports@FreeBSD.org>; Tue, 29 Sep 1998 14:10:12 -0700 (PDT)
          (envelope-from gnats@FreeBSD.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.8.8/8.8.5) id OAA20548;
	Tue, 29 Sep 1998 14:10:01 -0700 (PDT)
Received: (from nobody@localhost)
          by hub.freebsd.org (8.8.8/8.8.8) id OAA10961;
          Tue, 29 Sep 1998 14:08:10 -0700 (PDT)
          (envelope-from nobody)
Message-Id: <199809292108.OAA10961@hub.freebsd.org>
Date: Tue, 29 Sep 1998 14:08:10 -0700 (PDT)
From: taoka@infonets.hiroshima-u.ac.jp
To: freebsd-gnats-submit@FreeBSD.ORG
X-Send-Pr-Version: www-1.0
Subject: ports/8096: ELF patch for editors/xemacs (XEmacs-19.16)
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


>Number:         8096
>Category:       ports
>Synopsis:       ELF patch for editors/xemacs (XEmacs-19.16)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:
>Keywords:
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Sep 29 14:10:01 PDT 1998
>Last-Modified:
>Originator:     Satoshi Taoka
>Organization:
Hiroshima Univ. in Japan
>Release:        FreeBSD 3.0-19980921-BETA
>Environment:
>Description:
This is a ELF patch for editors/xemacs (XEmacs 19.16).

This is slightly different from the patch of PR (ports/8092)
for XEmacs 20.4.
# See ports/8092.
This has no next line:

+#define LINKER "$(CC) -nostdlib"

Because, on XEmacs 19, we cannot build by error of make command.

>How-To-Repeat:

>Fix:
[the new patch file patch-ah]

diff -ru orig/s/freebsd.h src/s/freebsd.h
--- orig/s/freebsd.h	Mon Oct 13 07:05:45 1997
+++ src/s/freebsd.h	Wed Sep 30 05:06:28 1998
@@ -53,6 +53,19 @@
 /* freebsd has POSIX-style pgrp behavior. */
 #define GETPGRP_NO_ARG
 
+#ifdef __ELF__ /* since from 3.0-CURRENT(maybe 19980831 or later) */
+#ifndef NOT_C_CODE
+#include <stddef.h>
+#endif
+#define LD_SWITCH_SYSTEM
+#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
+#undef LIB_GCC
+#define LIB_GCC
+
+#else /* not __ELF__ */
+
 #ifndef NO_SHARED_LIBS
 #define LD_SWITCH_SYSTEM -e start -dc -dp
 #define HAVE_TEXT_START		/* No need to define `start_of_text'. */
@@ -73,6 +86,8 @@
 #define A_TEXT_SEEK(hdr) (N_TXTOFF(hdr) + A_TEXT_OFFSET(hdr))
 #endif /* __FreeBSD__ */
 #endif /* NO_SHARED_LIBS */
+
+#endif /* not __ELF__ */
 
 #define HAVE_GETLOADAVG
 #define NO_TERMIO
diff -ru orig/unexelf.c src/unexelf.c
--- orig/unexelf.c	Wed Dec 18 12:38:00 1996
+++ src/unexelf.c	Wed Sep 30 04:14:34 1998
@@ -845,7 +845,9 @@
 
       for (; symp < symendp; symp ++)
 	if (strcmp ((char *) (symnames + symp->st_name), "_end") == 0
-	    || strcmp ((char *) (symnames + symp->st_name), "_edata") == 0)
+	    || strcmp ((char *) (symnames + symp->st_name), "end") == 0
+	    || strcmp ((char *) (symnames + symp->st_name), "_edata") == 0
+	    || strcmp ((char *) (symnames + symp->st_name), "edata") == 0)
 	  memcpy (&symp->st_value, &new_bss_addr, sizeof (new_bss_addr));
     }
 

>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message