mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-26 14:22:01 +00:00
Added support for new HP-UX platform.
Modified files: configure configure.in _hpux.h _hpux64.cfg uxrng.c prsystem.c pr/tests/Makefile.in
This commit is contained in:
wtc%netscape.com
parent
680453a8c3
commit
40ab8dd16c
68
nsprpub/configure
vendored
68
nsprpub/configure
vendored
@ -3314,7 +3314,9 @@ EOF
|
||||
DLL_SUFFIX=sl
|
||||
DSO_LDOPTS='-b +h $(notdir $@)'
|
||||
PR_MD_CSRCS=hpux.c
|
||||
PR_MD_ASFILES=os_HPUX.s
|
||||
if test "$OS_TEST" != "ia64"; then
|
||||
PR_MD_ASFILES=os_HPUX.s
|
||||
fi
|
||||
if test -n "$USE_64"; then
|
||||
MDCPUCFG_H=_hpux64.cfg
|
||||
else
|
||||
@ -3368,7 +3370,7 @@ EOF
|
||||
|
||||
fi
|
||||
|
||||
if echo "$OS_RELEASE" | egrep '^(B.10.30|B.11.00|B.11.11)' >/dev/null; then
|
||||
if echo "$OS_RELEASE" | egrep '^(B.10.30|B.11.00|B.11.11|B.11.20)' >/dev/null; then
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define HAVE_POINTER_LOCALTIME_R 1
|
||||
EOF
|
||||
@ -3427,7 +3429,7 @@ EOF
|
||||
DEFAULT_IMPL_STRATEGY=_PTH
|
||||
fi
|
||||
|
||||
if echo "$OS_RELEASE" | egrep '^(B.11.00|B.11.11)' >/dev/null; then
|
||||
if echo "$OS_RELEASE" | egrep '^(B.11.00|B.11.11|B.11.20)' >/dev/null; then
|
||||
cat >> confdefs.h <<\EOF
|
||||
#define HPUX10 1
|
||||
EOF
|
||||
@ -3450,11 +3452,21 @@ EOF
|
||||
|
||||
if test -z "$GNU_CC"; then
|
||||
if test -z "$USE_64"; then
|
||||
CFLAGS="$CFLAGS +DAportable +DS2.0"
|
||||
CXXFLAGS="$CXXFLAGS +DAportable +DS2.0"
|
||||
if test "$OS_TEST" = "ia64"; then
|
||||
CFLAGS="$CFLAGS +DD32"
|
||||
CXXFLAGS="$CXXFLAGS +DD32"
|
||||
else
|
||||
CFLAGS="$CFLAGS +DAportable +DS2.0"
|
||||
CXXFLAGS="$CXXFLAGS +DAportable +DS2.0"
|
||||
fi
|
||||
else
|
||||
CFLAGS="$CFLAGS +DA2.0W +DS2.0"
|
||||
CXXFLAGS="$CXXFLAGS +DA2.0W +DS2.0"
|
||||
if test "$OS_TEST" = "ia64"; then
|
||||
CFLAGS="$CFLAGS +DD64"
|
||||
CXXFLAGS="$CXXFLAGS +DD64"
|
||||
else
|
||||
CFLAGS="$CFLAGS +DA2.0W +DS2.0"
|
||||
CXXFLAGS="$CXXFLAGS +DA2.0W +DS2.0"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
DEFAULT_IMPL_STRATEGY=_PTH
|
||||
@ -4141,17 +4153,17 @@ EOF
|
||||
|
||||
ac_safe=`echo "machine/builtins.h" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for machine/builtins.h""... $ac_c" 1>&6
|
||||
echo "configure:4145: checking for machine/builtins.h" >&5
|
||||
echo "configure:4157: 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 4150 "configure"
|
||||
#line 4162 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <machine/builtins.h>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:4155: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:4167: \"$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*
|
||||
@ -4661,12 +4673,12 @@ esac
|
||||
if test -z "$SKIP_LIBRARY_CHECKS"; then
|
||||
|
||||
echo $ac_n "checking for dlopen""... $ac_c" 1>&6
|
||||
echo "configure:4665: checking for dlopen" >&5
|
||||
echo "configure:4677: checking for dlopen" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4670 "configure"
|
||||
#line 4682 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char dlopen(); below. */
|
||||
@ -4689,7 +4701,7 @@ dlopen();
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:4693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:4705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
rm -rf conftest*
|
||||
eval "ac_cv_func_dlopen=yes"
|
||||
else
|
||||
@ -4708,7 +4720,7 @@ else
|
||||
echo "$ac_t""no" 1>&6
|
||||
|
||||
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
|
||||
echo "configure:4712: checking for dlopen in -ldl" >&5
|
||||
echo "configure:4724: 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
|
||||
@ -4716,7 +4728,7 @@ else
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ldl $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4720 "configure"
|
||||
#line 4732 "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
|
||||
@ -4727,7 +4739,7 @@ int main() {
|
||||
dlopen()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:4731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:4743: \"$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
|
||||
@ -4755,13 +4767,13 @@ fi
|
||||
|
||||
if test $ac_cv_prog_gcc = yes; then
|
||||
echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
|
||||
echo "configure:4759: checking whether ${CC-cc} needs -traditional" >&5
|
||||
echo "configure:4771: 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 4765 "configure"
|
||||
#line 4777 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <sgtty.h>
|
||||
Autoconf TIOCGETP
|
||||
@ -4779,7 +4791,7 @@ rm -f conftest*
|
||||
|
||||
if test $ac_cv_prog_gcc_traditional = no; then
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4783 "configure"
|
||||
#line 4795 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <termio.h>
|
||||
Autoconf TCGETA
|
||||
@ -4803,12 +4815,12 @@ fi
|
||||
for ac_func in lchown strerror
|
||||
do
|
||||
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
||||
echo "configure:4807: checking for $ac_func" >&5
|
||||
echo "configure:4819: 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 4812 "configure"
|
||||
#line 4824 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char $ac_func(); below. */
|
||||
@ -4831,7 +4843,7 @@ $ac_func();
|
||||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:4835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:4847: \"$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
|
||||
@ -4869,7 +4881,7 @@ fi
|
||||
|
||||
|
||||
echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6
|
||||
echo "configure:4873: checking for pthread_create in -lpthreads" >&5
|
||||
echo "configure:4885: checking for pthread_create in -lpthreads" >&5
|
||||
echo "
|
||||
#include <pthread.h>
|
||||
void *foo(void *v) { int a = 1; }
|
||||
@ -4891,7 +4903,7 @@ echo "
|
||||
echo "$ac_t""no" 1>&6
|
||||
|
||||
echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
|
||||
echo "configure:4895: checking for pthread_create in -lpthread" >&5
|
||||
echo "configure:4907: checking for pthread_create in -lpthread" >&5
|
||||
echo "
|
||||
#include <pthread.h>
|
||||
void *foo(void *v) { int a = 1; }
|
||||
@ -4913,7 +4925,7 @@ echo "
|
||||
echo "$ac_t""no" 1>&6
|
||||
|
||||
echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
|
||||
echo "configure:4917: checking for pthread_create in -lc_r" >&5
|
||||
echo "configure:4929: checking for pthread_create in -lc_r" >&5
|
||||
echo "
|
||||
#include <pthread.h>
|
||||
void *foo(void *v) { int a = 1; }
|
||||
@ -4935,7 +4947,7 @@ echo "
|
||||
echo "$ac_t""no" 1>&6
|
||||
|
||||
echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6
|
||||
echo "configure:4939: checking for pthread_create in -lc" >&5
|
||||
echo "configure:4951: checking for pthread_create in -lc" >&5
|
||||
echo "
|
||||
#include <pthread.h>
|
||||
void *foo(void *v) { int a = 1; }
|
||||
@ -5085,7 +5097,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:5089: checking whether ${CC-cc} accepts -pthread" >&5
|
||||
echo "configure:5101: 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
|
||||
@ -5101,7 +5113,7 @@ echo "configure:5089: 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:5105: checking whether ${CC-cc} accepts -pthreads" >&5
|
||||
echo "configure:5117: 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
|
||||
|
||||
@ -890,7 +890,9 @@ case "$target" in
|
||||
DLL_SUFFIX=sl
|
||||
DSO_LDOPTS='-b +h $(notdir $@)'
|
||||
PR_MD_CSRCS=hpux.c
|
||||
PR_MD_ASFILES=os_HPUX.s
|
||||
if test "$OS_TEST" != "ia64"; then
|
||||
PR_MD_ASFILES=os_HPUX.s
|
||||
fi
|
||||
if test -n "$USE_64"; then
|
||||
MDCPUCFG_H=_hpux64.cfg
|
||||
else
|
||||
@ -929,7 +931,7 @@ case "$target" in
|
||||
AC_DEFINE(HAVE_INT_LOCALTIME_R)
|
||||
fi
|
||||
|
||||
if echo "$OS_RELEASE" | egrep '^(B.10.30|B.11.00|B.11.11)' >/dev/null; then
|
||||
if echo "$OS_RELEASE" | egrep '^(B.10.30|B.11.00|B.11.11|B.11.20)' >/dev/null; then
|
||||
AC_DEFINE(HAVE_POINTER_LOCALTIME_R)
|
||||
fi
|
||||
|
||||
@ -964,7 +966,7 @@ case "$target" in
|
||||
DEFAULT_IMPL_STRATEGY=_PTH
|
||||
fi
|
||||
|
||||
if echo "$OS_RELEASE" | egrep '^(B.11.00|B.11.11)' >/dev/null; then
|
||||
if echo "$OS_RELEASE" | egrep '^(B.11.00|B.11.11|B.11.20)' >/dev/null; then
|
||||
AC_DEFINE(HPUX10)
|
||||
AC_DEFINE(HPUX11)
|
||||
AC_DEFINE(_LARGEFILE64_SOURCE)
|
||||
@ -972,11 +974,21 @@ case "$target" in
|
||||
AC_DEFINE(HAVE_FCNTL_FILE_LOCKING)
|
||||
if test -z "$GNU_CC"; then
|
||||
if test -z "$USE_64"; then
|
||||
CFLAGS="$CFLAGS +DAportable +DS2.0"
|
||||
CXXFLAGS="$CXXFLAGS +DAportable +DS2.0"
|
||||
if test "$OS_TEST" = "ia64"; then
|
||||
CFLAGS="$CFLAGS +DD32"
|
||||
CXXFLAGS="$CXXFLAGS +DD32"
|
||||
else
|
||||
CFLAGS="$CFLAGS +DAportable +DS2.0"
|
||||
CXXFLAGS="$CXXFLAGS +DAportable +DS2.0"
|
||||
fi
|
||||
else
|
||||
CFLAGS="$CFLAGS +DA2.0W +DS2.0"
|
||||
CXXFLAGS="$CXXFLAGS +DA2.0W +DS2.0"
|
||||
if test "$OS_TEST" = "ia64"; then
|
||||
CFLAGS="$CFLAGS +DD64"
|
||||
CXXFLAGS="$CXXFLAGS +DD64"
|
||||
else
|
||||
CFLAGS="$CFLAGS +DA2.0W +DS2.0"
|
||||
CXXFLAGS="$CXXFLAGS +DA2.0W +DS2.0"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
DEFAULT_IMPL_STRATEGY=_PTH
|
||||
|
||||
@ -55,7 +55,11 @@
|
||||
#undef HAVE_WEAK_IO_SYMBOLS
|
||||
#undef HAVE_WEAK_MALLOC_SYMBOLS
|
||||
#define HAVE_DLL
|
||||
#ifdef IS_64
|
||||
#define USE_DLFCN
|
||||
#else
|
||||
#define USE_HPSHL
|
||||
#endif
|
||||
#ifndef HAVE_STRERROR
|
||||
#define HAVE_STRERROR
|
||||
#endif
|
||||
|
||||
@ -82,8 +82,8 @@
|
||||
|
||||
#define PR_ALIGN_OF_SHORT 2
|
||||
#define PR_ALIGN_OF_INT 4
|
||||
#define PR_ALIGN_OF_LONG 4
|
||||
#define PR_ALIGN_OF_INT64 4
|
||||
#define PR_ALIGN_OF_LONG 8
|
||||
#define PR_ALIGN_OF_INT64 8
|
||||
#define PR_ALIGN_OF_FLOAT 4
|
||||
#define PR_ALIGN_OF_DOUBLE 8
|
||||
#define PR_ALIGN_OF_POINTER 8
|
||||
|
||||
@ -64,6 +64,13 @@ GetHighResClock(void *buf, size_t maxbytes)
|
||||
|
||||
#elif defined(HPUX)
|
||||
|
||||
#ifdef __ia64
|
||||
static size_t
|
||||
GetHighResClock(void *buf, size_t maxbytes)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
#else
|
||||
static size_t
|
||||
GetHighResClock(void *buf, size_t maxbytes)
|
||||
{
|
||||
@ -73,6 +80,7 @@ GetHighResClock(void *buf, size_t maxbytes)
|
||||
cr16val = ret_cr16();
|
||||
return(_pr_CopyLowBits(buf, maxbytes, &cr16val, sizeof(cr16val)));
|
||||
}
|
||||
#endif
|
||||
|
||||
#elif defined(OSF1)
|
||||
|
||||
|
||||
@ -58,7 +58,7 @@
|
||||
#endif
|
||||
|
||||
#if defined(HPUX)
|
||||
#include <sys/mp.h>
|
||||
#include <sys/mpctl.h>
|
||||
#endif
|
||||
|
||||
#if defined(XP_UNIX)
|
||||
|
||||
@ -296,8 +296,10 @@ endif
|
||||
ifeq ($(OS_ARCH), HP-UX)
|
||||
LDOPTS += -z -Wl,+s,+b,$(ABSOLUTE_LIB_DIR)
|
||||
ifeq ($(USE_64),1)
|
||||
LDOPTS += +DA2.0W
|
||||
EXTRA_LIBS = -lpthread
|
||||
LDOPTS += +DD64
|
||||
endif
|
||||
ifeq ($(USE_PTHREADS),1)
|
||||
EXTRA_LIBS = $(LIBPTHREAD)
|
||||
endif
|
||||
endif
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user