104 lines
3.3 KiB
Diff
104 lines
3.3 KiB
Diff
diff -Naur old/configure.ac new/configure.ac
|
|
--- old/configure.ac 2019-11-18 15:58:29.410925910 +0300
|
|
+++ new/configure.ac 2019-11-29 17:53:12.725917502 +0300
|
|
@@ -3628,6 +3628,19 @@
|
|
UNOWINREG_DLL="185d60944ea767075d27247c3162b3bc-unowinreg.dll"
|
|
AC_SUBST(UNOWINREG_DLL)
|
|
|
|
+COM_IS_LCC=
|
|
+AC_MSG_CHECKING([whether the compiler is actually LCC])
|
|
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
|
|
+ #ifndef __LCC__
|
|
+ you lose
|
|
+ #endif
|
|
+ int foo=42;
|
|
+ ]])],
|
|
+ [AC_MSG_RESULT([yes])
|
|
+ COM_IS_LCC=TRUE],
|
|
+ [AC_MSG_RESULT([no])])
|
|
+AC_SUBST(COM_IS_LCC)
|
|
+
|
|
COM_IS_CLANG=
|
|
AC_MSG_CHECKING([whether the compiler is actually Clang])
|
|
AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
|
|
@@ -4450,6 +4463,11 @@
|
|
RTL_ARCH=X86_64
|
|
PLATFORMID=linux_x86_64
|
|
;;
|
|
+ e2k)
|
|
+ CPUNAME=E2K
|
|
+ RTL_ARCH=E2K
|
|
+ PLATFORMID=linux_e2k
|
|
+ ;;
|
|
*)
|
|
AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
|
|
;;
|
|
diff -Naur old/solenv/gbuild/platform/LINUX_E2K_GCC.mk new/solenv/gbuild/platform/LINUX_E2K_GCC.mk
|
|
--- old/solenv/gbuild/platform/LINUX_E2K_GCC.mk 1970-01-01 03:00:00.000000000 +0300
|
|
+++ new/solenv/gbuild/platform/LINUX_E2K_GCC.mk 2019-11-29 14:35:07.178238666 +0300
|
|
@@ -0,0 +1,14 @@
|
|
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
|
|
+#
|
|
+# This file is part of the LibreOffice project.
|
|
+#
|
|
+# This Source Code Form is subject to the terms of the Mozilla Public
|
|
+# License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
+#
|
|
+
|
|
+#please make generic modifications to unxgcc.mk or linux.mk
|
|
+
|
|
+include $(GBUILDDIR)/platform/linux.mk
|
|
+
|
|
+# vim: set noet sw=4:
|
|
--- old/config_host.mk.in 2019-11-18 15:58:29.410925910 +0300
|
|
+++ new/config_host.mk.in 2019-12-02 14:08:43.716103491 +0300
|
|
@@ -78,6 +78,7 @@
|
|
export COMPILER_PLUGINS_DEBUG=@COMPILER_PLUGINS_DEBUG@
|
|
export COMPILER_PLUGINS_TOOLING_ARGS=@COMPILER_PLUGINS_TOOLING_ARGS@
|
|
export COM_IS_CLANG=@COM_IS_CLANG@
|
|
+export COM_IS_LCC=@COM_IS_LCC@
|
|
export CPPUNIT_CFLAGS=$(gb_SPACE)@CPPUNIT_CFLAGS@
|
|
export CPPUNIT_LIBS=$(gb_SPACE)@CPPUNIT_LIBS@
|
|
export CPUNAME=@CPUNAME@
|
|
--- old/solenv/gbuild/platform/com_GCC_defs.mk 2019-11-18 15:58:29.122919982 +0300
|
|
+++ new/solenv/gbuild/platform/com_GCC_defs.mk 2019-12-02 14:30:17.440320623 +0300
|
|
@@ -63,7 +63,6 @@
|
|
-Wundef \
|
|
-Wunreachable-code \
|
|
$(if $(and $(COM_IS_CLANG),$(or $(findstring icecc,$(CC)),$(findstring icecc,$(CCACHE_PREFIX)))),,-Wunused-macros) \
|
|
- -finput-charset=UTF-8 \
|
|
-fmessage-length=0 \
|
|
-fno-common \
|
|
-pipe \
|
|
@@ -77,11 +76,18 @@
|
|
-Wundef \
|
|
-Wunreachable-code \
|
|
$(if $(and $(COM_IS_CLANG),$(or $(findstring icecc,$(CC)),$(findstring icecc,$(CCACHE_PREFIX)))),,-Wunused-macros) \
|
|
- -finput-charset=UTF-8 \
|
|
-fmessage-length=0 \
|
|
-fno-common \
|
|
-pipe \
|
|
|
|
+ifeq ($(COM_IS_LCC), TRUE)
|
|
+gb_CFLAGS_COMMON += -finput-charset=utf-8
|
|
+gb_CXXFLAGS_COMMON += -finput-charset=utf-8
|
|
+else
|
|
+gb_CFLAGS_COMMON += -finput-charset=UTF-8
|
|
+gb_CXXFLAGS_COMMON += -finput-charset=UTF-8
|
|
+endif
|
|
+
|
|
gb_Helper_disable_warnings = $(1) -w
|
|
|
|
ifeq ($(HAVE_BROKEN_GCC_WMAYBE_UNINITIALIZED),TRUE)
|
|
@@ -105,6 +111,9 @@
|
|
|
|
ifeq ($(COM_IS_CLANG),TRUE)
|
|
gb_CXXFLAGS_COMMON += -Wimplicit-fallthrough
|
|
+else ifeq ($(COM_IS_LCC), TRUE)
|
|
+gb_CFLAGS_COMMON += -Wlogical-op
|
|
+gb_CXXFLAGS_COMMON += -Wlogical-op
|
|
else
|
|
gb_CFLAGS_COMMON += \
|
|
-Wduplicated-cond \
|