From owner-svn-ports-head@FreeBSD.ORG Mon Sep 23 08:33:32 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 9D471C72; Mon, 23 Sep 2013 08:33:32 +0000 (UTC) (envelope-from ashish@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 70B672845; Mon, 23 Sep 2013 08:33:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8N8XWge050014; Mon, 23 Sep 2013 08:33:32 GMT (envelope-from ashish@svn.freebsd.org) Received: (from ashish@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8N8XWtt050012; Mon, 23 Sep 2013 08:33:32 GMT (envelope-from ashish@svn.freebsd.org) Message-Id: <201309230833.r8N8XWtt050012@svn.freebsd.org> From: Ashish SHUKLA Date: Mon, 23 Sep 2013 08:33:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r327950 - head/editors/emacs22/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Sep 2013 08:33:32 -0000 Author: ashish Date: Mon Sep 23 08:33:31 2013 New Revision: 327950 URL: http://svnweb.freebsd.org/changeset/ports/327950 Log: - Fix crash on 10-CURRENT Submitted by: dim Added: head/editors/emacs22/files/patch-src__m__intel386.h (contents, props changed) Modified: head/editors/emacs22/files/patch-src__alloc.c Modified: head/editors/emacs22/files/patch-src__alloc.c ============================================================================== --- head/editors/emacs22/files/patch-src__alloc.c Mon Sep 23 07:02:52 2013 (r327949) +++ head/editors/emacs22/files/patch-src__alloc.c Mon Sep 23 08:33:31 2013 (r327950) @@ -1,6 +1,36 @@ ---- src/alloc.c.orig 2008-09-07 05:25:27.000000000 +0300 -+++ src/alloc.c 2008-09-07 05:25:27.000000000 +0300 -@@ -4573,8 +4573,12 @@ +--- src/alloc.c.orig 2008-08-12 20:35:44.000000000 +0200 ++++ src/alloc.c 2013-09-07 21:52:46.000000000 +0200 +@@ -1205,6 +1205,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), +@@ -1236,6 +1239,9 @@ + + BLOCK_INPUT_ALLOC; + __malloc_hook = old_malloc_hook; ++#ifdef __GNUC__ ++ __asm __volatile ("" : : : "memory"); ++#endif + #ifdef DOUG_LEA_MALLOC + mallopt (M_TOP_PAD, malloc_hysteresis * 4096); + #else +@@ -1285,6 +1291,9 @@ + + BLOCK_INPUT_ALLOC; + __realloc_hook = old_realloc_hook; ++#ifdef __GNUC__ ++ __asm __volatile ("" : : : "memory"); ++#endif + + #ifdef GC_MALLOC_CHECK + if (ptr) +@@ -4573,8 +4582,12 @@ needed on ia64 too. See mach_dep.c, where it also says inline assembler doesn't work with relevant proprietary compilers. */ #ifdef __sparc__ Added: head/editors/emacs22/files/patch-src__m__intel386.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/emacs22/files/patch-src__m__intel386.h Mon Sep 23 08:33:31 2013 (r327950) @@ -0,0 +1,11 @@ +--- src/m/intel386.h.orig 2008-02-28 00:32:04.000000000 +0100 ++++ src/m/intel386.h 2013-09-14 16:14:18.000000000 +0200 +@@ -58,7 +58,7 @@ NOTE-END */ + /* 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. */