Module Name: src
Committed By: nakayama
Date: Sat Jul 12 19:21:48 UTC 2014
Modified Files:
src/lib/libc/arch/sparc: Makefile.inc
src/lib/libc/arch/sparc/gen: Makefile.inc
Log Message:
Include sparc_v8 library into sparc64 32-bit compat libc library.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/lib/libc/arch/sparc/Makefile.inc
cvs rdiff -u -r1.22 -r1.23 src/lib/libc/arch/sparc/gen/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/arch/sparc/Makefile.inc
diff -u src/lib/libc/arch/sparc/Makefile.inc:1.14 src/lib/libc/arch/sparc/Makefile.inc:1.15
--- src/lib/libc/arch/sparc/Makefile.inc:1.14 Tue Apr 12 03:35:47 2011
+++ src/lib/libc/arch/sparc/Makefile.inc Sat Jul 12 19:21:48 2014
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile.inc,v 1.14 2011/04/12 03:35:47 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.15 2014/07/12 19:21:48 nakayama Exp $
SRCS+= __sigaction14_sigtramp.c __sigtramp2.S
+.if ${MACHINE} != "sparc64"
# `source' files built from m4 source
# the name `div.o' is taken for the ANSI C `div' function, hence sdiv here
SRCS+= rem.S sdiv.S udiv.S urem.S
@@ -34,3 +35,4 @@ urem.S: ${LIBCDIR}/arch/sparc/gen/divrem
@(echo "define(NAME,\`.urem')define(OP,\`rem')define(S,\`false')"; \
cat ${.ALLSRC}) | ${TOOL_M4} > ${.TARGET}
@chmod 444 ${.TARGET}
+.endif
Index: src/lib/libc/arch/sparc/gen/Makefile.inc
diff -u src/lib/libc/arch/sparc/gen/Makefile.inc:1.22 src/lib/libc/arch/sparc/gen/Makefile.inc:1.23
--- src/lib/libc/arch/sparc/gen/Makefile.inc:1.22 Sun Dec 6 07:12:17 2009
+++ src/lib/libc/arch/sparc/gen/Makefile.inc Sat Jul 12 19:21:48 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.22 2009/12/06 07:12:17 uebayasi Exp $
+# $NetBSD: Makefile.inc,v 1.23 2014/07/12 19:21:48 nakayama Exp $
SRCS+= fabs.S modf.S
SRCS+= flt_rounds.c fpgetmask.c fpgetround.c fpgetsticky.c fpsetmask.c \
@@ -20,7 +20,13 @@ SRCS+= sigsetjmp.S
SRCS+= makecontext.c resumecontext.c _lwp.c swapcontext.S
-SRCS+= fixunsdfsi.S mul.S umul.S saveregs.S
+.if ${MACHINE} == "sparc64"
+.PATH: ${NETBSDSRCDIR}/lib/libarch/sparc/v8
+SRCS+= sparc_v8.S
+.else
+SRCS+= mul.S umul.S
+.endif
+SRCS+= fixunsdfsi.S saveregs.S
SRCS+= bswap16.c bswap32.c bswap64.c
LSRCS.sparc.gen= Lint_swapcontext.c
