Author: truckman
Date: Tue Apr 17 16:59:48 2018
New Revision: 1829372
URL: http://svn.apache.org/viewvc?rev=1829372&view=rev
Log:
Fix build with gcc 4.9 by tweaking optimization options for two files.
This is a workaround for:
<https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65009>
Modified:
openoffice/trunk/main/dbaccess/Library_dbui.mk
openoffice/trunk/main/svx/Library_svxcore.mk
Modified: openoffice/trunk/main/dbaccess/Library_dbui.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/dbaccess/Library_dbui.mk?rev=1829372&r1=1829371&r2=1829372&view=diff
==============================================================================
--- openoffice/trunk/main/dbaccess/Library_dbui.mk (original)
+++ openoffice/trunk/main/dbaccess/Library_dbui.mk Tue Apr 17 16:59:48 2018
@@ -286,6 +286,15 @@ $(eval $(call gb_LinkTarget_set_cxx_opti
))
endif
+# g++49 -Os sometimes leaves inline class methods undefined,
+# See: <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65009>
+ifeq ($(COM)$(shell expr $(CCNUMVER) '>=' 000400090000 '&' $(CCNUMVER) '<'
000500000000),GCC1)
+$(eval $(call gb_LinkTarget_set_cxx_optimization, \
+ dbaccess/source/ui/uno/ColumnControl, \
+ $(gb_COMPILEROPTFLAGS) -fno-devirtualize
-fno-devirtualize-speculatively \
+))
+endif
+
$(eval $(call gb_Library_add_noexception_objects,dbui, \
dbaccess/source/shared/dbu_reghelper \
dbaccess/source/shared/dbustrings \
Modified: openoffice/trunk/main/svx/Library_svxcore.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/svx/Library_svxcore.mk?rev=1829372&r1=1829371&r2=1829372&view=diff
==============================================================================
--- openoffice/trunk/main/svx/Library_svxcore.mk (original)
+++ openoffice/trunk/main/svx/Library_svxcore.mk Tue Apr 17 16:59:48 2018
@@ -449,6 +449,15 @@ $(eval $(call gb_LinkTarget_set_cxx_opti
))
endif
+# g++49 -Os sometimes leaves inline class methods undefined,
+# See: <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65009>
+ifeq ($(COM)$(shell expr $(CCNUMVER) '>=' 000400090000 '&' $(CCNUMVER) '<'
000500000000),GCC1)
+$(eval $(call gb_LinkTarget_set_cxx_optimization, \
+ svx/source/fmcomp/fmgridif, \
+ $(gb_COMPILEROPTFLAGS) -fno-devirtualize
-fno-devirtualize-speculatively \
+))
+endif
+
$(eval $(call gb_SdiTarget_SdiTarget,svx/sdi/svxslots,svx/sdi/svx))
$(eval $(call gb_SdiTarget_set_include,svx/sdi/svxslots,\
