configure: Move 'mach_dep' file processing logic to Makefile.am

* Makefile.am (libgc_la_SOURCES): Add "mach_dep.c"; order entries
lexicographically.
* Makefile.am (EXTRA_DIST): Remove "mach_dep.c" entry.
* configure.ac (machdep): Do not add "mach_dep.lo" entry; remove empty
case block; merge similar case blocks (for "sparc_mach_dep.lo").

diff --git a/Makefile.am b/Makefile.am
index 21a2056ffb8de6fbca700a84a2de5ff7bd3ce340..15fcee31df39be0f3e6dc5f13e1e06aabe908f05 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -50,12 +50,11 @@ pkgconfig_DATA = bdw-gc.pc
 
 lib_LTLIBRARIES += libgc.la
 libgc_la_SOURCES = \
-    allchblk.c alloc.c blacklst.c checksums.c dbg_mlc.c \
+    allchblk.c alloc.c backgraph.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 \
+    mach_dep.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 real_malloc.c reclaim.c \
-    specific.c stubborn.c typd_mlc.c \
-    backgraph.c thread_local_alloc.c
+    specific.c stubborn.c thread_local_alloc.c typd_mlc.c
 
 # C Library: Architecture Dependent
 # ---------------------------------
@@ -171,7 +170,7 @@ EXTRA_DIST += BCC_MAKEFILE NT_MAKEFILE \
 #
 EXTRA_DIST += tools/add_gc_prefix.c tools/gcname.c tools/if_mach.c \
     tools/if_not_there.c tools/setjmp_t.c tools/threadlibs.c \
-    gc.mak extra/gc.c extra/MacOS.c mach_dep.c extra/AmigaOS.c \
+    gc.mak extra/gc.c extra/MacOS.c extra/AmigaOS.c \
     Mac_files/datastart.c Mac_files/dataend.c \
     Mac_files/MacOS_config.h Mac_files/MacOS_Test_config.h \
     include/private/msvc_dbg.h extra/msvc_dbg.c tools/callprocs.sh

diff --git a/configure.ac b/configure.ac
index 5edca05ac60967bd020bb3c3afd81438801774d8..c18ac1a03b14a9ff41c8b52c51f0c32635e80dac 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -491,63 +491,39 @@ AC_MSG_CHECKING(which machine-dependent code should be used)
 machdep=
 case "$host" in
  alpha-*-openbsd*)
-    machdep="mach_dep.lo"
     if test x"${ac_cv_lib_dl_dlopen}" != xyes ; then
        AC_MSG_WARN(OpenBSD/Alpha without dlopen(). Shared library support is disabled)
     fi
     ;;
- alpha*-*-linux*)
-    machdep="mach_dep.lo"
-    ;;
  i?86-*-solaris2.[[89]])
     # PROC_VDB appears to work in 2.8 and 2.9 but not in 2.10+ (for now).
     AC_DEFINE([SOLARIS25_PROC_VDB_BUG_FIXED], 1,
               [See the comment in gcconfig.h.])
     ;;
- mipstx39-*-elf*)
-    machdep="mach_dep.lo"
-    ;;
- mips-dec-ultrix*)
-    machdep="mach-dep.lo"
-    ;;
- mips-nec-sysv*|mips-unknown-sysv*)
-    ;;
- mips*-*-linux*)
-    ;;
  mips-*-*)
-    machdep="mach_dep.lo"
     dnl AC_DEFINE(NO_EXECUTE_PERMISSION)
     dnl This is now redundant, but it is also important for incremental GC
     dnl performance under Irix.
     ;;
- sparc*-*-linux*)
-    machdep="mach_dep.lo src/sparc_mach_dep.lo"
-    ;;
  sparc-*-netbsd*)
-    machdep="mach_dep.lo src/sparc_netbsd_mach_dep.lo"
+    machdep="src/sparc_netbsd_mach_dep.lo"
     ;;
- sparc64-*-netbsd*)
-    machdep="mach_dep.lo src/sparc_mach_dep.lo"
-    ;;
- sparc*-*-openbsd*)
-    machdep="mach_dep.lo src/sparc_mach_dep.lo"
+ sparc*-*-linux* | sparc*-*-openbsd* | sparc64-*-netbsd*)
+    machdep="src/sparc_mach_dep.lo"
     ;;
  sparc-sun-solaris2.3)
-    machdep="mach_dep.lo src/sparc_mach_dep.lo"
+    machdep="src/sparc_mach_dep.lo"
     AC_DEFINE(SUNOS53_SHARED_LIB, 1,
               [Define to work around a Solaris 5.3 bug (see dyn_load.c).])
     ;;
  sparc*-sun-solaris2*)
-    machdep="mach_dep.lo src/sparc_mach_dep.lo"
+    machdep="src/sparc_mach_dep.lo"
     ;;
  ia64-*-*)
-    machdep="mach_dep.lo src/ia64_save_regs_in_stack.lo"
+    machdep="src/ia64_save_regs_in_stack.lo"
     ;;
 esac
-if test x"$machdep" = x; then
 AC_MSG_RESULT($machdep)
-   machdep="mach_dep.lo"
-fi
 addobjs="$addobjs $machdep"
 AC_SUBST(addobjs)
 AC_SUBST(addlibs)