Module Name: src
Committed By: mgorny
Date: Wed Jan 22 15:10:32 UTC 2020
Modified Files:
src/external/gpl3/gcc.old/lib/libgcc: Makefile.inc
src/external/gpl3/gcc/lib/libgcc: Makefile.inc
src/lib/libexecinfo: Makefile
Removed Files:
src/lib/libexecinfo: unwind.h
Log Message:
Install gcc's unwind.h instead of libexecinfo's
The prototypes in libexecinfo's unwind.h do not match those commonly
used (e.g. by gcc, clang, GNU libunwind, LLVM libunwind...), causing
C++ programs to fail to build on type mismatches (e.g. compiler-rt,
libc++abi). Rather than providing our own header, reuse the one
included in gcc.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/gpl3/gcc.old/lib/libgcc/Makefile.inc
cvs rdiff -u -r1.43 -r1.44 src/external/gpl3/gcc/lib/libgcc/Makefile.inc
cvs rdiff -u -r1.8 -r1.9 src/lib/libexecinfo/Makefile
cvs rdiff -u -r1.5 -r0 src/lib/libexecinfo/unwind.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc.old/lib/libgcc/Makefile.inc
diff -u src/external/gpl3/gcc.old/lib/libgcc/Makefile.inc:1.12 src/external/gpl3/gcc.old/lib/libgcc/Makefile.inc:1.13
--- src/external/gpl3/gcc.old/lib/libgcc/Makefile.inc:1.12 Thu Sep 26 08:03:26 2019
+++ src/external/gpl3/gcc.old/lib/libgcc/Makefile.inc Wed Jan 22 15:10:31 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.12 2019/09/26 08:03:26 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.13 2020/01/22 15:10:31 mgorny Exp $
LIBGCC_MACHINE_ARCH?=${MACHINE_ARCH:S/earmv5/earm/}
GCC_MACHINE_SUBDIR=${MACHINE_CPU:C/powerpc.*/rs6000/:C/x86_64/i386/}
@@ -111,6 +111,10 @@ LIB2_EHASM= ${G_LIB2ADDEH:M*.S:T:Nlibunw
.else
LIB2_EH= ${G_LIB2ADDEH:M*.c:T}
LIB2_EHASM= ${G_LIB2ADDEH:M*.S:T}
+
+INCSDIR= /usr/include
+# originally copied from unwind-*.h
+INCS+= unwind.h
.endif
# We have to weed out any existing func.S file that may exist
Index: src/external/gpl3/gcc/lib/libgcc/Makefile.inc
diff -u src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.43 src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.44
--- src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.43 Sat May 11 02:39:32 2019
+++ src/external/gpl3/gcc/lib/libgcc/Makefile.inc Wed Jan 22 15:10:31 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.43 2019/05/11 02:39:32 christos Exp $
+# $NetBSD: Makefile.inc,v 1.44 2020/01/22 15:10:31 mgorny Exp $
LIBGCC_MACHINE_ARCH?=${MACHINE_ARCH:S/earmv5/earm/}
GCC_MACHINE_SUBDIR=${MACHINE_CPU:C/powerpc.*/rs6000/:C/x86_64/i386/}
@@ -111,6 +111,10 @@ LIB2_EHASM= ${G_LIB2ADDEH:M*.S:T:Nlibunw
.else
LIB2_EH= ${G_LIB2ADDEH:M*.c:T}
LIB2_EHASM= ${G_LIB2ADDEH:M*.S:T}
+
+INCSDIR= /usr/include
+# originally copied from unwind-*.h
+INCS+= unwind.h
.endif
# We have to weed out any existing func.S file that may exist
Index: src/lib/libexecinfo/Makefile
diff -u src/lib/libexecinfo/Makefile:1.8 src/lib/libexecinfo/Makefile:1.9
--- src/lib/libexecinfo/Makefile:1.8 Fri Oct 24 22:42:16 2014
+++ src/lib/libexecinfo/Makefile Wed Jan 22 15:10:32 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2014/10/24 22:42:16 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2020/01/22 15:10:32 mgorny Exp $
.include <bsd.own.mk>
@@ -8,10 +8,6 @@ WARNS?=4
INCSDIR=/usr/include
INCS=execinfo.h
-.if ${HAVE_LIBGCC_EH} == "yes"
-INCS+= unwind.h
-.endif
-
#CPPFLAGS+='-D__RCSID(a)=' -D_GNU_SOURCE '-D__printflike(a,b)='
#CPPFLAGS+=-I/usr/include/libelf
#COPTS+=-std=gnu99
