зеркало из https://github.com/mozilla/pjs.git
1. Use $(CC) (the compiler) to build shared libraries on Solaris. Added
the -z defs linker flag back. Modified files: configure configure.in lib/ds/Makefile.in lib/libc/src/Makefile.in pr/src/Makefile.in 2. Let pr/src/md/unix/Makefile.in be responsible for removing the pr/src/cpu directory because it creates that directory. Note that the 'clean' target does not remove the directory because it doesn't remove the .so's either. Modified files: pr/src/Makefile.in, pr/src/md/unix/Makefile.in
This commit is contained in:
wtc%netscape.com
Родитель
cd39ba292d
Коммит
288cdc7e24
|
|
@ -4485,12 +4485,14 @@ EOF
|
|||
fi
|
||||
PR_MD_CSRCS=solaris.c
|
||||
LD=/usr/ccs/bin/ld
|
||||
DSO_LDOPTS='-G -h $(notdir $@) -z combreloc'
|
||||
MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
|
||||
RESOLVE_LINK_SYMBOLS=1
|
||||
if test -n "$GNU_CC"; then
|
||||
DSO_CFLAGS=-fPIC
|
||||
DSO_LDOPTS='-B/usr/ccs/bin/ -shared -Wl,-h,$(notdir $@),-z,combreloc,-z,defs'
|
||||
else
|
||||
DSO_CFLAGS=-KPIC
|
||||
DSO_LDOPTS='-G -h $(notdir $@) -z combreloc -z defs'
|
||||
fi
|
||||
if test -z "$GNU_AS"; then
|
||||
ASFLAGS="$ASFLAGS -Wa,-P"
|
||||
|
|
@ -4503,8 +4505,8 @@ EOF
|
|||
CXXFLAGS="$CXXFLAGS -MDupdate \$(DEPENDENCIES)"
|
||||
fi
|
||||
else
|
||||
CC="$CC -xstrconst"
|
||||
CXX="$CXX -Qoption cg -xstrconst"
|
||||
CFLAGS="$CFLAGS -xstrconst"
|
||||
CXXFLAGS="$CXXFLAGS -Qoption cg -xstrconst"
|
||||
if test -z "$MOZ_OPTIMIZE"; then
|
||||
CFLAGS="$CFLAGS -xs"
|
||||
CXXFLAGS="$CXXFLAGS -xs"
|
||||
|
|
@ -4756,12 +4758,12 @@ esac
|
|||
if test -z "$SKIP_LIBRARY_CHECKS"; then
|
||||
|
||||
echo $ac_n "checking for dlopen""... $ac_c" 1>&6
|
||||
echo "configure:4760: checking for dlopen" >&5
|
||||
echo "configure:4762: 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 4765 "configure"
|
||||
#line 4767 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char dlopen(); below. */
|
||||
|
|
@ -4784,7 +4786,7 @@ dlopen();
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:4788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:4790: \"$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
|
||||
|
|
@ -4803,7 +4805,7 @@ else
|
|||
echo "$ac_t""no" 1>&6
|
||||
|
||||
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
|
||||
echo "configure:4807: checking for dlopen in -ldl" >&5
|
||||
echo "configure:4809: 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
|
||||
|
|
@ -4811,7 +4813,7 @@ else
|
|||
ac_save_LIBS="$LIBS"
|
||||
LIBS="-ldl $LIBS"
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4815 "configure"
|
||||
#line 4817 "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
|
||||
|
|
@ -4822,7 +4824,7 @@ int main() {
|
|||
dlopen()
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:4826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:4828: \"$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
|
||||
|
|
@ -4850,13 +4852,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:4854: checking whether ${CC-cc} needs -traditional" >&5
|
||||
echo "configure:4856: 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 4860 "configure"
|
||||
#line 4862 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <sgtty.h>
|
||||
Autoconf TIOCGETP
|
||||
|
|
@ -4874,7 +4876,7 @@ rm -f conftest*
|
|||
|
||||
if test $ac_cv_prog_gcc_traditional = no; then
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 4878 "configure"
|
||||
#line 4880 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <termio.h>
|
||||
Autoconf TCGETA
|
||||
|
|
@ -4898,12 +4900,12 @@ fi
|
|||
for ac_func in lchown strerror
|
||||
do
|
||||
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
||||
echo "configure:4902: checking for $ac_func" >&5
|
||||
echo "configure:4904: 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 4907 "configure"
|
||||
#line 4909 "configure"
|
||||
#include "confdefs.h"
|
||||
/* System header to define __stub macros and hopefully few prototypes,
|
||||
which can conflict with char $ac_func(); below. */
|
||||
|
|
@ -4926,7 +4928,7 @@ $ac_func();
|
|||
|
||||
; return 0; }
|
||||
EOF
|
||||
if { (eval echo configure:4930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||
if { (eval echo configure:4932: \"$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
|
||||
|
|
@ -4965,7 +4967,7 @@ hpux*)
|
|||
if test -z "$GNU_CC"; then
|
||||
|
||||
echo $ac_n "checking for +Olit support""... $ac_c" 1>&6
|
||||
echo "configure:4969: checking for +Olit support" >&5
|
||||
echo "configure:4971: 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
|
||||
|
|
@ -4999,7 +5001,7 @@ esac
|
|||
|
||||
|
||||
echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6
|
||||
echo "configure:5003: checking for pthread_create in -lpthreads" >&5
|
||||
echo "configure:5005: checking for pthread_create in -lpthreads" >&5
|
||||
echo "
|
||||
#include <pthread.h>
|
||||
void *foo(void *v) { return v; }
|
||||
|
|
@ -5021,7 +5023,7 @@ echo "
|
|||
echo "$ac_t""no" 1>&6
|
||||
|
||||
echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
|
||||
echo "configure:5025: checking for pthread_create in -lpthread" >&5
|
||||
echo "configure:5027: checking for pthread_create in -lpthread" >&5
|
||||
echo "
|
||||
#include <pthread.h>
|
||||
void *foo(void *v) { return v; }
|
||||
|
|
@ -5043,7 +5045,7 @@ echo "
|
|||
echo "$ac_t""no" 1>&6
|
||||
|
||||
echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
|
||||
echo "configure:5047: checking for pthread_create in -lc_r" >&5
|
||||
echo "configure:5049: checking for pthread_create in -lc_r" >&5
|
||||
echo "
|
||||
#include <pthread.h>
|
||||
void *foo(void *v) { return v; }
|
||||
|
|
@ -5065,7 +5067,7 @@ echo "
|
|||
echo "$ac_t""no" 1>&6
|
||||
|
||||
echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6
|
||||
echo "configure:5069: checking for pthread_create in -lc" >&5
|
||||
echo "configure:5071: checking for pthread_create in -lc" >&5
|
||||
echo "
|
||||
#include <pthread.h>
|
||||
void *foo(void *v) { return v; }
|
||||
|
|
@ -5217,7 +5219,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:5221: checking whether ${CC-cc} accepts -pthread" >&5
|
||||
echo "configure:5223: 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
|
||||
|
|
@ -5240,7 +5242,7 @@ echo "configure:5221: 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:5244: checking whether ${CC-cc} accepts -pthreads" >&5
|
||||
echo "configure:5246: 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
|
||||
|
|
|
|||
|
|
@ -1634,12 +1634,14 @@ mips-sony-newsos*)
|
|||
fi
|
||||
PR_MD_CSRCS=solaris.c
|
||||
LD=/usr/ccs/bin/ld
|
||||
DSO_LDOPTS='-G -h $(notdir $@) -z combreloc'
|
||||
MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
|
||||
RESOLVE_LINK_SYMBOLS=1
|
||||
if test -n "$GNU_CC"; then
|
||||
DSO_CFLAGS=-fPIC
|
||||
DSO_LDOPTS='-B/usr/ccs/bin/ -shared -Wl,-h,$(notdir $@),-z,combreloc,-z,defs'
|
||||
else
|
||||
DSO_CFLAGS=-KPIC
|
||||
DSO_LDOPTS='-G -h $(notdir $@) -z combreloc -z defs'
|
||||
fi
|
||||
if test -z "$GNU_AS"; then
|
||||
ASFLAGS="$ASFLAGS -Wa,-P"
|
||||
|
|
@ -1652,8 +1654,8 @@ mips-sony-newsos*)
|
|||
CXXFLAGS="$CXXFLAGS -MDupdate \$(DEPENDENCIES)"
|
||||
fi
|
||||
else
|
||||
CC="$CC -xstrconst"
|
||||
CXX="$CXX -Qoption cg -xstrconst"
|
||||
CFLAGS="$CFLAGS -xstrconst"
|
||||
CXXFLAGS="$CXXFLAGS -Qoption cg -xstrconst"
|
||||
if test -z "$MOZ_OPTIMIZE"; then
|
||||
CFLAGS="$CFLAGS -xs"
|
||||
CXXFLAGS="$CXXFLAGS -xs"
|
||||
|
|
|
|||
|
|
@ -81,8 +81,12 @@ ifeq ($(OS_ARCH),SunOS)
|
|||
OS_LIBS = -lc
|
||||
MAPFILE = $(OBJDIR)/pldsmap.sun
|
||||
GARBAGE += $(MAPFILE)
|
||||
ifdef NS_USE_GCC
|
||||
MKSHLIB += -Wl,-M,$(MAPFILE)
|
||||
else
|
||||
MKSHLIB += -M $(MAPFILE)
|
||||
endif
|
||||
endif
|
||||
|
||||
EXTRA_LIBS = $(LIBNSPR)
|
||||
|
||||
|
|
|
|||
|
|
@ -90,8 +90,12 @@ ifeq ($(OS_ARCH),SunOS)
|
|||
OS_LIBS = -lc
|
||||
MAPFILE = $(OBJDIR)/plcmap.sun
|
||||
GARBAGE += $(MAPFILE)
|
||||
ifdef NS_USE_GCC
|
||||
MKSHLIB += -Wl,-M,$(MAPFILE)
|
||||
else
|
||||
MKSHLIB += -M $(MAPFILE)
|
||||
endif
|
||||
endif
|
||||
|
||||
EXTRA_LIBS = $(LIBNSPR)
|
||||
|
||||
|
|
|
|||
|
|
@ -71,14 +71,10 @@ OS_LIBS = -lm
|
|||
else # 4.1.3_U1
|
||||
MAPFILE = $(OBJDIR)/nsprmap.sun
|
||||
GARBAGE += $(MAPFILE)
|
||||
ifdef NS_USE_GCC
|
||||
MKSHLIB += -Wl,-M,$(MAPFILE)
|
||||
else
|
||||
MKSHLIB += -M $(MAPFILE)
|
||||
#
|
||||
# A "cpu" subdirectory will be created in this directory if NSDISTMODE
|
||||
# is not "copy". (See the comments in pr/src/md/unix/Makefile.in for
|
||||
# the reason.) This needs to be removed, too.
|
||||
#
|
||||
ifneq ($(NSDISTMODE),copy)
|
||||
GARBAGE += cpu
|
||||
endif
|
||||
#
|
||||
# In Solaris 2.6 or earlier, -lrt is called -lposix4.
|
||||
|
|
@ -101,7 +97,7 @@ endif # LOCAL_THREADS_ONLY
|
|||
endif # USE_PTHREADS
|
||||
ifeq ($(OS_TEST),sun4u)
|
||||
ifndef USE_64
|
||||
DSO_LDOPTS += -f \$$ORIGIN/cpu/\$$ISALIST/lib$(ULTRASPARC_LIBRARY)$(LIBRARY_VERSION).so
|
||||
DSO_LDOPTS += -Wl,-f,\$$ORIGIN/cpu/\$$ISALIST/lib$(ULTRASPARC_LIBRARY)$(LIBRARY_VERSION).so
|
||||
endif
|
||||
endif # sun4u
|
||||
endif # 4.1.3_U1
|
||||
|
|
|
|||
|
|
@ -113,6 +113,11 @@ ifneq ($(NSDISTMODE),copy)
|
|||
$(INSTALL) -m 444 $@ ../../cpu/sparcv8plus
|
||||
endif
|
||||
|
||||
ifneq ($(NSDISTMODE),copy)
|
||||
clobber realclean clobber_all distclean::
|
||||
rm -rf ../../cpu
|
||||
endif
|
||||
|
||||
$(ULTRASPARC_ASOBJS): $(ULTRASPARC_ASFILES)
|
||||
/usr/ccs/bin/as -o $@ -K PIC -P -D_ASM -D__STDC__=0 -xarch=v8plus $<
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче