aboutsummaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
authorOleg Endo <olegendo@gcc.gnu.org>2016-04-30 10:26:14 +0000
committerOleg Endo <olegendo@gcc.gnu.org>2016-04-30 10:26:14 +0000
commitace08cb86b33a6d4274d477084c8e7c96937e3a2 (patch)
treed097272c9fc263208dabb0c1fd178af825f9e29f /libjava
parentbc6d901463cf9173fdce15c22bbb85f274ce3565 (diff)
downloadgcc-ace08cb86b33a6d4274d477084c8e7c96937e3a2.zip
gcc-ace08cb86b33a6d4274d477084c8e7c96937e3a2.tar.gz
gcc-ace08cb86b33a6d4274d477084c8e7c96937e3a2.tar.bz2
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
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog5
-rwxr-xr-xlibjava/classpath/config.guess4
-rwxr-xr-xlibjava/classpath/config.sub9
3 files changed, 17 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index a4f7453..596fc052 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 f70fd60..b02565c 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 d728224..59bb593 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