From b453eac29b894701849f21eaa8018dae0a219e5e Mon Sep 17 00:00:00 2001 From: "wtchang%redhat.com" Date: Mon, 10 Oct 2005 17:47:03 +0000 Subject: [PATCH] Bugzilla Bug 263952: backed out the previous checkin (to define the Solaris feature test macros for SUS (XPG4v2) with extensions) because it is reported to introduce a small performance regression and break Firefox build on Solaris 10. --- nsprpub/configure | 57 +++++++++++++++----------------------------- nsprpub/configure.in | 7 ------ 2 files changed, 19 insertions(+), 45 deletions(-) diff --git a/nsprpub/configure b/nsprpub/configure index dee2a0a31fcd..9dbd85881690 100755 --- a/nsprpub/configure +++ b/nsprpub/configure @@ -4593,25 +4593,6 @@ EOF cat >> confdefs.h <<\EOF #define HAVE_FCNTL_FILE_LOCKING 1 -EOF - - # Define Solaris feature test macros. (See the standards(5) man page.) - # We conform to SUS (XPG4v2). - cat >> confdefs.h <<\EOF -#define _XOPEN_SOURCE 1 -EOF - - cat >> confdefs.h <<\EOF -#define _XOPEN_SOURCE_EXTENDED 1 -EOF - - # But we also use interfaces and headers not defined by the standard. - cat >> confdefs.h <<\EOF -#define __EXTENSIONS__ 1 -EOF - - cat >> confdefs.h <<\EOF -#define HAVE_SOCKLEN_T 1 EOF MDCPUCFG_H=_solaris.cfg @@ -4927,7 +4908,7 @@ case $target in ;; *) echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:4931: checking for dlopen in -ldl" >&5 +echo "configure:4912: 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 @@ -4935,7 +4916,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4931: \"$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 @@ -4963,17 +4944,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:4967: checking for dlfcn.h" >&5 +echo "configure:4948: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4977: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4958: \"$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* @@ -5006,13 +4987,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:5010: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:4991: 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 < Autoconf TIOCGETP @@ -5030,7 +5011,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -5054,12 +5035,12 @@ fi for ac_func in lchown strerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5058: checking for $ac_func" >&5 +echo "configure:5039: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5067: \"$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 @@ -5123,7 +5104,7 @@ hpux*) if test -z "$GNU_CC"; then echo $ac_n "checking for +Olit support""... $ac_c" 1>&6 -echo "configure:5127: checking for +Olit support" >&5 +echo "configure:5108: 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 @@ -5162,7 +5143,7 @@ darwin*) *) echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 -echo "configure:5166: checking for pthread_create in -lpthreads" >&5 +echo "configure:5147: checking for pthread_create in -lpthreads" >&5 echo " #include void *foo(void *v) { return v; } @@ -5184,7 +5165,7 @@ echo " echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:5188: checking for pthread_create in -lpthread" >&5 +echo "configure:5169: checking for pthread_create in -lpthread" >&5 echo " #include void *foo(void *v) { return v; } @@ -5206,7 +5187,7 @@ echo " echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 -echo "configure:5210: checking for pthread_create in -lc_r" >&5 +echo "configure:5191: checking for pthread_create in -lc_r" >&5 echo " #include void *foo(void *v) { return v; } @@ -5228,7 +5209,7 @@ echo " echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6 -echo "configure:5232: checking for pthread_create in -lc" >&5 +echo "configure:5213: checking for pthread_create in -lc" >&5 echo " #include void *foo(void *v) { return v; } @@ -5382,7 +5363,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:5386: checking whether ${CC-cc} accepts -pthread" >&5 +echo "configure:5367: 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 @@ -5405,7 +5386,7 @@ echo "configure:5386: 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:5409: checking whether ${CC-cc} accepts -pthreads" >&5 +echo "configure:5390: 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 diff --git a/nsprpub/configure.in b/nsprpub/configure.in index 9e9a2bcf2709..c91ca2da38b3 100644 --- a/nsprpub/configure.in +++ b/nsprpub/configure.in @@ -1797,13 +1797,6 @@ mips-sony-newsos*) AC_DEFINE(__svr4__) AC_DEFINE(SOLARIS) AC_DEFINE(HAVE_FCNTL_FILE_LOCKING) - # Define Solaris feature test macros. (See the standards(5) man page.) - # We conform to SUS (XPG4v2). - AC_DEFINE(_XOPEN_SOURCE) - AC_DEFINE(_XOPEN_SOURCE_EXTENDED) - # But we also use interfaces and headers not defined by the standard. - AC_DEFINE(__EXTENSIONS__) - AC_DEFINE(HAVE_SOCKLEN_T) MDCPUCFG_H=_solaris.cfg PR_MD_CSRCS=solaris.c LD=/usr/ccs/bin/ld