[src/trunk]: src/distrib/sets/lists fix sets for gcc aarch64 build.

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

details:   https://anonhg.NetBSD.org/src/rev/b3a4cf81583b
branches:  trunk
changeset: 320729:b3a4cf81583b
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Jul 17 01:47:20 2018 +0000

description:
fix sets for gcc aarch64 build.

diffstat:

 distrib/sets/lists/base/ad.aarch64  |  55 +++++++++++++++++++++---------
 distrib/sets/lists/comp/ad.aarch64  |  65 ++++++++++++++++++++++--------------
 distrib/sets/lists/debug/ad.aarch64 |  46 ++++++++++++++++---------
 3 files changed, 106 insertions(+), 60 deletions(-)

diffs (211 lines):

diff -r bd331b8d8532 -r b3a4cf81583b distrib/sets/lists/base/ad.aarch64
--- a/distrib/sets/lists/base/ad.aarch64        Tue Jul 17 00:50:56 2018 +0000
+++ b/distrib/sets/lists/base/ad.aarch64        Tue Jul 17 01:47:20 2018 +0000
@@ -1,19 +1,40 @@
-# $NetBSD: ad.aarch64,v 1.26 2018/04/01 04:35:02 ryo Exp $
-./libexec/ld.elf_so-eabi                       base-compat-shlib       compat,pic
-./libexec/ld.elf_so-eabihf                     base-compat-shlib       compat,pic
-./libexec/ld.elf_so-oabi                       base-sysutil-bin        compat,pic
-./usr/lib/eabi/libarm.so.0                     base-compat-shlib       compat,pic
-./usr/lib/eabi/libarm.so.0.0                   base-compat-shlib       compat,pic
-./usr/lib/eabi/libc_vfp.so.0                   base-compat-shlib       compat,pic
-./usr/lib/eabi/libc_vfp.so.0.0                 base-compat-shlib       compat,pic
-./usr/lib/eabihf/libarm.so.0                   base-compat-shlib       compat,pic
-./usr/lib/eabihf/libarm.so.0.0                 base-compat-shlib       compat,pic
-./usr/lib/oabi/libarm.so.0                     base-compat-shlib       compat,pic
-./usr/lib/oabi/libarm.so.0.0                   base-compat-shlib       compat,pic
-./usr/lib/oabi/libc_vfp.so.0                   base-compat-shlib       compat,pic
-./usr/lib/oabi/libc_vfp.so.0.0                 base-compat-shlib       compat,pic
-./usr/libexec/ld.elf_so-eabi                   base-compat-shlib       compat,pic
-./usr/libexec/ld.elf_so-eabihf                 base-compat-shlib       compat,pic
-./usr/libexec/ld.elf_so-oabi                   base-sysutil-bin        compat,pic
+# $NetBSD: ad.aarch64,v 1.27 2018/07/17 01:47:20 christos Exp $
+./lib/eabi                                     base-compat-lib         compat,gcc
+./lib/eabi/npf                                 base-compat-lib         compat,gcc
+./lib/eabihf                                   base-compat-lib         compat,gcc
+./lib/eabihf/npf                               base-compat-lib         compat,gcc
+./lib/oabi                                     base-compat-lib         compat,gcc
+./lib/oabi/npf                                 base-compat-lib         compat,gcc
+./libexec/ld.elf_so-eabi                       base-compat-shlib       compat,pic,llvm
+./libexec/ld.elf_so-eabihf                     base-compat-shlib       compat,pic,llvm
+./libexec/ld.elf_so-oabi                       base-sysutil-bin        compat,pic,llvm
+./usr/lib/eabi                                 base-compat-lib         compat,gcc
+./usr/lib/eabi/i18n                            base-compat-lib         compat,gcc
+./usr/lib/eabi/libarm.so.0                     base-compat-shlib       compat,pic,llvm
+./usr/lib/eabi/libarm.so.0.0                   base-compat-shlib       compat,pic,llvm
+./usr/lib/eabi/libc_vfp.so.0                   base-compat-shlib       compat,pic,llvm
+./usr/lib/eabi/libc_vfp.so.0.0                 base-compat-shlib       compat,pic,llvm
+./usr/lib/eabi/lua                             base-compat-lib         compat,gcc
+./usr/lib/eabi/lua/5.3                         base-compat-lib         compat,gcc
+./usr/lib/eabi/security                                base-compat-lib         compat,gcc
+./usr/lib/eabihf                               base-compat-lib         compat,gcc
+./usr/lib/eabihf/i18n                          base-compat-lib         compat,gcc
+./usr/lib/eabihf/libarm.so.0                   base-compat-shlib       compat,pic,llvm
+./usr/lib/eabihf/libarm.so.0.0                 base-compat-shlib       compat,pic,llvm
+./usr/lib/eabihf/lua                           base-compat-lib         compat,gcc
+./usr/lib/eabihf/lua/5.3                       base-compat-lib         compat,gcc
+./usr/lib/eabihf/security                      base-compat-lib         compat,gcc
+./usr/lib/oabi                                 base-compat-lib         compat,gcc
+./usr/lib/oabi/i18n                            base-compat-lib         compat,gcc
+./usr/lib/oabi/libarm.so.0                     base-compat-shlib       compat,pic,llvm
+./usr/lib/oabi/libarm.so.0.0                   base-compat-shlib       compat,pic,llvm
+./usr/lib/oabi/libc_vfp.so.0                   base-compat-shlib       compat,pic,llvm
+./usr/lib/oabi/libc_vfp.so.0.0                 base-compat-shlib       compat,pic,llvm
+./usr/lib/oabi/lua                             base-compat-lib         compat,gcc
+./usr/lib/oabi/lua/5.3                         base-compat-lib         compat,gcc
+./usr/lib/oabi/security                                base-compat-lib         compat,gcc
+./usr/libexec/ld.elf_so-eabi                   base-compat-shlib       compat,pic,llvm
+./usr/libexec/ld.elf_so-eabihf                 base-compat-shlib       compat,pic,llvm
+./usr/libexec/ld.elf_so-oabi                   base-sysutil-bin        compat,pic,llvm
 ./usr/sbin/ofctl                               base-sysutil-bin
 ./usr/sbin/tpctl                               base-sysutil-bin
