[gentoo-commits] proj/gcc-patches:master commit in: 5.5.0/gentoo/

[gentoo-commits] proj/gcc-patches:master commit in: 5.5.0/gentoo/

[Sergei Trofimovich]

commit:     8b2bf34b60351d4a3cfb32cde04b9de77075d3d8
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  2 21:56:53 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu Apr  2 21:56:53 2020 +0000
URL:        https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=8b2bf34b

5.5.0: make 21_all_gcc5_isl-dl.patch -p1 appliable

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

 5.5.0/gentoo/21_all_gcc5_isl-dl.patch | 16 ++++++++--------
 5.5.0/gentoo/README.history           |  1 +
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/5.5.0/gentoo/21_all_gcc5_isl-dl.patch b/5.5.0/gentoo/21_all_gcc5_isl-dl.patch
index aff6aec..2cb3d93 100644
--- a/5.5.0/gentoo/21_all_gcc5_isl-dl.patch
+++ b/5.5.0/gentoo/21_all_gcc5_isl-dl.patch
@@ -9,8 +9,8 @@ We abuse the existing plugin check logic to pull out that info.
 extended by Gentoo to support isl-0.15
 https://bugs.gentoo.org/552278
 
---- gcc/Makefile.in.jj	2012-12-13 17:09:20.000000000 +0100
-+++ gcc/Makefile.in	2012-12-14 11:45:22.585670055 +0100
+--- a/gcc/Makefile.in.jj	2012-12-13 17:09:20.000000000 +0100
++++ b/gcc/Makefile.in	2012-12-14 11:45:22.585670055 +0100
 @@ -1006,7 +1006,7 @@ BUILD_LIBDEPS= $(BUILD_LIBIBERTY)
  # and the system's installed libraries.
  LIBS = @LIBS@ libcommon.a $(CPPLIB) $(LIBINTL) $(LIBICONV) $(LIBBACKTRACE) \
@@ -36,8 +36,8 @@ https://bugs.gentoo.org/552278
  #\f
  # Generate header and source files from the machine description,
  # and compile them.
---- gcc/configure
-+++ gcc/configure
+--- a/gcc/configure
++++ b/gcc/configure
 @@ -604,6 +604,7 @@ PICFLAG
  enable_host_shared
  enable_plugin
@@ -62,8 +62,8 @@ https://bugs.gentoo.org/552278
       fi
       LIBS="$saved_LIBS"
  
---- gcc/graphite-poly.h.jj	2012-12-13 11:31:27.000000000 +0100
-+++ gcc/graphite-poly.h	2012-12-14 13:41:41.970800726 +0100
+--- a/gcc/graphite-poly.h.jj	2012-12-13 11:31:27.000000000 +0100
++++ b/gcc/graphite-poly.h	2012-12-14 13:41:41.970800726 +0100
 @@ -22,6 +22,493 @@ along with GCC; see the file COPYING3.
  #ifndef GCC_GRAPHITE_POLY_H
  #define GCC_GRAPHITE_POLY_H
@@ -558,8 +558,8 @@ https://bugs.gentoo.org/552278
  typedef struct poly_dr *poly_dr_p;
  
  typedef struct poly_bb *poly_bb_p;
---- gcc/graphite.c.jj	2012-12-13 11:31:00.000000000 +0100
-+++ gcc/graphite.c	2012-12-14 13:40:44.155136961 +0100
+--- a/gcc/graphite.c.jj	2012-12-13 11:31:00.000000000 +0100
++++ b/gcc/graphite.c	2012-12-14 13:40:44.155136961 +0100
 @@ -90,6 +90,38 @@ along with GCC; see the file COPYING3.
  #include "graphite-isl-ast-to-gimple.h"
  #include "graphite-sese-to-poly.h"

diff --git a/5.5.0/gentoo/README.history b/5.5.0/gentoo/README.history
index 4fcc795..b357432 100644
--- a/5.5.0/gentoo/README.history
+++ b/5.5.0/gentoo/README.history
@@ -1,4 +1,5 @@
 2		TODO
