Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

Commit 7e03f32

Browse files
nerli1nerli1
committed
Backed out 2 changesets (bug 1526010, bug 1520646) mass mochitest failures UPGRADE_NSPR_RELEASE CLOSED TREE
Backed out changeset 5b4cd1f37414 (bug 1520646) Backed out changeset c7041aff5ad7 (bug 1526010) --HG-- extra : amend_source : 8c92a1c912acbe67ce77861c0e6fedc5e127be05
1 parent 1c82c01 commit 7e03f32

15 files changed

Lines changed: 55 additions & 32 deletions

File tree

‎config/external/nspr/pr/moz.build‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,6 @@ LOCAL_INCLUDES += [
110110
]
111111

112112
SOURCES += [
113-
'/nsprpub/pr/src/io/prpolevt.c', # conflicting definition of PRFilePrivate
114-
]
115-
116-
UNIFIED_SOURCES += [
117113
'/nsprpub/pr/src/io/prfdcach.c',
118114
'/nsprpub/pr/src/io/priometh.c',
119115
'/nsprpub/pr/src/io/pripv6.c',
@@ -122,6 +118,7 @@ UNIFIED_SOURCES += [
122118
'/nsprpub/pr/src/io/prmapopt.c',
123119
'/nsprpub/pr/src/io/prmmap.c',
124120
'/nsprpub/pr/src/io/prmwait.c',
121+
'/nsprpub/pr/src/io/prpolevt.c',
125122
'/nsprpub/pr/src/io/prprf.c',
126123
'/nsprpub/pr/src/io/prscanf.c',
127124
'/nsprpub/pr/src/io/prstdio.c',
@@ -161,7 +158,7 @@ UNIFIED_SOURCES += [
161158

162159
if CONFIG['OS_TARGET'] != 'WINNT':
163160
DEFINES['_PR_PTHREADS'] = True
164-
UNIFIED_SOURCES += [
161+
SOURCES += [
165162
'/nsprpub/pr/src/md/unix/unix.c',
166163
'/nsprpub/pr/src/md/unix/unix_errors.c',
167164
'/nsprpub/pr/src/md/unix/uxproces.c',
@@ -175,16 +172,12 @@ if CONFIG['OS_TARGET'] != 'WINNT':
175172
]
176173
else:
177174
SOURCES += [
178-
# ntinrval.c needs windows.h without WIN32_LEAN_AND_MEAN, so it can't be
179-
# unified after any file that pulled in windows.h in lean-and-mean mode.
180-
'/nsprpub/pr/src/md/windows/ntinrval.c',
181-
]
182-
UNIFIED_SOURCES += [
183175
'/nsprpub/pr/src/io/prdir.c',
184176
'/nsprpub/pr/src/io/prfile.c',
185177
'/nsprpub/pr/src/io/prio.c',
186178
'/nsprpub/pr/src/io/prsocket.c',
187179
'/nsprpub/pr/src/md/windows/ntgc.c',
180+
'/nsprpub/pr/src/md/windows/ntinrval.c',
188181
'/nsprpub/pr/src/md/windows/ntmisc.c',
189182
'/nsprpub/pr/src/md/windows/ntsec.c',
190183
'/nsprpub/pr/src/md/windows/ntsem.c',

‎nsprpub/TAG-INFO‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
753fe0f7964c
1+
NSPR_4_20_RTM

‎nsprpub/config/prdepend.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@
1010
*/
1111

1212
#error "Do not include this header file."
13+

‎nsprpub/configure‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -783,6 +783,7 @@ with_android_ndk
783783
with_android_toolchain
784784
with_android_version
785785
with_android_platform
786+
with_gonk
786787
with_dist_prefix
787788
with_dist_bindir
788789
with_dist_includedir
@@ -872,7 +873,6 @@ datadir='${datarootdir}'
872873
sysconfdir='${prefix}/etc'
873874
sharedstatedir='${prefix}/com'
874875
localstatedir='${prefix}/var'
875-
876876
includedir='${prefix}/include'
877877
oldincludedir='/usr/include'
878878
docdir='${datarootdir}/doc/${PACKAGE}'
@@ -1484,6 +1484,7 @@ Optional Packages:
14841484
Android platform version, default 5 for arm, 9 for x86/mips
14851485
--with-android-platform=DIR
14861486
location of platform dir
1487+
--with-gonk=DIR location of gonk dir
14871488
--with-dist-prefix=DIST_PREFIX
14881489
place build files in DIST_PREFIX dist
14891490
--with-dist-bindir=DIR build execuatables in DIR DIST_PREFIX/bin
@@ -2487,7 +2488,7 @@ test -n "$target_alias" &&
24872488
program_prefix=${target_alias}-
24882489
24892490
MOD_MAJOR_VERSION=4
2490-
MOD_MINOR_VERSION=21
2491+
MOD_MINOR_VERSION=20
24912492
MOD_PATCH_VERSION=0
24922493
NSPR_MODNAME=nspr20
24932494
_HAVE_PTHREADS=
@@ -2655,6 +2656,19 @@ mipsel-*android*)
26552656
;;
26562657
esac
26572658
2659+
2660+
2661+
# Check whether --with-gonk was given.
2662+
if test "${with_gonk+set}" = set; then :
2663+
withval=$with_gonk; gonkdir=$withval
2664+
fi
2665+
2666+
2667+
if test -n "$gonkdir" ; then
2668+
2669+
$as_echo "#define ANDROID 1" >>confdefs.h
2670+
2671+
else
26582672
case "$target" in
26592673
*-android*|*-linuxandroid*)
26602674
if test -z "$android_ndk" ; then
@@ -2740,6 +2754,7 @@ $as_echo "$android_platform" >&6; }
27402754
27412755
;;
27422756
esac
2757+
fi
27432758
27442759
dist_prefix='${MOD_DEPTH}/dist'
27452760
dist_bindir='${dist_prefix}/bin'

‎nsprpub/configure.in‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ dnl ========================================================
1515
dnl = Defaults
1616
dnl ========================================================
1717
MOD_MAJOR_VERSION=4
18-
MOD_MINOR_VERSION=21
18+
MOD_MINOR_VERSION=20
1919
MOD_PATCH_VERSION=0
2020
NSPR_MODNAME=nspr20
2121
_HAVE_PTHREADS=
@@ -147,6 +147,21 @@ mipsel-*android*)
147147
;;
148148
esac
149149

150+
dnl ========================================================
151+
dnl = Gonk is a fork of Android used for Mozilla's B2G project.
152+
dnl = Configuration is done largely by the top level config
153+
dnl = and the specified gonk directory doesn't matter here.
154+
dnl ========================================================
155+
156+
AC_ARG_WITH(gonk,
157+
[ --with-gonk=DIR location of gonk dir],
158+
gonkdir=$withval)
159+
160+
if test -n "$gonkdir" ; then
161+
dnl Most things are directly configured by env vars when building for gonk
162+
163+
AC_DEFINE(ANDROID)
164+
else
150165
case "$target" in
151166
*-android*|*-linuxandroid*)
152167
if test -z "$android_ndk" ; then
@@ -231,6 +246,7 @@ case "$target" in
231246
AC_DEFINE(ANDROID)
232247
;;
233248
esac
249+
fi
234250

