Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Skip assembler helpers when using HAVE_LIBGCC_EH=no. Always use the

Browse Source 
generic unwind.h version in that case, even on ARM.
This commit is contained in:
joerg 2014-05-15 14:37:08 +00:00
parent a4468fde96
commit 9af9cc70aa
4 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
external/gpl3/gcc/lib/libgcc/Makefile.inc vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.inc,v 1.26 2014/05/03 16:43:10 martin Exp $
# $NetBSD: Makefile.inc,v 1.27 2014/05/15 14:37:08 joerg Exp $
LIBGCC_MACHINE_ARCH?=${MACHINE_ARCH:S/earmv5/earm/}
@ -92,11 +92,13 @@ LIB2FUNCS= ${LIB2FUNCS_SHORT:=.c}
LIB2FUNCS_ST= ${G_LIB2FUNCS_ST:=.c}
LIB2DIVMOD= ${LIB2_DIVMOD_FUNCS:=.c}
.if ${HAVE_LIBGCC_EH} == "no"
LIB2_EH= ${G_LIB2ADDEH:M*.c:T:Nunwind-dw2.c:Nunwind-dw2-fde-dip.c:Nunwind-sjlj.c:Nunwind-c.c}
LIB2_EH= ${G_LIB2ADDEH:M*.c:T:Nunwind-dw2.c:Nunwind-dw2-fde-dip.c:Nunwind-sjlj.c:Nunwind-c.c:Nunwind-arm.c:Npr-support.c}
LIB2_EHASM= ${G_LIB2ADDEH:M*.S:T:Nlibunwind.S}
G_CONFIGLINKS:= ${G_CONFIGLINKS:S,libgcc/config/arm/unwind-arm.h,libgcc/unwind-generic.h,}
.else
LIB2_EH= ${G_LIB2ADDEH:M*.c:T}
.endif
LIB2_EHASM= ${G_LIB2ADDEH:M*.S:T}
.endif
# We have to weed out any existing func.S file that may exist
# from the list of files we create.

6
external/gpl3/gcc/lib/libobjc/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.11 2014/03/14 12:17:53 christos Exp $
# $NetBSD: Makefile,v 1.12 2014/05/15 14:37:08 joerg Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@ -76,6 +76,10 @@ ${OBJS} ${POBJS} ${SOBJS}: runtime-info.h
${SRCS}: tconfig.h options.h
.if ${HAVE_LIBGCC_EH} == "no"
G_CONFIGLINKS:= ${G_CONFIGLINKS:S,libgcc/config/arm/unwind-arm.h,libgcc/unwind-generic.h,}
.endif
.if ${MKGCC} != "no"
.if defined(G_CONFIGLINKS) && !empty(G_CONFIGLINKS)
BUILDSYMLINKS+= ${G_CONFIGLINKS}

6
external/gpl3/gcc/lib/libstdc++-v3/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.9 2014/03/01 10:00:45 mrg Exp $
# $NetBSD: Makefile,v 1.10 2014/05/15 14:37:08 joerg Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@ -110,6 +110,10 @@ BUILDSYMLINKS+= \
${DIST}/libiberty/cp-demangle.c cp-demangle.c \
${DIST}/libiberty/cp-demangle.h cp-demangle.h
.if ${HAVE_LIBGCC_EH} == "no"
G_CONFIGLINKS:= ${G_CONFIGLINKS:S,libgcc/config/arm/unwind-arm.h,libgcc/unwind-generic.h,}
.endif
.if ${MKGCC} != "no"
.if defined(G_CONFIGLINKS) && !empty(G_CONFIGLINKS)
BUILDSYMLINKS+= ${G_CONFIGLINKS}

6
external/gpl3/gcc/lib/libsupc++/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.7 2014/03/01 10:00:48 mrg Exp $
# $NetBSD: Makefile,v 1.8 2014/05/15 14:37:08 joerg Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@ -27,6 +27,10 @@ CXXFLAGS+= ${G_SECTION_FLAGS}
COPTS.cp-demangle.c = -Wno-stack-protector
.if ${HAVE_LIBGCC_EH} == "no"
G_CONFIGLINKS:= ${G_CONFIGLINKS:S,libgcc/config/arm/unwind-arm.h,libgcc/unwind-generic.h,}
.endif
.if ${MKGCC} != "no"
.if defined(G_CONFIGLINKS) && !empty(G_CONFIGLINKS)
BUILDSYMLINKS+= ${G_CONFIGLINKS}