diff options
author | Jakub Jelinek <jakub@redhat.com> | 2005-01-06 14:57:16 +0000 |
---|---|---|
committer | Jakub Jelinek <jakub@redhat.com> | 2005-01-06 14:57:16 +0000 |
commit | 0ecfa2580d1aedb744deb5af1b60f92c69b9e9e0 (patch) | |
tree | 1ef0d0dc09dba23037800d5f3794a77d9b45554f /sysdeps/unix | |
parent | e4f5d077e9190f57abd49684bd7afcf4325bd348 (diff) |
Updated to fedora-glibc-20050106T1443
Diffstat (limited to 'sysdeps/unix')
-rw-r--r-- | sysdeps/unix/alarm.c | 7 | ||||
-rw-r--r-- | sysdeps/unix/mips/rt-sysdep.S | 1 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/bits/waitflags.h | 4 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/i386/clone.S | 2 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/init-first.c | 40 |
5 files changed, 23 insertions, 31 deletions
diff --git a/sysdeps/unix/alarm.c b/sysdeps/unix/alarm.c index ae77782c54..84ab5a52fe 100644 --- a/sysdeps/unix/alarm.c +++ b/sysdeps/unix/alarm.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991,92,94,97,2002 Free Software Foundation, Inc. +/* Copyright (C) 1991,1992,1994,1997,2002,2004 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -41,7 +41,10 @@ alarm (seconds) return 0; retval = old.it_value.tv_sec; - if (old.it_value.tv_usec) + /* Round to the nearest second, but never report zero seconds when + the alarm is still set. */ + if (old.it_value.tv_usec >= 500000 + || (retval == 0 && old.it_value.tv_usec > 0)) ++retval; return retval; } diff --git a/sysdeps/unix/mips/rt-sysdep.S b/sysdeps/unix/mips/rt-sysdep.S new file mode 100644 index 0000000000..f966bf1e59 --- /dev/null +++ b/sysdeps/unix/mips/rt-sysdep.S @@ -0,0 +1 @@ +#include <sysdep.S> diff --git a/sysdeps/unix/sysv/linux/bits/waitflags.h b/sysdeps/unix/sysv/linux/bits/waitflags.h index e3f80f6814..464cedb1fc 100644 --- a/sysdeps/unix/sysv/linux/bits/waitflags.h +++ b/sysdeps/unix/sysv/linux/bits/waitflags.h @@ -1,5 +1,5 @@ /* Definitions of flag bits for `waitpid' et al. - Copyright (C) 1992, 1996, 1997, 2000, 2004 Free Software Foundation, Inc. + Copyright (C) 1992,1996,1997,2000,2004,2005 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -32,5 +32,7 @@ #define WCONTINUED 8 /* Report continued child. */ #define WNOWAIT 0x01000000 /* Don't reap, just poll status. */ +#define __WNOTHREAD 0x20000000 /* Don't wait on children of other threads + in this group */ #define __WALL 0x40000000 /* Wait for any child. */ #define __WCLONE 0x80000000 /* Wait for cloned process. */ diff --git a/sysdeps/unix/sysv/linux/i386/clone.S b/sysdeps/unix/sysv/linux/i386/clone.S index acd43dfb0b..c7d31f7a32 100644 --- a/sysdeps/unix/sysv/linux/i386/clone.S +++ b/sysdeps/unix/sysv/linux/i386/clone.S @@ -67,7 +67,7 @@ ENTRY (BP_SYM (__clone)) /* Insert the argument onto the new stack. Make sure the new thread is started with an alignment of (mod 16). */ andl $0xfffffff0, %ecx - subl $24,%ecx + subl $28,%ecx movl ARG(%esp),%eax /* no negative argument counts */ movl %eax,12(%ecx) diff --git a/sysdeps/unix/sysv/linux/init-first.c b/sysdeps/unix/sysv/linux/init-first.c index f00271255d..7f0b963cb7 100644 --- a/sysdeps/unix/sysv/linux/init-first.c +++ b/sysdeps/unix/sysv/linux/init-first.c @@ -1,5 +1,5 @@ /* Initialization code run first thing by the ELF startup code. Linux version. - Copyright (C) 1995-1999,2000,01,02,03,2004 Free Software Foundation, Inc. + Copyright (C) 1995-2004, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -29,9 +29,6 @@ #include <ldsodefs.h> -/* The function is called from assembly stubs the compiler can't see. */ -static void init (int, char **, char **) __attribute__ ((used)); - /* Set nonzero if we have to be prepared for more then one libc being used in the process. Safe assumption if initializer never runs. */ int __libc_multiple_libcs attribute_hidden = 1; @@ -42,9 +39,19 @@ int __libc_argc attribute_hidden; char **__libc_argv attribute_hidden; -static void -init (int argc, char **argv, char **envp) +void +attribute_hidden +__libc_init_first (int argc, char **argv, char **envp) +{ +#ifdef SHARED + /* For DSOs we do not need __libc_init_first but instead _init. */ +} + +void +attribute_hidden +_init (int argc, char **argv, char **envp) { +#endif #ifdef USE_NONOPTION_FLAGS extern void __getopt_clean_environment (char **); #endif @@ -88,27 +95,6 @@ init (int argc, char **argv, char **envp) #endif } -#ifdef SHARED - -strong_alias (init, _init); - -extern void __libc_init_first (void); - -void -__libc_init_first (void) -{ -} - -#else -extern void __libc_init_first (int argc, char **argv, char **envp); - -void -__libc_init_first (int argc, char **argv, char **envp) -{ - init (argc, argv, envp); -} -#endif - /* This function is defined here so that if this file ever gets into ld.so we will get a link error. Having this file silently included |