From b60ba0849fe8f1f6169a87ec3723c64dbf23afc1 Mon Sep 17 00:00:00 2001
From: jsg <jsg@openbsd.org>
Date: Tue, 18 Apr 2017 05:24:46 +0000
Subject: [PATCH] add a clang comp list for arm64

---
 distrib/sets/lists/base/md.arm64    |   5 -
 distrib/sets/lists/comp/clang.arm64 | 188 ++++++++++++++++++++++++++++
 distrib/sets/lists/comp/md.arm64    | 183 ---------------------------
 3 files changed, 188 insertions(+), 188 deletions(-)
 create mode 100644 distrib/sets/lists/comp/clang.arm64

diff --git a/distrib/sets/lists/base/md.arm64 b/distrib/sets/lists/base/md.arm64
index f04d158e4aa..b1d3e409a89 100644
--- a/distrib/sets/lists/base/md.arm64
+++ b/distrib/sets/lists/base/md.arm64
@@ -29,13 +29,8 @@
 ./etc/firmware/zd1211b
 ./sbin/kbd
 ./sbin/wsconsctl
-./usr/lib/libc++.a
 ./usr/lib/libc++.so.0.0
-./usr/lib/libc++_p.a
-./usr/lib/libc++abi.a
 ./usr/lib/libc++abi.so.0.0
-./usr/lib/libc++abi_p.a
-./usr/lib/libcompiler_rt.a
 ./usr/libdata/perl5/aarch64-openbsd
 ./usr/libdata/perl5/aarch64-openbsd/.packlist
 ./usr/libdata/perl5/aarch64-openbsd/B
