Makefile.in: Rebuilt.

	* Makefile.in: Rebuilt.
	* Makefile.am (libgcjgc_a_SOURCES): Added solaris-threads.c and
	solaris-threads.h.

From-SVN: r26407

5 files changed, 66 insertions, 6 deletions

diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog
index 24a26aecfae..0b066bc1c51 100644
--- a/boehm-gc/ChangeLog
+++ b/boehm-gc/ChangeLog
@@ -1,3 +1,14 @@
+1999-04-13  Tom Tromey  <tromey@cygnus.com>
+
+	* Makefile.in: Rebuilt.
+	* Makefile.am (libgcjgc_a_SOURCES): Added solaris-threads.c and
+	solaris-threads.h.
+
+1999-04-09  Tom Tromey  <tromey@cygnus.com>
+
+	* configure: Rebuilt.
+	* configure.in: Use sparc_mach_dep.s when building on Solaris.
+
 1999-02-23  Tom Tromey  <tromey@cygnus.com>
 
 	* configure: Rebuilt.
diff --git a/boehm-gc/Makefile.am b/boehm-gc/Makefile.am
index fba2c1f4745..5b0742d5001 100644
--- a/boehm-gc/Makefile.am
+++ b/boehm-gc/Makefile.am
@@ -25,8 +25,9 @@ config.h dbg_mlc.c dyn_load.c finalize.c gc.h gc_alloc.h gc_cpp.h \
 gc_hdrs.h gc_mark.h gc_priv.h gc_private.h gc_typed.h headers.c	\
 irix_threads.c linux_threads.c malloc.c mallocx.c mark.c mark_rts.c \
 misc.c new_hblk.c obj_map.c os_dep.c pcr_interface.c ptr_chck.c	\
-quick_threads.c real_malloc.c reclaim.c solaris_pthreads.c stubborn.c \
-typd_mlc.c version.h weakpointer.h
+quick_threads.c real_malloc.c reclaim.c solaris_pthreads.c \
+solaris_threads.c solaris_threads.h stubborn.c typd_mlc.c version.h \
+weakpointer.h
 libgcjgc_a_LIBADD = @addobjs@
 libgcjgc_a_DEPENDENCIES = @addobjs@
 
diff --git a/boehm-gc/Makefile.in b/boehm-gc/Makefile.in
index 11454745016..693906ca2cd 100644
--- a/boehm-gc/Makefile.in
+++ b/boehm-gc/Makefile.in
@@ -98,12 +98,21 @@ toollibdir = $(tooldir)/lib$(MULTISUBDIR)
 
 toollib_LIBRARIES = $(target_all)
 EXTRA_LIBRARIES = libgcjgc.a
-libgcjgc_a_SOURCES = allchblk.c alloc.c blacklst.c checksums.c config.h dbg_mlc.c dyn_load.c finalize.c gc.h gc_alloc.h gc_cpp.h gc_hdrs.h gc_mark.h gc_priv.h gc_private.h gc_typed.h headers.c	irix_threads.c linux_threads.c malloc.c mallocx.c mark.c mark_rts.c misc.c new_hblk.c obj_map.c os_dep.c pcr_interface.c ptr_chck.c	quick_threads.c real_malloc.c reclaim.c solaris_pthreads.c stubborn.c typd_mlc.c version.h weakpointer.h
+libgcjgc_a_SOURCES = allchblk.c alloc.c blacklst.c checksums.c \
+config.h dbg_mlc.c dyn_load.c finalize.c gc.h gc_alloc.h gc_cpp.h \
+gc_hdrs.h gc_mark.h gc_priv.h gc_private.h gc_typed.h headers.c	\
+irix_threads.c linux_threads.c malloc.c mallocx.c mark.c mark_rts.c \
+misc.c new_hblk.c obj_map.c os_dep.c pcr_interface.c ptr_chck.c	\
+quick_threads.c real_malloc.c reclaim.c solaris_pthreads.c \
+solaris_threads.c solaris_threads.h stubborn.c typd_mlc.c version.h \
+weakpointer.h
 
 libgcjgc_a_LIBADD = @addobjs@
 libgcjgc_a_DEPENDENCIES = @addobjs@
 
-EXTRA_libgcjgc_a_SOURCES = alpha_mach_dep.s mips_sgi_mach_dep.s	mips_ultrix_mach_dep.s rs6000_mach_dep.s sparc_mach_dep.s sparc_sunos4_mach_dep.s mach_dep.c ecos.cc
+EXTRA_libgcjgc_a_SOURCES = alpha_mach_dep.s mips_sgi_mach_dep.s	\
+mips_ultrix_mach_dep.s rs6000_mach_dep.s sparc_mach_dep.s \
+sparc_sunos4_mach_dep.s mach_dep.c ecos.cc
 
 
 AM_CXXFLAGS = @BOEHM_GC_CFLAGS@
@@ -122,7 +131,43 @@ LINK = $(CC) $(AM_CFLAGS) $(MY_CFLAGS) $(LDFLAGS) -o $@
 # Work around what appears to be a GNU make bug handling MAKEFLAGS
 # values defined in terms of make variables, as is the case for CC and
 # friends when we are called from the top level Makefile.
