diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | elf/tst-stackguard1.c | 1 | ||||
| -rw-r--r-- | include/errno.h | 4 | ||||
| -rw-r--r-- | include/netdb.h | 22 | ||||
| -rw-r--r-- | nptl/ChangeLog | 8 | ||||
| -rw-r--r-- | nptl/tst-cancel14.c | 1 | ||||
| -rw-r--r-- | nptl/tst-cancel15.c | 1 | ||||
| -rw-r--r-- | nptl/tst-mutex9.c | 3 | ||||
| -rw-r--r-- | nptl/tst-stackguard1.c | 1 |
10 files changed, 38 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog index 74b9a59f64..0c19491bdd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2013-02-04 Andreas Schwab <schwab@suse.de> + + [BZ #14142] + * include/errno.h: Redefine errno only if !NOT_IN_libc || IN_LIB. + * include/netdb.h: Likewise for h_errno. + * elf/tst-stackguard1.c: Include <tls.h>. + 2013-02-02 Jan Kratochvil <jan.kratochvil@redhat.com> * elf/link.h (struct link_map): Extend the l_addr comment. diff --git a/NEWS b/NEWS index 8c2179057b..b5c465d51f 100644 --- a/NEWS +++ b/NEWS @@ -9,8 +9,8 @@ Version 2.18 * The following bugs are resolved with this release: - 13951, 14200, 14317, 14327, 14496, 14964, 14981, 14982, 14985, 14994, - 14996, 15003, 15020, 15023, 15036, 15062. + 13951, 14142, 14200, 14317, 14327, 14496, 14964, 14981, 14982, 14985, + 14994, 14996, 15003, 15020, 15023, 15036, 15062. Version 2.17 diff --git a/elf/tst-stackguard1.c b/elf/tst-stackguard1.c index 2b4fd9a780..fba60bdc90 100644 --- a/elf/tst-stackguard1.c +++ b/elf/tst-stackguard1.c @@ -23,6 +23,7 @@ #include <string.h> #include <sys/wait.h> #include <stackguard-macros.h> +#include <tls.h> #include <unistd.h> static const char *command; diff --git a/include/errno.h b/include/errno.h index 98c6080528..f1b93a881b 100644 --- a/include/errno.h +++ b/include/errno.h @@ -17,7 +17,7 @@ # define errno rtld_errno extern int rtld_errno attribute_hidden; -# else +# elif !defined NOT_IN_libc || defined IN_LIB # include <tls.h> @@ -29,7 +29,7 @@ extern int rtld_errno attribute_hidden; # endif extern __thread int errno attribute_tls_model_ie; -# endif /* RTLD_PRIVATE_ERRNO */ +# endif /* !NOT_IN_libc || IN_LIB */ # define __set_errno(val) (errno = (val)) diff --git a/include/netdb.h b/include/netdb.h index 3f2ae06451..8a569baef3 100644 --- a/include/netdb.h +++ b/include/netdb.h @@ -3,18 +3,20 @@ #ifndef _ISOMAC /* Macros for accessing h_errno from inside libc. */ -# undef h_errno -# ifdef _LIBC_REENTRANT -# include <tls.h> -# ifndef NOT_IN_libc -# define h_errno __libc_h_errno -# else -# define h_errno h_errno /* For #ifndef h_errno tests. */ -# endif +# if !defined NOT_IN_libc || defined IN_LIB +# undef h_errno +# ifdef _LIBC_REENTRANT +# include <tls.h> +# ifndef NOT_IN_libc +# define h_errno __libc_h_errno +# else +# define h_errno h_errno /* For #ifndef h_errno tests. */ +# endif extern __thread int h_errno attribute_tls_model_ie; -# else +# else extern int h_errno; -# endif /* _LIBC_REENTRANT */ +# endif /* _LIBC_REENTRANT */ +# endif /* !NOT_IN_libc || IN_LIB */ # define __set_h_errno(x) (h_errno = (x)) libc_hidden_proto (hstrerror) diff --git a/nptl/ChangeLog b/nptl/ChangeLog index c4f6c630cc..bcc1660b4d 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,11 @@ +2013-02-04 Andreas Schwab <schwab@suse.de> + + [BZ #14142] + * tst-cancel14.c: Include <sys/time.h>. + * tst-cancel15.c: Likewise. + * tst-mutex9.c: Include <stdint.h>, <stdlib.h> and <sys/time.h>. + * tst-stackguard1.c: Include <tls.h> + 2013-01-16 Andreas Schwab <schwab@suse.de> [BZ #14327] diff --git a/nptl/tst-cancel14.c b/nptl/tst-cancel14.c index fbaed4940f..ca9042d60a 100644 --- a/nptl/tst-cancel14.c +++ b/nptl/tst-cancel14.c @@ -23,6 +23,7 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> +#include <sys/time.h> static pthread_barrier_t bar; diff --git a/nptl/tst-cancel15.c b/nptl/tst-cancel15.c index 0119cc761f..3f320ad00d 100644 --- a/nptl/tst-cancel15.c +++ b/nptl/tst-cancel15.c @@ -23,6 +23,7 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> +#include <sys/time.h> static pthread_barrier_t bar; diff --git a/nptl/tst-mutex9.c b/nptl/tst-mutex9.c index adb3b61f09..1d689bd7e4 100644 --- a/nptl/tst-mutex9.c +++ b/nptl/tst-mutex9.c @@ -18,10 +18,13 @@ #include <errno.h> #include <pthread.h> +#include <stdint.h> #include <stdio.h> +#include <stdlib.h> #include <string.h> #include <unistd.h> #include <sys/mman.h> +#include <sys/time.h> #include <sys/wait.h> diff --git a/nptl/tst-stackguard1.c b/nptl/tst-stackguard1.c index f0f707f43a..57a48ad292 100644 --- a/nptl/tst-stackguard1.c +++ b/nptl/tst-stackguard1.c @@ -24,6 +24,7 @@ #include <string.h> #include <sys/wait.h> #include <stackguard-macros.h> +#include <tls.h> #include <unistd.h> static const char *command; |