Merge pull request #168 from JuliaLang/yyc/ld128

Fix compilation on AArch64
This commit is contained in:
Yichao Yu 2017-10-23 21:36:37 -04:00 committed by GitHub
commit b2520473c2
3 changed files with 23 additions and 2 deletions

View file

@ -125,8 +125,12 @@ SFLAGS_add += $(SFLAGS_arch)
LDFLAGS_add += $(LDFLAGS_arch) LDFLAGS_add += $(LDFLAGS_arch)
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 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
ifneq ($(filter $(ARCH),i387 amd64 aarch64 powerpc),) ifneq ($(filter $(ARCH),i387 amd64 powerpc),)
CFLAGS_add += -I$(OPENLIBM_HOME)/ld80 CFLAGS_add += -I$(OPENLIBM_HOME)/ld80
else
ifneq ($(filter $(ARCH),aarch64),)
CFLAGS_add += -I$(OPENLIBM_HOME)/ld128
endif
endif endif

View file

@ -5,6 +5,11 @@ SUBDIRS = src $(ARCH) bsdsrc
# Add ld80 directory on x86 and x64 # Add ld80 directory on x86 and x64
ifneq ($(filter $(ARCH),i387 amd64),) ifneq ($(filter $(ARCH),i387 amd64),)
SUBDIRS += ld80 SUBDIRS += ld80
else
ifneq ($(filter $(ARCH),aarch64),)
SUBDIRS += ld128
else
endif
endif endif
define INC_template define INC_template

View file

@ -1 +1,13 @@
SRCS = invtrig.c k_cosl.c k_sinl.c k_tanl.c # s_nanl.c s_exp2l.c $(CUR_SRCS) += invtrig.c \
e_acoshl.c e_powl.c k_tanl.c s_exp2l.c \
e_atanhl.c e_lgammal_r.c e_sinhl.c s_asinhl.c s_expm1l.c \
e_coshl.c e_log10l.c e_tgammal.c \
e_expl.c e_log2l.c k_cosl.c s_log1pl.c s_tanhl.c \
e_logl.c k_sinl.c s_erfl.c
# s_remquol.c e_fmodl.c s_truncl.c
# e_hypotl.c s_floorl.c s_nextafterl.c s_ceill.c s_modfl.c
ifneq ($(OS), WINNT)
$(CUR_SRCS) += s_nanl.c
endif