From 1c7921c43960a4a6717c816d646cf0f65fbaec12 Mon Sep 17 00:00:00 2001
From: Michael Stahl <Michael.Stahl@cib.de>
Date: Fri, 22 Jun 2018 10:44:02 +0200
Subject: poppler: try to work around GCC 4.8.2 bug

As seen on Linux-rpm_deb-x86@71-TDF:

poppler/Annot.cc:2491:1: internal compiler error: in connect_traces, at dwarf2cfi.c:2676

The bug report claims that -march=i586 works around the bug.

Change-Id: I1d97d2df9049e058d49987424cc8e4818a9fa9c6
---
 external/poppler/StaticLibrary_poppler.mk | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'external')

diff --git a/external/poppler/StaticLibrary_poppler.mk b/external/poppler/StaticLibrary_poppler.mk
index 84873d9c7c2a..08bc66eeadbd 100644
--- a/external/poppler/StaticLibrary_poppler.mk
+++ b/external/poppler/StaticLibrary_poppler.mk
@@ -33,6 +33,21 @@ $(eval $(call gb_StaticLibrary_add_cxxflags,poppler,\
 ))
 endif
 
+# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58864
+ifeq ($(COM),GCC)
+ifeq ($(COM_IS_CLANG),)
+ifeq ($(CPUNAME),INTEL)
+ifeq ($(shell expr '$(GCC_VERSION)' '<' 483),1)
+ifeq ($(shell expr '$(GCC_VERSION)' '>=' 480),1)
+$(eval $(call gb_StaticLibrary_add_cxxflags,poppler,\
+	-march=i586 \
+))
+endif
+endif
+endif
+endif
+endif
+
 $(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,poppler,cc))
 
 $(eval $(call gb_StaticLibrary_add_generated_exception_objects,poppler,\
-- 
cgit