[Glibc-bsd-commits] r5498 - in branches/experimental/kfreebsd-10/debian: . patches

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2014-08-24 22:42:54 +0000 (Sun, 24 Aug 2014)
New Revision: 5498

Removed:
   branches/experimental/kfreebsd-10/debian/patches/001_misc.diff
Modified:
   branches/experimental/kfreebsd-10/debian/changelog
   branches/experimental/kfreebsd-10/debian/patches/series
Log:
Delete 001_misc.diff;  the last remaining parts of it are no longer
relevant with Clang


Modified: branches/experimental/kfreebsd-10/debian/changelog
===================================================================
--- branches/experimental/kfreebsd-10/debian/changelog	2014-08-24 20:35:13 UTC (rev 5497)
+++ branches/experimental/kfreebsd-10/debian/changelog	2014-08-24 22:42:54 UTC (rev 5498)
@@ -6,6 +6,7 @@
   * Switch to clang-3.4 on i386, amd64, arm (Closes: #754799)
   * Switch to gcc-4.9 on other architectures (Closes: #751316)
   * Delete patches merged upstream:
+    - 001_misc.diff
     - si_status_wait6.diff
     - accept_O_CLOEXEC_in_shm_open.diff
     - newcons.diff

Deleted: branches/experimental/kfreebsd-10/debian/patches/001_misc.diff
===================================================================
--- branches/experimental/kfreebsd-10/debian/patches/001_misc.diff	2014-08-24 20:35:13 UTC (rev 5497)
+++ branches/experimental/kfreebsd-10/debian/patches/001_misc.diff	2014-08-24 22:42:54 UTC (rev 5498)
@@ -1,30 +0,0 @@
-
-Co-authored by Nali Toja
-
---- a/sys/conf/kern.mk
-+++ b/sys/conf/kern.mk
-@@ -1,5 +1,15 @@
- # $FreeBSD: stable/10/sys/conf/kern.mk 268882 2014-07-19 18:33:09Z dim $
- 
-+FREEBSD_CC!=   ${CC} -dM -E -</dev/null | awk '/__FreeBSD_cc_version/ { print $$3 }' || true
-+
-+.if ${FREEBSD_CC}
-+# FreeBSD extensions
-+format_extensions=     -fformat-extensions
-+no_align_long_strings= -mno-align-long-strings
-+.else
-+MK_FORMAT_EXTENSIONS=no
-+.endif
-+
- #
- # Warning flags for compiling the kernel and components of the kernel:
- #
-@@ -62,7 +72,7 @@
- #
- .if ${MACHINE_CPUARCH} == "i386"
- .if ${COMPILER_TYPE} != "clang"
--CFLAGS+=	-mno-align-long-strings -mpreferred-stack-boundary=2
-+CFLAGS+=	${no_align_long_strings} -mpreferred-stack-boundary=2
- .else
- CFLAGS+=	-mno-aes -mno-avx
- .endif

Modified: branches/experimental/kfreebsd-10/debian/patches/series
===================================================================
--- branches/experimental/kfreebsd-10/debian/patches/series	2014-08-24 20:35:13 UTC (rev 5497)
+++ branches/experimental/kfreebsd-10/debian/patches/series	2014-08-24 22:42:54 UTC (rev 5498)
@@ -6,7 +6,6 @@
 
 # Other patches that might or might not be mergeable
 userland.diff
-001_misc.diff
 002_maxpathlen.diff
 003_glibc_dev_aicasm.diff
 004_xargs.diff