diff --git a/distrib/sets/lists/comp/clang.arm64 b/distrib/sets/lists/comp/clang.arm64
new file mode 100644
index 00000000000..1c0d2230f7b
--- /dev/null
+++ b/distrib/sets/lists/comp/clang.arm64
@@ -0,0 +1,188 @@
+./usr/bin/clang
+./usr/bin/clang++
+./usr/bin/clang-cpp
+./usr/bin/ld.lld
+./usr/include/c++
+./usr/include/c++/v1
+./usr/include/c++/v1/__bit_reference
+./usr/include/c++/v1/__bsd_locale_defaults.h
+./usr/include/c++/v1/__bsd_locale_fallbacks.h
+./usr/include/c++/v1/__config
+./usr/include/c++/v1/__cxxabi_config.h
+./usr/include/c++/v1/__debug
+./usr/include/c++/v1/__functional_03
+./usr/include/c++/v1/__functional_base
+./usr/include/c++/v1/__functional_base_03
+./usr/include/c++/v1/__hash_table
+./usr/include/c++/v1/__libunwind_config.h
+./usr/include/c++/v1/__locale
+./usr/include/c++/v1/__mutex_base
+./usr/include/c++/v1/__nullptr
+./usr/include/c++/v1/__refstring
+./usr/include/c++/v1/__split_buffer
+./usr/include/c++/v1/__sso_allocator
+./usr/include/c++/v1/__std_stream
+./usr/include/c++/v1/__threading_support
+./usr/include/c++/v1/__tree
+./usr/include/c++/v1/__tuple
+./usr/include/c++/v1/__undef___deallocate
+./usr/include/c++/v1/__undef_min_max
+./usr/include/c++/v1/algorithm
+./usr/include/c++/v1/array
+./usr/include/c++/v1/atomic
+./usr/include/c++/v1/bitset
+./usr/include/c++/v1/cassert
+./usr/include/c++/v1/ccomplex
+./usr/include/c++/v1/cctype
+./usr/include/c++/v1/cerrno
+./usr/include/c++/v1/cfenv
+./usr/include/c++/v1/cfloat
+./usr/include/c++/v1/chrono
+./usr/include/c++/v1/cinttypes
+./usr/include/c++/v1/ciso646
+./usr/include/c++/v1/climits
+./usr/include/c++/v1/clocale
+./usr/include/c++/v1/cmath
+./usr/include/c++/v1/codecvt
+./usr/include/c++/v1/complex
+./usr/include/c++/v1/complex.h
+./usr/include/c++/v1/condition_variable
+./usr/include/c++/v1/csetjmp
+./usr/include/c++/v1/csignal
+./usr/include/c++/v1/cstdarg
+./usr/include/c++/v1/cstdbool
+./usr/include/c++/v1/cstddef
+./usr/include/c++/v1/cstdint
+./usr/include/c++/v1/cstdio
+./usr/include/c++/v1/cstdlib
+./usr/include/c++/v1/cstring
+./usr/include/c++/v1/ctgmath
+./usr/include/c++/v1/ctime
+./usr/include/c++/v1/ctype.h
+./usr/include/c++/v1/cwchar
+./usr/include/c++/v1/cwctype
+./usr/include/c++/v1/cxxabi.h
+./usr/include/c++/v1/deque
+./usr/include/c++/v1/errno.h
+./usr/include/c++/v1/exception
+./usr/include/c++/v1/experimental
+./usr/include/c++/v1/experimental/__config
+./usr/include/c++/v1/experimental/__memory
+./usr/include/c++/v1/experimental/algorithm
+./usr/include/c++/v1/experimental/any
+./usr/include/c++/v1/experimental/chrono
+./usr/include/c++/v1/experimental/deque
+./usr/include/c++/v1/experimental/dynarray
+./usr/include/c++/v1/experimental/filesystem
+./usr/include/c++/v1/experimental/forward_list
+./usr/include/c++/v1/experimental/functional
+./usr/include/c++/v1/experimental/iterator
+./usr/include/c++/v1/experimental/list
+./usr/include/c++/v1/experimental/map
+./usr/include/c++/v1/experimental/memory_resource
+./usr/include/c++/v1/experimental/optional
+./usr/include/c++/v1/experimental/propagate_const
+./usr/include/c++/v1/experimental/ratio
+./usr/include/c++/v1/experimental/regex
+./usr/include/c++/v1/experimental/set
+./usr/include/c++/v1/experimental/string
+./usr/include/c++/v1/experimental/string_view
+./usr/include/c++/v1/experimental/system_error
+./usr/include/c++/v1/experimental/tuple
+./usr/include/c++/v1/experimental/type_traits
+./usr/include/c++/v1/experimental/unordered_map
+./usr/include/c++/v1/experimental/unordered_set
+./usr/include/c++/v1/experimental/utility
+./usr/include/c++/v1/experimental/vector
+./usr/include/c++/v1/ext
+./usr/include/c++/v1/ext/__hash
+./usr/include/c++/v1/ext/hash_map
+./usr/include/c++/v1/ext/hash_set
+./usr/include/c++/v1/float.h
+./usr/include/c++/v1/forward_list
+./usr/include/c++/v1/fstream
+./usr/include/c++/v1/functional
+./usr/include/c++/v1/future
+./usr/include/c++/v1/initializer_list
+./usr/include/c++/v1/inttypes.h
+./usr/include/c++/v1/iomanip
+./usr/include/c++/v1/ios
+./usr/include/c++/v1/iosfwd
+./usr/include/c++/v1/iostream
+./usr/include/c++/v1/istream
+./usr/include/c++/v1/iterator
+./usr/include/c++/v1/libunwind.h
+./usr/include/c++/v1/limits
+./usr/include/c++/v1/list
+./usr/include/c++/v1/locale
+./usr/include/c++/v1/mach-o
+./usr/include/c++/v1/mach-o/compact_unwind_encoding.h
+./usr/include/c++/v1/map
+./usr/include/c++/v1/math.h
+./usr/include/c++/v1/memory
+./usr/include/c++/v1/mutex
+./usr/include/c++/v1/new
+./usr/include/c++/v1/numeric
+./usr/include/c++/v1/ostream
+./usr/include/c++/v1/queue
+./usr/include/c++/v1/random
+./usr/include/c++/v1/ratio
+./usr/include/c++/v1/regex
+./usr/include/c++/v1/scoped_allocator
+./usr/include/c++/v1/set
+./usr/include/c++/v1/setjmp.h
+./usr/include/c++/v1/shared_mutex
+./usr/include/c++/v1/sstream
+./usr/include/c++/v1/stack
+./usr/include/c++/v1/stdbool.h
+./usr/include/c++/v1/stddef.h
+./usr/include/c++/v1/stdexcept
+./usr/include/c++/v1/stdio.h
+./usr/include/c++/v1/stdlib.h
+./usr/include/c++/v1/streambuf
+./usr/include/c++/v1/string
+./usr/include/c++/v1/string.h
+./usr/include/c++/v1/strstream
+./usr/include/c++/v1/support
+./usr/include/c++/v1/support/newlib
+./usr/include/c++/v1/support/newlib/xlocale.h
+./usr/include/c++/v1/support/xlocale
+./usr/include/c++/v1/support/xlocale/__nop_locale_mgmt.h
+./usr/include/c++/v1/support/xlocale/__posix_l_fallback.h
+./usr/include/c++/v1/support/xlocale/__strtonum_fallback.h
+./usr/include/c++/v1/support/xlocale/xlocale.h
+./usr/include/c++/v1/system_error
+./usr/include/c++/v1/tgmath.h
+./usr/include/c++/v1/thread
+./usr/include/c++/v1/tuple
+./usr/include/c++/v1/type_traits
+./usr/include/c++/v1/typeindex
+./usr/include/c++/v1/typeinfo
+./usr/include/c++/v1/unordered_map
+./usr/include/c++/v1/unordered_set
+./usr/include/c++/v1/unwind.h
+./usr/include/c++/v1/utility
+./usr/include/c++/v1/valarray
+./usr/include/c++/v1/vector
+./usr/include/c++/v1/wchar.h
+./usr/include/c++/v1/wctype.h
+./usr/lib/clang
+./usr/lib/clang/4.0.0
+./usr/lib/clang/4.0.0/include
+./usr/lib/clang/4.0.0/include/arm_acle.h
+./usr/lib/clang/4.0.0/include/arm_neon.h
+./usr/lib/clang/4.0.0/include/module.modulemap
+./usr/lib/clang/4.0.0/include/stdalign.h
+./usr/lib/clang/4.0.0/include/stdatomic.h
+./usr/lib/clang/4.0.0/include/stdnoreturn.h
+./usr/lib/clang/4.0.0/include/tgmath.h
+./usr/lib/clang/4.0.0/include/unwind.h
+./usr/lib/clang/4.0.0/include/varargs.h
+./usr/lib/libc++.a
+./usr/lib/libc++_p.a
+./usr/lib/libc++abi.a
+./usr/lib/libc++abi_p.a
+./usr/lib/libcompiler_rt.a
+./usr/share/man/man1/clang++.1
+./usr/share/man/man1/clang-cpp.1
+./usr/share/man/man1/clang.1
diff --git a/distrib/sets/lists/comp/md.arm64 b/distrib/sets/lists/comp/md.arm64
index 7fdb125195c..f6eef258bfc 100644
--- a/distrib/sets/lists/comp/md.arm64
+++ b/distrib/sets/lists/comp/md.arm64
@@ -1,8 +1,4 @@
 ./usr/bin/addr2line
