Skip to content

Commit f22d7db

Browse files
committed
Fixed build on ARM
Removed all long double support, since ARM doesn't have long doubles.
1 parent 17775c5 commit f22d7db

12 files changed

Lines changed: 33 additions & 6 deletions

File tree

Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
OPENLIBM_HOME=$(abspath .)
22
include ./Make.inc
33

4-
SUBDIRS = src ld80 $(ARCH) bsdsrc
4+
SUBDIRS = src $(ARCH) bsdsrc
5+
ifneq ($(ARCH), arm)
6+
SUBDIRS += ld80
7+
endif
58

69
define INC_template
710
TEST=test

arm/fenv.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#ifndef _FENV_H_
3030
#define _FENV_H_
3131

32-
#include <sys/_types.h>
32+
#include <sys/types.h>
3333

3434
#ifndef __fenv_static
3535
#define __fenv_static static

include/fenv.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1+
#ifdef __arm__
2+
#include "../arm/fenv.h"
3+
#else
14
#ifdef __LP64
25
#include "../amd64/fenv.h"
36
#else
47
#include "../i387/fenv.h"
58
#endif
9+
#endif

src/Make.files

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ $(CUR_SRCS) = common.c \
1717
s_exp2.c s_exp2f.c s_expm1.c s_expm1f.c s_fabs.c s_fabsf.c s_fdim.c \
1818
s_finite.c s_finitef.c \
1919
s_floor.c s_floorf.c s_fma.c s_fmaf.c \
20-
s_fmax.c s_fmaxf.c s_fmaxl.c s_fmin.c \
21-
s_fminf.c s_fminl.c s_fpclassify.c \
20+
s_fmax.c s_fmaxf.c s_fmin.c \
21+
s_fminf.c s_fpclassify.c \
2222
s_frexp.c s_frexpf.c s_ilogb.c s_ilogbf.c \
23-
s_ilogbl.c s_isinf.c s_isfinite.c s_isnormal.c s_isnan.c \
23+
s_isinf.c s_isfinite.c s_isnormal.c s_isnan.c \
2424
s_llrint.c s_llrintf.c s_llround.c s_llroundf.c s_llroundl.c \
2525
s_log1p.c s_log1pf.c s_logb.c s_logbf.c s_lrint.c s_lrintf.c \
2626
s_lround.c s_lroundf.c s_lroundl.c s_modf.c s_modff.c \
@@ -37,11 +37,13 @@ ifneq ($(OS), WINNT)
3737
$(CUR_SRCS) += s_nan.c
3838
endif
3939

40+
ifneq ($(ARCH), arm)
4041
# C99 long double functions
4142
$(CUR_SRCS) += s_copysignl.c s_fabsl.c s_llrintl.c s_lrintl.c s_modfl.c
4243

4344
# If long double != double use these; otherwise, we alias the double versions.
4445
$(CUR_SRCS) += e_acosl.c e_asinl.c e_atan2l.c e_fmodl.c \
46+
s_fmaxl.c s_fminl.c s_ilogbl.c \
4547
e_hypotl.c e_remainderl.c e_sqrtl.c \
4648
s_atanl.c s_ceill.c s_cosl.c s_cprojl.c \
4749
s_csqrtl.c s_floorl.c s_fmal.c \
@@ -50,6 +52,7 @@ $(CUR_SRCS) += e_acosl.c e_asinl.c e_atan2l.c e_fmodl.c \
5052
s_sinl.c s_sincosl.c s_tanl.c s_truncl.c w_cabsl.c \
5153
s_nextafterl.c s_rintl.c s_scalbnl.c
5254
# s_cbrtl.c
55+
endif
5356

5457
# C99 complex functions
5558
$(CUR_SRCS) += s_ccosh.c s_ccoshf.c s_cexp.c s_cexpf.c \

src/openlibm.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@
2323
#define __WIN32__
2424
#endif
2525

26+
#ifndef __arm__
27+
#define LONG_DOUBLE
28+
#endif
29+
2630
#define __pure2
2731

2832
/*

src/s_fpclassify.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ __fpclassifyf(float f)
7272
}
7373
}
7474

75+
#ifdef LONG_DOUBLE
7576
DLLEXPORT int
7677
__fpclassifyl(long double e)
7778
{
@@ -93,5 +94,5 @@ __fpclassifyl(long double e)
9394
return FP_SUBNORMAL;
9495
}
9596
}
96-
97+
#endif
9798

src/s_isfinite.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ __isfinitef(float f)
4848
return (u.bits.exp != 255);
4949
}
5050

51+
#ifdef LONG_DOUBLE
5152
DLLEXPORT int
5253
__isfinitel(long double e)
5354
{
@@ -56,3 +57,4 @@ __isfinitel(long double e)
5657
u.e = e;
5758
return (u.bits.exp != 32767);
5859
}
60+
#endif

src/s_isinf.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ __isinff(float f)
5050
return (u.bits.exp == 255 && u.bits.man == 0);
5151
}
5252

53+
#ifdef LONG_DOUBLE
5354
DLLEXPORT int
5455
__isinfl(long double e)
5556
{
@@ -59,5 +60,6 @@ __isinfl(long double e)
5960
mask_nbit_l(u);
6061
return (u.bits.exp == 32767 && u.bits.manl == 0 && u.bits.manh == 0);
6162
}
63+
#endif
6264

6365
__weak_reference(__isinff, isinff);

src/s_isnan.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ __isnanf(float f)
5151
return (u.bits.exp == 255 && u.bits.man != 0);
5252
}
5353

54+
#ifdef LONG_DOUBLE
5455
DLLEXPORT int
5556
__isnanl(long double e)
5657
{
@@ -60,5 +61,6 @@ __isnanl(long double e)
6061
mask_nbit_l(u);
6162
return (u.bits.exp == 32767 && (u.bits.manl != 0 || u.bits.manh != 0));
6263
}
64+
#endif
6365

6466
__weak_reference(__isnanf, isnanf);

src/s_isnormal.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ __isnormalf(float f)
4848
return (u.bits.exp != 0 && u.bits.exp != 255);
4949
}
5050

51+
#ifdef LONG_DOUBLE
5152
DLLEXPORT int
5253
__isnormall(long double e)
5354
{
@@ -56,3 +57,4 @@ __isnormall(long double e)
5657
u.e = e;
5758
return (u.bits.exp != 0 && u.bits.exp != 32767);
5859
}
60+
#endif

0 commit comments

Comments
 (0)