Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/lib/libm fix double merge.



details:   https://anonhg.NetBSD.org/src/rev/443fdae3b155
branches:  trunk
changeset: 347431:443fdae3b155
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Aug 26 08:33:48 2016 +0000

description:
fix double merge.

diffstat:

 lib/libm/Makefile |  6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diffs (22 lines):

diff -r e277e9c8f76b -r 443fdae3b155 lib/libm/Makefile
--- a/lib/libm/Makefile Fri Aug 26 08:31:17 2016 +0000
+++ b/lib/libm/Makefile Fri Aug 26 08:33:48 2016 +0000
@@ -1,4 +1,4 @@
-#  $NetBSD: Makefile,v 1.182 2016/08/26 08:31:17 christos Exp $
+#  $NetBSD: Makefile,v 1.183 2016/08/26 08:33:48 christos Exp $
 #
 #  @(#)Makefile 5.1beta 93/09/24
 #
@@ -170,12 +170,8 @@
 .elif (${LIBC_MACHINE_CPU} == "mips")
 .PATH: ${.CURDIR}/arch/mips
 COMMON_SRCS += fenv.c
-.if (${LIBC_MACHINE_CPU} == "sh3")
-.PATH: ${.CURDIR}/arch/sh3
-COMMON_SRCS += fenv.c
 .elif (${LIBC_MACHINE_CPU} == "sh3")
 .PATH: ${.CURDIR}/arch/sh3
-COPTS.e_sqrtl.c += -DHAVE_FENV_H
 COMMON_SRCS += fenv.c
 .endif
 



Home | Main Index | Thread Index | Old Index