From ea3dc21b32670fe11a7743b3f3cd81dea9359b58 Mon Sep 17 00:00:00 2001 From: Ed Maste Date: Wed, 27 Jul 2016 16:34:19 +0000 Subject: rename ARM's libunwind.S to to avoid conflict with llvm libunwind llvm libunwind includes a libunwind.cpp, but on ARM libunwind.S is found first in .PATH. Rename the latter one, since it is not going to be updated again. Reviewed by: andrew MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D7162 --- gnu/lib/libgcc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/lib') diff --git a/gnu/lib/libgcc/Makefile b/gnu/lib/libgcc/Makefile index 272caf744882..a47bd3389420 100644 --- a/gnu/lib/libgcc/Makefile +++ b/gnu/lib/libgcc/Makefile @@ -99,7 +99,7 @@ STATIC_CXXFLAGS+= -fvisibility=hidden -fPIC .else # MK_LLVM_LIBUNWIND .if ${TARGET_CPUARCH} == "arm" -LIB2ADDEH = unwind-arm.c libunwind.S pr-support.c unwind-c.c +LIB2ADDEH = unwind-arm.c libunwind-arm.S pr-support.c unwind-c.c .else LIB2ADDEH = unwind-dw2.c unwind-dw2-fde-glibc.c unwind-sjlj.c gthr-gnat.c \ unwind-c.c -- cgit v1.2.3