diff options
Diffstat (limited to 'sysdeps')
-rw-r--r-- | sysdeps/arm/nacl/include/bits/setjmp.h | 3 | ||||
-rw-r--r-- | sysdeps/mips/include/sys/asm.h | 6 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/include/sys/sysinfo.h | 3 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/include/sys/timex.h | 3 | ||||
-rw-r--r-- | sysdeps/x86/fpu/include/bits/fenv.h | 6 |
5 files changed, 19 insertions, 2 deletions
diff --git a/sysdeps/arm/nacl/include/bits/setjmp.h b/sysdeps/arm/nacl/include/bits/setjmp.h index 6b6a235871..e1fe5059a3 100644 --- a/sysdeps/arm/nacl/include/bits/setjmp.h +++ b/sysdeps/arm/nacl/include/bits/setjmp.h @@ -24,6 +24,8 @@ # include <sysdeps/arm/bits/setjmp.h> #endif +# ifndef _ISOMAC + /* Register list for a ldm/stm instruction to load/store the general registers from a __jmp_buf. @@ -35,4 +37,5 @@ /* Index of __jmp_buf where the sp register resides. */ #define __JMP_BUF_SP 0 +# endif /* _ISOMAC */ #endif /* include/bits/setjmp.h */ diff --git a/sysdeps/mips/include/sys/asm.h b/sysdeps/mips/include/sys/asm.h index 7e288df117..67acf74dc0 100644 --- a/sysdeps/mips/include/sys/asm.h +++ b/sysdeps/mips/include/sys/asm.h @@ -16,8 +16,9 @@ <http://www.gnu.org/licenses/>. */ #ifndef _SYS_ASM_H +#include_next <sys/asm.h> -# include_next <sys/asm.h> +# ifndef _ISOMAC # undef __mips_cfi_startproc # define __mips_cfi_startproc cfi_startproc @@ -50,4 +51,5 @@ cfi_restore (gp) # endif -#endif +# endif /* _ISOMAC */ +#endif /* sys/asm.h */ diff --git a/sysdeps/unix/sysv/linux/include/sys/sysinfo.h b/sysdeps/unix/sysv/linux/include/sys/sysinfo.h index 50077fb08c..b76f7e0d09 100644 --- a/sysdeps/unix/sysv/linux/include/sys/sysinfo.h +++ b/sysdeps/unix/sysv/linux/include/sys/sysinfo.h @@ -21,6 +21,9 @@ #include_next <sys/sysinfo.h> +# ifndef _ISOMAC + extern __typeof (sysinfo) __sysinfo __THROW; +# endif /* _ISOMAC */ #endif /* sys/sysinfo.h */ diff --git a/sysdeps/unix/sysv/linux/include/sys/timex.h b/sysdeps/unix/sysv/linux/include/sys/timex.h index ace90ee033..4b4ff88895 100644 --- a/sysdeps/unix/sysv/linux/include/sys/timex.h +++ b/sysdeps/unix/sysv/linux/include/sys/timex.h @@ -21,6 +21,9 @@ #include_next <sys/timex.h> +# ifndef _ISOMAC + libc_hidden_proto (__adjtimex) +# endif /* _ISOMAC */ #endif /* sys/timex.h */ diff --git a/sysdeps/x86/fpu/include/bits/fenv.h b/sysdeps/x86/fpu/include/bits/fenv.h index 6e8b733f33..a410ed00d0 100644 --- a/sysdeps/x86/fpu/include/bits/fenv.h +++ b/sysdeps/x86/fpu/include/bits/fenv.h @@ -16,8 +16,11 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ +#ifndef _BITS_FENV_H #include_next <bits/fenv.h> +# ifndef _ISOMAC + /* Ensure __feraiseexcept calls in glibc are optimized the same as feraiseexcept calls. */ @@ -40,3 +43,6 @@ __NTH (__feraiseexcept (int __excepts)) __END_DECLS #endif + +# endif /* _ISOMAC */ +#endif /* bits/fenv.h */ |