Module Name: src
Committed By: martin
Date: Fri May 24 12:45:40 UTC 2013
Modified Files:
src/lib/libm: Makefile
src/lib/libm/arch/vax: n_scalbn.S
Log Message:
Fix POLYD/Mariah fallout and include the scalbn sources (which do not
use polyd).
Fix global names and weak aliases.
To generate a diff of this commit:
cvs rdiff -u -r1.137 -r1.138 src/lib/libm/Makefile
cvs rdiff -u -r1.3 -r1.4 src/lib/libm/arch/vax/n_scalbn.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libm/Makefile
diff -u src/lib/libm/Makefile:1.137 src/lib/libm/Makefile:1.138
--- src/lib/libm/Makefile:1.137 Wed May 1 04:04:31 2013
+++ src/lib/libm/Makefile Fri May 24 12:45:40 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.137 2013/05/01 04:04:31 matt Exp $
+# $NetBSD: Makefile,v 1.138 2013/05/24 12:45:40 martin Exp $
#
# @(#)Makefile 5.1beta 93/09/24
#
@@ -122,7 +122,7 @@ ARCH_SRCS = e_acos.S e_asin.S e_atanh.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.
-ARCHS_SRCS = n_scalbn.S
+ARCH_SRCS = n_scalbn.S
WARNS?=5
.endif
@@ -217,7 +217,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")
Index: src/lib/libm/arch/vax/n_scalbn.S
diff -u src/lib/libm/arch/vax/n_scalbn.S:1.3 src/lib/libm/arch/vax/n_scalbn.S:1.4
--- src/lib/libm/arch/vax/n_scalbn.S:1.3 Mon May 20 20:27:43 2013
+++ src/lib/libm/arch/vax/n_scalbn.S Fri May 24 12:45:40 2013
@@ -30,19 +30,20 @@
#include <machine/asm.h>
#include <sys/errno.h>
-RCSID("$NetBSD: n_scalbn.S,v 1.3 2013/05/20 20:27:43 mlelstv Exp $")
+RCSID("$NetBSD: n_scalbn.S,v 1.4 2013/05/24 12:45:40 martin Exp $")
+WEAK_ALIAS(scalbn,_scalbn)
WEAK_ALIAS(ldexp,_scalbn)
WEAK_ALIAS(ldexpf,_scalbnf)
WEAK_ALIAS(ldexpl,_scalbnl)
-ENTRY(scalbnf, 0)
+ENTRY(_scalbnf, 0)
cvtfd 4(%ap), %r0
movl 8(%ap), %r2
jr 1f
-ALTENTRY(scalbnl)
-ENTRY(scalbn, 0)
+ALTENTRY(_scalbnl)
+ENTRY(_scalbn, 0)
movd 4(%ap), %r0
movl 12(%ap), %r2