Merge sysdeps/mips/elf/ into sysdeps/mips/.

diff --git a/ChangeLog.mips b/ChangeLog.mips
index 44667cd..e838547 100644 (file)
--- a/ChangeLog.mips
+++ b/ChangeLog.mips
@@ -1,3 +1,11 @@
+2012-03-27  Joseph Myers  <joseph@codesourcery.com>
+
+       * sysdeps/mips/elf/start.S: Moved to ...
+       * sysdeps/mips/start.S: ...here.
+       * sysdeps/mips/elf/configure.in: Moved to ...
+       * sysdeps/mips/configure.in: ...here.  Update comment.
+       * sysdeps/mips/configure: New generated file.
+
 2012-03-20  Joseph Myers  <joseph@codesourcery.com>
 
        * sysdeps/unix/sysv/linux/mips/register-dump.h: Include <_itoa.h>

diff --git a/sysdeps/mips/elf/configure b/sysdeps/mips/configure
similarity index 98%
rename from sysdeps/mips/elf/configure
rename to sysdeps/mips/configure
index 3cf02e0..e80f0a0 100644 (file)
--- a/sysdeps/mips/elf/configure
+++ b/sysdeps/mips/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/mips/elf.
+ # Local configure fragment for sysdeps/mips.
 
 # Check for support of thread-local storage handling in assembler and
 # linker.

diff --git a/sysdeps/mips/elf/configure.in b/sysdeps/mips/configure.in
similarity index 94%
rename from sysdeps/mips/elf/configure.in
rename to sysdeps/mips/configure.in
index 5cb5a74..ed92d29 100644 (file)
--- a/sysdeps/mips/elf/configure.in
+++ b/sysdeps/mips/configure.in
@@ -1,5 +1,5 @@
 GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
-# Local configure fragment for sysdeps/mips/elf.
+# Local configure fragment for sysdeps/mips.
 
 # Check for support of thread-local storage handling in assembler and
 # linker.

diff --git a/sysdeps/mips/elf/start.S b/sysdeps/mips/start.S
similarity index 100%
rename from sysdeps/mips/elf/start.S
rename to sysdeps/mips/start.S