68 files changed, 114 insertions, 121 deletions

diff --git a/ChangeLog b/ChangeLog
index 43dfbf2a5e..488769724b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,32 @@
 2017-12-20  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
 
+	* 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.
+
 	* README: Remove tilepro-*-linux-gnu from supported architecture.
 	* scripts/build-many-glibcs.py: Likewise.
 	* sysdeps/tile/__tls_get_addr.S (__tls_get_addr): Likewise.
diff --git a/stdlib/bug-getcontext.c b/stdlib/bug-getcontext.c
index 163400acba..55c681c480 100644
--- a/stdlib/bug-getcontext.c
+++ b/stdlib/bug-getcontext.c
@@ -50,7 +50,7 @@ do_test (void)
   printf ("\nDone with getcontext()!\n");
   fflush (NULL);
 
-  /* On nios2 and tilepro, GCC 5 warns that except_mask may be used
+  /* On nios2 GCC 5 warns that except_mask may be used
      uninitialized.  Because it is always initialized and nothing in
      this test ever calls setcontext (a setcontext call could result
      in local variables being clobbered on the second return from
diff --git a/sysdeps/tile/Implies b/sysdeps/tile/Implies
index 1cbc053905..cb17441cbd 100644
--- a/sysdeps/tile/Implies
+++ b/sysdeps/tile/Implies
@@ -1,3 +1,4 @@
 ieee754/soft-fp
+ieee754/dbl-64/wordsize-64
 ieee754/dbl-64
 ieee754/flt-32
diff --git a/sysdeps/tile/Makefile b/sysdeps/tile/Makefile
index 3cd4d1e752..dcb8777a54 100644
--- a/sysdeps/tile/Makefile
+++ b/sysdeps/tile/Makefile
@@ -1,3 +1,39 @@
+include $(common-objpfx)cflags-mcmodel-large.mk
+
+# Check for gcc to support the command-line switch, and for
+# binutils to support the hwN_plt() assembly operators and relocations.
+$(common-objpfx)cflags-mcmodel-large.mk: $(common-objpfx)config.make
+	mcmodel=no; \
+	(echo 'int main() { return getuid(); }' | \
+	 $(CC) -o /dev/null -xc - -mcmodel=large -fpic) && mcmodel=yes; \
+	echo "cflags-mcmodel-large = $$mcmodel" > $@
+
+ifeq (yes,$(cflags-mcmodel-large))
+
+ifeq ($(subdir),csu)
+# elf-init.c is in libc_nonshared.o (the end of the shared object) but
+# must reach the _init symbol at the very start of the shared object.
+CFLAGS-elf-init.c += -mcmodel=large
+
+# __gmon_start__ is at the very start of the shared object when linked
+# with profiling, but calls to libc.so via the PLT at the very end.
+CFLAGS-gmon-start.c += -mcmodel=large
+endif
+
+else
+
+# Don't try to compile