Module Name: src
Committed By: mrg
Date: Wed Mar 23 06:44:09 UTC 2016
Modified Files:
src/distrib/sets/lists/base: ad.mips shl.mi
Log Message:
fix sets for mips64 builds (libgomp is not built for N64)
and also for GCC 5.
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/distrib/sets/lists/base/ad.mips
cvs rdiff -u -r1.765 -r1.766 src/distrib/sets/lists/base/shl.mi
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/ad.mips
diff -u src/distrib/sets/lists/base/ad.mips:1.70 src/distrib/sets/lists/base/ad.mips:1.71
--- src/distrib/sets/lists/base/ad.mips:1.70 Mon Jun 22 06:02:01 2015
+++ src/distrib/sets/lists/base/ad.mips Wed Mar 23 06:44:09 2016
@@ -1,6 +1,8 @@
-# $NetBSD: ad.mips,v 1.70 2015/06/22 06:02:01 matt Exp $
+# $NetBSD: ad.mips,v 1.71 2016/03/23 06:44:09 mrg Exp $
./libexec/ld.elf_so-64 base-compat-shlib compat,pic,arch64
./libexec/ld.elf_so-o32 base-compat-shlib compat,pic,arch64
./usr/libexec/ld.elf_so-64 base-compat-shlib compat,pic,arch64
./usr/libexec/ld.elf_so-o32 base-sysutil-bin compat,pic,arch64
./usr/lkm/ldscript base-obsolete obsolete
+./usr/lib/o32/libgomp.so.1.1 base-compat-shlib compat,pic,arch64,gcc=48
+./usr/lib/o32/libgomp.so.1.2 base-compat-shlib compat,pic,arch64,gcc=53
Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.765 src/distrib/sets/lists/base/shl.mi:1.766
--- src/distrib/sets/lists/base/shl.mi:1.765 Wed Mar 16 05:32:09 2016
+++ src/distrib/sets/lists/base/shl.mi Wed Mar 23 06:44:09 2016
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.765 2016/03/16 05:32:09 mrg Exp $
+# $NetBSD: shl.mi,v 1.766 2016/03/23 06:44:09 mrg Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -292,7 +292,9 @@
./usr/lib/libgomp.so base-sys-shlib compatfile,gcc
./usr/lib/libgomp.so.1 base-sys-shlib compatfile,gcc
./usr/lib/libgomp.so.1.1 base-sys-shlib compatfile,gcc=48
-./usr/lib/libgomp.so.1.2 base-sys-shlib compatfile,gcc=53
+./usr/lib/libgomp.so.1.2 base-sys-shlib compatfile,gcc=53,!machine_arch=mips64eb,!machine_arch=mips64el
+./usr/lib/libgomp.so.1.2 base-sys-shlib gcc=53,machine_arch=mips64eb
+./usr/lib/libgomp.so.1.2 base-sys-shlib gcc=53,machine_arch=mips64el
./usr/lib/libgssapi.so base-krb5-shlib compatfile,kerberos
./usr/lib/libgssapi.so.10 base-krb5-shlib compatfile,kerberos
./usr/lib/libgssapi.so.10.0 base-krb5-shlib compatfile,kerberos
