svn commit: r411234 - head/lang/gcc6-aux/files

[John Marino]

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