From c029f15fc28aa8a9aa3a83e8168c51cb47407acf Mon Sep 17 00:00:00 2001 From: "wtc%netscape.com" Date: Thu, 13 Jun 2002 22:00:29 +0000 Subject: [PATCH] Bug 136458: removed the old -O workaround and use -m68020-60. The patch is contributed by Richard Zidlicky . r=wtc. Modified Files: configure.in configure Linux.mk --- nsprpub/config/Linux.mk | 131 ---------------------------------------- nsprpub/configure | 52 +++++++--------- nsprpub/configure.in | 10 +-- 3 files changed, 25 insertions(+), 168 deletions(-) diff --git a/nsprpub/config/Linux.mk b/nsprpub/config/Linux.mk index 810ca2c6a32..e69de29bb2d 100644 --- a/nsprpub/config/Linux.mk +++ b/nsprpub/config/Linux.mk @@ -1,131 +0,0 @@ -# -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is the Netscape Portable Runtime (NSPR). -# -# The Initial Developer of the Original Code is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1998-2000 Netscape Communications Corporation. All -# Rights Reserved. -# -# Contributor(s): -# -# Alternatively, the contents of this file may be used under the -# terms of the GNU General Public License Version 2 or later (the -# "GPL"), in which case the provisions of the GPL are applicable -# instead of those above. If you wish to allow use of your -# version of this file only under the terms of the GPL and not to -# allow others to use your version of this file under the MPL, -# indicate your decision by deleting the provisions above and -# replace them with the notice and other provisions required by -# the GPL. If you do not delete the provisions above, a recipient -# may use your version of this file under either the MPL or the -# GPL. -# - -###################################################################### -# Config stuff for Linux (all architectures) -###################################################################### - -###################################################################### -# Version-independent -###################################################################### - -include $(MOD_DEPTH)/config/UNIX.mk - -# -# XXX -# Temporary define for the Client; to be removed when binary release is used -# -ifdef MOZILLA_CLIENT -ifneq ($(USE_PTHREADS),1) -CLASSIC_NSPR = 1 -endif -endif - -# -# The default implementation strategy for Linux is pthreads. -# -ifeq ($(CLASSIC_NSPR),1) -IMPL_STRATEGY = _EMU -DEFINES += -D_PR_LOCAL_THREADS_ONLY -else -USE_PTHREADS = 1 -IMPL_STRATEGY = _PTH -DEFINES += -D_REENTRANT -endif - -ifeq (86,$(findstring 86,$(OS_TEST))) -CPU_ARCH := x86 -else -ifeq (,$(filter-out arm% sa110,$(OS_TEST))) -CPU_ARCH := arm -else -CPU_ARCH := $(OS_TEST) -endif -endif -CPU_ARCH_TAG = _$(CPU_ARCH) - -CC = gcc -CCC = g++ -RANLIB = ranlib - -OS_INCLUDES = -G++INCLUDES = -I/usr/include/g++ - -PLATFORM_FLAGS = -ansi -Wall -pipe -DLINUX -PORT_FLAGS = -D_POSIX_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE -DHAVE_STRERROR -DHAVE_FCNTL_FILE_LOCKING - -OS_CFLAGS = $(DSO_CFLAGS) $(PLATFORM_FLAGS) $(PORT_FLAGS) - -###################################################################### -# Version-specific stuff -###################################################################### - -ifeq ($(CPU_ARCH),alpha) -PLATFORM_FLAGS += -D_ALPHA_ -D__alpha -mieee -endif -ifeq ($(CPU_ARCH),x86) -PLATFORM_FLAGS += -Di386 -endif -ifeq ($(CPU_ARCH),m68k) -# -# gcc on Linux/m68k either has a bug or triggers a code-sequence -# bug in the 68060 which causes gcc to crash. The simplest way to -# avoid this is to enable a minimum level of optimization. -# -ifndef BUILD_OPT -OPTIMIZER += -O -endif -PLATFORM_FLAGS += -m68020-40 -endif - -# -# Linux 2.x has shared libraries. -# - -MKSHLIB = $(LD) $(DSO_LDOPTS) -soname $(notdir $@) -ifdef BUILD_OPT -OPTIMIZER = -O2 -# invoke 'strip' on *.so files in optimized builds -STRIP = strip -endif - -###################################################################### -# Overrides for defaults in config.mk (or wherever) -###################################################################### - -###################################################################### -# Other -###################################################################### - -DSO_CFLAGS = -fPIC -DSO_LDOPTS = -shared diff --git a/nsprpub/configure b/nsprpub/configure index fd5a3adb128..a2704ef306c 100755 --- a/nsprpub/configure +++ b/nsprpub/configure @@ -3694,14 +3694,8 @@ EOF PR_MD_ASFILES=os_Linux_ia64.s ;; m68k) - CFLAGS="$CFLAGS -m68020-40" - CXXFLAGS="$CXXFLAGS -m68020-40" - # - # gcc on Linux/m68k either has a bug or triggers a code-sequence - # bug in the 68060 which causes gcc to crash. The simplest way to - # avoid this is to enable a minimum level of optimization. - # - _DEBUG_FLAGS="$_DEBUG_FLAGS -O" + CFLAGS="$CFLAGS -m68020-60" + CXXFLAGS="$CXXFLAGS -m68020-60" ;; esac ;; @@ -4155,17 +4149,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:4159: checking for machine/builtins.h" >&5 +echo "configure:4153: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4169: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4163: \"$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* @@ -4680,12 +4674,12 @@ esac if test -z "$SKIP_LIBRARY_CHECKS"; then echo $ac_n "checking for dlopen""... $ac_c" 1>&6 -echo "configure:4684: checking for dlopen" >&5 +echo "configure:4678: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4706: \"$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 @@ -4727,7 +4721,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:4731: checking for dlopen in -ldl" >&5 +echo "configure:4725: 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 @@ -4735,7 +4729,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:4744: \"$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 @@ -4774,13 +4768,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:4778: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:4772: 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 @@ -4798,7 +4792,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -4822,12 +4816,12 @@ fi for ac_func in lchown strerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4826: checking for $ac_func" >&5 +echo "configure:4820: 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:4848: \"$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 @@ -4888,7 +4882,7 @@ fi echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 -echo "configure:4892: checking for pthread_create in -lpthreads" >&5 +echo "configure:4886: checking for pthread_create in -lpthreads" >&5 echo " #include void *foo(void *v) { return v; } @@ -4910,7 +4904,7 @@ echo " echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:4914: checking for pthread_create in -lpthread" >&5 +echo "configure:4908: checking for pthread_create in -lpthread" >&5 echo " #include void *foo(void *v) { return v; } @@ -4932,7 +4926,7 @@ echo " echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 -echo "configure:4936: checking for pthread_create in -lc_r" >&5 +echo "configure:4930: checking for pthread_create in -lc_r" >&5 echo " #include void *foo(void *v) { return v; } @@ -4954,7 +4948,7 @@ echo " echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6 -echo "configure:4958: checking for pthread_create in -lc" >&5 +echo "configure:4952: checking for pthread_create in -lc" >&5 echo " #include void *foo(void *v) { return v; } @@ -5106,7 +5100,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:5110: checking whether ${CC-cc} accepts -pthread" >&5 +echo "configure:5104: 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 @@ -5129,7 +5123,7 @@ echo "configure:5110: 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:5133: checking whether ${CC-cc} accepts -pthreads" >&5 +echo "configure:5127: 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 fcfdfb9b474..8fb25e5ee73 100644 --- a/nsprpub/configure.in +++ b/nsprpub/configure.in @@ -1157,14 +1157,8 @@ case "$target" in PR_MD_ASFILES=os_Linux_ia64.s ;; m68k) - CFLAGS="$CFLAGS -m68020-40" - CXXFLAGS="$CXXFLAGS -m68020-40" - # - # gcc on Linux/m68k either has a bug or triggers a code-sequence - # bug in the 68060 which causes gcc to crash. The simplest way to - # avoid this is to enable a minimum level of optimization. - # - _DEBUG_FLAGS="$_DEBUG_FLAGS -O" + CFLAGS="$CFLAGS -m68020-60" + CXXFLAGS="$CXXFLAGS -m68020-60" ;; esac ;;