archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'PHP-8.0'

Browse source 
* PHP-8.0:
  opcache: more reliable way to get the current binary on solaris/illumos
This commit is contained in:
Nikita Popov 2021-05-06 14:34:28 +02:00
commit 9ff8d362b3
2 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
ext/opcache/jit/zend_elf.c
View file

@ -64,8 +64,7 @@ void zend_elf_load_symbols(void)
} }
int fd = open(path, O_RDONLY); int fd = open(path, O_RDONLY);
#elif defined(__sun) #elif defined(__sun)
const char *path = getexecname(); int fd = open("/proc/self/path/a.out", O_RDONLY);
int fd = open(path, O_RDONLY);
#elif defined(__HAIKU__) #elif defined(__HAIKU__)
char path[PATH_MAX]; char path[PATH_MAX];
if (find_path(B_APP_IMAGE_SYMBOL, B_FIND_PATH_IMAGE_PATH, if (find_path(B_APP_IMAGE_SYMBOL, B_FIND_PATH_IMAGE_PATH,

3
ext/opcache/jit/zend_jit_perf_dump.c
View file

@ -136,8 +136,7 @@ static void zend_jit_perf_jitdump_open(void)
} }
fd = open(path, O_RDONLY); fd = open(path, O_RDONLY);
#elif defined(__sun) #elif defined(__sun)
const char *path = getexecname(); fd = open("/proc/self/path/a.out", O_RDONLY);
fd = open(path, O_RDONLY);
#elif defined(__HAIKU__) #elif defined(__HAIKU__)
char path[PATH_MAX]; char path[PATH_MAX];
if (find_path(B_APP_IMAGE_SYMBOL, B_FIND_PATH_IMAGE_PATH, if (find_path(B_APP_IMAGE_SYMBOL, B_FIND_PATH_IMAGE_PATH,