Add aarch64 configurations

This updates the sublibrary makefiles to use the appropiate
sourcefiles for aarch64.

It also removes the aarch64 source file for `__set_thread_area` from
the thread sublibrary makefile, as it is provided by lib-muslglue.

Signed-off-by: Robert Kuban <robert.kuban@opensynergy.com>
Reviewed-by: Eduard Vintilă <eduard.vintila47@gmail.com>
Reviewed-by: Razvan Virtan <virtanrazvan@gmail.com>
Reviewed-by: Razvan Deaconescu <razvand@unikraft.io>
Approved-by: Razvan Deaconescu <razvand@unikraft.io>
Tested-by: Unikraft CI <monkey@unikraft.io>
GitHub-Closes: #7

diff --git a/Makefile.uk.musl.fenv b/Makefile.uk.musl.fenv
index 62e46b16b198c370dbcc40d03d781328542aef6a..ec636a260ec7e308c5f0f9e91e586586189af96d 100644 (file)
--- a/Makefile.uk.musl.fenv
+++ b/Makefile.uk.musl.fenv
@@ -11,6 +11,8 @@ LIBMUSL_FENV_SRCS-y += $(LIBMUSL)/src/fenv/feupdateenv.c
 ifeq (arm,$(CONFIG_UK_ARCH))
 LIBMUSL_FENV_SRCS-y += $(LIBMUSL)/src/fenv/arm/fenv-hf.S|arm
 LIBMUSL_FENV_SRCS-y += $(LIBMUSL)/src/fenv/arm/fenv.c|arm
+else ifeq (arm64,$(CONFIG_UK_ARCH))
+LIBMUSL_FENV_SRCS-y += $(LIBMUSL)/src/fenv/aarch64/fenv.s|aarch64
 else ifeq (x86_32,$(CONFIG_UK_ARCH))
 LIBMUSL_FENV_SRCS-y += $(LIBMUSL)/src/fenv/i386/fenv.s|x86_32
 else ifeq (x86_64,$(CONFIG_UK_ARCH))
@@ -19,7 +21,6 @@ else
 LIBMUSL_FENV_SRCS-y += $(LIBMUSL)/src/fenv/fenv.c
 endif
 
-#LIBMUSL_FENV_SRCS-y += $(LIBMUSL)/src/fenv/aarch64/fenv.s
 #LIBMUSL_FENV_SRCS-y += $(LIBMUSL)/src/fenv/mips/fenv-sf.c
 #LIBMUSL_FENV_SRCS-y += $(LIBMUSL)/src/fenv/mips/fenv.S
 #LIBMUSL_FENV_SRCS-y += $(LIBMUSL)/src/fenv/mips64/fenv-sf.c

diff --git a/Makefile.uk.musl.ldso b/Makefile.uk.musl.ldso
index 497a522105eed40882571ccce66699b03d8a0bfe..ba1d26ef4750e749cf70251ebea9b1d9c7438114 100644 (file)
--- a/Makefile.uk.musl.ldso
+++ b/Makefile.uk.musl.ldso
@@ -21,6 +21,9 @@ ifeq (arm,$(CONFIG_UK_ARCH))
 LIBMUSL_LDSO_SRCS-y += $(LIBMUSL)/src/ldso/arm/dlsym.s|arm
 LIBMUSL_LDSO_SRCS-y += $(LIBMUSL)/src/ldso/arm/find_exidx.c|arm
 LIBMUSL_LDSO_SRCS-y += $(LIBMUSL)/src/ldso/tlsdesc.c
+else ifeq (arm64,$(CONFIG_UK_ARCH))
+LIBMUSL_LDSO_SRCS-y += $(LIBMUSL)/src/ldso/aarch64/dlsym.s|aarch64
+LIBMUSL_LDSO_SRCS-y += $(LIBMUSL)/src/ldso/aarch64/tlsdesc.s|aarch64
 else ifeq (x86_32,$(CONFIG_UK_ARCH))
 LIBMUSL_LDSO_SRCS-y += $(LIBMUSL)/src/ldso/i386/dlsym.s|x86_32
 LIBMUSL_LDSO_SRCS-y += $(LIBMUSL)/src/ldso/i386/tlsdesc.s|x86_32
@@ -33,8 +36,6 @@ LIBMUSL_LDSO_SRCS-y += $(LIBMUSL)/src/ldso/dlsym.c
 endif
 
 endif
