diff --git a/.gitignore b/.gitignore
index 0977d5a..71f6a81 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /gcc-14.0.1-20240118.tar.xz
 /newlib-cygwin-d45261f62a15f8abd94a1031020b9a9f455e4eed.tar.xz
 /gcc-14.0.1-20240125.tar.xz
+/gcc-14.0.1-20240127.tar.xz
diff --git a/gcc.spec b/gcc.spec
index 7003323..276a646 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -1,5 +1,5 @@
-%global DATE 20240125
-%global gitrev f3118f3f56f589a21b94106c4e210e5ba9a60898
+%global DATE 20240127
+%global gitrev 97a1e216faf8ad55b025f07bed4940c016a982c3
 %global gcc_version 14.0.1
 %global gcc_major 14
 # Note, gcc_release must be integer, if you want to add suffixes to
@@ -141,7 +141,7 @@
 Summary: Various compilers (C, C++, Objective-C, ...)
 Name: gcc
 Version: %{gcc_version}
-Release: %{gcc_release}.3.0.riscv64%{?dist}
+Release: %{gcc_release}.4.0.riscv64%{?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
@@ -235,7 +235,7 @@ BuildRequires: doxygen >= 1.7.1
 BuildRequires: graphviz, dblatex, texlive-collection-latex, docbook5-style-xsl
 %endif
 %if %{build_offload_amdgcn}
-BuildRequires: llvm, lld
+BuildRequires: llvm >= 15, lld >= 15
 %endif
 Requires: cpp = %{version}-%{release}
 # Need .eh_frame ld optimizations
@@ -340,11 +340,11 @@ chmod 755 %{buildroot}%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_major}
 %endif
 
 %description
-The gcc package contains the GNU Compiler Collection version 14.
+The gcc package contains the GNU Compiler Collection version %{gcc_major}.
 You'll need this package in order to compile C code.
 
 %package -n libgcc
-Summary: GCC version 14 shared support library
+Summary: GCC version %{gcc_major} shared support library
 Autoreq: false
 %if !%{build_ada}
 Obsoletes: libgnat < %{version}-%{release}
@@ -855,7 +855,7 @@ to NVidia PTX capable devices if available.
 Summary: Offloading compiler to AMD GCN
 Requires: gcc = %{version}-%{release}
 Requires: libgomp-offload-amdgcn = %{version}-%{release}
-Requires: llvm, lld
+Requires: llvm >= 15, lld >= 15
 
 %description offload-amdgcn
 The gcc-offload-amdgcn package provides offloading support for
@@ -916,6 +916,8 @@ cp -a libstdc++-v3/config/cpu/i{4,3}86/atomicity.h
 
 LC_ALL=C sed -i -e 's/\xa0/ /' gcc/doc/options.texi
 
+sed -i -e '/ldp_fusion/s/Init(1)/Init(0)/' gcc/config/aarch64/aarch64.opt
+
 sed -i -e 's/Common Driver Var(flag_report_bug)/& Init(1)/' gcc/common.opt
 sed -i -e 's/context->report_bug = false;/context->report_bug = true;/' gcc/diagnostic.cc
 
@@ -1060,7 +1062,7 @@ cp -f -v /usr/lib/rpm/%{_vendor}/config.guess ../../isl-%{isl_version}/config.gu
 cp -f -v /usr/lib/rpm/%{_vendor}/config.sub ../../isl-%{isl_version}/config.sub
 %endif
 
-sed -i 's|libisl\([^-]\)|libgcc14privateisl\1|g' \
+sed -i 's|libisl\([^-]\)|libgcc%{gcc_major}privateisl\1|g' \
   ../../isl-%{isl_version}/Makefile.{am,in}
 ../../isl-%{isl_version}/configure \
   CC=/usr/bin/gcc CXX=/usr/bin/g++ \
@@ -1068,8 +1070,8 @@ sed -i 's|libisl\([^-]\)|libgcc14privateisl\1|g' \
 make %{?_smp_mflags} CFLAGS="${CFLAGS:-%optflags} $ISL_FLAG_PIC"
 make install
 cd ../isl-install/lib
-rm libgcc14privateisl.so{,.23}
-mv libgcc14privateisl.so.23.1.0 libisl.so.23
+rm libgcc%{gcc_major}privateisl.so{,.23}
+mv libgcc%{gcc_major}privateisl.so.23.1.0 libisl.so.23
 ln -sf libisl.so.23 libisl.so
 cd ../..
 %endif
@@ -1831,28 +1833,28 @@ mv -f $FULLPATH/ada{include,lib} $FULLLPATH/
 pushd $FULLLPATH/adalib
 if [ "%{_lib}" = "lib" ]; then
 ln -sf ../../../../../libgnarl-*.so libgnarl.so
-ln -sf ../../../../../libgnarl-*.so libgnarl-14.so
+ln -sf ../../../../../libgnarl-*.so libgnarl-%{gcc_major}.so
 ln -sf ../../../../../libgnat-*.so libgnat.so
-ln -sf ../../../../../libgnat-*.so libgnat-14.so
+ln -sf ../../../../../libgnat-*.so libgnat-%{gcc_major}.so
 else
 ln -sf ../../../../../../%{_lib}/libgnarl-*.so libgnarl.so
-ln -sf ../../../../../../%{_lib}/libgnarl-*.so libgnarl-14.so
+ln -sf ../../../../../../%{_lib}/libgnarl-*.so libgnarl-%{gcc_major}.so
 ln -sf ../../../../../../%{_lib}/libgnat-*.so libgnat.so
-ln -sf ../../../../../../%{_lib}/libgnat-*.so libgnat-14.so
+ln -sf ../../../../../../%{_lib}/libgnat-*.so libgnat-%{gcc_major}.so
 fi
 popd
 else
 pushd $FULLPATH/adalib
 if [ "%{_lib}" = "lib" ]; then
 ln -sf ../../../../libgnarl-*.so libgnarl.so
-ln -sf ../../../../libgnarl-*.so libgnarl-14.so
+ln -sf ../../../../libgnarl-*.so libgnarl-%{gcc_major}.so
 ln -sf ../../../../libgnat-*.so libgnat.so
-ln -sf ../../../../libgnat-*.so libgnat-14.so
+ln -sf ../../../../libgnat-*.so libgnat-%{gcc_major}.so
 else
 ln -sf ../../../../../%{_lib}/libgnarl-*.so libgnarl.so
-ln -sf ../../../../../%{_lib}/libgnarl-*.so libgnarl-14.so
+ln -sf ../../../../../%{_lib}/libgnarl-*.so libgnarl-%{gcc_major}.so
 ln -sf ../../../../../%{_lib}/libgnat-*.so libgnat.so
-ln -sf ../../../../../%{_lib}/libgnat-*.so libgnat-14.so
+ln -sf ../../../../../%{_lib}/libgnat-*.so libgnat-%{gcc_major}.so
 fi
 popd
 fi
@@ -3606,9 +3608,22 @@ end
 %endif
 
 %changelog
-* Fri Jan 26 2024 David Abdurachmanov <davidlt@rivosinc.com> 14.0.1-0.3.0.riscv64
+* Sun Jan 28 2024 David Abdurachmanov <davidlt@rivosinc.com> 14.0.1-0.4.0.riscv64
 - Adjust for riscv64
 
+* Sat Jan 27 2024 Jakub Jelinek <jakub@redhat.com> 14.0.1-0.4
+- update from trunk
+  - PRs analyzer/112969, c++/109227, c++/112899, c++/113580, c++/113598,
+	c++/113599, middle-end/112971, other/113575, preprocessor/105608,
+	target/100204, target/100212, target/112987, target/113469,
+	target/113526, target/113538, target/113601, testsuite/113558,
+	tree-optimization/113602
+- temporarily disable -mearly-ldp-fusion -mlate-ldp-fusion on aarch64 again
+  (#2260449, #2260560, #2260562)
+- use gcc_major macro in the spec some more
+- require llvm >= 15 and lld >= 15 for the amdgcn offloading
+  where they are used as assembler and linker
+
 * Thu Jan 25 2024 Jakub Jelinek <jakub@redhat.com> 14.0.1-0.3
 - update from trunk
   - PRs analyzer/111361, analyzer/112705, analyzer/112811, analyzer/112927,
diff --git a/sources b/sources
index 424df01..6042b49 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-SHA512 (gcc-14.0.1-20240125.tar.xz) = 8d9784cc2046947cb17c0d1cbd556dcc9f98106c1d19f7de5f9f7641d421a816d85ed9166b7d85324eae96d46384c7c8e2884a815cd53058792e13568cad883d
+SHA512 (gcc-14.0.1-20240127.tar.xz) = 3a45100039c6b2e0c7f0731dfa942c52badae86895c6ed9d76283dabb365efa00e9808aef9521754359df124c942fcbc700de09b6fdb6a9e7359b43cbbc722d8
 SHA512 (isl-0.24.tar.bz2) = aab3bddbda96b801d0f56d2869f943157aad52a6f6e6a61745edd740234c635c38231af20bc3f1a08d416a5e973a90e18249078ed8e4ae2f1d5de57658738e95
 SHA512 (newlib-cygwin-d45261f62a15f8abd94a1031020b9a9f455e4eed.tar.xz) = 31bfc19429797236e268e22b752c5abeabb9c0f39b1058634af8dab329b4f028fc72a35888193c9575f6cee5cf2c069669d79fcb4d4e3a4318f57413452f707d
 SHA512 (nvptx-tools-c5ad8ada3e86d96b10a9d352b7a764f801478ba6.tar.xz) = 8a5c282852c995fabf75a8d6331db807a1acd935fd82022e00801b798fb850392d03e29cfa4aa7e3d5cfd8f48510e5e25b79a647fbec79c8566792584a0c1c49