diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2015-08-18 21:52:22 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2015-08-18 21:52:22 +0000 |
| commit | 87336caeb5e5169575b8cba510cdbb71287c0514 (patch) | |
| tree | 175212155536eb3f63cb1b58073802c9c173c357 | |
| parent | 94ec7e007f4845de284d4f7569721b225ba77572 (diff) | |
| download | glibc-87336caeb5e5169575b8cba510cdbb71287c0514.tar.gz glibc-87336caeb5e5169575b8cba510cdbb71287c0514.tar.xz glibc-87336caeb5e5169575b8cba510cdbb71287c0514.zip | |
Fix MIPS -Wundef warnings for __mips_isa_rev.
This patch fixes -Wundef warnings relating to __mips_isa_rev being undefined. Tested for mips64 (all three ABIs) that there is a clean build and testsuite run with -Wno-error=undef removed (and my other -Wundef patches applied). * sysdeps/mips/dl-machine.h [__mips_isa_rev < 6]: Change conditionals to [!defined __mips_isa_rev || __mips_isa_rev < 6]. * sysdeps/mips/machine-gmon.h [__mips_isa_rev < 6]: Likewise.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | sysdeps/mips/dl-machine.h | 4 | ||||
| -rw-r--r-- | sysdeps/mips/machine-gmon.h | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 4b893a07cb..0daf15eeb9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2015-08-18 Joseph Myers <joseph@codesourcery.com> + + * sysdeps/mips/dl-machine.h [__mips_isa_rev < 6]: Change + conditionals to [!defined __mips_isa_rev || __mips_isa_rev < 6]. + * sysdeps/mips/machine-gmon.h [__mips_isa_rev < 6]: Likewise. + 2015-08-18 Carlos Eduardo Seo <cseo@linux.vnet.ibm.com> * sysdeps/powerpc/dl-procinfo.c: diff --git a/sysdeps/mips/dl-machine.h b/sysdeps/mips/dl-machine.h index 8738564241..52cd742056 100644 --- a/sysdeps/mips/dl-machine.h +++ b/sysdeps/mips/dl-machine.h @@ -151,7 +151,7 @@ elf_machine_load_address (void) #ifndef __mips16 asm (" .set noreorder\n" " " STRINGXP (PTR_LA) " %0, 0f\n" -# if __mips_isa_rev < 6 +# if !defined __mips_isa_rev || __mips_isa_rev < 6 " bltzal $0, 0f\n" " nop\n" "0: " STRINGXP (PTR_SUBU) " %0, $31, %0\n" @@ -259,7 +259,7 @@ do { \ and not just plain _start. */ #ifndef __mips16 -# if __mips_isa_rev < 6 +# if !defined __mips_isa_rev || __mips_isa_rev < 6 # define LCOFF STRINGXP(.Lcof2) # define LOAD_31 STRINGXP(bltzal $8) "," STRINGXP(.Lcof2) # else diff --git a/sysdeps/mips/machine-gmon.h b/sysdeps/mips/machine-gmon.h index ee2e3ea099..b661fd851c 100644 --- a/sysdeps/mips/machine-gmon.h +++ b/sysdeps/mips/machine-gmon.h @@ -83,7 +83,7 @@ static void __attribute_used__ __mcount (u_long frompc, u_long selfpc) #endif #if _MIPS_SIM == _ABIN32 -# if __mips_isa_rev < 6 +# if !defined __mips_isa_rev || __mips_isa_rev < 6 # define PTR_ADDU_STRING "add" /* no u */ # define PTR_SUBU_STRING "sub" /* no u */ # else |