Commit 08beb188 authored by Wan-Teh Chang's avatar Wan-Teh Chang
Browse files

Bug 575620: Update NSPR to NSPR_4_8_6_BETA1. This includes patches 

for bugs 559133, 564851, 415563, 575620, 575534,570332.
parent 089948b7

nsprpub/TAG-INFO

0 → 100644
+1 −0
Original line number Diff line number Diff line 
NSPR_4_8_6_BETA1

nsprpub/admin/repackage.sh

+4 −4
Original line number Diff line number Diff line
@@ -64,10 +64,10 @@ 
# 

# ------------------------------------------------------------------



FROMTOP=/share/builds/components/nspr20/v4.8.5

TOTOP=./v4.8.5

NSPRDIR=nspr-4.8.5

SOURCETAG=NSPR_4_8_5_RTM

FROMTOP=/share/builds/components/nspr20/v4.8.6

TOTOP=./v4.8.6

NSPRDIR=nspr-4.8.6

SOURCETAG=NSPR_4_8_6_RTM



#

# enumerate Unix object directories on /s/b/c

nsprpub/config/prdepend.h

+0 −1
Original line number Diff line number Diff line
@@ -42,4 +42,3 @@ 
 */



#error "Do not include this header file."

nsprpub/configure

+28 −29
Original line number Diff line number Diff line
@@ -712,7 +712,7 @@ test "$host_alias" != "$target_alias" && 


MOD_MAJOR_VERSION=4

MOD_MINOR_VERSION=8

MOD_PATCH_VERSION=5

MOD_PATCH_VERSION=6

NSPR_MODNAME=nspr20

_HAVE_PTHREADS=

USE_PTHREADS=
@@ -2786,7 +2786,7 @@ echo "$ac_t""$result" 1>&6 


if test $result = "yes"; then

   PROFILE_GEN_LDFLAGS="-fprofile-generate"

   PROFILE_USE_CFLAGS="-fprofile-use -fprofile-correction -Wcoverage-mismatch -freoder-blocks-and-partition"

   PROFILE_USE_CFLAGS="-fprofile-use -fprofile-correction -Wcoverage-mismatch -freorder-blocks-and-partition"

   PROFILE_USE_LDFLAGS="-fprofile-use"

fi
@@ -4214,23 +4214,22 @@ EOF 


        # Determine compiler version

        

        _MSVC_VER_FILTER='s|.* ([0-9]+\.[0-9]+\.[0-9]+(\.[0-9]+)?).*|\1|p'

        _MSVC_VER_FILTER='s|.* \([0-9]\+\.[0-9]\+\.[0-9]\+\(\.[0-9]\+\)\?\).*|\1|p'

        



        CC_VERSION=`"${CC}" -v 2>&1 | sed -nre "$_MSVC_VER_FILTER"`

        CC_VERSION=`"${CC}" -v 2>&1 | sed -ne "$_MSVC_VER_FILTER"`

        _CC_MAJOR_VERSION=`echo ${CC_VERSION} | awk -F\. '{ print $1 }'`

        _CC_MINOR_VERSION=`echo ${CC_VERSION} | awk -F\. '{ print $2 }'`

        _CC_RELEASE=`echo ${CC_VERSION} | awk -F\. '{ print $3 }'`

        _CC_BUILD=`echo ${CC_VERSION} | awk -F\. '{ print $4 }'`

        MSC_VER=${_CC_MAJOR_VERSION}${_CC_MINOR_VERSION}



        if test "$_CC_MAJOR_VERSION" = "14"; then

        if test "$_CC_MAJOR_VERSION" -eq "14"; then

                                            if test $_CC_RELEASE -gt 50727; then

              _USE_DYNAMICBASE=1

           elif test $_CC_BUILD -ge 762; then

              _USE_DYNAMICBASE=1

           fi

        elif test $_CC_MAJOR_VERSION -gt 15; then

        elif test $_CC_MAJOR_VERSION -ge 15; then

           _USE_DYNAMICBASE=1    

        fi
@@ -4709,17 +4708,17 @@ EOF 
        _OPTIMIZE_FLAGS="$_OPTIMIZE_FLAGS -Olimit 4000"

        ac_safe=`echo "machine/builtins.h" | sed 'y%./+-%__p_%'`

echo $ac_n "checking for machine/builtins.h""... $ac_c" 1>&6

echo "configure:4713: checking for machine/builtins.h" >&5

echo "configure:4712: checking for machine/builtins.h" >&5

if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then

  echo $ac_n "(cached) $ac_c" 1>&6

else

  cat > conftest.$ac_ext <<EOF

#line 4718 "configure"

#line 4717 "configure"

#include "confdefs.h"

#include <machine/builtins.h>

