aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gas/ChangeLog2
-rwxr-xr-xgas/configure35
-rw-r--r--gas/configure.in3
3 files changed, 22 insertions, 18 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 494f5a8..5f83e3f 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,7 @@
Wed Nov 29 23:14:27 1995 Ken Raeburn <raeburn@cygnus.com>
+ * configure.in: Treat m68k-sysv4 like m68k-elf, not m68k-sysv3.
+
* hash.c (struct hash_entry): Moved here...
* hash.h (struct hash_entry): ...from here.
diff --git a/gas/configure b/gas/configure
index 8f05b34..c092cee 100755
--- a/gas/configure
+++ b/gas/configure
@@ -843,9 +843,10 @@ for this_target in $target $canon_targets ; do
m68k-motorola-sysv*) fmt=coff targ=m68kcoff em=delta ;;
m68k-bull-sysv3*) fmt=coff targ=m68kcoff em=dpx2 ;;
m68k-apollo-*) fmt=coff targ=apollo em=apollo ;;
+ m68k-*-sysv4 | m68k-*-elf) # must be before -sysv*
+ fmt=elf ;;
m68k-*-coff | m68k-*-sysv*)
fmt=coff targ=m68kcoff ;;
- m68k-*-elf) fmt=elf ;;
m68k-*-hpux*) fmt=hp300 em=hp300 ;;
m68k-*-lynxos*) fmt=coff targ=m68kcoff
em=lynx ;;
@@ -1431,7 +1432,7 @@ else
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 1435 "configure"
+#line 1436 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
@@ -1445,7 +1446,7 @@ else
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 1449 "configure"
+#line 1450 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
@@ -1478,7 +1479,7 @@ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1482 "configure"
+#line 1483 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
@@ -1530,7 +1531,7 @@ else
ac_cv_c_cross=yes
else
cat > conftest.$ac_ext <<EOF
-#line 1534 "configure"
+#line 1535 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
@@ -1554,7 +1555,7 @@ if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1558 "configure"
+#line 1559 "configure"
#include "confdefs.h"
#include <alloca.h>
int main() { return 0; }
@@ -1586,7 +1587,7 @@ if eval "test \"`echo '$''{'ac_cv_func_alloca'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1590 "configure"
+#line 1591 "configure"
#include "confdefs.h"
#ifdef __GNUC__
@@ -1645,7 +1646,7 @@ if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1649 "configure"
+#line 1650 "configure"
#include "confdefs.h"
#if defined(CRAY) && ! defined(CRAY2)
webecray
@@ -1674,7 +1675,7 @@ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1678 "configure"
+#line 1679 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -1728,7 +1729,7 @@ else
ac_cv_c_stack_direction=0
else
cat > conftest.$ac_ext <<EOF
-#line 1732 "configure"
+#line 1733 "configure"
#include "confdefs.h"
find_stack_direction ()
{
@@ -1771,7 +1772,7 @@ else
ac_cv_c_inline=no
for ac_kw in inline __inline__ __inline; do
cat > conftest.$ac_ext <<EOF
-#line 1775 "configure"
+#line 1776 "configure"
#include "confdefs.h"
int main() { return 0; }
@@ -1811,7 +1812,7 @@ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1815 "configure"
+#line 1816 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -1864,7 +1865,7 @@ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1868 "configure"
+#line 1869 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -1917,7 +1918,7 @@ if eval "test \"`echo '$''{'gas_cv_assert_ok'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1921 "configure"
+#line 1922 "configure"
#include "confdefs.h"
#include <assert.h>
#include <stdio.h>
@@ -1974,7 +1975,7 @@ if eval "test \"`echo '$''{'gas_cv_decl_needed_malloc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1978 "configure"
+#line 1979 "configure"
#include "confdefs.h"
$gas_test_headers
int main() { return 0; }
@@ -2010,7 +2011,7 @@ if eval "test \"`echo '$''{'gas_cv_decl_needed_free'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2014 "configure"
+#line 2015 "configure"
#include "confdefs.h"
$gas_test_headers
int main() { return 0; }
@@ -2049,7 +2050,7 @@ if eval "test \"`echo '$''{'gas_cv_decl_needed_errno'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2053 "configure"
+#line 2054 "configure"
#include "confdefs.h"
#ifdef HAVE_ERRNO_H
diff --git a/gas/configure.in b/gas/configure.in
index 2d0cece..3972ffd 100644
--- a/gas/configure.in
+++ b/gas/configure.in
@@ -197,9 +197,10 @@ changequote([,])dnl
m68k-motorola-sysv*) fmt=coff targ=m68kcoff em=delta ;;
m68k-bull-sysv3*) fmt=coff targ=m68kcoff em=dpx2 ;;
m68k-apollo-*) fmt=coff targ=apollo em=apollo ;;
+ m68k-*-sysv4 | m68k-*-elf) # must be before -sysv*
+ fmt=elf ;;
m68k-*-coff | m68k-*-sysv*)
fmt=coff targ=m68kcoff ;;
- m68k-*-elf) fmt=elf ;;
m68k-*-hpux*) fmt=hp300 em=hp300 ;;
m68k-*-lynxos*) fmt=coff targ=m68kcoff
em=lynx ;;