diff -r bd331b8d8532 -r b3a4cf81583b distrib/sets/lists/comp/ad.aarch64
--- a/distrib/sets/lists/comp/ad.aarch64        Tue Jul 17 00:50:56 2018 +0000
+++ b/distrib/sets/lists/comp/ad.aarch64        Tue Jul 17 01:47:20 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ad.aarch64,v 1.20 2018/07/12 10:46:40 maxv Exp $
+# $NetBSD: ad.aarch64,v 1.21 2018/07/17 01:47:20 christos Exp $
 ./usr/include/aarch64                          comp-c-include
 ./usr/include/aarch64/ansi.h                   comp-c-include
 ./usr/include/aarch64/aout_machdep.h           comp-c-include
@@ -123,31 +123,38 @@
 ./usr/include/evbarm64                         comp-obsolete           obsolete
 ./usr/include/evbarm64/disklabel.h             comp-obsolete           obsolete
 ./usr/include/evbarm64/intr.h                  comp-obsolete           obsolete
-./usr/include/gcc-4.8/arm_neon.h               comp-c-include          gcccmds,gcc
-./usr/include/gcc-4.8/mmintrin.h               comp-c-include          gcccmds,gcc
-./usr/include/gcc-4.8/tgmath.h                 comp-c-include          gcccmds,gcc
-./usr/include/gcc-4.8/unwind-arm-common.h      comp-c-include          gcccmds,gcc,eabi
+./usr/include/g++/bits/aarch64                 comp-c-include          gcccmds,gcc=6
+./usr/include/g++/bits/aarch64/c++config.h     comp-c-include          gcccmds,gcc=6
+./usr/include/g++/bits/arm                     comp-c-include          gcccmds,gcc=6
+./usr/include/g++/bits/arm/c++config.h         comp-c-include          gcccmds,gcc=6
+./usr/include/gcc-4.8/arm_neon.h               comp-c-include          gcccmds,gcc=48
+./usr/include/gcc-4.8/mmintrin.h               comp-c-include          gcccmds,gcc=48
+./usr/include/gcc-4.8/tgmath.h                 comp-c-include          gcccmds,gcc=48
+./usr/include/gcc-4.8/unwind-arm-common.h      comp-c-include          gcccmds,gcc=48,eabi
+./usr/include/gcc-6/arm_acle.h                 comp-c-include          gcccmds,gcc=6
+./usr/include/gcc-6/arm_neon.h                 comp-c-include          gcccmds,gcc=6
+./usr/include/gcc-6/tgmath.h                   comp-c-include          gcccmds,gcc=6
 ./usr/include/ieeefp.h                         comp-c-include
