Haiku support patches (#989)

* Haiku: fix broken gcc strong stack protector

* qemu: Backport minor Haiku fix

We need to push this fix upstream to qemu. If we don't
get it upstreamed, i'll circle back and patch it if
Unicorn updates its qemu version.

Backports commit c7be4a2160e15089563f207752fb346a38db18ec from unicorn
This commit is contained in:
Alex von Gluck IV 2018-09-03 07:55:43 -04:00 committed by Lioncash
parent b4bb7edfe8
commit 80b94a546f
No known key found for this signature in database
GPG Key ID: 4E3C3CC1031BA9C7
2 changed files with 13 additions and 0 deletions

View File

@ -139,6 +139,15 @@ UNICORN_CFLAGS := $(UNICORN_CFLAGS:-fPIC=)
$(LIBNAME)_LDFLAGS += -Wl,--output-def,unicorn.def
DO_WINDOWS_EXPORT = 1
# Haiku
else ifneq ($(filter Haiku%,$(UNAME_S)),)
EXT = so
VERSION_EXT = $(EXT).$(API_MAJOR)
AR_EXT = a
$(LIBNAME)_LDFLAGS += -Wl,-Bsymbolic-functions,-soname,lib$(LIBNAME).$(VERSION_EXT)
UNICORN_CFLAGS := $(UNICORN_CFLAGS:-fPIC=)
UNICORN_QEMU_FLAGS += --disable-stack-protector
# Linux, Darwin
else
EXT = so

View File

@ -51,7 +51,11 @@
#include <sys/mman.h>
#include <libgen.h>
#include <setjmp.h>
#ifdef __HAIKU__
#include <posix/signal.h>
#else
#include <sys/signal.h>
#endif
#include "qemu/cutils.h"
#ifdef CONFIG_LINUX