[Glibc-bsd-commits] r4129 - in trunk/freebsd-libs/debian: . patches

[Robert Millan]

Author: rmh
Date: 2012-02-26 11:48:31 +0000 (Sun, 26 Feb 2012)
New Revision: 4129

Removed:
   trunk/freebsd-libs/debian/patches/bsfq_redefinition.diff
Modified:
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/patches/04_libkvm.diff
   trunk/freebsd-libs/debian/patches/series
Log:
bsfl() too.

Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog	2012-02-26 11:26:29 UTC (rev 4128)
+++ trunk/freebsd-libs/debian/changelog	2012-02-26 11:48:31 UTC (rev 4129)
@@ -1,7 +1,7 @@
 freebsd-libs (9.0+ds1-2) UNRELEASED; urgency=low
 
   * kvm.h: Use <bsd/nlist.h> rather than <nlist.h>. (Closes: #657772)
-  * bsfq_redefinition.diff: Remove redundant definition of bsfq().
+  * Remove redundant definitions of bsfq() and bsfl().
 
  -- Robert Millan <rmh at debian.org>  Sun, 26 Feb 2012 12:26:21 +0100
 

Modified: trunk/freebsd-libs/debian/patches/04_libkvm.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/04_libkvm.diff	2012-02-26 11:26:29 UTC (rev 4128)
+++ trunk/freebsd-libs/debian/patches/04_libkvm.diff	2012-02-26 11:48:31 UTC (rev 4129)
@@ -136,43 +136,6 @@
  		}
  		tot.ksw_total += ttl;
  		tot.ksw_used += xsd.xsw_used;
---- a/lib/libkvm/kvm_minidump_amd64.c
-+++ b/lib/libkvm/kvm_minidump_amd64.c
-@@ -100,6 +100,15 @@
- 	return (-1);
- }
- 
-+__inline__ u_long
-+bsfq(u_long mask)
-+{
-+	u_long  result;
-+
-+	__asm __volatile("bsfq %1,%0" : "=r" (result) : "rm" (mask));
-+	return (result);
-+}
-+
- static int
- inithash(kvm_t *kd, uint64_t *base, int len, off_t off)
- {
---- a/lib/libkvm/kvm_minidump_i386.c
-+++ b/lib/libkvm/kvm_minidump_i386.c
-@@ -102,6 +102,16 @@
- 	return (-1);
- }
- 
-+__inline__ u_int
-+bsfl(u_int mask)
-+{
-+	u_int   result;
-+
-+	__asm __volatile("bsfl %1,%0" : "=r" (result) : "rm" (mask));
-+	return (result);
-+}
-+
-+
- static int
- inithash(kvm_t *kd, uint32_t *base, int len, off_t off)
- {
 --- a/lib/libkvm/kvm_private.h
 +++ b/lib/libkvm/kvm_private.h
 @@ -34,6 +34,8 @@

Deleted: trunk/freebsd-libs/debian/patches/bsfq_redefinition.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/bsfq_redefinition.diff	2012-02-26 11:26:29 UTC (rev 4128)
+++ trunk/freebsd-libs/debian/patches/bsfq_redefinition.diff	2012-02-26 11:48:31 UTC (rev 4129)
@@ -1,18 +0,0 @@
---- a/lib/libkvm/kvm_minidump_amd64.c
-+++ b/lib/libkvm/kvm_minidump_amd64.c
-@@ -100,15 +100,6 @@
- 	return (-1);
- }
- 
--__inline__ u_long
--bsfq(u_long mask)
--{
--	u_long  result;
--
--	__asm __volatile("bsfq %1,%0" : "=r" (result) : "rm" (mask));
--	return (result);
--}
--
- static int
- inithash(kvm_t *kd, uint64_t *base, int len, off_t off)
- {

Modified: trunk/freebsd-libs/debian/patches/series
===================================================================
--- trunk/freebsd-libs/debian/patches/series	2012-02-26 11:26:29 UTC (rev 4128)
+++ trunk/freebsd-libs/debian/patches/series	2012-02-26 11:48:31 UTC (rev 4129)
@@ -17,4 +17,3 @@
 sysconf_cpuset_size.diff
 libusb_backward.diff
 libbsd_nlist.diff
-bsfq_redefinition.diff