Module Name: src
Committed By: mrg
Date: Mon Aug 10 04:13:19 UTC 2015
Modified Files:
src/distrib/sets/lists/comp: ad.mips
src/distrib/sets/lists/debug: ad.mips
Log Message:
fix some merge errors in the previous
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/distrib/sets/lists/comp/ad.mips
cvs rdiff -u -r1.59 -r1.60 src/distrib/sets/lists/debug/ad.mips
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/comp/ad.mips
diff -u src/distrib/sets/lists/comp/ad.mips:1.57 src/distrib/sets/lists/comp/ad.mips:1.58
--- src/distrib/sets/lists/comp/ad.mips:1.57 Mon Aug 10 03:21:44 2015
+++ src/distrib/sets/lists/comp/ad.mips Mon Aug 10 04:13:18 2015
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips,v 1.57 2015/08/10 03:21:44 mrg Exp $
+# $NetBSD: ad.mips,v 1.58 2015/08/10 04:13:18 mrg Exp $
./usr/bin/elf2aout comp-obsolete obsolete
./usr/bin/elf2ecoff comp-sysutil-bin
./usr/include/g++/bits/mips32 comp-c-include arch64
@@ -69,12 +69,6 @@
./usr/include/mips/varargs.h comp-obsolete obsolete
./usr/include/mips/vmparam.h comp-c-include
./usr/include/mips/wchar_limits.h comp-c-include
--./usr/lib/64/libgomp.a
--./usr/lib/64/libgomp.so
--./usr/lib/64/libgomp.so.1
--./usr/lib/64/libgomp.so.1.1
--./usr/lib/64/libgomp_p.a
--./usr/lib/64/libgomp_pic.a
./usr/libdata/ldscripts/elf32btsmip.x comp-util-bin arch64
./usr/libdata/ldscripts/elf32btsmip.xbn comp-util-bin arch64
./usr/libdata/ldscripts/elf32btsmip.xc comp-util-bin arch64
Index: src/distrib/sets/lists/debug/ad.mips
diff -u src/distrib/sets/lists/debug/ad.mips:1.59 src/distrib/sets/lists/debug/ad.mips:1.60
--- src/distrib/sets/lists/debug/ad.mips:1.59 Mon Jun 22 06:02:02 2015
+++ src/distrib/sets/lists/debug/ad.mips Mon Aug 10 04:13:19 2015
@@ -1,10 +1,7 @@
-# $NetBSD: ad.mips,v 1.59 2015/06/22 06:02:02 matt Exp $
--./usr/libdata/debug/usr/lib/64/libgomp.so.1.1.debug
--./usr/lib/64/libgomp_g.a
+# $NetBSD: ad.mips,v 1.60 2015/08/10 04:13:19 mrg Exp $
./usr/libdata/debug/libexec/ld.elf_so-64.debug comp-sys-debug debug,compat,arch64,dynamicroot
./usr/libdata/debug/libexec/ld.elf_so-o32.debug comp-sys-debug debug,compat,arch64,dynamicroot
./usr/libdata/debug/usr/bin/elf2aout.debug comp-obsolete obsolete
./usr/libdata/debug/usr/bin/elf2ecoff.debug comp-sysutil-debug debug
./usr/libdata/debug/usr/libexec/ld.elf_so-64.debug comp-sys-debug debug,compat,arch64
./usr/libdata/debug/usr/libexec/ld.elf_so-o32.debug comp-sys-debug debug,compat,arch64
-
