diff options
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/ChangeLog | 6 | ||||
-rw-r--r-- | gcc/config.gcc | 42 | ||||
-rw-r--r-- | gcc/config/sh/t-sh | 12 | ||||
-rwxr-xr-x | gcc/configure | 3 |
4 files changed, 14 insertions, 49 deletions
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 <olegendo@gcc.gnu.org> + + * config/sh/t-sh: Remove SH5 support. + * config.gcc: Likewise. + * configure: Likewise. + 2016-04-30 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> * 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. |