diff --git a/.gitignore b/.gitignore
index 20639e2..8a0d451 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-SOURCES/gcc-9.1.1-20190605.tar.xz
+/gcc-9.1.1-20190503.tar.xz
 /gcc-9.1.1-20190605.tar.xz
diff --git a/compat-sap-c++-9.spec b/compat-sap-c++-9.spec
index f9288c0..b8df3dd 100644
--- a/compat-sap-c++-9.spec
+++ b/compat-sap-c++-9.spec
@@ -27,7 +27,7 @@ Summary: C++ compatibility runtime library for SAP applications
 Name: %{?scl_prefix}c++-9
 ExclusiveArch: x86_64 ppc64le
 Version: %{gcc_version}
-Release: %{gcc_release}.2%{?dist}
+Release: %{gcc_release}.3%{?dist}
 # libgcc, libgfortran, libgomp, libstdc++ and crtstuff have
 # GCC Runtime Exception.
 License: GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions and LGPLv2+ and BSD
@@ -314,7 +314,8 @@ CONFIGURE_OPTS="\
 	"
 
 CC="$CC" CXX="$CXX" CFLAGS="$OPT_FLAGS" \
-	CXXFLAGS="`echo " $OPT_FLAGS " | sed 's/ -Wall / /g;s/ -fexceptions / /g'`" \
+	CXXFLAGS="`echo " $OPT_FLAGS " | sed 's/ -Wall / /g;s/ -fexceptions / /g' \
+		  | sed 's/ -Wformat-security / -Wformat -Wformat-security /'`" \
 	XCFLAGS="$OPT_FLAGS" TCFLAGS="$OPT_FLAGS" \
 	../configure --enable-bootstrap \
 	--enable-languages=c,c++,lto \
@@ -381,11 +382,14 @@ rm -rf %{buildroot}
 %{_root_prefix}/%{_lib}/README9
 
 %changelog
-* Fri Jun  7 2019 Marek Polacek <polacek@redhat.com> 9.1.2-1.2
+* Tue Jan 14 2020 Marek Polacek <polacek@redhat.com> 9.1.1-2.3
+- use -Wformat in CXXFLAGS (#1729983)
+
+* Fri Jun  7 2019 Marek Polacek <polacek@redhat.com> 9.1.1-2.2
 - bump for rebuild
 
-* Thu Jun  6 2019 Marek Polacek <polacek@redhat.com> 9.1.2-1.1
+* Thu Jun  6 2019 Marek Polacek <polacek@redhat.com> 9.1.1-2.1
 - update from Fedora
 
-* Fri May  3 2019 Marek Polacek <polacek@redhat.com> 9.1.1-1.1
+* Fri May  3 2019 Marek Polacek <polacek@redhat.com> 9.1.1-2.1
 - new package
diff --git a/gating.yaml b/gating.yaml
new file mode 100644
index 0000000..eb7c84f
--- /dev/null
+++ b/gating.yaml
@@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+  - rhel-8
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
diff --git a/gcc9-pr90303.patch b/gcc9-pr90303.patch
new file mode 100644
index 0000000..f67c9dd
--- /dev/null
+++ b/gcc9-pr90303.patch
@@ -0,0 +1,39 @@
+2019-05-03  Jakub Jelinek  <jakub@redhat.com>
+
+	PR tree-optimization/90303
+	* ipa-devirt.c (obj_type_ref_class, get_odr_type): Don't use
+	TYPE_CANONICAL for TYPE_STRUCTURAL_EQUALITY_P types in !in_lto_p mode.
+
+	* g++.target/i386/pr90303.C: New test.
+
+--- gcc/ipa-devirt.c	(revision 270834)
++++ gcc/ipa-devirt.c	(revision 270835)
+@@ -2020,7 +2020,7 @@ obj_type_ref_class (const_tree ref)
+   ref = TREE_VALUE (TYPE_ARG_TYPES (ref));
+   gcc_checking_assert (TREE_CODE (ref) == POINTER_TYPE);
+   tree ret = TREE_TYPE (ref);
+-  if (!in_lto_p)
++  if (!in_lto_p && !TYPE_STRUCTURAL_EQUALITY_P (ret))
+     ret = TYPE_CANONICAL (ret);
+   else
+     ret = get_odr_type (ret)->type;
+@@ -2042,7 +2042,7 @@ get_odr_type (tree type, bool insert)
+   int base_id = -1;
+ 
+   type = TYPE_MAIN_VARIANT (type);
+-  if (!in_lto_p)
++  if (!in_lto_p && !TYPE_STRUCTURAL_EQUALITY_P (type))
+     type = TYPE_CANONICAL (type);
+ 
+   gcc_checking_assert (can_be_name_hashed_p (type)
+--- gcc/testsuite/g++.target/i386/pr90303.C	(nonexistent)
++++ gcc/testsuite/g++.target/i386/pr90303.C	(revision 270835)
+@@ -0,0 +1,8 @@
++// PR tree-optimization/90303
++// { dg-do compile { target ia32 } }
++// { dg-additional-options "-O2" }
++
++struct A { virtual void foo (); };
++template <class> class B : A {};
++typedef void (__attribute__((fastcall)) F) ();
++B<F> e;