diff options
| author | ashish <ashish@FreeBSD.org> | 2013-09-23 16:41:16 +0800 |
|---|---|---|
| committer | ashish <ashish@FreeBSD.org> | 2013-09-23 16:41:16 +0800 |
| commit | 3b5c3dad0d44c65e84a1cce2b029c97dae74ea99 (patch) | |
| tree | 5da8ac9bcfeab24bc88f260528eff38d5ab5ad83 /editors | |
| parent | 07172639a2952bf97eafec73a9a60c9ca3c2b3ef (diff) | |
| download | freebsd-ports-gnome-3b5c3dad0d44c65e84a1cce2b029c97dae74ea99.tar.gz freebsd-ports-gnome-3b5c3dad0d44c65e84a1cce2b029c97dae74ea99.tar.zst freebsd-ports-gnome-3b5c3dad0d44c65e84a1cce2b029c97dae74ea99.zip | |
- Fix crash on 10-CURRENT
Submitted by: dim
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/emacs21/files/patch-src:alloc.c | 35 | ||||
| -rw-r--r-- | editors/emacs21/files/patch-src:m:intel386.h | 11 |
2 files changed, 44 insertions, 2 deletions
diff --git a/editors/emacs21/files/patch-src:alloc.c b/editors/emacs21/files/patch-src:alloc.c index 0ae9270b0d1f..ebb4a21c4850 100644 --- a/editors/emacs21/files/patch-src:alloc.c +++ b/editors/emacs21/files/patch-src:alloc.c @@ -1,6 +1,36 @@ --- src/alloc.c.orig Thu Sep 12 13:50:01 2002 +++ src/alloc.c Thu Sep 12 13:48:11 2002 -@@ -3723,7 +3723,11 @@ +@@ -685,6 +685,9 @@ + #endif /* GC_MALLOC_CHECK */ + + __free_hook = old_free_hook; ++#ifdef __GNUC__ ++ __asm __volatile ("" : : : "memory"); ++#endif + free (ptr); + + /* If we released our reserve (due to running out of memory), +@@ -728,6 +731,9 @@ + + BLOCK_INPUT; + __malloc_hook = old_malloc_hook; ++#ifdef __GNUC__ ++ __asm __volatile ("" : : : "memory"); ++#endif + #ifdef DOUG_LEA_MALLOC + mallopt (M_TOP_PAD, malloc_hysteresis * 4096); + #else +@@ -776,6 +782,9 @@ + + BLOCK_INPUT; + __realloc_hook = old_realloc_hook; ++#ifdef __GNUC__ ++ __asm __volatile ("" : : : "memory"); ++#endif + + #ifdef GC_MALLOC_CHECK + if (ptr) +@@ -3723,8 +3732,12 @@ /* This trick flushes the register windows so that all the state of the process is contained in the stack. */ #ifdef sparc @@ -8,7 +38,8 @@ + asm ("flushw"); +#else asm ("ta 3"); -+#endif #endif ++#endif /* Save registers that we need to see on the stack. We need to see + registers used to hold register variables and registers used to diff --git a/editors/emacs21/files/patch-src:m:intel386.h b/editors/emacs21/files/patch-src:m:intel386.h new file mode 100644 index 000000000000..8a2168e4c3f2 --- /dev/null +++ b/editors/emacs21/files/patch-src:m:intel386.h @@ -0,0 +1,11 @@ +--- src/m/intel386.h.orig 1997-08-30 09:18:39.000000000 +0200 ++++ src/m/intel386.h 2013-09-14 16:52:48.000000000 +0200 +@@ -57,7 +57,7 @@ + /* Define NO_ARG_ARRAY if you cannot take the address of the first of a + * group of arguments and treat it as an array of the arguments. */ + +-/* #define NO_ARG_ARRAY */ ++#define NO_ARG_ARRAY + + /* Define WORD_MACHINE if addresses and such have + * to be corrected before they can be used as byte counts. */ |