Sun Mar 11 10:37:32 2018 UTC ()
merge libpciaccess 0.14.


(mrg)
diff -r1.5 -r1.6 xsrc/external/mit/libpciaccess/dist/m4/libtool.m4
diff -r1.16 -r1.17 xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c

cvs diff -r1.5 -r1.6 xsrc/external/mit/libpciaccess/dist/m4/libtool.m4 (expand / switch to unified diff)

--- xsrc/external/mit/libpciaccess/dist/m4/libtool.m4 2017/08/29 05:52:34 1.5
+++ xsrc/external/mit/libpciaccess/dist/m4/libtool.m4 2018/03/11 10:37:32 1.6
@@ -2857,35 +2857,38 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu  @@ -2857,35 +2857,38 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu
2857 AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], 2857 AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
2858 [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], 2858 [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
2859 [lt_cv_shlibpath_overrides_runpath=yes])]) 2859 [lt_cv_shlibpath_overrides_runpath=yes])])
2860 LDFLAGS=$save_LDFLAGS 2860 LDFLAGS=$save_LDFLAGS
2861 libdir=$save_libdir 2861 libdir=$save_libdir
2862 ]) 2862 ])
2863 shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath 2863 shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
2864 2864
2865 # This implies no fast_install, which is unacceptable. 2865 # This implies no fast_install, which is unacceptable.
2866 # Some rework will be needed to allow for fast_install 2866 # Some rework will be needed to allow for fast_install
2867 # before this can be enabled. 2867 # before this can be enabled.
2868 hardcode_into_libs=yes 2868 hardcode_into_libs=yes
2869 2869
 2870 # Add ABI-specific directories to the system library path.
 2871 sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
 2872
2870 # Ideally, we could use ldconfig to report *all* directores which are 2873 # Ideally, we could use ldconfig to report *all* directores which are
2871 # searched for libraries, however this is still not possible. Aside from not 2874 # searched for libraries, however this is still not possible. Aside from not
2872 # being certain /sbin/ldconfig is available, command 2875 # being certain /sbin/ldconfig is available, command
2873 # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, 2876 # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
2874 # even though it is searched at run-time. Try to do the best guess by 2877 # even though it is searched at run-time. Try to do the best guess by
2875 # appending ld.so.conf contents (and includes) to the search path. 2878 # appending ld.so.conf contents (and includes) to the search path.
2876 if test -f /etc/ld.so.conf; then 2879 if test -f /etc/ld.so.conf; then
2877 lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` 2880 lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
2878 sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" 2881 sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
2879 fi 2882 fi
2880 2883
2881 # We used to test for /lib/ld.so.1 and disable shared libraries on 2884 # We used to test for /lib/ld.so.1 and disable shared libraries on
2882 # powerpc, because MkLinux only supported shared libraries with the 2885 # powerpc, because MkLinux only supported shared libraries with the
2883 # GNU dynamic linker. Since this was broken with cross compilers, 2886 # GNU dynamic linker. Since this was broken with cross compilers,
2884 # most powerpc-linux boxes support dynamic linking these days and 2887 # most powerpc-linux boxes support dynamic linking these days and
2885 # people can always --disable-shared, the test was removed, and we 2888 # people can always --disable-shared, the test was removed, and we
2886 # assume the GNU/Linux dynamic linker is in use. 2889 # assume the GNU/Linux dynamic linker is in use.
2887 dynamic_linker='GNU/Linux ld.so' 2890 dynamic_linker='GNU/Linux ld.so'
2888 ;; 2891 ;;
2889 2892
2890netbsd*) 2893netbsd*)
2891 version_type=sunos 2894 version_type=sunos

cvs diff -r1.16 -r1.17 xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c (expand / switch to unified diff)

--- xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c 2016/09/24 23:14:21 1.16
+++ xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c 2018/03/11 10:37:32 1.17
@@ -963,26 +963,30 @@ pci_system_netbsd_create(void) @@ -963,26 +963,30 @@ pci_system_netbsd_create(void)
963 for (domain = 0; domain < nbuses; domain++) { 963 for (domain = 0; domain < nbuses; domain++) {
964 bus = buses[domain].num; 964 bus = buses[domain].num;
965 for (dev = 0; dev < buses[domain].maxdevs; dev++) { 965 for (dev = 0; dev < buses[domain].maxdevs; dev++) {
966 nfuncs = pci_nfuncs(domain, bus, dev); 966 nfuncs = pci_nfuncs(domain, bus, dev);
967 for (func = 0; func < nfuncs; func++) { 967 for (func = 0; func < nfuncs; func++) {
968 if (pci_read(domain, bus, dev, func, 968 if (pci_read(domain, bus, dev, func,
969 PCI_ID_REG, &reg) != 0) 969 PCI_ID_REG, &reg) != 0)
970 continue; 970 continue;
971 if (PCI_VENDOR(reg) == PCI_VENDOR_INVALID || 971 if (PCI_VENDOR(reg) == PCI_VENDOR_INVALID ||
972 PCI_VENDOR(reg) == 0) 972 PCI_VENDOR(reg) == 0)
973 continue; 973 continue;
974 974
975 device->base.domain = domain; 975 device->base.domain = domain;
 976 if (domain > 0xffff)
 977 device->base.domain_16 = 0xffff;
 978 else
 979 device->base.domain_16 = domain & 0xffff;
976 device->base.bus = bus; 980 device->base.bus = bus;
977 device->base.dev = dev; 981 device->base.dev = dev;
978 device->base.func = func; 982 device->base.func = func;
979 device->base.vendor_id = PCI_VENDOR(reg); 983 device->base.vendor_id = PCI_VENDOR(reg);
980 device->base.device_id = PCI_PRODUCT(reg); 984 device->base.device_id = PCI_PRODUCT(reg);
981 985
982 if (pci_read(domain, bus, dev, func, 986 if (pci_read(domain, bus, dev, func,
983 PCI_CLASS_REG, &reg) != 0) 987 PCI_CLASS_REG, &reg) != 0)
984 continue; 988 continue;
985 989
986 device->base.device_class = 990 device->base.device_class =
987 PCI_INTERFACE(reg) | PCI_CLASS(reg) << 16 | 991 PCI_INTERFACE(reg) | PCI_CLASS(reg) << 16 |
988 PCI_SUBCLASS(reg) << 8; 992 PCI_SUBCLASS(reg) << 8;