-./usr/bin/clang
-./usr/bin/clang++
-./usr/bin/clang-cpp
-./usr/bin/ld.lld
 ./usr/bin/objcopy
 ./usr/bin/readelf
 ./usr/include/arm64
@@ -61,183 +57,7 @@
 ./usr/include/arm64/trap.h
 ./usr/include/arm64/vfp.h
 ./usr/include/arm64/vmparam.h
-./usr/include/c++
-./usr/include/c++/v1
-./usr/include/c++/v1/__bit_reference
-./usr/include/c++/v1/__bsd_locale_defaults.h
-./usr/include/c++/v1/__bsd_locale_fallbacks.h
-./usr/include/c++/v1/__config
-./usr/include/c++/v1/__cxxabi_config.h
-./usr/include/c++/v1/__debug
-./usr/include/c++/v1/__functional_03
-./usr/include/c++/v1/__functional_base
-./usr/include/c++/v1/__functional_base_03
-./usr/include/c++/v1/__hash_table
-./usr/include/c++/v1/__libunwind_config.h
-./usr/include/c++/v1/__locale
-./usr/include/c++/v1/__mutex_base
-./usr/include/c++/v1/__nullptr
-./usr/include/c++/v1/__refstring
-./usr/include/c++/v1/__split_buffer
-./usr/include/c++/v1/__sso_allocator
-./usr/include/c++/v1/__std_stream
-./usr/include/c++/v1/__threading_support
-./usr/include/c++/v1/__tree
-./usr/include/c++/v1/__tuple
-./usr/include/c++/v1/__undef___deallocate
-./usr/include/c++/v1/__undef_min_max
-./usr/include/c++/v1/algorithm
-./usr/include/c++/v1/array
-./usr/include/c++/v1/atomic
-./usr/include/c++/v1/bitset
-./usr/include/c++/v1/cassert
-./usr/include/c++/v1/ccomplex
-./usr/include/c++/v1/cctype
-./usr/include/c++/v1/cerrno
-./usr/include/c++/v1/cfenv
-./usr/include/c++/v1/cfloat
-./usr/include/c++/v1/chrono
-./usr/include/c++/v1/cinttypes
-./usr/include/c++/v1/ciso646
-./usr/include/c++/v1/climits
-./usr/include/c++/v1/clocale
-./usr/include/c++/v1/cmath
-./usr/include/c++/v1/codecvt
-./usr/include/c++/v1/complex
-./usr/include/c++/v1/complex.h
-./usr/include/c++/v1/condition_variable
-./usr/include/c++/v1/csetjmp
-./usr/include/c++/v1/csignal
-./usr/include/c++/v1/cstdarg
-./usr/include/c++/v1/cstdbool
-./usr/include/c++/v1/cstddef
-./usr/include/c++/v1/cstdint
-./usr/include/c++/v1/cstdio
-./usr/include/c++/v1/cstdlib
-./usr/include/c++/v1/cstring
-./usr/include/c++/v1/ctgmath
-./usr/include/c++/v1/ctime
-./usr/include/c++/v1/ctype.h
-./usr/include/c++/v1/cwchar
-./usr/include/c++/v1/cwctype
-./usr/include/c++/v1/cxxabi.h
-./usr/include/c++/v1/deque
-./usr/include/c++/v1/errno.h
-./usr/include/c++/v1/exception
-./usr/include/c++/v1/experimental
-./usr/include/c++/v1/experimental/__config
-./usr/include/c++/v1/experimental/__memory
-./usr/include/c++/v1/experimental/algorithm
-./usr/include/c++/v1/experimental/any
-./usr/include/c++/v1/experimental/chrono
-./usr/include/c++/v1/experimental/deque
-./usr/include/c++/v1/experimental/dynarray
-./usr/include/c++/v1/experimental/filesystem
-./usr/include/c++/v1/experimental/forward_list
-./usr/include/c++/v1/experimental/functional
-./usr/include/c++/v1/experimental/iterator
-./usr/include/c++/v1/experimental/list
-./usr/include/c++/v1/experimental/map
-./usr/include/c++/v1/experimental/memory_resource
-./usr/include/c++/v1/experimental/optional
-./usr/include/c++/v1/experimental/propagate_const
-./usr/include/c++/v1/experimental/ratio
-./usr/include/c++/v1/experimental/regex
-./usr/include/c++/v1/experimental/set
-./usr/include/c++/v1/experimental/string
-./usr/include/c++/v1/experimental/string_view
-./usr/include/c++/v1/experimental/system_error
-./usr/include/c++/v1/experimental/tuple
-./usr/include/c++/v1/experimental/type_traits
-./usr/include/c++/v1/experimental/unordered_map
-./usr/include/c++/v1/experimental/unordered_set
-./usr/include/c++/v1/experimental/utility
-./usr/include/c++/v1/experimental/vector
-./usr/include/c++/v1/ext
-./usr/include/c++/v1/ext/__hash
-./usr/include/c++/v1/ext/hash_map
-./usr/include/c++/v1/ext/hash_set
-./usr/include/c++/v1/float.h
-./usr/include/c++/v1/forward_list
-./usr/include/c++/v1/fstream
-./usr/include/c++/v1/functional
-./usr/include/c++/v1/future
-./usr/include/c++/v1/initializer_list
-./usr/include/c++/v1/inttypes.h
-./usr/include/c++/v1/iomanip
-./usr/include/c++/v1/ios
-./usr/include/c++/v1/iosfwd
-./usr/include/c++/v1/iostream
-./usr/include/c++/v1/istream
-./usr/include/c++/v1/iterator
-./usr/include/c++/v1/libunwind.h
-./usr/include/c++/v1/limits
-./usr/include/c++/v1/list
-./usr/include/c++/v1/locale
-./usr/include/c++/v1/mach-o
-./usr/include/c++/v1/mach-o/compact_unwind_encoding.h
-./usr/include/c++/v1/map
-./usr/include/c++/v1/math.h
-./usr/include/c++/v1/memory
-./usr/include/c++/v1/mutex
-./usr/include/c++/v1/new
-./usr/include/c++/v1/numeric
-./usr/include/c++/v1/ostream
-./usr/include/c++/v1/queue
-./usr/include/c++/v1/random
-./usr/include/c++/v1/ratio
-./usr/include/c++/v1/regex
-./usr/include/c++/v1/scoped_allocator
-./usr/include/c++/v1/set
-./usr/include/c++/v1/setjmp.h
-./usr/include/c++/v1/shared_mutex
-./usr/include/c++/v1/sstream
-./usr/include/c++/v1/stack
-./usr/include/c++/v1/stdbool.h
-./usr/include/c++/v1/stddef.h
-./usr/include/c++/v1/stdexcept
-./usr/include/c++/v1/stdio.h
-./usr/include/c++/v1/stdlib.h
-./usr/include/c++/v1/streambuf
-./usr/include/c++/v1/string
-./usr/include/c++/v1/string.h
-./usr/include/c++/v1/strstream
-./usr/include/c++/v1/support
-./usr/include/c++/v1/support/newlib
-./usr/include/c++/v1/support/newlib/xlocale.h
-./usr/include/c++/v1/support/xlocale
-./usr/include/c++/v1/support/xlocale/__nop_locale_mgmt.h
-./usr/include/c++/v1/support/xlocale/__posix_l_fallback.h
-./usr/include/c++/v1/support/xlocale/__strtonum_fallback.h
-./usr/include/c++/v1/support/xlocale/xlocale.h
-./usr/include/c++/v1/system_error
-./usr/include/c++/v1/tgmath.h
-./usr/include/c++/v1/thread
-./usr/include/c++/v1/tuple
-./usr/include/c++/v1/type_traits
-./usr/include/c++/v1/typeindex
-./usr/include/c++/v1/typeinfo
-./usr/include/c++/v1/unordered_map
-./usr/include/c++/v1/unordered_set
-./usr/include/c++/v1/unwind.h
-./usr/include/c++/v1/utility
-./usr/include/c++/v1/valarray
-./usr/include/c++/v1/vector
-./usr/include/c++/v1/wchar.h
-./usr/include/c++/v1/wctype.h
 ./usr/include/ieeefp.h
-./usr/lib/clang
-./usr/lib/clang/4.0.0
-./usr/lib/clang/4.0.0/include
-./usr/lib/clang/4.0.0/include/arm_acle.h
-./usr/lib/clang/4.0.0/include/arm_neon.h
-./usr/lib/clang/4.0.0/include/module.modulemap
-./usr/lib/clang/4.0.0/include/stdalign.h
-./usr/lib/clang/4.0.0/include/stdatomic.h
-./usr/lib/clang/4.0.0/include/stdnoreturn.h
-./usr/lib/clang/4.0.0/include/tgmath.h
-./usr/lib/clang/4.0.0/include/unwind.h
-./usr/lib/clang/4.0.0/include/varargs.h
 ./usr/lib/crtbegin.o
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
@@ -246,6 +66,3 @@
 ./usr/share/info/bfd.info
 ./usr/share/man/man1/c++.1
 ./usr/share/man/man1/cc.1
-./usr/share/man/man1/clang++.1
-./usr/share/man/man1/clang-cpp.1
-./usr/share/man/man1/clang.1
-- 
2.20.1