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

[Christian Hesse]

    Date: Thursday, September 13, 2018 @ 23:07:46
  Author: eworm
Revision: 334517

upgpkg: libstdc++5 3.3.6-6

BUILDINFO Rebuild

Added:
  libstdc++5/trunk/gcc-3.4.6-ucontext.patch
Modified:
  libstdc++5/trunk/PKGBUILD
  libstdc++5/trunk/gcc-3.4.3-no_multilib_amd64.patch

-----------------------------------+
 PKGBUILD                          |   11 ++++++-----
 gcc-3.4.3-no_multilib_amd64.patch |    4 ++--
 gcc-3.4.6-ucontext.patch          |   21 +++++++++++++++++++++
 3 files changed, 29 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-09-13 21:03:56 UTC (rev 334516)
+++ PKGBUILD	2018-09-13 23:07:46 UTC (rev 334517)
@@ -2,7 +2,7 @@
 
 pkgname=libstdc++5
 pkgver=3.3.6
-pkgrel=5
+pkgrel=6
 pkgdesc="GNU Standard C++ library version 3"
 arch=('x86_64')
 url="http://gcc.gnu.org"
@@ -12,18 +12,19 @@
 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
+        gcc-3.4.6-ucontext.patch
         siginfo.patch)
 md5sums=('18c52e6fb8966b7700665dca289d077f'
          '6b3d00b8d079805be1b895f7f6ce47a0'
-         '088e0807e677010cafe4e590e8711be1'
+         '8504bb22dae9d49e8b6d70d7e6910f1b'
+         '982ec78eed2887657189aefbe0c642d0'
          'bf36b281a9fc81f624f31f2623a3ad0e')
 
 prepare() {
   cd gcc-$pkgver
 
-  if [ "$CARCH" = "x86_64" ]; then
-    patch -Np0 -i $srcdir/gcc-3.4.3-no_multilib_amd64.patch
-  fi
+  patch -Np1 -i $srcdir/gcc-3.4.3-no_multilib_amd64.patch
+  patch -Np1 -i $srcdir/gcc-3.4.6-ucontext.patch
   
   # fix build issue with recent gcc
   sed -i "s#O_CREAT#O_CREAT, 0666#" gcc/collect2.c

Modified: gcc-3.4.3-no_multilib_amd64.patch
===================================================================
--- gcc-3.4.3-no_multilib_amd64.patch	2018-09-13 21:03:56 UTC (rev 334516)
+++ gcc-3.4.3-no_multilib_amd64.patch	2018-09-13 23:07:46 UTC (rev 334517)
@@ -1,5 +1,5 @@
---- 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

Added: gcc-3.4.6-ucontext.patch
===================================================================
--- gcc-3.4.6-ucontext.patch	                        (rev 0)
+++ gcc-3.4.6-ucontext.patch	2018-09-13 23:07:46 UTC (rev 334517)
@@ -0,0 +1,21 @@
+--- gcc-3.4.6/gcc/config/i386/linux64.h
++++ gcc-3.4.6/gcc/config/i386/linux64.h
+@@ -90,7 +90,7 @@
+     if (*(unsigned char *)(pc_+0) == 0x48				\
+ 	&& *(unsigned long *)(pc_+1) == 0x050f0000000fc0c7)		\
+       {									\
+-	struct ucontext *uc_ = (CONTEXT)->cfa;				\
++	ucontext_t *uc_ = (CONTEXT)->cfa;				\
+ 	sc_ = (struct sigcontext *) &uc_->uc_mcontext;			\
+       }									\
+     else								\
+@@ -160,7 +160,7 @@
+ 	  struct siginfo *pinfo;					\
+ 	  void *puc;							\
+ 	  struct siginfo info;						\
+-	  struct ucontext uc;						\
++	  ucontext_t uc;						\
+ 	} *rt_ = (CONTEXT)->cfa;					\
+ 	sc_ = (struct sigcontext *) &rt_->uc.uc_mcontext;		\
+       }									\
+