4 files changed, 52 insertions, 12 deletions

diff --git a/editors/emacs/files/patch-ae b/editors/emacs/files/patch-ae
index 09b06161ccc2..82b5e69cad05 100644
--- a/editors/emacs/files/patch-ae
+++ b/editors/emacs/files/patch-ae
@@ -1,6 +1,16 @@
---- orig/unexelf.c	Wed Jul 17 07:39:03 1996
-+++ src/unexelf.c	Wed Sep 30 09:35:47 1998
-@@ -845,7 +845,9 @@
+--- src/unexelf.c.orig	Fri Oct  2 12:55:43 1998
++++ src/unexelf.c	Fri Oct  2 13:02:05 1998
+@@ -678,7 +678,8 @@
+   if (n < 0)
+     fatal ("Couldn't find segment next to .bss in %s\n", old_name, 0);
+ 
+-  NEW_PROGRAM_H (n).p_filesz += new_data2_size;
++/*  NEW_PROGRAM_H (n).p_filesz += new_data2_size; */
++  NEW_PROGRAM_H (n).p_filesz = new_bss_addr - NEW_PROGRAM_H (n).p_vaddr; /* From emacs 20.3 */
+   NEW_PROGRAM_H (n).p_memsz = NEW_PROGRAM_H (n).p_filesz;
+ 
+ #if 0 /* Maybe allow section after data2 - does this ever happen? */
+@@ -845,7 +846,9 @@
  
        for (; symp < symendp; symp ++)
  	if (strcmp ((char *) (symnames + symp->st_name), "_end") == 0
diff --git a/editors/emacs19/files/patch-ae b/editors/emacs19/files/patch-ae
index 09b06161ccc2..82b5e69cad05 100644
--- a/editors/emacs19/files/patch-ae
+++ b/editors/emacs19/files/patch-ae
@@ -1,6 +1,16 @@
---- orig/unexelf.c	Wed Jul 17 07:39:03 1996
-+++ src/unexelf.c	Wed Sep 30 09:35:47 1998
-@@ -845,7 +845,9 @@
+--- src/unexelf.c.orig	Fri Oct  2 12:55:43 1998
++++ src/unexelf.c	Fri Oct  2 13:02:05 1998
+@@ -678,7 +678,8 @@
+   if (n < 0)
+     fatal ("Couldn't find segment next to .bss in %s\n", old_name, 0);
+ 
+-  NEW_PROGRAM_H (n).p_filesz += new_data2_size;
++/*  NEW_PROGRAM_H (n).p_filesz += new_data2_size; */
++  NEW_PROGRAM_H (n).p_filesz = new_bss_addr - NEW_PROGRAM_H (n).p_vaddr; /* From emacs 20.3 */
+   NEW_PROGRAM_H (n).p_memsz = NEW_PROGRAM_H (n).p_filesz;
+ 
+ #if 0 /* Maybe allow section after data2 - does this ever happen? */
+@@ -845,7 +846,9 @@
  
        for (; symp < symendp; symp ++)
  	if (strcmp ((char *) (symnames + symp->st_name), "_end") == 0
diff --git a/editors/emacs22/files/patch-ae b/editors/emacs22/files/patch-ae
index 09b06161ccc2..82b5e69cad05 100644
--- a/editors/emacs22/files/patch-ae
+++ b/editors/emacs22/files/patch-ae
@@ -1,6 +1,16 @@
---- orig/unexelf.c	Wed Jul 17 07:39:03 1996
-+++ src/unexelf.c	Wed Sep 30 09:35:47 1998
-@@ -845,7 +845,9 @@
+--- src/unexelf.c.orig	Fri Oct  2 12:55:43 1998
++++ src/unexelf.c	Fri Oct  2 13:02:05 1998
+@@ -678,7 +678,8 @@
+   if (n < 0)
+     fatal ("Couldn't find segment next to .bss in %s\n", old_name, 0);
+ 
+-  NEW_PROGRAM_H (n).p_filesz += new_data2_size;
++/*  NEW_PROGRAM_H (n).p_filesz += new_data2_size; */
++  NEW_PROGRAM_H (n).p_filesz = new_bss_addr - NEW_PROGRAM_H (n).p_vaddr; /* From emacs 20.3 */
+   NEW_PROGRAM_H (n).p_memsz = NEW_PROGRAM_H (n).p_filesz;
+ 
+ #if 0 /* Maybe allow section after data2 - does this ever happen? */
+@@ -845,7 +846,9 @@
  
        for (; symp < symendp; symp ++)
  	if (strcmp ((char *) (symnames + symp->st_name), "_end") == 0
diff --git a/editors/emacs23/files/patch-ae b/editors/emacs23/files/patch-ae
index 09b06161ccc2..82b5e69cad05 100644
--- a/editors/emacs23/files/patch-ae
+++ b/editors/emacs23/files/patch-ae
@@ -1,6 +1,16 @@
---- orig/unexelf.c	Wed Jul 17 07:39:03 1996
-+++ src/unexelf.c	Wed Sep 30 09:35:47 1998
-@@ -845,7 +845,9 @@
+--- src/unexelf.c.orig	Fri Oct  2 12:55:43 1998
++++ src/unexelf.c	Fri Oct  2 13:02:05 1998
+@@ -678,7 +678,8 @@
+   if (n < 0)
+     fatal ("Couldn't find segment next to .bss in %s\n", old_name, 0);
+ 
+-  NEW_PROGRAM_H (n).p_filesz += new_data2_size;
++/*  NEW_PROGRAM_H (n).p_filesz += new_data2_size; */
++  NEW_PROGRAM_H (n).p_filesz = new_bss_addr - NEW_PROGRAM_H (n).p_vaddr; /* From emacs 20.3 */
+   NEW_PROGRAM_H (n).p_memsz = NEW_PROGRAM_H (n).p_filesz;
+ 
+ #if 0 /* Maybe allow section after data2 - does this ever happen? */
+@@ -845,7 +846,9 @@
  
        for (; symp < symendp; symp ++)
  	if (strcmp ((char *) (symnames + symp->st_name), "_end") == 0