diff --git a/ld/ChangeLog b/ld/ChangeLog
index 325392f498..6bdc516173 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+2019-05-08  Pekka Seppänen  <pexu@sourceware.mail.kapsi.fi>
+
+	PR 24536
+	* ldbuildid.c (generate_build_id): Cast return value from
+	GetProcAddress in order to avoid a compile time warning.
+
 2019-05-06  Alan Modra  <amodra@gmail.com>
 
 	* testsuite/ld-undefined/weak-undef.exp: Don't xfail pj.
diff --git a/ld/ldbuildid.c b/ld/ldbuildid.c
index 55ff3bed84..c4ad19992b 100644
--- a/ld/ldbuildid.c
+++ b/ld/ldbuildid.c
@@ -139,7 +139,7 @@ generate_build_id (bfd *abfd,
 
       if (!rpc_library)
 	return FALSE;
-      uuid_create = (UuidCreateFn) GetProcAddress (rpc_library, "UuidCreate");
+      uuid_create = (UuidCreateFn) (void (WINAPI *)(void)) GetProcAddress (rpc_library, "UuidCreate");
       if (!uuid_create)
 	{
 	  FreeLibrary (rpc_library);