[前][次][番号順一覧][スレッド一覧]

ruby-changes:65621

From: David <ko1@a...>
Date: Mon, 22 Mar 2021 22:51:32 +0900 (JST)
Subject: [ruby-changes:65621] 5e16c3a12a (master): solaris/illumos build fix.

https://git.ruby-lang.org/ruby.git/commit/?id=5e16c3a12a

From 5e16c3a12a7f7869109fd8b72d7f54db347e5fe5 Mon Sep 17 00:00:00 2001
From: David Carlier <devnexen@g...>
Date: Sun, 21 Mar 2021 16:46:46 +0000
Subject: solaris/illumos build fix.

---
 addr2line.c | 2 +-
 cont.c      | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/addr2line.c b/addr2line.c
index a8fb4f2..cf0a379 100644
--- a/addr2line.c
+++ b/addr2line.c
@@ -1463,7 +1463,7 @@ ranges_include(DebugInfoReader *reader, ranges_t *ptr, uint64_t addr) https://github.com/ruby/ruby/blob/trunk/addr2line.c#L1463
                     }
                     break;
                   case DW_RLE_base_address:
-                    base_address = read_dw_form_addr(reader, &p);
+                    base_address = (uintptr_t)read_dw_form_addr(reader, &p);
                     break;
                   case DW_RLE_start_end:
                     read_dw_form_addr(reader, &p);
diff --git a/cont.c b/cont.c
index 4eab72f..7fbca90 100644
--- a/cont.c
+++ b/cont.c
@@ -646,6 +646,8 @@ fiber_pool_stack_free(struct fiber_pool_stack * stack) https://github.com/ruby/ruby/blob/trunk/cont.c#L646
 #if VM_CHECK_MODE > 0 && defined(MADV_DONTNEED)
     // This immediately discards the pages and the memory is reset to zero.
     madvise(base, size, MADV_DONTNEED);
+#elif defined(POSIX_MADV_DONTNEED)
+    posix_madvise(base, size, POSIX_MADV_DONTNEED);
 #elif defined(MADV_FREE_REUSABLE)
     madvise(base, size, MADV_FREE_REUSABLE);
 #elif defined(MADV_FREE)
-- 
cgit v1.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]