Synchronize on NetBSD-CVS (2013/12/1 12:00:00 UTC)
- Fix for possible unset uid/gid in toproto
- Fix for default mtree style
- Update libelf
- Importing libexecinfo
- Resynchronize GCC, mpc, gmp, mpfr
- build.sh: Replace params with show-params.
This has been done as the make target has been renamed in the same
way, while a new target named params has been added. This new
target generates a file containing all the parameters, instead of
printing it on the console.
- Update test48 with new etc/services (Fix by Ben Gras <ben@minix3.org)
get getservbyport() out of the inner loop
Change-Id: Ie6ad5226fa2621ff9f0dee8782ea48f9443d2091
This commit is contained in:
+127
-59
@@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.101 2011/01/12 23:03:56 joerg Exp $
|
||||
# $NetBSD: Makefile,v 1.152 2013/11/22 13:37:24 martin Exp $
|
||||
#
|
||||
# @(#)Makefile 5.1beta 93/09/24
|
||||
#
|
||||
@@ -50,6 +50,31 @@ USE_SHLIBDIR= yes
|
||||
.if (${MACHINE_ARCH} == "alpha")
|
||||
.PATH: ${.CURDIR}/arch/alpha
|
||||
ARCH_SRCS = s_copysign.S s_copysignf.S lrint.S
|
||||
.elif (${MACHINE_CPU} == "arm")
|
||||
.PATH: ${.CURDIR}/arch/arm
|
||||
COMMON_SRCS+= fenv.c
|
||||
COPTS.e_sqrtl.c += -DHAVE_FENV_H
|
||||
.if (${MKSOFTFLOAT} == "no")
|
||||
ARCH_SRCS = e_sqrt.S e_sqrtf.S lrint.S lrintf.S s_fabsf.S s_fma.S s_fmaf.S
|
||||
.else
|
||||
.for i in e_sqrt.o e_sqrtf.o lrint.o lrintf.o s_fabsf.o s_fma.o s_fmaf.o
|
||||
${i} ${i:.o=.po} ${i:.o=.pico} ${i:.o=.go} ${i:.o=.ln}: ${i:.o=.c}
|
||||
.endfor
|
||||
.endif
|
||||
.elif (${MACHINE_ARCH} == "sparc")
|
||||
.PATH: ${.CURDIR}/arch/sparc
|
||||
COMMON_SRCS+= fenv.c
|
||||
COPTS.e_sqrtl.c += -DHAVE_FENV_H
|
||||
COMMON_SRCS+= s_fma.c s_fmaf.c s_fmal.c
|
||||
.elif (${MACHINE_ARCH} == "sparc64")
|
||||
.PATH: ${.CURDIR}/arch/sparc64
|
||||
COMMON_SRCS+= fenv.c s_nexttowardf.c \
|
||||
s_nearbyint.c s_rintl.c
|
||||
COPTS.e_sqrtl.c += -DHAVE_FENV_H
|
||||
.ifndef _COMPAT_M32_MK_
|
||||
COMMON_SRCS+= s_nexttoward.c
|
||||
.endif
|
||||
COMMON_SRCS+= s_fma.c s_fmaf.c s_fmal.c
|
||||
.elif ((${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "x86_64"))
|
||||
|
||||
.if (${MACHINE_ARCH} == "x86_64")
|
||||
@@ -57,15 +82,20 @@ ARCH_SRCS = s_copysign.S s_copysignf.S lrint.S
|
||||
.endif
|
||||
.PATH: ${.CURDIR}/arch/i387
|
||||
|
||||
COMMON_SRCS+= fenv.c s_nextafterl.c s_nexttoward.c
|
||||
COMMON_SRCS+= fenv.c s_nexttoward.c s_nexttowardf.c \
|
||||
s_nearbyint.c s_rintl.c
|
||||
COMMON_SRCS+= s_fma.c s_fmaf.c s_fmal.c
|
||||
COPTS.e_sqrtl.c += -DHAVE_FENV_H
|
||||
|
||||
ARCH_SRCS = e_acos.S e_asin.S e_atan2.S e_exp.S e_expf.S e_fmod.S e_log.S \
|
||||
e_logf.S e_log10.S e_log10f.S e_log2.S e_log2f.S e_remainder.S \
|
||||
e_remainderf.S e_scalb.S e_scalbf.S e_sqrt.S e_sqrtf.S s_atan.S \
|
||||
s_atanf.S s_ceil.S s_ceilf.S s_copysign.S s_copysignf.S s_cos.S \
|
||||
s_cosf.S s_finite.S s_finitef.S s_floor.S s_floorf.S s_ilogb.S \
|
||||
s_ilogbf.S s_log1p.S s_log1pf.S s_logb.S s_logbf.S s_rint.S \
|
||||
s_rintf.S s_scalbn.S s_scalbnf.S s_significand.S \
|
||||
s_significandf.S s_sin.S s_sinf.S s_tan.S s_tanf.S lrint.S
|
||||
s_cosf.S s_finite.S s_finitef.S s_floor.S s_floorf.S \
|
||||
s_ilogb.S s_ilogbf.S s_ilogbl.S s_log1p.S s_log1pf.S \
|
||||
s_logb.S s_logbf.S s_logbl.S \
|
||||
s_rint.S s_rintf.S s_scalbn.S s_scalbnf.S s_significand.S \
|
||||
s_significandf.S s_sin.S s_sinf.S s_tan.S s_tanf.S lrint.S
|
||||
# do not pick up the i387 asm version, it is incorrect
|
||||
s_modf.o s_modf.pico s_modf.po s_modf.d: s_modf.c
|
||||
|
||||
@@ -94,23 +124,26 @@ ARCH_SRCS = e_acos.S e_asin.S e_atanh.S e_cosh.S e_exp.S e_fmod.S e_log.S \
|
||||
.endif
|
||||
# end of m68k
|
||||
.elif (${MACHINE_ARCH} == "vax")
|
||||
#.PATH: ${.CURDIR}/arch/vax
|
||||
.PATH: ${.CURDIR}/arch/vax
|
||||
|
||||
#NOIEEE_ARCH= n_infnan.S n_argred.S n_sqrt.S
|
||||
#ARCH_SRCS = n_atan2.S n_cabs.S n_cbrt.S n_support.S n_sincos.S n_tan.S
|
||||
# XXX - ripped out due to lack of the insn polyd in the Mariah chip,
|
||||
# and emulation code isn't written yet.
|
||||
WARNS?=4
|
||||
ARCH_SRCS = n_scalbn.S
|
||||
WARNS?=5
|
||||
.endif
|
||||
|
||||
WARNS?=4
|
||||
# LSC MINIX, do not compile yet with -Werror...
|
||||
NOGCCERROR=yes
|
||||
WARNS?=5
|
||||
|
||||
.PATH: ${.CURDIR}/man
|
||||
.PATH: ${.CURDIR}/src
|
||||
.PATH: ${.CURDIR}/noieee_src
|
||||
|
||||
.if (${MACHINE_ARCH} == "alpha")
|
||||
COPTS+= -mfp-rounding-mode=d
|
||||
.endif
|
||||
|
||||
.if (${MACHINE_ARCH} != "vax")
|
||||
CPPFLAGS+= -D_MULTI_LIBM -D_POSIX_MODE
|
||||
# XXX noieee libm is gross
|
||||
@@ -119,45 +152,53 @@ COPTS+= -fno-strict-aliasing
|
||||
CPPFLAGS+=-DLIBM_SCCS
|
||||
|
||||
LIB= m
|
||||
COMMON_SRCS+= e_acos.c e_acosf.c e_acosh.c e_acoshf.c e_asin.c e_asinf.c \
|
||||
COMMON_SRCS+= b_exp.c b_log.c b_tgamma.c \
|
||||
e_acos.c e_acosf.c e_acosh.c e_acoshf.c e_asin.c e_asinf.c \
|
||||
e_atan2.c e_atan2f.c e_atanh.c e_atanhf.c e_cosh.c e_coshf.c e_exp.c \
|
||||
e_expf.c e_fmod.c e_fmodf.c e_hypot.c e_hypotf.c e_j0.c e_j0f.c \
|
||||
e_expf.c e_fmod.c e_fmodf.c e_fmodl.c e_hypot.c e_hypotf.c \
|
||||
e_j0.c e_j0f.c \
|
||||
e_j1.c e_j1f.c e_jn.c e_jnf.c e_lgamma_r.c e_lgammaf_r.c e_log.c \
|
||||
e_log2.c e_log10.c e_log10f.c e_log2f.c e_logf.c e_pow.c e_powf.c \
|
||||
e_rem_pio2.c e_rem_pio2f.c e_remainder.c e_remainderf.c e_scalb.c \
|
||||
e_scalbf.c e_sinh.c e_sinhf.c e_sqrt.c e_sqrtf.c \
|
||||
e_scalbf.c e_sinh.c e_sinhf.c e_sqrt.c e_sqrtf.c e_sqrtl.c \
|
||||
k_cos.c k_cosf.c k_rem_pio2.c k_rem_pio2f.c k_sin.c k_sinf.c \
|
||||
k_standard.c k_tan.c k_tanf.c \
|
||||
s_asinh.c s_asinhf.c s_atan.c s_atanf.c s_cbrt.c s_cbrtf.c s_ceil.c \
|
||||
s_ceilf.c s_copysign.c s_copysignf.c s_copysignl.c s_cos.c s_cosf.c s_erf.c \
|
||||
ldbl_dummy.c \
|
||||
s_asinh.c s_asinhf.c s_atan.c s_atanf.c s_cbrt.c s_cbrtf.c s_cbrtl.c \
|
||||
s_ceil.c s_ceilf.c s_ceill.c s_copysign.c s_copysignf.c s_copysignl.c \
|
||||
s_cos.c s_cosf.c s_erf.c \
|
||||
s_erff.c s_exp2.c s_exp2f.c s_expm1.c s_expm1f.c s_fabsf.c s_fabsl.c \
|
||||
s_finite.c s_finitef.c \
|
||||
s_floor.c s_floorf.c s_frexpf.c s_ilogb.c s_ilogbf.c \
|
||||
s_isinff.c s_isnanf.c s_ldexpf.c s_lib_version.c s_log1p.c \
|
||||
s_log1pf.c s_logb.c s_logbf.c s_matherr.c s_modff.c s_nextafter.c \
|
||||
s_nextafterf.c s_rint.c s_rintf.c s_round.c s_roundf.c s_scalbn.c \
|
||||
s_scalbnf.c s_signgam.c s_significand.c s_significandf.c s_sin.c \
|
||||
s_sinf.c s_tan.c s_tanf.c s_tanh.c s_tanhf.c s_trunc.c s_truncf.c \
|
||||
s_floor.c s_floorf.c s_floorl.c s_frexpf.c \
|
||||
s_ilogb.c s_ilogbf.c s_ilogbl.c \
|
||||
s_isinff.c s_isnanf.c s_lib_version.c s_log1p.c \
|
||||
s_log1pf.c s_logb.c s_logbf.c s_logbl.c \
|
||||
s_matherr.c s_modff.c s_nextafter.c s_nextafterl.c \
|
||||
s_nextafterf.c s_remquo.c s_remquof.c s_rint.c s_rintf.c \
|
||||
s_round.c s_roundf.c s_roundl.c s_scalbn.c \
|
||||
s_scalbnf.c s_scalbnl.c s_signgam.c s_significand.c s_significandf.c s_sin.c \
|
||||
s_sinf.c s_tan.c s_tanf.c s_tanh.c s_tanhf.c s_tgammaf.c \
|
||||
s_trunc.c s_truncf.c s_truncl.c \
|
||||
w_acos.c w_acosf.c w_acosh.c w_acoshf.c w_asin.c w_asinf.c w_atan2.c \
|
||||
w_atan2f.c w_atanh.c w_atanhf.c w_cosh.c w_coshf.c \
|
||||
w_drem.c w_dremf.c w_exp.c w_expf.c w_fmod.c w_fmodf.c w_gamma.c \
|
||||
w_gamma_r.c w_gammaf.c w_gammaf_r.c w_hypot.c w_hypotf.c w_j0.c \
|
||||
w_drem.c w_dremf.c w_exp.c w_expf.c w_fmod.c w_fmodf.c w_fmodl.c \
|
||||
w_gamma.c w_gamma_r.c w_gammaf.c w_gammaf_r.c w_hypot.c w_hypotf.c \
|
||||
w_j0.c \
|
||||
w_j0f.c w_j1.c w_j1f.c w_jn.c w_jnf.c w_lgamma.c w_lgamma_r.c \
|
||||
w_lgammaf.c w_lgammaf_r.c w_log.c w_log10.c w_log10f.c w_log2.c \
|
||||
w_log2f.c w_logf.c \
|
||||
w_pow.c w_powf.c w_remainder.c w_remainderf.c w_scalb.c w_scalbf.c \
|
||||
w_sinh.c w_sinhf.c w_sqrt.c w_sqrtf.c \
|
||||
w_sinh.c w_sinhf.c w_sqrt.c w_sqrtf.c w_sqrtl.c \
|
||||
lrint.c lrintf.c llrint.c llrintf.c lround.c lroundf.c llround.c \
|
||||
llroundf.c s_frexp.c s_ldexp.c s_modf.c \
|
||||
s_fmax.c s_fmaxf.c s_fmaxl.c s_fmin.c s_fminf.c s_fminl.c s_fdim.c
|
||||
llroundf.c s_frexp.c s_frexpl.c s_modf.c \
|
||||
s_fmax.c s_fmaxf.c s_fmaxl.c \
|
||||
s_fmin.c s_fminf.c s_fminl.c s_fdim.c
|
||||
|
||||
.PATH: ${.CURDIR}/compat
|
||||
COMMON_SRCS+= compat_cabs.c compat_cabsf.c
|
||||
# XXX our compatibility cabs() is different!
|
||||
.if defined(HAVE_GCC) && ${HAVE_GCC} == 4
|
||||
COPTS.compat_cabs.c= -fno-builtin-cabs
|
||||
COPTS.compat_cabsf.c= -fno-builtin-cabsf
|
||||
.endif
|
||||
COPTS.compat_cabs.c= ${${ACTIVE_CC} == "gcc":? -fno-builtin-cabs :}
|
||||
COPTS.compat_cabsf.c= ${${ACTIVE_CC} == "gcc":? -fno-builtin-cabsf :}
|
||||
|
||||
# math routines for non-IEEE architectures.
|
||||
NOIEEE_SRCS = n_asincos.c n_acosh.c n_asinh.c n_atan.c n_atanh.c n_cosh.c \
|
||||
@@ -191,7 +232,7 @@ SRCS+= ${ARCH_ADDS}
|
||||
.if (${MACHINE_ARCH} == "vax") # XXX until POLYD is written.
|
||||
.PATH: ${.CURDIR}/arch/vax
|
||||
SRCS:=${SRCS} n_sqrt.S n_argred.S n_infnan.S n_atan2.S n_cabs.S n_cbrt.S \
|
||||
n_support.S
|
||||
n_support.S n_scalbn.S
|
||||
.endif
|
||||
|
||||
.if (${MACHINE_ARCH} == "i386")
|
||||
@@ -199,11 +240,15 @@ SRCS:=${SRCS} n_sqrt.S n_argred.S n_infnan.S n_atan2.S n_cabs.S n_cbrt.S \
|
||||
COPTS.s_tanh.c+= -O0
|
||||
.endif
|
||||
|
||||
MAN+= acos.3 acosh.3 asin.3 asinh.3 atan.3 atan2.3 atanh.3 ceil.3 \
|
||||
cos.3 cosh.3 erf.3 exp.3 fabs.3 floor.3 fmod.3 frexp.3 hypot.3 ieee.3 \
|
||||
ieee_test.3 isinff.3 j0.3 ldexp.3 lgamma.3 lrint.3 \
|
||||
math.3 modf.3 rint.3 round.3 sin.3 sinh.3 \
|
||||
sqrt.3 tan.3 tanh.3 trunc.3 fmax.3 fdim.3
|
||||
MAN+= acos.3 acosh.3 asin.3 asinh.3 atan.3 atan2.3 atanh.3 \
|
||||
ceil.3 copysign.3 cos.3 cosh.3 \
|
||||
erf.3 exp.3 \
|
||||
fabs.3 finite.3 fmod.3 frexp.3 hypot.3 \
|
||||
ieee_test.3 ilogb.3 isinff.3 j0.3 ldexp.3 lgamma.3 log.3 lrint.3 \
|
||||
math.3 modf.3 nextafter.3 pow.3 \
|
||||
remainder.3 rint.3 round.3 \
|
||||
scalbn.3 sin.3 sinh.3 sqrt.3 \
|
||||
tan.3 tanh.3 trunc.3 fmax.3 fdim.3
|
||||
|
||||
# fenv.h interface
|
||||
MAN+= feclearexcept.3 feenableexcept.3 fegetenv.3 fegetround.3 fenv.3
|
||||
@@ -225,46 +270,61 @@ MLINKS+=asinh.3 asinhf.3
|
||||
MLINKS+=atan.3 atanf.3
|
||||
MLINKS+=atan2.3 atan2f.3
|
||||
MLINKS+=atanh.3 atanhf.3
|
||||
MLINKS+=ceil.3 ceilf.3
|
||||
MLINKS+=ceil.3 ceilf.3 \
|
||||
ceil.3 ceill.3 \
|
||||
ceil.3 floor.3 \
|
||||
ceil.3 floorf.3 \
|
||||
ceil.3 floorl.3
|
||||
MLINKS+=copysign.3 copysignf.3 \
|
||||
copysign.3 copysignl.3
|
||||
MLINKS+=cos.3 cosf.3
|
||||
MLINKS+=cosh.3 coshf.3
|
||||
MLINKS+=erf.3 erff.3 erf.3 erfc.3 erf.3 erfcf.3
|
||||
MLINKS+=exp.3 expf.3 exp.3 expm1.3 exp.3 expm1f.3 \
|
||||
exp.3 exp2.3 exp.3 exp2f.3 \
|
||||
exp.3 log.3 exp.3 logf.3 \
|
||||
exp.3 log10.3 exp.3 log10f.3 \
|
||||
exp.3 log1p.3 exp.3 log1pf.3 \
|
||||
exp.3 pow.3 exp.3 powf.3 \
|
||||
exp.3 log2.3 exp.3 log2f.3
|
||||
exp.3 exp2.3 exp.3 exp2f.3
|
||||
MLINKS+=log.3 logf.3 \
|
||||
log.3 log10.3 \
|
||||
log.3 log10f.3 \
|
||||
log.3 log1p.3 \
|
||||
log.3 log1pf.3 \
|
||||
log.3 log2.3 \
|
||||
log.3 log2f.3
|
||||
MLINKS+=pow.3 powf.3
|
||||
MLINKS+=fabs.3 fabsf.3
|
||||
MLINKS+=floor.3 floorf.3
|
||||
MLINKS+=fmod.3 fmodf.3
|
||||
MLINKS+=finite.3 finitef.3
|
||||
MLINKS+=fmod.3 fmodf.3 \
|
||||
fmod.3 fmodl.3
|
||||
MLINKS+=hypot.3 hypotf.3
|
||||
MLINKS+=ieee.3 copysign.3 ieee.3 copysignf.3 ieee.3 copysignl.3 \
|
||||
ieee.3 finite.3 ieee.3 finitef.3 \
|
||||
ieee.3 ilogb.3 ieee.3 ilogbf.3 \
|
||||
ieee.3 nextafter.3 ieee.3 nextafterf.3 ieee.3 nextafterl.3 \
|
||||
ieee.3 nexttoward.3 \
|
||||
ieee.3 remainder.3 ieee.3 remainderf.3 \
|
||||
ieee.3 scalbn.3 ieee.3 scalbnf.3
|
||||
MLINKS+=ieee_test.3 logb.3 ieee_test.3 logbf.3
|
||||
MLINKS+=ieee_test.3 logb.3 ieee_test.3 logbf.3 ieee_test.3 logbl.3
|
||||
MLINKS+=ieee_test.3 scalb.3 ieee_test.3 scalbf.3
|
||||
MLINKS+=ieee_test.3 significand.3 ieee_test.3 significandf.3
|
||||
MLINKS+=ilogb.3 ilogbf.3 ilogb.3 ilogbl.3
|
||||
MLINKS+=isinff.3 isnanf.3
|
||||
MLINKS+=j0.3 j0f.3 j0.3 j1.3 j0.3 j1f.3 j0.3 jn.3 j0.3 jnf.3 \
|
||||
j0.3 y0.3 j0.3 y0f.3 j0.3 y1.3 j0.3 y1f.3 j0.3 yn.3 j0.3 ynf.3
|
||||
MLINKS+=lgamma.3 lgammaf.3 lgamma.3 lgamma_r.3 lgamma.3 lgammaf_r.3 \
|
||||
lgamma.3 gamma.3 lgamma.3 gammaf.3 lgamma.3 gamma_r.3 \
|
||||
lgamma.3 gammaf_r.3
|
||||
lgamma.3 gammaf_r.3 lgamma.3 tgamma.3 lgamma.3 tgammaf.3
|
||||
MLINKS+=nextafter.3 nextafterf.3 \
|
||||
nextafter.3 nextafterl.3 \
|
||||
nextafter.3 nexttoward.3
|
||||
MLINKS+=lrint.3 lrintf.3 lrint.3 llrint.3 lrint.3 llrintf.3
|
||||
MLINKS+=remainder.3 remainderf.3 \
|
||||
remainder.3 remquo.3 \
|
||||
remainder.3 remquof.3
|
||||
MLINKS+=rint.3 rintf.3
|
||||
MLINKS+=scalbn.3 scalbnf.3 \
|
||||
scalbn.3 scalbnl.3
|
||||
MLINKS+=sin.3 sinf.3
|
||||
MLINKS+=sinh.3 sinhf.3
|
||||
MLINKS+=sqrt.3 sqrtf.3 sqrt.3 cbrt.3 sqrt.3 cbrtf.3
|
||||
MLINKS+=sin.3 sinhf.3
|
||||
MLINKS+=sqrt.3 sqrtf.3 sqrt.3 sqrtl.3 \
|
||||
sqrt.3 cbrt.3 sqrt.3 cbrtf.3 sqrt.3 cbrtl.3
|
||||
MLINKS+=tan.3 tanf.3
|
||||
MLINKS+=tanh.3 tanhf.3
|
||||
MLINKS+=round.3 roundf.3
|
||||
MLINKS+=trunc.3 truncf.3
|
||||
MLINKS+=round.3 roundf.3 \
|
||||
round.3 roundl.3
|
||||
MLINKS+=trunc.3 truncf.3 \
|
||||
trunc.3 truncl.3
|
||||
MLINKS+=fmax.3 fmaxl.3
|
||||
MLINKS+=fmax.3 fmaxf.3
|
||||
MLINKS+=fmax.3 fmin.3
|
||||
@@ -277,6 +337,14 @@ MLINKS+=fdim.3 fdimf.3
|
||||
.include "${.CURDIR}/complex/Makefile.inc"
|
||||
.endif
|
||||
|
||||
COPTS.compat_cabs.c+= ${${ACTIVE_CC} == "clang":? -Wno-incompatible-library-redeclaration :}
|
||||
COPTS.compat_cabsf.c+= ${${ACTIVE_CC} == "clang":? -Wno-incompatible-library-redeclaration :}
|
||||
|
||||
.include "${.CURDIR}/gen/Makefile.inc"
|
||||
|
||||
.if ${HAVE_LIBGCC} == "no"
|
||||
.include "${.CURDIR}/compiler_rt/Makefile.inc"
|
||||
.endif
|
||||
|
||||
.include <bsd.lib.mk>
|
||||
.include <bsd.subdir.mk>
|
||||
|
||||
Reference in New Issue
Block a user