Skip to content

Add build support for Haiku #1007

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
kenmays wants to merge 9 commits into
base: main
Choose a base branch
from
+23 −19
Open

Add build support for Haiku #1007

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7182432
Fix formatting in NV_DEV_PRINTF for register info
kenmays Jan 19, 2026
2b7f9e5
Update CFLAGS for riscv64 architecture
kenmays Jan 19, 2026
d9fb31e
haiku: fix riscv64 build
kenmays Jan 19, 2026
ab9bb31
haiku: Makefile adjustments
kenmays Jan 19, 2026
eb3c703
haiku: Makefile adjustments
kenmays Jan 19, 2026
aec3311
haiku: Add support for Haiku
kenmays Jan 19, 2026
a5e8fb8
haiku: Add support for Haiku
kenmays Jan 19, 2026
7ed28f2
haiku: Add support for Haiku
kenmays Jan 19, 2026
295f8b1
haiku: Add support for Haiku
kenmays Jan 19, 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 src/common/inc/nvBldVer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
#define NV_PUBLIC_BRANCH r591_47
#endif

#if defined(NV_LINUX) || defined(NV_BSD) || defined(NV_SUNOS)
#if defined(NV_LINUX) || defined(NV_BSD) || defined(NV_SUNOS) || defined(NV_HAIKU)
#define NV_BUILD_BRANCH_VERSION "rel/gpu_drv/r590/r591_47-174"
#define NV_BUILD_CHANGELIST_NUM (37007394)
#define NV_BUILD_TYPE "Official"
Expand Down
2 changes: 1 addition & 1 deletion src/common/inc/nvUnixVersion.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef __NV_UNIX_VERSION_H__
#define __NV_UNIX_VERSION_H__

#if defined(NV_LINUX) || defined(NV_BSD) || defined(NV_SUNOS) || defined(NV_VMWARE) || defined(NV_QNX) || defined(NV_INTEGRITY) || \
#if defined(NV_LINUX) || defined(NV_BSD) || defined(NV_SUNOS) || defined(NV_VMWARE) || defined(NV_QNX) || defined(NV_INTEGRITY) || defined(NV_HAIKU) || \
(defined(RMCFG_FEATURE_PLATFORM_GSP) && RMCFG_FEATURE_PLATFORM_GSP == 1) || \
defined(NV_DCECORE)

Expand Down
2 changes: 1 addition & 1 deletion src/common/inc/nvVer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#define NV_COPYRIGHT_YEAR "2025"
#define NV_COPYRIGHT "(C) " NV_COPYRIGHT_YEAR " NVIDIA Corporation. All rights reserved." // Please do not use the non-ascii copyright symbol for (C).

#if defined(NV_LINUX) || defined(NV_BSD) || defined(NV_SUNOS) || defined(NV_VMWARE) || defined(NV_QNX) || defined(NV_INTEGRITY) || \
#if defined(NV_LINUX) || defined(NV_BSD) || defined(NV_SUNOS) || defined(NV_VMWARE) || defined(NV_QNX) || defined(NV_INTEGRITY) || defined(NV_HAIKU) || \
(defined(RMCFG_FEATURE_PLATFORM_GSP) && RMCFG_FEATURE_PLATFORM_GSP == 1) || \
defined(NV_DCECORE)

Expand Down
6 changes: 5 additions & 1 deletion src/common/sdk/nvidia/inc/cpuopsys.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,12 @@
# define NV_BSD
#endif /* defined(__FreeBSD__) */

#if defined(__HAIKU__)
# define NV_HAIKU
#endif /* defined(__HAIKU__) */

/* XXXar don't define NV_UNIX on MacOSX or vxworks or QNX */
#if (defined(__unix__) || defined(__unix) || defined(__INTEGRITY) ) && !defined(nvmacosx) && !defined(vxworks) && !defined(NV_UNIX) && !defined(__QNX__) && !defined(__QNXNTO__)/* XXX until removed from Makefiles */
#if (defined(__unix__) || defined(__unix) || defined(__INTEGRITY) || defined(NV_HAIKU) ) && !defined(nvmacosx) && !defined(vxworks) && !defined(NV_UNIX) && !defined(__QNX__) && !defined(__QNXNTO__)/* XXX until removed from Makefiles */
# define NV_UNIX
#endif /* defined(__unix__) */

Expand Down
12 changes: 6 additions & 6 deletions src/nvidia-modeset/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ CFLAGS += -O2
ifeq ($(TARGET_ARCH),x86_64)
CFLAGS += -msoft-float
CFLAGS += -mno-red-zone
CFLAGS += -mcmodel=kernel
# CFLAGS += -mcmodel=kernel
CFLAGS += -mno-mmx
CFLAGS += -mno-sse
CFLAGS += -mno-sse2
Expand All @@ -104,15 +104,15 @@ ifeq ($(TARGET_ARCH),aarch64)
endif

