merge revision(s) 739f929:

NetBSD build update. (#4079)

	---
	 addr2line.c | 8 ++++++--
	 1 file changed, 6 insertions(+), 2 deletions(-)
This commit is contained in:
NARUSE, Yui 2021-02-02 22:10:02 +09:00
parent 6673b60f3d
commit 852c112a3f
2 changed files with 7 additions and 3 deletions

View file

@ -2101,11 +2101,15 @@ fail:
* and returns strlen(binary_filename). * and returns strlen(binary_filename).
* it is NUL terminated. * it is NUL terminated.
*/ */
#if defined(__linux__) #if defined(__linux__) || defined(__NetBSD__)
static ssize_t static ssize_t
main_exe_path(void) main_exe_path(void)
{ {
# define PROC_SELF_EXE "/proc/self/exe" # if defined(__linux__)
# define PROC_SELF_EXE "/proc/self/exe"
# elif defined(__NetBSD__)
# define PROC_SELF_EXE "/proc/curproc/exe"
# endif
ssize_t len = readlink(PROC_SELF_EXE, binary_filename, PATH_MAX); ssize_t len = readlink(PROC_SELF_EXE, binary_filename, PATH_MAX);
if (len < 0) return 0; if (len < 0) return 0;
binary_filename[len] = 0; binary_filename[len] = 0;

View file

@ -12,7 +12,7 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 0 #define RUBY_VERSION_TEENY 0
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
#define RUBY_PATCHLEVEL 32 #define RUBY_PATCHLEVEL 33
#define RUBY_RELEASE_YEAR 2021 #define RUBY_RELEASE_YEAR 2021
#define RUBY_RELEASE_MONTH 2 #define RUBY_RELEASE_MONTH 2