From: Jakub Jelinek <jakub@redhat.com>
Date: Thu, 15 Mar 2018 18:04:59 +0000 (+0100)
Subject: re PR libfortran/84880 (libgfortran fail to build on aarch64/arm 32bit cross toolchain)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=724ad4a31b5655ebe8b8ca5ddf7db388231ee08b;p=gcc.git

re PR libfortran/84880 (libgfortran fail to build on aarch64/arm 32bit cross toolchain)

	PR libgfortran/84880
	* intrinsics/kill.c (kill): Rename to...
	(PREFIX (kill)): ... this.  Use export_proto_np instead of export_proto.

From-SVN: r258571
---

diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 2d40ef080cb..1c84d2b9fe2 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,9 @@
+2018-03-15  Jakub Jelinek  <jakub@redhat.com>
+
+	PR libgfortran/84880
+	* intrinsics/kill.c (kill): Rename to...
+	(PREFIX (kill)): ... this.  Use export_proto_np instead of export_proto.
+
 2018-03-13  Steven G. Kargl  <kargl@gcc.gnu.org>
 
 	* libgfortran/gfortran.map: Remove _gfortran_kill_i4,
diff --git a/libgfortran/intrinsics/kill.c b/libgfortran/intrinsics/kill.c
index 3b062b3424d..ba24b6fca3b 100644
--- a/libgfortran/intrinsics/kill.c
+++ b/libgfortran/intrinsics/kill.c
@@ -51,11 +51,11 @@ kill_sub (GFC_INTEGER_4 pid, GFC_INTEGER_4 signal, GFC_INTEGER_4 *status)
 }
 iexport(kill_sub);
 
-extern GFC_INTEGER_4 kill (GFC_INTEGER_4, GFC_INTEGER_4);
-export_proto(kill);
+extern GFC_INTEGER_4 PREFIX (kill) (GFC_INTEGER_4, GFC_INTEGER_4);
+export_proto_np(PREFIX (kill));
 
 GFC_INTEGER_4
-kill (GFC_INTEGER_4 pid, GFC_INTEGER_4 signal)
+PREFIX (kill) (GFC_INTEGER_4 pid, GFC_INTEGER_4 signal)
 {
   int val;
   val = (int)kill (pid, signal);