-dnl Figure out the current CPU.
-catacomb_CPU_FAMILIES([catacomb_CLEAR_FLAGS])
-case $CPUFAM in
- m4_define([catacomb_DEFINE_CPU],
- [m4_ifdef([catacomb_seen_cpu/$2], [],
- [$2)
- AC_DEFINE([CPUFAM_]m4_translit([$2], [a-z], [A-Z]), [1],
- [Define if host CPU family is \`$2\'.])
- ;;m4_define([catacomb_seen_cpu/$2], [t])])])
- catacomb_CPU_FAMILIES([catacomb_DEFINE_CPU])
+dnl Now check the assembler. We have target-specific requirements here, so
+dnl we couldn't do this any earlier.
+AC_CACHE_CHECK(
+ [whether the assembler is likely to work], [mdw_cv_gnuish_as],
+ [AC_LANG_PUSH([CPPAS])
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
+ .text
+ .L\$_test = 23
+.macro mymac
+ .L\$_test = .L\$_test + 1
+.endm
+ .globl foo
+ .extern bar
+ mymac]])],
+ [mdw_cv_gnuish_as=yes], [mdw_cv_gnuish_as=no])
+ case $CPUFAM in
+ x86 | amd64)
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
+ .text
+ .arch pentium4
+ .intel_syntax noprefix
+ .globl foo
+foo:
+ adc dword ptr var, 0
+ ret
+ .data
+var: .long 1
+ ]])],
+ [:], [mdw_cv_gnuish_as=no])
+ ;;
+ esac
+ AC_LANG_POP([CPPAS])])
+AM_CONDITIONAL([GNUISH_AS], [test $mdw_cv_gnuish_as = yes])
+if test $mdw_cv_gnuish_as = no; then CPUFAM=nil ABI=nil; fi
+
+dnl A hairy macro used to set the `CPUFAM_...' and `ABI_...' variables. We
+dnl basically need to do the same thing for the family and ABI, so it's worth
+dnl some effort to hide the ugliness.
+m4_define([catacomb_DEFINE_CPU_OR_ABI],
+[case $$1 in
+ m4_define([_def],
+ [m4_ifdef([catacomb_seen_$3/$$2], [],
+ [$$2)
+ AC_DEFINE([$4]m4_translit([$$2], [a-z], [A-Z]), [1], [$5])
+ ;;m4_define([catacomb_seen_$3/$$2], [t])])])
+ catacomb_CPU_FAMILIES([_def])