[Glibc-bsd-commits] r4107 - in trunk/kfreebsd-kernel-headers/debian: . patches

[Robert Millan]

Author: rmh
Date: 2012-02-19 19:28:11 +0000 (Sun, 19 Feb 2012)
New Revision: 4107

Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/patches/010_glibc.diff
   trunk/kfreebsd-kernel-headers/debian/rules
Log:
Extend __CC_SUPPORTS_* hack.

Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2012-02-19 19:12:06 UTC (rev 4106)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2012-02-19 19:28:11 UTC (rev 4107)
@@ -1,7 +1,7 @@
 kfreebsd-kernel-headers (0.74) UNRELEASED; urgency=low
 
   * Misc fixes related to machine/cpufunc.h.  (Closes: #660396)
-    - Add sed hack to force __CC_SUPPORTS___INLINE == 1.
+    - Add sed hack to force __CC_SUPPORTS_* == 1.
     - Remove conflicting declarations for inb(), inw(), outb(), etc.
     - Add new test for machine/cpufunc.h (test/cpufunc.c).
 

Modified: trunk/kfreebsd-kernel-headers/debian/patches/010_glibc.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/010_glibc.diff	2012-02-19 19:12:06 UTC (rev 4106)
+++ trunk/kfreebsd-kernel-headers/debian/patches/010_glibc.diff	2012-02-19 19:28:11 UTC (rev 4107)
@@ -4,19 +4,13 @@
 
 --- a/sys/sys/syslimits.h
 +++ b/sys/sys/syslimits.h
-@@ -33,15 +33,6 @@
- #ifndef _SYS_SYSLIMITS_H_
+@@ -34,9 +34,6 @@
  #define _SYS_SYSLIMITS_H_
  
--#if !defined(_KERNEL) && !defined(_LIMITS_H_) && !defined(_SYS_PARAM_H_)
+ #if !defined(_KERNEL) && !defined(_LIMITS_H_) && !defined(_SYS_PARAM_H_)
 -#ifndef _SYS_CDEFS_H
 -#error this file needs sys/cdefs.h as a prerequisite
 -#endif
--#ifdef __CC_SUPPORTS_WARNING
--#warning "No user-serviceable parts inside."
--#endif
--#endif
--
- /*
-  * Do not add any new variables here.  (See the comment at the end of
-  * the file for why.)
+ #if 1
+ #warning "No user-serviceable parts inside."
+ #endif

Modified: trunk/kfreebsd-kernel-headers/debian/rules
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/rules	2012-02-19 19:12:06 UTC (rev 4106)
+++ trunk/kfreebsd-kernel-headers/debian/rules	2012-02-19 19:28:11 UTC (rev 4107)
@@ -56,9 +56,9 @@
 		-e 's/#\s*ifdef\s*__GNUCLIKE_[A-Z_]\+\(\s\|$$\)/#if 1/g' \
 		-e 's/#\s*ifndef\s*__GNUCLIKE_[A-Z_]\+\(\s\|$$\)/#if 0/g' \
 		\
-		-e 's/defined\s*(\s*__CC_SUPPORTS___INLINE\s*)/1/g' \
-		-e 's/#\s*ifdef\s*__CC_SUPPORTS___INLINE\(\s\|$$\)/#if 1/g' \
-		-e 's/#\s*ifndef\s*__CC_SUPPORTS___INLINE\(\s\|$$\)/#if 0/g' \
+		-e 's/defined\s*(\s*__CC_SUPPORTS_\(INLINE\|__INLINE\|__INLINE__\|__FUNC__\|WARNING\|VARADIC_XXX\|DYNAMIC_ARRAY_INIT\)\s*)/1/g' \
+		-e 's/#\s*ifdef\s*__CC_SUPPORTS_\(INLINE\|__INLINE\|__INLINE__\|__FUNC__\|WARNING\|VARADIC_XXX\|DYNAMIC_ARRAY_INIT\)\(\s\|$$\)/#if 1/g' \
+		-e 's/#\s*ifndef\s*__CC_SUPPORTS_\(INLINE\|__INLINE\|__INLINE__\|__FUNC__\|WARNING\|VARADIC_XXX\|DYNAMIC_ARRAY_INIT\)\(\s\|$$\)/#if 0/g' \
 		\
 		-e 's/__packed\(\s\|;\)/ __attribute__((__packed__))\1/g' \
 		-e 's/__aligned(\([^)]*\?\))/ __attribute__((aligned(\1)))/g' \