[libreoffice] 01/02: backport -mlong-jump-table-offsets usage in xmloff for m68k

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-5.3
in repository libreoffice.

commit b9e020ef055a84f163f480f0e1339de58ed34482
Author: Rene Engelhard <rene at debian.org>
Date:   Wed Jan 11 23:42:47 2017 +0100

    backport -mlong-jump-table-offsets usage in xmloff for m68k
---
 changelog                                      |  2 ++
 patches/m68k-use-mlong-jump-table-offsets.diff | 39 ++++++++++++++++++++++++++
 patches/series                                 |  1 +
 3 files changed, 42 insertions(+)

diff --git a/changelog b/changelog
index ec337ab..63b93e1 100644
--- a/changelog
+++ b/changelog
@@ -3,6 +3,8 @@ libreoffice (1:5.3.0~rc2~git20161229-1) UNRELEASED; urgency=medium
   * New upstream snapshot
 
   * debian/patches/change-from-glew-to-epoxy.diff: update
+  * debian/patches/m68k-use-mlong-jump-table-offsets.diff: add;
+    as name says
 
  -- Rene Engelhard <rene at debian.org>  Thu, 29 Dec 2016 15:21:41 +0100
 
diff --git a/patches/m68k-use-mlong-jump-table-offsets.diff b/patches/m68k-use-mlong-jump-table-offsets.diff
new file mode 100644
index 0000000..eea53cd
--- /dev/null
+++ b/patches/m68k-use-mlong-jump-table-offsets.diff
@@ -0,0 +1,39 @@
+diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk
+index 2feb3cf95c69..d8cf94879670 100644
+--- a/xmloff/Library_xo.mk
++++ b/xmloff/Library_xo.mk
+@@ -368,4 +368,10 @@ $(eval $(call gb_Library_add_exception_objects,xo,\
+     xmloff/source/xforms/xformsimport \
+ ))
+ 
++ifeq ($(CPUNAME),M68K)
++$(eval $(call gb_Library_add_cxxflags,xo,\
++    -mlong-jump-table-offsets \
++))
++endif
++
+ # vim: set noet sw=4 ts=4:
+diff --git a/configure.ac b/configure.ac
+index 079e856..58d1672 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3792,6 +3792,19 @@ if test "$GCC" = "yes"; then
+     else
+         AC_MSG_RESULT([no])
+     fi
++
++    if test "$host_cpu" = "m68k"; then
++        AC_MSG_CHECKING([whether $CC supports -mlong-jump-table-offsets])
++        save_CFLAGS=$CFLAGS
++        CFLAGS="$CFLAGS -Werror -mlong-jump-table-offsets"
++        AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])],[ HAVE_GCC_LONG_JUMP_TABLE_OFFSETS=TRUE ],[])
++        CFLAGS=$save_CFLAGS
++        if test "$HAVE_GCC_LONG_JUMP_TABLE_OFFSETS" = "TRUE"; then
++            AC_MSG_RESULT([yes])
++        else
++            AC_MSG_ERROR([no])
++        fi
++    fi
+ fi
+ AC_SUBST(HAVE_GCC_GGDB2)
+ AC_SUBST(HAVE_GCC_FINLINE_LIMIT)
diff --git a/patches/series b/patches/series
index fa0452f..15eb4aa 100644
--- a/patches/series
+++ b/patches/series
@@ -33,3 +33,4 @@ no-openssl.diff
 m68k-alignment.diff
 change-from-glew-to-epoxy.diff
 gtk3-opengl-slideshow.diff
+m68k-use-mlong-jump-table-offsets.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git