From 8350c7e88273644e42322bd0e1007b9df3dc9def Mon Sep 17 00:00:00 2001 From: "Peter S. Mazinger" Date: Sun, 13 Mar 2011 21:48:22 +0100 Subject: change __HAVE_FPU__ to __UCLIBC_HAS_FPU__ add features.h where necessary Signed-off-by: Peter S. Mazinger Signed-off-by: Bernhard Reutner-Fischer --- libc/sysdeps/linux/m68k/__longjmp.S | 2 +- libc/sysdeps/linux/m68k/bits/setjmp.h | 4 +++- libc/sysdeps/linux/m68k/bsd-_setjmp.S | 3 ++- libc/sysdeps/linux/m68k/bsd-setjmp.S | 3 ++- libc/sysdeps/linux/m68k/jmpbuf-offsets.h | 2 ++ libc/sysdeps/linux/m68k/setjmp.S | 3 ++- libc/sysdeps/linux/nios2/__longjmp.S | 2 +- libc/sysdeps/linux/nios2/bits/setjmp.h | 2 +- libc/sysdeps/linux/nios2/bsd-_setjmp.S | 3 ++- libc/sysdeps/linux/nios2/bsd-setjmp.S | 3 ++- libc/sysdeps/linux/nios2/jmpbuf-offsets.h | 4 +++- libc/sysdeps/linux/nios2/setjmp.S | 2 +- 12 files changed, 22 insertions(+), 11 deletions(-) (limited to 'libc') diff --git a/libc/sysdeps/linux/m68k/__longjmp.S b/libc/sysdeps/linux/m68k/__longjmp.S index f80c087e3..5033f02b4 100644 --- a/libc/sysdeps/linux/m68k/__longjmp.S +++ b/libc/sysdeps/linux/m68k/__longjmp.S @@ -15,7 +15,7 @@ __longjmp: movel #1, %d0 1: moveml %a0@(JB_REGS), %d2-%d7/%a2-%a7 -#if defined(__HAVE_68881__) || defined(__HAVE_FPU__) +#if defined __HAVE_68881__ || defined __UCLIBC_HAS_FPU__ fmovemx %a0@(JB_FPREGS), %fp2-%fp7 #endif movel %a0@(JB_PC), %sp@ diff --git a/libc/sysdeps/linux/m68k/bits/setjmp.h b/libc/sysdeps/linux/m68k/bits/setjmp.h index fa9ff543b..72feb5365 100644 --- a/libc/sysdeps/linux/m68k/bits/setjmp.h +++ b/libc/sysdeps/linux/m68k/bits/setjmp.h @@ -25,6 +25,8 @@ # error "Never include directly; use instead." #endif +#include + typedef struct { /* There are eight 4-byte data registers, but D0 is not saved. */ @@ -35,7 +37,7 @@ typedef struct int *__fp; int *__sp; -#if defined __HAVE_68881__ || defined __HAVE_FPU__ +#if defined __HAVE_68881__ || defined __UCLIBC_HAS_FPU__ /* There are eight floating point registers which are saved in IEEE 96-bit extended format. */ char __fpregs[8 * (96 / 8)]; diff --git a/libc/sysdeps/linux/m68k/bsd-_setjmp.S b/libc/sysdeps/linux/m68k/bsd-_setjmp.S index cc472f70d..c963cccf5 100644 --- a/libc/sysdeps/linux/m68k/bsd-_setjmp.S +++ b/libc/sysdeps/linux/m68k/bsd-_setjmp.S @@ -2,6 +2,7 @@ /* Copyright (C) 2002, David McCullough */ /* This file is released under the LGPL, any version you like */ +#include #include .globl _setjmp; @@ -12,7 +13,7 @@ _setjmp: moveal %sp@(4), %a0 movel %sp@(0), %a0@(JB_PC) moveml %d2-%d7/%a2-%a7, %a0@(JB_REGS) -#if defined(__HAVE_68881__) || defined(__HAVE_FPU__) +#if defined __HAVE_68881__ || defined __UCLIBC_HAS_FPU__ fmovemx %fp2-%fp7, %a0@(JB_FPREGS) #endif clrl %d0 diff --git a/libc/sysdeps/linux/m68k/bsd-setjmp.S b/libc/sysdeps/linux/m68k/bsd-setjmp.S index b41b4c1fd..9daf27713 100644 --- a/libc/sysdeps/linux/m68k/bsd-setjmp.S +++ b/libc/sysdeps/linux/m68k/bsd-setjmp.S @@ -2,6 +2,7 @@ /* Copyright (C) 2002, David McCullough */ /* This file is released under the LGPL, any version you like */ +#include #include #include "m68k_pic.S" @@ -13,7 +14,7 @@ setjmp: moveal %sp@(4), %a0 movel %sp@(0), %a0@(JB_PC) moveml %d2-%d7/%a2-%a7, %a0@(JB_REGS) -#if defined(__HAVE_68881__) || defined(__HAVE_FPU__) +#if defined __HAVE_68881__ || defined __UCLIBC_HAS_FPU__ fmovemx %fp2-%fp7, %a0@(JB_FPREGS) #endif clrl %d0 diff --git a/libc/sysdeps/linux/m68k/jmpbuf-offsets.h b/libc/sysdeps/linux/m68k/jmpbuf-offsets.h index cb0df830f..fdd365d12 100644 --- a/libc/sysdeps/linux/m68k/jmpbuf-offsets.h +++ b/libc/sysdeps/linux/m68k/jmpbuf-offsets.h @@ -4,6 +4,8 @@ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. */ +#include + #define JB_REGS 0 #define JB_DREGS 0 #define JB_AREGS 24 diff --git a/libc/sysdeps/linux/m68k/setjmp.S b/libc/sysdeps/linux/m68k/setjmp.S index b5bc6e009..5f05b8591 100644 --- a/libc/sysdeps/linux/m68k/setjmp.S +++ b/libc/sysdeps/linux/m68k/setjmp.S @@ -2,6 +2,7 @@ /* Copyright (C) 2002, David McCullough */ /* This file is released under the LGPL, any version you like */ +#include #include #include "m68k_pic.S" @@ -13,7 +14,7 @@ __sigsetjmp: moveal %sp@(4), %a0 movel %sp@(0), %a0@(JB_PC) moveml %d2-%d7/%a2-%a7, %a0@(JB_REGS) -#if defined(__HAVE_68881__) || defined(__HAVE_FPU__) +#if defined __HAVE_68881__ || defined __UCLIBC_HAS_FPU__ fmovemx %fp2-%fp7, %a0@(JB_FPREGS) #endif clrl %d0 diff --git a/libc/sysdeps/linux/nios2/__longjmp.S b/libc/sysdeps/linux/nios2/__longjmp.S index 77697731f..7df599768 100644 --- a/libc/sysdeps/linux/nios2/__longjmp.S +++ b/libc/sysdeps/linux/nios2/__longjmp.S @@ -37,7 +37,7 @@ __longjmp: ldw gp, JB_GP(r4) ldw sp, JB_SP(r4) -#if defined(__HAVE_FPU__) +#ifdef __UCLIBC_HAS_FPU__ RESTORE_FPU r4 JB_FPREGS #endif diff --git a/libc/sysdeps/linux/nios2/bits/setjmp.h b/libc/sysdeps/linux/nios2/bits/setjmp.h index 4985191d6..1773de7dd 100644 --- a/libc/sysdeps/linux/nios2/bits/setjmp.h +++ b/libc/sysdeps/linux/nios2/bits/setjmp.h @@ -42,7 +42,7 @@ typedef struct unsigned long __gp; /* floating point regs, if any */ -#if defined __HAVE_FPU__ +#ifdef __UCLIBC_HAS_FPU__ unsigned long __fpregs[64]; #endif } __jmp_buf[1]; diff --git a/libc/sysdeps/linux/nios2/bsd-_setjmp.S b/libc/sysdeps/linux/nios2/bsd-_setjmp.S index ac101bdff..e1350f55e 100644 --- a/libc/sysdeps/linux/nios2/bsd-_setjmp.S +++ b/libc/sysdeps/linux/nios2/bsd-_setjmp.S @@ -11,6 +11,7 @@ * */ +#include #include .globl _setjmp @@ -32,7 +33,7 @@ _setjmp: stw fp, JB_FP(r4) stw gp, JB_GP(r4) -#if defined(__HAVE_FPU__) +#ifdef __UCLIBC_HAS_FPU__ SAVE_FPU r4 JB_FPREGS #endif stw r0, JB_SIZE(r4) /* signal mask is not saved */ diff --git a/libc/sysdeps/linux/nios2/bsd-setjmp.S b/libc/sysdeps/linux/nios2/bsd-setjmp.S index aa2e64fd2..f533754dc 100644 --- a/libc/sysdeps/linux/nios2/bsd-setjmp.S +++ b/libc/sysdeps/linux/nios2/bsd-setjmp.S @@ -12,6 +12,7 @@ */ +#include #include .globl setjmp @@ -33,7 +34,7 @@ setjmp: stw fp, JB_FP(r4) stw gp, JB_GP(r4) -#if defined(__HAVE_FPU__) +#ifdef __UCLIBC_HAS_FPU__ SAVE_FPU r4 JB_FPREGS #endif diff --git a/libc/sysdeps/linux/nios2/jmpbuf-offsets.h b/libc/sysdeps/linux/nios2/jmpbuf-offsets.h index 3ade24e01..b7d19cafb 100644 --- a/libc/sysdeps/linux/nios2/jmpbuf-offsets.h +++ b/libc/sysdeps/linux/nios2/jmpbuf-offsets.h @@ -4,6 +4,8 @@ * Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. */ +#include + #define JB_REGS 0 #define JB_PC 32 #define JB_SP 36 @@ -11,7 +13,7 @@ #define JB_GP 44 #define JB_FPREGS 48 -#if defined __UCLIBC_HAS_FPU__ +#ifdef __UCLIBC_HAS_FPU__ # define JB_SIZE 304 #else # define JB_SIZE 48 diff --git a/libc/sysdeps/linux/nios2/setjmp.S b/libc/sysdeps/linux/nios2/setjmp.S index 22b52d143..6071685b0 100644 --- a/libc/sysdeps/linux/nios2/setjmp.S +++ b/libc/sysdeps/linux/nios2/setjmp.S @@ -33,7 +33,7 @@ __sigsetjmp: stw fp, JB_FP(r4) stw gp, JB_GP(r4) -#if defined(__HAVE_FPU__) +#ifdef __UCLIBC_HAS_FPU__ SAVE_FPU r4 JB_FPREGS #endif -- cgit v1.2.3