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 "uClibc-ng - small C library for embedded systems". The branch, master has been updated via c28bd50282271116f81d72302f22dc3e41035f48 (commit) via 739d2e9fe2929ab0ee83404f03f45702ab0f517a (commit) from f81442f06289f183e3891bf6d48ad138faf66c96 (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 ----------------------------------------------------------------- commit c28bd50282271116f81d72302f22dc3e41035f48 Author: Waldemar Brodkorb &lt;wbx(a)openadk.org&gt; Date: Thu Jan 5 08:08:02 2017 +0100 mips: sync with GNU libc, fix mips64r6 n32 compilation commit 739d2e9fe2929ab0ee83404f03f45702ab0f517a Author: Waldemar Brodkorb &lt;wbx(a)openadk.org&gt; Date: Thu Jan 5 06:27:35 2017 +0100 ld.so: fix mips{32,64}r6 support Signed-off-by: Matthew Fortune &lt;Matthew.Fortune(a)imgtec.com&gt; ----------------------------------------------------------------------- Summary of changes: ldso/ldso/mips/dl-startup.h | 2 +- libc/sysdeps/linux/mips/sys/asm.h | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ldso/ldso/mips/dl-startup.h b/ldso/ldso/mips/dl-startup.h index 0cab7be..8026f17 100644 --- a/ldso/ldso/mips/dl-startup.h +++ b/ldso/ldso/mips/dl-startup.h @@ -37,12 +37,12 @@ __asm__("" #if _MIPS_SIM == _MIPS_SIM_ABI32 " subu $29, 16\n" #endif -# if !defined __mips_isa_rev || __mips_isa_rev < 6 #if _MIPS_SIM == _MIPS_SIM_ABI64 " dla $8, .coff\n" #else /* O32 || N32 */ " la $8, .coff\n" #endif /* O32 || N32 */ +# if !defined __mips_isa_rev || __mips_isa_rev < 6 " bltzal $8, .coff\n" ".coff:\n" # else diff --git a/libc/sysdeps/linux/mips/sys/asm.h b/libc/sysdeps/linux/mips/sys/asm.h index 809bde4..7b0c925 100644 --- a/libc/sysdeps/linux/mips/sys/asm.h +++ b/libc/sysdeps/linux/mips/sys/asm.h @@ -415,12 +415,19 @@ symbol = value #if _MIPS_SIM == _MIPS_SIM_NABI32 # define PTR_ADD add # define PTR_ADDI addi -# define PTR_ADDU add /* no u */ -# define PTR_ADDIU addi /* no u */ # define PTR_SUB sub # define PTR_SUBI subi +#if !defined __mips_isa_rev || __mips_isa_rev < 6 +# define PTR_ADDU add /* no u */ +# define PTR_ADDIU addi /* no u */ # define PTR_SUBU sub /* no u */ # define PTR_SUBIU sub /* no u */ +#else +# define PTR_ADDU addu +# define PTR_ADDIU addiu +# define PTR_SUBU subu +# define PTR_SUBIU subu +#endif # define PTR_L lw # define PTR_LA la # define PTR_S sw hooks/post-receive -- uClibc-ng - small C library for embedded systems