+	U 21_all_gcc5_isl-dl.patch
 	+ 36_all_libsanitizer-p1.patch
 	+ 37_all_libsanitizer-p2.patch
 

[gentoo-commits] proj/gcc-patches:master commit in: 5.5.0/gentoo/

[Sergei Trofimovich]

commit:     57816f7d2301fee45fc1ad690dab98ca0f56cf64
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 28 19:02:20 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Aug 28 19:02:20 2020 +0000
URL:        https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=57816f7d

5.5.0: backport 'objdump' lookup for plugins

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

 5.5.0/gentoo/41_all_plugin-objdump.patch | 34 ++++++++++++++++++++++++++++++++
 5.5.0/gentoo/README.history              |  3 +++
 2 files changed, 37 insertions(+)

diff --git a/5.5.0/gentoo/41_all_plugin-objdump.patch b/5.5.0/gentoo/41_all_plugin-objdump.patch
new file mode 100644
index 0000000..a9c33fd
--- /dev/null
+++ b/5.5.0/gentoo/41_all_plugin-objdump.patch
@@ -0,0 +1,34 @@
+https://gcc.gnu.org/PR95648
+--- a/config/gcc-plugin.m4
++++ b/config/gcc-plugin.m4
+@@ -45,7 +45,7 @@ AC_DEFUN([GCC_ENABLE_PLUGINS],
+      ;;
+      *)
+        if test x$build = x$host; then
+-	 export_sym_check="objdump${exeext} -T"
++	 export_sym_check="$ac_cv_prog_OBJDUMP -T"
+        elif test x$host = x$target; then
+ 	 export_sym_check="$gcc_cv_objdump -T"
+        else
+--- a/gcc/configure
++++ b/gcc/configure
+@@ -30386,7 +30386,7 @@ fi
+      ;;
+      *)
+        if test x$build = x$host; then
+-	 export_sym_check="objdump${exeext} -T"
++	 export_sym_check="$ac_cv_prog_OBJDUMP -T"
+        elif test x$host = x$target; then
+ 	 export_sym_check="$gcc_cv_objdump -T"
+        else
+--- a/libcc1/configure
++++ b/libcc1/configure
+@@ -14819,7 +14819,7 @@ fi
+      ;;
+      *)
+        if test x$build = x$host; then
+-	 export_sym_check="objdump${exeext} -T"
++	 export_sym_check="$ac_cv_prog_OBJDUMP -T"
+        elif test x$host = x$target; then
+ 	 export_sym_check="$gcc_cv_objdump -T"
+        else

diff --git a/5.5.0/gentoo/README.history b/5.5.0/gentoo/README.history
index d7048a4..b873201 100644
--- a/5.5.0/gentoo/README.history
+++ b/5.5.0/gentoo/README.history
@@ -1,3 +1,6 @@
+5		TODO
+	+ 41_all_plugin-objdump.patch
+
 4		23 Aug 2020
 	+ 40_all_gcc-c++17.patch
 

[gentoo-commits] proj/gcc-patches:master commit in: 5.5.0/gentoo/

[Sergei Trofimovich]

commit:     abcb5facaae237324993b4d37a8b4ff4ff0352f3
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 23 09:05:00 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Aug 23 09:05:00 2020 +0000
URL:        https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=abcb5fac

5.5.0: cut 4 patchset

One new patch:
+ 40_all_gcc-c++17.patch: be buildable with c++17

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

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

diff --git a/5.5.0/gentoo/README.history b/5.5.0/gentoo/README.history
index 57f94a8..d7048a4 100644
--- a/5.5.0/gentoo/README.history
+++ b/5.5.0/gentoo/README.history
@@ -1,4 +1,4 @@
-4		TODO
+4		23 Aug 2020
 	+ 40_all_gcc-c++17.patch
 
 3		29 May 2020

[gentoo-commits] proj/gcc-patches:master commit in: 5.5.0/gentoo/

[Sergei Trofimovich]

commit:     10274189de219a51faaa6e59a3805f1b18804fe4
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  1 08:45:27 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Aug  1 08:45:27 2020 +0000
URL:        https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=10274189

5.5.0: tweak to build against gcc-11

