Hopefully fix the ia64 libgc build.

diff --git a/libgc/Makefile.am b/libgc/Makefile.am
index 45d4b0f69255b24785eac57e91d41a4c6e9bc5cc..2a4fa0a3411b6ee30a14cb878cdbcec6b425c4b6 100644 (file)
--- a/libgc/Makefile.am
+++ b/libgc/Makefile.am
@@ -36,6 +36,8 @@ EXTRA_DIST =
 
 if POWERPC_DARWIN
 asm_libgc_sources = powerpc_darwin_mach_dep.s
+else if TARGET_IA64
+asm_libgc_sources = ia64_save_regs_in_stack.s
 else
 asm_libgc_sources = 
 endif

diff --git a/libgc/configure.in b/libgc/configure.in
index 8c735a1760d8a739a7fe0d58a109e31b44476862..c7ce110c6c2a490f4ce36c6f8a14f8f8d34a4f35 100644 (file)
--- a/libgc/configure.in
+++ b/libgc/configure.in
@@ -337,7 +337,8 @@ case "$host" in
     machdep="sparc_mach_dep.lo"
     ;;
  ia64-*-*)
-    machdep="mach_dep.lo ia64_save_regs_in_stack.lo"
+     machdep="mach_dep.lo ia64_save_regs_in_stack.lo"
+       target_ia64=true
     ;;
 esac
 if test x"$machdep" = x; then
@@ -345,11 +346,18 @@ AC_MSG_RESULT($machdep)
    machdep="mach_dep.lo"
 fi
 addobjs="$addobjs $machdep"
-AC_SUBST(addobjs)
+#
+# Adding object files directly to _LIBADD breaks -j builds, so we need to add the sources
+# instead, but _SOURCES can't contain autoconf substitutions, so add them using automake
+# conditionals.
+#
+#AC_SUBST(addobjs)
 AC_SUBST(addincludes)
 AC_SUBST(addlibs)
 AC_SUBST(addtests)
 
+AM_CONDITIONAL(TARGET_IA64,test x$target_ia64 = xtrue)
+
 AC_PROG_LIBTOOL
 # Use dolt (http://dolt.freedesktop.org/) instead of libtool for building.
 DOLT