diff --git a/.gitignore b/.gitignore
index d6c3fb3..494a188 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /gcc-10.0.1-20200118.tar.xz
 /newlib-cygwin-50e2a63b04bdd018484605fbb954fd1bd5147fa0.tar.xz
 /nvptx-tools-5f6f343a302d620b0868edab376c00b15741e39e.tar.xz
+/gcc-10.0.1-20200121.tar.xz
diff --git a/gcc.spec b/gcc.spec
index c79afa0..fb1db66 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -1,10 +1,10 @@
-%global DATE 20200118
-%global gitrev cef2a35ef0b6b1f728face9ba5530f0eb69b1d50
+%global DATE 20200121
+%global gitrev 0d664c7566fe5bf444420c5333401ac056e1a5d6
 %global gcc_version 10.0.1
 %global gcc_major 10
 # Note, gcc_release must be integer, if you want to add suffixes to
 # %%{release}, append them after %%{gcc_release} on Release: line.
-%global gcc_release 0.3
+%global gcc_release 0.4
 %global nvptx_tools_gitrev 5f6f343a302d620b0868edab376c00b15741e39e
 %global newlib_cygwin_gitrev 50e2a63b04bdd018484605fbb954fd1bd5147fa0
 %global _unpackaged_files_terminate_build 0
@@ -15,6 +15,9 @@
 # Until annobin is fixed (#1519165).
 %undefine _annotated_build
 %endif
+%if 0%{?__brp_strip_static_archive:1}
+%global __brp_strip_static_archive %{__brp_strip_static_archive} || :
+%endif
 %if 0%{?fedora} < 32
 %global multilib_64_archs sparc64 ppc64 ppc64p7 s390x x86_64
 %else
@@ -256,7 +259,7 @@ Patch8: gcc10-foffload-default.patch
 Patch9: gcc10-Wno-format-security.patch
 Patch10: gcc10-rh1574936.patch
 Patch11: gcc10-d-shared-libphobos.patch
-Patch12: gcc10-coroutines.patch
+Patch12: gcc10-libcpp-lex-workaround.patch
 
 # On ARM EABI systems, we do want -gnueabi to be part of the
 # target triple.
@@ -768,7 +771,7 @@ to NVidia PTX capable devices if available.
 %patch10 -p0 -b .rh1574936~
 %endif
 %patch11 -p0 -b .d-shared-libphobos~
-%patch12 -p0 -b .coroutines~
+%patch12 -p0 -b .libcpp-lex-workaround~
 
 echo 'Red Hat %{version}-%{gcc_release}' > gcc/DEV-PHASE
 
@@ -2159,11 +2162,14 @@ end
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/arm_acle.h
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/arm_cmse.h
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/arm_fp16.h
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/arm_bf16.h
 %endif
 %ifarch aarch64
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/arm_neon.h
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/arm_acle.h
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/arm_fp16.h
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/arm_bf16.h
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/arm_sve.h
 %endif
 %ifarch sparc sparcv9 sparc64
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/include/visintrin.h
@@ -2992,5 +2998,14 @@ end
 %endif
 
 %changelog
+* Tue Jan 21 2020 Jakub Jelinek <jakub@redhat.com> 10.0.1-0.4
+- update from trunk
+  - PRs c++/33799, c++/92536, debug/92763, fortran/44960, fortran/93309,
+	lto/93318, middle-end/93194, middle-end/93242, preprocessor/80005,
+	target/93073, target/93304, target/93319, testsuite/92829,
+	tree-opt/93321, tree-optimization/92328, tree-optimization/93094,
+	tree-optimization/93199
+- add arm_bf16.h and arm_sve.h to arm and arm/aarch64 (#1793471)
+
 * Sat Jan 18 2020 Jakub Jelinek <jakub@redhat.com> 10.0.1-0.3
 - new package
diff --git a/gcc10-coroutines.patch b/gcc10-coroutines.patch
deleted file mode 100644
index 87d3db1..0000000
--- a/gcc10-coroutines.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-2020-01-18  Jakub Jelinek  <jakub@redhat.com>
-
-	* coroutines.cc (get_fn_local_identifier): Fix NO_DOT_IN_LABEL
-	but non-NO_DOLLAR_IN_LABEL case build.
-
---- gcc/cp/coroutines.cc.jj	2020-01-18 13:47:09.318360691 +0100
-+++ gcc/cp/coroutines.cc	2020-01-18 19:05:48.349119608 +0100
-@@ -2252,7 +2252,7 @@ get_fn_local_identifier (tree orig, cons
-   sep = ".";
- #else
- #ifndef NO_DOLLAR_IN_LABEL
--  sep = "$"
-+  sep = "$";
- #else
-   sep = "_";
-   pfx = "__";
diff --git a/gcc10-libcpp-lex-workaround.patch b/gcc10-libcpp-lex-workaround.patch
new file mode 100644
index 0000000..bcf5a33
--- /dev/null
+++ b/gcc10-libcpp-lex-workaround.patch
@@ -0,0 +1,20 @@
+--- libcpp/lex.c	2020-01-12 11:54:38.565380941 +0100
++++ libcpp/lex.c	2020-01-21 14:35:36.182794214 +0100
+@@ -752,7 +752,7 @@ search_line_fast (const uchar *s, const
+   }
+ }
+ 
+-#elif defined (__ARM_NEON) && defined (__ARM_64BIT_STATE)
++#elif defined (__ARM_NEON) && defined (__ARM_64BIT_STATE) && __has_include("arm_bf16.h")
+ #include "arm_neon.h"
+ 
+ /* This doesn't have to be the exact page size, but no system may use
+@@ -847,7 +847,7 @@ done:
+ 	  + __builtin_ctz (found));
+ }
+ 
+-#elif defined (__ARM_NEON)
++#elif defined (__ARM_NEON) && __has_include("arm_bf16.h")
+ #include "arm_neon.h"
+ 
+ static const uchar *
diff --git a/sources b/sources
index 0422319..cc3b4a0 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (gcc-10.0.1-20200118.tar.xz) = 665e1cea975dbfc2ad75db3eb3e5a757487b2a371fa3dd830a3a0897cf9553853e7b85ee1d2b221897cdeb7b861da22e05d20a0740c12ff137700c1a82cfdd4f
+SHA512 (gcc-10.0.1-20200121.tar.xz) = da870a96e739a3091392b7f62d7fbe4ceef7d6f49644ca366a9a2918b87b70d859f58b3dccc8a53546b81012f4af9d92a709eed4d94ba137f713a08606a59fb6
 SHA512 (newlib-cygwin-50e2a63b04bdd018484605fbb954fd1bd5147fa0.tar.xz) = 9ceea0b883185fe489724d54a7e909bb6ed4785fcadf80162033dc6a133e2657337175601278e4155d1f8fac275ff9c8a02572aea876166c608774c809f832e9
 SHA512 (nvptx-tools-5f6f343a302d620b0868edab376c00b15741e39e.tar.xz) = f6d10db94fa1570ae0f94df073fa3c73c8e5ee16d59070b53d94f7db0de8a031bc44d7f3f1852533da04b625ce758e022263855ed43cfc6867e0708d001e53c7