Date: Mon, 23 Sep 2013 08:41:17 +0000 (UTC) From: Ashish SHUKLA <ashish@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r327951 - head/editors/emacs21/files Message-ID: <201309230841.r8N8fH1X054325@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ashish Date: Mon Sep 23 08:41:16 2013 New Revision: 327951 URL: http://svnweb.freebsd.org/changeset/ports/327951 Log: - Fix crash on 10-CURRENT Submitted by: dim Added: head/editors/emacs21/files/patch-src:m:intel386.h (contents, props changed) Modified: head/editors/emacs21/files/patch-src:alloc.c (contents, props changed) Modified: head/editors/emacs21/files/patch-src:alloc.c ============================================================================== --- head/editors/emacs21/files/patch-src:alloc.c Mon Sep 23 08:33:31 2013 (r327950) +++ head/editors/emacs21/files/patch-src:alloc.c Mon Sep 23 08:41:16 2013 (r327951) @@ -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 Added: head/editors/emacs21/files/patch-src:m:intel386.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/emacs21/files/patch-src:m:intel386.h Mon Sep 23 08:41:16 2013 (r327951) @@ -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. */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309230841.r8N8fH1X054325>