From 086766edf97918ae5b46f79a6fe1f42a6603f22a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Wed, 22 Jan 2020 01:48:28 +0100 Subject: [PATCH] m68k: fix math in libroot Change-Id: Icd50c5887d1b96818c620046b20ba51aac55ec18 Reviewed-on: https://review.haiku-os.org/c/haiku/+/2212 Reviewed-by: waddlesplash Reviewed-by: Adrien Destugues --- .../libroot/posix/glibc/arch/m68k/Jamfile | 40 ++++---- .../libroot/posix/musl/math/m68k/Jamfile | 97 +++++++++++++++++++ 2 files changed, 117 insertions(+), 20 deletions(-) create mode 100644 src/system/libroot/posix/musl/math/m68k/Jamfile diff --git a/src/system/libroot/posix/glibc/arch/m68k/Jamfile b/src/system/libroot/posix/glibc/arch/m68k/Jamfile index 8eb249cda7..e8fc19e019 100644 --- a/src/system/libroot/posix/glibc/arch/m68k/Jamfile +++ b/src/system/libroot/posix/glibc/arch/m68k/Jamfile @@ -17,7 +17,7 @@ if $(OPTIM) = -O0 { } SubDirCcFlags -D_GNU_SOURCE -D_IEEE_LIBM -DPIC ; -SubDirAsFlags -DPIC ; +SubDirAsFlags -DMOTOROLA_SYNTAX -DPIC ; local genericSources = cmp.c dbl2mpn.c divrem.c @@ -25,25 +25,25 @@ local genericSources = mul.c mul_n.c ldbl2mpn.c - s_isnan.c s_isnanf.c s_isinf.c s_isinff.c - s_clog.c s_clogf.c s_clogl.c - s_csqrt.c s_csqrtf.c s_csqrtl.c - s_cacos.c s_cacosf.c s_cacosl.c - s_cacosh.c s_cacoshf.c s_cacoshl.c - s_casin.c s_casinf.c s_casinl.c - s_casinh.c s_casinhf.c s_casinhl.c - s_catan.c s_catanf.c s_catanl.c - s_catanh.c s_catanhf.c s_catanhl.c - s_csin.c s_csinf.c s_csinl.c - s_csinh.c s_csinhf.c s_csinhl.c - s_ctan.c s_ctanf.c s_ctanl.c - s_ctanh.c s_ctanhf.c s_ctanhl.c - s_ccos.c s_ccosf.c s_ccosl.c - s_ccosh.c s_ccoshf.c s_ccoshl.c - s_cexp.c s_cexpf.c s_cexpl.c - s_clog10.c s_clog10f.c s_clog10l.c - s_cpow.c s_cpowf.c s_cpowl.c - s_cproj.c s_cprojf.c s_cprojl.c + s_isnan.c s_isnanf.c s_isinf.c #s_isinff.c + s_clog.c s_clogf.c #s_clogl.c + s_csqrt.c s_csqrtf.c #s_csqrtl.c + s_cacos.c s_cacosf.c #s_cacosl.c + s_cacosh.c s_cacoshf.c #s_cacoshl.c + s_casin.c s_casinf.c #s_casinl.c + s_casinh.c s_casinhf.c #s_casinhl.c + s_catan.c s_catanf.c #s_catanl.c + s_catanh.c s_catanhf.c #s_catanhl.c + s_csin.c s_csinf.c #s_csinl.c + s_csinh.c s_csinhf.c #s_csinhl.c + s_ctan.c s_ctanf.c #s_ctanl.c + s_ctanh.c s_ctanhf.c #s_ctanhl.c + s_ccos.c s_ccosf.c #s_ccosl.c + s_ccosh.c s_ccoshf.c #s_ccoshl.c + s_cexp.c s_cexpf.c #s_cexpl.c + s_clog10.c s_clog10f.c #s_clog10l.c + s_cpow.c s_cpowf.c #s_cpowl.c + s_cproj.c s_cprojf.c #s_cprojl.c ; local architectureObject ; diff --git a/src/system/libroot/posix/musl/math/m68k/Jamfile b/src/system/libroot/posix/musl/math/m68k/Jamfile new file mode 100644 index 0000000000..141c03cf4f --- /dev/null +++ b/src/system/libroot/posix/musl/math/m68k/Jamfile @@ -0,0 +1,97 @@ +SubDir HAIKU_TOP src system libroot posix musl math m68k ; + +SubDirCcFlags -Wno-unused-but-set-variable ; + +SubDirSysHdrs [ FDirName $(SUBDIR) .. .. include ] ; +UseHeaders [ FDirName $(SUBDIR) .. .. internal ] ; + +local arch ; +for arch in $(TARGET_ARCHS) { + UseHeaders [ FDirName $(SUBDIR) .. .. arch $(arch) ] ; +} +UseHeaders [ FDirName $(SUBDIR) .. .. arch generic ] ; + +local generics = + acos.c acosf.c acosl.c + acosh.c acoshf.c acoshl.c + asin.c asinf.c asinl.c + asinh.c asinhf.c asinhl.c + atan2.c atan2f.c atan2l.c + atan.c atanf.c atanl.c + atanh.c atanhf.c atanhl.c + cbrt.c cbrtf.c cbrtl.c + ceil.c ceilf.c ceill.c + copysign.c copysignf.c copysignl.c + cos.c cosf.c cosl.c __cosl.c __cos.c __cosdf.c + cosh.c coshf.c coshl.c + erf.c erff.c erfl.c + exp10.c exp10f.c exp10l.c + exp2.c exp2f.c exp2f_data.c exp2l.c + exp.c exp_data.c expf.c expl.c + expm1.c expm1f.c expm1l.c + __expo2.c __expo2f.c + fabs.c fabsf.c fabsl.c + fdim.c fdimf.c fdiml.c + finite.c finitef.c + floor.c floorf.c floorl.c + fma.c fmaf.c fmal.c + fmax.c fmaxf.c fmaxl.c + fmin.c fminf.c fminl.c + fmod.c fmodf.c fmodl.c + frexp.c frexpf.c frexpl.c + hypot.c hypotf.c hypotl.c + ilogb.c ilogbf.c ilogbl.c + __invtrigl.c + j0.c j0f.c j1.c j1f.c jn.c jnf.c + ldexp.c ldexpf.c ldexpl.c + lgamma.c lgammaf.c lgammaf_r.c lgammal.c lgamma_r.c + llrint.c llrintf.c llrintl.c + llround.c llroundf.c llroundl.c + log10.c log10f.c log10l.c + log1p.c log1pf.c log1pl.c + log2.c log2_data.c log2f.c log2f_data.c log2l.c + logb.c logbf.c logbl.c + log.c log_data.c logf.c logf_data.c logl.c + lrint.c lrintf.c lrintl.c + lround.c lroundf.c lroundl.c + __math_divzero.c __math_divzerof.c __math_invalid.c __math_invalidf.c + __math_oflow.c __math_oflowf.c __math_uflow.c __math_uflowf.c + __math_xflow.c __math_xflowf.c + modf.c modff.c modfl.c + nan.c nanf.c nanl.c + nearbyint.c nearbyintf.c nearbyintl.c + nextafter.c nextafterf.c nextafterl.c + nexttoward.c nexttowardf.c nexttowardl.c + __polevll.c pow.c pow_data.c powf.c powf_data.c powl.c + remainder.c remainderf.c remainderl.c + __rem_pio2.c __rem_pio2f.c __rem_pio2_large.c __rem_pio2l.c + remquo.c remquof.c remquol.c + rint.c rintf.c rintl.c + round.c roundf.c roundl.c + scalb.c scalbf.c scalbln.c scalblnf.c scalblnl.c scalbn.c scalbnf.c scalbnl.c + signgam.c + significand.c significandf.c + __sin.c sin.c __sinl.c sinl.c + sincos.c sincosf.c sincosl.c + __sindf.c sinf.c + sinh.c sinhf.c sinhl.c + sqrt.c sqrtf.c sqrtl.c + __tan.c tan.c __tandf.c tanf.c __tanl.c tanl.c + tanh.c tanhf.c tanhl.c + tgamma.c tgammaf.c tgammal.c + trunc.c truncf.c truncl.c + ; + +local architectureObject ; +for architectureObject in [ MultiArchSubDirSetup ] { + on $(architectureObject) { + local architecture = $(TARGET_PACKAGING_ARCH) ; + + MergeObject <$(architecture)>posix_musl_math.o : + + $(generics) + ; + + SEARCH on [ FGristFiles $(generics) ] = [ FDirName $(SUBDIR) .. ] ; + } +}