-#LIBMUSL_LDSO_SRCS-y += $(LIBMUSL)/src/ldso/aarch64/dlsym.s
-#LIBMUSL_LDSO_SRCS-y += $(LIBMUSL)/src/ldso/aarch64/tlsdesc.s
 #LIBMUSL_LDSO_SRCS-y += $(LIBMUSL)/src/ldso/microblaze/dlsym.s
 #LIBMUSL_LDSO_SRCS-y += $(LIBMUSL)/src/ldso/mips/dlsym.s
 #LIBMUSL_LDSO_SRCS-y += $(LIBMUSL)/src/ldso/mips64/dlsym.s

diff --git a/Makefile.uk.musl.math b/Makefile.uk.musl.math
index 37a4bb25dacd5d5326221b4c537ebcfda42dbb37..9d9a8445b7459b012a3c01955fae34f817b28386 100644 (file)
--- a/Makefile.uk.musl.math
+++ b/Makefile.uk.musl.math
@@ -304,6 +304,253 @@ LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/x86_64/sqrt.s|x86_64
 LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/x86_64/sqrtf.s|x86_64
 LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/x86_64/sqrtl.s|x86_64
 LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/x86_64/truncl.s|x86_64
+else ifeq (arm64,$(CONFIG_UK_ARCH))
+# reset sources proviously added
+LIBMUSL_MATH_SRCS-y =
+# base sources (skips the ones replaced by aarch64)
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/acos.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/acosf.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/acosh.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/acoshf.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/acoshl.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/acosl.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/asin.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/asinf.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/asinh.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/asinhf.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/asinhl.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/asinl.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/atan2.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/atan2f.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/atan2l.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/atan.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/atanf.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/atanh.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/atanhf.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/atanhl.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/atanl.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/cbrt.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/cbrtf.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/cbrtl.c
+#LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/ceil.c
+#LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/ceilf.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/ceill.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/copysign.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/copysignf.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/copysignl.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/__cos.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/cos.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/__cosdf.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/cosf.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/cosh.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/coshf.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/coshl.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/__cosl.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/cosl.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/erf.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/erff.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/erfl.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/exp10.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/exp10f.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/exp10l.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/exp2.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/exp2f.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/exp2l.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/exp.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/expf.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/expl.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/expm1.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/expm1f.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/expm1l.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/__expo2.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/__expo2f.c
+#LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/fabs.c
+#LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/fabsf.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/fabsl.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/fdim.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/fdimf.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/fdiml.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/finite.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/finitef.c
+#LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/floor.c
+#LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/floorf.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/floorl.c
+#LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/fma.c
+#LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/fmaf.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/fmal.c
+#LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/fmax.c
+#LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/fmaxf.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/fmaxl.c
+#LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/fmin.c
+#LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/fminf.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/fminl.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/fmod.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/fmodf.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/fmodl.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/__fpclassify.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/__fpclassifyf.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/__fpclassifyl.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/frexp.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/frexpf.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/frexpl.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/hypot.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/hypotf.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/hypotl.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/ilogb.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/ilogbf.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/ilogbl.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/__invtrigl.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/j0.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/j0f.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/j1.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/j1f.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/jn.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/jnf.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/ldexp.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/ldexpf.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/ldexpl.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/lgamma.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/lgammaf.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/lgammaf_r.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/lgammal.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/lgamma_r.c
+#LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/llrint.c
+#LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/llrintf.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/llrintl.c
+#LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/llround.c
+#LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/llroundf.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/llroundl.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/log10.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/log10f.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/log10l.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/log1p.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/log1pf.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/log1pl.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/log2.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/log2f.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/log2l.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/logb.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/logbf.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/logbl.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/log.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/logf.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/logl.c
+#LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/lrint.c
+#LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/lrintf.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/lrintl.c
+#LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/lround.c
+#LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/lroundf.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/lroundl.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/modf.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/modff.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/modfl.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/nan.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/nanf.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/nanl.c
+#LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/nearbyint.c
+#LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/nearbyintf.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/nearbyintl.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/nextafter.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/nextafterf.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/nextafterl.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/nexttoward.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/nexttowardf.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/nexttowardl.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/__polevll.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/pow.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/powf.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/powl.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/remainder.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/remainderf.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/remainderl.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/__rem_pio2.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/__rem_pio2f.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/__rem_pio2_large.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/__rem_pio2l.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/remquo.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/remquof.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/remquol.c
+#LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/rint.c
+#LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/rintf.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/rintl.c
+#LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/round.c
+#LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/roundf.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/roundl.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/scalb.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/scalbf.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/scalbln.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/scalblnf.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/scalblnl.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/scalbn.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/scalbnf.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/scalbnl.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/__signbit.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/__signbitf.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/__signbitl.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/signgam.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/significand.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/significandf.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/__sin.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/sin.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/sincos.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/sincosf.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/sincosl.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/__sindf.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/sinf.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/sinh.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/sinhf.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/sinhl.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/__sinl.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/sinl.c
+#LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/sqrt.c
+#LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/sqrtf.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/sqrtl.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/__tan.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/tan.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/__tandf.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/tanf.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/tanh.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/tanhf.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/tanhl.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/__tanl.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/tanl.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/tgamma.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/tgammaf.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/tgammal.c
+#LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/trunc.c
+#LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/truncf.c
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/truncl.c
+# aarch64 specific sources
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/aarch64/ceil.c|aarch64
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/aarch64/ceilf.c|aarch64
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/aarch64/fabs.c|aarch64
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/aarch64/fabsf.c|aarch64
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/aarch64/floor.c|aarch64
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/aarch64/floorf.c|aarch64
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/aarch64/fma.c|aarch64
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/aarch64/fmaf.c|aarch64
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/aarch64/fmax.c|aarch64
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/aarch64/fmaxf.c|aarch64
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/aarch64/fmin.c|aarch64
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/aarch64/fminf.c|aarch64
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/aarch64/llrint.c|aarch64
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/aarch64/llrintf.c|aarch64
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/aarch64/llround.c|aarch64
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/aarch64/llroundf.c|aarch64
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/aarch64/lrint.c|aarch64
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/aarch64/lrintf.c|aarch64
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/aarch64/lround.c|aarch64
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/aarch64/lroundf.c|aarch64
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/aarch64/nearbyint.c|aarch64
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/aarch64/nearbyintf.c|aarch64
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/aarch64/rint.c|aarch64
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/aarch64/rintf.c|aarch64
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/aarch64/round.c|aarch64
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/aarch64/roundf.c|aarch64
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/aarch64/sqrt.c|aarch64
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/aarch64/sqrtf.c|aarch64
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/aarch64/trunc.c|aarch64
+LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/aarch64/truncf.c|aarch64
 else ifeq (arm,$(CONFIG_UK_ARCH))
 LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/acosl.c
 LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/asinl.c
