From owner-svn-ports-all@freebsd.org  Wed Mar 16 13:08:55 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3C506AD2D5B;
 Wed, 16 Mar 2016 13:08:55 +0000 (UTC)
 (envelope-from marino@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0BF79B31;
 Wed, 16 Mar 2016 13:08:54 +0000 (UTC)
 (envelope-from marino@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2GD8sg2071370;
 Wed, 16 Mar 2016 13:08:54 GMT (envelope-from marino@FreeBSD.org)
Received: (from marino@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2GD8sIG071369;
 Wed, 16 Mar 2016 13:08:54 GMT (envelope-from marino@FreeBSD.org)
Message-Id: <201603161308.u2GD8sIG071369@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: marino set sender to
 marino@FreeBSD.org using -f
From: John Marino <marino@FreeBSD.org>
Date: Wed, 16 Mar 2016 13:08:54 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r411234 - head/lang/gcc6-aux/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-all@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 16 Mar 2016 13:08:55 -0000

Author: marino
Date: Wed Mar 16 13:08:54 2016
New Revision: 411234
URL: https://svnweb.freebsd.org/changeset/ports/411234

Log:
  lang/gcc6-aux: Add forgotten patch (gnatdroid support)
  
  There's no requirement to bump since lang/gcc6-aux doesn't compile
  the patched code.  The gnatdroid ports will though.

Modified:
  head/lang/gcc6-aux/files/diff-ada

Modified: head/lang/gcc6-aux/files/diff-ada
==============================================================================
--- head/lang/gcc6-aux/files/diff-ada	Wed Mar 16 13:00:10 2016	(r411233)
+++ head/lang/gcc6-aux/files/diff-ada	Wed Mar 16 13:08:54 2016	(r411234)
@@ -1099,3 +1099,22 @@
  
  # List of target dependent sources, overridden below as necessary
  TARGET_ADA_SRCS =
+--- gcc/ada/init.c.orig
++++ gcc/ada/init.c
+@@ -2510,8 +2510,15 @@
+ {
+   mcontext_t *mcontext = &((ucontext_t *) ucontext)->uc_mcontext;
+ 
++#if defined (__i386__)
++  unsigned long *pc = (unsigned long *)mcontext->gregs[REG_EIP];
++  /* The pattern is "orl $0x0,(%esp)" for a probe in 32-bit mode.  */
++  if (signo == SIGSEGV && pc && *pc == 0x00240c83)
++    mcontext->gregs[REG_ESP] += 4096 + 4 * sizeof (unsigned long);
++#elif defined (__ARMEL__)
+   /* ARM Bump has to be an even number because of odd/even architecture.  */
+-  ((mcontext_t *) mcontext)->arm_pc += 2;
++  mcontext->arm_pc += 2;
++#endif
+ }
+ 
+ static void