[commits] r3597 - in /fsf/trunk/ports: ./ sysdeps/hppa/nptl/ sysdeps/unix/sysv/linux/hppa/bits/ sysdeps/unix/sysv/linux/hppa/nptl/

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Tue Sep 25 00:04:17 2007
New Revision: 3597

Log:
Import glibc-ports-mainline for 2007-09-25

Modified:
    fsf/trunk/ports/ChangeLog.hppa
    fsf/trunk/ports/sysdeps/hppa/nptl/tls.h
    fsf/trunk/ports/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h
    fsf/trunk/ports/sysdeps/unix/sysv/linux/hppa/nptl/sysdep-cancel.h

Modified: fsf/trunk/ports/ChangeLog.hppa
==============================================================================
--- fsf/trunk/ports/ChangeLog.hppa (original)
+++ fsf/trunk/ports/ChangeLog.hppa Tue Sep 25 00:04:17 2007
@@ -1,3 +1,13 @@
+2007-09-24  Carlos O'Donell  <carlos@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/hppa/nptl/tls.h: Fix comment.
+	* sysdeps/unix/sysv/linux/hppa/bits/fcntl.h: Fix comment format.
+	[__USE_GNU] (O_CLOEXEC): Define.
+	* sysdeps/unix/sysv/linux/hppa/nptl/sysdep-cancel.h: Issue error
+	if the library is unsupported.
+	[ASSEMBLER && IS_IN_librt]: Define CENABLE, CDISABLE, and
+	__local_multiple_threads.
+
 2007-08-03  Aurelien Jarno  <aurelien@xxxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/hppa/linuxthreads/sysdep-cancel.h:

Modified: fsf/trunk/ports/sysdeps/hppa/nptl/tls.h
==============================================================================
--- fsf/trunk/ports/sysdeps/hppa/nptl/tls.h (original)
+++ fsf/trunk/ports/sysdeps/hppa/nptl/tls.h Tue Sep 25 00:04:17 2007
@@ -170,6 +170,6 @@
 #define THREAD_GSCOPE_WAIT() \
   GL(dl_wait_lookup_done) ()
 
-#endif /* __ASSEMBLER__ */
+#endif /* !__ASSEMBLER__ */
 
 #endif	/* tls.h */

Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h Tue Sep 25 00:04:17 2007
@@ -46,10 +46,11 @@
 
 
 #ifdef __USE_GNU
-# define O_DIRECT	00040000 /* Direct disk access. */
-# define O_DIRECTORY	00010000 /* Must be a directory. */
-# define O_NOFOLLOW	00000200 /* Do not follow links. */
-# define O_NOATIME	04000000 /* Do not set atime. */
+# define O_DIRECT	000040000 /* Direct disk access.  */
+# define O_DIRECTORY	000010000 /* Must be a directory.  */
+# define O_NOFOLLOW	000000200 /* Do not follow links.  */
+# define O_NOATIME	004000000 /* Do not set atime.  */
+# define O_CLOEXEC	010000000 /* Set close_on_exec.  */
 #endif
 
 #ifdef __USE_LARGEFILE64

Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/hppa/nptl/sysdep-cancel.h
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/hppa/nptl/sysdep-cancel.h (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/hppa/nptl/sysdep-cancel.h Tue Sep 25 00:04:17 2007
@@ -173,7 +173,7 @@
 #   define CDISABLE	.import __libc_disable_asynccancel,code ASM_LINE_SEP \
 			bl __libc_disable_asynccancel,%r2 ASM_LINE_SEP
 #  endif
-# else
+# elif defined IS_IN_librt
 #  ifdef PIC
 #   define CENABLE .import __librt_enable_asynccancel,code ASM_LINE_SEP \
 			bl __librt_enable_asynccancel,%r2 ASM_LINE_SEP
@@ -185,14 +185,18 @@
 #   define CDISABLE .import __librt_disable_asynccancel,code ASM_LINE_SEP \
 			bl __librt_disable_asynccancel,%r2 ASM_LINE_SEP
 #  endif
+# else
+#  error Unsupported library
 # endif
 
 # ifdef IS_IN_libpthread
 #  define __local_multiple_threads __pthread_multiple_threads
 # elif !defined NOT_IN_libc
 #  define __local_multiple_threads __libc_multiple_threads
+# elif IS_IN_librt
+#  define __local_multiple_threads __librt_multiple_threads
 # else
-#  define __local_multiple_threads __librt_multiple_threads
+#  error Unsupported library
 # endif
 
 # ifndef __ASSEMBLER__