Attachment #175751 for bug #213480




#
# static libgcc.a prerequisite for shared libc
#
_prereq_libs= gnu/lib/libssp/libssp_nonshared lib/libcompiler_rt

# These dependencies are not automatically generated:
#

#
_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

_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} \




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

	unwind-c.c
.endif

.endif # MK_LLVM_LIBUNWIND

LIB2ADDEHSTATIC = $(LIB2ADDEH)
LIB2ADDEHSHARED = $(LIB2ADDEH)


.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

#-----------------------------------------------------------------------
#

Lines 160-165 _libcplusplus= libc++ Link Here

(-)b/lib/Makefile (+2 lines)
160		160
161	SUBDIR.${MK_EFI}+= libefivar	161	SUBDIR.${MK_EFI}+= libefivar
162	SUBDIR.${MK_LIBTHR}+= libthr	162	SUBDIR.${MK_LIBTHR}+= libthr
		163	SUBDIR.${MK_LLVM_LIBUNWIND}+= libgcc_eh
		164	SUBDIR.${MK_LLVM_LIBUNWIND}+= libgcc_s
163	SUBDIR.${MK_NAND}+= libnandfs	165	SUBDIR.${MK_NAND}+= libnandfs
164	SUBDIR.${MK_NETGRAPH}+= libnetgraph	166	SUBDIR.${MK_NETGRAPH}+= libnetgraph
165	SUBDIR.${MK_NIS}+= libypclnt	167	SUBDIR.${MK_NIS}+= libypclnt

Return to bug 213480

Lines 1983-1989 libraries: .MAKE .PHONY Link Here

(-)b/Makefile.inc1 (-2 / +17 lines)
1983	#	1983	#
1984	# static libgcc.a prerequisite for shared libc	1984	# static libgcc.a prerequisite for shared libc
1985	#	1985	#
1986	_prereq_libs= gnu/lib/libssp/libssp_nonshared gnu/lib/libgcc lib/libcompiler_rt	1986	_prereq_libs= gnu/lib/libssp/libssp_nonshared lib/libcompiler_rt
1987		1987
1988	# These dependencies are not automatically generated:	1988	# These dependencies are not automatically generated:
1989	#	1989	#
Lines 1992-1998 _prereq_libs= gnu/lib/libssp/libssp_nonshared gnu/lib/libgcc lib/libcompiler_rt Link Here
1992	#	1992	#
1993	_startup_libs= gnu/lib/csu	1993	_startup_libs= gnu/lib/csu
1994	_startup_libs+= lib/csu	1994	_startup_libs+= lib/csu
1995	_startup_libs+= gnu/lib/libgcc
1996	_startup_libs+= lib/libcompiler_rt	1995	_startup_libs+= lib/libcompiler_rt
1997	_startup_libs+= lib/libc	1996	_startup_libs+= lib/libc
1998	_startup_libs+= lib/libc_nonshared	1997	_startup_libs+= lib/libc_nonshared
Lines 2000-2010 _startup_libs+= lib/libc_nonshared Link Here
2000	_startup_libs+= lib/libcxxrt	1999	_startup_libs+= lib/libcxxrt
2001	.endif	2000	.endif
2002		2001
		2002	.if ${MK_LLVM_LIBUNWIND} != "no"
		2003	_prereq_libs+= lib/libgcc_eh lib/libgcc_s
		2004	_startup_libs+= lib/libgcc_eh lib/libgcc_s
		2005
		2006	lib/libgcc_s__L: lib/libc__L
		2007	lib/libgcc_s__L: lib/libc_nonshared__L
		2008	.if ${MK_LIBCPLUSPLUS} != "no"
		2009	lib/libcxxrt__L: lib/libgcc_s__L
		2010	.endif
		2011
		2012	.else # MK_LLVM_LIBUNWIND == no
		2013
		2014	_prereq_libs+= gnu/lib/libgcc
		2015	_startup_libs+= gnu/lib/libgcc
		2016
2003	gnu/lib/libgcc__L: lib/libc__L	2017	gnu/lib/libgcc__L: lib/libc__L
2004	gnu/lib/libgcc__L: lib/libc_nonshared__L	2018	gnu/lib/libgcc__L: lib/libc_nonshared__L
2005	.if ${MK_LIBCPLUSPLUS} != "no"	2019	.if ${MK_LIBCPLUSPLUS} != "no"
2006	lib/libcxxrt__L: gnu/lib/libgcc__L	2020	lib/libcxxrt__L: gnu/lib/libgcc__L
2007	.endif	2021	.endif
		2022	.endif
