[Glibc-bsd-commits] r4938 - in trunk/kfreebsd-10/debian: . patches

[Robert Millan]

Author: rmh
Date: 2013-09-09 22:09:15 +0000 (Mon, 09 Sep 2013)
New Revision: 4938

Modified:
   trunk/kfreebsd-10/debian/changelog
   trunk/kfreebsd-10/debian/control.in
   trunk/kfreebsd-10/debian/patches/914_psm.diff
   trunk/kfreebsd-10/debian/patches/918_unix_socket_overflow.diff
   trunk/kfreebsd-10/debian/patches/920_linux_cflags.diff
   trunk/kfreebsd-10/debian/rules
Log:
  * New upstream snapshot.
    - 920_linux_cflags.diff: Set __FreeBSD__=10 in order to fix <stddef.h>
      buildability.
    - Switch to clang (at least until/unless GCC <wmmintrin.h> becomes
      buildable).

Modified: trunk/kfreebsd-10/debian/changelog
===================================================================
--- trunk/kfreebsd-10/debian/changelog	2013-09-09 13:08:58 UTC (rev 4937)
+++ trunk/kfreebsd-10/debian/changelog	2013-09-09 22:09:15 UTC (rev 4938)
@@ -1,9 +1,16 @@
-kfreebsd-10 (10.0~svn254663-2) UNRELEASED; urgency=low
+kfreebsd-10 (10.0~svn255412-1) experimental; urgency=low
 
+  * New upstream snapshot.
+    - 920_linux_cflags.diff: Set __FreeBSD__=10 in order to fix <stddef.h>
+      buildability.
+    - Switch to clang (at least until/unless GCC <wmmintrin.h> becomes
+      buildable).
+
+  [ Robert Millan ]
   * Stop overriding linker_path, this is done in userland already.
   * Make kfreebsd-headers- at version@- at abiname@ kfreebsd-specific.
 
- -- Robert Millan <rmh at debian.org>  Sun, 01 Sep 2013 21:52:37 +0200
+ -- Robert Millan <rmh at debian.org>  Mon, 09 Sep 2013 14:18:49 +0200
 
 kfreebsd-10 (10.0~svn254663-1) experimental; urgency=low
 

Modified: trunk/kfreebsd-10/debian/control.in
===================================================================
--- trunk/kfreebsd-10/debian/control.in	2013-09-09 13:08:58 UTC (rev 4937)
+++ trunk/kfreebsd-10/debian/control.in	2013-09-09 22:09:15 UTC (rev 4938)
@@ -7,6 +7,7 @@
 Vcs-Svn: svn://anonscm.debian.org/glibc-bsd/trunk/kfreebsd-@major@/
 Build-Depends: debhelper (>= 5.0.0), bzip2, sharutils, flex-old | flex,
  freebsd-buildutils (>= 10~svn253832),
+ freebsd-glue (>= 0.1.5),
  byacc,
  @cc_pkg@, libdb-dev,
  libbsd-dev (>= 0.3.0), pkg-config,

Modified: trunk/kfreebsd-10/debian/patches/914_psm.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/914_psm.diff	2013-09-09 13:08:58 UTC (rev 4937)
+++ trunk/kfreebsd-10/debian/patches/914_psm.diff	2013-09-09 22:09:15 UTC (rev 4938)
@@ -63,7 +63,7 @@
  	default:
  		return (ENOTTY);
  	}
-@@ -3549,9 +3529,6 @@
+@@ -3579,9 +3559,6 @@
  		wakeup(sc);
  	}
  	selwakeuppri(&sc->rsel, PZERO);

Modified: trunk/kfreebsd-10/debian/patches/918_unix_socket_overflow.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/918_unix_socket_overflow.diff	2013-09-09 13:08:58 UTC (rev 4937)
+++ trunk/kfreebsd-10/debian/patches/918_unix_socket_overflow.diff	2013-09-09 22:09:15 UTC (rev 4938)
@@ -8,7 +8,7 @@
 
 --- a/sys/kern/uipc_usrreq.c
 +++ b/sys/kern/uipc_usrreq.c
-@@ -470,7 +470,12 @@
+@@ -471,7 +471,12 @@
  	KASSERT(unp != NULL, ("uipc_bind: unp == NULL"));
  
  	if (soun->sun_len > sizeof(struct sockaddr_un))
@@ -21,7 +21,7 @@
  	namelen = soun->sun_len - offsetof(struct sockaddr_un, sun_path);
  	if (namelen <= 0)
  		return (EINVAL);
-@@ -1287,7 +1292,12 @@
+@@ -1289,7 +1294,12 @@
  	KASSERT(unp != NULL, ("unp_connect: unp == NULL"));
  
  	if (nam->sa_len > sizeof(struct sockaddr_un))

Modified: trunk/kfreebsd-10/debian/patches/920_linux_cflags.diff
===================================================================
--- trunk/kfreebsd-10/debian/patches/920_linux_cflags.diff	2013-09-09 13:08:58 UTC (rev 4937)
+++ trunk/kfreebsd-10/debian/patches/920_linux_cflags.diff	2013-09-09 22:09:15 UTC (rev 4938)
@@ -9,7 +9,7 @@
  .endif
  WERROR?= -Werror
  
-+CFLAGS+= -Ulinux -U__linux__ -D__FreeBSD__
++CFLAGS+= -Ulinux -U__linux__ -D__FreeBSD__=10
 +
  # XXX LOCORE means "don't declare C stuff" not "for locore.s".
  ASM_CFLAGS= -x assembler-with-cpp -DLOCORE ${CFLAGS}
@@ -20,7 +20,7 @@
  CFLAGS+=	-D_KERNEL
  CFLAGS+=	-DKLD_MODULE
  
-+CFLAGS+=	-Ulinux -U__linux__ -D__FreeBSD__
++CFLAGS+=	-Ulinux -U__linux__ -D__FreeBSD__=10
 +
  # Don't use any standard or source-relative include directories.
  CSTD=		c99

Modified: trunk/kfreebsd-10/debian/rules
===================================================================
--- trunk/kfreebsd-10/debian/rules	2013-09-09 13:08:58 UTC (rev 4937)
+++ trunk/kfreebsd-10/debian/rules	2013-09-09 22:09:15 UTC (rev 4938)
@@ -22,8 +22,8 @@
 configfile	:= DEBCUSTOM
 abiname		:= 0
 ld_target	:= $(shell ld --help | sed -ne "s/[^ :]*: supported targets: \([^ ]*\) .*/\1/p")
-cc_cmd		:= gcc-4.8
-cc_pkg		:= gcc-4.8
+cc_cmd		:= clang
+cc_pkg		:= clang-3.3 (>= 1:3.3-9)
 
 ifeq ($(cpu), mipsel)
 kfreebsd_cpu	:= mips