зеркало из https://github.com/mozilla/pjs.git
Set CPU_ARCH for Linux.
Modified files: configure configure.in
This commit is contained in:
wtc%netscape.com
Родитель
3c66ed5f5c
Коммит
b585c46aab
|
|
@ -3508,7 +3508,12 @@ EOF
|
|||
OS_LIBS="$OS_LIBS -lc"
|
||||
_OPTIMIZE_FLAGS=-O2
|
||||
COMPILER_TAG=_glibc
|
||||
CPU_ARCH_TAG=_${target_cpu}
|
||||
if echo "$OS_TEST" | grep -c 86 >/dev/null; then
|
||||
CPU_ARCH=x86
|
||||
else
|
||||
CPU_ARCH=$OS_TEST
|
||||
fi
|
||||
CPU_ARCH_TAG=_${CPU_ARCH}
|
||||
case "${target_cpu}" in
|
||||
alpha)
|
||||
cat >> confdefs.h <<\EOF
|
||||
|
|
@ -3528,7 +3533,6 @@ EOF
|
|||
EOF
|
||||
|
||||
PR_MD_ASFILES=os_Linux_x86.s
|
||||
CPU_ARCH_TAG=_x86
|
||||
;;
|
||||
ia64)
|
||||
PR_MD_ASFILES=os_Linux_ia64.s
|
||||
|
|
@ -4000,17 +4004,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:4004: checking for machine/builtins.h" >&5
|
||||
echo "configure:4008: 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 4009 "configure"
|
||||
#line 4013 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <machine/builtins.h>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:4014: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:4018: \"$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*
|
||||
|
|
@ -4545,12 +4549,12 @@ esac
|
|||
if test -z "$SKIP_LIBRARY_CHECKS"; then
|
||||
|
||||
echo $ac_n "checking for dlopen""... $ac_c" 1>&6
|
||||
echo "configure:4549: checking for dlopen" >&5
|
||||
echo "configure:4553: 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 4554 "configure"
|
||||
#line 4558 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char dlopen(); below. */
|
||||
|
|
@ -4573,7 +4577,7 @@ dlopen();
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:4577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:4581: \"$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
|
||||
|
|
@ -4592,7 +4596,7 @@ else
|
|||
echo "$ac_t""no" 1>&6
|
||||
|
||||
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
|
||||
echo "configure:4596: checking for dlopen in -ldl" >&5
|
||||
echo "configure:4600: 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
|
||||
|
|
@ -4600,7 +4604,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ldl $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4604 "configure"
|
||||
#line 4608 "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
|
||||
|
|
@ -4611,7 +4615,7 @@ int main() {
|
|||
dlopen()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:4615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:4619: \"$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
|
||||
|
|
@ -4639,13 +4643,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:4643: checking whether ${CC-cc} needs -traditional" >&5
|
||||
echo "configure:4647: 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 4649 "configure"
|
||||
#line 4653 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <sgtty.h>
|
||||
Autoconf TIOCGETP
|
||||
|
|
@ -4663,7 +4667,7 @@ rm -f conftest*
|
|||
|
||||
if test $ac_cv_prog_gcc_traditional = no; then
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4667 "configure"
|
||||
#line 4671 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <termio.h>
|
||||
Autoconf TCGETA
|
||||
|
|
@ -4687,12 +4691,12 @@ fi
|
|||
for ac_func in lchown strerror
|
||||
do
|
||||
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
||||
echo "configure:4691: checking for $ac_func" >&5
|
||||
echo "configure:4695: 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 4696 "configure"
|
||||
#line 4700 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char $ac_func(); below. */
|
||||
|
|
@ -4715,7 +4719,7 @@ $ac_func();
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:4719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:4723: \"$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
|
||||
|
|
@ -4746,7 +4750,7 @@ done
|
|||
|
||||
|
||||
echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6
|
||||
echo "configure:4750: checking for pthread_create in -lpthreads" >&5
|
||||
echo "configure:4754: checking for pthread_create in -lpthreads" >&5
|
||||
echo "
|
||||
#include <pthread.h>
|
||||
void *foo(void *v) { int a = 1; }
|
||||
|
|
@ -4768,7 +4772,7 @@ echo "
|
|||
echo "$ac_t""no" 1>&6
|
||||
|
||||
echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
|
||||
echo "configure:4772: checking for pthread_create in -lpthread" >&5
|
||||
echo "configure:4776: checking for pthread_create in -lpthread" >&5
|
||||
echo "
|
||||
#include <pthread.h>
|
||||
void *foo(void *v) { int a = 1; }
|
||||
|
|
@ -4790,7 +4794,7 @@ echo "
|
|||
echo "$ac_t""no" 1>&6
|
||||
|
||||
echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
|
||||
echo "configure:4794: checking for pthread_create in -lc_r" >&5
|
||||
echo "configure:4798: checking for pthread_create in -lc_r" >&5
|
||||
echo "
|
||||
#include <pthread.h>
|
||||
void *foo(void *v) { int a = 1; }
|
||||
|
|
@ -4812,7 +4816,7 @@ echo "
|
|||
echo "$ac_t""no" 1>&6
|
||||
|
||||
echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6
|
||||
echo "configure:4816: checking for pthread_create in -lc" >&5
|
||||
echo "configure:4820: checking for pthread_create in -lc" >&5
|
||||
echo "
|
||||
#include <pthread.h>
|
||||
void *foo(void *v) { int a = 1; }
|
||||
|
|
@ -4962,7 +4966,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:4966: checking whether ${CC-cc} accepts -pthread" >&5
|
||||
echo "configure:4970: 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
|
||||
|
|
@ -4978,7 +4982,7 @@ echo "configure:4966: 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:4982: checking whether ${CC-cc} accepts -pthreads" >&5
|
||||
echo "configure:4986: 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
|
||||
|
|
|
|||
|
|
@ -1048,7 +1048,12 @@ case "$target" in
|
|||
OS_LIBS="$OS_LIBS -lc"
|
||||
_OPTIMIZE_FLAGS=-O2
|
||||
COMPILER_TAG=_glibc
|
||||
CPU_ARCH_TAG=_${target_cpu}
|
||||
if echo "$OS_TEST" | grep -c 86 >/dev/null; then
|
||||
CPU_ARCH=x86
|
||||
else
|
||||
CPU_ARCH=$OS_TEST
|
||||
fi
|
||||
CPU_ARCH_TAG=_${CPU_ARCH}
|
||||
case "${target_cpu}" in
|
||||
alpha)
|
||||
AC_DEFINE(_ALPHA_)
|
||||
|
|
@ -1059,7 +1064,6 @@ case "$target" in
|
|||
i?86)
|
||||
AC_DEFINE(i386)
|
||||
PR_MD_ASFILES=os_Linux_x86.s
|
||||
CPU_ARCH_TAG=_x86
|
||||
;;
|
||||
ia64)
|
||||
PR_MD_ASFILES=os_Linux_ia64.s
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче