diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2023-01-23 11:47:08 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2023-01-27 07:29:14 +0000 |
| commit | 8ef01413f6522fe47494b3c1d46d633f1d34e297 (patch) | |
| tree | d48dd183f16eba7ef5e7bc908388e2e139bf17e0 /desktop | |
| parent | c5224a49fde004e36454da459c7d91a6905c1110 (diff) | |
Remove support for 32-bit S390
As discussed in the mailing list thread starting at
<https://lists.freedesktop.org/archives/libreoffice/2023-January/089808.html>
"Plan to remove dead C++ UNO bridge implementations (bridges/source/cpp_uno/*)",
the bridge implementation at bridges/source/cpp_uno/gcc3_linux_s390 is
apparently dead and should thus be removed. However, that was the only bridge
implementation for 32-bit S390, which implies that support for the 32-bit S390
architecture as a whole is dead and should thus be removed.
Change-Id: I18b3b4fa11df4ce693107bad6bbea2fab1c19f26
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146058
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/deployment/misc/dp_platform.cxx | 2 | ||||
| -rw-r--r-- | desktop/test/deployment/update/platform/linux_s390.oxt | bin | 705 -> 0 bytes | |||
| -rw-r--r-- | desktop/test/deployment/update/platform/readme.txt | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/desktop/source/deployment/misc/dp_platform.cxx b/desktop/source/deployment/misc/dp_platform.cxx index 1f83bed37756..d42cfe436b90 100644 --- a/desktop/source/deployment/misc/dp_platform.cxx +++ b/desktop/source/deployment/misc/dp_platform.cxx @@ -115,8 +115,6 @@ namespace ret = checkOSandCPU(u"Linux", u"IA64"); else if (token == u"linux_m68k") ret = checkOSandCPU(u"Linux", u"M68K"); - else if (token == u"linux_s390") - ret = checkOSandCPU(u"Linux", u"S390"); else if (token == u"linux_s390x") ret = checkOSandCPU(u"Linux", u"S390x"); else if (token == u"linux_hppa") diff --git a/desktop/test/deployment/update/platform/linux_s390.oxt b/desktop/test/deployment/update/platform/linux_s390.oxt Binary files differdeleted file mode 100644 index 199702ebf056..000000000000 --- a/desktop/test/deployment/update/platform/linux_s390.oxt +++ /dev/null diff --git a/desktop/test/deployment/update/platform/readme.txt b/desktop/test/deployment/update/platform/readme.txt index 30c028f9931d..222895ad73c9 100644 --- a/desktop/test/deployment/update/platform/readme.txt +++ b/desktop/test/deployment/update/platform/readme.txt @@ -12,7 +12,6 @@ linux_mips_el.oxt: linux_mips_el linux_mips64_el.oxt: linux_mips64_el linux_powerpc64.oxt: linux_powerpc64 linux_powerpc.oxt: linux_powerpc -linux_s390.oxt: linux_s390 linux_s390x.oxt: linux_s390x linux_sparc.oxt: linux_sparc linux_x86.oxt: linux_x86 |