Module Name: src
Committed By: ozaki-r
Date: Sat Feb 21 15:00:30 UTC 2015
Modified Files:
src/external/cddl/osnet/dist/lib/libdtrace/common: dt_subr.c
src/external/cddl/osnet/sys/sys: isa_defs.h
Log Message:
Fix dtrace build error with gcc 4.8 on i386 and arm
_ILP32 is required by dt_popc.
The fix is inspired by FreeBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/external/cddl/osnet/dist/lib/libdtrace/common/dt_subr.c
cvs rdiff -u -r1.1 -r1.2 src/external/cddl/osnet/sys/sys/isa_defs.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/cddl/osnet/dist/lib/libdtrace/common/dt_subr.c
diff -u src/external/cddl/osnet/dist/lib/libdtrace/common/dt_subr.c:1.10 src/external/cddl/osnet/dist/lib/libdtrace/common/dt_subr.c:1.11
--- src/external/cddl/osnet/dist/lib/libdtrace/common/dt_subr.c:1.10 Wed Feb 18 03:07:56 2015
+++ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_subr.c Sat Feb 21 15:00:30 2015
@@ -48,6 +48,7 @@
#include <limits.h>
#include <paths.h>
+#include <sys/isa_defs.h>
#include <dt_impl.h>
static const struct {
Index: src/external/cddl/osnet/sys/sys/isa_defs.h
diff -u src/external/cddl/osnet/sys/sys/isa_defs.h:1.1 src/external/cddl/osnet/sys/sys/isa_defs.h:1.2
--- src/external/cddl/osnet/sys/sys/isa_defs.h:1.1 Fri Aug 7 20:57:57 2009
+++ src/external/cddl/osnet/sys/sys/isa_defs.h Sat Feb 21 15:00:30 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_defs.h,v 1.1 2009/08/07 20:57:57 haad Exp $ */
+/* $NetBSD: isa_defs.h,v 1.2 2015/02/21 15:00:30 ozaki-r Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -30,3 +30,22 @@
*/
#include <sys/types.h>
+
+#if defined(__i386__)
+#if !defined(_ILP32)
+#define _ILP32
+#endif
+
+#elif defined(__amd64__)
+#if !defined(_LP64)
+#define _LP64
+#endif
+
+#elif defined(__arm__)
+#if !defined(_ILP32)
+#define _ILP32
+#endif
+
+#else
+#error "architecture not supported"
+#endif
