diff options
author | Zoltan Varga <vargaz@gmail.com> | 2010-12-02 09:06:49 +0300 |
---|---|---|
committer | Zoltan Varga <vargaz@gmail.com> | 2010-12-02 09:06:49 +0300 |
commit | dc02f96de993f9b478e0ad66d285bda8b05e4460 (patch) | |
tree | 92d3a59c30254f79cef4f3e5bfb5cf698acf86b3 /libgc | |
parent | 2c5ff41b8b529d629480339d9433db11da54ec1c (diff) |
Revert "Fix the OSC build breakage by only compiling mach_dep.c on openbsd."
This reverts commit 103450e4a270ed47fa93fc0a99fcdb95e602c5fa.
Diffstat (limited to 'libgc')
-rw-r--r-- | libgc/Makefile.am | 8 | ||||
-rw-r--r-- | libgc/configure.in | 2 |
2 files changed, 1 insertions, 9 deletions
diff --git a/libgc/Makefile.am b/libgc/Makefile.am index d4c1c24bb82..45d4b0f6925 100644 --- a/libgc/Makefile.am +++ b/libgc/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/libgc/configure.in b/libgc/configure.in index c260afc59c4..8c735a1760d 100644 --- a/libgc/configure.in +++ b/libgc/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([],[ |