* expr.c (operand): Check correctly that there is no advance in

[deliverable/binutils-gdb.git] / gas / configure.in

diff --git a/gas/configure.in b/gas/configure.in
index 093014ba1fea01c9394b03701f6b278a827b9378..099f62ec494cb18fca9d8c442e61a62f2834117e 100644 (file)
--- a/gas/configure.in
+++ b/gas/configure.in
@@ -140,9 +140,7 @@ changequote([,])dnl
       arm-*-pe | thumb-*-pe)               fmt=coff em=pe ;;
 
       d10v-*-*)                    fmt=elf bfd_gas=yes ;;
-# start-sanitize-d30v
       d30v-*-*)                    fmt=elf bfd_gas=yes ;;
-# end-sanitize-d30v
 
       hppa-*-*elf*)         fmt=elf em=hppa ;;
       hppa-*-lites*)        fmt=elf em=hppa ;;
@@ -156,6 +154,10 @@ changequote([,])dnl
 
       i386-ibm-aix*)        fmt=coff em=i386aix ;;
       i386-sequent-bsd*)    fmt=aout em=dynix bfd_gas=yes ;;
+dnl start-sanitize-beos
+      i386-*-beospe*)       fmt=coff em=pe bfd_gas=yes ;;
+      i386-*-beoself* | i386-*-beos*) fmt=elf ;;
+dnl end-sanitize-beos
       i386-*-bsd*)          fmt=aout em=386bsd ;;
       i386-*-netbsd0.8)     fmt=aout em=386bsd ;;
       i386-*-netbsd*)       fmt=aout em=nbsd bfd_gas=yes;;
@@ -368,7 +370,7 @@ changequote([,])dnl
 
     case ${cpu_type} in
       m32r)
-       case ${extra_objects} in
+       case "x${extra_objects}" in
        *cgen.o*) ;;
        *) extra_objects="$extra_objects cgen.o"
           AC_DEFINE(USING_CGEN)
@@ -465,6 +467,17 @@ case "${obj_format}" in
   "") AC_MSG_ERROR(GAS does not know what format to use for target ${target}) ;;
 esac
 
+# Unfortunately the cpu in cpu-opc.h file isn't always $(TARGET_CPU).
+cgen_cpu_prefix=""
+case "x${extra_objects}" in
+  *cgen.o*)
+       case ${target_cpu} in
+         *) cgen_cpu_prefix=${target_cpu} ;;
+       esac
+       ;;
+esac
+AC_SUBST(cgen_cpu_prefix)
+
 dnl
 dnl Make sure the desired support files exist.
 dnl