Commit 31a0c824 authored by Wan-Teh Chang's avatar Wan-Teh Chang
Browse files

Bug 673382: Update NSPR to NSPR_4_8_9_BETA4, which includes the fixes for 

Bug 665978, Bug 655058, Bug 645459, Bug 661596, Bug 673223, Bug 673224,
Bug 654436, Bug 663970.
parent 2f7cc3ff

nsprpub/TAG-INFO

+1 −1
Original line number Diff line number Diff line 
NSPR_4_8_9_BETA3
 
NSPR_4_8_9_BETA4

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/config/rules.mk

+8 −0
Original line number Diff line number Diff line
@@ -378,6 +378,14 @@ endif # MOZ_PROFILE_USE 


################################################################################



ifdef MOZ_PROFILE_GENERATE

# Clean up profiling data during PROFILE_GENERATE phase

export::

	-$(RM) *.pgd *.gcda

endif



################################################################################



ifeq ($(OS_ARCH),WINNT)

$(RES): $(RESNAME)

	@$(MAKE_OBJDIR)

nsprpub/configure

+27 −25
Original line number Diff line number Diff line
@@ -2822,7 +2822,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 -freorder-blocks-and-partition"

   PROFILE_USE_CFLAGS="-fprofile-use -fprofile-correction -Wcoverage-mismatch"

   PROFILE_USE_LDFLAGS="-fprofile-use"

fi
@@ -3778,7 +3778,6 @@ EOF 
        i*86*)

            if test -n "$USE_64"; then

                CPU_ARCH=x86_64

                CC="$CC -arch x86_64"

            else        

                CPU_ARCH=i386

            fi
@@ -3787,6 +3786,9 @@ EOF 
            CPU_ARCH=ppc

            ;;

    esac

    if test "`echo $CC | grep -c '\-arch '`" = "0"; then

        CC="$CC -arch $CPU_ARCH"

    fi

    DSO_CFLAGS=-fPIC

    DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @executable_path/$@ -headerpad_max_install_names'

    _OPTIMIZE_FLAGS=-O2
@@ -4940,17 +4942,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:4944: checking for machine/builtins.h" >&5

echo "configure:4946: 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 4949 "configure"

#line 4951 "configure"

#include "confdefs.h"

#include <machine/builtins.h>

EOF

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

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

{ (eval echo configure:4956: \"$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*
@@ -5599,7 +5601,7 @@ case $target in 
    ;;

*)

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

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

echo "configure:5605: 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
@@ -5607,7 +5609,7 @@ else 
  ac_save_LIBS="$LIBS"

LIBS="-ldl  $LIBS"

cat > conftest.$ac_ext <<EOF

#line 5611 "configure"

#line 5613 "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
@@ -5618,7 +5620,7 @@ int main() { 
dlopen()

; return 0; }

EOF

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

if { (eval echo configure:5624: \"$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
@@ -5635,17 +5637,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:5639: checking for dlfcn.h" >&5

echo "configure:5641: 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 5644 "configure"

#line 5646 "configure"

#include "confdefs.h"

#include <dlfcn.h>

EOF

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

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

{ (eval echo configure:5651: \"$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*
@@ -5678,13 +5680,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:5682: checking whether ${CC-cc} needs -traditional" >&5

echo "configure:5684: 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 5688 "configure"

#line 5690 "configure"

#include "confdefs.h"

#include <sgtty.h>

Autoconf TIOCGETP
@@ -5702,7 +5704,7 @@ rm -f conftest* 


  if test $ac_cv_prog_gcc_traditional = no; then

    cat > conftest.$ac_ext <<EOF

#line 5706 "configure"

#line 5708 "configure"

#include "confdefs.h"

#include <termio.h>

Autoconf TCGETA
@@ -5726,12 +5728,12 @@ fi 
for ac_func in lchown strerror

do

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

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

echo "configure:5732: 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 5735 "configure"

#line 5737 "configure"

#include "confdefs.h"

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

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


; return 0; }

EOF

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

if { (eval echo configure:5760: \"$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
@@ -5805,7 +5807,7 @@ do 
# Extract the first word of "$ac_prog", so it can be a program name with args.

set dummy $ac_prog; ac_word=$2

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

echo "configure:5809: checking for $ac_word" >&5

echo "configure:5811: checking for $ac_word" >&5

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

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

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



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

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

echo "configure:5870: 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
@@ -5906,7 +5908,7 @@ wince*) 
*)

    

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

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

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

echo "

    #include <pthread.h> 

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

        

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

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

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

echo "

    #include <pthread.h> 

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

        

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

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

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

echo "

    #include <pthread.h> 

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

        

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

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

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

echo "

    #include <pthread.h> 

    void *foo(void *v) { return v; }
@@ -6090,7 +6092,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:6094: checking whether ${CC-cc} accepts -pthread" >&5

echo "configure:6096: 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
@@ -6113,7 +6115,7 @@ echo "configure:6094: 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:6117: checking whether ${CC-cc} accepts -pthreads" >&5

echo "configure:6119: 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

+4 −2
Original line number Diff line number Diff line
@@ -676,7 +676,7 @@ AC_MSG_RESULT([$result]) 


if test $result = "yes"; then

   PROFILE_GEN_LDFLAGS="-fprofile-generate"

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

   PROFILE_USE_CFLAGS="-fprofile-use -fprofile-correction -Wcoverage-mismatch"

   PROFILE_USE_LDFLAGS="-fprofile-use"

fi
@@ -1309,7 +1309,6 @@ case "$target" in 
        i*86*)

            if test -n "$USE_64"; then

                CPU_ARCH=x86_64

                CC="$CC -arch x86_64"

            else        

                CPU_ARCH=i386

            fi
@@ -1318,6 +1317,9 @@ case "$target" in 
            CPU_ARCH=ppc

            ;;

    esac

    if test "`echo $CC | grep -c '\-arch '`" = "0"; then

        CC="$CC -arch $CPU_ARCH"

    fi

    DSO_CFLAGS=-fPIC

    DSO_LDOPTS='-dynamiclib -compatibility_version 1 -current_version 1 -all_load -install_name @executable_path/$@ -headerpad_max_install_names'

    _OPTIMIZE_FLAGS=-O2