Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 30 Oct 2016 02:57:47 +0000 (UTC)
From:      Ed Maste <emaste@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r308100 - head/lib/libgcc_eh
Message-ID:  <201610300257.u9U2vlK7011913@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: emaste
Date: Sun Oct 30 02:57:47 2016
New Revision: 308100
URL: https://svnweb.freebsd.org/changeset/base/308100

Log:
  compile libunwind c source with -fexceptions
  
  When an exception is thrown the unwinder must unwind its own C source
  (starting with _Unwind_RaiseException in UnwindLevel1.c), so it needs to
  be built with unwinding data.

Modified:
  head/lib/libgcc_eh/Makefile.inc

Modified: head/lib/libgcc_eh/Makefile.inc
==============================================================================
--- head/lib/libgcc_eh/Makefile.inc	Sat Oct 29 23:25:12 2016	(r308099)
+++ head/lib/libgcc_eh/Makefile.inc	Sun Oct 30 02:57:47 2016	(r308100)
@@ -8,15 +8,20 @@ STATIC_CFLAGS+=${PICFLAG} -fvisibility=h
 
 .PATH: ${COMPILERRTDIR}/lib/builtins
 .PATH: ${UNWINDSRCDIR}
-SRCS+=	gcc_personality_v0.c
-SRCS+=	int_util.c
-SRCS+=	Unwind-EHABI.cpp
-SRCS+=	Unwind-sjlj.c
-SRCS+=	UnwindLevel1-gcc-ext.c
-SRCS+=	UnwindLevel1.c
-SRCS+=	UnwindRegistersRestore.S
-SRCS+=	UnwindRegistersSave.S
-SRCS+=	libunwind.cpp
+SRCS_EXC+=	gcc_personality_v0.c
+SRCS_EXC+=	int_util.c
+SRCS_EXC+=	Unwind-EHABI.cpp
+SRCS_EXC+=	Unwind-sjlj.c
+SRCS_EXC+=	UnwindLevel1-gcc-ext.c
+SRCS_EXC+=	UnwindLevel1.c
+SRCS_EXC+=	UnwindRegistersRestore.S
+SRCS_EXC+=	UnwindRegistersSave.S
+SRCS_EXC+=	libunwind.cpp
+
+SRCS+=		${SRCS_EXC}
+.for file in ${SRCS_EXC:M*.c}
+CFLAGS.${file}+=	-fexceptions
+.endfor
 
 CFLAGS+=	-I${UNWINDINCDIR} -I${.CURDIR} -D_LIBUNWIND_IS_NATIVE_ONLY
 .if empty(CXXFLAGS:M-std=*)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610300257.u9U2vlK7011913>