diff options
| author | Michael Stahl <Michael.Stahl@cib.de> | 2018-06-22 10:44:02 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-06-27 06:42:43 +0200 |
| commit | 4ffc53ee9aac5c5db31ef959c13ddaa00a2c3a5d (patch) | |
| tree | e039d9c7f5be9c7da3cbc1d675fc0166afd2b300 /external | |
| parent | 68cf249043de1417a8e1ccea29b3c9c2895d512f (diff) | |
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.
(cherry picked from commit 1c7921c43960a4a6717c816d646cf0f65fbaec12)
Reviewed-on: https://gerrit.libreoffice.org/56292
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit dce6401f7e1f466c30996ad606699479713209e5)
poppler: fix incorrect GCC_VERSION check
The minor version is encoded into the last 2 digits, the micro version
is not avialable.
Reviewed-on: https://gerrit.libreoffice.org/56380
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Jenkins
Change-Id: I1d97d2df9049e058d49987424cc8e4818a9fa9c6
Reviewed-on: https://gerrit.libreoffice.org/56298
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Jenkins
(cherry picked from commit 08f77bc1c6650ee7b2dd9d7825bbc1cf08d4761b)
Diffstat (limited to 'external')
| -rw-r--r-- | external/poppler/StaticLibrary_poppler.mk | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/external/poppler/StaticLibrary_poppler.mk b/external/poppler/StaticLibrary_poppler.mk index 84873d9c7c2a..f145b7ae9c39 100644 --- a/external/poppler/StaticLibrary_poppler.mk +++ b/external/poppler/StaticLibrary_poppler.mk @@ -33,6 +33,22 @@ $(eval $(call gb_StaticLibrary_add_cxxflags,poppler,\ )) endif +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58864 +# can't easily check for 4.8.2 exactly so just apply to GCC 4.8.x +ifeq ($(COM),GCC) +ifeq ($(COM_IS_CLANG),) +ifeq ($(CPUNAME),INTEL) +ifeq ($(shell expr '$(GCC_VERSION)' '<' 409),1) +ifeq ($(shell expr '$(GCC_VERSION)' '>=' 408),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,\ |