Re: [PATCH] Fortran -- clean up KILL

[Jakub Jelinek]

On Thu, Mar 15, 2018 at 07:10:26AM -0700, Steve Kargl wrote:
> On Thu, Mar 15, 2018 at 01:35:23PM +0100, Richard Biener wrote:
> > >
> > > extern GFC_INTEGER_4 kill (GFC_INTEGER_4, GFC_INTEGER_4);
> > > extern __typeof(kill) kill __asm__("" "_gfortran_kill");
> > 
> > Why do you need to jump through these hoops anyway?  Just do ...
> > 
> 
> Not sure who the "you" refers to.  The easiest 
> fix be appending a 4 to kill.  I'll do that 
> later.

I think this is even easier, no need to rename anything:

2018-03-15  Jakub Jelinek  <ja...@redhat.com>

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

--- libgfortran/intrinsics/kill.c.jj    2018-03-14 09:44:57.988975360 +0100
+++ libgfortran/intrinsics/kill.c       2018-03-15 16:01:02.725668658 +0100
@@ -51,11 +51,11 @@ kill_sub (GFC_INTEGER_4 pid, GFC_INTEGER
 }
 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);


        Jakub