diff mbox

Fix MIPS __mips_isa_rev -Werror=undef build [committed]

Message ID alpine.DEB.2.10.1502162212420.10686@digraph.polyomino.org.uk
State Committed
Headers

Commit Message

Joseph Myers Feb. 16, 2015, 10:12 p.m. UTC 
  I see an error

In file included from ../sysdeps/mips/include/sys/asm.h:20:0,
                 from ../sysdeps/mips/start.S:39:
../sysdeps/mips/sys/asm.h:421:5: error: "__mips_isa_rev" is not defined [-Werror=undef]
 #if __mips_isa_rev < 6
     ^
cc1: some warnings being treated as errors

in MIPS builds.  As sys/asm.h is an installed header, it seems better
to test for !defined __mips_isa_rev here, instead of defining it to 0
as done in sysdeps/unix/mips/sysdep.h, to avoid perturbing any code
outside glibc that tests whether __mips_isa_rev is defined; this patch
does so.

Committed.

2015-02-16  Joseph Myers  <joseph@codesourcery.com>

	* sysdeps/mips/sys/asm.h [__mips_isa_rev < 6]: Change condition to
	[!defined __mips_isa_rev || __mips_isa_rev < 6].
diff mbox

Patch

diff --git a/sysdeps/mips/sys/asm.h b/sysdeps/mips/sys/asm.h
index 6c94cee..0ff8802 100644
--- a/sysdeps/mips/sys/asm.h
+++ b/sysdeps/mips/sys/asm.h
@@ -418,7 +418,7 @@  symbol		=	value
 # define PTR_ADDI	addi
 # define PTR_SUB	sub
 # define PTR_SUBI	subi
-#if __mips_isa_rev < 6
+#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 */