Move sysdeps/powerpc/powerpc64/elf files

	* sysdeps/powerpc/powerpc64/elf/bzero.S: Moved to ...
	* sysdeps/powerpc/powerpc64/bzero.S: ... here.
	* sysdeps/powerpc/powerpc64/elf/entry.h: Moved to ...
	* sysdeps/powerpc/powerpc64/entry.h: ... here.
	* sysdeps/powerpc/powerpc64/elf/start.S: Moved to ...
	* sysdeps/powerpc/powerpc64/start.S: here.
	* sysdeps/powerpc/powerpc64/elf/Makefile: Merge into ...
	* sysdeps/powerpc/powerpc64/Makefile: ... this.
	* sysdeps/powerpc/powerpc64/elf/configure.in: Merge into ...
	* sysdeps/powerpc/powerpc64/configure.in: ... this.
	* sysdeps/powerpc/powerpc64/elf/configure: Delete file.

8 files changed, 63 insertions, 214 deletions

diff --git a/sysdeps/powerpc/powerpc64/Makefile b/sysdeps/powerpc/powerpc64/Makefile
index 01889e1314..171e89b3ba 100644
--- a/sysdeps/powerpc/powerpc64/Makefile
+++ b/sysdeps/powerpc/powerpc64/Makefile
@@ -25,6 +25,16 @@ no-special-regs := $(sort $(foreach n,40 41 50 51 60 61 62 63 \
 				    -ffixed-v$n)) \
 		   -ffixed-vrsave -ffixed-vscr -mno-altivec -mno-vsx
 
+# Need to prevent gcc from using fprs in code used during dynamic linking.
+
+CFLAGS-dl-runtime.os = $(no-special-regs)
+CFLAGS-dl-lookup.os = $(no-special-regs)
+CFLAGS-dl-misc.os = $(no-special-regs)
+CFLAGS-rtld-mempcpy.os = $(no-special-regs)
+CFLAGS-rtld-memmove.os = $(no-special-regs)
+CFLAGS-rtld-memchr.os = $(no-special-regs)
+CFLAGS-rtld-strnlen.os = $(no-special-regs)
+
 ifeq ($(subdir),csu)
 sysdep_routines += hp-timing
 elide-routines.os += hp-timing
diff --git a/sysdeps/powerpc/powerpc64/elf/bzero.S b/sysdeps/powerpc/powerpc64/bzero.S
index b79f88511d..b79f88511d 100644
--- a/sysdeps/powerpc/powerpc64/elf/bzero.S
+++ b/sysdeps/powerpc/powerpc64/bzero.S
diff --git a/sysdeps/powerpc/powerpc64/configure.in b/sysdeps/powerpc/powerpc64/configure.in
index 67aac663d8..7d333a7c57 100644
--- a/sysdeps/powerpc/powerpc64/configure.in
+++ b/sysdeps/powerpc/powerpc64/configure.in
@@ -40,3 +40,56 @@ rm -f conftest.c conftest.s
 if test x$libc_cv_overlapping_opd = xyes; then
   AC_DEFINE(USE_PPC64_OVERLAPPING_OPD)
 fi
