public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/gcc-patches:master commit in: 4.1.2/gentoo/
@ 2018-09-16 11:13 Sergei Trofimovich
  0 siblings, 0 replies; 5+ messages in thread
From: Sergei Trofimovich @ 2018-09-16 11:13 UTC (permalink / raw
  To: gentoo-commits

commit:     8ad4da87eaa58d0de1543fdcac9c2b03f8ef8f09
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 16 11:13:38 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Sep 16 11:13:38 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=8ad4da87

4.1.2: backport 'struct ucontext' to 'ucontext_t' rename in glibc

Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 4.1.2/gentoo/96_all_ucontext-to-ucontext_t.patch | 113 +++++++++++++++++++++++
 4.1.2/gentoo/README.history                      |   3 +
 2 files changed, 116 insertions(+)

diff --git a/4.1.2/gentoo/96_all_ucontext-to-ucontext_t.patch b/4.1.2/gentoo/96_all_ucontext-to-ucontext_t.patch
new file mode 100644
index 0000000..986baca
--- /dev/null
+++ b/4.1.2/gentoo/96_all_ucontext-to-ucontext_t.patch
@@ -0,0 +1,113 @@
+https://bugs.gentoo.org/629502
+
+From ecf0d1a107133c715763940c2b197aa814710e1b Mon Sep 17 00:00:00 2001
+From: jsm28 <jsm28@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Tue, 4 Jul 2017 10:25:10 +0000
+Subject: [PATCH] Use ucontext_t not struct ucontext in linux-unwind.h files.
+
+Current glibc no longer gives the ucontext_t type the tag struct
+ucontext, to conform with POSIX namespace rules.  This requires
+various linux-unwind.h files in libgcc, that were previously using
+struct ucontext, to be fixed to use ucontext_t instead.  This is
+similar to the removal of the struct siginfo tag from siginfo_t some
+years ago.
+
+This patch changes those files to use ucontext_t instead.  As the
+standard name that should be unconditionally safe, so this is not
+restricted to architectures supported by glibc, or conditioned on the
+glibc version.
+
+Tested compilation together with current glibc with glibc's
+build-many-glibcs.py.
+
+	* config/aarch64/linux-unwind.h (aarch64_fallback_frame_state),
+	config/alpha/linux-unwind.h (alpha_fallback_frame_state),
+	config/bfin/linux-unwind.h (bfin_fallback_frame_state),
+	config/i386/linux-unwind.h (x86_64_fallback_frame_state,
+	x86_fallback_frame_state), config/m68k/linux-unwind.h (struct
+	uw_ucontext), config/nios2/linux-unwind.h (struct nios2_ucontext),
+	config/pa/linux-unwind.h (pa32_fallback_frame_state),
+	config/sh/linux-unwind.h (sh_fallback_frame_state),
+	config/tilepro/linux-unwind.h (tile_fallback_frame_state),
+	config/xtensa/linux-unwind.h (xtensa_fallback_frame_state): Use
+	ucontext_t instead of struct ucontext.
+
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-5-branch@249958 138bc75d-0d04-0410-961f-82ee72b054a4
+---
+ libgcc/config/aarch64/linux-unwind.h |  2 +-
+ libgcc/config/alpha/linux-unwind.h   |  2 +-
+ libgcc/config/bfin/linux-unwind.h    |  2 +-
+ libgcc/config/i386/linux-unwind.h    |  4 ++--
+ libgcc/config/m68k/linux-unwind.h    |  2 +-
+ libgcc/config/nios2/linux-unwind.h   |  2 +-
+ libgcc/config/pa/linux-unwind.h      |  2 +-
+ libgcc/config/sh/linux-unwind.h      |  2 +-
+ libgcc/config/tilepro/linux-unwind.h |  2 +-
+ libgcc/config/xtensa/linux-unwind.h  |  2 +-
+ 11 files changed, 25 insertions(+), 11 deletions(-)
+
+diff --git a/libgcc/config/alpha/linux-unwind.h b/libgcc/config/alpha/linux-unwind.h
+index d65474fec12..9a226b195b5 100644
+--- a/gcc/config/alpha/linux-unwind.h
++++ b/gcc/config/alpha/linux-unwind.h
+@@ -51,7 +51,7 @@ alpha_fallback_frame_state (struct _Unwind_Context *context,
+     {
+       struct rt_sigframe {
+ 	siginfo_t info;
+-	struct ucontext uc;
++	ucontext_t uc;
+       } *rt_ = context->cfa;
+       sc = &rt_->uc.uc_mcontext;
+     }
+diff --git a/libgcc/config/i386/linux-unwind.h b/libgcc/config/i386/linux-unwind.h
+index e54bf73b1fd..d35fc4566ce 100644
+--- a/gcc/config/i386/linux-unwind.h
++++ b/gcc/config/i386/linux-unwind.h
+@@ -58,7 +58,7 @@ x86_64_fallback_frame_state (struct _Unwind_Context *context,
+   if (*(unsigned char *)(pc+0) == 0x48
+       && *(unsigned long long *)(pc+1) == RT_SIGRETURN_SYSCALL)
+     {
+-      struct ucontext *uc_ = context->cfa;
++      ucontext_t *uc_ = context->cfa;
+       /* The void * cast is necessary to avoid an aliasing warning.
+          The aliasing warning is correct, but should not be a problem
+          because it does not alias anything.  */
+@@ -138,7 +138,7 @@ x86_fallback_frame_state (struct _Unwind_Context *context,
+ 	siginfo_t *pinfo;
+ 	void *puc;
+ 	siginfo_t info;
+-	struct ucontext uc;
++	ucontext_t uc;
+       } *rt_ = context->cfa;
+       /* The void * cast is necessary to avoid an aliasing warning.
+          The aliasing warning is correct, but should not be a problem
+diff --git a/libgcc/config/pa/linux-unwind.h b/libgcc/config/pa/linux-unwind.h
+index 01494685ea4..91575356803 100644
+--- a/gcc/config/pa/linux-unwind.h
++++ b/gcc/config/pa/linux-unwind.h
+@@ -80,7 +80,7 @@ pa32_fallback_frame_state (struct _Unwind_Context *context,
+   struct sigcontext *sc;
+   struct rt_sigframe {
+     siginfo_t info;
+-    struct ucontext uc;
++    ucontext_t uc;
+   } *frame;
+ 
+   /* rt_sigreturn trampoline:
+diff --git a/libgcc/config/sh/linux-unwind.h b/libgcc/config/sh/linux-unwind.h
+index e63091f287c..67033f06b4b 100644
+--- a/gcc/config/sh/linux-unwind.h
++++ b/gcc/config/sh/linux-unwind.h
+@@ -180,7 +180,7 @@ sh_fallback_frame_state (struct _Unwind_Context *context,
+     {
+       struct rt_sigframe {
+ 	siginfo_t info;
+-	struct ucontext uc;
++	ucontext_t uc;
+       } *rt_ = context->cfa;
+       /* The void * cast is necessary to avoid an aliasing warning.
+          The aliasing warning is correct, but should not be a problem
+-- 
+2.14.1
+

diff --git a/4.1.2/gentoo/README.history b/4.1.2/gentoo/README.history
index 840c89b..f856cdc 100644
--- a/4.1.2/gentoo/README.history
+++ b/4.1.2/gentoo/README.history
@@ -1,3 +1,6 @@
+1.7		TODO
+	+ 96_all_ucontext-to-ucontext_t.patch
+
 1.6		13 Jan 2016
 	- 00_all_gcc-trampolinewarn.patch
 	+ 44_all_gcc-4.1-log2-static-inline.patch


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] proj/gcc-patches:master commit in: 4.1.2/gentoo/
@ 2018-09-23 22:21 Sergei Trofimovich
  0 siblings, 0 replies; 5+ messages in thread
From: Sergei Trofimovich @ 2018-09-23 22:21 UTC (permalink / raw
  To: gentoo-commits

commit:     d31da8a42bc875efd0eb25b92a8730ecf15592cf
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 23 22:17:45 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Sep 23 22:17:45 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=d31da8a4

4.1.2: cut 1.7 release

Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 4.1.2/gentoo/README.history | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/4.1.2/gentoo/README.history b/4.1.2/gentoo/README.history
index f856cdc..906e822 100644
--- a/4.1.2/gentoo/README.history
+++ b/4.1.2/gentoo/README.history
@@ -1,4 +1,4 @@
-1.7		TODO
+1.7		23 Sep 2018
 	+ 96_all_ucontext-to-ucontext_t.patch
 
 1.6		13 Jan 2016


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] proj/gcc-patches:master commit in: 4.1.2/gentoo/
@ 2018-11-29 20:00 Sergei Trofimovich
  0 siblings, 0 replies; 5+ messages in thread
From: Sergei Trofimovich @ 2018-11-29 20:00 UTC (permalink / raw
  To: gentoo-commits

commit:     e68248882abf164a90740b7c52a76cf5f3333822
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 29 20:00:19 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu Nov 29 20:00:19 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=e6824888

4.1.2: backport libjava ucontext fix

Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 4.1.2/gentoo/97_all_libjava-ucontext.patch | 37 ++++++++++++++++++++++++++++++
 4.1.2/gentoo/README.history                |  3 +++
 2 files changed, 40 insertions(+)

diff --git a/4.1.2/gentoo/97_all_libjava-ucontext.patch b/4.1.2/gentoo/97_all_libjava-ucontext.patch
new file mode 100644
index 0000000..ab9ea96
--- /dev/null
+++ b/4.1.2/gentoo/97_all_libjava-ucontext.patch
@@ -0,0 +1,37 @@
+https://bugs.gentoo.org/629502
+
+From 9b9287cde20ea57578cf07efb2a96ed4cc0da36f Mon Sep 17 00:00:00 2001
+From: doko <doko@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Thu, 7 Sep 2017 07:22:07 +0000
+Subject: [PATCH] 2017-09-07  Matthias Klose  <doko@ubuntu.com>
+
+        * include/x86_64-signal.h (HANDLE_DIVIDE_OVERFLOW): Replace
+        'struct ucontext' with ucontext_t.
+        * include/i386-signal.h (HANDLE_DIVIDE_OVERFLOW): Likewise.
+        * include/s390-signal.h (HANDLE_DIVIDE_OVERFLOW): Likewise.
+
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-5-branch@251832 138bc75d-0d04-0410-961f-82ee72b054a4
+
+--- a/libjava/include/pa-signal.h
++++ b/libjava/include/pa-signal.h
+@@ -24,7 +24,7 @@ static void _Jv_##_name (int _dummy, siginfo_t *_info, void *arg)
+ #define MAKE_THROW_FRAME(_exception)				\
+ do								\
+ {								\
+-  struct ucontext *uc = (struct ucontext *)arg;			\
++  ucontext_t *uc = (ucontext_t *)arg;				\
+   struct sigcontext *sc = &uc->uc_mcontext;			\
+   (void)_dummy;							\
+   (void)_info;							\
+--- a/libjava/include/x86_64-signal.h
++++ b/libjava/include/x86_64-signal.h
+@@ -40,7 +40,7 @@ do									     \
+   /* Advance the program counter so that it is after the start of the	     \
+      instruction:  the x86_64 exception handler expects			     \
+      the PC to point to the instruction after a call. */		     \
+-  struct ucontext *_uc = (struct ucontext *)_p;				     \
++  ucontext_t *_uc = (ucontext_t *)_p;					     \
+   volatile struct sigcontext *_sc = (struct sigcontext *) &_uc->uc_mcontext; \
+   _sc->rip += 2;							     \
+ }									     \

diff --git a/4.1.2/gentoo/README.history b/4.1.2/gentoo/README.history
index 906e822..e4b1de7 100644
--- a/4.1.2/gentoo/README.history
+++ b/4.1.2/gentoo/README.history
@@ -1,3 +1,6 @@
+1.8		TODO
+	+ 97_all_libjava-ucontext.patch
+
 1.7		23 Sep 2018
 	+ 96_all_ucontext-to-ucontext_t.patch
 


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] proj/gcc-patches:master commit in: 4.1.2/gentoo/
@ 2019-06-01  9:36 Sergei Trofimovich
  0 siblings, 0 replies; 5+ messages in thread
From: Sergei Trofimovich @ 2019-06-01  9:36 UTC (permalink / raw
  To: gentoo-commits

commit:     ecd6c999bfa8d4af432167b39d9a51f33735490f
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  1 09:35:06 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Jun  1 09:35:06 2019 +0000
URL:        https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=ecd6c999

4.1.2: cut 1.8 patchset

Two new patches:
97_all_libjava-ucontext.patch: fix libjava build on modern glibc
98_all_cgraph_node-gcc-9.patch: workaround buid failure against gcc-9.1.0

Bug: https://bugs.gentoo.org/629502
Bug: https://gcc.gnu.org/PR90677
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 4.1.2/gentoo/README.history | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/4.1.2/gentoo/README.history b/4.1.2/gentoo/README.history
index 1a91ef2..202d22b 100644
--- a/4.1.2/gentoo/README.history
+++ b/4.1.2/gentoo/README.history
@@ -1,4 +1,4 @@
-1.8		TODO
+1.8		1 Jun 2019
 	+ 97_all_libjava-ucontext.patch
 	+ 98_all_cgraph_node-gcc-9.patch
 


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] proj/gcc-patches:master commit in: 4.1.2/gentoo/
@ 2019-10-27 23:16 Sergei Trofimovich
  0 siblings, 0 replies; 5+ messages in thread
From: Sergei Trofimovich @ 2019-10-27 23:16 UTC (permalink / raw
  To: gentoo-commits

commit:     e9af6dfb6aa2a78f9820d5c2e79e57f88c2d73d2
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 27 23:16:31 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Oct 27 23:16:31 2019 +0000
URL:        https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=e9af6dfb

4.1.2: expand 98_all_cgraph_node-gcc-9.patch to allof gcc-9

Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 4.1.2/gentoo/98_all_cgraph_node-gcc-9.patch | 6 +++---
 4.1.2/gentoo/README.history                 | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/4.1.2/gentoo/98_all_cgraph_node-gcc-9.patch b/4.1.2/gentoo/98_all_cgraph_node-gcc-9.patch
index 92f27a8..16e99b0 100644
--- a/4.1.2/gentoo/98_all_cgraph_node-gcc-9.patch
+++ b/4.1.2/gentoo/98_all_cgraph_node-gcc-9.patch
@@ -16,7 +16,7 @@ gcc-4.6.4/gcc/pretty-print.h:322:6: error: 'cgraph_node' is not defined as a typ
  /* This header may be included before diagnostics-core.h, hence the duplicate
     definitions to allow for GCC-specific formats.  */
 -#if GCC_VERSION >= 3005
-+#if (GCC_VERSION >= 3005) && (GCC_VERSION != 9001) /* 9.1.0 is buggy: https://gcc.gnu.org/PR90677  */
++#if (GCC_VERSION >= 3005) && (__GNUC__ != 9) /* gcc-9 is buggy: https://gcc.gnu.org/PR90677  */
  #define ATTRIBUTE_GCC_PPDIAG(m, n) __attribute__ ((__format__ (__gcc_diag__, m ,n))) ATTRIBUTE_NONNULL(m)
  #else
  #define ATTRIBUTE_GCC_PPDIAG(m, n) ATTRIBUTE_NONNULL(m)
@@ -27,7 +27,7 @@ gcc-4.6.4/gcc/pretty-print.h:322:6: error: 'cgraph_node' is not defined as a typ
     diagnostic framework extensions, you must include this file before
     toplev.h, not after.  */
 -#if GCC_VERSION >= 4001
-+#if (GCC_VERSION >= 4001) && (GCC_VERSION != 9001) /* 9.1.0 is buggy: https://gcc.gnu.org/PR90677  */
++#if (GCC_VERSION >= 4001) && (__GNUC__ != 9) /* gcc-9 is buggy: https://gcc.gnu.org/PR90677  */
  #define ATTRIBUTE_GCC_CDIAG(m, n) __attribute__ ((__format__ (GCC_DIAG_STYLE, m ,n))) ATTRIBUTE_NONNULL(m)
  #else
  #define ATTRIBUTE_GCC_CDIAG(m, n) ATTRIBUTE_NONNULL(m)
@@ -38,7 +38,7 @@ gcc-4.6.4/gcc/pretty-print.h:322:6: error: 'cgraph_node' is not defined as a typ
     each language front end can extend them with its own set of format
     specifiers.  We must use custom format checks.  */
 -#if GCC_VERSION >= 4001
-+#if (GCC_VERSION >= 4001) && (GCC_VERSION != 9001) /* 9.1.0 is buggy: https://gcc.gnu.org/PR90677  */
++#if (GCC_VERSION >= 4001) && (__GNUC__ != 9) /* gcc-9 is buggy: https://gcc.gnu.org/PR90677  */
  #define ATTRIBUTE_GCC_DIAG(m, n) __attribute__ ((__format__ (GCC_DIAG_STYLE, m, n))) ATTRIBUTE_NONNULL(m)
  #else
  #define ATTRIBUTE_GCC_DIAG(m, n) ATTRIBUTE_NONNULL(m)

diff --git a/4.1.2/gentoo/README.history b/4.1.2/gentoo/README.history
index 202d22b..4536512 100644
--- a/4.1.2/gentoo/README.history
+++ b/4.1.2/gentoo/README.history
@@ -1,3 +1,6 @@
+2		27 Oct 2019
+	U 98_all_cgraph_node-gcc-9.patch
+
 1.8		1 Jun 2019
 	+ 97_all_libjava-ucontext.patch
 	+ 98_all_cgraph_node-gcc-9.patch


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2019-10-27 23:17 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-09-23 22:21 [gentoo-commits] proj/gcc-patches:master commit in: 4.1.2/gentoo/ Sergei Trofimovich
  -- strict thread matches above, loose matches on Subject: below --
2019-10-27 23:16 Sergei Trofimovich
2019-06-01  9:36 Sergei Trofimovich
2018-11-29 20:00 Sergei Trofimovich
2018-09-16 11:13 Sergei Trofimovich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox