diff options
| author | toshii <toshii@pkgsrc.org> | 2000-08-23 16:20:17 +0000 |
|---|---|---|
| committer | toshii <toshii@pkgsrc.org> | 2000-08-23 16:20:17 +0000 |
| commit | 448c2694e9a8c92fc0ff0ccf6a11bcc0716105ae (patch) | |
| tree | 5a41bc0df19eb46c79ebcf18424295365f5b3c23 /editors/emacs/patches | |
| parent | ac1a68df221d7a5900f5991197bfa168f856f6b5 (diff) | |
| download | pkgsrc-448c2694e9a8c92fc0ff0ccf6a11bcc0716105ae.tar.gz | |
fix build failure on alpha,
and merge patch-ac into patch-az
Diffstat (limited to 'editors/emacs/patches')
| -rw-r--r-- | editors/emacs/patches/patch-ac | 12 | ||||
| -rw-r--r-- | editors/emacs/patches/patch-az | 31 |
2 files changed, 23 insertions, 20 deletions
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) { |