EOF

ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

{ (eval echo configure:4723: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

{ (eval echo configure:4722: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`

if test -z "$ac_err"; then

  rm -rf conftest*
@@ -5368,7 +5367,7 @@ case $target in 
    ;;

*)

    echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6

echo "configure:5372: checking for dlopen in -ldl" >&5

echo "configure:5371: checking for dlopen in -ldl" >&5

ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`

if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then

  echo $ac_n "(cached) $ac_c" 1>&6
@@ -5376,7 +5375,7 @@ else 
  ac_save_LIBS="$LIBS"

LIBS="-ldl  $LIBS"

cat > conftest.$ac_ext <<EOF

#line 5380 "configure"

#line 5379 "configure"

#include "confdefs.h"

/* Override any gcc2 internal prototype to avoid an error.  */

/* We use char because int might match the return type of a gcc2
@@ -5387,7 +5386,7 @@ int main() { 
dlopen()

; return 0; }

EOF

if { (eval echo configure:5391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

if { (eval echo configure:5390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

  rm -rf conftest*

  eval "ac_cv_lib_$ac_lib_var=yes"

else
@@ -5404,17 +5403,17 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then 
  echo "$ac_t""yes" 1>&6

  ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`

echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6

echo "configure:5408: checking for dlfcn.h" >&5

echo "configure:5407: checking for dlfcn.h" >&5

if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then

  echo $ac_n "(cached) $ac_c" 1>&6

else

  cat > conftest.$ac_ext <<EOF

#line 5413 "configure"

#line 5412 "configure"

#include "confdefs.h"

#include <dlfcn.h>

EOF

ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

{ (eval echo configure:5418: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

{ (eval echo configure:5417: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`

if test -z "$ac_err"; then

  rm -rf conftest*
@@ -5447,13 +5446,13 @@ esac 


if test $ac_cv_prog_gcc = yes; then

    echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6

echo "configure:5451: checking whether ${CC-cc} needs -traditional" >&5

echo "configure:5450: checking whether ${CC-cc} needs -traditional" >&5

if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then

  echo $ac_n "(cached) $ac_c" 1>&6

else

    ac_pattern="Autoconf.*'x'"

  cat > conftest.$ac_ext <<EOF

#line 5457 "configure"

#line 5456 "configure"

#include "confdefs.h"

#include <sgtty.h>

Autoconf TIOCGETP
@@ -5471,7 +5470,7 @@ rm -f conftest* 


  if test $ac_cv_prog_gcc_traditional = no; then

    cat > conftest.$ac_ext <<EOF

#line 5475 "configure"

#line 5474 "configure"

#include "confdefs.h"

#include <termio.h>

Autoconf TCGETA
@@ -5495,12 +5494,12 @@ fi 
for ac_func in lchown strerror

do

echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

echo "configure:5499: checking for $ac_func" >&5

echo "configure:5498: checking for $ac_func" >&5

if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then

  echo $ac_n "(cached) $ac_c" 1>&6

else

  cat > conftest.$ac_ext <<EOF

#line 5504 "configure"

#line 5503 "configure"

#include "confdefs.h"

/* System header to define __stub macros and hopefully few prototypes,

    which can conflict with char $ac_func(); below.  */
@@ -5523,7 +5522,7 @@ $ac_func(); 


; return 0; }

EOF

if { (eval echo configure:5527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

if { (eval echo configure:5526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

  rm -rf conftest*

  eval "ac_cv_func_$ac_func=yes"

else
@@ -5564,7 +5563,7 @@ hpux*) 
if test -z "$GNU_CC"; then



    echo $ac_n "checking for +Olit support""... $ac_c" 1>&6

echo "configure:5568: checking for +Olit support" >&5

echo "configure:5567: checking for +Olit support" >&5

if eval "test \"`echo '$''{'ac_cv_hpux_usable_olit_option'+set}'`\" = set"; then

  echo $ac_n "(cached) $ac_c" 1>&6

else
@@ -5606,7 +5605,7 @@ wince*) 
*)

    

echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6

echo "configure:5610: checking for pthread_create in -lpthreads" >&5

echo "configure:5609: checking for pthread_create in -lpthreads" >&5

echo "

    #include <pthread.h> 

    void *foo(void *v) { return v; }
@@ -5628,7 +5627,7 @@ echo " 
        echo "$ac_t""no" 1>&6

        

echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6

echo "configure:5632: checking for pthread_create in -lpthread" >&5

echo "configure:5631: checking for pthread_create in -lpthread" >&5

echo "

    #include <pthread.h> 

    void *foo(void *v) { return v; }
@@ -5650,7 +5649,7 @@ echo " 
        echo "$ac_t""no" 1>&6

        

echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6

echo "configure:5654: checking for pthread_create in -lc_r" >&5

echo "configure:5653: checking for pthread_create in -lc_r" >&5

echo "

    #include <pthread.h> 

    void *foo(void *v) { return v; }
@@ -5672,7 +5671,7 @@ echo " 
        echo "$ac_t""no" 1>&6

        

echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6

echo "configure:5676: checking for pthread_create in -lc" >&5

echo "configure:5675: checking for pthread_create in -lc" >&5

echo "

    #include <pthread.h> 

    void *foo(void *v) { return v; }
@@ -5804,7 +5803,7 @@ if test -n "$USE_PTHREADS"; then 
      rm -f conftest*

   ac_cv_have_dash_pthread=no

   echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6

echo "configure:5808: checking whether ${CC-cc} accepts -pthread" >&5

echo "configure:5807: checking whether ${CC-cc} accepts -pthread" >&5

   echo 'int main() { return 0; }' | cat > conftest.c

   ${CC-cc} -pthread -o conftest conftest.c > conftest.out 2>&1

   if test $? -eq 0; then
@@ -5827,7 +5826,7 @@ echo "configure:5808: checking whether ${CC-cc} accepts -pthread" >&5 
			    ac_cv_have_dash_pthreads=no

    if test "$ac_cv_have_dash_pthread" = "no"; then

	    echo $ac_n "checking whether ${CC-cc} accepts -pthreads""... $ac_c" 1>&6

echo "configure:5831: checking whether ${CC-cc} accepts -pthreads" >&5

echo "configure:5830: checking whether ${CC-cc} accepts -pthreads" >&5

    	echo 'int main() { return 0; }' | cat > conftest.c

	    ${CC-cc} -pthreads -o conftest conftest.c > conftest.out 2>&1

    	if test $? -eq 0; then

nsprpub/configure.in

+6 −7
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ dnl = Defaults 
dnl ========================================================

MOD_MAJOR_VERSION=4

MOD_MINOR_VERSION=8

MOD_PATCH_VERSION=5

MOD_PATCH_VERSION=6

NSPR_MODNAME=nspr20

_HAVE_PTHREADS=

USE_PTHREADS=
@@ -659,7 +659,7 @@ AC_MSG_RESULT([$result]) 


if test $result = "yes"; then

   PROFILE_GEN_LDFLAGS="-fprofile-generate"

   PROFILE_USE_CFLAGS="-fprofile-use -fprofile-correction -Wcoverage-mismatch -freoder-blocks-and-partition"

   PROFILE_USE_CFLAGS="-fprofile-use -fprofile-correction -Wcoverage-mismatch -freorder-blocks-and-partition"

   PROFILE_USE_LDFLAGS="-fprofile-use"

fi
@@ -1678,17 +1678,16 @@ arm-android-eabi) 


        # Determine compiler version

        changequote(,)

        _MSVC_VER_FILTER='s|.* ([0-9]+\.[0-9]+\.[0-9]+(\.[0-9]+)?).*|\1|p'

        _MSVC_VER_FILTER='s|.* \([0-9]\+\.[0-9]\+\.[0-9]\+\(\.[0-9]\+\)\?\).*|\1|p'

        changequote([,])



        CC_VERSION=`"${CC}" -v 2>&1 | sed -nre "$_MSVC_VER_FILTER"`

        CC_VERSION=`"${CC}" -v 2>&1 | sed -ne "$_MSVC_VER_FILTER"`

        _CC_MAJOR_VERSION=`echo ${CC_VERSION} | awk -F\. '{ print $1 }'`

        _CC_MINOR_VERSION=`echo ${CC_VERSION} | awk -F\. '{ print $2 }'`

        _CC_RELEASE=`echo ${CC_VERSION} | awk -F\. '{ print $3 }'`

        _CC_BUILD=`echo ${CC_VERSION} | awk -F\. '{ print $4 }'`

        MSC_VER=${_CC_MAJOR_VERSION}${_CC_MINOR_VERSION}



        if test "$_CC_MAJOR_VERSION" = "14"; then

        if test "$_CC_MAJOR_VERSION" -eq "14"; then

           dnl -DYNAMICBASE is only supported on VC8SP1 or newer,

           dnl so be very specific here!

           dnl VC8 is 14.00.50727.42, VC8SP1 is 14.00.50727.762
@@ -1697,7 +1696,7 @@ arm-android-eabi) 
           elif test $_CC_BUILD -ge 762; then

              _USE_DYNAMICBASE=1

           fi

        elif test $_CC_MAJOR_VERSION -gt 15; then

        elif test $_CC_MAJOR_VERSION -ge 15; then

           _USE_DYNAMICBASE=1    

        fi