[src/trunk]: src/lib/libc/compiler_rt Changes for OR1K

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8054944a278c
branches:  trunk
changeset: 331987:8054944a278c
user:      matt <matt%NetBSD.org@localhost>
date:      Wed Sep 03 19:29:14 2014 +0000

description:
Changes for OR1K

diffstat:

 lib/libc/compiler_rt/Makefile.inc |  17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diffs (46 lines):

diff -r f2735efa82fe -r 8054944a278c lib/libc/compiler_rt/Makefile.inc
--- a/lib/libc/compiler_rt/Makefile.inc Wed Sep 03 19:28:20 2014 +0000
+++ b/lib/libc/compiler_rt/Makefile.inc Wed Sep 03 19:29:14 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.26 2014/08/17 16:14:59 matt Exp $
+# $NetBSD: Makefile.inc,v 1.27 2014/09/03 19:29:14 matt Exp $
 
 COMPILER_RT_SRCDIR=    ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
 
@@ -135,17 +135,24 @@
 .endif
 
 # These have h/w instructions which are always used.
-.if ${LIBC_MACHINE_ARCH} != "alpha" && ${LIBC_MACHINE_CPU} != "powerpc" \
-    && ${LIBC_MACHINE_CPU} != "aarch64"
+.if ${LIBC_MACHINE_ARCH} != "alpha" && ${LIBC_MACHINE_CPU} != "aarch64" \
+    && ${LIBC_MACHINE_CPU} != "powerpc" && ${LIBC_MACHINE_CPU} != "or1k"
 GENERIC_SRCS+= \
        clzsi2.c
 .endif
 
 # These have h/w instructions which are always used.
+.if ${LIBC_MACHINE_ARCH} != "alpha" && ${LIBC_MACHINE_ARCH} != "vax" \
+    && ${LIBC_MACHINE_CPU} != "aarch64" && ${LIBC_MACHINE_CPU} != "powerpc" \
+    && ${LIBC_MACHINE_CPU} != "or1k"
+GENERIC_SRCS+= \
+       ctzsi2.c
+.endif
+
+# These have h/w instructions which are always used.
 .if ${LIBC_MACHINE_ARCH} != "alpha" && ${LIBC_MACHINE_CPU} != "powerpc" \
     && ${LIBC_MACHINE_CPU} != "aarch64" && ${LIBC_MACHINE_ARCH} != "vax"
 GENERIC_SRCS+= \
-       ctzsi2.c \
        divmodsi4.c \
        divsi3.c \
        modsi3.c \
@@ -174,7 +181,7 @@
 
 # These have h/w instructions which are always used.
 .if ${LIBC_MACHINE_ARCH} != "alpha" && ${LIBC_MACHINE_CPU} != "powerpc64" \
-    && ${LIBC_MACHINE_ARCH} != "aarch64"
+    && ${LIBC_MACHINE_ARCH} != "aarch64" && ${LIBC_MACHINE_CPU} != "or1k"
 GENERIC_SRCS+= \
        clzdi2.c \
        ctzdi2.c \