One new patch:
+ 104_all_gcc-c++17.patch: avoid use of '++' on 'bool'.

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

 5.5.0/gentoo/40_all_gcc-c++17.patch | 12 ++++++++++++
 5.5.0/gentoo/README.history         |  3 +++
 2 files changed, 15 insertions(+)

diff --git a/5.5.0/gentoo/40_all_gcc-c++17.patch b/5.5.0/gentoo/40_all_gcc-c++17.patch
new file mode 100644
index 0000000..d940d4c
--- /dev/null
+++ b/5.5.0/gentoo/40_all_gcc-c++17.patch
@@ -0,0 +1,12 @@
+Fix compatibility with c++17
+--- a/gcc/reload.h
++++ b/gcc/reload.h
+@@ -168,7 +168,7 @@ struct target_reload {
+      value indicates the level of indirect addressing supported, e.g., two
+      means that (MEM (MEM (REG n))) is also valid if (REG n) does not get
+      a hard register.  */
+-  bool x_spill_indirect_levels;
++  unsigned char x_spill_indirect_levels;
+ 
+   /* True if caller-save has been reinitialized.  */
+   bool x_caller_save_initialized_p;

diff --git a/5.5.0/gentoo/README.history b/5.5.0/gentoo/README.history
index 421682a..57f94a8 100644
--- a/5.5.0/gentoo/README.history
+++ b/5.5.0/gentoo/README.history
@@ -1,3 +1,6 @@
+4		TODO
+	+ 40_all_gcc-c++17.patch
+
 3		29 May 2020
 	+ 38_all_libcpp-ar.patch
 	+ 39_all_whitespace-pa.patch

[gentoo-commits] proj/gcc-patches:master commit in: 5.5.0/gentoo/

[Sergei Trofimovich]

commit:     2e352a647976fb24448244759d8c63a212e3d778
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri May 29 21:19:42 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri May 29 21:19:42 2020 +0000
URL:        https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=2e352a64

5.5.0: cut 3 patchset

Two new patches:
+ 26_all_libcpp-ar.patch: respect user's AR
+ 27_all_alignof-failure-PR90736.patch: avoid gcc ICE in templates

Reported-by: Agostino Sarubbo
Bug: https://bugs.gentoo.org/718004
Bug: https://gcc.gnu.org/PR94657
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

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

diff --git a/5.5.0/gentoo/README.history b/5.5.0/gentoo/README.history
index a50ba3d..421682a 100644
--- a/5.5.0/gentoo/README.history
+++ b/5.5.0/gentoo/README.history
@@ -1,4 +1,4 @@
-3		TODO
+3		29 May 2020
 	+ 38_all_libcpp-ar.patch
 	+ 39_all_whitespace-pa.patch
 

[gentoo-commits] proj/gcc-patches:master commit in: 5.5.0/gentoo/

[Sergei Trofimovich]

commit:     ea14fd9ff6024eb1611f4b43cbf2a7f844cac0ab
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri May 29 18:34:31 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri May 29 18:34:31 2020 +0000
URL:        https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=ea14fd9f

5.5.0: fix libcpp ar detection, backport whitespace change

Reported-by: Agostino Sarubbo
Bug: https://bugs.gentoo.org/718004
Bug: https://gcc.gnu.org/PR94657
Reported-by: Jeroen Roovers
Bug: https://bugs.gentoo.org/725676
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 5.5.0/gentoo/38_all_libcpp-ar.patch     | 143 ++++++++++++++++++++++++++++++++
 5.5.0/gentoo/39_all_whitespace-pa.patch |  28 +++++++
 5.5.0/gentoo/README.history             |   4 +
 3 files changed, 175 insertions(+)

diff --git a/5.5.0/gentoo/38_all_libcpp-ar.patch b/5.5.0/gentoo/38_all_libcpp-ar.patch
new file mode 100644
index 0000000..55f2944
--- /dev/null
+++ b/5.5.0/gentoo/38_all_libcpp-ar.patch
@@ -0,0 +1,143 @@
+https://bugs.gentoo.org/718004
+https://gcc.gnu.org/PR94657
+
+Make sue we use ${CHOST}-ar and not 'ar'.
+
+--- a/libcpp/configure.ac
++++ b/libcpp/configure.ac
+@@ -12,6 +12,7 @@ AC_PROG_INSTALL
+ AC_PROG_CC
+ AC_PROG_CXX
+ AC_PROG_RANLIB
++AC_CHECK_TOOL(AR, ar)
+ 
+ AC_USE_SYSTEM_EXTENSIONS
+ AC_SYS_LARGEFILE
+--- a/libcpp/Makefile.in
++++ b/libcpp/Makefile.in
+@@ -25,7 +25,7 @@ srcdir = @srcdir@
+ top_builddir = .
+ VPATH = @srcdir@
+ INSTALL = @INSTALL@
+-AR = ar
++AR = @AR@
+ ARFLAGS = cru
+ ACLOCAL = @ACLOCAL@
+ AUTOCONF = @AUTOCONF@
+--- a/libcpp/configure
++++ b/libcpp/configure
+@@ -657,6 +657,7 @@ ACLOCAL
+ EGREP
+ GREP
+ CPP
++AR
+ RANLIB
+ ac_ct_CXX
+ CXXFLAGS
+@@ -1038,6 +1039,7 @@ do
+   | -silent | --silent | --silen | --sile | --sil)
+     silent=yes ;;
+ 
++
+   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+     ac_prev=sbindir ;;
+   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+@@ -4006,6 +4008,98 @@ else
+   RANLIB="$ac_cv_prog_RANLIB"
+ fi
+ 
++if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
++set dummy ${ac_tool_prefix}ar; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_prog_AR+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  if test -n "$AR"; then
++  ac_cv_prog_AR="$AR" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_AR="${ac_tool_prefix}ar"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
++
++fi
++fi
++AR=$ac_cv_prog_AR
++if test -n "$AR"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
++$as_echo "$AR" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++
++fi
++if test -z "$ac_cv_prog_AR"; then
++  ac_ct_AR=$AR
++  # Extract the first word of "ar", so it can be a program name with args.
++set dummy ar; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_prog_ac_ct_AR+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  if test -n "$ac_ct_AR"; then
++  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_ac_ct_AR="ar"
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++  done
++IFS=$as_save_IFS
++
++fi
++fi
++ac_ct_AR=$ac_cv_prog_ac_ct_AR
++if test -n "$ac_ct_AR"; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
++$as_echo "$ac_ct_AR" >&6; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++  if test "x$ac_ct_AR" = x; then
++    AR=""
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
++esac
++    AR=$ac_ct_AR
++  fi
++else
++  AR="$ac_cv_prog_AR"
++fi
++
+ 
+ 
+ ac_ext=c

