diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2016-11-04 19:35:49 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2016-11-04 19:35:49 +0000 |
| commit | c7fbd7722d7c6640bee5fbf8af3a0b1343eefd8b (patch) | |
| tree | 18e0c1a254a1a8847f1ddc0342dcaa00d669e420 /Makefile.inc1 | |
| parent | 73e62e8c5c62e4067714aabb36a6dcbda0f25d91 (diff) | |
| download | src-test2-c7fbd7722d7c6640bee5fbf8af3a0b1343eefd8b.tar.gz src-test2-c7fbd7722d7c6640bee5fbf8af3a0b1343eefd8b.zip | |
Connect new LLVM-based libgcc_eh & libgcc_s to the build
Compiler-rt and LLVM's libunwind provide a suitable replacement for
libgcc.a, libgcc_eh.a, and libgcc_s.so.
Remove the now-unused LLVM_LIBUNWIND block from gnu/lib/libgcc.
PR: 213480 [exp-run]
Reviewed by: brooks, ed
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D8189
Notes
Notes:
svn path=/head/; revision=308308
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 2b00ff1422b8..eaa3d3fcbdf3 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2001,7 +2001,7 @@ libraries: .MAKE .PHONY # # static libgcc.a prerequisite for shared libc # -_prereq_libs= gnu/lib/libgcc lib/libcompiler_rt +_prereq_libs= lib/libcompiler_rt .if ${MK_SSP} != "no" _prereq_libs+= gnu/lib/libssp/libssp_nonshared .endif @@ -2013,7 +2013,6 @@ _prereq_libs+= gnu/lib/libssp/libssp_nonshared # _startup_libs= gnu/lib/csu _startup_libs+= lib/csu -_startup_libs+= gnu/lib/libgcc _startup_libs+= lib/libcompiler_rt _startup_libs+= lib/libc _startup_libs+= lib/libc_nonshared @@ -2021,11 +2020,27 @@ _startup_libs+= lib/libc_nonshared _startup_libs+= lib/libcxxrt .endif +.if ${MK_LLVM_LIBUNWIND} != "no" +_prereq_libs+= lib/libgcc_eh lib/libgcc_s +_startup_libs+= lib/libgcc_eh lib/libgcc_s + +lib/libgcc_s__L: lib/libc__L +lib/libgcc_s__L: lib/libc_nonshared__L +.if ${MK_LIBCPLUSPLUS} != "no" +lib/libcxxrt__L: lib/libgcc_s__L +.endif + +.else # MK_LLVM_LIBUNWIND == no + +_prereq_libs+= gnu/lib/libgcc +_startup_libs+= gnu/lib/libgcc + gnu/lib/libgcc__L: lib/libc__L gnu/lib/libgcc__L: lib/libc_nonshared__L .if ${MK_LIBCPLUSPLUS} != "no" lib/libcxxrt__L: gnu/lib/libgcc__L .endif +.endif _prebuild_libs= ${_kerberos5_lib_libasn1} \ ${_kerberos5_lib_libhdb} \ |