* configure.tgt (cris-*-*): Change default emulation to criself.

	(cris-*-*aout*): New rule.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 730c25621e8b236e5cdb18008ffd2f80642e4d07..3b2157143bc1bb14f899498e6612f0494eb992d2 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-27  Hans-Peter Nilsson  <hp@axis.com>
+
+       * configure.tgt (cris-*-*): Change default emulation to criself.
+       (cris-*-*aout*): New rule.
+
 2001-03-27  Matthew Wilcox  <willy@ldl.fc.hp.com>
 
        * emulparams/hppalinux.sh (MAXPAGESIZE): Set to 0x4000.

diff --git a/ld/configure.tgt b/ld/configure.tgt
index 52f5faf0f94e4fef118d731a2fbe0162a718f966..a38d31f809df2c39ac06fa85d3460a3f599d2b7f 100644 (file)
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@@ -23,9 +23,12 @@ arm-*-pe)            targ_emul=armpe ;
 arc-*-elf*)            targ_emul=arcelf ;;
 avr-*-*)               targ_emul=avr85xx
                        targ_extra_emuls="avr1200 avr23xx avr44x4 avr4433 avrmega603 avrmega103 avrmega161" ;;
-cris-*-*)              targ_emul=crisaout
+cris-*-*aout*)         targ_emul=crisaout
                        targ_extra_emuls="criself crislinux"
                        targ_extra_libpath=$targ_extra_emuls ;;
+cris-*-*)              targ_emul=criself
+                       targ_extra_emuls="crisaout crislinux"
+                       targ_extra_libpath=$targ_extra_emuls ;;
 d10v-*-*)              targ_emul=d10velf ;;
 d30v-*-*ext*)          targ_emul=d30v_e; targ_extra_emuls="d30velf d30v_o" ;;
 d30v-*-*onchip*)       targ_emul=d30v_o; targ_extra_emuls="d30velf d30v_e" ;;