diff --git a/Manifest.files.gz b/Manifest.files.gz
index a222729b9b30..daf26396b1b5 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 0b68ade99d17..9c61535e67dc 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/opencl-icd-loader/opencl-icd-loader-2020.03.13.ebuild b/dev-libs/opencl-icd-loader/opencl-icd-loader-2020.03.13.ebuild
index 354e60244a5a..617e29a65dd2 100644
--- a/dev-libs/opencl-icd-loader/opencl-icd-loader-2020.03.13.ebuild
+++ b/dev-libs/opencl-icd-loader/opencl-icd-loader-2020.03.13.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 CMAKE_ECLASS=cmake
-inherit cmake-multilib
+inherit cmake-multilib flag-o-matic
 
 MY_PN="OpenCL-ICD-Loader"
 MY_P="${MY_PN}-${PV}"
@@ -26,6 +26,15 @@ RDEPEND="${DEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+src_prepare() {
+	# Until the next upstream release. Bug #716410
+	if use test; then
+		append-cflags $(test-flags-CC -fcommon)
+	fi
+
+	cmake_src_prepare
+}
+
 multilib_src_configure() {
 	local ocl_dir="/usr/$(get_libdir)/OpenCL/vendors/${PN}"
 
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index cbb3f8a9c331..d3095ac54720 100644
Binary files a/metadata/Manifest.gz and b/metadata/Manifest.gz differ
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 0a0f9430aded..4d42ec81ec04 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 07 Apr 2020 09:08:53 +0000
+Tue, 07 Apr 2020 09:38:48 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 0a0f9430aded..4d42ec81ec04 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 07 Apr 2020 09:08:53 +0000
+Tue, 07 Apr 2020 09:38:48 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index d4ec5b45cd91..57de17090cdc 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index ba12a19ee893..1223e0a79b18 100644
Binary files a/metadata/md5-cache/dev-libs/Manifest.gz and b/metadata/md5-cache/dev-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-libs/opencl-icd-loader-2020.03.13 b/metadata/md5-cache/dev-libs/opencl-icd-loader-2020.03.13
index 9894125936e5..deb1cf369649 100644
--- a/metadata/md5-cache/dev-libs/opencl-icd-loader-2020.03.13
+++ b/metadata/md5-cache/dev-libs/opencl-icd-loader-2020.03.13
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/KhronosGroup/OpenCL-ICD-Loader/archive/v2020.03.13.tar.gz -> opencl-icd-loader-2020.03.13.tar.gz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	40fe59465edacd730c644ec2bc197809	multilib	318e8ae683e57fd3ccd0d31a769d8ee8	multilib-build	dfda7934df092a96e439c05b4aeac519	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=07897eee70ef258ec053b0ab0e48238b
+_md5_=591283c632121c92271a5802b83befaf
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 9cf0876aecca..4d42ec81ec04 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 07 Apr 2020 09:08:54 +0000
+Tue, 07 Apr 2020 09:38:48 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 5820710f453f..402dd4f5b39d 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue 07 Apr 2020 09:08:53 AM UTC
+Tue 07 Apr 2020 09:38:48 AM UTC
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 10ddab95d862..c9ee01f01039 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 07 Apr 2020 09:30:01 +0000
+Tue, 07 Apr 2020 10:00:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 88cdf5f95509..1cbf7a189995 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-a0f2955ce40742819e2b63106f50a6d6c2d57bd8 1586248869 2020-04-07T08:41:09+00:00
+ad524a0e30e6a7841e75f0669d2fbc7cbd571c06 1586250493 2020-04-07T09:08:13+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index c46140fcc984..ebc3d490506d 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1586250301 Tue 07 Apr 2020 09:05:01 AM UTC
+1586252101 Tue 07 Apr 2020 09:35:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 0a0f9430aded..4d42ec81ec04 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Tue, 07 Apr 2020 09:08:53 +0000
+Tue, 07 Apr 2020 09:38:48 +0000