Raymond Toy pushed to branch issue-485-import-openlibm-single-float-functions at cmucl / cmucl

Commits:

2 changed files:

Changes:

  • src/lisp/Config.x86_common
    ... ... @@ -95,49 +95,10 @@ CORE_MATH_SRCS = $(CORE64_SRCS) $(CORE32_SRCS)
    95 95
     
    
    96 96
     endif
    
    97 97
     
    
    98
    -# If core-math is not defined such as on Darwin, we use the code from
    
    99
    -# openlibm to implement the special functions for single-floats.
    
    100
    -ifndef FEATURE_CORE_MATH
    
    101
    -OPENLIBM_DIR = openlibm
    
    102
    -OPENLIBM_SRCS = \
    
    103
    -	$(OPENLIBM_DIR)/e_acosf.c \
    
    104
    -	$(OPENLIBM_DIR)/e_acoshf.c \
    
    105
    -	$(OPENLIBM_DIR)/e_asinf.c \
    
    106
    -	$(OPENLIBM_DIR)/e_atan2f.c \
    
    107
    -	$(OPENLIBM_DIR)/e_atanhf.c \
    
    108
    -	$(OPENLIBM_DIR)/e_coshf.c \
    
    109
    -	$(OPENLIBM_DIR)/e_expf.c \
    
    110
    -	$(OPENLIBM_DIR)/e_hypotf.c \
    
    111
    -	$(OPENLIBM_DIR)/e_log10f.c \
    
    112
    -	$(OPENLIBM_DIR)/e_logf.c \
    
    113
    -	$(OPENLIBM_DIR)/e_powf.c \
    
    114
    -	$(OPENLIBM_DIR)/e_rem_pio2f.c \
    
    115
    -	$(OPENLIBM_DIR)/e_sinhf.c \
    
    116
    -	$(OPENLIBM_DIR)/k_cosf.c \
    
    117
    -	$(OPENLIBM_DIR)/k_sinf.c \
    
    118
    -	$(OPENLIBM_DIR)/k_tanf.c \
    
    119
    -	$(OPENLIBM_DIR)/k_expf.c \
    
    120
    -	$(OPENLIBM_DIR)/s_asinhf.c \
    
    121
    -	$(OPENLIBM_DIR)/s_atanf.c \
    
    122
    -	$(OPENLIBM_DIR)/s_cosf.c \
    
    123
    -	$(OPENLIBM_DIR)/s_expm1f.c \
    
    124
    -	$(OPENLIBM_DIR)/s_log1pf.c \
    
    125
    -	$(OPENLIBM_DIR)/s_sinf.c \
    
    126
    -	$(OPENLIBM_DIR)/s_sincosf.c \
    
    127
    -	$(OPENLIBM_DIR)/s_tanf.c \
    
    128
    -	$(OPENLIBM_DIR)/s_tanhf.c
    
    129
    -endif
    
    130
    -
    
    131 98
     ifeq ($(filter 2% 3%, $(shell $(CC) -dumpversion)),)
    
    132 99
     CPP_INCLUDE_OPTIONS := -iquote . -iquote $(PATH1)
    
    133
    -ifndef FEATURE_CORE_MATH
    
    134
    -CPP_INCLUDE_OPTIONS += -isystem $(PATH1)/$(OPENLIBM_DIR) -DOPENLIBM_USE_HOST_MATH_H
    
    135
    -endif
    
    136 100
     else
    
    137
    -CPP_INCLUDE_OPTIONS := -I. -I$(PATH1) -I $(OPENLIBM_DIR) -I-
    
    138
    -ifndef FEATURE_CORE_MATH
    
    139
    -CPP_INCLUDE_OPTIONS += -I $(PATH1)/$(OPENLIBM_DIR)
    
    140
    -endif
    
    101
    +CPP_INCLUDE_OPTIONS := -I. -I$(PATH1) -I-
    
    141 102
     endif
    
    142 103
     
    
    143 104
     CPPFLAGS := $(CPP_DEFINE_OPTIONS) $(CPP_INCLUDE_OPTIONS) 
    

  • src/lisp/GNUmakefile
    ... ... @@ -37,7 +37,6 @@ SRCS = lisp.c coreparse.c alloc.c monitor.c print.c interr.c \
    37 37
     	runprog.c time.c case-mapping.c exec-init.c \
    
    38 38
     	irrat.c \
    
    39 39
     	${CORE_MATH_SRCS} \
    
    40
    -	${OPENLIBM_SRCS} \
    
    41 40
     	${FDLIBM} ${ARCH_SRC} ${ASSEM_SRC} ${OS_SRC} ${GC_SRC}
    
    42 41
     
    
    43 42