diff options
| author | emaste <emaste@FreeBSD.org> | 2016-08-01 20:02:59 +0000 |
|---|---|---|
| committer | emaste <emaste@FreeBSD.org> | 2016-08-01 20:02:59 +0000 |
| commit | 90b3984103ff1c319b79d9ebbb2aa74163cf0625 (patch) | |
| tree | 6994ede26060aa371c13b2dedc5965c8e4c68223 /gnu | |
| parent | a99c449f2ed07be07e948200139fdc82b523e77b (diff) | |
| download | FreeBSD-src-90b3984103ff1c319b79d9ebbb2aa74163cf0625.zip FreeBSD-src-90b3984103ff1c319b79d9ebbb2aa74163cf0625.tar.gz | |
MFC r303396: 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.
Approved by: re (kib)
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/lib/libgcc/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gnu/lib/libgcc/Makefile b/gnu/lib/libgcc/Makefile index 272caf7..a47bd33 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 |
