configure.in: Add new THREADCXXFLAGS variable.
* configure.in: Add new THREADCXXFLAGS variable. Handle POSIX threads on alpha*-dec-osf*. * configure: Regenerate. * Makefile.am: Add THREADCXXFLAGS to AM_CXXFLAGS. * Makefile.in: Regenerate. Co-Authored-By: Rainer Orth <ro@TechFak.Uni-Bielefeld.DE> From-SVN: r69997
This commit is contained in:
parent
689a714d9f
commit
620a329bbb
5 changed files with 450 additions and 383 deletions
|
@ -1,3 +1,12 @@
|
|||
2003-07-31 Roger Sayle <roger@eyesopen.com>
|
||||
Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
|
||||
|
||||
* configure.in: Add new THREADCXXFLAGS variable.
|
||||
Handle POSIX threads on alpha*-dec-osf*.
|
||||
* configure: Regenerate.
|
||||
* Makefile.am: Add THREADCXXFLAGS to AM_CXXFLAGS.
|
||||
* Makefile.in: Regenerate.
|
||||
|
||||
2003-07-08 Andrew Haley <aph@redhat.com>
|
||||
|
||||
* include/i386-signal.h (RESTORE): New.
|
||||
|
|
|
@ -95,7 +95,7 @@ GCC_UNWIND_INCLUDE = @GCC_UNWIND_INCLUDE@
|
|||
WARNINGS = -W -Wall
|
||||
## We need _GNU_SOURCE defined for some Linux builds. It doesn't hurt
|
||||
## to always define it.
|
||||
AM_CXXFLAGS = -fno-rtti -fnon-call-exceptions \
|
||||
AM_CXXFLAGS = -fno-rtti -fnon-call-exceptions $(THREADCXXFLAGS) \
|
||||
## Some systems don't allow `$' in identifiers by default, so we force it.
|
||||
-fdollars-in-identifiers \
|
||||
## Detect bugs in the verifier implementation, and maybe other places.
|
||||
|
|
|
@ -123,6 +123,7 @@ STRIP = @STRIP@
|
|||
SYSDEP_SOURCES = @SYSDEP_SOURCES@
|
||||
SYSTEMSPEC = @SYSTEMSPEC@
|
||||
SYS_ZLIBS = @SYS_ZLIBS@
|
||||
THREADCXXFLAGS = @THREADCXXFLAGS@
|
||||
THREADDEPS = @THREADDEPS@
|
||||
THREADINCS = @THREADINCS@
|
||||
THREADLDFLAGS = @THREADLDFLAGS@
|
||||
|
@ -193,7 +194,7 @@ JAVAC = $(GCJ_WITH_FLAGS) -C
|
|||
GCC_UNWIND_INCLUDE = @GCC_UNWIND_INCLUDE@
|
||||
|
||||
WARNINGS = -W -Wall
|
||||
AM_CXXFLAGS = -fno-rtti -fnon-call-exceptions \
|
||||
AM_CXXFLAGS = -fno-rtti -fnon-call-exceptions $(THREADCXXFLAGS) \
|
||||
-fdollars-in-identifiers \
|
||||
-Wswitch-enum \
|
||||
@LIBGCJ_CXXFLAGS@ @X_CFLAGS@ $(WARNINGS) -D_GNU_SOURCE \
|
||||
|
@ -2686,13 +2687,14 @@ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
|
|||
DATA = $(jar_DATA) $(pkgconfig_DATA) $(toolexecmainlib_DATA)
|
||||
|
||||
DIST_COMMON = README COPYING ChangeLog Makefile.am Makefile.in NEWS \
|
||||
THANKS acinclude.m4 aclocal.m4 configure configure.in \
|
||||
libgcj-test.spec.in libgcj.pc.in libgcj.spec.in
|
||||
THANKS acconfig.h acinclude.m4 aclocal.m4 configure configure.in \
|
||||
gcj/libgcj-config.h.in gcj/stamp-h2.in include/config.h.in \
|
||||
include/stamp-h1.in libgcj-test.spec.in libgcj.pc.in libgcj.spec.in
|
||||
|
||||
|
||||
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
|
||||
|
||||
TAR = gtar
|
||||
TAR = tar
|
||||
GZIP_ENV = --best
|
||||
DIST_SUBDIRS = @DIRLTDL@ testsuite gcj include @DIRLTDL@ gcj include
|
||||
DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
|
||||
|
@ -4315,6 +4317,53 @@ config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
|
|||
$(SHELL) ./config.status --recheck
|
||||
$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
|
||||
cd $(srcdir) && $(AUTOCONF)
|
||||
|
||||
include/config.h: include/stamp-h1
|
||||
@if test ! -f $@; then \
|
||||
rm -f include/stamp-h1; \
|
||||
$(MAKE) include/stamp-h1; \
|
||||
else :; fi
|
||||
include/stamp-h1: $(srcdir)/include/config.h.in $(top_builddir)/config.status
|
||||
cd $(top_builddir) \
|
||||
&& CONFIG_FILES= CONFIG_HEADERS=include/config.h \
|
||||
$(SHELL) ./config.status
|
||||
@echo timestamp > include/stamp-h1 2> /dev/null
|
||||
$(srcdir)/include/config.h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/include/stamp-h1.in
|
||||
@if test ! -f $@; then \
|
||||
rm -f $(srcdir)/include/stamp-h1.in; \
|
||||
$(MAKE) $(srcdir)/include/stamp-h1.in; \
|
||||
else :; fi
|
||||
$(srcdir)/include/stamp-h1.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
|
||||
cd $(top_srcdir) && $(AUTOHEADER)
|
||||
@echo timestamp > $(srcdir)/include/stamp-h1.in 2> /dev/null
|
||||
|
||||
gcj/libgcj-config.h: gcj/stamp-h2
|
||||
@if test ! -f $@; then \
|
||||
rm -f gcj/stamp-h2; \
|
||||
$(MAKE) gcj/stamp-h2; \
|
||||
else :; fi
|
||||
gcj/stamp-h2: $(srcdir)/gcj/libgcj-config.h.in $(top_builddir)/config.status
|
||||
cd $(top_builddir) \
|
||||
&& CONFIG_FILES= CONFIG_HEADERS=gcj/libgcj-config.h \
|
||||
$(SHELL) ./config.status
|
||||
@echo timestamp > gcj/stamp-h2 2> /dev/null
|
||||
$(srcdir)/gcj/libgcj-config.h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/gcj/stamp-h2.in
|
||||
@if test ! -f $@; then \
|
||||
rm -f $(srcdir)/gcj/stamp-h2.in; \
|
||||
$(MAKE) $(srcdir)/gcj/stamp-h2.in; \
|
||||
else :; fi
|
||||
$(srcdir)/gcj/stamp-h2.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
|
||||
cd $(top_srcdir) && $(AUTOHEADER)
|
||||
@echo timestamp > $(srcdir)/gcj/stamp-h2.in 2> /dev/null
|
||||
|
||||
mostlyclean-hdr:
|
||||
|
||||
clean-hdr:
|
||||
|
||||
distclean-hdr:
|
||||
-rm -f include/config.h gcj/libgcj-config.h
|
||||
|
||||
maintainer-clean-hdr:
|
||||
libgcj.pc: $(top_builddir)/config.status libgcj.pc.in
|
||||
cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
|
||||
libgcj.spec: $(top_builddir)/config.status libgcj.spec.in
|
||||
|
@ -4779,29 +4828,32 @@ distclean-generic:
|
|||
-rm -f config.cache config.log stamp-h stamp-h[0-9]*
|
||||
|
||||
maintainer-clean-generic:
|
||||
mostlyclean-am: mostlyclean-toolexeclibLTLIBRARIES mostlyclean-compile \
|
||||
mostlyclean-libtool mostlyclean-binPROGRAMS \
|
||||
mostlyclean-noinstPROGRAMS mostlyclean-tags \
|
||||
mostlyclean-depend mostlyclean-generic
|
||||
mostlyclean-am: mostlyclean-hdr mostlyclean-toolexeclibLTLIBRARIES \
|
||||
mostlyclean-compile mostlyclean-libtool \
|
||||
mostlyclean-binPROGRAMS mostlyclean-noinstPROGRAMS \
|
||||
mostlyclean-tags mostlyclean-depend mostlyclean-generic
|
||||
|
||||
mostlyclean: mostlyclean-recursive
|
||||
|
||||
clean-am: clean-toolexeclibLTLIBRARIES clean-compile clean-libtool \
|
||||
clean-binPROGRAMS clean-noinstPROGRAMS clean-tags \
|
||||
clean-depend clean-generic mostlyclean-am clean-local
|
||||
clean-am: clean-hdr clean-toolexeclibLTLIBRARIES clean-compile \
|
||||
clean-libtool clean-binPROGRAMS clean-noinstPROGRAMS \
|
||||
clean-tags clean-depend clean-generic mostlyclean-am \
|
||||
clean-local
|
||||
|
||||
clean: clean-recursive
|
||||
|
||||
distclean-am: distclean-toolexeclibLTLIBRARIES distclean-compile \
|
||||
distclean-libtool distclean-binPROGRAMS \
|
||||
distclean-noinstPROGRAMS distclean-tags \
|
||||
distclean-depend distclean-generic clean-am
|
||||
distclean-am: distclean-hdr distclean-toolexeclibLTLIBRARIES \
|
||||
distclean-compile distclean-libtool \
|
||||
distclean-binPROGRAMS distclean-noinstPROGRAMS \
|
||||
distclean-tags distclean-depend distclean-generic \
|
||||
clean-am
|
||||
-rm -f libtool
|
||||
|
||||
distclean: distclean-recursive
|
||||
-rm -f config.status
|
||||
|
||||
maintainer-clean-am: maintainer-clean-toolexeclibLTLIBRARIES \
|
||||
maintainer-clean-am: maintainer-clean-hdr \
|
||||
maintainer-clean-toolexeclibLTLIBRARIES \
|
||||
maintainer-clean-compile maintainer-clean-libtool \
|
||||
maintainer-clean-binPROGRAMS \
|
||||
maintainer-clean-noinstPROGRAMS maintainer-clean-tags \
|
||||
|
@ -4813,9 +4865,9 @@ maintainer-clean-am: maintainer-clean-toolexeclibLTLIBRARIES \
|
|||
maintainer-clean: maintainer-clean-recursive
|
||||
-rm -f config.status
|
||||
|
||||
.PHONY: mostlyclean-toolexeclibLTLIBRARIES \
|
||||
distclean-toolexeclibLTLIBRARIES clean-toolexeclibLTLIBRARIES \
|
||||
maintainer-clean-toolexeclibLTLIBRARIES \
|
||||
.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
|
||||
mostlyclean-toolexeclibLTLIBRARIES distclean-toolexeclibLTLIBRARIES \
|
||||
clean-toolexeclibLTLIBRARIES maintainer-clean-toolexeclibLTLIBRARIES \
|
||||
uninstall-toolexeclibLTLIBRARIES install-toolexeclibLTLIBRARIES \
|
||||
mostlyclean-compile distclean-compile clean-compile \
|
||||
maintainer-clean-compile mostlyclean-libtool distclean-libtool \
|
||||
|
|
724
libjava/configure
vendored
724
libjava/configure
vendored
File diff suppressed because it is too large
Load diff
|
@ -432,6 +432,7 @@ case "$THREADS" in
|
|||
;;
|
||||
esac
|
||||
|
||||
THREADCXXFLAGS=
|
||||
THREADLDFLAGS=
|
||||
THREADLIBS=
|
||||
THREADINCS=
|
||||
|
@ -466,6 +467,12 @@ changequote([,])
|
|||
THREADLDFLAGS=-pthread
|
||||
THREADSPEC=-lc_r
|
||||
;;
|
||||
alpha*-dec-osf*)
|
||||
THREADCXXFLAGS=-pthread
|
||||
# boehm-gc needs some functions from librt, so link that too.
|
||||
THREADLIBS='-lpthread -lrt'
|
||||
THREADSPEC='-lpthread -lrt'
|
||||
;;
|
||||
*)
|
||||
THREADLIBS=-lpthread
|
||||
THREADSPEC=-lpthread
|
||||
|
@ -503,6 +510,7 @@ AC_SUBST(THREADDEPS)
|
|||
AC_SUBST(THREADOBJS)
|
||||
AC_SUBST(THREADSPEC)
|
||||
AC_SUBST(THREADLDFLAGS)
|
||||
AC_SUBST(THREADCXXFLAGS)
|
||||
|
||||
if test -d sysdep; then true; else mkdir sysdep; fi
|
||||
AC_LINK_FILES(sysdep/$sysdeps_dir/locks.h, sysdep/locks.h)
|
||||
|
|
Loading…
Add table
Reference in a new issue