diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0b096fc926f..72bd0447fe2 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2020-08-08  Tom de Vries  <tdevries@suse.de>
+
+	PR build/26344
+	* arch/riscv.c (riscv_lookup_target_description): Use an explicit
+	constructor.
+	* regcache.c (get_thread_arch_aspace_regcache): Same.
+
 2020-08-07  Tom Tromey  <tromey@adacore.com>
 
 	* ravenscar-thread.c
diff --git a/gdb/arch/riscv.c b/gdb/arch/riscv.c
index e43aafc1c2f..8f5709092e9 100644
--- a/gdb/arch/riscv.c
+++ b/gdb/arch/riscv.c
@@ -108,8 +108,9 @@ riscv_lookup_target_description (const struct riscv_gdbarch_features features)
 
   target_desc *tdesc = riscv_create_target_description (features);
 
-  /* Add to the cache.  */
-  riscv_tdesc_cache.emplace (features, tdesc);
+  /* Add to the cache.  Work around a problem with g++ 4.8 (PR96537):
+     Call the target_desc_up constructor explictly instead of implicitly.  */
+  riscv_tdesc_cache.emplace (features, target_desc_up (tdesc));
 
   return tdesc;
 }
diff --git a/gdb/regcache.c b/gdb/regcache.c
index b8fcc528600..cd54bc6b5f9 100644
--- a/gdb/regcache.c
+++ b/gdb/regcache.c
@@ -354,7 +354,9 @@ get_thread_arch_aspace_regcache (process_stratum_target *target,
   /* It does not exist, create it.  */
   regcache *new_regcache = new regcache (target, arch, aspace);
   new_regcache->set_ptid (ptid);
-  ptid_regc_map.insert (std::make_pair (ptid, new_regcache));
+  /* Work around a problem with g++ 4.8 (PR96537): Call the regcache_up
+     constructor explictly instead of implicitly.  */
+  ptid_regc_map.insert (std::make_pair (ptid, regcache_up (new_regcache)));
 
   return new_regcache;
 }