Simplify tilegx sysdeps folder

With tilepro support removal we can now simplify internal tile support by
moving the directory structure to avoid the unnecessary directory levels
in tile/tilegx both on generic and linux folders.

Checked with a build for tilegx-linux-gnu and tilegx-linux-gnu-32 with
and without the patch, there is no difference in generated binary with
a dissassemble.

	* stdlib/bug-getcontext.c (do_test): Remove tilepro mention in
	comment.
	* sysdeps/tile/preconfigure: Remove tilegx folder.
	* sysdeps/tile/tilegx/Implies: Move definitions to ...
	* sysdeps/tile/Implies: ... here.
	* sysdeps/tile/tilegx/Makefile: Move rules to ...
	* sysdeps/tile/Makefile: ... here.
	* sysdeps/tile/tilegx/atomic-machine.h: Move definitions to ...
	* sysdeps/tile/atomic-machine.h: ... here.  Add include guards.
	* sysdeps/tile/tilegx/bits/wordsize.h: Move to ...
	* sysdeps/tile/bits/wordsize.h: ... here.
	* sysdeps/tile/tilegx/*: Move to ...
	* sysdeps/tile/*: ... here.
	* sysdeps/tile/tilegx/tilegx32/Implies: Move to ...
	* sysdeps/tile/tilegx32/Implies: ... here.
	* sysdeps/tile/tilegx/tilegx64/Implies: Move to ...
	* sysdeps/tile/tilegx64/Implies: ... here.
	* sysdeps/unix/sysv/linux/tile/tilegx/Makefile: Move definitions
	to ...
	* sysdeps/unix/sysv/linux/tile/Makefile: ... here.
	* sysdeps/unix/sysv/linux/tile/tilegx/*: Move to ...
	* sysdeps/unix/sysv/linux/tile/*: ... here.
	* sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/*: Move to ...
	* sysdeps/unix/sysv/linux/tile/tilegx32/*: ... here.
	* sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/*: Move to ...
	* sysdeps/unix/sysv/linux/tile/tilegx64/*: ... here.

43 files changed, 7 insertions, 8 deletions

diff --git a/sysdeps/unix/sysv/linux/tile/Makefile b/sysdeps/unix/sysv/linux/tile/Makefile
index 04605a69ac..fddaf181fe 100644
--- a/sysdeps/unix/sysv/linux/tile/Makefile
+++ b/sysdeps/unix/sysv/linux/tile/Makefile
@@ -1,3 +1,8 @@
+# Provide biarch definitions.
+abi-variants := 64 32
+abi-64-condition := __WORDSIZE == 64
+abi-32-condition := __WORDSIZE == 32
+
 ifeq ($(subdir),misc)
 
 # <sys/reg.h> provides something like x86 compatibility.
diff --git a/sysdeps/unix/sysv/linux/tile/tilegx/configure b/sysdeps/unix/sysv/linux/tile/configure
index 36e42e07e9..63f9686971 100644
--- a/sysdeps/unix/sysv/linux/tile/tilegx/configure
+++ b/sysdeps/unix/sysv/linux/tile/configure
@@ -4,7 +4,7 @@
 ldd_rewrite_script=$dir/ldd-rewrite.sed
 
 case $machine in
-tile/tilegx/tilegx32)
+tile/tilegx32)
   test -n "$libc_cv_slibdir" ||
 case "$prefix" in
 /usr | /usr/)
diff --git a/sysdeps/unix/sysv/linux/tile/tilegx/configure.ac b/sysdeps/unix/sysv/linux/tile/configure.ac
index baca1f62a8..45ec42cff9 100644
--- a/sysdeps/unix/sysv/linux/tile/tilegx/configure.ac
+++ b/sysdeps/unix/sysv/linux/tile/configure.ac
@@ -4,7 +4,7 @@ GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
 ldd_rewrite_script=$dir/ldd-rewrite.sed
 
 case $machine in
-tile/tilegx/tilegx32)
+tile/tilegx32)
   LIBC_SLIBDIR_RTLDDIR([lib32], [lib32])
   ;;
 esac
diff --git a/sysdeps/unix/sysv/linux/tile/tilegx/ioctl.S b/sysdeps/unix/sysv/linux/tile/ioctl.S
index 43f956399e..43f956399e 100644
--- a/sysdeps/unix/sysv/linux/tile/tilegx/ioctl.S
+++ b/sysdeps/unix/sysv/linux/tile/ioctl.S
diff --git a/sysdeps/unix/sysv/linux/tile/tilegx/ldconfig.h b/sysdeps/unix/sysv/linux/tile/ldconfig.h
index 6185e300fe..6185e300fe 100644
--- a/sysdeps/unix/sysv/linux/tile/tilegx/ldconfig.h
+++ b/sysdeps/unix/sysv/linux/tile/ldconfig.h
diff --git a/sysdeps/unix/sysv/linux/tile/tilegx/ldd-rewrite.sed b/sysdeps/unix/sysv/linux/tile/ldd-rewrite.sed
index 8b0bb691cc..8b0bb691cc 100644
--- a/sysdeps/unix/sysv/linux/tile/tilegx/ldd-rewrite.sed
+++ b/sysdeps/unix/sysv/linux/tile/ldd-rewrite.sed
diff --git a/sysdeps/unix/sysv/linux/tile/tilegx/register-dump.h b/sysdeps/unix/sysv/linux/tile/register-dump.h
index 491413e980..491413e980 100644
--- a/sysdeps/unix/sysv/linux/tile/tilegx/register-dump.h
+++ b/sysdeps/unix/sysv/linux/tile/register-dump.h
diff --git a/sysdeps/unix/sysv/linux/tile/tilegx/sched_getcpu.c b/sysdeps/unix/sysv/linux/tile/sched_getcpu.c
index 807913c7d1..807913c7d1 100644
--- a/sysdeps/unix/sysv/linux/tile/tilegx/sched_getcpu.c
+++ b/sysdeps/unix/sysv/linux/tile/sched_getcpu.c
diff --git a/sysdeps/unix/sysv/linux/tile/tilegx/Makefile b/sysdeps/unix/sysv/linux/tile/tilegx/Makefile
deleted file mode 100644
index 62a5be662a..0000000000
--- a/sysdeps/unix/sysv/linux/tile/tilegx/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-# Provide biarch definitions.
-abi-variants := 64 32
-abi-64-condition := __WORDSIZE == 64
-abi-32-condition := __WORDSIZE == 32
diff --git a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/Implies b/sysdeps/unix/sysv/linux/tile/tilegx32/Implies
index 9090d3fb8b..0023bb77aa 100644
--- a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/Implies
+++ b/sysdeps/unix/sysv/linux/tile/tilegx32/Implies
@@ -1,4 +1,3 @@
-unix/sysv/linux/tile/tilegx
 unix/sysv/linux/tile
 unix/sysv/linux/generic/wordsize-32
 unix/sysv/linux/generic
diff --git a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/Makefile b/sysdeps/unix/sysv/linux/tile/tilegx32/Makefile
index 1e9d29be31..1e9d29be31 100644
--- a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/Makefile
+++ b/sysdeps/unix/sysv/linux/tile/tilegx32/Makefile
diff --git a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/c++-types.data b/sysdeps/unix/sysv/linux/tile/tilegx32/c++-types.data
index 1a7bcb38d3..1a7bcb38d3 100644
--- a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/c++-types.data
+++ b/sysdeps/unix/sysv/linux/tile/tilegx32/c++-types.data
diff --git a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/jmp_buf-macros.h b/sysdeps/unix/sysv/linux/tile/tilegx32/jmp_buf-macros.h
index eb64802525..eb64802525 100644
--- a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/jmp_buf-macros.h
+++ b/sysdeps/unix/sysv/linux/tile/tilegx32/jmp_buf-macros.h
diff --git a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/ld.abilist b/sysdeps/unix/sysv/linux/tile/tilegx32/ld.abilist
index f166310147..f166310147 100644
--- a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/ld.abilist
+++ b/sysdeps/unix/sysv/linux/tile/tilegx32/ld.abilist
diff --git a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/libBrokenLocale.abilist b/sysdeps/unix/sysv/linux/tile/tilegx32/libBrokenLocale.abilist
index 0d64827515..0d64827515 100644
--- a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/libBrokenLocale.abilist
+++ b/sysdeps/unix/sysv/linux/tile/tilegx32/libBrokenLocale.abilist
diff --git a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/libanl.abilist b/sysdeps/unix/sysv/linux/tile/tilegx32/libanl.abilist
index a3b1cc08bf..a3b1cc08bf 100644
--- a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/libanl.abilist
+++ b/sysdeps/unix/sysv/linux/tile/tilegx32/libanl.abilist
diff --git a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/libc.abilist b/sysdeps/unix/sysv/linux/tile/tilegx32/libc.abilist
index dcbfbc05ac..dcbfbc05ac 100644
--- a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/libc.abilist
+++ b/sysdeps/unix/sysv/linux/tile/tilegx32/libc.abilist
diff --git a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/libcrypt.abilist b/sysdeps/unix/sysv/linux/tile/tilegx32/libcrypt.abilist
index d5643802b7..d5643802b7 100644
--- a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/libcrypt.abilist
+++ b/sysdeps/unix/sysv/linux/tile/tilegx32/libcrypt.abilist
diff --git a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/libdl.abilist b/sysdeps/unix/sysv/linux/tile/tilegx32/libdl.abilist
index cabc30c239..cabc30c239 100644
--- a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/libdl.abilist
+++ b/sysdeps/unix/sysv/linux/tile/tilegx32/libdl.abilist
diff --git a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/libm.abilist b/sysdeps/unix/sysv/linux/tile/tilegx32/libm.abilist
index 6b375f5152..6b375f5152 100644
--- a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/libm.abilist
+++ b/sysdeps/unix/sysv/linux/tile/tilegx32/libm.abilist
diff --git a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/libnsl.abilist b/sysdeps/unix/sysv/linux/tile/tilegx32/libnsl.abilist
index 0277e5c1a8..0277e5c1a8 100644
--- a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/libnsl.abilist
+++ b/sysdeps/unix/sysv/linux/tile/tilegx32/libnsl.abilist
diff --git a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/libpthread.abilist b/sysdeps/unix/sysv/linux/tile/tilegx32/libpthread.abilist
index d16158f938..d16158f938 100644
--- a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/tile/tilegx32/libpthread.abilist
diff --git a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/libresolv.abilist b/sysdeps/unix/sysv/linux/tile/tilegx32/libresolv.abilist
index aa2fefa6e4..aa2fefa6e4 100644
--- a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/tile/tilegx32/libresolv.abilist
diff --git a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/librt.abilist b/sysdeps/unix/sysv/linux/tile/tilegx32/librt.abilist
index 14f5c8245d..14f5c8245d 100644
--- a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/librt.abilist
+++ b/sysdeps/unix/sysv/linux/tile/tilegx32/librt.abilist
diff --git a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/libthread_db.abilist b/sysdeps/unix/sysv/linux/tile/tilegx32/libthread_db.abilist
index 4aade0b7e0..4aade0b7e0 100644
--- a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/libthread_db.abilist
+++ b/sysdeps/unix/sysv/linux/tile/tilegx32/libthread_db.abilist
diff --git a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/libutil.abilist b/sysdeps/unix/sysv/linux/tile/tilegx32/libutil.abilist
index e4d432643c..e4d432643c 100644
--- a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/libutil.abilist
+++ b/sysdeps/unix/sysv/linux/tile/tilegx32/libutil.abilist
diff --git a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/Implies b/sysdeps/unix/sysv/linux/tile/tilegx64/Implies
index e4e0800c0a..f8143197bd 100644
--- a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/Implies
+++ b/sysdeps/unix/sysv/linux/tile/tilegx64/Implies
@@ -1,4 +1,3 @@
-unix/sysv/linux/tile/tilegx
 unix/sysv/linux/tile
 unix/sysv/linux/generic
 unix/sysv/linux/wordsize-64
diff --git a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/Makefile b/sysdeps/unix/sysv/linux/tile/tilegx64/Makefile
index c8991d31e4..c8991d31e4 100644
--- a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/Makefile
+++ b/sysdeps/unix/sysv/linux/tile/tilegx64/Makefile
diff --git a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/c++-types.data b/sysdeps/unix/sysv/linux/tile/tilegx64/c++-types.data
index ac925ccb36..ac925ccb36 100644
--- a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/c++-types.data
+++ b/sysdeps/unix/sysv/linux/tile/tilegx64/c++-types.data
diff --git a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/jmp_buf-macros.h b/sysdeps/unix/sysv/linux/tile/tilegx64/jmp_buf-macros.h
index 685f9b8236..685f9b8236 100644
--- a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/jmp_buf-macros.h
+++ b/sysdeps/unix/sysv/linux/tile/tilegx64/jmp_buf-macros.h
diff --git a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/ld.abilist b/sysdeps/unix/sysv/linux/tile/tilegx64/ld.abilist
index ab74e7ecd1..ab74e7ecd1 100644
--- a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/ld.abilist
+++ b/sysdeps/unix/sysv/linux/tile/tilegx64/ld.abilist
diff --git a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/libBrokenLocale.abilist b/sysdeps/unix/sysv/linux/tile/tilegx64/libBrokenLocale.abilist
index 0d64827515..0d64827515 100644
--- a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/libBrokenLocale.abilist
+++ b/sysdeps/unix/sysv/linux/tile/tilegx64/libBrokenLocale.abilist
diff --git a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/libanl.abilist b/sysdeps/unix/sysv/linux/tile/tilegx64/libanl.abilist
index a3b1cc08bf..a3b1cc08bf 100644
--- a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/libanl.abilist
+++ b/sysdeps/unix/sysv/linux/tile/tilegx64/libanl.abilist
diff --git a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/libc.abilist b/sysdeps/unix/sysv/linux/tile/tilegx64/libc.abilist
index 53dc99c45a..53dc99c45a 100644
--- a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/tile/tilegx64/libc.abilist
diff --git a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/libcrypt.abilist b/sysdeps/unix/sysv/linux/tile/tilegx64/libcrypt.abilist
index d5643802b7..d5643802b7 100644
--- a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/libcrypt.abilist
+++ b/sysdeps/unix/sysv/linux/tile/tilegx64/libcrypt.abilist
diff --git a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/libdl.abilist b/sysdeps/unix/sysv/linux/tile/tilegx64/libdl.abilist
index cabc30c239..cabc30c239 100644
--- a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/libdl.abilist
+++ b/sysdeps/unix/sysv/linux/tile/tilegx64/libdl.abilist
diff --git a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/libm.abilist b/sysdeps/unix/sysv/linux/tile/tilegx64/libm.abilist
index 6b375f5152..6b375f5152 100644
--- a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/libm.abilist
+++ b/sysdeps/unix/sysv/linux/tile/tilegx64/libm.abilist
diff --git a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/libnsl.abilist b/sysdeps/unix/sysv/linux/tile/tilegx64/libnsl.abilist
index 0277e5c1a8..0277e5c1a8 100644
--- a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/libnsl.abilist
+++ b/sysdeps/unix/sysv/linux/tile/tilegx64/libnsl.abilist
diff --git a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/libpthread.abilist b/sysdeps/unix/sysv/linux/tile/tilegx64/libpthread.abilist
index d16158f938..d16158f938 100644
--- a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/tile/tilegx64/libpthread.abilist
diff --git a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/libresolv.abilist b/sysdeps/unix/sysv/linux/tile/tilegx64/libresolv.abilist
index bd81642e3d..bd81642e3d 100644
--- a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/libresolv.abilist
+++ b/sysdeps/unix/sysv/linux/tile/tilegx64/libresolv.abilist
diff --git a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/librt.abilist b/sysdeps/unix/sysv/linux/tile/tilegx64/librt.abilist
index 14f5c8245d..14f5c8245d 100644
--- a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/librt.abilist
+++ b/sysdeps/unix/sysv/linux/tile/tilegx64/librt.abilist
diff --git a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/libthread_db.abilist b/sysdeps/unix/sysv/linux/tile/tilegx64/libthread_db.abilist
index 4aade0b7e0..4aade0b7e0 100644
--- a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/libthread_db.abilist
+++ b/sysdeps/unix/sysv/linux/tile/tilegx64/libthread_db.abilist
diff --git a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/libutil.abilist b/sysdeps/unix/sysv/linux/tile/tilegx64/libutil.abilist
index e4d432643c..e4d432643c 100644
--- a/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/libutil.abilist
+++ b/sysdeps/unix/sysv/linux/tile/tilegx64/libutil.abilist