Merge sysdeps/alpha/elf/ into sysdeps/alpha/.

diff --git a/ChangeLog.alpha b/ChangeLog.alpha
index 500e2273c8e1a0bd983566c703a84a2f7d8da894..c25d3f1f612ca043f9852885212321952b87b34b 100644 (file)
--- a/ChangeLog.alpha
+++ b/ChangeLog.alpha
@@ -1,3 +1,15 @@
+2012-03-27  Richard Henderson  <rth@twiddle.net>
+
+       * sysdeps/alpha/elf/configure.in: Move to ...
+       * sysdeps/alpha/configure.in: ... here.  Update comment.
+       * sysdeps/alpha/configure: Regenerate.
+       * sysdeps/alpha/elf/crti.S: Move to ...
+       * sysdeps/alpha/crti.S: ... here.
+       * sysdeps/alpha/elf/crtn.S: Move to ...
+       * sysdeps/alpha/crtn.S: ... here.
+       * sysdeps/alpha/elf/start.S: Move to ...
+       * sysdeps/alpha/start.S: ... here.
+
 2012-03-21  Richard Henderson  <rth@twiddle.net>
 
        * sysdeps/alpha/hp-timing.h: Include <_itoa.h> instead

diff --git a/sysdeps/alpha/elf/configure b/sysdeps/alpha/configure
similarity index 98%
rename from sysdeps/alpha/elf/configure
rename to sysdeps/alpha/configure
index 5da9875910b434b4f42e8ee4a27bed2756b69bc4..1d0daf5a818ae7af02801534f243c87a41c4f548 100644 (file)
--- a/sysdeps/alpha/elf/configure
+++ b/sysdeps/alpha/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/alpha/elf.
+ # Local configure fragment for sysdeps/alpha.
 
 # Check for support of thread-local storage handling in assembler and linker.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Alpha TLS support" >&5

diff --git a/sysdeps/alpha/elf/configure.in b/sysdeps/alpha/configure.in
similarity index 97%
rename from sysdeps/alpha/elf/configure.in
rename to sysdeps/alpha/configure.in
index 75fff5374c32364e584e9983bab6a75cf7fb1846..bf8e92665720361821ee62f0c5a3947c17cf0ff8 100644 (file)
--- a/sysdeps/alpha/elf/configure.in
+++ b/sysdeps/alpha/configure.in
@@ -1,5 +1,5 @@
 GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
-# Local configure fragment for sysdeps/alpha/elf.
+# Local configure fragment for sysdeps/alpha.
 
 # Check for support of thread-local storage handling in assembler and linker.
 AC_CACHE_CHECK(for Alpha TLS support, libc_cv_alpha_tls, [dnl

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

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

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