blob: 43130b56dea83cf849575f2421fbd1e19075dfdd (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
|
From 8ef989f82b29655e8d4532f14d5aa12a2999d850 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Draszik?= <andre.draszik@jci.com>
Date: Fri, 2 Mar 2018 13:58:07 +0000
Subject: [PATCH 10/10] jdk: disable backtrace() (musl build fix)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
musl doesn't implement / provide backtrace() and friends or
the corresponding header files. This is all glibc specific.
Use appropriate #ifdef to disable their use on musl and thus
to fix the build on musl.
Upstream-Status: Pending
Signed-off-by: André Draszik <andre.draszik@jci.com>
---
jdk/src/solaris/native/sun/xawt/XToolkit.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/jdk/src/solaris/native/sun/xawt/XToolkit.c b/jdk/src/solaris/native/sun/xawt/XToolkit.c
index 71d41f37..d3dc47cb 100644
--- a/jdk/src/solaris/native/sun/xawt/XToolkit.c
+++ b/jdk/src/solaris/native/sun/xawt/XToolkit.c
@@ -27,7 +27,7 @@
#include <X11/Xutil.h>
#include <X11/Xos.h>
#include <X11/Xatom.h>
-#ifdef __linux__
+#if defined(__linux__) && defined(__GLIBC__)
#include <execinfo.h>
#endif
@@ -799,7 +799,7 @@ JNIEXPORT jstring JNICALL Java_sun_awt_X11_XToolkit_getEnv
return ret;
}
-#ifdef __linux__
+#if defined(__linux__) && defined(__GLIBC__)
void print_stack(void)
{
void *array[10];
--
2.16.2
|
