Fcalva/OpenLibm
1
0
Fork 0
mirror of https://git.planet-casio.com/Lephenixnoir/OpenLibm.git synced 2025-04-04 09:37:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Avoid redefining endianness macros with some gcc versions

Browse source 
_LITTLE_ENDIAN and _BIG_ENDIAN are built-in on some platforms/versions.
Better use __ORDER_LITTLE_ENDIAN__, __ORDER_BIG_ENDIAN__ and __BYTE_ORDER__,
which are standard for gcc and clang, and define them when they are missing.
Also remove the special-case for FreeBSD, which is apprently not needed.
This commit is contained in:
Milan Bouchet-Valat 2016-02-27 15:42:51 +01:00
parent 949c530994
commit b5ca785d4c
4 changed files with 27 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
src/fpmath.h
View file

@ -41,57 +41,42 @@
#include "powerpc_fpmath.h" #include "powerpc_fpmath.h"
#endif #endif
#if defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__)
/* Definitions provided directly by GCC and Clang. */ /* Definitions provided directly by GCC and Clang. */
#define _LITTLE_ENDIAN __ORDER_LITTLE_ENDIAN__ #if !(defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && defined(__ORDER_BIG_ENDIAN__))
#define _BIG_ENDIAN __ORDER_BIG_ENDIAN__
#define _PDP_ENDIAN __ORDER_PDP_ENDIAN__
#define _BYTE_ORDER __BYTE_ORDER__
#elif defined(__GLIBC__) #if defined(__GLIBC__)
#include <features.h> #include <features.h>
#include <endian.h> #include <endian.h>
#define _LITTLE_ENDIAN __LITTLE_ENDIAN #define __ORDER_LITTLE_ENDIAN__ __LITTLE_ENDIAN
#define _BIG_ENDIAN __BIG_ENDIAN #define __ORDER_BIG_ENDIAN__ __BIG_ENDIAN
#define _PDP_ENDIAN __PDP_ENDIAN #define __BYTE_ORDER__ __BYTE_ORDER
#define _BYTE_ORDER __BYTE_ORDER
#elif defined(__APPLE__) #elif defined(__APPLE__)
#include <machine/endian.h> #include <machine/endian.h>
#define _LITTLE_ENDIAN LITTLE_ENDIAN #define __ORDER_LITTLE_ENDIAN__ LITTLE_ENDIAN
#define _BIG_ENDIAN BIG_ENDIAN #define __ORDER_BIG_ENDIAN__ BIG_ENDIAN
#define _PDP_ENDIAN PDP_ENDIAN #define __BYTE_ORDER__ BYTE_ORDER
#define _BYTE_ORDER BYTE_ORDER
#elif defined(__FreeBSD__)
#include <machine/endian.h>
#elif defined(_WIN32) #elif defined(_WIN32)
#define _LITTLE_ENDIAN 1234 #define __ORDER_LITTLE_ENDIAN__ 1234
#define _BIG_ENDIAN 4321 #define __ORDER_BIG_ENDIAN__ 4321
#define _PDP_ENDIAN 3412 #define __BYTE_ORDER__ __ORDER_LITTLE_ENDIAN__
#define _BYTE_ORDER _LITTLE_ENDIAN
#define _FLOAT_WORD_ORDER _LITTLE_ENDIAN
#define LITTLE_ENDIAN _LITTLE_ENDIAN
#define BIG_ENDIAN _BIG_ENDIAN
#define PDP_ENDIAN _PDP_ENDIAN
#define BYTE_ORDER _BYTE_ORDER
#endif #endif
#ifndef _IEEE_WORD_ORDER #endif /* __BYTE_ORDER__, __ORDER_LITTLE_ENDIAN__ and __ORDER_BIG_ENDIAN__ */
#define _IEEE_WORD_ORDER _BYTE_ORDER
#ifndef __FLOAT_WORD_ORDER__
#define __FLOAT_WORD_ORDER__ __BYTE_ORDER__
#endif #endif
union IEEEf2bits { union IEEEf2bits {
float f; float f;
struct { struct {
#if _BYTE_ORDER == _LITTLE_ENDIAN #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
unsigned int man :23; unsigned int man :23;
unsigned int exp :8; unsigned int exp :8;
unsigned int sign :1; unsigned int sign :1;
@ -109,14 +94,14 @@ union IEEEf2bits {
union IEEEd2bits { union IEEEd2bits {
double d; double d;
struct { struct {
#if _BYTE_ORDER == _LITTLE_ENDIAN #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
#if _IEEE_WORD_ORDER == _LITTLE_ENDIAN #if __FLOAT_WORD_ORDER__ == __ORDER_LITTLE_ENDIAN__
unsigned int manl :32; unsigned int manl :32;
#endif #endif
unsigned int manh :20; unsigned int manh :20;
unsigned int exp :11; unsigned int exp :11;
unsigned int sign :1; unsigned int sign :1;
#if _IEEE_WORD_ORDER == _BIG_ENDIAN #if __FLOAT_WORD_ORDER__ == __ORDER_BIG_ENDIAN__
unsigned int manl :32; unsigned int manl :32;
#endif #endif
#else /* _BIG_ENDIAN */ #else /* _BIG_ENDIAN */

4
src/math_private.h
View file

@ -43,7 +43,7 @@
* ints. * ints.
*/ */
#if _IEEE_WORD_ORDER == _BIG_ENDIAN #if __FLOAT_WORD_ORDER__ == __ORDER_BIG_ENDIAN__
typedef union typedef union
{ {
@ -61,7 +61,7 @@ typedef union
#endif #endif
#if _IEEE_WORD_ORDER == _LITTLE_ENDIAN #if __FLOAT_WORD_ORDER__ == __ORDER_LITTLE_ENDIAN__
typedef union typedef union
{ {

8
src/math_private_openbsd.h
View file

@ -17,7 +17,7 @@
#ifndef _MATH_PRIVATE_OPENBSD_H_ #ifndef _MATH_PRIVATE_OPENBSD_H_
#define _MATH_PRIVATE_OPENBSD_H_ #define _MATH_PRIVATE_OPENBSD_H_
#if _IEEE_WORD_ORDER == _BIG_ENDIAN #if __FLOAT_WORD_ORDER__ == __ORDER_BIG_ENDIAN__
typedef union typedef union
{ {
@ -36,7 +36,7 @@ typedef union
#endif #endif
#if _IEEE_WORD_ORDER == _LITTLE_ENDIAN #if __FLOAT_WORD_ORDER__ == __ORDER_LITTLE_ENDIAN__
typedef union typedef union
{ {
@ -106,7 +106,7 @@ do { \
/* A union which permits us to convert between a long double and /* A union which permits us to convert between a long double and
three 32 bit ints. */ three 32 bit ints. */
#if _IEEE_WORD_ORDER == _BIG_ENDIAN #if __FLOAT_WORD_ORDER__ == __ORDER_BIG_ENDIAN__
typedef union typedef union
{ {
@ -124,7 +124,7 @@ typedef union
#endif #endif
#if _IEEE_WORD_ORDER == _LITTLE_ENDIAN #if __FLOAT_WORD_ORDER__ == __ORDER_LITTLE_ENDIAN__
typedef union typedef union
{ {

4
src/s_nan.c
View file

@ -78,7 +78,7 @@ __scan_nan(u_int32_t *words, int num_words, const char *s)
; ;
/* Scan backwards, filling in the bits in words[] as we go. */ /* Scan backwards, filling in the bits in words[] as we go. */
#if _BYTE_ORDER == _LITTLE_ENDIAN #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
for (bitpos = 0; bitpos < 32 * num_words; bitpos += 4) { for (bitpos = 0; bitpos < 32 * num_words; bitpos += 4) {
#else #else
for (bitpos = 32 * num_words - 4; bitpos >= 0; bitpos -= 4) { for (bitpos = 32 * num_words - 4; bitpos >= 0; bitpos -= 4) {
@ -98,7 +98,7 @@ nan(const char *s)
} u; } u;
__scan_nan(u.bits, 2, s); __scan_nan(u.bits, 2, s);
#if _BYTE_ORDER == _LITTLE_ENDIAN #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
u.bits[1] |= 0x7ff80000; u.bits[1] |= 0x7ff80000;
#else #else
u.bits[0] |= 0x7ff80000; u.bits[0] |= 0x7ff80000;