-AM_MAKEFLAGS =  	"AR_FLAGS=$(AR_FLAGS)" 	"CC_FOR_BUILD=$(CC_FOR_BUILD)" 	"CFLAGS=$(CFLAGS)" 	"CXXFLAGS=$(CXXFLAGS)" 	"CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" 	"CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" 	"INSTALL=$(INSTALL)" 	"INSTALL_DATA=$(INSTALL_DATA)" 	"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" 	"INSTALL_SCRIPT=$(INSTALL_SCRIPT)" 	"LDFLAGS=$(LDFLAGS)" 	"LIBCFLAGS=$(LIBCFLAGS)" 	"LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" 	"MAKE=$(MAKE)" 	"MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" 	"PICFLAG=$(PICFLAG)" 	"PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" 	"SHELL=$(SHELL)" 	"EXPECT=$(EXPECT)" 	"RUNTEST=$(RUNTEST)" 	"RUNTESTFLAGS=$(RUNTESTFLAGS)" 	"exec_prefix=$(exec_prefix)" 	"infodir=$(infodir)" 	"libdir=$(libdir)" 	"prefix=$(prefix)" 	"tooldir=$(tooldir)" 	"AR=$(AR)" 	"AS=$(AS)" 	"CC=$(CC)" 	"CXX=$(CXX)" 	"LD=$(LD)" 	"LIBCFLAGS=$(LIBCFLAGS)" 	"NM=$(NM)" 	"PICFLAG=$(PICFLAG)" 	"RANLIB=$(RANLIB)" 	"DESTDIR=$(DESTDIR)"
+AM_MAKEFLAGS = \
+	"AR_FLAGS=$(AR_FLAGS)" \
+	"CC_FOR_BUILD=$(CC_FOR_BUILD)" \
+	"CFLAGS=$(CFLAGS)" \
+	"CXXFLAGS=$(CXXFLAGS)" \
+	"CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
+	"CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \
+	"INSTALL=$(INSTALL)" \
+	"INSTALL_DATA=$(INSTALL_DATA)" \
+	"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
+	"INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \
+	"LDFLAGS=$(LDFLAGS)" \
+	"LIBCFLAGS=$(LIBCFLAGS)" \
+	"LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \
+	"MAKE=$(MAKE)" \
+	"MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \
+	"PICFLAG=$(PICFLAG)" \
+	"PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \
+	"SHELL=$(SHELL)" \
+	"EXPECT=$(EXPECT)" \
+	"RUNTEST=$(RUNTEST)" \
+	"RUNTESTFLAGS=$(RUNTESTFLAGS)" \
+	"exec_prefix=$(exec_prefix)" \
+	"infodir=$(infodir)" \
+	"libdir=$(libdir)" \
+	"prefix=$(prefix)" \
+	"tooldir=$(tooldir)" \
+	"AR=$(AR)" \
+	"AS=$(AS)" \
+	"CC=$(CC)" \
+	"CXX=$(CXX)" \
+	"LD=$(LD)" \
+	"LIBCFLAGS=$(LIBCFLAGS)" \
+	"NM=$(NM)" \
+	"PICFLAG=$(PICFLAG)" \
+	"RANLIB=$(RANLIB)" \
+	"DESTDIR=$(DESTDIR)"
 
 
 CONFIG_STATUS_DEPENDENCIES = $(boehm_gc_basedir)/configure.host
@@ -142,7 +187,8 @@ libgcjgc_a_OBJECTS =  allchblk.o alloc.o blacklst.o checksums.o \
 dbg_mlc.o dyn_load.o finalize.o headers.o irix_threads.o \
 linux_threads.o malloc.o mallocx.o mark.o mark_rts.o misc.o new_hblk.o \
 obj_map.o os_dep.o pcr_interface.o ptr_chck.o quick_threads.o \
-real_malloc.o reclaim.o solaris_pthreads.o stubborn.o typd_mlc.o
+real_malloc.o reclaim.o solaris_pthreads.o solaris_threads.o stubborn.o \
+typd_mlc.o
 check_PROGRAMS =  gctest$(EXEEXT)
 gctest_OBJECTS =  test.o
 gctest_DEPENDENCIES =  ./libgcjgc.a
diff --git a/boehm-gc/configure b/boehm-gc/configure
index cbbc4d236d5..a5f305aa369 100755
--- a/boehm-gc/configure
+++ b/boehm-gc/configure
@@ -1756,6 +1756,7 @@ EOF
 
     ;;
  sparc-sun-solaris2.3*)
+    machdep="sparc_mach_dep.o"
     cat >> confdefs.h <<\EOF
 #define SUNOS53_SHARED_LIB 1
 EOF
diff --git a/boehm-gc/configure.in b/boehm-gc/configure.in
index 224c4668031..6a4850f17dd 100644
--- a/boehm-gc/configure.in
+++ b/boehm-gc/configure.in
@@ -133,6 +133,7 @@ case "$host" in
     AC_DEFINE(DATASTART_IS_ETEXT)
     ;;
  sparc-sun-solaris2.3*)
+    machdep="sparc_mach_dep.o"
     AC_DEFINE(SUNOS53_SHARED_LIB)
     ;;
 esac