Skip to content

Commit b252047

Browse files
authored
Merge pull request #168 from JuliaLang/yyc/ld128
Fix compilation on AArch64
2 parents 3ff5216 + 238a909 commit b252047

3 files changed

Lines changed: 23 additions & 2 deletions

File tree

Make.inc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,12 @@ SFLAGS_add += $(SFLAGS_arch)
125125
LDFLAGS_add += $(LDFLAGS_arch)
126126

127127
CFLAGS_add += -std=c99 -Wall -I$(OPENLIBM_HOME) -I$(OPENLIBM_HOME)/include -I$(OPENLIBM_HOME)/$(ARCH) -I$(OPENLIBM_HOME)/src -DASSEMBLER -D__BSD_VISIBLE -Wno-implicit-function-declaration
128-
ifneq ($(filter $(ARCH),i387 amd64 aarch64 powerpc),)
128+
ifneq ($(filter $(ARCH),i387 amd64 powerpc),)
129129
CFLAGS_add += -I$(OPENLIBM_HOME)/ld80
130+
else
131+
ifneq ($(filter $(ARCH),aarch64),)
132+
CFLAGS_add += -I$(OPENLIBM_HOME)/ld128
133+
endif
130134
endif
131135

132136

Makefile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ SUBDIRS = src $(ARCH) bsdsrc
55
# Add ld80 directory on x86 and x64
66
ifneq ($(filter $(ARCH),i387 amd64),)
77
SUBDIRS += ld80
8+
else
9+
ifneq ($(filter $(ARCH),aarch64),)
10+
SUBDIRS += ld128
11+
else
12+
endif
813
endif
914

1015
define INC_template

ld128/Make.files

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,13 @@
1-
SRCS = invtrig.c k_cosl.c k_sinl.c k_tanl.c # s_nanl.c s_exp2l.c
1+
$(CUR_SRCS) += invtrig.c \
2+
e_acoshl.c e_powl.c k_tanl.c s_exp2l.c \
3+
e_atanhl.c e_lgammal_r.c e_sinhl.c s_asinhl.c s_expm1l.c \
4+
e_coshl.c e_log10l.c e_tgammal.c \
5+
e_expl.c e_log2l.c k_cosl.c s_log1pl.c s_tanhl.c \
6+
e_logl.c k_sinl.c s_erfl.c
7+
8+
# s_remquol.c e_fmodl.c s_truncl.c
9+
# e_hypotl.c s_floorl.c s_nextafterl.c s_ceill.c s_modfl.c
10+
11+
ifneq ($(OS), WINNT)
12+
$(CUR_SRCS) += s_nanl.c
13+
endif

0 commit comments

Comments
 (0)