CVS commit: pkgsrc/lang/g95

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Sun Oct  2 23:26:40 UTC 2016

Modified Files:
        pkgsrc/lang/g95: distinfo
        pkgsrc/lang/g95/patches: patch-libf95.a-0.93_runtime_mutex.c

Log Message:
g95: now that I understand why -mips1 is chosen here, clarify it in the
comment for the patch.

note: the choice of o32 for this package is questionable, and defaulting
to n32 on gcc/config.gcc instead is probably the right thing, this package
won't run on platforms that use o32, and the n32 linker can't handle the
o32 objects apparently - it dies with "not enough GOT space for local GOT
entries" (PR toolchain/51521).

defaulting to n32 will allow deleting this patch, but I won't make the
transition because I can't get further in the build and hit a compile
assertion about MTYPE not matching CEXT (double float in my case), similar
to GCC bug #20633.


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/lang/g95/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/lang/g95/patches/patch-libf95.a-0.93_runtime_mutex.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/g95/distinfo
diff -u pkgsrc/lang/g95/distinfo:1.27 pkgsrc/lang/g95/distinfo:1.28
--- pkgsrc/lang/g95/distinfo:1.27       Wed Sep 28 15:34:54 2016
+++ pkgsrc/lang/g95/distinfo    Sun Oct  2 23:26:39 2016
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.27 2016/09/28 15:34:54 maya Exp $
+$NetBSD: distinfo,v 1.28 2016/10/02 23:26:39 maya Exp $
 
 SHA1 (g95_source.tgz) = b5e503fd6459b65cbda73190685f9490230d9cff
 RMD160 (g95_source.tgz) = 98d03e9a1835f4b3553a72a798bdf1d90a757176
@@ -33,4 +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
+SHA1 (patch-libf95.a-0.93_runtime_mutex.c) = 085b1f7a2bcc1c7de09489cd77e0b773876e2aa2

Index: pkgsrc/lang/g95/patches/patch-libf95.a-0.93_runtime_mutex.c
diff -u pkgsrc/lang/g95/patches/patch-libf95.a-0.93_runtime_mutex.c:1.1 pkgsrc/lang/g95/patches/patch-libf95.a-0.93_runtime_mutex.c:1.2
--- pkgsrc/lang/g95/patches/patch-libf95.a-0.93_runtime_mutex.c:1.1     Wed Sep 28 15:34:54 2016
+++ pkgsrc/lang/g95/patches/patch-libf95.a-0.93_runtime_mutex.c Sun Oct  2 23:26:40 2016
@@ -1,9 +1,11 @@
-$NetBSD: patch-libf95.a-0.93_runtime_mutex.c,v 1.1 2016/09/28 15:34:54 maya Exp $
+$NetBSD: patch-libf95.a-0.93_runtime_mutex.c,v 1.2 2016/10/02 23:26:40 maya Exp $
 
-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.
+This package builds a gcc on netbsd/mips which defaults to o32 mips1
+output, and then uses it to compile g95 - which then uses assembly that
+is rejected for the chosen -mips1 by the linker.
+
+set mips3 for this segment, it'll stop being rejected by the linker, but
+will crash if anyone runs this code on actual mips1 (rare).
 
 --- libf95.a-0.93/runtime/mutex.c.orig 2008-09-17 03:45:13.000000000 +0000
 +++ libf95.a-0.93/runtime/mutex.c