Date: Thu, 8 Jan 2015 20:11:39 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r276853 - in head: lib/libc/arm/aeabi lib/libstand sys/boot/libstand32 Message-ID: <201501082011.t08KBdAx074825@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Thu Jan 8 20:11:38 2015 New Revision: 276853 URL: https://svnweb.freebsd.org/changeset/base/276853 Log: Apparently more Makefiles use stuff from compiler-rt, so fix them up too. (This did not show during a make universe, strangely.) Modified: head/lib/libc/arm/aeabi/Makefile.inc head/lib/libstand/Makefile head/sys/boot/libstand32/Makefile Modified: head/lib/libc/arm/aeabi/Makefile.inc ============================================================================== --- head/lib/libc/arm/aeabi/Makefile.inc Thu Jan 8 20:08:00 2015 (r276852) +++ head/lib/libc/arm/aeabi/Makefile.inc Thu Jan 8 20:11:38 2015 (r276853) @@ -20,7 +20,7 @@ SRCS+= aeabi_vfp_double.S \ # libc. This causes issues when other parts of libc call these functions. # We work around this by including these functions in libc but mark them as # hidden so users of libc will not pick up these versions. -.PATH: ${LIBC_SRCTOP}/../../contrib/compiler-rt/lib/arm +.PATH: ${LIBC_SRCTOP}/../../contrib/compiler-rt/lib/builtins/arm SRCS+= aeabi_memcmp.S \ aeabi_memcpy.S \ Modified: head/lib/libstand/Makefile ============================================================================== --- head/lib/libstand/Makefile Thu Jan 8 20:08:00 2015 (r276852) +++ head/lib/libstand/Makefile Thu Jan 8 20:11:38 2015 (r276853) @@ -65,14 +65,14 @@ SRCS+= bcmp.c bcopy.c bzero.c ffs.c memc .PATH: ${.CURDIR}/../libc/arm/gen # Compiler support functions -.PATH: ${.CURDIR}/../../contrib/compiler-rt/lib/ +.PATH: ${.CURDIR}/../../contrib/compiler-rt/lib/builtins/ # __clzsi2 and ctzsi2 for various builtin functions SRCS+= clzsi2.c ctzsi2.c # Divide and modulus functions called by the compiler SRCS+= divmoddi4.c divmodsi4.c divdi3.c divsi3.c moddi3.c modsi3.c SRCS+= udivmoddi4.c udivmodsi4.c udivdi3.c udivsi3.c umoddi3.c umodsi3.c -.PATH: ${.CURDIR}/../../contrib/compiler-rt/lib/arm/ +.PATH: ${.CURDIR}/../../contrib/compiler-rt/lib/builtins/arm/ SRCS+= aeabi_idivmod.S aeabi_ldivmod.S aeabi_uidivmod.S aeabi_uldivmod.S SRCS+= aeabi_memcmp.S aeabi_memcpy.S aeabi_memmove.S aeabi_memset.S Modified: head/sys/boot/libstand32/Makefile ============================================================================== --- head/sys/boot/libstand32/Makefile Thu Jan 8 20:08:00 2015 (r276852) +++ head/sys/boot/libstand32/Makefile Thu Jan 8 20:11:38 2015 (r276853) @@ -68,14 +68,14 @@ SRCS+= bcmp.c bcopy.c bzero.c ffs.c memc .PATH: ${LIBC}/arm/gen # Compiler support functions -.PATH: ${.CURDIR}/../../../contrib/compiler-rt/lib/ +.PATH: ${.CURDIR}/../../../contrib/compiler-rt/lib/builtins/ # __clzsi2 and ctzsi2 for various builtin functions SRCS+= clzsi2.c ctzsi2.c # Divide and modulus functions called by the compiler SRCS+= divmoddi4.c divmodsi4.c divdi3.c divsi3.c moddi3.c modsi3.c SRCS+= udivmoddi4.c udivmodsi4.c udivdi3.c udivsi3.c umoddi3.c umodsi3.c -.PATH: ${.CURDIR}/../../../contrib/compiler-rt/lib/arm/ +.PATH: ${.CURDIR}/../../../contrib/compiler-rt/lib/builtins/arm/ SRCS+= aeabi_idivmod.S aeabi_ldivmod.S aeabi_uidivmod.S aeabi_uldivmod.S SRCS+= aeabi_memcmp.S aeabi_memcpy.S aeabi_memmove.S aeabi_memset.S
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501082011.t08KBdAx074825>