mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Remove: last remnants of SunOS (#11210) 

We have no evidence SunOS has been tried in the last few years,
and the code is awkward enough to just remove.
pull/11214/head
Patric Stout 2023-08-19 00:52:58 +02:00 committed by GitHub
parent 53af20910b
commit cd10ddf9ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/os/unix/crashlog_unix.cpp
View File

@ -19,9 +19,6 @@
#if defined(__GLIBC__)
/* Execinfo (and thus making stacktraces) is a GNU extension */
# include <execinfo.h>
#elif defined(SUNOS)
# include <ucontext.h>
# include <dlfcn.h>
#endif
#if defined(__NetBSD__)
@ -70,38 +67,6 @@ class CrashLogUnix : public CrashLog {
);
}
#if defined(SUNOS)
/** Data needed while walking up the stack */
struct StackWalkerParams {
std::back_insert_iterator<std::string> *output_iterator; ///< Buffer
int counter; ///< We are at counter-th stack level
};
/**
* Callback used while walking up the stack.
* @param pc program counter
* @param sig 'active' signal (unused)
* @param params parameters
* @return always 0, continue walking up the stack
*/
static int SunOSStackWalker(uintptr_t pc, int sig, void *params)
{
StackWalkerParams *wp = (StackWalkerParams *)params;
/* Resolve program counter to file and nearest symbol (if possible) */
Dl_info dli;
if (dladdr((void *)pc, &dli) != 0) {
fmt::format_to(*wp->output_iterator, " [{:02}] {}({}+0x{:x}) [0x{:x}]\n",
wp->counter, dli.dli_fname, dli.dli_sname, (int)((byte *)pc - (byte *)dli.dli_saddr), (uint)pc);
} else {
fmt::format_to(*wp->output_iterator, " [{:02}] [0x{:x}]\n", wp->counter, (uint)pc);
}
wp->counter++;
return 0;
}
#endif
void LogStacktrace(std::back_insert_iterator<std::string> &output_iterator) const override
{
fmt::format_to(output_iterator, "Stacktrace:\n");
@ -114,15 +79,6 @@ class CrashLogUnix : public CrashLog {
fmt::format_to(output_iterator, " [{:02}] {}\n", i, messages[i]);
}
free(messages);
#elif defined(SUNOS)
ucontext_t uc;
if (getcontext(&uc) != 0) {
fmt::format_to(output_iterator, " getcontext() failed\n\n");
return buffer;
}
StackWalkerParams wp = { &output_iterator, 0 };
walkcontext(&uc, &CrashLogUnix::SunOSStackWalker, &wp);
#else
fmt::format_to(output_iterator, " Not supported.\n");
#endif

10
src/stdafx.h
View File

@ -42,14 +42,8 @@
* does not have stdint.h.
* For OSX the inclusion is already done in osx_stdafx.h. */
#if !defined(__APPLE__) && (!defined(_MSC_VER) || _MSC_VER >= 1600)
# if defined(SUNOS)
/* SunOS/Solaris does not have stdint.h, but inttypes.h defines everything
* stdint.h defines and we need. */
# include <inttypes.h>
# else
# define __STDC_LIMIT_MACROS
# include <stdint.h>
# endif
# define __STDC_LIMIT_MACROS
# include <stdint.h>
#endif
#include <algorithm>