@@ -366,36 +613,6 @@ LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/sqrt.c
 LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/sqrtf.c
 endif
 
-# LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/aarch64/ceil.c
-# LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/aarch64/ceilf.c
-# LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/aarch64/fabs.c
-# LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/aarch64/fabsf.c
-# LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/aarch64/floor.c
-# LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/aarch64/floorf.c
-# LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/aarch64/fma.c
-# LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/aarch64/fmaf.c
-# LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/aarch64/fmax.c
-# LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/aarch64/fmaxf.c
-# LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/aarch64/fmin.c
-# LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/aarch64/fminf.c
-# LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/aarch64/llrint.c
-# LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/aarch64/llrintf.c
-# LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/aarch64/llround.c
-# LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/aarch64/llroundf.c
-# LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/aarch64/lrint.c
-# LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/aarch64/lrintf.c
-# LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/aarch64/lround.c
-# LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/aarch64/lroundf.c
-# LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/aarch64/nearbyint.c
-# LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/aarch64/nearbyintf.c
-# LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/aarch64/rint.c
-# LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/aarch64/rintf.c
-# LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/aarch64/round.c
-# LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/aarch64/roundf.c
-# LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/aarch64/sqrt.c
-# LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/aarch64/sqrtf.c
-# LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/aarch64/trunc.c
-# LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/aarch64/truncf.c
 # LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/powerpc64/ceil.c
 # LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/powerpc64/ceilf.c
 # LIBMUSL_MATH_SRCS-y += $(LIBMUSL)/src/math/powerpc64/fabs.c

