fix build failure on alpha,

and merge patch-ac into patch-az

3 files changed, 25 insertions, 23 deletions

diff --git a/editors/emacs/files/patch-sum b/editors/emacs/files/patch-sum
index 579af7fe3da..452917aab34 100644
--- a/editors/emacs/files/patch-sum
+++ b/editors/emacs/files/patch-sum
@@ -1,8 +1,7 @@
-$NetBSD: patch-sum,v 1.13 2000/07/10 21:22:05 tron Exp $
+$NetBSD: patch-sum,v 1.14 2000/08/23 16:20:17 toshii Exp $
 
 MD5 (patch-aa) = 41d31356a0b856d789ded3ef10bb4349
 MD5 (patch-ab) = ef7e12a958af844399e841d2205995d7
-MD5 (patch-ac) = 72a302cb50ca3517163d156201257e34
 MD5 (patch-ad) = 66aac70c544f3877460851ffe37510ff
 MD5 (patch-ae) = f1718f253dabb4b1b9be6d2839353c5e
 MD5 (patch-af) = 139ec0b39a8bad5ab5cdc2c3785a59de
@@ -13,7 +12,7 @@ MD5 (patch-aj) = 2826479143a847192c969b7e8f623ade
 MD5 (patch-ak) = ef7fabe3fea75d799d8628d155a8b72c
 MD5 (patch-ax) = 46750ed00d5bff9fea4f330b0ca0fc41
 MD5 (patch-ay) = 39327beca758ac8d2cd9eab329beb5e6
-MD5 (patch-az) = ab578c17f96ef827218e0167643fa5e7
+MD5 (patch-az) = 7e8f5f624f222c4eb16ca23901a0ebcb
 MD5 (patch-bc) = f38d4bc4159920c81cb7d5f3770ace48
 MD5 (patch-bf) = 5af3c12a104c1b6caa0a95ffac9f56a3
 MD5 (patch-bg) = bd6546815c9b9e4389669e599acf90f0
diff --git a/editors/emacs/patches/patch-ac b/editors/emacs/patches/patch-ac
deleted file mode 100644
index d9ef70862e2..00000000000
--- a/editors/emacs/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.9 2000/07/10 21:22:08 tron Exp $
-
---- src/unexelf.c.orig	Mon May 15 18:14:02 2000
-+++ src/unexelf.c	Mon Jul 10 00:53:42 2000
-@@ -479,6 +479,7 @@
- 
- # ifndef PT_LOAD
- #  define PT_LOAD	Elf_pt_load
-+#  define SHT_PROGBITS	Elf_sht_progbits
- #  define SHT_SYMTAB	Elf_sht_symtab
- #  define SHT_DYNSYM	Elf_sht_dynsym
- #  define SHT_NULL	Elf_sht_null
diff --git a/editors/emacs/patches/patch-az b/editors/emacs/patches/patch-az
index 2fb02021bc0..70059f60979 100644
--- a/editors/emacs/patches/patch-az
+++ b/editors/emacs/patches/patch-az
@@ -1,8 +1,14 @@
-$NetBSD: patch-az,v 1.9 2000/06/24 17:03:39 minoura Exp $
-
 --- src/unexelf.c.orig	Mon May 15 17:14:02 2000
-+++ src/unexelf.c	Sun Jun 18 09:44:41 2000
-@@ -495,9 +495,14 @@
++++ src/unexelf.c	Wed Aug 23 21:25:31 2000
+@@ -479,6 +479,7 @@
+ 
+ # ifndef PT_LOAD
+ #  define PT_LOAD	Elf_pt_load
++#  define SHT_PROGBITS	Elf_sht_progbits
+ #  define SHT_SYMTAB	Elf_sht_symtab
+ #  define SHT_DYNSYM	Elf_sht_dynsym
+ #  define SHT_NULL	Elf_sht_null
+@@ -495,9 +496,14 @@
  #  include <sys/exec_ecoff.h>
  #  define HDRR		struct ecoff_symhdr
  #  define pHDRR		HDRR *
@@ -18,7 +24,16 @@ $NetBSD: patch-az,v 1.9 2000/06/24 17:03:39 minoura Exp $
  #ifdef __OpenBSD__
  # include <sys/exec_elf.h>
  #endif
-@@ -522,6 +527,14 @@
+@@ -512,7 +518,7 @@
+ # else
+ #  define ElfBitsW(bits, type) Elf/**/bits/**/_/**/type
+ # endif
+-# ifdef _LP64
++# if defined (_LP64) || defined(__alpha__)
+ #  define ELFSIZE 64
+ # else
+ #  define ELFSIZE 32
+@@ -522,6 +528,14 @@
  # define ElfW(type) ElfExpandBitsW (ELFSIZE, type)
  #endif
  
@@ -33,7 +48,7 @@ $NetBSD: patch-az,v 1.9 2000/06/24 17:03:39 minoura Exp $
  #ifndef ELF_BSS_SECTION_NAME
  #define ELF_BSS_SECTION_NAME ".bss"
  #endif
-@@ -613,12 +626,53 @@
+@@ -613,12 +627,53 @@
        if (noerror)
  	return -1;
        else
@@ -88,7 +103,7 @@ $NetBSD: patch-az,v 1.9 2000/06/24 17:03:39 minoura Exp $
  /* ****************************************************************
   * unexec
   *
-@@ -1005,22 +1059,11 @@
+@@ -1005,22 +1060,11 @@
  	  == 0)
  	{
  	  pHDRR symhdr = (pHDRR) (NEW_SECTION_H (nn).sh_offset + new_base);
@@ -113,7 +128,7 @@ $NetBSD: patch-az,v 1.9 2000/06/24 17:03:39 minoura Exp $
        if (NEW_SECTION_H (nn).sh_type == SHT_MIPS_DEBUG
  	  && old_mdebug_index != -1) 
          {
-@@ -1030,20 +1073,17 @@
+@@ -1030,20 +1074,17 @@
  
  	  if (diff)
  	    {