diff options
| -rwxr-xr-x | config.guess | 2 | ||||
| -rwxr-xr-x | config.sub | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/config.guess b/config.guess index 9b3e52aab48..85fb13ad18b 100755 --- a/config.guess +++ b/config.guess @@ -397,7 +397,7 @@ EOF echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit 0 ;; *:GNU:*:*) - echo `echo ${UNAME_MACHINE}|sed -e 's,/.*$,,'`-unknown-gnu-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo `echo ${UNAME_MACHINE}|sed -e 's,/.*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit 0 ;; *:Linux:*:*) # The BFD linker knows what the default object file format is, so diff --git a/config.sub b/config.sub index 5c77f398fdc..0432524944d 100755 --- a/config.sub +++ b/config.sub @@ -68,7 +68,7 @@ esac # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - linux-gnu* | gnu-gnu*) + linux-gnu*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; @@ -678,7 +678,7 @@ case $os in # The portable systems comes first. # Each alternative MUST END IN A *, to match a version number. # -sysv* is not here because it comes later, after sysvr4. - -gnu-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ + -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ | -amigados* | -msdos* | -newsos* | -unicos* | -aof* | -aos* \ @@ -692,9 +692,6 @@ case $os in | -linux-gnu* | -uxpv*) # Remember, each alternative MUST END IN *, to match a version number. ;; - -gnu*) - os=`echo $os | sed -e 's|gnu|gnu-gnu|'` - ;; -linux*) os=`echo $os | sed -e 's|linux|linux-gnu|'` ;; |