diff --git a/Makefile.uk.musl.setjmp b/Makefile.uk.musl.setjmp
index 9a9b26793f93ad2f472f04220324940d0662d6b5..391a305142e4d2ed8dc7c1f11f37a3df269f55f8 100644 (file)
--- a/Makefile.uk.musl.setjmp
+++ b/Makefile.uk.musl.setjmp
@@ -4,6 +4,9 @@ LIBMUSL_SETJMP_SRCS-y += $(LIBMUSL)/src/setjmp/longjmp.c
 ifeq (arm,$(CONFIG_UK_ARCH))
 LIBMUSL_SETJMP_SRCS-y += $(LIBMUSL)/src/setjmp/arm/longjmp.s|arm
 LIBMUSL_SETJMP_SRCS-y += $(LIBMUSL)/src/setjmp/arm/setjmp.s|arm
+else ifeq (arm64,$(CONFIG_UK_ARCH))
+LIBMUSL_SETJMP_SRCS-y += $(LIBMUSL)/src/setjmp/aarch64/longjmp.s|aarch64
+LIBMUSL_SETJMP_SRCS-y += $(LIBMUSL)/src/setjmp/aarch64/setjmp.s|aarch64
 else ifeq (x86_32,$(CONFIG_UK_ARCH))
 LIBMUSL_SETJMP_SRCS-y += $(LIBMUSL)/src/setjmp/i386/longjmp.s|i386
 LIBMUSL_SETJMP_SRCS-y += $(LIBMUSL)/src/setjmp/i386/setjmp.s|i386
@@ -12,8 +15,6 @@ LIBMUSL_SETJMP_SRCS-y += $(LIBMUSL)/src/setjmp/x86_64/longjmp.s|x86_64
 LIBMUSL_SETJMP_SRCS-y += $(LIBMUSL)/src/setjmp/x86_64/setjmp.s|x86_64
 endif
 
-#LIBMUSL_SETJMP_SRCS-y += $(LIBMUSL)/src/setjmp/aarch64/longjmp.s
-#LIBMUSL_SETJMP_SRCS-y += $(LIBMUSL)/src/setjmp/aarch64/setjmp.s
 #LIBMUSL_SETJMP_SRCS-y += $(LIBMUSL)/src/setjmp/microblaze/longjmp.s
 #LIBMUSL_SETJMP_SRCS-y += $(LIBMUSL)/src/setjmp/microblaze/setjmp.s
 #LIBMUSL_SETJMP_SRCS-y += $(LIBMUSL)/src/setjmp/mips/longjmp.S

diff --git a/Makefile.uk.musl.signal b/Makefile.uk.musl.signal
index bf09ccb4a1c1cc2e6a32873226bd84c1e6cda555..1c30ba6e33f82e05d9270c291635b34bfa3ac6e6 100644 (file)
--- a/Makefile.uk.musl.signal
+++ b/Makefile.uk.musl.signal
@@ -68,12 +68,13 @@ LIBMUSL_SIGNAL_SRCS-y += $(LIBMUSL)/src/signal/x86_64/sigsetjmp.s|x86_64
 else ifeq (arm,$(CONFIG_UK_ARCH))
 LIBMUSL_SIGNAL_SRCS-y += $(LIBMUSL)/src/signal/arm/restore.s|arm
 LIBMUSL_SIGNAL_SRCS-y += $(LIBMUSL)/src/signal/arm/sigsetjmp.s|arm
+else ifeq (aarch64,$(CONFIG_UK_ARCH))
+LIBMUSL_SIGNAL_SRCS-y += $(LIBMUSL)/src/signal/aarch64/restore.s|aarch64
+LIBMUSL_SIGNAL_SRCS-y += $(LIBMUSL)/src/signal/aarch64/sigsetjmp.s|aarch64
 else
 LIBMUSL_SIGNAL_SRCS-y += $(LIBMUSL)/src/signal/restore.c
 endif
 
-#LIBMUSL_SIGNAL_SRCS-y += $(LIBMUSL)/src/signal/aarch64/restore.s
-#LIBMUSL_SIGNAL_SRCS-y += $(LIBMUSL)/src/signal/aarch64/sigsetjmp.s
 #LIBMUSL_SIGNAL_SRCS-y += $(LIBMUSL)/src/signal/microblaze/restore.s
 #LIBMUSL_SIGNAL_SRCS-y += $(LIBMUSL)/src/signal/microblaze/sigsetjmp.s
 #LIBMUSL_SIGNAL_SRCS-y += $(LIBMUSL)/src/signal/mips/restore.s

