This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch zack/testsuite-isomac updated. glibc-2.25-75-g73c2dc5
- From: zack at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 27 Feb 2017 14:41:37 -0000
- Subject: GNU C Library master sources branch zack/testsuite-isomac updated. glibc-2.25-75-g73c2dc5
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, zack/testsuite-isomac has been updated
via 73c2dc508a64bb0628e68e6919a8acbba98f851f (commit)
from 3e90b1e0a778032e9e6791cc5a07afc5107c3a71 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=73c2dc508a64bb0628e68e6919a8acbba98f851f
commit 73c2dc508a64bb0628e68e6919a8acbba98f851f
Author: Zack Weinberg <zackw@panix.com>
Date: Mon Feb 27 09:40:56 2017 -0500
_ISOMAC-in-testsuite fixes.
* dlfcn/tst-dladdr.c: Don't include ldsodefs.h. Don't use
DL_LOOKUP_ADDRESS.
* nss/tst-cancel-getpwuid_r.c: Include nss.h.
* sysdeps/powerpc/tst-set_ppr.c: Don't include dl-procinfo.h.
* dlfcn/Makefile: Move tst-dladdr back to tests.
* nss/Makefile: Move tst-cancel-getpwuid_r back to tests.
* libio/libio.h: Condition dummy definition of _IO_lock_t on
_IO_lock_t_defined, not _IO_MTSAFE_IO. Move macro definitions
conditioned on _IO_MTSAFE_IO ...
* include/libio.h: ... here.
* stdlib/tst-strtod.c, stdlib/tst-strtod1i.c:
Convert to support/test-driver.c.
* stdlib/tst-strtod5.c, stdlib/tst-strtod5i.c: Likewise.
Add copyright notice.
* sysdeps/generic/stdio-lock.h, sysdeps/nptl/stdio-lock.h:
Define _IO_lock_t_defined after defining _IO_lock_t.
diff --git a/dlfcn/Makefile b/dlfcn/Makefile
index 8e4f9d1..94f511d 100644
--- a/dlfcn/Makefile
+++ b/dlfcn/Makefile
@@ -34,10 +34,9 @@ libdl-shared-only-routines := dlopenold dlfcn
endif
ifeq (yes,$(build-shared))
-tests = glrefmain failtest default errmsg1 tstcxaatexit \
+tests = glrefmain failtest tst-dladdr default errmsg1 tstcxaatexit \
bug-dlopen1 bug-dlsym1 tst-dlinfo bug-atexit1 bug-atexit2 \
bug-atexit3 tstatexit bug-dl-leaf tst-rec-dlopen
-tests-internal = tst-dladdr
endif
modules-names = glreflib1 glreflib2 glreflib3 failtestmod defaultmod1 \
defaultmod2 errmsg1mod modatexit modcxaatexit \
diff --git a/dlfcn/tst-dladdr.c b/dlfcn/tst-dladdr.c
index 3610123..b53fe36 100644
--- a/dlfcn/tst-dladdr.c
+++ b/dlfcn/tst-dladdr.c
@@ -24,8 +24,6 @@
#include <stdlib.h>
#include <string.h>
-#include <ldsodefs.h>
-
#define TEST_FUNCTION do_test ()
extern int do_test (void);
@@ -53,8 +51,6 @@ do_test (void)
if (ret == 0)
error (EXIT_FAILURE, 0, "dladdr failed");
- printf ("address of ref1 = %lx\n",
- (unsigned long int) DL_LOOKUP_ADDRESS (sym));
printf ("ret = %d\n", ret);
printf ("info.dli_fname = %p (\"%s\")\n", info.dli_fname, info.dli_fname);
printf ("info.dli_fbase = %p\n", info.dli_fbase);
diff --git a/include/libio.h b/include/libio.h
index 97fc5b5..53321b6 100644
--- a/include/libio.h
+++ b/include/libio.h
@@ -21,16 +21,27 @@ libc_hidden_proto (_IO_sgetn)
libc_hidden_proto (_IO_vfprintf)
libc_hidden_proto (_IO_vfscanf)
-#if defined _IO_MTSAFE_IO && _IO_lock_inexpensive
-# undef _IO_flockfile
-# define _IO_flockfile(_fp) \
- if (((_fp)->_flags & _IO_USER_LOCK) == 0) \
- _IO_lock_lock (*(_fp)->_lock)
-# undef _IO_funlockfile
-# define _IO_funlockfile(_fp) \
- if (((_fp)->_flags & _IO_USER_LOCK) == 0) \
- _IO_lock_unlock (*(_fp)->_lock)
-#endif
+#ifdef _IO_MTSAFE_IO
+# define _IO_peekc(_fp) _IO_peekc_locked (_fp)
+# if _IO_lock_inexpensive
+# define _IO_flockfile(_fp) \
+ if (((_fp)->_flags & _IO_USER_LOCK) == 0) _IO_lock_lock (*(_fp)->_lock)
+# define _IO_funlockfile(_fp) \
+ if (((_fp)->_flags & _IO_USER_LOCK) == 0) _IO_lock_unlock (*(_fp)->_lock)
+# else
+# define _IO_flockfile(_fp) \
+ if (((_fp)->_flags & _IO_USER_LOCK) == 0) _IO_flockfile (_fp)
+# define _IO_funlockfile(_fp) \
+ if (((_fp)->_flags & _IO_USER_LOCK) == 0) _IO_funlockfile (_fp)
+# endif
+#else
+# define _IO_peekc(_fp) _IO_peekc_unlocked (_fp)
+# define _IO_flockfile(_fp) /**/
+# define _IO_funlockfile(_fp) /**/
+# define _IO_ftrylockfile(_fp) /**/
+# define _IO_cleanup_region_start(_fct, _fp) /**/
+# define _IO_cleanup_region_end(_Doit) /**/
+#endif /* !_IO_MTSAFE_IO */
#endif
#endif
diff --git a/include/stdio.h b/include/stdio.h
index 6c84dff..ad0d0f0 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -1,8 +1,5 @@
#ifndef _STDIO_H
-# if defined _ISOMAC
-# undef _IO_MTSAFE_IO
-# include <libio/stdio.h>
-# elif defined __need_FILE || defined __need___FILE
+# if defined _ISOMAC || defined __need_FILE || defined __need___FILE
# include <libio/stdio.h>
# else
# include <libio/stdio.h>
diff --git a/libio/libio.h b/libio/libio.h
index 2241c14..4fa9d74 100644
--- a/libio/libio.h
+++ b/libio/libio.h
@@ -143,10 +143,9 @@
struct _IO_jump_t; struct _IO_FILE;
-/* Handle lock. */
-#ifdef _IO_MTSAFE_IO
-/* _IO_lock_t defined in internal headers during the glibc build. */
-#else
+/* During the build of glibc itself, _IO_lock_t will already have been
+ defined by internal headers. */
+#ifndef _IO_lock_t_defined
typedef void _IO_lock_t;
#endif
@@ -441,21 +440,6 @@ extern void _IO_flockfile (_IO_FILE *) __THROW;
extern void _IO_funlockfile (_IO_FILE *) __THROW;
extern int _IO_ftrylockfile (_IO_FILE *) __THROW;
-#ifdef _IO_MTSAFE_IO
-# define _IO_peekc(_fp) _IO_peekc_locked (_fp)
-# define _IO_flockfile(_fp) \
- if (((_fp)->_flags & _IO_USER_LOCK) == 0) _IO_flockfile (_fp)
-# define _IO_funlockfile(_fp) \
- if (((_fp)->_flags & _IO_USER_LOCK) == 0) _IO_funlockfile (_fp)
-#else
-# define _IO_peekc(_fp) _IO_peekc_unlocked (_fp)
-# define _IO_flockfile(_fp) /**/
-# define _IO_funlockfile(_fp) /**/
-# define _IO_ftrylockfile(_fp) /**/
-# define _IO_cleanup_region_start(_fct, _fp) /**/
-# define _IO_cleanup_region_end(_Doit) /**/
-#endif /* !_IO_MTSAFE_IO */
-
extern int _IO_vfscanf (_IO_FILE * __restrict, const char * __restrict,
_IO_va_list, int *__restrict);
extern int _IO_vfprintf (_IO_FILE *__restrict, const char *__restrict,
diff --git a/nss/Makefile b/nss/Makefile
index 6d165f2..691c0c1 100644
--- a/nss/Makefile
+++ b/nss/Makefile
@@ -57,7 +57,7 @@ xtests = bug-erange
# If we have a thread library then we can test cancellation against
# some routines like getpwuid_r.
ifeq (yes,$(have-thread-library))
-tests-internal += tst-cancel-getpwuid_r
+tests += tst-cancel-getpwuid_r
endif
# Specify rules for the nss_* modules. We have some services.
diff --git a/nss/tst-cancel-getpwuid_r.c b/nss/tst-cancel-getpwuid_r.c
index d4fbb86..53de829 100644
--- a/nss/tst-cancel-getpwuid_r.c
+++ b/nss/tst-cancel-getpwuid_r.c
@@ -35,6 +35,7 @@
#include <stdlib.h>
#include <pthread.h>
#include <pwd.h>
+#include <nss.h>
#include <sys/types.h>
#include <unistd.h>
#include <semaphore.h>
diff --git a/stdlib/tst-strtod.c b/stdlib/tst-strtod.c
index e0f096c..aa7e3ae 100644
--- a/stdlib/tst-strtod.c
+++ b/stdlib/tst-strtod.c
@@ -214,6 +214,4 @@ long_dbl (void)
return 0;
}
-
-#define TEST_FUNCTION do_test ()
-#include "../test-skeleton.c"
+#include <support/test-driver.c>
diff --git a/stdlib/tst-strtod1i.c b/stdlib/tst-strtod1i.c
index 5c2ba99..d8a952f 100644
--- a/stdlib/tst-strtod1i.c
+++ b/stdlib/tst-strtod1i.c
@@ -80,5 +80,4 @@ do_test (void)
return result ? EXIT_FAILURE : EXIT_SUCCESS;
}
-#define TEST_FUNCTION do_test ()
-#include "../test-skeleton.c"
+#include <support/test-driver.c>
diff --git a/stdlib/tst-strtod5.c b/stdlib/tst-strtod5.c
index 691759e..d53b17c 100644
--- a/stdlib/tst-strtod5.c
+++ b/stdlib/tst-strtod5.c
@@ -1,3 +1,20 @@
+/* Copyright (C) 2007-2017 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
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
+
#include <locale.h>
#include <stdio.h>
#include <stdlib.h>
@@ -68,5 +85,4 @@ do_test (void)
return status;
}
-#define TEST_FUNCTION do_test ()
-#include "../test-skeleton.c"
+#include <support/test-driver.c>
diff --git a/stdlib/tst-strtod5i.c b/stdlib/tst-strtod5i.c
index 92ed983..e9489c1 100644
--- a/stdlib/tst-strtod5i.c
+++ b/stdlib/tst-strtod5i.c
@@ -1,3 +1,20 @@
+/* Copyright (C) 2007-2017 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
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
+
#include <locale.h>
#include <stdio.h>
#include <stdlib.h>
@@ -79,5 +96,4 @@ do_test (void)
return status;
}
-#define TEST_FUNCTION do_test ()
-#include "../test-skeleton.c"
+#include <support/test-driver.c>
diff --git a/sysdeps/generic/stdio-lock.h b/sysdeps/generic/stdio-lock.h
index 532bb5f..763c7d4 100644
--- a/sysdeps/generic/stdio-lock.h
+++ b/sysdeps/generic/stdio-lock.h
@@ -22,6 +22,7 @@
#include <libc-lock.h>
__libc_lock_define_recursive (typedef, _IO_lock_t)
+#define _IO_lock_t_defined 1
/* We need recursive (counting) mutexes. */
#ifdef _LIBC_LOCK_RECURSIVE_INITIALIZER
diff --git a/sysdeps/nptl/stdio-lock.h b/sysdeps/nptl/stdio-lock.h
index 35d6ce0..df74906 100644
--- a/sysdeps/nptl/stdio-lock.h
+++ b/sysdeps/nptl/stdio-lock.h
@@ -27,6 +27,7 @@
#define _IO_lock_inexpensive 1
typedef struct { int lock; int cnt; void *owner; } _IO_lock_t;
+#define _IO_lock_t_defined 1
#define _IO_lock_initializer { LLL_LOCK_INITIALIZER, 0, NULL }
diff --git a/sysdeps/powerpc/tst-set_ppr.c b/sysdeps/powerpc/tst-set_ppr.c
index 77901b5..df8dda7 100644
--- a/sysdeps/powerpc/tst-set_ppr.c
+++ b/sysdeps/powerpc/tst-set_ppr.c
@@ -16,7 +16,6 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include <dl-procinfo.h>
#include <inttypes.h>
#include <stdio.h>
#include <stdint.h>
-----------------------------------------------------------------------
Summary of changes:
dlfcn/Makefile | 3 +--
dlfcn/tst-dladdr.c | 4 ----
include/libio.h | 31 +++++++++++++++++++++----------
include/stdio.h | 5 +----
libio/libio.h | 22 +++-------------------
nss/Makefile | 2 +-
nss/tst-cancel-getpwuid_r.c | 1 +
stdlib/tst-strtod.c | 4 +---
stdlib/tst-strtod1i.c | 3 +--
stdlib/tst-strtod5.c | 20 ++++++++++++++++++--
stdlib/tst-strtod5i.c | 20 ++++++++++++++++++--
sysdeps/generic/stdio-lock.h | 1 +
sysdeps/nptl/stdio-lock.h | 1 +
sysdeps/powerpc/tst-set_ppr.c | 1 -
14 files changed, 68 insertions(+), 50 deletions(-)
hooks/post-receive
--
GNU C Library master sources