Merge tag 'sh-for-5.8' of git://git.libc.org/linux-sh

Pull arch/sh updates from Rich Felker:
 "Fix for arch/sh build regression with newer binutils, removal of SH5,
  fixes for module exports, and misc cleanup"

* tag 'sh-for-5.8' of git://git.libc.org/linux-sh:
  sh: remove sh5 support
  sh: add missing EXPORT_SYMBOL() for __delay
  sh: Convert ins[bwl]/outs[bwl] macros to inline functions
  sh: Convert iounmap() macros to inline functions
  sh: Add missing DECLARE_EXPORT() for __ashiftrt_r4_xx
  sh: configs: Cleanup old Kconfig IO scheduler options
  arch/sh: vmlinux.scr
  sh: Replace CONFIG_MTD_M25P80 with CONFIG_MTD_SPI_NOR in sh7757lcr_defconfig
  sh: sh4a: Bring back tmu3_device early device

diff --combined arch/sh/Kconfig
index 0424b8f,74403e8..a7cc146
--- 1/arch/sh/Kconfig
--- 2/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@@ -9,6 -9,7 +9,6 @@@ config SUPER
        select CLKDEV_LOOKUP
        select DMA_DECLARE_COHERENT
        select HAVE_IDE if HAS_IOPORT_MAP
 -      select HAVE_MEMBLOCK_NODE_MAP
        select HAVE_OPROFILE
        select HAVE_ARCH_TRACEHOOK
        select HAVE_PERF_EVENTS
@@@ -53,15 -54,6 +53,6 @@@
        select HAVE_NMI
        select NEED_SG_DMA_LENGTH
        select ARCH_HAS_GIGANTIC_PAGE
- 
-       help
-         The SuperH is a RISC processor targeted for use in embedded systems
-         and consumer electronics; it was also used in the Sega Dreamcast
-         gaming console.  The SuperH port has a home page at
-         <http://www.linux-sh.org/>.
- 
- config SUPERH32
-       def_bool "$(ARCH)" = "sh"
        select ARCH_32BIT_OFF_T
        select GUP_GET_PTE_LOW_HIGH if X2TLB
        select HAVE_KPROBES
@@@ -70,6 -62,7 +61,6 @@@
        select HAVE_FUNCTION_TRACER
        select HAVE_FTRACE_MCOUNT_RECORD
        select HAVE_DYNAMIC_FTRACE
 -      select HAVE_FTRACE_NMI_ENTER if DYNAMIC_FTRACE
        select ARCH_WANT_IPC_PARSE_VERSION
        select HAVE_FUNCTION_GRAPH_TRACER
        select HAVE_ARCH_KGDB
@@@ -79,19 -72,15 +70,15 @@@
        select ARCH_HIBERNATION_POSSIBLE if MMU
        select SPARSE_IRQ
        select HAVE_STACKPROTECTOR
- 
- config SUPERH64
-       def_bool "$(ARCH)" = "sh64"
-       select HAVE_EXIT_THREAD
-       select KALLSYMS
+       help
+         The SuperH is a RISC processor targeted for use in embedded systems
+         and consumer electronics; it was also used in the Sega Dreamcast
+         gaming console.  The SuperH port has a home page at
+         <http://www.linux-sh.org/>.
  
  config GENERIC_BUG
        def_bool y
-       depends on BUG && SUPERH32
- 
- config GENERIC_CSUM
-       def_bool y
-       depends on SUPERH64
+       depends on BUG
  
  config GENERIC_HWEIGHT
        def_bool y
@@@ -201,12 -190,6 +188,6 @@@ config CPU_SH4AL_DS
        select CPU_SH4A
        select CPU_HAS_DSP
  
- config CPU_SH5
-       bool
-       select CPU_HAS_FPU
-       select SYS_SUPPORTS_SH_TMU
-       select SYS_SUPPORTS_HUGETLBFS if MMU
- 
  config CPU_SHX2
        bool
  
@@@ -226,8 -209,6 +207,6 @@@ config CPU_HAS_PM
         default y
         bool
  
- if SUPERH32
- 
  choice
        prompt "Processor sub-type selection"
  
@@@ -516,27 -497,6 +495,6 @@@ config CPU_SUBTYPE_SH736
  
  endchoice
  
- endif
- 
- if SUPERH64
- 
- choice
-       prompt "Processor sub-type selection"
- 
- # SH-5 Processor Support
- 
- config CPU_SUBTYPE_SH5_101
-       bool "Support SH5-101 processor"
-       select CPU_SH5
- 
- config CPU_SUBTYPE_SH5_103
-       bool "Support SH5-103 processor"
-       select CPU_SH5
- 
- endchoice
- 
- endif
- 
  source "arch/sh/mm/Kconfig"
   
  source "arch/sh/Kconfig.cpu"
@@@ -590,7 -550,7 +548,7 @@@ source "kernel/Kconfig.hz
  
  config KEXEC
        bool "kexec system call (EXPERIMENTAL)"
