Revert "Fix the OSC build breakage by only compiling mach_dep.c on openbsd."

This reverts commit 103450e4a270ed47fa93fc0a99fcdb95e602c5fa.

diff --git a/Makefile.am b/Makefile.am
index d4c1c24bb823818e22fbdc9d9172892243a9d086..45d4b0f69255b24785eac57e91d41a4c6e9bc5cc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,12 +40,6 @@ else
 asm_libgc_sources = 
 endif
 
-if OPENBSD
-os_libgc_sources = mach_dep.c
-else
-os_libgc_sources =
-endif
-
 libmonogc_la_SOURCES = allchblk.c alloc.c blacklst.c checksums.c dbg_mlc.c \
 dyn_load.c finalize.c gc_dlopen.c gcj_mlc.c headers.c \
 malloc.c mallocx.c mark.c mark_rts.c misc.c new_hblk.c \
@@ -53,7 +47,7 @@ obj_map.c os_dep.c pcr_interface.c ptr_chck.c real_malloc.c reclaim.c \
 solaris_pthreads.c solaris_threads.c specific.c stubborn.c typd_mlc.c \
 backgraph.c win32_threads.c \
 pthread_support.c pthread_stop_world.c darwin_stop_world.c \
-openbsd_stop_world.c $(os_libgc_sources) $(asm_libgc_sources)
+openbsd_stop_world.c mach_dep.c $(asm_libgc_sources)
 
 # Include THREADDLLIBS here to ensure that the correct versions of
 # linuxthread semaphore functions get linked:

diff --git a/configure.in b/configure.in
index c260afc59c425e9419e7e03a6840445bf1ae3f14..8c735a1760d8a739a7fe0d58a109e31b44476862 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -153,7 +153,6 @@ case "$THREADS" in
          AC_DEFINE(PARALLEL_MARK)
        fi
        AC_DEFINE(THREAD_LOCAL_ALLOC)
-       openbsd=true
        ;;
      *-*-osf*)
        AC_DEFINE(GC_OSF1_THREADS)
@@ -214,7 +213,6 @@ case "$host" in
       ;;
 esac
 AM_CONDITIONAL(POWERPC_DARWIN,test x$powerpc_darwin = xtrue)
-AM_CONDITIONAL(OPENBSD,test x$openbsd = xtrue)
 
 AC_MSG_CHECKING(for xlc)
 AC_TRY_COMPILE([],[