Updated patches

3 files changed, 21 insertions, 19 deletions

diff --git a/debian/changelog b/debian/changelog
index 24db194..016785a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ gcc-4.8 (4.8.2-20~+dyson1) UNRELEASED; urgency=medium
   * Install only fixed sys/nsctl/nsctl.h sys/feature_tests.h sys/int_const.h
     sys/int_limits.h; e. i. not sys/varargs.h, cause it breaks building
     kernel modules. 
+  * Updated illumos-strict-calling-conventions.diff
+  * Updated illumos-rdynamic.diff
 
  -- Igor Pashev <pashev.igor@gmail.com>  Fri, 18 Apr 2014 15:21:49 +0400
 
diff --git a/debian/patches/illumos-rdynamic.diff b/debian/patches/illumos-rdynamic.diff
index d885a8e..2e3b83c 100644
--- a/debian/patches/illumos-rdynamic.diff
+++ b/debian/patches/illumos-rdynamic.diff
@@ -1,15 +1,15 @@
 Index: gcc-48/src/gcc/configure.ac
 ===================================================================
---- gcc-48.orig/src/gcc/configure.ac	2013-11-06 15:56:48.510580884 +0400
-+++ gcc-48/src/gcc/configure.ac	2013-11-07 13:11:45.205155985 +0400
-@@ -5200,15 +5200,21 @@
+--- gcc-48.orig/src/gcc/configure.ac	2014-04-18 19:40:11.321832341 +0400
++++ gcc-48/src/gcc/configure.ac	2014-04-18 19:51:39.967711188 +0400
+@@ -5230,15 +5230,21 @@
        : # No need to use a flag
        AC_MSG_RESULT([yes])
      else
 -      AC_MSG_RESULT([yes])
        AC_MSG_CHECKING([for -rdynamic])
-       ${CC} ${CFLAGS} ${LDFLAGS} -rdynamic conftest.c -o conftest > /dev/null 2>&1
-       if $export_sym_check conftest | grep foobar > /dev/null; then
+       ${CC} ${CFLAGS} ${LDFLAGS} -rdynamic conftest.c -o conftest$ac_exeext > /dev/null 2>&1
+       if $export_sym_check conftest$ac_exeext | grep -q foobar > /dev/null; then
          plugin_rdynamic=yes
          pluginlibs="-rdynamic"
        else
diff --git a/debian/patches/illumos-strict-calling-conventions.diff b/debian/patches/illumos-strict-calling-conventions.diff
index a9eec24..342f91f 100644
--- a/debian/patches/illumos-strict-calling-conventions.diff
+++ b/debian/patches/illumos-strict-calling-conventions.diff
@@ -15,8 +15,8 @@ See http://wiki.illumos.org/display/illumos/GCC+Modifications
 
 Index: gcc-48/src/gcc/common.opt
 ===================================================================
---- gcc-48.orig/src/gcc/common.opt	2013-11-07 13:09:27.760550425 +0400
-+++ gcc-48/src/gcc/common.opt	2013-11-07 13:13:38.932938815 +0400
+--- gcc-48.orig/src/gcc/common.opt	2014-04-18 19:51:49.854293922 +0400
++++ gcc-48/src/gcc/common.opt	2014-04-19 13:25:33.566648986 +0400
 @@ -1930,6 +1930,10 @@
  Common Report Var(flag_strict_aliasing) Optimization
  Assume strict aliasing rules apply
@@ -30,17 +30,17 @@ Index: gcc-48/src/gcc/common.opt
  Treat signed overflow as undefined
 Index: gcc-48/src/gcc/config/i386/i386.c
 ===================================================================
---- gcc-48.orig/src/gcc/config/i386/i386.c	2013-08-23 14:01:34.000000000 +0400
-+++ gcc-48/src/gcc/config/i386/i386.c	2013-11-07 13:13:38.984746919 +0400
-@@ -5214,6 +5214,7 @@
+--- gcc-48.orig/src/gcc/config/i386/i386.c	2014-04-18 19:39:46.504594693 +0400
++++ gcc-48/src/gcc/config/i386/i386.c	2014-04-19 13:28:34.056953493 +0400
+@@ -5176,6 +5176,7 @@
+   /* Use register calling convention for local functions when possible.  */
    if (decl
        && TREE_CODE (decl) == FUNCTION_DECL
-       && optimize
 +      && (TARGET_64BIT || !flag_strict_calling_conventions)
-       && !(profile_flag && !flag_fentry))
-     {
-       /* FIXME: remove this CONST_CAST when cgraph.[ch] is constified.  */
-@@ -5290,8 +5291,9 @@
+       /* Caller and callee must agree on the calling convention, so
+ 	 checking here just optimize means that with
+ 	 __attribute__((optimize (...))) caller could use regparm convention
+@@ -5258,8 +5259,9 @@
  
    /* For local functions, pass up to SSE_REGPARM_MAX SFmode
       (and DFmode for SSE2) arguments in SSE registers.  */
@@ -54,8 +54,8 @@ Index: gcc-48/src/gcc/config/i386/i386.c
        struct cgraph_local_info *i = cgraph_local_info (CONST_CAST_TREE(decl));
 Index: gcc-48/src/gcc/doc/invoke.texi
 ===================================================================
---- gcc-48.orig/src/gcc/doc/invoke.texi	2013-11-07 13:10:28.439356714 +0400
-+++ gcc-48/src/gcc/doc/invoke.texi	2013-11-07 13:13:39.005340690 +0400
+--- gcc-48.orig/src/gcc/doc/invoke.texi	2014-04-18 19:51:49.889319972 +0400
++++ gcc-48/src/gcc/doc/invoke.texi	2014-04-19 13:25:33.904408477 +0400
 @@ -8034,6 +8034,12 @@
  The @option{-fstrict-aliasing} option is enabled at levels
  @option{-O2}, @option{-O3}, @option{-Os}.
@@ -72,7 +72,7 @@ Index: gcc-48/src/gcc/doc/invoke.texi
 Index: gcc-48/src/gcc/testsuite/gcc.target/i386/local.c
 ===================================================================
 --- gcc-48.orig/src/gcc/testsuite/gcc.target/i386/local.c	2012-02-27 23:18:23.000000000 +0400
-+++ gcc-48/src/gcc/testsuite/gcc.target/i386/local.c	2013-11-07 13:13:39.009740054 +0400
++++ gcc-48/src/gcc/testsuite/gcc.target/i386/local.c	2014-04-19 13:25:33.941693684 +0400
 @@ -1,5 +1,6 @@
  /* { dg-do compile } */
 -/* { dg-options "-O2 -funit-at-a-time" } */
@@ -84,7 +84,7 @@ Index: gcc-48/src/gcc/testsuite/gcc.target/i386/local.c
 Index: gcc-48/src/gcc/testsuite/gcc.target/i386/strict-cc.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gcc-48/src/gcc/testsuite/gcc.target/i386/strict-cc.c	2013-11-07 13:13:39.011880206 +0400
++++ gcc-48/src/gcc/testsuite/gcc.target/i386/strict-cc.c	2014-04-19 13:25:33.944559397 +0400
 @@ -0,0 +1,22 @@
 +/* { dg-do compile { target { ilp32 } } } */
 +/* { dg-options "-O2 -funit-at-a-time -fstrict-calling-conventions"  } */