Re: pkg/44547

[coypu%SDF.ORG@localhost]

The following reply was made to PR pkg/44547; it has been noted by GNATS.

From: coypu%SDF.ORG@localhost
To: gnats-bugs%netbsd.org@localhost
Cc: 
Subject: Re: pkg/44547
Date: Thu, 22 Sep 2016 23:31:55 +0000

 --qDbXVdCdHGoSgWSk
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 This patch ought to do it, but I can't test it. I will do it soon.
 
 --qDbXVdCdHGoSgWSk
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename="g95-mips.diff"
 
 Index: distinfo
 ===================================================================
 RCS file: /cvsroot/pkgsrc/lang/g95/distinfo,v
 retrieving revision 1.25
 diff -u -p -u -r1.25 distinfo
 --- distinfo	29 Dec 2015 23:34:46 -0000	1.25
 +++ distinfo	22 Sep 2016 23:30:55 -0000
 @@ -33,3 +33,4 @@ SHA1 (patch-libf95.a-0.93_math_ff.c) = d
  SHA1 (patch-libf95.a-0.93_math_x87.S) = 25dc2b613969947ae60fdc9b1dc6d9524b0157be
  SHA1 (patch-libf95.a-0.93_quad_power16.c) = eb6711bcd1018cac675dbbe212cd22a831a9d191
  SHA1 (patch-libf95.a-0.93_runtime_main.c) = dfde68072f38bf5bbb9c54ebeea5b9ce07d0c6be
 +SHA1 (patch-libf95.a-0.93_runtime_mutex.c) = 8252537e4cbc5fd53b3f89e4403b581e3c73e52c
 Index: patches/patch-libf95.a-0.93_runtime_mutex.c
 ===================================================================
 RCS file: patches/patch-libf95.a-0.93_runtime_mutex.c
 diff -N patches/patch-libf95.a-0.93_runtime_mutex.c
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ patches/patch-libf95.a-0.93_runtime_mutex.c	22 Sep 2016 23:30:55 -0000
 @@ -0,0 +1,22 @@
 +$NetBSD$
 +
 +gcc on netbsd/mips rejects ll/sc as it targets mips1 which lacks
 +these instructions. tell it it's mips3 code. it will crash
 +at runtime for mips1 (unlikely to compile this package), but
 +makes it possible to build for newer mips.
 +
 +--- libf95.a-0.93/runtime/mutex.c.orig	2008-09-17 03:45:13.000000000 +0000
 ++++ libf95.a-0.93/runtime/mutex.c
 +@@ -116,9 +116,12 @@ int old_val, temp;
 + 
 +     __asm__ __volatile__("   move %5, %2     \n"
 + 			 "1: move %2, %5     \n"
 ++			 "   .set push       \n"
 ++			 "   .set mips3      \n"
 + 			 "   ll   %0, %4     \n"
 + 			 "   bne  %0, %3, 2f \n"
 + 			 "   sc   %2, %1     \n"
 ++			 "   .set pop        \n"
 + 			 "   beqz %2, 1b     \n"
 + 			 "2:\n"
 + 			 : "=&r" (old_val), "=m" (*addr)
 
 --qDbXVdCdHGoSgWSk--