From cd1530839c0847f8060dd15f57c6419fba9f45a3 Mon Sep 17 00:00:00 2001 From: Carlos O'Donell Date: Mon, 24 Sep 2007 18:28:33 +0000 Subject: [PATCH] 2007-09-24 Carlos O'Donell * 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. --- ChangeLog.hppa | 10 ++++++++++ sysdeps/hppa/nptl/tls.h | 2 +- sysdeps/unix/sysv/linux/hppa/bits/fcntl.h | 9 +++++---- sysdeps/unix/sysv/linux/hppa/nptl/sysdep-cancel.h | 8 ++++++-- 4 files changed, 22 insertions(+), 7 deletions(-) diff --git a/ChangeLog.hppa b/ChangeLog.hppa index 7bb3387..9501c49 100644 --- a/ChangeLog.hppa +++ b/ChangeLog.hppa @@ -1,3 +1,13 @@ +2007-09-24 Carlos O'Donell + + * 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 * sysdeps/unix/sysv/linux/hppa/linuxthreads/sysdep-cancel.h: diff --git a/sysdeps/hppa/nptl/tls.h b/sysdeps/hppa/nptl/tls.h index d2d725e..2810d71 100644 --- a/sysdeps/hppa/nptl/tls.h +++ b/sysdeps/hppa/nptl/tls.h @@ -170,6 +170,6 @@ static inline void __set_cr27(struct pthread *cr27) #define THREAD_GSCOPE_WAIT() \ GL(dl_wait_lookup_done) () -#endif /* __ASSEMBLER__ */ +#endif /* !__ASSEMBLER__ */ #endif /* tls.h */ diff --git a/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h b/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h index 328df54..1bf6bcb 100644 --- a/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h +++ b/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h @@ -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 diff --git a/sysdeps/unix/sysv/linux/hppa/nptl/sysdep-cancel.h b/sysdeps/unix/sysv/linux/hppa/nptl/sysdep-cancel.h index 375f732..6cffa76 100644 --- a/sysdeps/unix/sysv/linux/hppa/nptl/sysdep-cancel.h +++ b/sysdeps/unix/sysv/linux/hppa/nptl/sysdep-cancel.h @@ -173,7 +173,7 @@ L(pre_end): ASM_LINE_SEP \ # 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 @@ L(pre_end): ASM_LINE_SEP \ # 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 -# else +# elif IS_IN_librt # define __local_multiple_threads __librt_multiple_threads +# else +# error Unsupported library # endif # ifndef __ASSEMBLER__ -- 2.7.4