From bc58245abf9c31a6ffa2e590d4a349d36156b057 Mon Sep 17 00:00:00 2001
From: Wilson Snyder <wsnyder@wsnyder.org>
Date: Sat, 14 May 2016 17:56:04 -0400
Subject: [PATCH] Fix core dump on Arch Linux/GCC 6.1.1, bug1058.

---
 Changes      | 2 ++
 configure.ac | 1 +
 2 files changed, 3 insertions(+)

diff --git a/Changes b/Changes
index 4424d2aae..f6bd6a0ee 100644
--- a/Changes
+++ b/Changes
@@ -19,6 +19,8 @@ indicates the contributor was also the author of the fix; Thanks!
 
 ****  Fix removal of empty packages, modules and cells, bug1034. [Johan Bjork]
 
+****  Fix core dump on Arch Linux/GCC 6.1.1, bug1058. [Jannis Harder]
+
 
 * Verilator 3.882 2016-03-01
 
diff --git a/configure.ac b/configure.ac
index c611a0e0e..1feb4d04c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -132,6 +132,7 @@ _MY_CXX_CHECK_OPT(CFG_CXXFLAGS_SRC,-Wno-unused-parameter)
 _MY_CXX_CHECK_OPT(CFG_CXXFLAGS_SRC,-Wno-char-subscripts)
 _MY_CXX_CHECK_OPT(CFG_CXXFLAGS_SRC,-Wno-undefined-bool-conversion)
 _MY_CXX_CHECK_OPT(CFG_CXXFLAGS_SRC,-Qunused-arguments)
+_MY_CXX_CHECK_OPT(CFG_CXXFLAGS_SRC,-fno-delete-null-pointer-checks)
 AC_SUBST(CFG_CXXFLAGS_SRC)
 
 # Flags for compiling Verilator parser