diff --git a/5.5.0/gentoo/39_all_whitespace-pa.patch b/5.5.0/gentoo/39_all_whitespace-pa.patch
new file mode 100644
index 0000000..9c65b29
--- /dev/null
+++ b/5.5.0/gentoo/39_all_whitespace-pa.patch
@@ -0,0 +1,28 @@
+From bd7a5c5dc082707dd62083514bbb88c6f78e5bdb Mon Sep 17 00:00:00 2001
+From: John David Anglin <danglin@gcc.gnu.org>
+Date: Fri, 20 Sep 2019 21:47:56 +0000
+Subject: [PATCH] pa.c (pa_trampoline_init): Remove spurious extended
+ character.
+
+	* config/pa/pa.c (pa_trampoline_init): Remove spurious extended
+	character.
+
+From-SVN: r276007
+---
+ gcc/config/pa/pa.c | 2 +-
+
+--- a/gcc/config/pa/pa.c
++++ b/gcc/config/pa/pa.c
+@@ -10152,7 +10152,7 @@ pa_trampoline_init (rtx m_tramp, tree fndecl, rtx chain_value)
+     }
+ 
+ #ifdef HAVE_ENABLE_EXECUTE_STACK
+-  emit_library_call (gen_rtx_SYMBOL_REF (Pmode, "__enable_execute_stack"),
+-		     LCT_NORMAL, VOIDmode, 1, XEXP (m_tramp, 0), Pmode);
++  emit_library_call (gen_rtx_SYMBOL_REF (Pmode, "__enable_execute_stack"),
++		      LCT_NORMAL, VOIDmode, 1, XEXP (m_tramp, 0), Pmode);
+ #endif
+ }
+-- 
+2.25.0
+

