aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorEd Maste <emaste@FreeBSD.org>2016-07-27 16:34:19 +0000
committerEd Maste <emaste@FreeBSD.org>2016-07-27 16:34:19 +0000
commitea3dc21b32670fe11a7743b3f3cd81dea9359b58 (patch)
tree14b9ea3c29c135b3b1aa0aff0aae9ceefe8d7b37 /gnu
parent06b418173f6d70c31621926d0d34dcb05bc3ef25 (diff)
downloadsrc-ea3dc21b32670fe11a7743b3f3cd81dea9359b58.tar.gz
src-ea3dc21b32670fe11a7743b3f3cd81dea9359b58.zip
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
Notes
Notes: svn path=/head/; revision=303396
Diffstat (limited to 'gnu')
-rw-r--r--gnu/lib/libgcc/Makefile2
1 files changed, 1 insertions, 1 deletions
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