This is an automated email from the ASF dual-hosted git repository.
jim pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new 26c8159 some macOS changes: o ensure current assembly of
privateSnippetExecutor o BigSur note o Use vars to make it easier to change
overall options o Java8 compatibility
26c8159 is described below
commit 26c81592e2a56d5b50bbc60282d6c2b633d2d1cb
Author: Jim Jagielski <[email protected]>
AuthorDate: Tue Feb 9 14:36:31 2021 -0500
some macOS changes:
o ensure current assembly of privateSnippetExecutor
o BigSur note
o Use vars to make it easier to change overall options
o Java8 compatibility
(cherry picked from commit 3187fb04a7844dcbfa332c4129f6e43deb893699)
---
main/bridges/source/cpp_uno/s5abi_macosx_x86-64/cpp2uno.cxx | 3 +++
main/configure.ac | 1 +
main/odk/settings/settings.mk | 9 +++++----
main/scripting/java/build.xml | 2 +-
4 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/cpp2uno.cxx
b/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/cpp2uno.cxx
index d7fd5b2..5dcd114 100644
--- a/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/cpp2uno.cxx
+++ b/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/cpp2uno.cxx
@@ -395,6 +395,9 @@ extern "C" typelib_TypeClass cpp_vtable_call(
extern "C" void privateSnippetExecutor( void )
{
asm volatile (
+ " .text\n"
+ " .align 2\n"
+ ".globl privateSnippetExecutor\n"
" subq $160, %rsp\n"
" movq %r10, -152(%rbp)\n" // Save
(nVtableOffset << 32) + nFunctionIndex
diff --git a/main/configure.ac b/main/configure.ac
index a4483d4..5a87d6e 100644
--- a/main/configure.ac
+++ b/main/configure.ac
@@ -1163,6 +1163,7 @@ case "$build_os" in
fi
# Don't use OSVERSION until we know no conflicts result from it
_darwin_version="`uname -r | $AWK -F . '{ print $1 }'`"
+ # FIXME: Assumes 10.x, breaks w/ Big Sur
_osx_version="10.`expr $_darwin_version - 4`"
AC_MSG_NOTICE([Detected Darwin version: $_darwin_version
($_osx_version)])
;;
diff --git a/main/odk/settings/settings.mk b/main/odk/settings/settings.mk
index 24d6723..8fd4aea 100644
--- a/main/odk/settings/settings.mk
+++ b/main/odk/settings/settings.mk
@@ -397,14 +397,15 @@ endif
JAVABIN=Commands
GCC_ARCH_OPTION=-arch x86_64
+CLANG_CXX_VERSIONING=-std=c++11 -stdlib=libc++
OS=MACOSX
PS=/
ICL=\$$
-CC=`xcrun -f clang` -arch x86_64
-CXX=`xcrun -f clang++` -arch x86_64 -std=c++11 -stdlib=libc++
-LINK=`xcrun -f clang++` -arch x86_64 -std=c++11 -stdlib=libc++
-LIB=`xcrun -f clang++` -arch x86_64 -std=c++11 -stdlib=libc++
+CC=`xcrun -f clang` $(GCC_ARCH_OPTION)
+CXX=`xcrun -f clang++` $(GCC_ARCH_OPTION) $(CLANG_CXX_VERSIONING)
+LINK=`xcrun -f clang++` $(GCC_ARCH_OPTION) $(CLANG_CXX_VERSIONING)
+LIB=`xcrun -f clang++` $(GCC_ARCH_OPTION) $(CLANG_CXX_VERSIONING)
INSTALLTOOL=`xcrun -f install_name_tool`
ECHO=@echo
diff --git a/main/scripting/java/build.xml b/main/scripting/java/build.xml
index fe907ff..db526af 100644
--- a/main/scripting/java/build.xml
+++ b/main/scripting/java/build.xml
@@ -90,7 +90,7 @@
<and>
<os family="mac"/>
<os family="unix"/>
- <contains string="${java.version}" substring="1.7" casesensitive="false"
/>
+ <contains string="${java.version}" substring="1.8" casesensitive="false"
/>
<contains string="${java.vendor}" substring="Oracle"
casesensitive="false" />
</and>
</condition>
