[Commits] r23257 - in /fsf/glibc-2_17-branch/libc/ports: ./ sysdeps/tile/ sysdeps/tile/tilegx/

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Mon Jun 10 00:02:29 2013
New Revision: 23257

Log:
Import glibc-2.17 for 2013-06-10

Modified:
    fsf/glibc-2_17-branch/libc/ports/ChangeLog.tile
    fsf/glibc-2_17-branch/libc/ports/sysdeps/tile/crti.S
    fsf/glibc-2_17-branch/libc/ports/sysdeps/tile/start.S
    fsf/glibc-2_17-branch/libc/ports/sysdeps/tile/tilegx/Makefile

Modified: fsf/glibc-2_17-branch/libc/ports/ChangeLog.tile
==============================================================================
--- fsf/glibc-2_17-branch/libc/ports/ChangeLog.tile (original)
+++ fsf/glibc-2_17-branch/libc/ports/ChangeLog.tile Mon Jun 10 00:02:29 2013
@@ -1,3 +1,12 @@
+2013-05-23  Chris Metcalf  <cmetcalf@xxxxxxxxxx>
+
+	* sysdeps/tile/tilegx/Makefile ($(cflags-mcmodel-large)):
+	Test for assembler and linker support for "-mcmodel=large -fpic"
+	in addition to compiler support; provide -DNO_PLT_PCREL if not.
+	* sysdeps/tile/start.S [NO_PLT_PCREL]: Guard for no PC-relative
+	PLT operators in assembly.
+	* sysdeps/tile/crti.S [NO_PLT_PCREL]: Likewise.
+
 2012-12-14  Chris Metcalf  <cmetcalf@xxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/tile/nptl/clone.S: Fix DWARF info.

Modified: fsf/glibc-2_17-branch/libc/ports/sysdeps/tile/crti.S
==============================================================================
--- fsf/glibc-2_17-branch/libc/ports/sysdeps/tile/crti.S (original)
+++ fsf/glibc-2_17-branch/libc/ports/sysdeps/tile/crti.S Mon Jun 10 00:02:29 2013
@@ -95,7 +95,7 @@
 	LD_PTR r0, r0
 	BEQZ r0, .Lno_weak_fn
 	jalr r0
-#elif defined(__tilegx__)
+#elif defined(__tilegx__) && !defined(NO_PLT_PCREL)
 	/* Since we are calling from the start of the object to the PLT,
 	   call by loading the full address into a register.  */
 	lnk r2

Modified: fsf/glibc-2_17-branch/libc/ports/sysdeps/tile/start.S
==============================================================================
--- fsf/glibc-2_17-branch/libc/ports/sysdeps/tile/start.S (original)
+++ fsf/glibc-2_17-branch/libc/ports/sysdeps/tile/start.S Mon Jun 10 00:02:29 2013
@@ -62,6 +62,13 @@
 #include <sysdep.h>
 #include <arch/abi.h>
 
+/* Just create no-ops if we don't support PC-relative PLT relocations. */
+#ifdef NO_PLT_PCREL
+# define hw2_last_plt(x)	0
+# define hw1_plt(x)		0
+# define hw0_plt(x)		0
+#endif
+
 	.text
 	.global _start
 	.type   _start,@function
@@ -155,7 +162,11 @@
 	}
 	{
 	 ADD_PTR r4, r4, r13
-	 jalr r12
+# ifdef NO_PLT_PCREL
+	 j plt(__libc_start_main)
+# else
+	 jr r12
+# endif
 	}
 #else
 	 addli r0, r13, lo16(main - .Lmy_pc)

Modified: fsf/glibc-2_17-branch/libc/ports/sysdeps/tile/tilegx/Makefile
==============================================================================
--- fsf/glibc-2_17-branch/libc/ports/sysdeps/tile/tilegx/Makefile (original)
+++ fsf/glibc-2_17-branch/libc/ports/sysdeps/tile/tilegx/Makefile Mon Jun 10 00:02:29 2013
@@ -1,12 +1,16 @@
 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; \
-	$(CC) -S -o /dev/null -xc /dev/null -mcmodel=large && mcmodel=yes; \
+	(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)
-ifeq (yes,$(cflags-mcmodel-large))
 # 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
@@ -15,4 +19,17 @@
 # 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 assembly code with hwN_plt() directives if the
+# toolchain doesn't support -mcmodel=large.
+ifeq ($(subdir),csu)
+CPPFLAGS-start.S += -DNO_PLT_PCREL
+CPPFLAGS-crti.S += -DNO_PLT_PCREL
 endif
+ifeq ($(subdir),nptl)
+CPPFLAGS-pt-crti.S += -DNO_PLT_PCREL
+endif
+
+endif

_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits