diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2023-01-23 11:28:21 +0100 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2023-01-27 07:28:16 +0000 |
commit | 70bcf9e8bea1fee9cca44437730324ba7805b633 (patch) | |
tree | d8d97927d773fd753ab569d1f0ace95917d14849 /sal | |
parent | 12a5e9bd92c0969051e035a4f2b7c18f0e3e79b5 (diff) |
Remove support for AIX
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_aix_powerpc is
apparently dead and should thus be removed. However, that was the only bridge
implementation for AIX, which implies that support for the AIX platform as a
whole is dead and should thus be removed.
Change-Id: I96de3f7f97d4fd770ff78256f0ea435383688be9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146057
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sal')
-rw-r--r-- | sal/osl/unx/file_error_transl.cxx | 2 | ||||
-rw-r--r-- | sal/osl/unx/module.cxx | 49 | ||||
-rw-r--r-- | sal/osl/unx/system.hxx | 14 | ||||
-rw-r--r-- | sal/qa/osl/file/osl_File.cxx | 2 |
4 files changed, 1 insertions, 66 deletions
diff --git a/sal/osl/unx/file_error_transl.cxx b/sal/osl/unx/file_error_transl.cxx index ad6e00558a40..539d4ccfc930 100644 --- a/sal/osl/unx/file_error_transl.cxx +++ b/sal/osl/unx/file_error_transl.cxx @@ -140,10 +140,8 @@ oslFileError oslTranslateFileError(int Errno) #endif return osl_File_E_NOSYS; -#if !defined(AIX) || !(defined(_ALL_SOURCE) && !defined(_LINUX_SOURCE_COMPAT)) case ENOTEMPTY: return osl_File_E_NOTEMPTY; -#endif case ELOOP: return osl_File_E_LOOP; diff --git a/sal/osl/unx/module.cxx b/sal/osl/unx/module.cxx index 606c8fa475a1..3eabc6294f83 100644 --- a/sal/osl/unx/module.cxx +++ b/sal/osl/unx/module.cxx @@ -31,57 +31,9 @@ #include "system.hxx" #include "file_url.hxx" -#ifdef AIX -#include <sys/ldr.h> -#endif - static bool getModulePathFromAddress(void * address, rtl_String ** path) { bool result = false; -#if defined(AIX) - int size = 4 * 1024; - char *buf, *filename=NULL; - struct ld_info *lp; - - if ((buf = (char*)malloc(size)) == NULL) - return false; - - //figure out how big a buffer we need - while (loadquery(L_GETINFO, buf, size) == -1 && errno == ENOMEM) - { - size += 4 * 1024; - free(buf); - if ((buf = (char*)malloc(size)) == NULL) - return false; - } - - lp = (struct ld_info*) buf; - while (lp) - { - unsigned long start = (unsigned long)lp->ldinfo_dataorg; - unsigned long end = start + lp->ldinfo_datasize; - if (start <= (unsigned long)address && end > (unsigned long)address) - { - filename = lp->ldinfo_filename; - break; - } - if (!lp->ldinfo_next) - break; - lp = (struct ld_info*) ((char *) lp + lp->ldinfo_next); - } - - if (filename) - { - rtl_string_newFromStr(path, filename); - result = sal_True; - } - else - { - result = sal_False; - } - - free(buf); -#else #if HAVE_UNIX_DLAPI Dl_info dl_info; @@ -95,7 +47,6 @@ static bool getModulePathFromAddress(void * address, rtl_String ** path) (void) address; (void) path; #endif -#endif return result; } diff --git a/sal/osl/unx/system.hxx b/sal/osl/unx/system.hxx index 8b1f1dccced4..02d8b06c3bf5 100644 --- a/sal/osl/unx/system.hxx +++ b/sal/osl/unx/system.hxx @@ -201,19 +201,6 @@ # define IOCHANNEL_TRANSFER_BSD_RENO #endif -#ifdef AIX -# define AF_IPX -1 -# include <strings.h> -# include <pthread.h> -# include <dlfcn.h> -# include <sys/time.h> -# include <sys/un.h> -# include <netinet/tcp.h> -# include <sys/machine.h> -# define SLEEP_TIMESPEC(timespec) nsleep(×pec, 0) -# define LIBPATH "LIBPATH" -#endif - #ifdef __sun # include <shadow.h> # include <sys/un.h> @@ -291,7 +278,6 @@ int macxp_resolveAlias(char *path, int buflen); #if !defined(_WIN32) && \ !defined(LINUX) && !defined(NETBSD) && !defined(FREEBSD) && \ - !defined(AIX) && \ !defined(__sun) && !defined(MACOSX) && \ !defined(OPENBSD) && !defined(DRAGONFLY) && \ !defined(IOS) && !defined(ANDROID) && \ diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx index 718fb65423d1..93199e8bd2fa 100644 --- a/sal/qa/osl/file/osl_File.cxx +++ b/sal/qa/osl/file/osl_File.cxx @@ -4715,7 +4715,7 @@ namespace osl_Directory if (tmp_x.lastIndexOf('/') != (tmp_x.getLength() - 1)) tmp_x += "/"; -#if !defined(_WIN32) && !defined(ANDROID) && !defined(AIX) +#if !defined(_WIN32) && !defined(ANDROID) // FIXME would be nice to create unique dir even on Windows tmp_x += "XXXXXX"; char *out = mkdtemp(const_cast<char*>(tmp_x.getStr())); |