From bc6d901463cf9173fdce15c22bbb85f274ce3565 Mon Sep 17 00:00:00 2001 From: Oleg Endo Date: Sat, 30 Apr 2016 09:11:03 +0000 Subject: config.guess: Remove SH5 support. / * config.guess: Remove SH5 support. * config.sub: Likewise. * configure: Likewise. * configure.ac: Likewise. config/ * picflag.m4: Remove SH5 support. gcc/ * config/sh/t-sh: Remove SH5 support. * config.gcc: Likewise. * configure: Likewise. contrib/ * compare-all-tests: Remove SH5 support. * config-list.mk: Likewise. libada/ * configure: Remove SH5 support. libgcc/ * config.host: Remove SH5 support. * configure: Likewise. libiberty/ * configure: Remove SH5 support. libjava/ * classpath/config.guess: Remove SH5 support. * classpath/config.sub: Likewise. From-SVN: r235676 --- ChangeLog | 7 +++++++ config.guess | 4 ---- config.sub | 9 +-------- config/ChangeLog | 4 ++++ config/picflag.m4 | 3 +-- configure | 4 +--- configure.ac | 4 +--- contrib/ChangeLog | 5 +++++ contrib/compare-all-tests | 3 +-- contrib/config-list.mk | 4 ++-- gcc/ChangeLog | 6 ++++++ gcc/config.gcc | 42 +++++------------------------------------- gcc/config/sh/t-sh | 12 ++---------- gcc/configure | 3 +-- libada/ChangeLog | 4 ++++ libada/configure | 3 +-- libgcc/ChangeLog | 5 +++++ libgcc/config.host | 17 ++--------------- libgcc/configure | 3 +-- libiberty/ChangeLog | 4 ++++ libiberty/configure | 3 +-- libjava/ChangeLog | 5 +++++ libjava/classpath/config.guess | 4 ---- libjava/classpath/config.sub | 9 +-------- 24 files changed, 61 insertions(+), 106 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6ee632f7eb6..2a31a9fda09 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2016-04-30 Oleg Endo + + * config.guess: Remove SH5 support. + * config.sub: Likewise. + * configure: Likewise. + * configure.ac: Likewise. + 2016-04-26 Jakub Jelinek PR bootstrap/70704 diff --git a/config.guess b/config.guess index dcd5149681d..639697751d2 100755 --- a/config.guess +++ b/config.guess @@ -177,7 +177,6 @@ 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'` @@ -1028,9 +1027,6 @@ 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 da6d1b6826a..1b4b975110e 100755 --- a/config.sub +++ b/config.sub @@ -306,7 +306,6 @@ 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 \ @@ -432,7 +431,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-* | sh64-* | sh64le-* \ + | shle-* | sh[1234]le-* | sh3ele-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \ @@ -1094,12 +1093,6 @@ 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/config/ChangeLog b/config/ChangeLog index 9b3964a60fb..edaf7d1529b 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,7 @@ +2016-04-30 Oleg Endo + + * picflag.m4: Remove SH5 support. + 2015-10-21 Maxim Ostapenko * bootstrap-asan.mk: Replace ASAN_OPTIONS=detect_leaks with diff --git a/config/picflag.m4 b/config/picflag.m4 index 2f5b9721eb2..e0fa3439997 100644 --- a/config/picflag.m4 +++ b/config/picflag.m4 @@ -61,8 +61,7 @@ case "${$2}" in $1=-fpic ;; # FIXME: Simplify to sh*-*-netbsd*? - sh-*-netbsdelf* | shl*-*-netbsdelf* | sh5-*-netbsd* | sh5l*-*-netbsd* | \ - sh64-*-netbsd* | sh64l*-*-netbsd*) + sh-*-netbsdelf* | shl*-*-netbsdelf*) $1=-fpic ;; # Default to -fPIC unless specified otherwise. diff --git a/configure b/configure index d747385ddbf..3c1e99ae1fe 100755 --- a/configure +++ b/configure @@ -3446,8 +3446,6 @@ case "${target}" in ;; sh-*-* | sh[34]*-*-*) ;; - sh64-*-* | sh5*-*-*) - ;; sparc*-*-*) ;; x86_64-*-*) @@ -3946,7 +3944,7 @@ case "${target}" in or1k*-*-*) noconfigdirs="$noconfigdirs gdb" ;; - sh-*-* | sh64-*-*) + sh-*-*) case "${target}" in sh*-*-elf) ;; diff --git a/configure.ac b/configure.ac index 1652182fd14..df00ce219a4 100644 --- a/configure.ac +++ b/configure.ac @@ -782,8 +782,6 @@ case "${target}" in ;; sh-*-* | sh[[34]]*-*-*) ;; - sh64-*-* | sh5*-*-*) - ;; sparc*-*-*) ;; x86_64-*-*) @@ -1282,7 +1280,7 @@ case "${target}" in or1k*-*-*) noconfigdirs="$noconfigdirs gdb" ;; - sh-*-* | sh64-*-*) + sh-*-*) case "${target}" in sh*-*-elf) ;; diff --git a/contrib/ChangeLog b/contrib/ChangeLog index 7e5ac53039f..a045faeefdb 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,8 @@ +2016-04-30 Oleg Endo + + * compare-all-tests: Remove SH5 support. + * config-list.mk: Likewise. + 2016-04-28 Martin Liska * analyze_brprob: Remove. diff --git a/contrib/compare-all-tests b/contrib/compare-all-tests index 444e3b5b7e3..7851a1b2b61 100644 --- a/contrib/compare-all-tests +++ b/contrib/compare-all-tests @@ -31,11 +31,10 @@ mn10300_opts='-mam33 -mam33-2' pa_opts='-march=2.0 -march=1.0 -march=1.1' ppc_opts='-m32 -m64' s390_opts='-m31 -m31/-mzarch -m64' -sh64_opts='-m5-32media -m5-32media-nofpu -m5-64media -m5-64media-nofpu -m5-compact -m5-compact-nofpu' sh_opts='-m3 -m3e -m4 -m4a -m4al -m4/-mieee -m1 -m1/-mno-cbranchdi -m2a -m2a/-mieee -m2e -m2e/-mieee' sparc_opts='-mcpu=v8/-m32 -mcpu=v9/-m32 -m64' -all_targets='alpha arm avr bfin cris fr30 frv h8300 ia64 iq2000 m32c m32r m68k mcore mips mmix mn10300 pa pdp11 ppc sh sh64 sparc spu v850 vax xstormy16 xtensa' # e500 +all_targets='alpha arm avr bfin cris fr30 frv h8300 ia64 iq2000 m32c m32r m68k mcore mips mmix mn10300 pa pdp11 ppc sh sparc spu v850 vax xstormy16 xtensa' # e500 test_one_file () { diff --git a/contrib/config-list.mk b/contrib/config-list.mk index 6a83a84b562..8210352003c 100644 --- a/contrib/config-list.mk +++ b/contrib/config-list.mk @@ -63,8 +63,8 @@ LIST = aarch64-elf aarch64-linux-gnu aarch64-rtems \ powerpcle-eabisim powerpcle-eabi rs6000-ibm-aix4.3 rs6000-ibm-aix5.1.0 \ rs6000-ibm-aix5.2.0 rs6000-ibm-aix5.3.0 rs6000-ibm-aix6.0 \ rl78-elf rx-elf s390-linux-gnu s390x-linux-gnu s390x-ibm-tpf sh-elf \ - shle-linux sh-netbsdelf sh-superh-elf sh5el-netbsd sh64-netbsd sh64-linux \ - sh64-elfOPT-with-newlib sh-rtems sh-wrs-vxworks sparc-elf \ + shle-linux sh-netbsdelf sh-superh-elf \ + sh-rtems sh-wrs-vxworks sparc-elf \ sparc-leon-elf sparc-rtems sparc-linux-gnu \ sparc-leon3-linux-gnuOPT-enable-target=all sparc-netbsdelf \ sparc64-sun-solaris2.10OPT-with-gnu-ldOPT-with-gnu-asOPT-enable-threads=posix \ diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 545f4b58da8..747eb797972 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2016-04-30 Oleg Endo + + * config/sh/t-sh: Remove SH5 support. + * config.gcc: Likewise. + * configure: Likewise. + 2016-04-30 Rainer Orth * config/darwin.h (LINK_COMMAND_SPEC_A): Handle -fcilkplus. diff --git a/gcc/config.gcc b/gcc/config.gcc index f66e48cd1ca..4e98df76cfe 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -2617,16 +2617,15 @@ s390x-ibm-tpf*) ;; sh-*-elf* | sh[12346l]*-*-elf* | \ sh-*-linux* | sh[2346lbe]*-*-linux* | \ - sh-*-netbsdelf* | shl*-*-netbsdelf* | sh5-*-netbsd* | sh5l*-*-netbsd* | \ - sh64-*-netbsd* | sh64l*-*-netbsd*) + sh-*-netbsdelf* | shl*-*-netbsdelf*) tmake_file="${tmake_file} sh/t-sh sh/t-elf" if test x${with_endian} = x; then case ${target} in sh[1234]*be-*-* | sh[1234]*eb-*-*) with_endian=big ;; shbe-*-* | sheb-*-*) with_endian=big,little ;; sh[1234]l* | sh[34]*-*-linux*) with_endian=little ;; - shl* | sh64l* | sh*-*-linux* | \ - sh5l* | sh-superh-elf) with_endian=little,big ;; + shl* | sh*-*-linux* | \ + sh-superh-elf) with_endian=little,big ;; sh[1234]*-*-*) with_endian=big ;; *) with_endian=big,little ;; esac @@ -2670,37 +2669,14 @@ sh-*-elf* | sh[12346l]*-*-elf* | \ tm_file="${tm_file} sh/embed-elf.h" ;; esac case ${target} in - sh5*-*-netbsd*) - # SHmedia, 32-bit ABI - tmake_file="${tmake_file} sh/t-sh64" - ;; - sh64*-netbsd*) - # SHmedia, 64-bit ABI - tmake_file="${tmake_file} sh/t-sh64 sh/t-netbsd-sh5-64" - ;; *-*-netbsd) ;; - sh64*-*-linux*) - tmake_file="${tmake_file} sh/t-sh64" - tm_file="${tm_file} sh/sh64.h" - extra_headers="shmedia.h ushmedia.h sshmedia.h" - ;; - sh64*) - tmake_file="${tmake_file} sh/t-sh64" - tm_file="${tm_file} sh/sh64.h" - if test x$with_newlib = xyes; then - tm_file="${tm_file} newlib-stdint.h" - fi - extra_headers="shmedia.h ushmedia.h sshmedia.h" - ;; *-*-elf*) tm_file="${tm_file} newlib-stdint.h" ;; esac # sed el/eb endian suffixes away to avoid confusion with sh[23]e case `echo ${target} | sed 's/e[lb]-/-/'` in - sh64*-*-netbsd*) sh_cpu_target=sh5-64media ;; - sh64* | sh5*-*-netbsd*) sh_cpu_target=sh5-32media ;; sh4a_single_only*) sh_cpu_target=sh4a-single-only ;; sh4a_single*) sh_cpu_target=sh4a-single ;; sh4a_nofpu*) sh_cpu_target=sh4a-nofpu ;; @@ -2723,7 +2699,6 @@ sh-*-elf* | sh[12346l]*-*-elf* | \ # did the user say --without-fp ? if test x$with_fp = xno; then case ${sh_cpu_target} in - sh5-*media) sh_cpu_target=${sh_cpu_target}-nofpu ;; sh4al | sh1) ;; sh4a* ) sh_cpu_target=sh4a-nofpu ;; sh4*) sh_cpu_target=sh4-nofpu ;; @@ -2736,8 +2711,6 @@ sh-*-elf* | sh[12346l]*-*-elf* | \ fi sh_cpu_default="`echo $with_cpu|sed s/^m/sh/|tr A-Z_ a-z-`" case $sh_cpu_default in - sh5-64media-nofpu | sh5-64media | \ - sh5-32media-nofpu | sh5-32media | sh5-compact-nofpu | sh5-compact | \ sh2a-single-only | sh2a-single | sh2a-nofpu | sh2a | \ sh4a-single-only | sh4a-single | sh4a-nofpu | sh4a | sh4al | \ sh4-single-only | sh4-single | sh4-nofpu | sh4 | sh4-300 | \ @@ -2748,9 +2721,7 @@ sh-*-elf* | sh[12346l]*-*-elf* | \ sh_multilibs=${with_multilib_list} if test "$sh_multilibs" = "default" ; then case ${target} in - sh64-superh-linux* | \ sh[1234]*) sh_multilibs=${sh_cpu_target} ;; - sh64* | sh5*) sh_multilibs=m5-32media,m5-32media-nofpu,m5-compact,m5-compact-nofpu,m5-64media,m5-64media-nofpu ;; sh-superh-*) sh_multilibs=m4,m4-single,m4-single-only,m4-nofpu ;; sh*-*-linux*) sh_multilibs=m1,m2,m2a,m3e,m4 ;; sh*-*-netbsd*) sh_multilibs=m3,m3e,m4 ;; @@ -2769,10 +2740,7 @@ sh-*-elf* | sh[12346l]*-*-elf* | \ m1 | m2 | m2e | m3 | m3e | \ m4 | m4-single | m4-single-only | m4-nofpu | m4-300 |\ m4a | m4a-single | m4a-single-only | m4a-nofpu | m4al | \ - m2a | m2a-single | m2a-single-only | m2a-nofpu | \ - m5-64media | m5-64media-nofpu | \ - m5-32media | m5-32media-nofpu | \ - m5-compact | m5-compact-nofpu) + m2a | m2a-single | m2a-single-only | m2a-nofpu) # TM_MULTILIB_CONFIG is used by t-sh for the non-endian multilib definition # It is passed to MULTIILIB_OPTIONS verbatim. TM_MULTILIB_CONFIG="${TM_MULTILIB_CONFIG}/${sh_multilib}" @@ -2789,7 +2757,7 @@ sh-*-elf* | sh[12346l]*-*-elf* | \ done TM_MULTILIB_CONFIG=`echo $TM_MULTILIB_CONFIG | sed 's:^/::'` if test x${enable_incomplete_targets} = xyes ; then - tm_defines="$tm_defines SUPPORT_SH1=1 SUPPORT_SH2E=1 SUPPORT_SH4=1 SUPPORT_SH4_SINGLE=1 SUPPORT_SH2A=1 SUPPORT_SH2A_SINGLE=1 SUPPORT_SH5_32MEDIA=1 SUPPORT_SH5_32MEDIA_NOFPU=1 SUPPORT_SH5_64MEDIA=1 SUPPORT_SH5_64MEDIA_NOFPU=1" + tm_defines="$tm_defines SUPPORT_SH1=1 SUPPORT_SH2E=1 SUPPORT_SH4=1 SUPPORT_SH4_SINGLE=1 SUPPORT_SH2A=1 SUPPORT_SH2A_SINGLE=1" fi tm_file="$tm_file ./sysroot-suffix.h" tmake_file="$tmake_file t-sysroot-suffix" diff --git a/gcc/config/sh/t-sh b/gcc/config/sh/t-sh index 348cc0b63be..7446c8eda6a 100644 --- a/gcc/config/sh/t-sh +++ b/gcc/config/sh/t-sh @@ -50,9 +50,7 @@ MULTILIB_MATCHES = $(shell \ m2e,m3e,m4-single-only,m4-100-single-only,m4-200-single-only,m4-300-single-only,m4a-single-only \ m2a-single,m2a-single-only \ m4-single,m4-100-single,m4-200-single,m4-300-single,m4a-single \ - m4,m4-100,m4-200,m4-300,m4a \ - m5-32media,m5-compact,m5-32media \ - m5-32media-nofpu,m5-compact-nofpu,m5-32media-nofpu; do \ + m4,m4-100,m4-200,m4-300,m4a; do \ subst= ; \ for lib in `echo $$abi|tr , ' '` ; do \ if test "`echo $$multilibs|sed s/$$lib//`" != "$$multilibs"; then \ @@ -89,13 +87,7 @@ MULTILIB_OSDIRNAMES = \ m4a-single-only=!m4a-single-only $(OTHER_ENDIAN)/m4a-single-only=!$(OTHER_ENDIAN)/m4a-single-only \ m4a-single=!m4a-single $(OTHER_ENDIAN)/m4a-single=!$(OTHER_ENDIAN)/m4a-single \ m4a=!m4a $(OTHER_ENDIAN)/m4a=!$(OTHER_ENDIAN)/m4a \ - m4al=!m4al $(OTHER_ENDIAN)/m4al=!$(OTHER_ENDIAN)/m4al \ - m5-32media=!m5-32media $(OTHER_ENDIAN)/m5-32media=!$(OTHER_ENDIAN)/m5-32media \ - m5-32media-nofpu=!m5-32media-nofpu $(OTHER_ENDIAN)/m5-32media-nofpu=!$(OTHER_ENDIAN)/m5-32media-nofpu \ - m5-compact=!m5-compact $(OTHER_ENDIAN)/m5-compact=!$(OTHER_ENDIAN)/m5-compact \ - m5-compact-nofpu=!m5-compact-nofpu $(OTHER_ENDIAN)/m5-compact-nofpu=!$(OTHER_ENDIAN)/m5-compact-nofpu \ - m5-64media=!m5-64media $(OTHER_ENDIAN)/m5-64media=!$(OTHER_ENDIAN)/m5-64media \ - m5-64media-nofpu=!m5-64media-nofpu $(OTHER_ENDIAN)/m5-64media-nofpu=!$(OTHER_ENDIAN)/m5-64media-nofpu + m4al=!m4al $(OTHER_ENDIAN)/m4al=!$(OTHER_ENDIAN)/m4al $(out_object_file): gt-sh.h gt-sh.h : s-gtype ; @true diff --git a/gcc/configure b/gcc/configure index 99fdea172f6..274c397be7d 100755 --- a/gcc/configure +++ b/gcc/configure @@ -5060,8 +5060,7 @@ case "${target}" in PICFLAG_FOR_TARGET=-fpic ;; # FIXME: Simplify to sh*-*-netbsd*? - sh-*-netbsdelf* | shl*-*-netbsdelf* | sh5-*-netbsd* | sh5l*-*-netbsd* | \ - sh64-*-netbsd* | sh64l*-*-netbsd*) + sh-*-netbsdelf* | shl*-*-netbsdelf*) PICFLAG_FOR_TARGET=-fpic ;; # Default to -fPIC unless specified otherwise. diff --git a/libada/ChangeLog b/libada/ChangeLog index 9ba85572a2d..a790c5b3078 100644 --- a/libada/ChangeLog +++ b/libada/ChangeLog @@ -1,3 +1,7 @@ +2016-04-30 Oleg Endo + + * configure: Remove SH5 support. + 2016-01-04 Jakub Jelinek Update copyright years. diff --git a/libada/configure b/libada/configure index 2296096d4d2..981bcdb9906 100755 --- a/libada/configure +++ b/libada/configure @@ -2878,8 +2878,7 @@ case "${host}" in PICFLAG=-fpic ;; # FIXME: Simplify to sh*-*-netbsd*? - sh-*-netbsdelf* | shl*-*-netbsdelf* | sh5-*-netbsd* | sh5l*-*-netbsd* | \ - sh64-*-netbsd* | sh64l*-*-netbsd*) + sh-*-netbsdelf* | shl*-*-netbsdelf*) PICFLAG=-fpic ;; # Default to -fPIC unless specified otherwise. diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index 6b199ab8e3a..58a3bc70bf5 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,8 @@ +2016-04-30 Oleg Endo + + * config.host: Remove SH5 support. + * configure: Likewise. + 2016-04-29 Oleg Endo * config/sh/crt1.S: Remove SH5 support. diff --git a/libgcc/config.host b/libgcc/config.host index c5266ed8288..8bd7bb68a2b 100644 --- a/libgcc/config.host +++ b/libgcc/config.host @@ -1138,10 +1138,6 @@ sh-*-elf* | sh[12346l]*-*-elf*) libic_invalidate_array_4-200.a \ libic_invalidate_array_4a.a \ libgcc-Os-4-200.a libgcc-4-300.a" - case ${host} in sh64*-*-*) - tmake_file="$tmake_file sh/t-sh64" - ;; - esac case ${host} in sh*-superh-elf) tmake_file="$tmake_file sh/t-superh" @@ -1151,20 +1147,11 @@ sh-*-elf* | sh[12346l]*-*-elf*) ;; sh-*-linux* | sh[2346lbe]*-*-linux*) tmake_file="${tmake_file} sh/t-sh t-slibgcc-libgcc sh/t-linux t-fdpbit" - case ${host} in sh64*-*-linux*) - tmake_file="$tmake_file sh/t-sh64" - ;; - esac md_unwind_header=sh/linux-unwind.h ;; -sh-*-netbsdelf* | shl*-*-netbsdelf* | sh5-*-netbsd* | sh5l*-*-netbsd* | \ - sh64-*-netbsd* | sh64l*-*-netbsd*) +sh-*-netbsdelf* | shl*-*-netbsdelf*) tmake_file="$tmake_file sh/t-sh sh/t-netbsd" - case ${host} in - sh5*-*-netbsd* | sh64*-netbsd*) - tmake_file="$tmake_file sh/t-sh64" - ;; - esac + # NetBSD's C library includes a fast software FP library that # has support for setting/setting the rounding mode, exception # mask, etc. Therefore, we don't want to include software FP diff --git a/libgcc/configure b/libgcc/configure index e7d6c75a6f7..bf96aec75fd 100644 --- a/libgcc/configure +++ b/libgcc/configure @@ -2355,8 +2355,7 @@ case "${host}" in PICFLAG=-fpic ;; # FIXME: Simplify to sh*-*-netbsd*? - sh-*-netbsdelf* | shl*-*-netbsdelf* | sh5-*-netbsd* | sh5l*-*-netbsd* | \ - sh64-*-netbsd* | sh64l*-*-netbsd*) + sh-*-netbsdelf* | shl*-*-netbsdelf*) PICFLAG=-fpic ;; # Default to -fPIC unless specified otherwise. diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index fb3f1f74fd6..7497392ea97 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,7 @@ +2016-04-30 Oleg Endo + + * configure: Remove SH5 support. + 2016-04-08 Marcel Böhme PR c++/69687 diff --git a/libiberty/configure b/libiberty/configure index bde78ffd25d..0f8e9b925e5 100755 --- a/libiberty/configure +++ b/libiberty/configure @@ -5145,8 +5145,7 @@ case "${host}" in PICFLAG=-fpic ;; # FIXME: Simplify to sh*-*-netbsd*? - sh-*-netbsdelf* | shl*-*-netbsdelf* | sh5-*-netbsd* | sh5l*-*-netbsd* | \ - sh64-*-netbsd* | sh64l*-*-netbsd*) + sh-*-netbsdelf* | shl*-*-netbsdelf*) PICFLAG=-fpic ;; # Default to -fPIC unless specified otherwise. diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 7c6a4fe743c..a4f7453d7be 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2016-04-30 Oleg Endo + + * classpath/config.guess: Remove SH5 support. + * classpath/config.sub: Likewise. + 2016-04-20 Ben Elliston PR testsuite/70719 diff --git a/libjava/classpath/config.guess b/libjava/classpath/config.guess index b02565c7b2f..f70fd6029d0 100755 --- a/libjava/classpath/config.guess +++ b/libjava/classpath/config.guess @@ -162,7 +162,6 @@ 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 @@ -968,9 +967,6 @@ 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 59bb593f109..d728224a17a 100755 --- a/libjava/classpath/config.sub +++ b/libjava/classpath/config.sub @@ -307,7 +307,6 @@ 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 \ @@ -421,7 +420,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-* | sh64-* | sh64le-* \ + | shle-* | sh[1234]le-* | sh3ele-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ @@ -1064,12 +1063,6 @@ 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 -- cgit v1.2.1