summaryrefslogtreecommitdiff
path: root/libc
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@uclibc-ng.org>2016-01-30 09:37:44 (GMT)
committerWaldemar Brodkorb <wbx@uclibc-ng.org>2016-01-31 16:41:44 (GMT)
commit931fd627f61957dbe33860f659c7cf2939f94113 (patch)
tree57e94248aca2ead1239cad06011bb1279f3ca14b /libc
parent6f15c3b452c94098f3a9e2a0686ca5e5ffe65461 (diff)
mips: fix clashing symbols
ISC bind9 uses ptrsize, better use something else. Reported-By: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Waldemar Brodkorb <wbx@uclibc-ng.org>
Diffstat (limited to 'libc')
-rw-r--r--libc/sysdeps/linux/mips/bits/setjmp.h12
-rw-r--r--libc/sysdeps/linux/mips/setjmp_aux.c6
2 files changed, 9 insertions, 9 deletions
diff --git a/libc/sysdeps/linux/mips/bits/setjmp.h b/libc/sysdeps/linux/mips/bits/setjmp.h
index 375e537..51f972e 100644
--- a/libc/sysdeps/linux/mips/bits/setjmp.h
+++ b/libc/sysdeps/linux/mips/bits/setjmp.h
@@ -26,18 +26,18 @@
#include <sgidefs.h>
#if _MIPS_SIM == _MIPS_SIM_ABI32
-#define ptrsize void *
+#define __ptr_size void *
#else
-#define ptrsize long long
+#define __ptr_size long long
#endif
typedef struct
{
/* Program counter. */
- ptrsize __pc;
+ __ptr_size __pc;
/* Stack pointer. */
- ptrsize __sp;
+ __ptr_size __sp;
/* Callee-saved registers s0 through s7. */
#if _MIPS_SIM == _MIPS_SIM_ABI32
@@ -47,10 +47,10 @@ typedef struct
#endif
/* The frame pointer. */
- ptrsize __fp;
+ __ptr_size __fp;
/* The global pointer. */
- ptrsize __gp;
+ __ptr_size __gp;
/* Floating point status register. */
int __fpc_csr;
diff --git a/libc/sysdeps/linux/mips/setjmp_aux.c b/libc/sysdeps/linux/mips/setjmp_aux.c
index 9cffcc6..4338838 100644
--- a/libc/sysdeps/linux/mips/setjmp_aux.c
+++ b/libc/sysdeps/linux/mips/setjmp_aux.c
@@ -62,14 +62,14 @@ __sigsetjmp_aux (jmp_buf env, int savemask, int sp, int fp)
#endif
/* .. and the stack pointer; */
- env[0].__jmpbuf[0].__sp = (ptrsize) sp;
+ env[0].__jmpbuf[0].__sp = (__ptr_size) sp;
/* .. and the FP; it'll be in s8. */
- env[0].__jmpbuf[0].__fp = (ptrsize) fp;
+ env[0].__jmpbuf[0].__fp = (__ptr_size) fp;
/* .. and the GP; */
#if _MIPS_SIM == _MIPS_SIM_ABI64
- env[0].__jmpbuf[0].__gp = (ptrsize) gp;
+ env[0].__jmpbuf[0].__gp = (__ptr_size) gp;
#else
__asm__ __volatile__ ("sw $gp, %0" : : "m" (env[0].__jmpbuf[0].__gp));
#endif