diff --git a/5.5.0/gentoo/README.history b/5.5.0/gentoo/README.history
index 5e07898..a50ba3d 100644
--- a/5.5.0/gentoo/README.history
+++ b/5.5.0/gentoo/README.history
@@ -1,3 +1,7 @@
+3		TODO
+	+ 38_all_libcpp-ar.patch
+	+ 39_all_whitespace-pa.patch
+
 2		02 Apr 2020
 	U 21_all_gcc5_isl-dl.patch
 	+ 36_all_libsanitizer-p1.patch

[gentoo-commits] proj/gcc-patches:master commit in: 5.5.0/gentoo/

[Sergei Trofimovich]

commit:     e8437af72aeec8f222647e0f84bef74c17d47839
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  2 22:01:29 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu Apr  2 22:01:29 2020 +0000
URL:        https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=e8437af7

5.5.0: cut 2 patchset

Two new patches to handle glibc-2.31 struct changes:
+ 36_all_libsanitizer-p1.patch
+ 37_all_libsanitizer-p2.patch

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

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

diff --git a/5.5.0/gentoo/README.history b/5.5.0/gentoo/README.history
index b357432..5e07898 100644
--- a/5.5.0/gentoo/README.history
+++ b/5.5.0/gentoo/README.history
@@ -1,4 +1,4 @@
-2		TODO
+2		02 Apr 2020
 	U 21_all_gcc5_isl-dl.patch
 	+ 36_all_libsanitizer-p1.patch
 	+ 37_all_libsanitizer-p2.patch

[gentoo-commits] proj/gcc-patches:master commit in: 5.5.0/gentoo/

[Sergei Trofimovich]

commit:     560867ab09420fd475ff0151d1fa58b4aa83e725
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 21 14:11:10 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Mar 21 14:11:10 2020 +0000
URL:        https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=560867ab

5.5.0: backport glibc-2.31 libsanitizer fixes

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

 5.5.0/gentoo/36_all_libsanitizer-p1.patch | 33 ++++++++++++++++
 5.5.0/gentoo/37_all_libsanitizer-p2.patch | 63 +++++++++++++++++++++++++++++++
 5.5.0/gentoo/README.history               |  4 ++
 3 files changed, 100 insertions(+)

diff --git a/5.5.0/gentoo/36_all_libsanitizer-p1.patch b/5.5.0/gentoo/36_all_libsanitizer-p1.patch
new file mode 100644
index 0000000..9bc5426
--- /dev/null
+++ b/5.5.0/gentoo/36_all_libsanitizer-p1.patch
@@ -0,0 +1,33 @@
+From 54d87ffe4b34052f159ac5b72b250129ce813b2a Mon Sep 17 00:00:00 2001
+From: Jakub Jelinek <jakub@redhat.com>
+Date: Fri, 14 Feb 2020 12:33:27 +0100
+Subject: [PATCH] backport: re PR sanitizer/92154 (new glibc breaks arm
+ bootstrap due to libsanitizer)
+
+	Backported from mainline
+	2019-10-22  Tamar Christina  <tamar.christina@arm.com>
+
+	PR sanitizer/92154
+	* sanitizer_common/sanitizer_platform_limits_posix.cc:
+	Cherry-pick compiler-rt revision r375220.
+---
+--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
+@@ -1128,12 +1128,16 @@ CHECK_SIZE_AND_OFFSET(ipc_perm, gid);
+ CHECK_SIZE_AND_OFFSET(ipc_perm, cuid);
+ CHECK_SIZE_AND_OFFSET(ipc_perm, cgid);
+ #ifndef __GLIBC_PREREQ
+ #define __GLIBC_PREREQ(x, y) 0
+ #endif
+-#if !defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21)
++#if (!defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21)) && \
++    !defined(__arm__)
+ /* On aarch64 glibc 2.20 and earlier provided incorrect mode field.  */
++/* On Arm glibc 2.31 and later provide a different mode field, this field is
++   never used by libsanitizer so we can simply ignore this assert for all glibc
++   versions.  */
+ CHECK_SIZE_AND_OFFSET(ipc_perm, mode);
+ #endif
+ 
+ CHECK_TYPE_SIZE(shmid_ds);
+ CHECK_SIZE_AND_OFFSET(shmid_ds, shm_perm);