235251
dnl ========================================================
236252
dnl =

‎nsprpub/lib/ds/plvrsion.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ PRVersionDescription VERSION_DESC_NAME =
5454
/* filename */ _PRODUCTION, /* the produced library name */
5555
/* description */ "Portable runtime", /* what we are */
5656
/* security */ "N/A", /* not applicable here */
57-
/* copywrite */ "This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/.",
57+
/* copywrite */ "Copyright (c) 1998 Netscape Communications Corporation. All Rights Reserved",
5858
/* comment */ "http://www.mozilla.org/MPL/",
5959
/* specialString */ ""
6060
};

‎nsprpub/lib/libc/src/plvrsion.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ PRVersionDescription VERSION_DESC_NAME =
5454
/* filename */ _PRODUCTION, /* the produced library name */
5555
/* description */ "Portable runtime", /* what we are */
5656
/* security */ "N/A", /* not applicable here */
57-
/* copywrite */ "This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/.",
57+
/* copywrite */ "Copyright (c) 1998 Netscape Communications Corporation. All Rights Reserved",
5858
/* comment */ "http://www.mozilla.org/MPL/",
5959
/* specialString */ ""
6060
};

‎nsprpub/lib/prstreams/plvrsion.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ PRVersionDescription VERSION_DESC_NAME =
5454
/* filename */ _PRODUCTION, /* the produced library name */
5555
/* description */ "Portable runtime", /* what we are */
5656
/* security */ "N/A", /* not applicable here */
57-
/* copywrite */ "This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/.",
57+
/* copywrite */ "Copyright (c) 1998 Netscape Communications Corporation. All Rights Reserved",
5858
/* comment */ "http://www.mozilla.org/MPL/",
5959
/* specialString */ ""
6060
};

‎nsprpub/pr/include/md/_win32_errors.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ extern void _MD_win32_map_accept_error(PRInt32 err);
8383
extern void _MD_win32_map_acceptex_error(PRInt32 err);
8484
#define _PR_MD_MAP_ACCEPTEX_ERROR _MD_win32_map_acceptex_error
8585

86-
extern void _MD_win32_map_connect_error(PRInt32 err);
86+
extern PRInt32 _MD_win32_map_connect_error(PRInt32 err);
8787
#define _PR_MD_MAP_CONNECT_ERROR _MD_win32_map_connect_error
8888

8989
extern void _MD_win32_map_bind_error(PRInt32 err);

‎nsprpub/pr/include/prbit.h‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ PR_BEGIN_EXTERN_C
1414
** functions.
1515
*/
1616
#if defined(_WIN32) && (_MSC_VER >= 1300) && \
17-
(defined(_M_IX86) || defined(_M_X64) || defined(_M_ARM) || \
18-
defined(_M_ARM64))
17+
(defined(_M_IX86) || defined(_M_AMD64) || defined(_M_ARM))
1918
# include <intrin.h>
2019
# pragma intrinsic(_BitScanForward,_BitScanReverse)
2120
__forceinline static int __prBitScanForward32(unsigned int val)
@@ -34,8 +33,7 @@ PR_BEGIN_EXTERN_C
3433
# define pr_bitscan_clz32(val) __prBitScanReverse32(val)
3534
# define PR_HAVE_BUILTIN_BITSCAN32
3635
#elif ((__GNUC__ >= 4) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)) && \
37-
(defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
38-
defined(__aarch64__))
36+
(defined(__i386__) || defined(__x86_64__) || defined(__arm__))
3937
# define pr_bitscan_ctz32(val) __builtin_ctz(val)
4038
# define pr_bitscan_clz32(val) __builtin_clz(val)
4139
# define PR_HAVE_BUILTIN_BITSCAN32
@@ -138,7 +136,7 @@ NSPR_API(PRIntn) PR_FloorLog2(PRUint32 i);
138136
*/
139137

140138
#if defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_AMD64) || \
141-
defined(_M_X64) || defined(_M_ARM) || defined(_M_ARM64))
139+
defined(_M_X64) || defined(_M_ARM))
142140
#include <stdlib.h>
143141
#pragma intrinsic(_rotl, _rotr)
144142
#define PR_ROTATE_LEFT32(a, bits) _rotl(a, bits)

0 commit comments

Comments
 (0)