changeset 10776:0c765af76a3a

6890660 pragma unknown_control_flow(vfork) is needed on all architectures
author Roger A. Faulkner <Roger.Faulkner@Sun.COM>
date Mon, 12 Oct 2009 20:17:24 -0700
parents a6efb446630f
children 66a375946c31
files usr/src/head/unistd.h usr/src/uts/common/sys/fork.h
diffstat 2 files changed, 3 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/head/unistd.h	Mon Oct 12 22:28:28 2009 -0400
+++ b/usr/src/head/unistd.h	Mon Oct 12 20:17:24 2009 -0700
@@ -878,16 +878,9 @@
 
 #endif /* __STDC__ */
 
-/*
- * This atrocity is necessary on sparc because registers modified
- * by the child get propagated back to the parent via the window
- * save/restore mechanism.
- */
-#if !defined(__XOPEN_OR_POSIX) || defined(__EXTENSIONS__)
-#if defined(__sparc)
+#if !defined(__XOPEN_OR_POSIX) || defined(_XPG4_2) || defined(__EXTENSIONS__)
 #pragma unknown_control_flow(vfork)
-#endif
-#endif /* !defined(__XOPEN_OR_POSIX) || defined(__EXTENSIONS__) */
+#endif /* !defined(__XOPEN_OR_POSIX) || defined(_XPG4_2)... */
 
 /*
  * getlogin_r() & ttyname_r() prototypes are defined here.
--- a/usr/src/uts/common/sys/fork.h	Mon Oct 12 22:28:28 2009 -0400
+++ b/usr/src/uts/common/sys/fork.h	Mon Oct 12 20:17:24 2009 -0700
@@ -20,15 +20,13 @@
  */
 
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
 #ifndef _SYS_FORK_H
 #define	_SYS_FORK_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/types.h>
 
 #ifdef	__cplusplus
@@ -43,9 +41,7 @@
 extern pid_t forkallx(int);
 extern pid_t vforkx(int);
 
-#if defined(__sparc)
 #pragma unknown_control_flow(vforkx)
-#endif
 
 #endif	/* !defined(_KERNEL) */