ifeq ($(TARGET_ARCH),riscv64)
CFLAGS += -march=rv64imac_zicsr_zifencei
CFLAGS += -march=rv64gc
CFLAGS += -mabi=lp64
CFLAGS += -mcmodel=medany
CFLAGS += -mno-relax
endif

CFLAGS += -fno-pic
CFLAGS += -fpic
CFLAGS += -fno-common
CFLAGS += -fomit-frame-pointer
CFLAGS += -fno-omit-frame-pointer
CFLAGS += -fno-strict-aliasing
CFLAGS += -ffunction-sections
CFLAGS += -fdata-sections
Expand Down Expand Up @@ -153,8 +153,8 @@ ifeq ($(TARGET_ARCH),x86_64)
CONDITIONAL_CFLAGS += $(call TEST_CC_ARG, -fcf-protection=branch)
endif
CONDITIONAL_CFLAGS += $(call TEST_CC_ARG, -fno-jump-tables)
CONDITIONAL_CFLAGS += $(call TEST_CC_ARG, -mindirect-branch=thunk-extern)
CONDITIONAL_CFLAGS += $(call TEST_CC_ARG, -mindirect-branch-register)
# CONDITIONAL_CFLAGS += $(call TEST_CC_ARG, -mindirect-branch=thunk-extern)
# CONDITIONAL_CFLAGS += $(call TEST_CC_ARG, -mindirect-branch-register)
endif

CFLAGS += $(CONDITIONAL_CFLAGS)
Expand Down
16 changes: 8 additions & 8 deletions src/nvidia/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ CFLAGS += -fno-stack-protector
ifeq ($(TARGET_ARCH),x86_64)
CFLAGS += -msoft-float
CFLAGS += -mno-red-zone
CFLAGS += -mcmodel=kernel
# CFLAGS += -mcmodel=kernel
CFLAGS += -mno-mmx
CFLAGS += -mno-sse
CFLAGS += -mno-sse2
Expand All @@ -96,13 +96,13 @@ ifeq ($(TARGET_ARCH),aarch64)
endif

ifeq ($(TARGET_ARCH),riscv64)
CFLAGS += -march=rv64imac_zicsr_zifencei
CFLAGS += -march=rv64gc
CFLAGS += -mabi=lp64
CFLAGS += -mcmodel=medany
CFLAGS += -mno-relax
endif

CFLAGS += -fno-pic
CFLAGS += -fpic

CFLAGS += -D_LANGUAGE_C
CFLAGS += -D__NO_CTYPE
Expand Down Expand Up @@ -138,9 +138,9 @@ CFLAGS += -DNV_PRINTF_STRINGS_ALLOWED=1
CFLAGS += -DNV_ASSERT_FAILED_USES_STRINGS=1
CFLAGS += -DPORT_ASSERT_FAILED_USES_STRINGS=1

ifeq ($(DEBUG),1)
CFLAGS += -gsplit-dwarf
endif
#ifeq ($(DEBUG),1)
# CFLAGS += -gsplit-dwarf
#endif

# Define how to perform dead code elimination: place each symbol in its own
# section at compile time, and garbage collect unreachable sections at link
Expand Down Expand Up @@ -183,8 +183,8 @@ ifeq ($(TARGET_ARCH),x86_64)
CONDITIONAL_CFLAGS += $(call TEST_CC_ARG, -fcf-protection=branch)
endif
CONDITIONAL_CFLAGS += $(call TEST_CC_ARG, -fno-jump-tables)
CONDITIONAL_CFLAGS += $(call TEST_CC_ARG, -mindirect-branch-register)
CONDITIONAL_CFLAGS += $(call TEST_CC_ARG, -mindirect-branch=thunk-extern)
# CONDITIONAL_CFLAGS += $(call TEST_CC_ARG, -mindirect-branch-register)
# CONDITIONAL_CFLAGS += $(call TEST_CC_ARG, -mindirect-branch=thunk-extern)
endif

CFLAGS += $(CONDITIONAL_CFLAGS)
Expand Down
2 changes: 1 addition & 1 deletion src/nvidia/arch/nvalloc/unix/src/osinit.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1498,7 +1498,7 @@ RmSetupRegisters(
NV_DEV_PRINTF(NV_DBG_SETUP, nv, "RmSetupRegisters for 0x%x:0x%x\n",
nv->pci_info.vendor_id, nv->pci_info.device_id);
NV_DEV_PRINTF(NV_DBG_SETUP, nv, "pci config info:\n");
NV_DEV_PRINTF(NV_DBG_SETUP, nv, " registers look like: 0x%" NvU64_fmtx " 0x%" NvU64_fmtx,
NV_DEV_PRINTF(NV_DBG_SETUP, nv, " registers look like: 0x%" NvU64_fmtx " 0x%" NvU64_fmtx "\n",
nv->regs->cpu_address, nv->regs->size);

if (nv->fb != NULL)
Expand Down