[Glibc-bsd-commits] r5516 - in trunk/kfreebsd-kernel-headers: debian debian/patches test
stevenc-guest at alioth.debian.org
stevenc-guest at alioth.debian.org
Wed Sep 3 13:45:22 UTC 2014
Author: stevenc-guest
Date: 2014-09-03 13:45:22 +0000 (Wed, 03 Sep 2014)
New Revision: 5516
Added:
trunk/kfreebsd-kernel-headers/debian/patches/compiler_membar.diff
trunk/kfreebsd-kernel-headers/test/atomic.c
Modified:
trunk/kfreebsd-kernel-headers/debian/changelog
trunk/kfreebsd-kernel-headers/debian/install
trunk/kfreebsd-kernel-headers/debian/patches/series
trunk/kfreebsd-kernel-headers/test/Makefile
Log:
* Add to machine/atomic.h a definition for macro __compiler_membar
not available in glibc (Closes: #750836)
* Add net/if_pflog.h (Closes: #756553)
- add atomic.c testcase (Romain Francoise)
* Enable testing for -Wimplicit-function-declaration
Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog 2014-09-02 13:02:47 UTC (rev 5515)
+++ trunk/kfreebsd-kernel-headers/debian/changelog 2014-09-03 13:45:22 UTC (rev 5516)
@@ -1,10 +1,19 @@
kfreebsd-kernel-headers (10.1~2) UNRELEASED; urgency=medium
- * NOT RELEASED YET
- * Add more pf headers
+ [ Christoph Egger ]
+ * Add more pf headers:
+ - netpfil/pf/pf_altq.h
+ - netpfil/pf/pf.h
- -- Christoph Egger <christoph at debian.org> Sun, 31 Aug 2014 12:18:07 -0700
+ [ Steven Chamberlain ]
+ * Add to machine/atomic.h a definition for macro __compiler_membar
+ not available in glibc (Closes: #750836)
+ * Add net/if_pflog.h (Closes: #756553)
+ - add atomic.c testcase (Romain Francoise)
+ * Enable testing for -Wimplicit-function-declaration
+ -- GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org> Wed, 03 Sep 2014 13:06:24 +0100
+
kfreebsd-kernel-headers (10.1~1) experimental; urgency=medium
* Update for 10.1
Modified: trunk/kfreebsd-kernel-headers/debian/install
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/install 2014-09-02 13:02:47 UTC (rev 5515)
+++ trunk/kfreebsd-kernel-headers/debian/install 2014-09-03 13:45:22 UTC (rev 5516)
@@ -73,6 +73,7 @@
sys/net/if_llc.h usr/include/net
sys/net/if_media.h usr/include/net
sys/net/if_mib.h usr/include/net
+sys/net/if_pflog.h usr/include/net
sys/net/if_pfsync.h usr/include/net
sys/net/if_sppp.h usr/include/net
sys/net/if_stf.h usr/include/net
Added: trunk/kfreebsd-kernel-headers/debian/patches/compiler_membar.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/compiler_membar.diff (rev 0)
+++ trunk/kfreebsd-kernel-headers/debian/patches/compiler_membar.diff 2014-09-03 13:45:22 UTC (rev 5516)
@@ -0,0 +1,41 @@
+Compiler memory barriers, specific to gcc and clang
+
+Defined in FreeBSD sys/cdefs.h but not glibc's
+
+--- a/sys/amd64/include/atomic.h
++++ b/sys/amd64/include/atomic.h
+@@ -32,6 +32,10 @@
+ #error this file needs sys/cdefs.h as a prerequisite
+ #endif
+
++#if defined(__GNUC__) && !defined(__compiler_membar)
++#define __compiler_membar() __asm __volatile(" " : : : "memory")
++#endif
++
+ #define mb() __asm __volatile("mfence;" : : : "memory")
+ #define wmb() __asm __volatile("sfence;" : : : "memory")
+ #define rmb() __asm __volatile("lfence;" : : : "memory")
+--- a/sys/i386/include/atomic.h
++++ b/sys/i386/include/atomic.h
+@@ -37,6 +37,10 @@
+ #include <machine/specialreg.h>
+ #endif
+
++#if defined(__GNUC__) && !defined(__compiler_membar)
++#define __compiler_membar() __asm __volatile(" " : : : "memory")
++#endif
++
+ #define mb() __asm __volatile("lock; addl $0,(%%esp)" : : : "memory", "cc")
+ #define wmb() __asm __volatile("lock; addl $0,(%%esp)" : : : "memory", "cc")
+ #define rmb() __asm __volatile("lock; addl $0,(%%esp)" : : : "memory", "cc")
+--- a/sys/x86/include/bus.h
++++ b/sys/x86/include/bus.h
+@@ -1037,7 +1037,7 @@
+ __asm __volatile("lock; addl $0,0(%%esp)" : : : "memory");
+ #endif
+ else
+- __compiler_membar();
++ __asm __volatile(" " : : : "memory");
+ #endif
+ }
+
Modified: trunk/kfreebsd-kernel-headers/debian/patches/series
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/series 2014-09-02 13:02:47 UTC (rev 5515)
+++ trunk/kfreebsd-kernel-headers/debian/patches/series 2014-09-03 13:45:22 UTC (rev 5516)
@@ -31,3 +31,4 @@
sys_kern_backward_compat.diff
net_if_ioctls.diff
vmpage_h_include
+compiler_membar.diff
Modified: trunk/kfreebsd-kernel-headers/test/Makefile
===================================================================
--- trunk/kfreebsd-kernel-headers/test/Makefile 2014-09-02 13:02:47 UTC (rev 5515)
+++ trunk/kfreebsd-kernel-headers/test/Makefile 2014-09-03 13:45:22 UTC (rev 5516)
@@ -1,6 +1,7 @@
TESTS = \
assert_correct_bsize.o \
assert_wchar_size.o \
+ atomic.o \
endian_collision.o \
socket_collision.o \
signal_collision.o \
@@ -38,7 +39,7 @@
CFLAGS = -I. -I../debian/kfreebsd-kernel-headers/usr/include
# Enable all the stuff in glibc to probe for collisions
-CFLAGS += -D_GNU_SOURCE -Werror -Wsystem-headers
+CFLAGS += -D_GNU_SOURCE -Werror -Wsystem-headers -Wimplicit-function-declaration
all: $(TESTS)
Added: trunk/kfreebsd-kernel-headers/test/atomic.c
===================================================================
--- trunk/kfreebsd-kernel-headers/test/atomic.c (rev 0)
+++ trunk/kfreebsd-kernel-headers/test/atomic.c 2014-09-03 13:45:22 UTC (rev 5516)
@@ -0,0 +1,10 @@
+#include <sys/types.h>
+#include <sys/cdefs.h>
+#include <machine/atomic.h>
+
+int main(int argc, char **argv)
+{
+ unsigned int p, v = 0;
+ atomic_store_rel_int(&p, v);
+ return 0;
+}
More information about the Glibc-bsd-commits
mailing list