diff --git a/sysdeps/sh/elf/configure b/sysdeps/sh/configure
similarity index 98%
rename from sysdeps/sh/elf/configure
rename to sysdeps/sh/configure
index 8235c3c01b..29a924b08a 100644
--- a/sysdeps/sh/elf/configure
+++ b/sysdeps/sh/configure
@@ -81,7 +81,7 @@ $as_echo X/"$0" |
 }
 
 # This file is generated from configure.in by Autoconf.  DO NOT EDIT!
- # Local configure fragment for sysdeps/sh/elf.
+ # Local configure fragment for sysdeps/sh.
 
 # Check for support of thread-local storage handling in assembler and
 # linker.
@@ -119,4 +119,3 @@ if test $libc_cv_sh_tls = no; then
 fi
 
 $as_echo "#define PI_STATIC_AND_HIDDEN 1" >>confdefs.h
-
diff --git a/sysdeps/sh/elf/configure.in b/sysdeps/sh/configure.in
similarity index 94%
rename from sysdeps/sh/elf/configure.in
rename to sysdeps/sh/configure.in
index 9c41a24f4f..538e34e9f5 100644
--- a/sysdeps/sh/elf/configure.in
+++ b/sysdeps/sh/configure.in
@@ -1,5 +1,5 @@
 GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
-# Local configure fragment for sysdeps/sh/elf.
+# Local configure fragment for sysdeps/sh.
 
 # Check for support of thread-local storage handling in assembler and
 # linker.
diff --git a/sysdeps/sh/elf/start.S b/sysdeps/sh/start.S
similarity index 100%
rename from sysdeps/sh/elf/start.S
rename to sysdeps/sh/start.S