From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 10 Sep 2004 21:16:28 +0000 (+0000)
Subject: [BZ #377]
X-Git-Tag: cvs/fedora-base~71
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=05f4d5cd08269699c405f190e6f858ec6c079457;p=thirdparty%2Fglibc.git

[BZ #377]

Update.
	* sysdeps/unix/sysv/linux/kernel-features.h: Don't define
	__ASSUME_CLONE_STOPPED.

2004-09-10  Jakub Jelinek  <jakub@redhat.com>

	* misc/sys/cdefs.h (__REDIRECT_NTH): Change order of __THROW and
	__asm__ for C++.  [BZ #377]

2004-09-10  Ulrich Drepper  <drepper@redhat.com>
---

diff --git a/ChangeLog b/ChangeLog
index e4bf276ccd3..30ae386c106 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-09-10  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/unix/sysv/linux/kernel-features.h: Don't define
+	__ASSUME_CLONE_STOPPED.
+
+2004-09-10  Jakub Jelinek  <jakub@redhat.com>
+
+	* misc/sys/cdefs.h (__REDIRECT_NTH): Change order of __THROW and
+	__asm__ for C++.  [BZ #377]
+
 2004-09-10  Ulrich Drepper  <drepper@redhat.com>
 
 	* nscd/nscd_stat.c: Improve output by also printing .shared and
diff --git a/misc/sys/cdefs.h b/misc/sys/cdefs.h
index e89776c2a7a..2271e10fdca 100644
--- a/misc/sys/cdefs.h
+++ b/misc/sys/cdefs.h
@@ -159,8 +159,13 @@
 #if defined __GNUC__ && __GNUC__ >= 2
 
 # define __REDIRECT(name, proto, alias) name proto __asm__ (__ASMNAME (#alias))
-# define __REDIRECT_NTH(name, proto, alias) \
+# ifdef __cplusplus
+#  define __REDIRECT_NTH(name, proto, alias) \
+     name proto __THROW __asm__ (__ASMNAME (#alias))
+# else
+#  define __REDIRECT_NTH(name, proto, alias) \
      name proto __asm__ (__ASMNAME (#alias)) __THROW
+# endif
 # define __ASMNAME(cname)  __ASMNAME2 (__USER_LABEL_PREFIX__, cname)
 # define __ASMNAME2(prefix, cname) __STRING (prefix) cname
 
diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h
index d08c91c2f76..17f4f8fcf71 100644
--- a/sysdeps/unix/sysv/linux/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/kernel-features.h
@@ -365,10 +365,13 @@
 # define __ASSUME_UTIMES	1
 #endif
 
+// XXX Disabled for now since the semantics we want is not achieved.
+#if 0
 /* The CLONE_STOPPED flag was introduced in the 2.6.0-test1 series.  */
 #if __LINUX_KERNEL_VERSION >= 132609
 # define __ASSUME_CLONE_STOPPED	1
 #endif
+#endif
 
 /* The fixed version of the posix_fadvise64 syscall appeared in
    2.6.0-test3.  At least for x86.  */