Linux configuration name fixes

diff --git a/build-all.mk b/build-all.mk
index ab7ce5c54b58a7aab0f1be1e73606fa3625e0bee..0e1fd3ea317890b249fce0e09bd7d0f93bea4242 100644 (file)
--- a/build-all.mk
+++ b/build-all.mk
@@ -119,14 +119,14 @@ endif
 ifeq ($(canonhost),i586-unknown-linux)
 canonhost := i486-linux
 endif
-ifeq ($(canonhost),i386-unknown-linuxelf)
-canonhost := i386-linuxelf
+ifeq ($(canonhost),i386-unknown-linuxaout)
+canonhost := i386-linuxaout
 endif
-ifeq ($(canonhost),i486-unknown-linuxelf)
-canonhost := i486-linuxelf
+ifeq ($(canonhost),i486-unknown-linuxaout)
+canonhost := i486-linuxaout
 endif
-ifeq ($(canonhost),i586-unknown-linuxelf)
-canonhost := i486-linuxelf
+ifeq ($(canonhost),i586-unknown-linuxaout)
+canonhost := i486-linuxaout
 endif
 
 #
@@ -297,7 +297,7 @@ all: all-cygnus
 SHELL=/bin/bash
 endif
 
-ifeq ($(patsubst %-linux,linux,$(patsubst %-linuxelf,linux,$(canonhost))),linux)
+ifeq ($(patsubst %-linux,linux,$(patsubst %-linuxaout,linux,$(canonhost))),linux)
 TARGETS = $(NATIVE)
 all: all-cygnus
 endif
@@ -318,7 +318,7 @@ ifeq ($(patsubst %-lynx,lynx,$(canonhost)),lynx)
 FLAGS_TO_PASS := $(FLAGS_TO_PASS) "GNU_MAKE=$(MAKE)" "CONFIG_SHELL=/bin/bash"
 endif
 
-ifeq ($(patsubst %-linux,linux,$(patsubst %-linuxelf,linux,$(canonhost))),linux)
+ifeq ($(patsubst %-linux,linux,$(patsubst %-linuxaout,linux,$(canonhost))),linux)
 FLAGS_TO_PASS := $(FLAGS_TO_PASS) "GNU_MAKE=$(MAKE)"
 endif
 

diff --git a/gdb/gdbserver/configure.in b/gdb/gdbserver/configure.in
index 1e06a05d4f26714a6fe15684bc61a36cf54c0bc2..67215bd0cf4f28688e2b2a8257c45e115029d089 100644 (file)
--- a/gdb/gdbserver/configure.in
+++ b/gdb/gdbserver/configure.in
@@ -49,7 +49,7 @@ i[345]86-*-lynxos*)   gdb_host=i386lynx ;;
 i[345]86-*-go32)       gdb_host=go32
                        gdb_serial_driver=ser-go32.c
                        ;;
-i[345]86-*-linux)      gdb_host=linux ;;
+i[345]86-*-linux*)     gdb_host=linux ;;
 i[345]86-*-mach)       gdb_host=i386mach ;;
 i[345]86-*-sco3.2v4*)  gdb_host=i386sco4 ;;
 i[345]86-*-sco*)       gdb_host=i386sco ;;
@@ -182,7 +182,7 @@ i[345]86-*-sunos*)  gdb_target=sun386 ;;
 i[345]86-*-sysv4*)     gdb_target=i386v4 ;;
 i[345]86-*-sco*)       gdb_target=i386v ;;
 i[345]86-*-sysv*)      gdb_target=i386v ;;
-i[345]86-*-linux)      gdb_target=linux ;;
+i[345]86-*-linux*)     gdb_target=linux ;;
 
 i960-*-bout)           gdb_target=vxworks960 ;;
 i960-*-coff)           gdb_target=nindy960 ;;

diff --git a/gdb/nlm/configure.in b/gdb/nlm/configure.in
index 4c4b4b35a1f75453cd9b35a36ea033a43cb0445b..0feaa85263f13e8fcfd8a5d63c204945130a2363 100644 (file)
--- a/gdb/nlm/configure.in
+++ b/gdb/nlm/configure.in
@@ -41,7 +41,7 @@ i[345]86-*-lynxos*)   gdb_host=i386lynx ;;
 i[345]86-*-go32)       gdb_host=go32
                        gdb_serial_driver=ser-go32.c
                        ;;
-i[345]86-*-linux)      gdb_host=linux ;;
+i[345]86-*-linux*)     gdb_host=linux ;;
 i[345]86-*-mach)       gdb_host=i386mach ;;
 i[345]86-*-sco3.2v4*)  gdb_host=i386sco4 ;;
 i[345]86-*-sco*)       gdb_host=i386sco ;;
@@ -168,7 +168,7 @@ i[345]86-*-sunos*)  gdb_target=sun386 ;;
 i[345]86-*-sysv4*)     gdb_target=i386v4 ;;
 i[345]86-*-sco*)       gdb_target=i386v ;;
 i[345]86-*-sysv*)      gdb_target=i386v ;;
-i[345]86-*-linux)      gdb_target=linux ;;
+i[345]86-*-linux*)     gdb_target=linux ;;
 
 i960-*-bout)           gdb_target=vxworks960 ;;
 i960-*-coff)           gdb_target=nindy960 ;;