Skip to content

Commit 3841ea3

Browse files
devnexennikic
authored andcommitted
DragonFlyBSD build update for opcache JIT part.
Closes GH-6339.
1 parent 5572318 commit 3841ea3

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

ext/opcache/jit/zend_elf.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
#include <sys/types.h>
2121
#include <sys/stat.h>
22-
#if defined(__FreeBSD__)
22+
#if defined(__FreeBSD__) || defined(__DragonFly__)
2323
#include <sys/sysctl.h>
2424
#elif defined(__HAIKU__)
2525
#include <FindDirectory.h>
@@ -55,7 +55,7 @@ void zend_elf_load_symbols(void)
5555
int fd = open("/proc/self/exe", O_RDONLY);
5656
#elif defined(__NetBSD__)
5757
int fd = open("/proc/curproc/exe", O_RDONLY);
58-
#elif defined(__FreeBSD__)
58+
#elif defined(__FreeBSD__) || defined(__DragonFly__)
5959
char path[PATH_MAX];
6060
size_t pathlen = sizeof(path);
6161
int mib[4] = {CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1};

ext/opcache/jit/zend_jit_perf_dump.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@
3232
# include <sys/sysctl.h>
3333
#elif defined(__NetBSD__)
3434
# include <lwp.h>
35+
#elif defined(__DragonFly__)
36+
# include <sys/lwp.h>
37+
# include <sys/sysctl.h>
3538
#elif defined(__sun)
3639
// avoiding thread.h inclusion as it conflicts with vtunes types.
3740
extern unsigned int thr_self(void);
@@ -124,7 +127,7 @@ static void zend_jit_perf_jitdump_open(void)
124127
fd = open("/proc/self/exe", O_RDONLY);
125128
#elif defined(__NetBSD__)
126129
fd = open("/proc/curproc/exe", O_RDONLY);
127-
#elif defined(__FreeBSD__)
130+
#elif defined(__FreeBSD__) || defined(__DragonFly__)
128131
char path[PATH_MAX];
129132
size_t pathlen = sizeof(path);
130133
int mib[4] = {CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1};
@@ -226,6 +229,8 @@ static void zend_jit_perf_jitdump_register(const char *name, void *start, size_t
226229
thread_id = getthrid();
227230
#elif defined(__NetBSD__)
228231
thread_id = _lwp_self();
232+
#elif defined(__DragonFly__)
233+
thread_id = lwp_gettid();
229234
#elif defined(__sun)
230235
thread_id = thr_self();
231236
#endif

0 commit comments

Comments
 (0)