From ff7aea6735af50c922eb1b6333c6e62f1bb29ca8 Mon Sep 17 00:00:00 2001 From: kettenis Date: Thu, 6 Apr 2017 09:28:29 +0000 Subject: [PATCH] Compile C code with -funwind-tables. Fixes exception handling on architectures that don't generate .eh_frame info by default such as arm64. ok jsg@ --- lib/libcxxabi/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/libcxxabi/Makefile b/lib/libcxxabi/Makefile index 5ca9386d611..d86f649e1ca 100644 --- a/lib/libcxxabi/Makefile +++ b/lib/libcxxabi/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2017/02/16 02:08:42 jsg Exp $ +# $OpenBSD: Makefile,v 1.7 2017/04/06 09:28:29 kettenis Exp $ .include @@ -42,6 +42,7 @@ SRCS+= abort_message.cpp\ CPPFLAGS+= -I${SHDRDIR} -I${HDRDIR} -I${UHDRDIR} CPPFLAGS+= -D_LIBUNWIND_IS_NATIVE_ONLY +CFLAGS+= -nostdlib -funwind-tables CXXFLAGS+= -nostdlib -nostdinc++ -funwind-tables .if empty(CXXFLAGS:M-std=*) CXXFLAGS+= -std=c++11 -- 2.20.1