-./usr/lib/eabi/libarm.a                                comp-c-lib              compat
-./usr/lib/eabi/libarm.so                       base-sys-shlib          compat,pic
-./usr/lib/eabi/libarm_p.a                      comp-c-proflib          compat,profile
-./usr/lib/eabi/libarm_pic.a                    comp-c-piclib           compat,pic,picinstall
-./usr/lib/eabi/libc_vfp.a                      comp-c-lib              compat
-./usr/lib/eabi/libc_vfp.so                     base-sys-shlib          compat,pic
-./usr/lib/eabi/libc_vfp_p.a                    comp-c-proflib          compat,profile
-./usr/lib/eabi/libc_vfp_pic.a                  comp-c-piclib           compat,pic,picinstall
-./usr/lib/eabihf/libarm.a                              comp-c-lib              compat
-./usr/lib/eabihf/libarm.so                     base-sys-shlib          compat,pic
-./usr/lib/eabihf/libarm_p.a                    comp-c-proflib          compat,profile
-./usr/lib/eabihf/libarm_pic.a                  comp-c-piclib           compat,pic,picinstall
-./usr/lib/oabi/libarm.a                                comp-c-lib              compat
-./usr/lib/oabi/libarm.so                       base-sys-shlib          compat,pic
-./usr/lib/oabi/libarm_p.a                      comp-c-proflib          compat,profile
-./usr/lib/oabi/libarm_pic.a                    comp-c-piclib           compat,pic,picinstall
-./usr/lib/oabi/libc_vfp.a                      comp-c-lib              compat
-./usr/lib/oabi/libc_vfp.so                     base-sys-shlib          compat,pic
-./usr/lib/oabi/libc_vfp_p.a                    comp-c-proflib          compat,profile
-./usr/lib/oabi/libc_vfp_pic.a                  comp-c-piclib           compat,pic,picinstall
+./usr/lib/eabi/libarm.a                                comp-c-lib              compat,llvm
+./usr/lib/eabi/libarm.so                       base-sys-shlib          compat,pic,llvm
+./usr/lib/eabi/libarm_p.a                      comp-c-proflib          compat,profile,llvm
+./usr/lib/eabi/libarm_pic.a                    comp-c-piclib           compat,pic,picinstall,llvm
+./usr/lib/eabi/libc_vfp.a                      comp-c-lib              compat,llvm
+./usr/lib/eabi/libc_vfp.so                     base-sys-shlib          compat,pic,llvm
+./usr/lib/eabi/libc_vfp_p.a                    comp-c-proflib          compat,profile,llvm
+./usr/lib/eabi/libc_vfp_pic.a                  comp-c-piclib           compat,pic,picinstall,llvm
+./usr/lib/eabihf/libarm.a                              comp-c-lib              compat,llvm
+./usr/lib/eabihf/libarm.so                     base-sys-shlib          compat,pic,llvm
+./usr/lib/eabihf/libarm_p.a                    comp-c-proflib          compat,profile,llvm
+./usr/lib/eabihf/libarm_pic.a                  comp-c-piclib           compat,pic,picinstall,llvm
+./usr/lib/oabi/libarm.a                                comp-c-lib              compat,llvm
+./usr/lib/oabi/libarm.so                       base-sys-shlib          compat,pic,llvm
+./usr/lib/oabi/libarm_p.a                      comp-c-proflib          compat,profile,llvm
+./usr/lib/oabi/libarm_pic.a                    comp-c-piclib           compat,pic,picinstall,llvm
+./usr/lib/oabi/libc_vfp.a                      comp-c-lib              compat,llvm
+./usr/lib/oabi/libc_vfp.so                     base-sys-shlib          compat,pic,llvm
+./usr/lib/oabi/libc_vfp_p.a                    comp-c-proflib          compat,profile,llvm
+./usr/lib/oabi/libc_vfp_pic.a                  comp-c-piclib           compat,pic,picinstall,llvm
 ./usr/libdata/ldscripts/aarch64elf.x           -unknown-               binutils
 ./usr/libdata/ldscripts/aarch64elf.xbn         -unknown-               binutils
 ./usr/libdata/ldscripts/aarch64elf.xc          -unknown-               binutils
