diff options
| author | Oleg Endo <olegendo@gcc.gnu.org> | 2016-04-30 10:26:14 +0000 |
|---|---|---|
| committer | Oleg Endo <olegendo@gcc.gnu.org> | 2016-04-30 10:26:14 +0000 |
| commit | ace08cb86b33a6d4274d477084c8e7c96937e3a2 (patch) | |
| tree | d097272c9fc263208dabb0c1fd178af825f9e29f | |
| parent | bc6d901463cf9173fdce15c22bbb85f274ce3565 (diff) | |
config.guess: Revert r235676.
/
* config.guess: Revert r235676.
* config.sub: Revert r235676.
libjava/
* classpath/config.guess: Revert r235676.
* classpath/config.sub: Revert r235676.
From-SVN: r235677
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rwxr-xr-x | config.guess | 4 | ||||
| -rwxr-xr-x | config.sub | 9 | ||||
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rwxr-xr-x | libjava/classpath/config.guess | 4 | ||||
| -rwxr-xr-x | libjava/classpath/config.sub | 9 |
6 files changed, 35 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 2a31a9fda09..cced43b4a2d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,11 @@ 2016-04-30 Oleg Endo <olegendo@gcc.gnu.org> - * config.guess: Remove SH5 support. + * config.guess: Revert r235676. + * config.sub: Revert r235676. + +2016-04-30 Oleg Endo <olegendo@gcc.gnu.org> + + * config.guess: Remove SH5 support. * config.sub: Likewise. * configure: Likewise. * configure.ac: Likewise. diff --git a/config.guess b/config.guess index 639697751d2..dcd5149681d 100755 --- a/config.guess +++ b/config.guess @@ -177,6 +177,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; earmv*) arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'` endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'` @@ -1027,6 +1028,9 @@ EOF s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; + sh64*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; diff --git a/config.sub b/config.sub index 1b4b975110e..da6d1b6826a 100755 --- a/config.sub +++ b/config.sub @@ -306,6 +306,7 @@ case $basic_machine in | rl78 | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ | spu \ @@ -431,7 +432,7 @@ case $basic_machine in | riscv32-* | riscv64-* \ | rl78-* | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \ @@ -1093,6 +1094,12 @@ case $basic_machine in basic_machine=sh-hitachi os=-hms ;; + sh5el) + basic_machine=sh5le-unknown + ;; + sh64) + basic_machine=sh64-unknown + ;; sparclite-wrs | simso-wrs) basic_machine=sparclite-wrs os=-vxworks diff --git a/libjava/ChangeLog b/libjava/ChangeLog index a4f7453d7be..596fc0529ed 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,10 @@ 2016-04-30 Oleg Endo <olegendo@gcc.gnu.org> + * classpath/config.guess: Revert r235676. + * classpath/config.sub: Revert r235676. + +2016-04-30 Oleg Endo <olegendo@gcc.gnu.org> + * classpath/config.guess: Remove SH5 support. * classpath/config.sub: Likewise. diff --git a/libjava/classpath/config.guess b/libjava/classpath/config.guess index f70fd6029d0..b02565c7b2f 100755 --- a/libjava/classpath/config.guess +++ b/libjava/classpath/config.guess @@ -162,6 +162,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched @@ -967,6 +968,9 @@ EOF s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux exit ;; + sh64*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; diff --git a/libjava/classpath/config.sub b/libjava/classpath/config.sub index d728224a17a..59bb593f109 100755 --- a/libjava/classpath/config.sub +++ b/libjava/classpath/config.sub @@ -307,6 +307,7 @@ case $basic_machine in | rl78 | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ | spu \ @@ -420,7 +421,7 @@ case $basic_machine in | pyramid-* \ | rl78-* | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ @@ -1063,6 +1064,12 @@ case $basic_machine in basic_machine=sh-hitachi os=-hms ;; + sh5el) + basic_machine=sh5le-unknown + ;; + sh64) + basic_machine=sh64-unknown + ;; sparclite-wrs | simso-wrs) basic_machine=sparclite-wrs os=-vxworks |