[gentoo-commits] gentoo-x86 commit in dev-scheme/guile/files: guile-1.8.8-gcc46.patch

[Kacper Kowalik (xarthisius)]

xarthisius    12/08/27 08:15:35

  Added:                guile-1.8.8-gcc46.patch
  Log:
  Backport upstream patch to fix SIGSEGV with gcc-4.6 wrt #424475 by Ivan Bagaev <gmiramir@×××××.com> Thanks to Cyprien Nicolas (fulax) <c.nicolas+bugs@×××××.com> for detailed analysis and finding patch. Acked by hkBst
  
  (Portage version: 2.2.0_alpha123/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  dev-scheme/guile/files/guile-1.8.8-gcc46.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-scheme/guile/files/guile-1.8.8-gcc46.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-scheme/guile/files/guile-1.8.8-gcc46.patch?rev=1.1&content-type=text/plain

Index: guile-1.8.8-gcc46.patch
===================================================================
Backported upstream patch to fix SIGSEGV with gcc-4.6

http://git.savannah.gnu.org/cgit/guile.git/commit/?h=branch_release-1-8&id=62bc1072c19e81bb0f9e42a5034e7ab8c27d3b94
https://bugs.gentoo.org/show_bug.cgi?id=424475
--- a/configure.in
+++ b/configure.in
@@ -1199,23 +1199,20 @@
 AC_RUN_IFELSE([AC_LANG_SOURCE(
 [AC_INCLUDES_DEFAULT
 int
-find_stack_direction ()
+find_stack_direction (int *addr, int depth)
 {
-  static char *addr = 0;
-  auto char dummy;
-  if (addr == 0)
-    {
-      addr = &dummy;
-      return find_stack_direction ();
-    }
-  else
-    return (&dummy > addr) ? 1 : -1;
+  int dir, dummy = 0;
+  if (! addr)
+    addr = &dummy;
+  *addr = addr < &dummy ? 1 : addr == &dummy ? 0 : -1;
+  dir = depth ? find_stack_direction (addr, depth - 1) : 0;
+  return dir + dummy;
 }
 
 int
-main ()
+main (int argc, char **argv)
 {
-  return find_stack_direction () < 0;
+  return find_stack_direction (0, argc + !argv + 20) < 0;
 }])],
 	       [SCM_I_GSC_STACK_GROWS_UP=1],
 	       [],