Module Name:    xsrc
Committed By:   mrg
Date:           Sun Mar 11 10:37:32 UTC 2018

Modified Files:
        xsrc/external/mit/libpciaccess/dist/m4: libtool.m4
        xsrc/external/mit/libpciaccess/dist/src: netbsd_pci.c

Log Message:
merge libpciaccess 0.14.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/libpciaccess/dist/m4/libtool.m4
cvs rdiff -u -r1.16 -r1.17 \
    xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/libpciaccess/dist/m4/libtool.m4
diff -u xsrc/external/mit/libpciaccess/dist/m4/libtool.m4:1.5 xsrc/external/mit/libpciaccess/dist/m4/libtool.m4:1.6
--- xsrc/external/mit/libpciaccess/dist/m4/libtool.m4:1.5	Tue Aug 29 05:52:34 2017
+++ xsrc/external/mit/libpciaccess/dist/m4/libtool.m4	Sun Mar 11 10:37:32 2018
@@ -2867,6 +2867,9 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu 
   # before this can be enabled.
   hardcode_into_libs=yes
 
+  # Add ABI-specific directories to the system library path.
+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
   # Ideally, we could use ldconfig to report *all* directores which are
   # searched for libraries, however this is still not possible.  Aside from not
   # being certain /sbin/ldconfig is available, command
@@ -2875,7 +2878,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu 
   # appending ld.so.conf contents (and includes) to the search path.
   if test -f /etc/ld.so.conf; then
     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' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on

Index: xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c
diff -u xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c:1.16 xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c:1.17
--- xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c:1.16	Sat Sep 24 23:14:21 2016
+++ xsrc/external/mit/libpciaccess/dist/src/netbsd_pci.c	Sun Mar 11 10:37:32 2018
@@ -973,6 +973,10 @@ pci_system_netbsd_create(void)
 					continue;
 
 				device->base.domain = domain;
+				if (domain > 0xffff)
+				    device->base.domain_16 = 0xffff;
+				else
+				    device->base.domain_16 = domain & 0xffff;
 				device->base.bus = bus;
 				device->base.dev = dev;
 				device->base.func = func;

Reply via email to