diff --git a/Makefile.uk.musl.string b/Makefile.uk.musl.string
index 45316b4512ce75af2611f039123f9fd6a42a03c1..17cffa1db9400b740d8f5201f980fd5326fa8af1 100644 (file)
--- a/Makefile.uk.musl.string
+++ b/Makefile.uk.musl.string
@@ -91,6 +91,10 @@ LIBMUSL_STRING_SRCS-y += $(LIBMUSL)/src/string/arm/memcpy.c|arm
 LIBMUSL_STRING_SRCS-y += $(LIBMUSL)/src/string/arm/memcpy_le.S|arm
 LIBMUSL_STRING_SRCS-y += $(LIBMUSL)/src/string/memmove.c|arm
 LIBMUSL_STRING_SRCS-y += $(LIBMUSL)/src/string/memset.c|arm
+else ifeq (arm64,$(CONFIG_UK_ARCH))
+LIBMUSL_STRING_SRCS-y += $(LIBMUSL)/src/string/memmove.c
+LIBMUSL_STRING_SRCS-y += $(LIBMUSL)/src/string/memcpy.c
+LIBMUSL_STRING_SRCS-y += $(LIBMUSL)/src/string/memset.c
 else ifeq (x86_32,$(CONFIG_UK_ARCH))
 LIBMUSL_STRING_SRCS-y += $(LIBMUSL)/src/string/i386/memcpy.s|i386
 LIBMUSL_STRING_SRCS-y += $(LIBMUSL)/src/string/i386/memmove.s|i386

diff --git a/Makefile.uk.musl.thread b/Makefile.uk.musl.thread
index bfb80ed1b4e3a0b4bb6846be9923aac1476c868f..7aaa316ff5fac26ad8cb06081a5a8d856a416ff0 100644 (file)
--- a/Makefile.uk.musl.thread
+++ b/Makefile.uk.musl.thread
@@ -174,16 +174,16 @@ LIBMUSL_THREAD_SRCS-y += $(LIBMUSL)/src/thread/arm/__aeabi_read_tp_c.c|arm
 LIBMUSL_THREAD_SRCS-y += $(LIBMUSL)/src/thread/arm/atomics.s|arm
 LIBMUSL_THREAD_SRCS-y += $(LIBMUSL)/src/thread/arm/clone.s|arm
 LIBMUSL_THREAD_SRCS-y += $(LIBMUSL)/src/thread/arm/syscall_cp.s|arm
+else ifeq (arm64,$(CONFIG_UK_ARCH))
+LIBMUSL_THREAD_SRCS-y += $(LIBMUSL)/src/thread/aarch64/__unmapself.s|aarch64
+LIBMUSL_THREAD_SRCS-y += $(LIBMUSL)/src/thread/aarch64/clone.s|aarch64
+LIBMUSL_THREAD_SRCS-y += $(LIBMUSL)/src/thread/aarch64/syscall_cp.s|aarch64
 else
 #LIBMUSL_THREAD_SRCS-y += $(LIBMUSL)/src/thread/__set_thread_area.c
 #LIBMUSL_THREAD_SRCS-y += $(LIBMUSL)/src/thread/__unmapself.c
 LIBMUSL_THREAD_SRCS-y += $(LIBMUSL)/src/thread/clone.c|thread
 endif
 
-#LIBMUSL_THREAD_SRCS-y += $(LIBMUSL)/src/thread/aarch64/__set_thread_area.s
-#LIBMUSL_THREAD_SRCS-y += $(LIBMUSL)/src/thread/aarch64/__unmapself.s
-#LIBMUSL_THREAD_SRCS-y += $(LIBMUSL)/src/thread/aarch64/clone.s
-#LIBMUSL_THREAD_SRCS-y += $(LIBMUSL)/src/thread/aarch64/syscall_cp.s
 #LIBMUSL_THREAD_SRCS-y += $(LIBMUSL)/src/thread/microblaze/__set_thread_area.s
 #LIBMUSL_THREAD_SRCS-y += $(LIBMUSL)/src/thread/microblaze/__unmapself.s
 #LIBMUSL_THREAD_SRCS-y += $(LIBMUSL)/src/thread/microblaze/clone.s