This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]

GNU C Library master sources branch master updated. glibc-2.24-400-gf7f7931

From: macro at sourceware dot org
To: glibc-cvs at sourceware dot org
Date: 23 Nov 2016 18:26:10 -0000
Subject: GNU C Library master sources branch master updated. glibc-2.24-400-gf7f7931

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  f7f7931e581271c678e0d38818c2022c2da81f8b (commit)
      from  56ede9ed59684a5802cc88733055453901f1c2f0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=f7f7931e581271c678e0d38818c2022c2da81f8b

commit f7f7931e581271c678e0d38818c2022c2da81f8b
Author: Maciej W. Rozycki <macro@imgtec.com>
Date:   Wed Nov 23 12:39:39 2016 +0000

    MIPS: Use R_MICROMIPS_JALR rather than R_MIPS_JALR in microMIPS code
    
    In a microMIPS compilation of `.init' code use the R_MICROMIPS_JALR
    relocation intended for PIC call relaxation in microMIPS code rather
    than the corresponding R_MIPS_JALR relocation meant for regular MIPS
    code only.
    
    	* sysdeps/mips/mips32/crti.S (JALR_RELOC): New macro.
    	(_init): Use it in place of hardcoded R_MIPS_JALR.
    	* sysdeps/mips/mips64/n32/crti.S (JALR_RELOC): New macro.
    	(_init): Use it in place of hardcoded R_MIPS_JALR.
    	* sysdeps/mips/mips64/n64/crti.S (JALR_RELOC): New macro.
    	(_init): Use it in place of hardcoded R_MIPS_JALR.

diff --git a/ChangeLog b/ChangeLog
index 963bf2a..3063bd0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2016-11-23  Maciej W. Rozycki  <macro@imgtec.com>
+
+	* sysdeps/mips/mips32/crti.S (JALR_RELOC): New macro.
+	(_init): Use it in place of hardcoded R_MIPS_JALR.
+	* sysdeps/mips/mips64/n32/crti.S (JALR_RELOC): New macro.
+	(_init): Use it in place of hardcoded R_MIPS_JALR.
+	* sysdeps/mips/mips64/n64/crti.S (JALR_RELOC): New macro.
+	(_init): Use it in place of hardcoded R_MIPS_JALR.
+
 2016-11-23  Joseph Myers  <joseph@codesourcery.com>
 
 	[BZ #20787]
diff --git a/sysdeps/mips/mips32/crti.S b/sysdeps/mips/mips32/crti.S
index dfbbdc4..a801f28 100644
--- a/sysdeps/mips/mips32/crti.S
+++ b/sysdeps/mips/mips32/crti.S
@@ -40,6 +40,12 @@
 
 #include <libc-symbols.h>
 
+#ifdef __mips_micromips
+# define JALR_RELOC R_MICROMIPS_JALR
+#else
+# define JALR_RELOC R_MIPS_JALR
+#endif
+
 #ifndef PREINIT_FUNCTION
 # define PREINIT_FUNCTION __gmon_start__
 #endif
@@ -71,13 +77,13 @@ _init:
 	lw $2,%got(PREINIT_FUNCTION)($28)
 	beq $2,$0,.Lno_weak_fn
 	lw $25,%call16(PREINIT_FUNCTION)($28)
-	.reloc 1f,R_MIPS_JALR,PREINIT_FUNCTION
+	.reloc 1f,JALR_RELOC,PREINIT_FUNCTION
 1:	jalr $25
 .Lno_weak_fn:
 	.insn
 #else
 	lw $25,%got(PREINIT_FUNCTION)($28)
-	.reloc 1f,R_MIPS_JALR,PREINIT_FUNCTION
+	.reloc 1f,JALR_RELOC,PREINIT_FUNCTION
 1:	jalr $25
 #endif
 
diff --git a/sysdeps/mips/mips64/n32/crti.S b/sysdeps/mips/mips64/n32/crti.S
index afe6d8e..376fa53 100644
--- a/sysdeps/mips/mips64/n32/crti.S
+++ b/sysdeps/mips/mips64/n32/crti.S
@@ -40,6 +40,12 @@
 
 #include <libc-symbols.h>
 
+#ifdef __mips_micromips
+# define JALR_RELOC R_MICROMIPS_JALR
+#else
+# define JALR_RELOC R_MIPS_JALR
+#endif
+
 #ifndef PREINIT_FUNCTION
 # define PREINIT_FUNCTION __gmon_start__
 #endif
@@ -71,13 +77,13 @@ _init:
 	lw $2,%got_disp(PREINIT_FUNCTION)($28)
 	beq $2,$0,.Lno_weak_fn
 	lw $25,%call16(PREINIT_FUNCTION)($28)
-	.reloc 1f,R_MIPS_JALR,PREINIT_FUNCTION
+	.reloc 1f,JALR_RELOC,PREINIT_FUNCTION
 1:	jalr $25
 .Lno_weak_fn:
 	.insn
 #else
 	lw $25,%got_disp(PREINIT_FUNCTION)($28)
-	.reloc 1f,R_MIPS_JALR,PREINIT_FUNCTION
+	.reloc 1f,JALR_RELOC,PREINIT_FUNCTION
 1:	jalr $25
 #endif
 
diff --git a/sysdeps/mips/mips64/n64/crti.S b/sysdeps/mips/mips64/n64/crti.S
index 4049d29..e7fdea4 100644
--- a/sysdeps/mips/mips64/n64/crti.S
+++ b/sysdeps/mips/mips64/n64/crti.S
@@ -40,6 +40,12 @@
 
 #include <libc-symbols.h>
 
+#ifdef __mips_micromips
+# define JALR_RELOC R_MICROMIPS_JALR
+#else
+# define JALR_RELOC R_MIPS_JALR
+#endif
+
 #ifndef PREINIT_FUNCTION
 # define PREINIT_FUNCTION __gmon_start__
 #endif
@@ -71,13 +77,13 @@ _init:
 	ld $2,%got_disp(PREINIT_FUNCTION)($28)
 	beq $2,$0,.Lno_weak_fn
 	ld $25,%call16(PREINIT_FUNCTION)($28)
-	.reloc 1f,R_MIPS_JALR,PREINIT_FUNCTION
+	.reloc 1f,JALR_RELOC,PREINIT_FUNCTION
 1:	jalr $25
 .Lno_weak_fn:
 	.insn
 #else
 	ld $25,%got_disp(PREINIT_FUNCTION)($28)
-	.reloc 1f,R_MIPS_JALR,PREINIT_FUNCTION
+	.reloc 1f,JALR_RELOC,PREINIT_FUNCTION
 1:	jalr $25
 #endif
 

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                      |    9 +++++++++
 sysdeps/mips/mips32/crti.S     |   10 ++++++++--
 sysdeps/mips/mips64/n32/crti.S |   10 ++++++++--
 sysdeps/mips/mips64/n64/crti.S |   10 ++++++++--
 4 files changed, 33 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]