Attachment 175751 Details for Bug 213480 – Connect new libgcc_eh and libgcc_s to the build

[patch] Connect new libgcc_eh and libgcc_s to the build

D8189.diff (text/plain), 3.82 KB, created by Ed Maste on 2016-10-14 16:01:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ed Maste

Created: 2016-10-14 16:01:34 UTC

Size: 3.82 KB

patch

obsolete

>commit 408f6e9d95157984e9b3a89a26fc8afaf64999ac
>Author: Ed Maste <emaste@freebsd.org>
>Date:   Mon Sep 26 14:48:49 2016 -0400
>
>    Connect new libgcc_eh and libgcc_s to the build
>    
>    Remove LLVM_LIBUNWIND block from gnu/lib/libgcc
>    
>    https://reviews.freebsd.org/D8189
>
>diff --git a/Makefile.inc1 b/Makefile.inc1
>index 9c47c71..5936130 100644
>--- a/Makefile.inc1
>+++ b/Makefile.inc1
>@@ -1983,7 +1983,7 @@ libraries: .MAKE .PHONY
> #
> # static libgcc.a prerequisite for shared libc
> #
>-_prereq_libs= gnu/lib/libssp/libssp_nonshared gnu/lib/libgcc lib/libcompiler_rt
>+_prereq_libs= gnu/lib/libssp/libssp_nonshared lib/libcompiler_rt
> 
> # These dependencies are not automatically generated:
> #
>@@ -1992,7 +1992,6 @@ _prereq_libs= gnu/lib/libssp/libssp_nonshared gnu/lib/libgcc lib/libcompiler_rt
> #
> _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
>@@ -2000,11 +1999,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} \
>diff --git a/gnu/lib/libgcc/Makefile b/gnu/lib/libgcc/Makefile
>index b101b4f..0012a93 100644
>--- a/gnu/lib/libgcc/Makefile
>+++ b/gnu/lib/libgcc/Makefile
>@@ -74,34 +74,6 @@ LIB2FUNCS+= _floatdi${mode} _floatundi${mode}
> LIB2ADD = $(LIB2FUNCS_EXTRA)
> LIB2ADD_ST = $(LIB2FUNCS_STATIC_EXTRA)
> 
>-# Additional sources to handle exceptions; overridden by targets as needed.
>-.if ${MK_LLVM_LIBUNWIND} != "no"
>-
>-.PATH: ${COMPILERRTDIR}/lib/builtins
>-.PATH: ${UNWINDSRCDIR}
>-LIB2ADDEH = gcc_personality_v0.c \
>-	int_util.c \
>-	Unwind-EHABI.cpp \
>-	Unwind-sjlj.c \
>-	UnwindLevel1-gcc-ext.c \
>-	UnwindLevel1.c \
>-	UnwindRegistersRestore.S \
>-	UnwindRegistersSave.S \
>-	libunwind.cpp
>-
>-CFLAGS+=	-I${UNWINDINCDIR} -I${.CURDIR} -D_LIBUNWIND_IS_NATIVE_ONLY
>-.if empty(CXXFLAGS:M-std=*)
>-CXXFLAGS+=	-std=c++11
>-.endif
>-CXXFLAGS+=	-fno-rtti
>-STATIC_CXXFLAGS+= -fvisibility=hidden -fPIC
>-.if ${MK_DIRDEPS_BUILD} == "yes"
>-# Avoid dependency on lib/libc++
>-CFLAGS+=	-I${SRCTOP}/contrib/libc++/include
>-.endif
>-
>-.else # MK_LLVM_LIBUNWIND
>-
> .if ${TARGET_CPUARCH} == "arm"
> LIB2ADDEH =	unwind-arm.c libunwind-arm.S pr-support.c unwind-c.c
> .else
>@@ -109,8 +81,6 @@ LIB2ADDEH = unwind-dw2.c unwind-dw2-fde-glibc.c unwind-sjlj.c gthr-gnat.c \
> 	unwind-c.c
> .endif
> 
>-.endif # MK_LLVM_LIBUNWIND
>-
> LIB2ADDEHSTATIC = $(LIB2ADDEH)
> LIB2ADDEHSHARED = $(LIB2ADDEH)
> 
>@@ -202,14 +172,7 @@ LIB2_DIVMOD_FUNCS:= ${LIB2_DIVMOD_FUNCS:S/${sym}//g}
> .endif
> 
> COMMONHDRS=	tm.h tconfig.h options.h gthr-default.h
>-.if ${MK_LLVM_LIBUNWIND} != "no"
>-# unwind.h is a generated file when MK_LLVM_LIBUNWIND == "no", and a stale
>-# copy may be left behind in OBJDIR when switching, so remove it explicitly.
>-beforebuild:
>-	@rm -f ${.OBJDIR}/unwind.h
>-.else
> COMMONHDRS+=	unwind.h
>-.endif
> 
> #-----------------------------------------------------------------------
> #
>diff --git a/lib/Makefile b/lib/Makefile
>index 1f8a9b7..693f561 100644
>--- a/lib/Makefile
>+++ b/lib/Makefile
>@@ -160,6 +160,8 @@ _libcplusplus=	libc++
> 
> SUBDIR.${MK_EFI}+=	libefivar
> SUBDIR.${MK_LIBTHR}+=	libthr
>+SUBDIR.${MK_LLVM_LIBUNWIND}+=	libgcc_eh
>+SUBDIR.${MK_LLVM_LIBUNWIND}+=	libgcc_s
> SUBDIR.${MK_NAND}+=	libnandfs
> SUBDIR.${MK_NETGRAPH}+=	libnetgraph
> SUBDIR.${MK_NIS}+=	libypclnt

Actions: View | Diff

Attachments on bug 213480: 175751 | 176085