From 75323087aea91719bbb4f766bc6298d0618f0163 Mon Sep 17 00:00:00 2001 From: JustOff Date: Sat, 9 Jun 2018 15:09:22 +0300 Subject: Update NSPR to 4.19 --- nsprpub/TAG-INFO | 1 + nsprpub/config/.cvsignore | 11 +++++++++++ nsprpub/configure | 2 +- nsprpub/configure.in | 2 +- nsprpub/lib/.cvsignore | 1 + nsprpub/lib/ds/.cvsignore | 2 ++ nsprpub/lib/libc/.cvsignore | 1 + nsprpub/lib/libc/include/.cvsignore | 1 + nsprpub/lib/libc/src/.cvsignore | 2 ++ nsprpub/lib/prstreams/.cvsignore | 1 + nsprpub/lib/prstreams/tests/testprstrm/.cvsignore | 1 + nsprpub/lib/tests/.cvsignore | 1 + nsprpub/pr/.cvsignore | 1 + nsprpub/pr/include/.cvsignore | 1 + nsprpub/pr/include/md/.cvsignore | 1 + nsprpub/pr/include/obsolete/.cvsignore | 1 + nsprpub/pr/include/prinit.h | 4 ++-- nsprpub/pr/include/private/.cvsignore | 1 + nsprpub/pr/src/.cvsignore | 2 ++ nsprpub/pr/src/bthreads/.cvsignore | 1 + nsprpub/pr/src/cplus/.cvsignore | 1 + nsprpub/pr/src/cplus/tests/.cvsignore | 1 + nsprpub/pr/src/io/.cvsignore | 1 + nsprpub/pr/src/linking/.cvsignore | 1 + nsprpub/pr/src/malloc/.cvsignore | 1 + nsprpub/pr/src/md/.cvsignore | 1 + nsprpub/pr/src/md/beos/.cvsignore | 1 + nsprpub/pr/src/md/os2/.cvsignore | 1 + nsprpub/pr/src/md/unix/.cvsignore | 1 + nsprpub/pr/src/md/unix/unix.c | 19 +++++++++++++++---- nsprpub/pr/src/md/windows/.cvsignore | 1 + nsprpub/pr/src/memory/.cvsignore | 1 + nsprpub/pr/src/misc/.cvsignore | 1 + nsprpub/pr/src/pthreads/.cvsignore | 1 + nsprpub/pr/src/pthreads/ptthread.c | 16 ++++++++++++++++ nsprpub/pr/src/threads/.cvsignore | 1 + nsprpub/pr/src/threads/combined/.cvsignore | 1 + nsprpub/pr/tests/.cvsignore | 1 + nsprpub/pr/tests/dll/.cvsignore | 1 + nsprpub/pr/tests/prfz.c | 1 + nsprpub/pr/tests/vercheck.c | 6 +++--- nsprpub/tools/.cvsignore | 1 + 42 files changed, 87 insertions(+), 11 deletions(-) create mode 100644 nsprpub/TAG-INFO create mode 100644 nsprpub/config/.cvsignore create mode 100644 nsprpub/lib/.cvsignore create mode 100644 nsprpub/lib/ds/.cvsignore create mode 100644 nsprpub/lib/libc/.cvsignore create mode 100644 nsprpub/lib/libc/include/.cvsignore create mode 100644 nsprpub/lib/libc/src/.cvsignore create mode 100644 nsprpub/lib/prstreams/.cvsignore create mode 100644 nsprpub/lib/prstreams/tests/testprstrm/.cvsignore create mode 100644 nsprpub/lib/tests/.cvsignore create mode 100644 nsprpub/pr/.cvsignore create mode 100644 nsprpub/pr/include/.cvsignore create mode 100644 nsprpub/pr/include/md/.cvsignore create mode 100644 nsprpub/pr/include/obsolete/.cvsignore create mode 100644 nsprpub/pr/include/private/.cvsignore create mode 100644 nsprpub/pr/src/.cvsignore create mode 100644 nsprpub/pr/src/bthreads/.cvsignore create mode 100644 nsprpub/pr/src/cplus/.cvsignore create mode 100644 nsprpub/pr/src/cplus/tests/.cvsignore create mode 100644 nsprpub/pr/src/io/.cvsignore create mode 100644 nsprpub/pr/src/linking/.cvsignore create mode 100644 nsprpub/pr/src/malloc/.cvsignore create mode 100644 nsprpub/pr/src/md/.cvsignore create mode 100644 nsprpub/pr/src/md/beos/.cvsignore create mode 100644 nsprpub/pr/src/md/os2/.cvsignore create mode 100644 nsprpub/pr/src/md/unix/.cvsignore create mode 100644 nsprpub/pr/src/md/windows/.cvsignore create mode 100644 nsprpub/pr/src/memory/.cvsignore create mode 100644 nsprpub/pr/src/misc/.cvsignore create mode 100644 nsprpub/pr/src/pthreads/.cvsignore create mode 100644 nsprpub/pr/src/threads/.cvsignore create mode 100644 nsprpub/pr/src/threads/combined/.cvsignore create mode 100644 nsprpub/pr/tests/.cvsignore create mode 100644 nsprpub/pr/tests/dll/.cvsignore create mode 100644 nsprpub/tools/.cvsignore (limited to 'nsprpub') diff --git a/nsprpub/TAG-INFO b/nsprpub/TAG-INFO new file mode 100644 index 000000000..ed713edea --- /dev/null +++ b/nsprpub/TAG-INFO @@ -0,0 +1 @@ +NSPR_4_19_RTM diff --git a/nsprpub/config/.cvsignore b/nsprpub/config/.cvsignore new file mode 100644 index 000000000..bb3ee4bcc --- /dev/null +++ b/nsprpub/config/.cvsignore @@ -0,0 +1,11 @@ +nfspwd +revdepth +my_config.mk +my_overrides.mk +autoconf.mk +nsprincl.mk +nsprincl.sh +now +Makefile +nsinstall +nspr-config diff --git a/nsprpub/configure b/nsprpub/configure index 19e9fa60f..619d193ae 100755 --- a/nsprpub/configure +++ b/nsprpub/configure @@ -2488,7 +2488,7 @@ test -n "$target_alias" && program_prefix=${target_alias}- MOD_MAJOR_VERSION=4 -MOD_MINOR_VERSION=18 +MOD_MINOR_VERSION=19 MOD_PATCH_VERSION=0 NSPR_MODNAME=nspr20 _HAVE_PTHREADS= diff --git a/nsprpub/configure.in b/nsprpub/configure.in index 7b0b8b395..ea0ae7f8e 100644 --- a/nsprpub/configure.in +++ b/nsprpub/configure.in @@ -15,7 +15,7 @@ dnl ======================================================== dnl = Defaults dnl ======================================================== MOD_MAJOR_VERSION=4 -MOD_MINOR_VERSION=18 +MOD_MINOR_VERSION=19 MOD_PATCH_VERSION=0 NSPR_MODNAME=nspr20 _HAVE_PTHREADS= diff --git a/nsprpub/lib/.cvsignore b/nsprpub/lib/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/nsprpub/lib/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/nsprpub/lib/ds/.cvsignore b/nsprpub/lib/ds/.cvsignore new file mode 100644 index 000000000..bcab60f5a --- /dev/null +++ b/nsprpub/lib/ds/.cvsignore @@ -0,0 +1,2 @@ +Makefile +_pl_bld.h diff --git a/nsprpub/lib/libc/.cvsignore b/nsprpub/lib/libc/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/nsprpub/lib/libc/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/nsprpub/lib/libc/include/.cvsignore b/nsprpub/lib/libc/include/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/nsprpub/lib/libc/include/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/nsprpub/lib/libc/src/.cvsignore b/nsprpub/lib/libc/src/.cvsignore new file mode 100644 index 000000000..bcab60f5a --- /dev/null +++ b/nsprpub/lib/libc/src/.cvsignore @@ -0,0 +1,2 @@ +Makefile +_pl_bld.h diff --git a/nsprpub/lib/prstreams/.cvsignore b/nsprpub/lib/prstreams/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/nsprpub/lib/prstreams/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/nsprpub/lib/prstreams/tests/testprstrm/.cvsignore b/nsprpub/lib/prstreams/tests/testprstrm/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/nsprpub/lib/prstreams/tests/testprstrm/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/nsprpub/lib/tests/.cvsignore b/nsprpub/lib/tests/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/nsprpub/lib/tests/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/nsprpub/pr/.cvsignore b/nsprpub/pr/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/nsprpub/pr/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/nsprpub/pr/include/.cvsignore b/nsprpub/pr/include/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/nsprpub/pr/include/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/nsprpub/pr/include/md/.cvsignore b/nsprpub/pr/include/md/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/nsprpub/pr/include/md/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/nsprpub/pr/include/obsolete/.cvsignore b/nsprpub/pr/include/obsolete/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/nsprpub/pr/include/obsolete/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/nsprpub/pr/include/prinit.h b/nsprpub/pr/include/prinit.h index c55788923..ab3aba208 100644 --- a/nsprpub/pr/include/prinit.h +++ b/nsprpub/pr/include/prinit.h @@ -31,9 +31,9 @@ PR_BEGIN_EXTERN_C ** The format of the version string is ** ".[.] []" */ -#define PR_VERSION "4.18" +#define PR_VERSION "4.19" #define PR_VMAJOR 4 -#define PR_VMINOR 18 +#define PR_VMINOR 19 #define PR_VPATCH 0 #define PR_BETA PR_FALSE diff --git a/nsprpub/pr/include/private/.cvsignore b/nsprpub/pr/include/private/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/nsprpub/pr/include/private/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/nsprpub/pr/src/.cvsignore b/nsprpub/pr/src/.cvsignore new file mode 100644 index 000000000..41a1bd2b7 --- /dev/null +++ b/nsprpub/pr/src/.cvsignore @@ -0,0 +1,2 @@ +Makefile +_pr_bld.h diff --git a/nsprpub/pr/src/bthreads/.cvsignore b/nsprpub/pr/src/bthreads/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/nsprpub/pr/src/bthreads/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/nsprpub/pr/src/cplus/.cvsignore b/nsprpub/pr/src/cplus/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/nsprpub/pr/src/cplus/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/nsprpub/pr/src/cplus/tests/.cvsignore b/nsprpub/pr/src/cplus/tests/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/nsprpub/pr/src/cplus/tests/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/nsprpub/pr/src/io/.cvsignore b/nsprpub/pr/src/io/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/nsprpub/pr/src/io/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/nsprpub/pr/src/linking/.cvsignore b/nsprpub/pr/src/linking/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/nsprpub/pr/src/linking/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/nsprpub/pr/src/malloc/.cvsignore b/nsprpub/pr/src/malloc/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/nsprpub/pr/src/malloc/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/nsprpub/pr/src/md/.cvsignore b/nsprpub/pr/src/md/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/nsprpub/pr/src/md/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/nsprpub/pr/src/md/beos/.cvsignore b/nsprpub/pr/src/md/beos/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/nsprpub/pr/src/md/beos/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/nsprpub/pr/src/md/os2/.cvsignore b/nsprpub/pr/src/md/os2/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/nsprpub/pr/src/md/os2/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/nsprpub/pr/src/md/unix/.cvsignore b/nsprpub/pr/src/md/unix/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/nsprpub/pr/src/md/unix/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/nsprpub/pr/src/md/unix/unix.c b/nsprpub/pr/src/md/unix/unix.c index 29e24e574..7c90b5075 100644 --- a/nsprpub/pr/src/md/unix/unix.c +++ b/nsprpub/pr/src/md/unix/unix.c @@ -2713,8 +2713,13 @@ static void* _MD_Unix_mmap64( } /* _MD_Unix_mmap64 */ #endif /* defined(_PR_NO_LARGE_FILES) || defined(SOLARIS2_5) */ -/* Android <= 19 doesn't have mmap64. */ -#if defined(ANDROID) && __ANDROID_API__ <= 19 +/* NDK non-unified headers for API < 21 don't have mmap64. However, + * NDK unified headers do provide mmap64 for all API versions when building + * with clang. Therefore, we should provide mmap64 here for API < 21 if we're + * not using clang or if we're using non-unified headers. We check for + * non-unified headers by the lack of __ANDROID_API_L__ macro. */ +#if defined(ANDROID) && __ANDROID_API__ < 21 && \ + (!defined(__clang__) || !defined(__ANDROID_API_L__)) PR_IMPORT(void) *__mmap2(void *, size_t, int, int, int, size_t); #define ANDROID_PAGE_SIZE 4096 @@ -2784,9 +2789,9 @@ static void _PR_InitIOV(void) _md_iovector._stat64 = stat; _md_iovector._lseek64 = _MD_Unix_lseek64; #elif defined(_PR_HAVE_OFF64_T) -#if defined(IRIX5_3) || defined(ANDROID) +#if defined(IRIX5_3) || (defined(ANDROID) && __ANDROID_API__ < 21) /* - * Android doesn't have open64. We pass the O_LARGEFILE flag to open + * Android < 21 doesn't have open64. We pass the O_LARGEFILE flag to open * in _MD_open. */ _md_iovector._open64 = open; @@ -2794,8 +2799,14 @@ static void _PR_InitIOV(void) _md_iovector._open64 = open64; #endif _md_iovector._mmap64 = mmap64; +#if (defined(ANDROID) && __ANDROID_API__ < 21) + /* Same as the open64 case for Android. */ + _md_iovector._fstat64 = fstat; + _md_iovector._stat64 = stat; +#else _md_iovector._fstat64 = fstat64; _md_iovector._stat64 = stat64; +#endif _md_iovector._lseek64 = lseek64; #elif defined(_PR_HAVE_LARGE_OFF_T) _md_iovector._open64 = open; diff --git a/nsprpub/pr/src/md/windows/.cvsignore b/nsprpub/pr/src/md/windows/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/nsprpub/pr/src/md/windows/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/nsprpub/pr/src/memory/.cvsignore b/nsprpub/pr/src/memory/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/nsprpub/pr/src/memory/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/nsprpub/pr/src/misc/.cvsignore b/nsprpub/pr/src/misc/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/nsprpub/pr/src/misc/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/nsprpub/pr/src/pthreads/.cvsignore b/nsprpub/pr/src/pthreads/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/nsprpub/pr/src/pthreads/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/nsprpub/pr/src/pthreads/ptthread.c b/nsprpub/pr/src/pthreads/ptthread.c index 6046d5d8d..e61a4cbde 100644 --- a/nsprpub/pr/src/pthreads/ptthread.c +++ b/nsprpub/pr/src/pthreads/ptthread.c @@ -978,7 +978,23 @@ void _PR_InitThreads( * GCC supports the constructor and destructor attributes as of * version 2.5. */ +#if defined(DARWIN) +/* + * The dynamic linker on OSX doesn't execute __attribute__((destructor)) + * destructors in the right order wrt non-__attribute((destructor)) destructors + * in other libraries. So use atexit() instead, which does. + * See https://bugzilla.mozilla.org/show_bug.cgi?id=1399746#c99 + */ +static void _PR_Fini(void); + +__attribute__ ((constructor)) +static void _register_PR_Fini() { + atexit(_PR_Fini); +} +#else static void _PR_Fini(void) __attribute__ ((destructor)); +#endif + #elif defined(__SUNPRO_C) /* * Sun Studio compiler diff --git a/nsprpub/pr/src/threads/.cvsignore b/nsprpub/pr/src/threads/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/nsprpub/pr/src/threads/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/nsprpub/pr/src/threads/combined/.cvsignore b/nsprpub/pr/src/threads/combined/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/nsprpub/pr/src/threads/combined/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/nsprpub/pr/tests/.cvsignore b/nsprpub/pr/tests/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/nsprpub/pr/tests/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/nsprpub/pr/tests/dll/.cvsignore b/nsprpub/pr/tests/dll/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/nsprpub/pr/tests/dll/.cvsignore @@ -0,0 +1 @@ +Makefile diff --git a/nsprpub/pr/tests/prfz.c b/nsprpub/pr/tests/prfz.c index 0c5a4324f..7179dbecd 100644 --- a/nsprpub/pr/tests/prfz.c +++ b/nsprpub/pr/tests/prfz.c @@ -10,6 +10,7 @@ #include #include #include +#include int main(int argc, char **argv) diff --git a/nsprpub/pr/tests/vercheck.c b/nsprpub/pr/tests/vercheck.c index da2f7b1de..43b0abc4b 100644 --- a/nsprpub/pr/tests/vercheck.c +++ b/nsprpub/pr/tests/vercheck.c @@ -40,7 +40,7 @@ static char *compatible_version[] = { "4.10", "4.10.1", "4.10.2", "4.10.3", "4.10.4", "4.10.5", "4.10.6", "4.10.7", "4.10.8", "4.10.9", "4.10.10", "4.11", "4.12", "4.13", "4.14", "4.15", - "4.16", "4.17", + "4.16", "4.17", "4.18", PR_VERSION }; @@ -56,8 +56,8 @@ static char *incompatible_version[] = { "3.0", "3.0.1", "3.1", "3.1.1", "3.1.2", "3.1.3", "3.5", "3.5.1", - "4.18.1", - "4.19", "4.19.1", + "4.19.1", + "4.20", "4.20.1", "10.0", "11.1", "12.14.20" }; diff --git a/nsprpub/tools/.cvsignore b/nsprpub/tools/.cvsignore new file mode 100644 index 000000000..f3c7a7c5d --- /dev/null +++ b/nsprpub/tools/.cvsignore @@ -0,0 +1 @@ +Makefile -- cgit v1.2.3