diff --git a/5.5.0/gentoo/37_all_libsanitizer-p2.patch b/5.5.0/gentoo/37_all_libsanitizer-p2.patch
new file mode 100644
index 0000000..dea9073
--- /dev/null
+++ b/5.5.0/gentoo/37_all_libsanitizer-p2.patch
@@ -0,0 +1,63 @@
+From dbdf86838aaaef76620c00c53096cfe157d5af6e Mon Sep 17 00:00:00 2001
+From: Jakub Jelinek <jakub@redhat.com>
+Date: Fri, 14 Feb 2020 12:38:30 +0100
+Subject: [PATCH] backport: re PR sanitizer/92154 (new glibc breaks arm
+ bootstrap due to libsanitizer)
+
+	Backported from mainline
+	2019-11-26  Jakub Jelinek  <jakub@redhat.com>
+
+	PR sanitizer/92154
+	* sanitizer_common/sanitizer_platform_limits_posix.h: Cherry-pick
+	llvm-project revision 947f9692440836dcb8d88b74b69dd379d85974ce.
+	* sanitizer_common/sanitizer_platform_limits_posix.cc: Likewise.
+---
+--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc
+@@ -1128,16 +1128,13 @@ CHECK_SIZE_AND_OFFSET(ipc_perm, gid);
+ CHECK_SIZE_AND_OFFSET(ipc_perm, cuid);
+ CHECK_SIZE_AND_OFFSET(ipc_perm, cgid);
+ #ifndef __GLIBC_PREREQ
+ #define __GLIBC_PREREQ(x, y) 0
+ #endif
+-#if (!defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21)) && \
+-    !defined(__arm__)
+-/* On aarch64 glibc 2.20 and earlier provided incorrect mode field.  */
+-/* On Arm glibc 2.31 and later provide a different mode field, this field is
+-   never used by libsanitizer so we can simply ignore this assert for all glibc
+-   versions.  */
++#if !SANITIZER_LINUX || __GLIBC_PREREQ (2, 31)
++/* glibc 2.30 and earlier provided 16-bit mode field instead of 32-bit
++   on many architectures.  */
+ CHECK_SIZE_AND_OFFSET(ipc_perm, mode);
+ #endif
+ 
+ CHECK_TYPE_SIZE(shmid_ds);
+ CHECK_SIZE_AND_OFFSET(shmid_ds, shm_perm);
+--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
+@@ -210,20 +210,13 @@ namespace __sanitizer {
+     unsigned long __unused1;
+     unsigned long __unused2;
+ #elif defined(__sparc__)
+-# if defined(__arch64__)
+     unsigned mode;
+-    unsigned short __pad1;
+-# else
+-    unsigned short __pad1;
+-    unsigned short mode;
+     unsigned short __pad2;
+-# endif
+     unsigned short __seq;
+     unsigned long long __unused1;
+     unsigned long long __unused2;
+ #else
+-    unsigned short mode;
+-    unsigned short __pad1;
++    unsigned int mode;
+     unsigned short __seq;
+     unsigned short __pad2;
+ #if defined(__x86_64__) && !defined(_LP64)
+-- 
+2.25.2
+

diff --git a/5.5.0/gentoo/README.history b/5.5.0/gentoo/README.history
index 237416d..4fcc795 100644
--- a/5.5.0/gentoo/README.history
+++ b/5.5.0/gentoo/README.history
@@ -1,3 +1,7 @@
+2		TODO
+	+ 36_all_libsanitizer-p1.patch
+	+ 37_all_libsanitizer-p2.patch
+
 1.0		10 Dec 2018
 	+ 01_all_gcc-spec-env.patch
 	+ 02_all_default-ssp.patch