@@ -203,6 +210,9 @@
 ./usr/libdata/ldscripts/armelf.x               -unknown-               binutils
 ./usr/libdata/ldscripts/armelf.xbn             -unknown-               binutils
 ./usr/libdata/ldscripts/armelf.xc              -unknown-               binutils
+./usr/libdata/ldscripts/armelf.xd              -unknown-               binutils=230
+./usr/libdata/ldscripts/armelf.xdc             -unknown-               binutils=230
+./usr/libdata/ldscripts/armelf.xdw             -unknown-               binutils=230
 ./usr/libdata/ldscripts/armelf.xn              -unknown-               binutils
 ./usr/libdata/ldscripts/armelf.xr              -unknown-               binutils
 ./usr/libdata/ldscripts/armelf.xs              -unknown-               binutils
@@ -252,6 +262,9 @@
 ./usr/libdata/ldscripts/armelfb.x              -unknown-               binutils
 ./usr/libdata/ldscripts/armelfb.xbn            -unknown-               binutils
 ./usr/libdata/ldscripts/armelfb.xc             -unknown-               binutils
+./usr/libdata/ldscripts/armelfb.xd             -unknown-               binutils=230
+./usr/libdata/ldscripts/armelfb.xdc            -unknown-               binutils=230
+./usr/libdata/ldscripts/armelfb.xdw            -unknown-               binutils=230
 ./usr/libdata/ldscripts/armelfb.xn             -unknown-               binutils
 ./usr/libdata/ldscripts/armelfb.xr             -unknown-               binutils
 ./usr/libdata/ldscripts/armelfb.xs             -unknown-               binutils
@@ -297,4 +310,4 @@
 ./usr/libdata/ldscripts/armelfb_nbsd_eabihf.xsc        -unknown-               binutils
 ./usr/libdata/ldscripts/armelfb_nbsd_eabihf.xsw        -unknown-               binutils
 ./usr/libdata/ldscripts/armelfb_nbsd_eabihf.xu -unknown-               binutils