2008		2023
2009	_prebuild_libs= ${_kerberos5_lib_libasn1} \	2024	_prebuild_libs= ${_kerberos5_lib_libasn1} \
2010	${_kerberos5_lib_libhdb} \	2025	${_kerberos5_lib_libhdb} \

Lines 74-107 LIB2FUNCS+= _floatdi${mode} _floatundi${mode} Link Here

(-)b/gnu/lib/libgcc/Makefile (-37 lines)
74	LIB2ADD = $(LIB2FUNCS_EXTRA)	74	LIB2ADD = $(LIB2FUNCS_EXTRA)
75	LIB2ADD_ST = $(LIB2FUNCS_STATIC_EXTRA)	75	LIB2ADD_ST = $(LIB2FUNCS_STATIC_EXTRA)
76		76
77	# Additional sources to handle exceptions; overridden by targets as needed.
78	.if ${MK_LLVM_LIBUNWIND} != "no"
79
80	.PATH: ${COMPILERRTDIR}/lib/builtins
81	.PATH: ${UNWINDSRCDIR}
82	LIB2ADDEH = gcc_personality_v0.c \
83	int_util.c \
84	Unwind-EHABI.cpp \
85	Unwind-sjlj.c \
86	UnwindLevel1-gcc-ext.c \
87	UnwindLevel1.c \
88	UnwindRegistersRestore.S \
89	UnwindRegistersSave.S \
90	libunwind.cpp
91
92	CFLAGS+= -I${UNWINDINCDIR} -I${.CURDIR} -D_LIBUNWIND_IS_NATIVE_ONLY
93	.if empty(CXXFLAGS:M-std=*)
94	CXXFLAGS+= -std=c++11
95	.endif
96	CXXFLAGS+= -fno-rtti
97	STATIC_CXXFLAGS+= -fvisibility=hidden -fPIC
98	.if ${MK_DIRDEPS_BUILD} == "yes"
99	# Avoid dependency on lib/libc++
100	CFLAGS+= -I${SRCTOP}/contrib/libc++/include
101	.endif
102
103	.else # MK_LLVM_LIBUNWIND
104
105	.if ${TARGET_CPUARCH} == "arm"	77	.if ${TARGET_CPUARCH} == "arm"
106	LIB2ADDEH = unwind-arm.c libunwind-arm.S pr-support.c unwind-c.c	78	LIB2ADDEH = unwind-arm.c libunwind-arm.S pr-support.c unwind-c.c
107	.else	79	.else
Lines 109-116 LIB2ADDEH = unwind-dw2.c unwind-dw2-fde-glibc.c unwind-sjlj.c gthr-gnat.c \ Link Here
109	unwind-c.c	81	unwind-c.c
110	.endif	82	.endif
111		83
112	.endif # MK_LLVM_LIBUNWIND
113
114	LIB2ADDEHSTATIC = $(LIB2ADDEH)	84	LIB2ADDEHSTATIC = $(LIB2ADDEH)
115	LIB2ADDEHSHARED = $(LIB2ADDEH)	85	LIB2ADDEHSHARED = $(LIB2ADDEH)
116		86
Lines 202-215 LIB2_DIVMOD_FUNCS:= ${LIB2_DIVMOD_FUNCS:S/${sym}//g} Link Here
202	.endif	172	.endif
203		173
204	COMMONHDRS= tm.h tconfig.h options.h gthr-default.h	174	COMMONHDRS= tm.h tconfig.h options.h gthr-default.h
205	.if ${MK_LLVM_LIBUNWIND} != "no"
206	# unwind.h is a generated file when MK_LLVM_LIBUNWIND == "no", and a stale
207	# copy may be left behind in OBJDIR when switching, so remove it explicitly.
208	beforebuild:
209	@rm -f ${.OBJDIR}/unwind.h
210	.else
211	COMMONHDRS+= unwind.h	175	COMMONHDRS+= unwind.h
212	.endif
213		176
214	#-----------------------------------------------------------------------	177	#-----------------------------------------------------------------------
215	#	178	#