Skip to content

Added 64-bit Haiku support #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
deathwombat wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Added 64-bit Haiku support #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4aae789
Add haiku-amd64 target and fix haiku-x86 target
deathwombat Mar 18, 2026
69cc7db
Add CPU_AMD64 for OS_HAIKU
deathwombat Mar 18, 2026
4f4159b
Spawn threads under 64-bit Haiku
deathwombat Mar 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common/clirun.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1151,7 +1151,7 @@ static struct thread_param_block *__StartThread( unsigned int thread_i,
// Be OS priority should be adjustable from 1 to 10
// 1 is lowest, 10 is higest for non-realtime and non-system tasks
sprintf(thread_name, "%s crunch#%d", utilGetAppName(), thread_i + 1);
thrparams->threadID = spawn_thread((long (*)(void *)) Go_mt,
thrparams->threadID = spawn_thread((thread_func)Go_mt,
thread_name, be_priority, (void *)thrparams );
if ( ((thrparams->threadID) >= B_NO_ERROR) &&
(resume_thread(thrparams->threadID) == B_NO_ERROR) )
Expand Down
6 changes: 4 additions & 2 deletions common/cputypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,8 +484,10 @@
#define CLIENT_OS OS_HAIKU
#if defined(__POWERPC__) || defined(__PPC__)
#define CLIENT_CPU CPU_POWERPC
#elif defined(__INTEL__)
#define CLIENT_CPU CPU_X86
#elif defined(__i386__) || defined(ASM_X86)
#define CLIENT_CPU CPU_X86
#elif defined(ASM_AMD64) || defined(__x86_64__) || defined(__amd64__)
#define CLIENT_CPU CPU_AMD64
#endif
#elif defined(__MORPHOS__)
#define CLIENT_OS_NAME "MorphOS"
Expand Down
38 changes: 25 additions & 13 deletions configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2996,6 +2996,18 @@ case "$1" in
add_sources "dynix" "x86"
;;

*haiku-x86)
TARGET_AS="gcc -c"
TARGET_CC="gcc"
TARGET_NASM="nasm"
generate_gcc_opts "x86" "haiku"
TARGET_CCFLAGS="$OPTS_GCC -fno-pic -O3 -Wno-multichar"
TARGET_LIBS="-lnetwork"
TARGET_TARBALL="haiku-x86"
TARGET_DOCFILES="docs/readme.haiku" #platform specific docfile
add_sources "haiku" "x86"
;;

###### AMD 64

*linux-amd64) # generic. works everywhere
Expand Down Expand Up @@ -3052,6 +3064,19 @@ case "$1" in
add_sources "macosx" "amd64"
;;

*haiku-amd64) # HAVE_OGR must be set to 0
TARGET_AS="gcc -c"
TARGET_CC="gcc"
generate_gcc_opts "amd64" "haiku"
TARGET_NASM="nasm"
TARGET_NASM_FMT="elf64"
TARGET_CCFLAGS="$OPTS_GCC -O3 -Wno-multichar"
TARGET_LIBS="-lnetwork"
TARGET_TARBALL="haiku-amd64"
TARGET_DOCFILES="docs/readme.haiku" #platform specific docfile
add_sources "haiku" "amd64"
;;

###### NeXT (x86, m68k, sparc, hppa)

*next-x86)
Expand Down Expand Up @@ -3257,19 +3282,6 @@ case "$1" in
add_sources "beos" "ppc"
;;

*haiku-x86)
TARGET_AS="gcc -c"
TARGET_CC="gcc"
TARGET_NASM="nasm"
generate_gcc_opts "x86" "haiku"
TARGET_CCFLAGS="$OPTS_GCC -fno-pic -O3 -Wno-multichar"
TARGET_LDFLAGS="-static"
TARGET_LIBS="-lnetwork"
TARGET_TARBALL="haiku-x86"
TARGET_DOCFILES="docs/readme.haiku" #platform specific docfile
add_sources "haiku" "x86"
;;

####### OS/2 (x86, emx)

*os2-x86) # [pfeffi] <pfeffi@distributed.net>
Expand Down