+
+# Check for support of thread-local storage handling in assembler and
+# linker.
+AC_CACHE_CHECK(for powerpc64 TLS support, libc_cv_powerpc64_tls, [dnl
+cat > conftest.s <<\EOF
+	.section ".tdata","awT",@progbits
+x:      .quad   1
+x1:     .quad   1
+x2:     .quad   1
+x3:     .quad   1
+x4:     .long   1
+	.section ".toc","aw"
+.LC0:
+	.quad	x@dtpmod
+	.quad	x@dtprel
+.LC1:
+	.quad	x1@dtpmod
+	.quad	0
+.LC2:
+	.quad	x@tprel
+	.text
+	addi    3,2,x@got@tlsgd
+	addi    3,2,.LC0@toc
+	addi    3,2,x1@got@tlsld
+	addi    9,3,x1@dtprel
+	addis   9,3,x2@dtprel@ha
+	addi    9,9,x2@dtprel@l
+	ld      9,x3@got@dtprel(2)
+	addi    3,2,.LC0@toc
+	lwz     0,x1@dtprel(3)
+	ld      0,x1@dtprel(3)
+	addis   9,3,x2@dtprel@ha
+	lwz     0,x2@dtprel@l(9)
+	ld      0,x2@dtprel@l(9)
+	ld      9,x3@got@dtprel(2)
+	ld      9,x@got@tprel(2)
+	add     9,9,x@tls
+	ld      9,.LC2@toc(2)
+	add     9,9,.LC2@tls
+	addi    9,13,x1@tprel
+	addis   9,13,x2@tprel@ha
+	addi    9,9,x2@tprel@l
+EOF
+dnl
+if AC_TRY_COMMAND(${CC-cc} -c $CFLAGS conftest.s 1>&AS_MESSAGE_LOG_FD); then
+  libc_cv_powerpc64_tls=yes
+else
+  libc_cv_powerpc64_tls=no
+fi
+rm -f conftest*])
+if test $libc_cv_powerpc64_tls = no; then
+  AC_MSG_ERROR([the assembler must support TLS])
+fi
diff --git a/sysdeps/powerpc/powerpc64/elf/Makefile b/sysdeps/powerpc/powerpc64/elf/Makefile
deleted file mode 100644
index 6a77e116bd..0000000000
--- a/sysdeps/powerpc/powerpc64/elf/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-# powerpc64/ELF specific definitions.
-
-# Need to prevent gcc from using fprs in code used during dynamic linking.
-
-CFLAGS-dl-runtime.os = $(no-special-regs)
-CFLAGS-dl-lookup.os = $(no-special-regs)
-CFLAGS-dl-misc.os = $(no-special-regs)
-CFLAGS-rtld-mempcpy.os = $(no-special-regs)
-CFLAGS-rtld-memmove.os = $(no-special-regs)
-CFLAGS-rtld-memchr.os = $(no-special-regs)
-CFLAGS-rtld-strnlen.os = $(no-special-regs)
diff --git a/sysdeps/powerpc/powerpc64/elf/configure b/sysdeps/powerpc/powerpc64/elf/configure
deleted file mode 100644
index a3d24a3827..0000000000
--- a/sysdeps/powerpc/powerpc64/elf/configure
+++ /dev/null
@@ -1,148 +0,0 @@
-
-# as_fn_set_status STATUS
-# -----------------------
-# Set $? to STATUS, without forking.
-as_fn_set_status ()
-{
-  return $1
-} # as_fn_set_status
-
-# as_fn_exit STATUS
-# -----------------
-# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-as_fn_exit ()
-{
-  set +e
-  as_fn_set_status $1
-  exit $1
-} # as_fn_exit
-if expr a : '\(a\)' >/dev/null 2>&1 &&
-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-as_me=`$as_basename -- "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-$as_echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\/\)$/{
-	    s//\1/
-	    q
-	  }
-	  /^X\/\(\/\).*/{
-	    s//\1/
-	    q
-	  }
-	  s/.*/./; q'`
-
-
-  as_lineno_1=$LINENO as_lineno_1a=$LINENO
-  as_lineno_2=$LINENO as_lineno_2a=$LINENO
-  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
-  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
-  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
-  sed -n '
-    p
-    /[$]LINENO/=
-  ' <$as_myself |
-    sed '
-      s/[$]LINENO.*/&-/
-      t lineno
-      b
-      :lineno
-      N
-      :loop
-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
-      t loop
-      s/-\n.*//
-    ' >$as_me.lineno &&
-  chmod +x "$as_me.lineno" ||
-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensitive to this).
-  . "./$as_me.lineno"
-  # Exit status is that of the last command.
-  exit
-}
-
-# This file is generated from configure.in by Autoconf.  DO NOT EDIT!
- # Local configure fragment for sysdeps/powerpc64/elf.
-
-# Check for support of thread-local storage handling in assembler and
-# linker.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for powerpc64 TLS support" >&5
-$as_echo_n "checking for powerpc64 TLS support... " >&6; }
-if ${libc_cv_powerpc64_tls+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat > conftest.s <<\EOF
-	.section ".tdata","awT",@progbits
-x:      .quad   1
-x1:     .quad   1
-x2:     .quad   1
-x3:     .quad   1
-x4:     .long   1
-	.section ".toc","aw"
-.LC0:
-	.quad	x@dtpmod
-	.quad	x@dtprel
-.LC1:
-	.quad	x1@dtpmod
-	.quad	0
-.LC2:
-	.quad	x@tprel
-	.text
-	addi    3,2,x@got@tlsgd
-	addi    3,2,.LC0@toc
-	addi    3,2,x1@got@tlsld
-	addi    9,3,x1@dtprel
-	addis   9,3,x2@dtprel@ha
-	addi    9,9,x2@dtprel@l
-	ld      9,x3@got@dtprel(2)
-	addi    3,2,.LC0@toc
-	lwz     0,x1@dtprel(3)
-	ld      0,x1@dtprel(3)
-	addis   9,3,x2@dtprel@ha
-	lwz     0,x2@dtprel@l(9)
-	ld      0,x2@dtprel@l(9)
-	ld      9,x3@got@dtprel(2)
-	ld      9,x@got@tprel(2)
-	add     9,9,x@tls
-	ld      9,.LC2@toc(2)
-	add     9,9,.LC2@tls
-	addi    9,13,x1@tprel
-	addis   9,13,x2@tprel@ha
-	addi    9,9,x2@tprel@l
-EOF
-if { ac_try='${CC-cc} -c $CFLAGS conftest.s 1>&5'
-  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }; then
-  libc_cv_powerpc64_tls=yes
-else
-  libc_cv_powerpc64_tls=no
-fi
-rm -f conftest*
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_powerpc64_tls" >&5
-$as_echo "$libc_cv_powerpc64_tls" >&6; }
-if test $libc_cv_powerpc64_tls = no; then
-  as_fn_error $? "the assembler must support TLS" "$LINENO" 5
-fi
diff --git a/sysdeps/powerpc/powerpc64/elf/configure.in b/sysdeps/powerpc/powerpc64/elf/configure.in
deleted file mode 100644
index 9a375c66a4..0000000000
--- a/sysdeps/powerpc/powerpc64/elf/configure.in
+++ /dev/null
@@ -1,55 +0,0 @@
-GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
-# Local configure fragment for sysdeps/powerpc64/elf.
-
-# Check for support of thread-local storage handling in assembler and
-# linker.
-AC_CACHE_CHECK(for powerpc64 TLS support, libc_cv_powerpc64_tls, [dnl
-cat > conftest.s <<\EOF
-	.section ".tdata","awT",@progbits
-x:      .quad   1
-x1:     .quad   1
-x2:     .quad   1
-x3:     .quad   1
-x4:     .long   1
-	.section ".toc","aw"
-.LC0:
-	.quad	x@dtpmod
-	.quad	x@dtprel
-.LC1:
-	.quad	x1@dtpmod
-	.quad	0
-.LC2:
-	.quad	x@tprel
-	.text
-	addi    3,2,x@got@tlsgd
-	addi    3,2,.LC0@toc
-	addi    3,2,x1@got@tlsld
-	addi    9,3,x1@dtprel
-	addis   9,3,x2@dtprel@ha
-	addi    9,9,x2@dtprel@l
-	ld      9,x3@got@dtprel(2)
-	addi    3,2,.LC0@toc
-	lwz     0,x1@dtprel(3)
-	ld      0,x1@dtprel(3)
-	addis   9,3,x2@dtprel@ha
-	lwz     0,x2@dtprel@l(9)
-	ld      0,x2@dtprel@l(9)
-	ld      9,x3@got@dtprel(2)
-	ld      9,x@got@tprel(2)
-	add     9,9,x@tls
-	ld      9,.LC2@toc(2)
-	add     9,9,.LC2@tls
-	addi    9,13,x1@tprel
-	addis   9,13,x2@tprel@ha
-	addi    9,9,x2@tprel@l
-EOF
-dnl
-if AC_TRY_COMMAND(${CC-cc} -c $CFLAGS conftest.s 1>&AS_MESSAGE_LOG_FD); then
-  libc_cv_powerpc64_tls=yes
-else
-  libc_cv_powerpc64_tls=no
-fi
-rm -f conftest*])
-if test $libc_cv_powerpc64_tls = no; then
-  AC_MSG_ERROR([the assembler must support TLS])
-fi
diff --git a/sysdeps/powerpc/powerpc64/elf/entry.h b/sysdeps/powerpc/powerpc64/entry.h
index 2a54fe728d..2a54fe728d 100644
--- a/sysdeps/powerpc/powerpc64/elf/entry.h
+++ b/sysdeps/powerpc/powerpc64/entry.h
diff --git a/sysdeps/powerpc/powerpc64/elf/start.S b/sysdeps/powerpc/powerpc64/start.S
index d9c92d139f..d9c92d139f 100644
--- a/sysdeps/powerpc/powerpc64/elf/start.S
+++ b/sysdeps/powerpc/powerpc64/start.S