Commit 7f6e0fe6 by Tom Tromey

re GNATS libgcj/15 (_REENTRANT should be defined more consistently)

	Fix for PR libgcj/15:
	* java/util/natGregorianCalendar.cc (_REENTRANT,
	_POSIX_PTHREAD_SEMANTICS): Don't define.
	* java/net/natInetAddress.cc (_REENTRANT): Don't define.
	* java/lang/natSystem.cc (_REENTRANT, _POSIX_PTHREAD_SEMANTICS):
	Don't define.
	* java/io/natFile.cc (_REENTRANT, _POSIX_PTHREAD_SEMANTICS): Don't
	define.
	* configure: Rebuilt.
	* configure.in: If using POSIX threads, define _REENTRANT if
	needed.  Define _POSIX_PTHREAD_SEMANTICS.  Don't define
	GETHOSTBYNAME_R_NEEDS_REENTRANT.

From-SVN: r33319
parent 7234f9bc
...@@ -842,8 +842,9 @@ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ ...@@ -842,8 +842,9 @@ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
DATA = $(data_DATA) $(toolexeclib_DATA) DATA = $(data_DATA) $(toolexeclib_DATA)
DIST_COMMON = README COPYING ChangeLog Makefile.am Makefile.in NEWS \ DIST_COMMON = README COPYING ChangeLog Makefile.am Makefile.in NEWS \
THANKS acinclude.m4 aclocal.m4 configure configure.in \ THANKS acconfig.h acinclude.m4 aclocal.m4 configure configure.in \
libgcj-test.spec.in libgcj.spec.in include/config.h.in include/stamp-h.in libgcj-test.spec.in \
libgcj.spec.in
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
...@@ -1156,6 +1157,34 @@ config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) ...@@ -1156,6 +1157,34 @@ config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck $(SHELL) ./config.status --recheck
$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) $(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
cd $(srcdir) && $(AUTOCONF) cd $(srcdir) && $(AUTOCONF)
include/config.h: include/stamp-h
@if test ! -f $@; then \
rm -f include/stamp-h; \
$(MAKE) include/stamp-h; \
else :; fi
include/stamp-h: $(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-h 2> /dev/null
$(srcdir)/include/config.h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/include/stamp-h.in
@if test ! -f $@; then \
rm -f $(srcdir)/include/stamp-h.in; \
$(MAKE) $(srcdir)/include/stamp-h.in; \
else :; fi
$(srcdir)/include/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
cd $(top_srcdir) && $(AUTOHEADER)
@echo timestamp > $(srcdir)/include/stamp-h.in 2> /dev/null
mostlyclean-hdr:
clean-hdr:
distclean-hdr:
-rm -f include/config.h
maintainer-clean-hdr:
libgcj.spec: $(top_builddir)/config.status libgcj.spec.in libgcj.spec: $(top_builddir)/config.status libgcj.spec.in
cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
libgcj-test.spec: $(top_builddir)/config.status libgcj-test.spec.in libgcj-test.spec: $(top_builddir)/config.status libgcj-test.spec.in
...@@ -1599,31 +1628,33 @@ distclean-generic: ...@@ -1599,31 +1628,33 @@ distclean-generic:
-rm -f config.cache config.log stamp-h stamp-h[0-9]* -rm -f config.cache config.log stamp-h stamp-h[0-9]*
maintainer-clean-generic: maintainer-clean-generic:
mostlyclean-am: mostlyclean-toolexeclibLIBRARIES mostlyclean-compile \ mostlyclean-am: mostlyclean-hdr mostlyclean-toolexeclibLIBRARIES \
mostlyclean-libtool mostlyclean-toolexeclibLTLIBRARIES \ mostlyclean-compile mostlyclean-libtool \
mostlyclean-toolexeclibLTLIBRARIES \
mostlyclean-binPROGRAMS mostlyclean-noinstPROGRAMS \ mostlyclean-binPROGRAMS mostlyclean-noinstPROGRAMS \
mostlyclean-tags mostlyclean-depend mostlyclean-generic mostlyclean-tags mostlyclean-depend mostlyclean-generic
mostlyclean: mostlyclean-recursive mostlyclean: mostlyclean-recursive
clean-am: clean-toolexeclibLIBRARIES clean-compile clean-libtool \ clean-am: clean-hdr clean-toolexeclibLIBRARIES clean-compile \
clean-toolexeclibLTLIBRARIES clean-binPROGRAMS \ clean-libtool clean-toolexeclibLTLIBRARIES \
clean-noinstPROGRAMS clean-tags clean-depend \ clean-binPROGRAMS clean-noinstPROGRAMS clean-tags \
clean-generic mostlyclean-am clean-local clean-depend clean-generic mostlyclean-am clean-local
clean: clean-recursive clean: clean-recursive
distclean-am: distclean-toolexeclibLIBRARIES distclean-compile \ distclean-am: distclean-hdr distclean-toolexeclibLIBRARIES \
distclean-libtool distclean-toolexeclibLTLIBRARIES \ distclean-compile distclean-libtool \
distclean-binPROGRAMS distclean-noinstPROGRAMS \ distclean-toolexeclibLTLIBRARIES distclean-binPROGRAMS \
distclean-tags distclean-depend distclean-generic \ distclean-noinstPROGRAMS distclean-tags \
clean-am distclean-depend distclean-generic clean-am
-rm -f libtool -rm -f libtool
distclean: distclean-recursive distclean: distclean-recursive
-rm -f config.status -rm -f config.status
maintainer-clean-am: maintainer-clean-toolexeclibLIBRARIES \ maintainer-clean-am: maintainer-clean-hdr \
maintainer-clean-toolexeclibLIBRARIES \
maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-compile maintainer-clean-libtool \
maintainer-clean-toolexeclibLTLIBRARIES \ maintainer-clean-toolexeclibLTLIBRARIES \
maintainer-clean-binPROGRAMS \ maintainer-clean-binPROGRAMS \
...@@ -1636,7 +1667,8 @@ maintainer-clean-am: maintainer-clean-toolexeclibLIBRARIES \ ...@@ -1636,7 +1667,8 @@ maintainer-clean-am: maintainer-clean-toolexeclibLIBRARIES \
maintainer-clean: maintainer-clean-recursive maintainer-clean: maintainer-clean-recursive
-rm -f config.status -rm -f config.status
.PHONY: mostlyclean-toolexeclibLIBRARIES distclean-toolexeclibLIBRARIES \ .PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
mostlyclean-toolexeclibLIBRARIES distclean-toolexeclibLIBRARIES \
clean-toolexeclibLIBRARIES maintainer-clean-toolexeclibLIBRARIES \ clean-toolexeclibLIBRARIES maintainer-clean-toolexeclibLIBRARIES \
uninstall-toolexeclibLIBRARIES install-toolexeclibLIBRARIES \ uninstall-toolexeclibLIBRARIES install-toolexeclibLIBRARIES \
mostlyclean-compile distclean-compile clean-compile \ mostlyclean-compile distclean-compile clean-compile \
......
...@@ -332,6 +332,13 @@ case "$THREADS" in ...@@ -332,6 +332,13 @@ case "$THREADS" in
# But for now we don't check for it. We just assume you aren't # But for now we don't check for it. We just assume you aren't
# using MIT pthreads. # using MIT pthreads.
AC_DEFINE(HAVE_PTHREAD_MUTEXATTR_INIT) AC_DEFINE(HAVE_PTHREAD_MUTEXATTR_INIT)
# If we're using the Boehm GC, then we happen to know that it
# defines _REENTRANT, so we don't bother. Eww.
if test "$GC" != boehm; then
AC_DEFINE(_REENTRANT, 1, [Required define if using POSIX threads])
fi
AC_DEFINE(_POSIX_PTHREAD_SEMANTICS, 1, [Required define if using POSIX threads])
;; ;;
none) none)
...@@ -440,7 +447,7 @@ else ...@@ -440,7 +447,7 @@ else
AC_LANG_RESTORE AC_LANG_RESTORE
]) ])
if test "x$libjava_cv_gethostbyname_r_needs_reentrant" = xyes; then if test "x$libjava_cv_gethostbyname_r_needs_reentrant" = xyes; then
AC_DEFINE(GETHOSTBYNAME_R_NEEDS_REENTRANT, 1, [Define if gethostbyname_r is only declared if _REENTRANT is defined]) AC_DEFINE(_REENTRANT, 1, [Required define if using POSIX threads])
fi fi
;; ;;
esac esac
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment