[arch-commits] Commit in lib32-libstdc++5/trunk (3 files)

[Christian Hesse]

    Date: Thursday, September 13, 2018 @ 23:22:13
  Author: eworm
Revision: 380752

changes from libstdc++5

Modified:
  lib32-libstdc++5/trunk/PKGBUILD
  lib32-libstdc++5/trunk/gcc-3.4.3-no_multilib_amd64.patch
  lib32-libstdc++5/trunk/siginfo.patch

-----------------------------------+
 PKGBUILD                          |   12 ++++++++----
 gcc-3.4.3-no_multilib_amd64.patch |    6 +++---
 siginfo.patch                     |   14 --------------
 3 files changed, 11 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-09-13 23:18:54 UTC (rev 380751)
+++ PKGBUILD	2018-09-13 23:22:13 UTC (rev 380752)
@@ -11,16 +11,20 @@
 makedepends=('gcc-multilib' 'binutils')
 options=('!makeflags')
 source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-{core,g++}-${pkgver}.tar.bz2
-        gcc-3.4.3-no_multilib_amd64.patch siginfo.patch)
+        gcc-3.4.3-no_multilib_amd64.patch
+        gcc-3.4.6-ucontext.patch
+        siginfo.patch)
 md5sums=('18c52e6fb8966b7700665dca289d077f'
          '6b3d00b8d079805be1b895f7f6ce47a0'
-         'b2a96584f4cee72362695ba44c911c40'
-         '64b9d275b400f0fd1e8b1932c12cea20')
+         '8504bb22dae9d49e8b6d70d7e6910f1b'
+         '982ec78eed2887657189aefbe0c642d0'
+         'bf36b281a9fc81f624f31f2623a3ad0e')
 
 prepare() {
   cd ${srcdir}/gcc-${pkgver}
 
-  patch -Np0 -i $srcdir/gcc-3.4.3-no_multilib_amd64.patch
+  patch -Np1 -i $srcdir/gcc-3.4.3-no_multilib_amd64.patch
+  patch -Np1 -i $srcdir/gcc-3.4.6-ucontext.patch
   patch -Np0 -i $srcdir/siginfo.patch
 
   # fix build issue with recent gcc

Modified: gcc-3.4.3-no_multilib_amd64.patch
===================================================================
--- gcc-3.4.3-no_multilib_amd64.patch	2018-09-13 23:18:54 UTC (rev 380751)
+++ gcc-3.4.3-no_multilib_amd64.patch	2018-09-13 23:22:13 UTC (rev 380752)
@@ -1,11 +1,11 @@
---- gcc/config/i386/t-linux64.orig	2003-06-28 00:19:59.000000000 +0000
-+++ gcc/config/i386/t-linux64	2003-06-28 00:20:07.000000000 +0000
+--- gcc-3.4.3/gcc/config/i386/t-linux64
++++ gcc-3.4.3/gcc/config/i386/t-linux64
 @@ -6,7 +6,7 @@
  
  MULTILIB_OPTIONS = m64/m32
  MULTILIB_DIRNAMES = 64 32 
 -MULTILIB_OSDIRNAMES = ../lib64 ../lib
-+MULTILIB_OSDIRNAMES = ../lib ../lib32
++MULTILIB_OSDIRNAMES = . ../lib
  
  LIBGCC = stmp-multilib
  INSTALL_LIBGCC = install-multilib

Modified: siginfo.patch
===================================================================
--- siginfo.patch	2018-09-13 23:18:54 UTC (rev 380751)
+++ siginfo.patch	2018-09-13 23:22:13 UTC (rev 380752)
@@ -1,17 +1,3 @@
---- gcc/config/i386/linux64.h.orig	2014-04-28 10:00:16.556121683 +0000
-+++ gcc/config/i386/linux64.h	2014-04-28 10:00:43.105959247 +0000
-@@ -257,9 +257,9 @@
-       {									\
- 	struct rt_sigframe {						\
- 	  int sig;							\
--	  struct siginfo *pinfo;					\
-+	  siginfo_t *pinfo;					\
- 	  void *puc;							\
--	  struct siginfo info;						\
-+	  siginfo_t info;						\
- 	  struct ucontext uc;						\
- 	} *rt_ = (CONTEXT)->cfa;					\
- 	sc_ = (struct sigcontext *) &rt_->uc.uc_mcontext;		\
 --- gcc/config/i386/linux.h.orig	2014-04-28 10:00:16.556121683 +0000
 +++ gcc/config/i386/linux.h	2014-04-28 10:00:43.105959247 +0000
 @@ -257,9 +257,9 @@