From: Zoltan Varga <vargaz@gmail.com>
Date: Sat, 4 Dec 2010 08:18:57 +0000 (+0100)
Subject: Hopefully fix the ia64 libgc build.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7c566fb114ffae132bb1f621c97bff0043895d32;p=gc

Hopefully fix the ia64 libgc build.
---

diff --git a/Makefile.am b/Makefile.am
index 45d4b0f6..2a4fa0a3 100644
--- a/Makefile.am
+++ b/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/configure.in b/configure.in
index 8c735a17..c7ce110c 100644
--- a/configure.in
+++ b/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