[src/trunk]: src/distrib/sets/lists fix some merge errors in the previous

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3df3bcff8927
branches:  trunk
changeset: 339788:3df3bcff8927
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Aug 10 04:13:18 2015 +0000

description:
fix some merge errors in the previous

diffstat:

 distrib/sets/lists/comp/ad.mips  |  8 +-------
 distrib/sets/lists/debug/ad.mips |  5 +----
 2 files changed, 2 insertions(+), 11 deletions(-)

diffs (37 lines):

diff -r ed80d7d88e3e -r 3df3bcff8927 distrib/sets/lists/comp/ad.mips
--- a/distrib/sets/lists/comp/ad.mips   Mon Aug 10 03:21:44 2015 +0000
+++ b/distrib/sets/lists/comp/ad.mips   Mon Aug 10 04:13:18 2015 +0000
@@ -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
diff -r ed80d7d88e3e -r 3df3bcff8927 distrib/sets/lists/debug/ad.mips
--- a/distrib/sets/lists/debug/ad.mips  Mon Aug 10 03:21:44 2015 +0000
+++ b/distrib/sets/lists/debug/ad.mips  Mon Aug 10 04:13:18 2015 +0000
@@ -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
-