Attachment #176085 for bug #213480




#
# static libgcc.a prerequisite for shared libc
#
_prereq_libs= lib/libcompiler_rt
.if ${MK_SSP} != "no"
_prereq_libs+= gnu/lib/libssp/libssp_nonshared
.endif

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

Lines 3-10 Link Here

(-)b/gnu/lib/Makefile (-2 / +4 lines)
3	.include <src.opts.mk>	3	.include <src.opts.mk>
4		4
5	SUBDIR= csu	5	SUBDIR= csu
6	SUBDIR+= libgcc
7
8	SUBDIR.${MK_DIALOG}+= libdialog	6	SUBDIR.${MK_DIALOG}+= libdialog
9	SUBDIR.${MK_GCC}+= libgcov libgomp	7	SUBDIR.${MK_GCC}+= libgcov libgomp
10	SUBDIR.${MK_SSP}+= libssp	8	SUBDIR.${MK_SSP}+= libssp
Lines 19-24 SUBDIR+= libreadline Link Here
19	SUBDIR+= libregex	17	SUBDIR+= libregex
20	.endif	18	.endif
21		19
		20	.if ${MK_LLVM_LIBUNWIND} == "no"
		21	SUBDIR+= libgcc
		22	.endif
		23
22	# libsupc++ uses libstdc++ headers, although 'make includes' should	24	# libsupc++ uses libstdc++ headers, although 'make includes' should
23	# have taken care of that already.	25	# have taken care of that already.
24	.if ${MK_GNUCXX} != "no"	26	.if ${MK_GNUCXX} != "no"




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

	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 1984-1990 libraries: .MAKE .PHONY Link Here

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

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

(-)b/gnu/lib/libgcc/Makefile (-36 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		77
105	.if ${TARGET_CPUARCH} == "arm"	78	.if ${TARGET_CPUARCH} == "arm"
106	LIB2ADDEH = unwind-arm.c libunwind-arm.S pr-support.c unwind-c.c	79	LIB2ADDEH = unwind-arm.c libunwind-arm.S pr-support.c unwind-c.c
Lines 109-116 LIB2ADDEH = unwind-dw2.c unwind-dw2-fde-glibc.c unwind-sjlj.c gthr-gnat.c \ Link Here
109	unwind-c.c	82	unwind-c.c
110	.endif	83	.endif
111		84
112	.endif # MK_LLVM_LIBUNWIND
113
114	LIB2ADDEHSTATIC = $(LIB2ADDEH)	85	LIB2ADDEHSTATIC = $(LIB2ADDEH)
115	LIB2ADDEHSHARED = $(LIB2ADDEH)	86	LIB2ADDEHSHARED = $(LIB2ADDEH)
116		87
Lines 202-215 LIB2_DIVMOD_FUNCS:= ${LIB2_DIVMOD_FUNCS:S/${sym}//g} Link Here
202	.endif	173	.endif
203		174
204	COMMONHDRS= tm.h tconfig.h options.h gthr-default.h	175	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	176	COMMONHDRS+= unwind.h
212	.endif
213		177
214	#-----------------------------------------------------------------------	178	#-----------------------------------------------------------------------
215	#	179	#