-       depends on SUPERH32 && MMU
+       depends on MMU
        select KEXEC_CORE
        help
          kexec is a system call that implements the ability to shutdown your
@@@ -608,7 -568,7 +566,7 @@@
  
  config CRASH_DUMP
        bool "kernel crash dumps (EXPERIMENTAL)"
-       depends on SUPERH32 && BROKEN_ON_SMP
+       depends on BROKEN_ON_SMP
        help
          Generate crash dump after being started by kexec.
          This should be normally only set in special crash dump kernels
@@@ -622,7 -582,7 +580,7 @@@
  
  config KEXEC_JUMP
        bool "kexec jump (EXPERIMENTAL)"
-       depends on SUPERH32 && KEXEC && HIBERNATION
+       depends on KEXEC && HIBERNATION
        help
          Jump between original kernel and kexeced kernel and invoke
          code via KEXEC
@@@ -699,7 -659,7 +657,7 @@@ config HOTPLUG_CP
  
  config GUSA
        def_bool y
-       depends on !SMP && SUPERH32
+       depends on !SMP
        help
          This enables support for gUSA (general UserSpace Atomicity).
          This is the default implementation for both UP and non-ll/sc

diff --combined fs/Kconfig.binfmt
index 04f86b8,fb6efe5..8cd471d
--- 1/fs/Kconfig.binfmt
--- 2/fs/Kconfig.binfmt
+++ b/fs/Kconfig.binfmt
@@@ -36,16 -36,10 +36,16 @@@ config COMPAT_BINFMT_EL
  config ARCH_BINFMT_ELF_STATE
        bool
  
 +config ARCH_HAVE_ELF_PROT
 +      bool
 +
 +config ARCH_USE_GNU_PROPERTY
 +      bool
 +
  config BINFMT_ELF_FDPIC
        bool "Kernel support for FDPIC ELF binaries"
        default y if !BINFMT_ELF
-       depends on (ARM || (SUPERH32 && !MMU) || C6X)
+       depends on (ARM || (SUPERH && !MMU) || C6X)
        select ELFCORE
        help
          ELF FDPIC binaries are based on ELF, but allow the individual load
@@@ -78,7 -72,7 +78,7 @@@ config CORE_DUMP_DEFAULT_ELF_HEADER
  
          The core dump behavior can be controlled per process using
          the /proc/PID/coredump_filter pseudo-file; this setting is
 -        inherited.  See Documentation/filesystems/proc.txt for details.
 +        inherited.  See Documentation/filesystems/proc.rst for details.
  
          This config option changes the default setting of coredump_filter
          seen at boot time.  If unsure, say Y.

diff --combined scripts/headers_install.sh
index 94a8335,720f2e6..955cf3a
--- 1/scripts/headers_install.sh
--- 2/scripts/headers_install.sh
+++ b/scripts/headers_install.sh
@@@ -64,7 -64,7 +64,7 @@@ configs=$(sed -e 
        d
  ' $OUTFILE)
  
 -# The entries in the following list are not warned.
 +# The entries in the following list do not result in an error.
  # Please do not add a new entry. This list is only for existing ones.
  # The list will be reduced gradually, and deleted eventually. (hopefully)
  #
@@@ -81,9 -81,6 +81,6 @@@ arch/ia64/include/uapi/asm/cmpxchg.h:CO
  arch/m68k/include/uapi/asm/ptrace.h:CONFIG_COLDFIRE
  arch/nios2/include/uapi/asm/swab.h:CONFIG_NIOS2_CI_SWAB_NO
  arch/nios2/include/uapi/asm/swab.h:CONFIG_NIOS2_CI_SWAB_SUPPORT
- arch/sh/include/uapi/asm/ptrace.h:CONFIG_CPU_SH5
- arch/sh/include/uapi/asm/sigcontext.h:CONFIG_CPU_SH5
- arch/sh/include/uapi/asm/stat.h:CONFIG_CPU_SH5
  arch/x86/include/uapi/asm/auxvec.h:CONFIG_IA32_EMULATION
  arch/x86/include/uapi/asm/auxvec.h:CONFIG_X86_64
  arch/x86/include/uapi/asm/mman.h:CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS
@@@ -98,19 -95,18 +95,19 @@@ include/uapi/linux/raw.h:CONFIG_MAX_RAW
  
  for c in $configs
  do
 -      warn=1
 +      leak_error=1
  
        for ignore in $config_leak_ignores
        do
                if echo "$INFILE:$c" | grep -q "$ignore$"; then
 -                      warn=
 +                      leak_error=
                        break
                fi
        done
  
 -      if [ "$warn" = 1 ]; then
 -              echo "warning: $INFILE: leak $c to user-space" >&2
 +      if [ "$leak_error" = 1 ]; then
 +              echo "error: $INFILE: leak $c to user-space" >&2
 +              exit 1
        fi
  done