-./usr/libdata/ldscripts/armelfb_nbsd_eabihf.xw         -unknown-               binutils
+./usr/libdata/ldscripts/armelfb_nbsd_eabihf.xw -unknown-               binutils
diff -r bd331b8d8532 -r b3a4cf81583b distrib/sets/lists/debug/ad.aarch64
--- a/distrib/sets/lists/debug/ad.aarch64       Tue Jul 17 00:50:56 2018 +0000
+++ b/distrib/sets/lists/debug/ad.aarch64       Tue Jul 17 01:47:20 2018 +0000
@@ -1,19 +1,31 @@
-# $NetBSD: ad.aarch64,v 1.27 2018/04/01 04:35:02 ryo Exp $
-./usr/lib/eabi/libarm_g.a                                      comp-sys-debug  debuglib,compat
-./usr/lib/eabi/libc_vfp_g.a                                    comp-sys-debug  debuglib,compat
-./usr/lib/eabihf/libarm_g.a                                    comp-sys-debug  debuglib,compat
-./usr/lib/oabi/libarm_g.a                                      comp-sys-debug  debuglib,compat
-./usr/lib/oabi/libc_vfp_g.a                                    comp-sys-debug  debuglib,compat
-./usr/libdata/debug/libexec/ld.elf_so-eabi.debug               comp-sys-debug  debug,compat
-./usr/libdata/debug/libexec/ld.elf_so-eabihf.debug             comp-sys-debug  debug,compat
-./usr/libdata/debug/libexec/ld.elf_so-oabi.debug               comp-sys-debug  debug,compat
-./usr/libdata/debug/usr/lib/eabi/libarm.so.0.0.debug           comp-sys-debug  debug,compat,pic
-./usr/libdata/debug/usr/lib/eabi/libc_vfp.so.0.0.debug         comp-sys-debug  debug,compat,pic
-./usr/libdata/debug/usr/lib/eabihf/libarm.so.0.0.debug         comp-sys-debug  debug,compat,pic
-./usr/libdata/debug/usr/lib/oabi/libarm.so.0.0.debug           comp-sys-debug  debug,compat,pic
-./usr/libdata/debug/usr/lib/oabi/libc_vfp.so.0.0.debug         comp-sys-debug  debug,compat,pic
-./usr/libdata/debug/usr/libexec/ld.elf_so-eabi.debug           comp-sys-debug  debug,compat
-./usr/libdata/debug/usr/libexec/ld.elf_so-eabihf.debug         comp-sys-debug  debug,compat
-./usr/libdata/debug/usr/libexec/ld.elf_so-oabi.debug           comp-sys-debug  debug,compat
+# $NetBSD: ad.aarch64,v 1.28 2018/07/17 01:47:20 christos Exp $
+./usr/lib/eabi/libarm_g.a                                      comp-sys-debug  debuglib,compat,llvm
+./usr/lib/eabi/libc_vfp_g.a                                    comp-sys-debug  debuglib,compat,llvm
+./usr/lib/eabihf/libarm_g.a                                    comp-sys-debug  debuglib,compat,llvm
+./usr/lib/oabi/libarm_g.a                                      comp-sys-debug  debuglib,compat,llvm
+./usr/lib/oabi/libc_vfp_g.a                                    comp-sys-debug  debuglib,compat,llvm
+./usr/libdata/debug/lib/eabi                                   comp-sys-debug,compat,gcc
+./usr/libdata/debug/lib/eabi/npf                               comp-sys-debug,compat,gcc
+./usr/libdata/debug/lib/eabihf                                 comp-sys-debug,compat,gcc
+./usr/libdata/debug/lib/eabihf/npf                             comp-sys-debug,compat,gcc
+./usr/libdata/debug/lib/oabi                                   comp-sys-debug,compat,gcc
+./usr/libdata/debug/lib/oabi/npf                               comp-sys-debug,compat,gcc
+./usr/libdata/debug/libexec/ld.elf_so-eabi.debug               comp-sys-debug  debug,compat,llvm
+./usr/libdata/debug/libexec/ld.elf_so-eabihf.debug             comp-sys-debug  debug,compat,llvm
+./usr/libdata/debug/libexec/ld.elf_so-oabi.debug               comp-sys-debug  debug,compat,llvm
+./usr/libdata/debug/usr/lib/eabi                               comp-sys-debug,compat,gcc
+./usr/libdata/debug/usr/lib/eabi/i18n                          comp-sys-debug,compat,gcc
+./usr/libdata/debug/usr/lib/eabi/libarm.so.0.0.debug           comp-sys-debug  debug,compat,pic,llvm
+./usr/libdata/debug/usr/lib/eabi/libc_vfp.so.0.0.debug         comp-sys-debug  debug,compat,pic,llvm
+./usr/libdata/debug/usr/lib/eabihf                             comp-sys-debug,compat,gcc
+./usr/libdata/debug/usr/lib/eabihf/i18n                                comp-sys-debug,compat,gcc
+./usr/libdata/debug/usr/lib/eabihf/libarm.so.0.0.debug         comp-sys-debug  debug,compat,pic,llvm
+./usr/libdata/debug/usr/lib/oabi                               comp-sys-debug,compat,gcc
+./usr/libdata/debug/usr/lib/oabi/i18n                          comp-sys-debug,compat,gcc
+./usr/libdata/debug/usr/lib/oabi/libarm.so.0.0.debug           comp-sys-debug  debug,compat,pic,llvm
+./usr/libdata/debug/usr/lib/oabi/libc_vfp.so.0.0.debug         comp-sys-debug  debug,compat,pic,llvm
+./usr/libdata/debug/usr/libexec/ld.elf_so-eabi.debug           comp-sys-debug  debug,compat,llvm
+./usr/libdata/debug/usr/libexec/ld.elf_so-eabihf.debug         comp-sys-debug  debug,compat,llvm
+./usr/libdata/debug/usr/libexec/ld.elf_so-oabi.debug           comp-sys-debug  debug,compat,llvm
 ./usr/libdata/debug/usr/sbin/ofctl.debug                       comp-util-debug         debug
 ./usr/libdata/debug/usr/sbin/tpctl.debug                       comp-sysutil-debug      debug