Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix x86 checks so that they work for xeon processors

Browse Source 
Bug #199343 r=wtc


git-svn-id: svn://10.0.0.236/branches/ldapcsdk_50_client_branch@141402 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
seawood%netscape.com
2003-04-18 19:10:26 +00:00
parent 61db168563
commit 197396b6fa
2 changed files with 146 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

281
mozilla/directory/c-sdk/configure vendored
View File

@@ -1164,7 +1164,7 @@ EOF
beos*)
DEFINES="$DEFINES -DDEBUG_${USER}"
;;
msvc*|mksnt*|cygwin*|mingw*)
msvc*|mksnt*|cygwin*|mingw*|os2*)
DEFINES="$DEFINES -DDEBUG_`echo ${USERNAME} | sed -e 's| |_|g'`"
;;
*)
@@ -2630,7 +2630,7 @@ fi
if test "$GXX" = "yes"; then
GNU_CXX=1
fi
if test "`echo | $AS -V 2>&1 | grep -c GNU`" != "0"; then
if test "`echo | $AS -v 2>&1 | grep -c GNU`" != "0"; then
GNU_AS=1
fi
rm -f a.out
@@ -3078,7 +3078,7 @@ EOF
PR_MD_ARCH_DIR=beos
RESOLVE_LINK_SYMBOLS=1
case "${target_cpu}" in
i?86)
i*86)
_OPTIMIZE_FLAGS=-O2
_DEBUG_FLAGS='-gdwarf-2 -O0'
MKSHLIB='$(CCC) $(DSO_LDOPTS) -o $@'
@@ -3753,7 +3753,7 @@ EOF
CFLAGS="$CFLAGS -mieee"
CXXFLAGS="$CXXFLAGS -mieee"
;;
i?86)
i*86)
cat >> confdefs.h <<\EOF
#define i386 1
EOF
@@ -3920,7 +3920,7 @@ EOF
esac
case "$target_cpu" in
i?86)
i*86)
cat >> confdefs.h <<\EOF
#define _X86_ 1
EOF
@@ -4191,6 +4191,123 @@ EOF
DSO_LDOPTS='-shared -auto_symvec $(LDFLAGS) $(OPTIMIZER)'
;;
*-os2*)
cat >> confdefs.h <<\EOF
#define XP_OS2 1
EOF
cat >> confdefs.h <<\EOF
#define XP_PC 1
EOF
cat >> confdefs.h <<\EOF
#define BSD_SELECT 1
EOF
cat >> confdefs.h <<\EOF
#define _PR_GLOBAL_THREADS_ONLY 1
EOF
PR_MD_ARCH_DIR=os2
RESOLVE_LINK_SYMBOLS=1
NSINSTALL=nsinstall
LIB_PREFIX=
LIB_SUFFIX=lib
DLL_SUFFIX=dll
DLLTOOL=''
RC=rc.exe
PROG_SUFFIX=.exe
MDCPUCFG_H=_os2.cfg
# EMX/GCC build
if test -n "$GNU_CC"; then
# AC_DEFINE(USE_OS2_TOOLKIT_HEADERS)
cat >> confdefs.h <<\EOF
#define XP_OS2_EMX 1
EOF
cat >> confdefs.h <<\EOF
#define OS2 1
EOF
AR=emxomfar
AR_FLAGS='-p256 r $@'
LD='$(CC)'
CFLAGS="$CFLAGS -Wall -Zmtd -Zomf"
CXXFLAGS="$CFLAGS -Wall -Zmtd -Zomf"
MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
DSO_CFLAGS=
DSO_LDOPTS='-Zomf -Zdll -Zmtd'
_OPTIMIZE_FLAGS="-O2 -s"
_DEBUG_FLAGS="-g -fno-inline"
if test -n "$MOZ_OPTIMIZE"; then
DSO_LDOPTS="$DSO_LDOPTS -Zlinker /EXEPACK:2 -Zlinker /PACKCODE -Zlinker /PACKDATA"
fi
OS_LIBS="-lsocket -lemxio"
IMPLIB='emximp -o'
FILTER='emxexp -o'
if test -z "$EMXOMFLD_LINKER"; then
# using LINK386.EXE
DSO_LDOPTS="$DSO_LDOPTS -Zlinker /NOO"
fi
# GCC for OS/2 currently predefines these, but we don't want them
DEFINES="$DEFINES -Uunix -U__unix -U__unix__"
# Visual Age C++ build
elif test "$VACPP" = "yes"; then
MOZ_BUILD_ROOT=`pwd -D`
cat >> confdefs.h <<\EOF
#define XP_OS2_VACPP 1
EOF
cat >> confdefs.h <<\EOF
#define OS2 4
EOF
cat >> confdefs.h <<\EOF
#define TCPV40HDRS 1
EOF
cat >> confdefs.h <<\EOF
#define _X86_ 1
EOF
OBJ_SUFFIX=obj
AS=alp
ASFLAGS='-Mb'
ASM_SUFFIX=asm
AR=ilib
AR_FLAGS='/NOL /NOI /O:$(subst /,\\,$@)'
CFLAGS='/Q /qlibansi /Gd+ /Gm+ /Su4 /Mp /Tl9'
HOST_CFLAGS="$CFLAGS"
OS_CFLAGS='/Q /qlibansi /Gd+ /Gm+ /Su4 /Mp /Tl9'
OS_EXE_CFLAGS='/Q /qlibansi /Gd+ /Gm+ /Su4 /Mp /Tl9'
CXXFLAGS='/Q /qlibansi /Gd+ /Gm+ /Su4 /Mp /Tl9'
OS_LIBS='so32dll.lib tcp32dll.lib'
LD='-ilink'
MKSHLIB='$(LD) $(DSO_LDOPTS)'
IMPLIB='implib -nologo -noignorecase'
FILTER='cppfilt -q -B -P'
_OPTIMIZE_FLAGS='/O+ /Gl+ /Gx+ /qtune=pentium /qarch=pentium'
_DEBUG_FLAGS='/Ti+ '
LDFLAGS='/NOL /M /L'
DLLFLAGS='/O:$@ /DLL /INC:_dllentry /MAP:$(@:.dll=.map) /L /NOL'
EXEFLAGS='/OUT:$@ /PMTYPE:VIO /MAP:$(@:.exe=.map) /L /NOL'
if test -n "$MOZ_DEBUG"; then
LDFLAGS="$LDFLAGS /DE"
DLLFLAGS="$DLLFLAGS /DE"
EXEFLAGS="$EXEFLAGS /DE"
fi
if test -n "$MOZ_OPTIMIZE"; then
LDFLAGS="$LDFLAGS /OPTFUNC /EXEPACK:2 /PACKCODE /PACKDATA"
DLLFLAGS="$DLLFLAGS /OPTFUNC /EXEPACK:2 /PACKCODE /PACKDATA"
EXEFLAGS="$EXEFLAGS /OPTFUNC /EXEPACK:2 /PACKCODE /PACKDATA"
fi
fi
;;
*-osf*)
SHELL_OVERRIDE="SHELL = /usr/bin/ksh"
cat >> confdefs.h <<\EOF
@@ -4207,17 +4324,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:4211: checking for machine/builtins.h" >&5
echo "configure:4328: 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 4216 "configure"
#line 4333 "configure"
#include "confdefs.h"
#include <machine/builtins.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:4221: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
{ (eval echo configure:4338: \"$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*
@@ -4603,118 +4720,6 @@ EOF
CPU_ARCH=x86
;;
*-os2*)
cat >> confdefs.h <<\EOF
#define XP_OS2 1
EOF
cat >> confdefs.h <<\EOF
#define BSD_SELECT 1
EOF
cat >> confdefs.h <<\EOF
#define XP_PC 1
EOF
cat >> confdefs.h <<\EOF
#define _PR_GLOBAL_THREADS_ONLY 1
EOF
OBJ_SUFFIX=obj
LIB_SUFFIX=lib
LIB_PREFIX=
DLL_SUFFIX=dll
ASM_SUFFIX=asm
RC=rc.exe
PR_MD_ARCH_DIR=os2
PROG_SUFFIX=.exe
NSINSTALL=nsinstall
MDCPUCFG_H=_os2.cfg
RESOLVE_LINK_SYMBOLS=1
# EMX/GCC build
if test "$GNU_CC"; then
cat >> confdefs.h <<\EOF
#define XP_OS2_EMX 1
EOF
cat >> confdefs.h <<\EOF
#define OS2 1
EOF
AR=emxomfar
AR_FLAGS='-p256 r $@'
CFLAGS="-Zmtd -Zomf"
HOST_CFLAGS="$CFLAGS"
CXXFLAGS="-Zmtd -Zomf"
OS_LIBS="-lsocket -lemxio"
LD='$(CC)'
IMPLIB='emximp -o'
FILTER='emxexp'
OS_DLLFLAGS='$(DSO_LDOPTS) -o $@'
_OPTIMIZE_FLAGS=-O3
_DEBUG_FLAGS=-g
if test -n "$MOZ_DEBUG"; then
DLLFLAGS='-g'
EXEFLAGS='-g $(OMF_FLAG) -Zmtd -L$(DIST)/lib -o $@'
DSO_LDOPTS='-g -Zomf -Zdll -Zmt -Zcrtdll -Zlinker /NOO'
else
DLLFLAGS=
EXEFLAGS='-Zmtd -o $@'
DSO_LDOPTS='-Zomf -Zdll -Zmt -Zcrtdll -Zlinker /NOO'
fi
fi
# Visual Age C++ build
if test "$VACPP" = "yes"; then
cat >> confdefs.h <<\EOF
#define XP_OS2_VACPP 1
EOF
cat >> confdefs.h <<\EOF
#define OS2 4
EOF
cat >> confdefs.h <<\EOF
#define TCPV40HDRS 1
EOF
cat >> confdefs.h <<\EOF
#define _X86_ 1
EOF
AS=alp
ASFLAGS='-Mb'
AR=-ilib
AR_FLAGS='/NOL /NOI /O:$(subst /,\\,$@)'
CFLAGS='/Q /qlibansi /Gd+ /Gm+ /Su4 /Mp /Tl9'
HOST_CFLAGS="$CFLAGS"
OS_CFLAGS='/Q /qlibansi /Gd+ /Gm+ /Su4 /Mp /Tl9'
OS_EXE_CFLAGS='/Q /qlibansi /Gd+ /Gm+ /Su4 /Mp /Tl9'
CXXFLAGS='/Q /qlibansi /Gd+ /Gm+ /Su4 /Mp /Tl9'
OS_LIBS='so32dll.lib tcp32dll.lib'
LD='-ilink'
MKSHLIB='$(LD) $(DSO_LDOPTS)'
IMPLIB='implib -nologo -noignorecase'
FILTER='cppfilt -q -B -P'
_OPTIMIZE_FLAGS='/O+ /Gl+ /Gx+ /qtune=pentium /qarch=pentium'
_DEBUG_FLAGS='/Ti+ '
LDFLAGS='/NOL /M /L'
DLLFLAGS='/O:$@ /DLL /INC:_dllentry /MAP:$(@:.dll=.map) /L /NOL'
EXEFLAGS='/OUT:$@ /PMTYPE:VIO /MAP:$(@:.exe=.map) /L /NOL'
if test -n "$MOZ_DEBUG"; then
LDFLAGS="$LDFLAGS /DE"
DLLFLAGS="$DLLFLAGS /DE"
EXEFLAGS="$EXEFLAGS /DE"
fi
if test -n "$MOZ_OPTIMIZE"; then
LDFLAGS="$LDFLAGS /OPTFUNC /EXEPACK:2 /PACKCODE /PACKDATA"
DLLFLAGS="$DLLFLAGS /OPTFUNC /EXEPACK:2 /PACKCODE /PACKDATA"
EXEFLAGS="$EXEFLAGS /OPTFUNC /EXEPACK:2 /PACKCODE /PACKDATA"
fi
fi
;;
*)
cat >> confdefs.h <<\EOF
#define XP_UNIX 1
@@ -4727,12 +4732,12 @@ esac
if test -z "$SKIP_LIBRARY_CHECKS"; then
echo $ac_n "checking for dlopen""... $ac_c" 1>&6
echo "configure:4731: checking for dlopen" >&5
echo "configure:4736: 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 4736 "configure"
#line 4741 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char dlopen(); below. */
@@ -4755,7 +4760,7 @@ dlopen();
; return 0; }
EOF
if { (eval echo configure:4759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:4764: \"$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
@@ -4774,7 +4779,7 @@ else
echo "$ac_t""no" 1>&6
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
echo "configure:4778: checking for dlopen in -ldl" >&5
echo "configure:4783: 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
@@ -4782,7 +4787,7 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldl $LIBS"
cat > conftest.$ac_ext <<EOF
#line 4786 "configure"
#line 4791 "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
@@ -4793,7 +4798,7 @@ int main() {
dlopen()
; return 0; }
EOF
if { (eval echo configure:4797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:4802: \"$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
@@ -4821,13 +4826,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:4825: checking whether ${CC-cc} needs -traditional" >&5
echo "configure:4830: 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 4831 "configure"
#line 4836 "configure"
#include "confdefs.h"
#include <sgtty.h>
Autoconf TIOCGETP
@@ -4845,7 +4850,7 @@ rm -f conftest*
if test $ac_cv_prog_gcc_traditional = no; then
cat > conftest.$ac_ext <<EOF
#line 4849 "configure"
#line 4854 "configure"
#include "confdefs.h"
#include <termio.h>
Autoconf TCGETA
@@ -4869,12 +4874,12 @@ fi
for ac_func in lchown strerror
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:4873: checking for $ac_func" >&5
echo "configure:4878: 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 4878 "configure"
#line 4883 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -4897,7 +4902,7 @@ $ac_func();
; return 0; }
EOF
if { (eval echo configure:4901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
if { (eval echo configure:4906: \"$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
@@ -4935,7 +4940,7 @@ fi
echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6
echo "configure:4939: checking for pthread_create in -lpthreads" >&5
echo "configure:4944: checking for pthread_create in -lpthreads" >&5
echo "
#include <pthread.h>
void *foo(void *v) { int a = 1; }
@@ -4957,7 +4962,7 @@ echo "
echo "$ac_t""no" 1>&6
echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
echo "configure:4961: checking for pthread_create in -lpthread" >&5
echo "configure:4966: checking for pthread_create in -lpthread" >&5
echo "
#include <pthread.h>
void *foo(void *v) { int a = 1; }
@@ -4979,7 +4984,7 @@ echo "
echo "$ac_t""no" 1>&6
echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
echo "configure:4983: checking for pthread_create in -lc_r" >&5
echo "configure:4988: checking for pthread_create in -lc_r" >&5
echo "
#include <pthread.h>
void *foo(void *v) { int a = 1; }
@@ -5001,7 +5006,7 @@ echo "
echo "$ac_t""no" 1>&6
echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6
echo "configure:5005: checking for pthread_create in -lc" >&5
echo "configure:5010: checking for pthread_create in -lc" >&5
echo "
#include <pthread.h>
void *foo(void *v) { int a = 1; }
@@ -5151,7 +5156,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:5155: checking whether ${CC-cc} accepts -pthread" >&5
echo "configure:5160: 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
@@ -5167,7 +5172,7 @@ echo "configure:5155: 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:5171: checking whether ${CC-cc} accepts -pthreads" >&5
echo "configure:5176: 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

6
mozilla/directory/c-sdk/configure.in
View File

@@ -764,7 +764,7 @@ case "$target" in
PR_MD_ARCH_DIR=beos
RESOLVE_LINK_SYMBOLS=1
case "${target_cpu}" in
i?86)
i*86)
_OPTIMIZE_FLAGS=-O2
_DEBUG_FLAGS='-gdwarf-2 -O0'
MKSHLIB='$(CCC) $(DSO_LDOPTS) -o $@'
@@ -1161,7 +1161,7 @@ case "$target" in
CFLAGS="$CFLAGS -mieee"
CXXFLAGS="$CXXFLAGS -mieee"
;;
i?86)
i*86)
AC_DEFINE(i386)
PR_MD_ASFILES=os_Linux_x86.s
;;
@@ -1301,7 +1301,7 @@ case "$target" in
esac
case "$target_cpu" in
i?86)
i*86)
AC_DEFINE(_X86_)
;;
alpha)