Add ability to use clang with GNU toolchain on Haiku#127392

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

Merged
jkoritzinsky merged 13 commits into from
Apr 25, 2026
Merged

Add ability to use clang with GNU toolchain on Haiku #127392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
39dd9dd
Add ability to use clang with GNU toolchain on Haiku
am11 Apr 24, 2026
a17a93d
Cleanups
am11 Apr 24, 2026
ae17673
Update configureplatform.cmake
am11 Apr 24, 2026
c8fe8e3
Update pal_environment.c
am11 Apr 24, 2026
cddb405
Update pal_mount.c
am11 Apr 24, 2026
a1b4527
Update pal_networking.c
am11 Apr 24, 2026
8ec028b
Update pal_process.c
am11 Apr 24, 2026
865bfb5
Update pal_evp_pkey.c
am11 Apr 24, 2026
8c928d1
Merge branch 'main' into patch-53
am11 Apr 24, 2026
c1312bf
Update pal_evp_pkey.c
am11 Apr 24, 2026
0d3664b
Keep gcc working
am11 Apr 25, 2026
9610702
Update pal_evp_pkey.c
am11 Apr 25, 2026
d71b4e6
Update gcenv.unix.cpp
am11 Apr 25, 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
12 changes: 9 additions & 3 deletions eng/common/cross/toolchain.cmake
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -225,13 +225,19 @@ elseif(ILLUMOS)
locate_toolchain_exec(g++ CMAKE_CXX_COMPILER)
elseif(HAIKU)
set(CMAKE_SYSROOT "${CROSS_ROOTFS}")
set(CMAKE_PROGRAM_PATH "${CMAKE_PROGRAM_PATH};${CROSS_ROOTFS}/cross-tools-x86_64/bin")
set(CMAKE_SYSTEM_PREFIX_PATH "${CROSS_ROOTFS}")
set(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES} -lssp")
set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lssp")

locate_toolchain_exec(gcc CMAKE_C_COMPILER)
locate_toolchain_exec(g++ CMAKE_CXX_COMPILER)
if ($ENV{CCC_CC} MATCHES ".*gcc.*")
set(CMAKE_PROGRAM_PATH "${CMAKE_PROGRAM_PATH};${CROSS_ROOTFS}/cross-tools-x86_64/bin")
locate_toolchain_exec(gcc CMAKE_C_COMPILER)
locate_toolchain_exec(g++ CMAKE_CXX_COMPILER)
else()
set(CMAKE_C_COMPILER_EXTERNAL_TOOLCHAIN "${CROSS_ROOTFS}/cross-tools-x86_64")
set(CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN "${CROSS_ROOTFS}/cross-tools-x86_64")
set(CMAKE_ASM_COMPILER_EXTERNAL_TOOLCHAIN "${CROSS_ROOTFS}/cross-tools-x86_64")
endif()

# let CMake set up the correct search paths
include(Platform/Haiku)
Expand Down
6 changes: 5 additions & 1 deletion eng/native/configureplatform.cmake
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -494,7 +494,11 @@ if(NOT CLR_CMAKE_TARGET_BROWSER AND NOT CLR_CMAKE_TARGET_WASI)
# The default linker on Solaris also does not support PIE.
if(NOT CLR_CMAKE_TARGET_ANDROID AND NOT CLR_CMAKE_TARGET_SUNOS AND NOT CLR_CMAKE_TARGET_APPLE AND NOT MSVC)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie")
add_compile_options($<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:-fPIE>)
if(CLR_CMAKE_TARGET_HAIKU)
add_compile_options($<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:-fPIC>)
else()
add_compile_options($<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:-fPIE>)
endif()
add_compile_options($<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,SHARED_LIBRARY>:-fPIC>)
endif()

Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/gc/unix/gcenv.unix.cpp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -208,7 +208,7 @@ bool GCToOSInterface::Initialize()

#else // HAVE_SCHED_GETAFFINITY

for (size_t i = 0; i < configuredCpuCount; i++)
for (int i = 0; i < configuredCpuCount; i++)
{
g_processAffinitySet.Add(i);
}
Expand Down
4 changes: 2 additions & 2 deletions src/native/libs/System.Native/pal_environment.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,8 +25,8 @@ char** SystemNative_GetEnviron(void)
#endif
}

void SystemNative_FreeEnviron(char** environ)
void SystemNative_FreeEnviron(char** environment)
{
// no op
(void)environ;
(void)environment;
}
2 changes: 1 addition & 1 deletion src/native/libs/System.Native/pal_mount.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@
#endif // __HAIKU__

// Android does not define MNTOPT_RO
#ifndef MNTOPT_RO
#if !defined(MNTOPT_RO) && (HAVE_SYS_MNTENT_H || HAVE_MNTENT_H)
#define MNTOPT_RO "r"
#endif
#endif
Expand Down
2 changes: 1 addition & 1 deletion src/native/libs/System.Native/pal_networking.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3681,6 +3681,7 @@ int32_t SystemNative_SendFile(intptr_t out_fd, intptr_t in_fd, int64_t offset, i
// Emulate sendfile using a simple read/send loop.
*sent = 0;
char* buffer = NULL;
size_t bufferLength = Min((size_t)count, 80 * 1024 * sizeof(char));

// Save the original input file position and seek to the offset position
off_t inputFileOrigOffset = lseek(infd, 0, SEEK_CUR);
Expand All@@ -3690,7 +3691,6 @@ int32_t SystemNative_SendFile(intptr_t out_fd, intptr_t in_fd, int64_t offset, i
}

// Allocate a buffer
size_t bufferLength = Min((size_t)count, 80 * 1024 * sizeof(char));
buffer = (char*)malloc(bufferLength);
if (buffer == NULL)
{
Expand Down
13 changes: 9 additions & 4 deletions src/native/libs/System.Native/pal_process.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -784,24 +784,29 @@ static int32_t ConvertRLimitResourcesPalToPlatform(RLimitResources value)
#elif defined(RLIMIT_VMEM)
case PAL_RLIMIT_RSS:
return RLIMIT_VMEM;
#else
case PAL_RLIMIT_RSS:
break;
#endif
#ifdef RLIMIT_MEMLOCK
case PAL_RLIMIT_MEMLOCK:
return RLIMIT_MEMLOCK;
#elif defined(RLIMIT_VMEM)
case PAL_RLIMIT_MEMLOCK:
return RLIMIT_VMEM;
#else
case PAL_RLIMIT_MEMLOCK:
break;
#endif
#ifdef RLIMIT_NPROC
case PAL_RLIMIT_NPROC:
return RLIMIT_NPROC;
#else
case PAL_RLIMIT_NPROC:
break;
#endif
case PAL_RLIMIT_NOFILE:
return RLIMIT_NOFILE;
#if !defined(RLIMIT_RSS) || !(defined(RLIMIT_MEMLOCK) || defined(RLIMIT_VMEM)) || !defined(RLIMIT_NPROC)
default:
break;
#endif
}

assert_msg(false, "Unknown RLIMIT value", (int)value);
Expand Down
4 changes: 4 additions & 0 deletions src/native/libs/System.Security.Cryptography.Native/pal_evp_pkey.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1005,7 +1005,11 @@ EVP_PKEY* CryptoNative_LoadKeyFromProvider(const char* providerName, const char*
EvpPKeyExtraHandle* extra = (EvpPKeyExtraHandle*)malloc(sizeof(EvpPKeyExtraHandle));
extra->prov = prov;
extra->libCtx = libCtx;
#if defined(TARGET_HAIKU) && defined(__clang__)
__c11_atomic_init(&extra->refCount, 1);
#else
atomic_init(&extra->refCount, 1);
#endif
*extraHandle = extra;
}

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Add ability to use clang with GNU toolchain on Haiku#127392

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

 Merged

jkoritzinsky
merged 13 commits into

from

Apr 25, 2026
 Merged


Add ability to use clang with GNU toolchain on Haiku
#127392
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
39dd9dd

Add ability to use clang with GNU toolchain on Haiku


am11 Apr 24, 2026
a17a93d

Cleanups


am11 Apr 24, 2026
ae17673

Update configureplatform.cmake


am11 Apr 24, 2026
c8fe8e3

Update pal_environment.c


am11 Apr 24, 2026
cddb405

Update pal_mount.c


am11 Apr 24, 2026
a1b4527

Update pal_networking.c


am11 Apr 24, 2026
8ec028b

Update pal_process.c


am11 Apr 24, 2026
865bfb5

Update pal_evp_pkey.c


am11 Apr 24, 2026
8c928d1

Merge branch 'main' into patch-53


am11 Apr 24, 2026
c1312bf

Update pal_evp_pkey.c


am11 Apr 24, 2026
0d3664b

Keep gcc working


am11 Apr 25, 2026
9610702

Update pal_evp_pkey.c


am11 Apr 25, 2026
d71b4e6

Update gcenv.unix.cpp


am11 Apr 25, 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


12 changes: 9 additions & 3 deletions
eng/common/cross/toolchain.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -225,13 +225,19 @@ elseif(ILLUMOS)
 locate_toolchain_exec(g++ CMAKE_CXX_COMPILER)
elseif(HAIKU)
 set(CMAKE_SYSROOT "${CROSS_ROOTFS}")
 set(CMAKE_PROGRAM_PATH "${CMAKE_PROGRAM_PATH};${CROSS_ROOTFS}/cross-tools-x86_64/bin")
 set(CMAKE_SYSTEM_PREFIX_PATH "${CROSS_ROOTFS}")
 set(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES} -lssp")
 set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lssp")

 locate_toolchain_exec(gcc CMAKE_C_COMPILER)
 locate_toolchain_exec(g++ CMAKE_CXX_COMPILER)
 if ($ENV{CCC_CC} MATCHES ".*gcc.*")
 set(CMAKE_PROGRAM_PATH "${CMAKE_PROGRAM_PATH};${CROSS_ROOTFS}/cross-tools-x86_64/bin")
 locate_toolchain_exec(gcc CMAKE_C_COMPILER)
 locate_toolchain_exec(g++ CMAKE_CXX_COMPILER)
 else()
 set(CMAKE_C_COMPILER_EXTERNAL_TOOLCHAIN "${CROSS_ROOTFS}/cross-tools-x86_64")
 set(CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN "${CROSS_ROOTFS}/cross-tools-x86_64")
 set(CMAKE_ASM_COMPILER_EXTERNAL_TOOLCHAIN "${CROSS_ROOTFS}/cross-tools-x86_64")
 endif()

 # let CMake set up the correct search paths
 include(Platform/Haiku)
Expand Down

6 changes: 5 additions & 1 deletion
eng/native/configureplatform.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -494,7 +494,11 @@ if(NOT CLR_CMAKE_TARGET_BROWSER AND NOT CLR_CMAKE_TARGET_WASI)
 # The default linker on Solaris also does not support PIE.
 if(NOT CLR_CMAKE_TARGET_ANDROID AND NOT CLR_CMAKE_TARGET_SUNOS AND NOT CLR_CMAKE_TARGET_APPLE AND NOT MSVC)
 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie")
 add_compile_options($<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:-fPIE>)
 if(CLR_CMAKE_TARGET_HAIKU)
 add_compile_options($<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:-fPIC>)
 else()
 add_compile_options($<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:-fPIE>)
 endif()
 add_compile_options($<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,SHARED_LIBRARY>:-fPIC>)
 endif()

Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/gc/unix/gcenv.unix.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -208,7 +208,7 @@ bool GCToOSInterface::Initialize()

#else // HAVE_SCHED_GETAFFINITY

 for (size_t i = 0; i < configuredCpuCount; i++)
 for (int i = 0; i < configuredCpuCount; i++)
 {
 g_processAffinitySet.Add(i);
 }
Expand Down

4 changes: 2 additions & 2 deletions
src/native/libs/System.Native/pal_environment.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,8 +25,8 @@ char** SystemNative_GetEnviron(void)
#endif
}

void SystemNative_FreeEnviron(char** environ)
void SystemNative_FreeEnviron(char** environment)
{
 // no op
 (void)environ;
 (void)environment;
}

2 changes: 1 addition & 1 deletion
src/native/libs/System.Native/pal_mount.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@
#endif // __HAIKU__

// Android does not define MNTOPT_RO
#ifndef MNTOPT_RO
#if !defined(MNTOPT_RO) && (HAVE_SYS_MNTENT_H || HAVE_MNTENT_H)
#define MNTOPT_RO "r"
#endif
#endif
Expand Down

2 changes: 1 addition & 1 deletion
src/native/libs/System.Native/pal_networking.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3681,6 +3681,7 @@ int32_t SystemNative_SendFile(intptr_t out_fd, intptr_t in_fd, int64_t offset, i
 // Emulate sendfile using a simple read/send loop.
 *sent = 0;
 char* buffer = NULL;
 size_t bufferLength = Min((size_t)count, 80 * 1024 * sizeof(char));

 // Save the original input file position and seek to the offset position
 off_t inputFileOrigOffset = lseek(infd, 0, SEEK_CUR);
Expand All@@ -3690,7 +3691,6 @@ int32_t SystemNative_SendFile(intptr_t out_fd, intptr_t in_fd, int64_t offset, i
 }

 // Allocate a buffer
 size_t bufferLength = Min((size_t)count, 80 * 1024 * sizeof(char));
 buffer = (char*)malloc(bufferLength);
 if (buffer == NULL)
 {
Expand Down

13 changes: 9 additions & 4 deletions
src/native/libs/System.Native/pal_process.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -784,24 +784,29 @@ static int32_t ConvertRLimitResourcesPalToPlatform(RLimitResources value)
#elif defined(RLIMIT_VMEM)
 case PAL_RLIMIT_RSS:
 return RLIMIT_VMEM;
#else
 case PAL_RLIMIT_RSS:
 break;
#endif
#ifdef RLIMIT_MEMLOCK
 case PAL_RLIMIT_MEMLOCK:
 return RLIMIT_MEMLOCK;
#elif defined(RLIMIT_VMEM)
 case PAL_RLIMIT_MEMLOCK:
 return RLIMIT_VMEM;
#else
 case PAL_RLIMIT_MEMLOCK:
 break;
#endif
#ifdef RLIMIT_NPROC
 case PAL_RLIMIT_NPROC:
 return RLIMIT_NPROC;
#else
 case PAL_RLIMIT_NPROC:
 break;
#endif
 case PAL_RLIMIT_NOFILE:
 return RLIMIT_NOFILE;
#if !defined(RLIMIT_RSS) || !(defined(RLIMIT_MEMLOCK) || defined(RLIMIT_VMEM)) || !defined(RLIMIT_NPROC)
 default:
 break;
#endif
 }

 assert_msg(false, "Unknown RLIMIT value", (int)value);
Expand Down

4 changes: 4 additions & 0 deletions
src/native/libs/System.Security.Cryptography.Native/pal_evp_pkey.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1005,7 +1005,11 @@ EVP_PKEY* CryptoNative_LoadKeyFromProvider(const char* providerName, const char*
 EvpPKeyExtraHandle* extra = (EvpPKeyExtraHandle*)malloc(sizeof(EvpPKeyExtraHandle));
 extra->prov = prov;
 extra->libCtx = libCtx;
#if defined(TARGET_HAIKU) && defined(__clang__)
 __c11_atomic_init(&extra->refCount, 1);
#else
 atomic_init(&extra->refCount, 1);
#endif
 *extraHandle = extra;
 }

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add ability to use clang with GNU toolchain on Haiku#127392

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

 Merged

jkoritzinsky
merged 13 commits into

from

Apr 25, 2026
 Merged


Add ability to use clang with GNU toolchain on Haiku
#127392
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
39dd9dd

Add ability to use clang with GNU toolchain on Haiku


am11 Apr 24, 2026
a17a93d

Cleanups


am11 Apr 24, 2026
ae17673

Update configureplatform.cmake


am11 Apr 24, 2026
c8fe8e3

Update pal_environment.c


am11 Apr 24, 2026
cddb405

Update pal_mount.c


am11 Apr 24, 2026
a1b4527

Update pal_networking.c


am11 Apr 24, 2026
8ec028b

Update pal_process.c


am11 Apr 24, 2026
865bfb5

Update pal_evp_pkey.c


am11 Apr 24, 2026
8c928d1

Merge branch 'main' into patch-53


am11 Apr 24, 2026
c1312bf

Update pal_evp_pkey.c


am11 Apr 24, 2026
0d3664b

Keep gcc working


am11 Apr 25, 2026
9610702

Update pal_evp_pkey.c


am11 Apr 25, 2026
d71b4e6

Update gcenv.unix.cpp


am11 Apr 25, 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


12 changes: 9 additions & 3 deletions
eng/common/cross/toolchain.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -225,13 +225,19 @@ elseif(ILLUMOS)
 locate_toolchain_exec(g++ CMAKE_CXX_COMPILER)
elseif(HAIKU)
 set(CMAKE_SYSROOT "${CROSS_ROOTFS}")
 set(CMAKE_PROGRAM_PATH "${CMAKE_PROGRAM_PATH};${CROSS_ROOTFS}/cross-tools-x86_64/bin")
 set(CMAKE_SYSTEM_PREFIX_PATH "${CROSS_ROOTFS}")
 set(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES} -lssp")
 set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lssp")

 locate_toolchain_exec(gcc CMAKE_C_COMPILER)
 locate_toolchain_exec(g++ CMAKE_CXX_COMPILER)
 if ($ENV{CCC_CC} MATCHES ".*gcc.*")
 set(CMAKE_PROGRAM_PATH "${CMAKE_PROGRAM_PATH};${CROSS_ROOTFS}/cross-tools-x86_64/bin")
 locate_toolchain_exec(gcc CMAKE_C_COMPILER)
 locate_toolchain_exec(g++ CMAKE_CXX_COMPILER)
 else()
 set(CMAKE_C_COMPILER_EXTERNAL_TOOLCHAIN "${CROSS_ROOTFS}/cross-tools-x86_64")
 set(CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN "${CROSS_ROOTFS}/cross-tools-x86_64")
 set(CMAKE_ASM_COMPILER_EXTERNAL_TOOLCHAIN "${CROSS_ROOTFS}/cross-tools-x86_64")
 endif()

 # let CMake set up the correct search paths
 include(Platform/Haiku)
Expand Down

6 changes: 5 additions & 1 deletion
eng/native/configureplatform.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -494,7 +494,11 @@ if(NOT CLR_CMAKE_TARGET_BROWSER AND NOT CLR_CMAKE_TARGET_WASI)
 # The default linker on Solaris also does not support PIE.
 if(NOT CLR_CMAKE_TARGET_ANDROID AND NOT CLR_CMAKE_TARGET_SUNOS AND NOT CLR_CMAKE_TARGET_APPLE AND NOT MSVC)
 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie")
 add_compile_options($<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:-fPIE>)
 if(CLR_CMAKE_TARGET_HAIKU)
 add_compile_options($<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:-fPIC>)
 else()
 add_compile_options($<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:-fPIE>)
 endif()
 add_compile_options($<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,SHARED_LIBRARY>:-fPIC>)
 endif()

Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/gc/unix/gcenv.unix.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -208,7 +208,7 @@ bool GCToOSInterface::Initialize()

#else // HAVE_SCHED_GETAFFINITY

 for (size_t i = 0; i < configuredCpuCount; i++)
 for (int i = 0; i < configuredCpuCount; i++)
 {
 g_processAffinitySet.Add(i);
 }
Expand Down

4 changes: 2 additions & 2 deletions
src/native/libs/System.Native/pal_environment.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,8 +25,8 @@ char** SystemNative_GetEnviron(void)
#endif
}

void SystemNative_FreeEnviron(char** environ)
void SystemNative_FreeEnviron(char** environment)
{
 // no op
 (void)environ;
 (void)environment;
}

2 changes: 1 addition & 1 deletion
src/native/libs/System.Native/pal_mount.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@
#endif // __HAIKU__

// Android does not define MNTOPT_RO
#ifndef MNTOPT_RO
#if !defined(MNTOPT_RO) && (HAVE_SYS_MNTENT_H || HAVE_MNTENT_H)
#define MNTOPT_RO "r"
#endif
#endif
Expand Down

2 changes: 1 addition & 1 deletion
src/native/libs/System.Native/pal_networking.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3681,6 +3681,7 @@ int32_t SystemNative_SendFile(intptr_t out_fd, intptr_t in_fd, int64_t offset, i
 // Emulate sendfile using a simple read/send loop.
 *sent = 0;
 char* buffer = NULL;
 size_t bufferLength = Min((size_t)count, 80 * 1024 * sizeof(char));

 // Save the original input file position and seek to the offset position
 off_t inputFileOrigOffset = lseek(infd, 0, SEEK_CUR);
Expand All@@ -3690,7 +3691,6 @@ int32_t SystemNative_SendFile(intptr_t out_fd, intptr_t in_fd, int64_t offset, i
 }

 // Allocate a buffer
 size_t bufferLength = Min((size_t)count, 80 * 1024 * sizeof(char));
 buffer = (char*)malloc(bufferLength);
 if (buffer == NULL)
 {
Expand Down

13 changes: 9 additions & 4 deletions
src/native/libs/System.Native/pal_process.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -784,24 +784,29 @@ static int32_t ConvertRLimitResourcesPalToPlatform(RLimitResources value)
#elif defined(RLIMIT_VMEM)
 case PAL_RLIMIT_RSS:
 return RLIMIT_VMEM;
#else
 case PAL_RLIMIT_RSS:
 break;
#endif
#ifdef RLIMIT_MEMLOCK
 case PAL_RLIMIT_MEMLOCK:
 return RLIMIT_MEMLOCK;
#elif defined(RLIMIT_VMEM)
 case PAL_RLIMIT_MEMLOCK:
 return RLIMIT_VMEM;
#else
 case PAL_RLIMIT_MEMLOCK:
 break;
#endif
#ifdef RLIMIT_NPROC
 case PAL_RLIMIT_NPROC:
 return RLIMIT_NPROC;
#else
 case PAL_RLIMIT_NPROC:
 break;
#endif
 case PAL_RLIMIT_NOFILE:
 return RLIMIT_NOFILE;
#if !defined(RLIMIT_RSS) || !(defined(RLIMIT_MEMLOCK) || defined(RLIMIT_VMEM)) || !defined(RLIMIT_NPROC)
 default:
 break;
#endif
 }

 assert_msg(false, "Unknown RLIMIT value", (int)value);
Expand Down

4 changes: 4 additions & 0 deletions
src/native/libs/System.Security.Cryptography.Native/pal_evp_pkey.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1005,7 +1005,11 @@ EVP_PKEY* CryptoNative_LoadKeyFromProvider(const char* providerName, const char*
 EvpPKeyExtraHandle* extra = (EvpPKeyExtraHandle*)malloc(sizeof(EvpPKeyExtraHandle));
 extra->prov = prov;
 extra->libCtx = libCtx;
#if defined(TARGET_HAIKU) && defined(__clang__)
 __c11_atomic_init(&extra->refCount, 1);
#else
 atomic_init(&extra->refCount, 1);
#endif
 *extraHandle = extra;
 }

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add ability to use clang with GNU toolchain on Haiku#127392

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

 Merged

jkoritzinsky
merged 13 commits into

from

Apr 25, 2026
 Merged


Add ability to use clang with GNU toolchain on Haiku
#127392
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
39dd9dd

Add ability to use clang with GNU toolchain on Haiku


am11 Apr 24, 2026
a17a93d

Cleanups


am11 Apr 24, 2026
ae17673

Update configureplatform.cmake


am11 Apr 24, 2026
c8fe8e3

Update pal_environment.c


am11 Apr 24, 2026
cddb405

Update pal_mount.c


am11 Apr 24, 2026
a1b4527

Update pal_networking.c


am11 Apr 24, 2026
8ec028b

Update pal_process.c


am11 Apr 24, 2026
865bfb5

Update pal_evp_pkey.c


am11 Apr 24, 2026
8c928d1

Merge branch 'main' into patch-53


am11 Apr 24, 2026
c1312bf

Update pal_evp_pkey.c


am11 Apr 24, 2026
0d3664b

Keep gcc working


am11 Apr 25, 2026
9610702

Update pal_evp_pkey.c


am11 Apr 25, 2026
d71b4e6

Update gcenv.unix.cpp


am11 Apr 25, 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


12 changes: 9 additions & 3 deletions
eng/common/cross/toolchain.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -225,13 +225,19 @@ elseif(ILLUMOS)
 locate_toolchain_exec(g++ CMAKE_CXX_COMPILER)
elseif(HAIKU)
 set(CMAKE_SYSROOT "${CROSS_ROOTFS}")
 set(CMAKE_PROGRAM_PATH "${CMAKE_PROGRAM_PATH};${CROSS_ROOTFS}/cross-tools-x86_64/bin")
 set(CMAKE_SYSTEM_PREFIX_PATH "${CROSS_ROOTFS}")
 set(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES} -lssp")
 set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lssp")

 locate_toolchain_exec(gcc CMAKE_C_COMPILER)
 locate_toolchain_exec(g++ CMAKE_CXX_COMPILER)
 if ($ENV{CCC_CC} MATCHES ".*gcc.*")
 set(CMAKE_PROGRAM_PATH "${CMAKE_PROGRAM_PATH};${CROSS_ROOTFS}/cross-tools-x86_64/bin")
 locate_toolchain_exec(gcc CMAKE_C_COMPILER)
 locate_toolchain_exec(g++ CMAKE_CXX_COMPILER)
 else()
 set(CMAKE_C_COMPILER_EXTERNAL_TOOLCHAIN "${CROSS_ROOTFS}/cross-tools-x86_64")
 set(CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN "${CROSS_ROOTFS}/cross-tools-x86_64")
 set(CMAKE_ASM_COMPILER_EXTERNAL_TOOLCHAIN "${CROSS_ROOTFS}/cross-tools-x86_64")
 endif()

 # let CMake set up the correct search paths
 include(Platform/Haiku)
Expand Down

6 changes: 5 additions & 1 deletion
eng/native/configureplatform.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -494,7 +494,11 @@ if(NOT CLR_CMAKE_TARGET_BROWSER AND NOT CLR_CMAKE_TARGET_WASI)
 # The default linker on Solaris also does not support PIE.
 if(NOT CLR_CMAKE_TARGET_ANDROID AND NOT CLR_CMAKE_TARGET_SUNOS AND NOT CLR_CMAKE_TARGET_APPLE AND NOT MSVC)
 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie")
 add_compile_options($<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:-fPIE>)
 if(CLR_CMAKE_TARGET_HAIKU)
 add_compile_options($<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:-fPIC>)
 else()
 add_compile_options($<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:-fPIE>)
 endif()
 add_compile_options($<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,SHARED_LIBRARY>:-fPIC>)
 endif()

Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/gc/unix/gcenv.unix.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -208,7 +208,7 @@ bool GCToOSInterface::Initialize()

#else // HAVE_SCHED_GETAFFINITY

 for (size_t i = 0; i < configuredCpuCount; i++)
 for (int i = 0; i < configuredCpuCount; i++)
 {
 g_processAffinitySet.Add(i);
 }
Expand Down

4 changes: 2 additions & 2 deletions
src/native/libs/System.Native/pal_environment.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,8 +25,8 @@ char** SystemNative_GetEnviron(void)
#endif
}

void SystemNative_FreeEnviron(char** environ)
void SystemNative_FreeEnviron(char** environment)
{
 // no op
 (void)environ;
 (void)environment;
}

2 changes: 1 addition & 1 deletion
src/native/libs/System.Native/pal_mount.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@
#endif // __HAIKU__

// Android does not define MNTOPT_RO
#ifndef MNTOPT_RO
#if !defined(MNTOPT_RO) && (HAVE_SYS_MNTENT_H || HAVE_MNTENT_H)
#define MNTOPT_RO "r"
#endif
#endif
Expand Down

2 changes: 1 addition & 1 deletion
src/native/libs/System.Native/pal_networking.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3681,6 +3681,7 @@ int32_t SystemNative_SendFile(intptr_t out_fd, intptr_t in_fd, int64_t offset, i
 // Emulate sendfile using a simple read/send loop.
 *sent = 0;
 char* buffer = NULL;
 size_t bufferLength = Min((size_t)count, 80 * 1024 * sizeof(char));

 // Save the original input file position and seek to the offset position
 off_t inputFileOrigOffset = lseek(infd, 0, SEEK_CUR);
Expand All@@ -3690,7 +3691,6 @@ int32_t SystemNative_SendFile(intptr_t out_fd, intptr_t in_fd, int64_t offset, i
 }

 // Allocate a buffer
 size_t bufferLength = Min((size_t)count, 80 * 1024 * sizeof(char));
 buffer = (char*)malloc(bufferLength);
 if (buffer == NULL)
 {
Expand Down

13 changes: 9 additions & 4 deletions
src/native/libs/System.Native/pal_process.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -784,24 +784,29 @@ static int32_t ConvertRLimitResourcesPalToPlatform(RLimitResources value)
#elif defined(RLIMIT_VMEM)
 case PAL_RLIMIT_RSS:
 return RLIMIT_VMEM;
#else
 case PAL_RLIMIT_RSS:
 break;
#endif
#ifdef RLIMIT_MEMLOCK
 case PAL_RLIMIT_MEMLOCK:
 return RLIMIT_MEMLOCK;
#elif defined(RLIMIT_VMEM)
 case PAL_RLIMIT_MEMLOCK:
 return RLIMIT_VMEM;
#else
 case PAL_RLIMIT_MEMLOCK:
 break;
#endif
#ifdef RLIMIT_NPROC
 case PAL_RLIMIT_NPROC:
 return RLIMIT_NPROC;
#else
 case PAL_RLIMIT_NPROC:
 break;
#endif
 case PAL_RLIMIT_NOFILE:
 return RLIMIT_NOFILE;
#if !defined(RLIMIT_RSS) || !(defined(RLIMIT_MEMLOCK) || defined(RLIMIT_VMEM)) || !defined(RLIMIT_NPROC)
 default:
 break;
#endif
 }

 assert_msg(false, "Unknown RLIMIT value", (int)value);
Expand Down

4 changes: 4 additions & 0 deletions
src/native/libs/System.Security.Cryptography.Native/pal_evp_pkey.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1005,7 +1005,11 @@ EVP_PKEY* CryptoNative_LoadKeyFromProvider(const char* providerName, const char*
 EvpPKeyExtraHandle* extra = (EvpPKeyExtraHandle*)malloc(sizeof(EvpPKeyExtraHandle));
 extra->prov = prov;
 extra->libCtx = libCtx;
#if defined(TARGET_HAIKU) && defined(__clang__)
 __c11_atomic_init(&extra->refCount, 1);
#else
 atomic_init(&extra->refCount, 1);
#endif
 *extraHandle = extra;
 }

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Add ability to use clang with GNU toolchain on Haiku#127392

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

 Merged

jkoritzinsky
merged 13 commits into

from

Apr 25, 2026
 Merged


Add ability to use clang with GNU toolchain on Haiku
#127392
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
39dd9dd

Add ability to use clang with GNU toolchain on Haiku


am11 Apr 24, 2026
a17a93d

Cleanups


am11 Apr 24, 2026
ae17673

Update configureplatform.cmake


am11 Apr 24, 2026
c8fe8e3

Update pal_environment.c


am11 Apr 24, 2026
cddb405

Update pal_mount.c


am11 Apr 24, 2026
a1b4527

Update pal_networking.c


am11 Apr 24, 2026
8ec028b

Update pal_process.c


am11 Apr 24, 2026
865bfb5

Update pal_evp_pkey.c


am11 Apr 24, 2026
8c928d1

Merge branch 'main' into patch-53


am11 Apr 24, 2026
c1312bf

Update pal_evp_pkey.c


am11 Apr 24, 2026
0d3664b

Keep gcc working


am11 Apr 25, 2026
9610702

Update pal_evp_pkey.c


am11 Apr 25, 2026
d71b4e6

Update gcenv.unix.cpp


am11 Apr 25, 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


12 changes: 9 additions & 3 deletions
eng/common/cross/toolchain.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -225,13 +225,19 @@ elseif(ILLUMOS)
 locate_toolchain_exec(g++ CMAKE_CXX_COMPILER)
elseif(HAIKU)
 set(CMAKE_SYSROOT "${CROSS_ROOTFS}")
 set(CMAKE_PROGRAM_PATH "${CMAKE_PROGRAM_PATH};${CROSS_ROOTFS}/cross-tools-x86_64/bin")
 set(CMAKE_SYSTEM_PREFIX_PATH "${CROSS_ROOTFS}")
 set(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES} -lssp")
 set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lssp")

 locate_toolchain_exec(gcc CMAKE_C_COMPILER)
 locate_toolchain_exec(g++ CMAKE_CXX_COMPILER)
 if ($ENV{CCC_CC} MATCHES ".*gcc.*")
 set(CMAKE_PROGRAM_PATH "${CMAKE_PROGRAM_PATH};${CROSS_ROOTFS}/cross-tools-x86_64/bin")
 locate_toolchain_exec(gcc CMAKE_C_COMPILER)
 locate_toolchain_exec(g++ CMAKE_CXX_COMPILER)
 else()
 set(CMAKE_C_COMPILER_EXTERNAL_TOOLCHAIN "${CROSS_ROOTFS}/cross-tools-x86_64")
 set(CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN "${CROSS_ROOTFS}/cross-tools-x86_64")
 set(CMAKE_ASM_COMPILER_EXTERNAL_TOOLCHAIN "${CROSS_ROOTFS}/cross-tools-x86_64")
 endif()

 # let CMake set up the correct search paths
 include(Platform/Haiku)
Expand Down

6 changes: 5 additions & 1 deletion
eng/native/configureplatform.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -494,7 +494,11 @@ if(NOT CLR_CMAKE_TARGET_BROWSER AND NOT CLR_CMAKE_TARGET_WASI)
 # The default linker on Solaris also does not support PIE.
 if(NOT CLR_CMAKE_TARGET_ANDROID AND NOT CLR_CMAKE_TARGET_SUNOS AND NOT CLR_CMAKE_TARGET_APPLE AND NOT MSVC)
 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie")
 add_compile_options($<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:-fPIE>)
 if(CLR_CMAKE_TARGET_HAIKU)
 add_compile_options($<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:-fPIC>)
 else()
 add_compile_options($<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:-fPIE>)
 endif()
 add_compile_options($<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,SHARED_LIBRARY>:-fPIC>)
 endif()

Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/gc/unix/gcenv.unix.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -208,7 +208,7 @@ bool GCToOSInterface::Initialize()

#else // HAVE_SCHED_GETAFFINITY

 for (size_t i = 0; i < configuredCpuCount; i++)
 for (int i = 0; i < configuredCpuCount; i++)
 {
 g_processAffinitySet.Add(i);
 }
Expand Down

4 changes: 2 additions & 2 deletions
src/native/libs/System.Native/pal_environment.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,8 +25,8 @@ char** SystemNative_GetEnviron(void)
#endif
}

void SystemNative_FreeEnviron(char** environ)
void SystemNative_FreeEnviron(char** environment)
{
 // no op
 (void)environ;
 (void)environment;
}

2 changes: 1 addition & 1 deletion
src/native/libs/System.Native/pal_mount.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@
#endif // __HAIKU__

// Android does not define MNTOPT_RO
#ifndef MNTOPT_RO
#if !defined(MNTOPT_RO) && (HAVE_SYS_MNTENT_H || HAVE_MNTENT_H)
#define MNTOPT_RO "r"
#endif
#endif
Expand Down

2 changes: 1 addition & 1 deletion
src/native/libs/System.Native/pal_networking.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3681,6 +3681,7 @@ int32_t SystemNative_SendFile(intptr_t out_fd, intptr_t in_fd, int64_t offset, i
 // Emulate sendfile using a simple read/send loop.
 *sent = 0;
 char* buffer = NULL;
 size_t bufferLength = Min((size_t)count, 80 * 1024 * sizeof(char));

 // Save the original input file position and seek to the offset position
 off_t inputFileOrigOffset = lseek(infd, 0, SEEK_CUR);
Expand All@@ -3690,7 +3691,6 @@ int32_t SystemNative_SendFile(intptr_t out_fd, intptr_t in_fd, int64_t offset, i
 }

 // Allocate a buffer
 size_t bufferLength = Min((size_t)count, 80 * 1024 * sizeof(char));
 buffer = (char*)malloc(bufferLength);
 if (buffer == NULL)
 {
Expand Down

13 changes: 9 additions & 4 deletions
src/native/libs/System.Native/pal_process.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -784,24 +784,29 @@ static int32_t ConvertRLimitResourcesPalToPlatform(RLimitResources value)
#elif defined(RLIMIT_VMEM)
 case PAL_RLIMIT_RSS:
 return RLIMIT_VMEM;
#else
 case PAL_RLIMIT_RSS:
 break;
#endif
#ifdef RLIMIT_MEMLOCK
 case PAL_RLIMIT_MEMLOCK:
 return RLIMIT_MEMLOCK;
#elif defined(RLIMIT_VMEM)
 case PAL_RLIMIT_MEMLOCK:
 return RLIMIT_VMEM;
#else
 case PAL_RLIMIT_MEMLOCK:
 break;
#endif
#ifdef RLIMIT_NPROC
 case PAL_RLIMIT_NPROC:
 return RLIMIT_NPROC;
#else
 case PAL_RLIMIT_NPROC:
 break;
#endif
 case PAL_RLIMIT_NOFILE:
 return RLIMIT_NOFILE;
#if !defined(RLIMIT_RSS) || !(defined(RLIMIT_MEMLOCK) || defined(RLIMIT_VMEM)) || !defined(RLIMIT_NPROC)
 default:
 break;
#endif
 }

 assert_msg(false, "Unknown RLIMIT value", (int)value);
Expand Down

4 changes: 4 additions & 0 deletions
src/native/libs/System.Security.Cryptography.Native/pal_evp_pkey.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1005,7 +1005,11 @@ EVP_PKEY* CryptoNative_LoadKeyFromProvider(const char* providerName, const char*
 EvpPKeyExtraHandle* extra = (EvpPKeyExtraHandle*)malloc(sizeof(EvpPKeyExtraHandle));
 extra->prov = prov;
 extra->libCtx = libCtx;
#if defined(TARGET_HAIKU) && defined(__clang__)
 __c11_atomic_init(&extra->refCount, 1);
#else
 atomic_init(&extra->refCount, 1);
#endif
 *extraHandle = extra;
 }

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add ability to use clang with GNU toolchain on Haiku#127392

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

 Merged

jkoritzinsky
merged 13 commits into

from

Apr 25, 2026
 Merged


Add ability to use clang with GNU toolchain on Haiku
#127392
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
39dd9dd

Add ability to use clang with GNU toolchain on Haiku


am11 Apr 24, 2026
a17a93d

Cleanups


am11 Apr 24, 2026
ae17673

Update configureplatform.cmake


am11 Apr 24, 2026
c8fe8e3

Update pal_environment.c


am11 Apr 24, 2026
cddb405

Update pal_mount.c


am11 Apr 24, 2026
a1b4527

Update pal_networking.c


am11 Apr 24, 2026
8ec028b

Update pal_process.c


am11 Apr 24, 2026
865bfb5

Update pal_evp_pkey.c


am11 Apr 24, 2026
8c928d1

Merge branch 'main' into patch-53


am11 Apr 24, 2026
c1312bf

Update pal_evp_pkey.c


am11 Apr 24, 2026
0d3664b

Keep gcc working


am11 Apr 25, 2026
9610702

Update pal_evp_pkey.c


am11 Apr 25, 2026
d71b4e6

Update gcenv.unix.cpp


am11 Apr 25, 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


12 changes: 9 additions & 3 deletions
eng/common/cross/toolchain.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -225,13 +225,19 @@ elseif(ILLUMOS)
 locate_toolchain_exec(g++ CMAKE_CXX_COMPILER)
elseif(HAIKU)
 set(CMAKE_SYSROOT "${CROSS_ROOTFS}")
 set(CMAKE_PROGRAM_PATH "${CMAKE_PROGRAM_PATH};${CROSS_ROOTFS}/cross-tools-x86_64/bin")
 set(CMAKE_SYSTEM_PREFIX_PATH "${CROSS_ROOTFS}")
 set(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES} -lssp")
 set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lssp")

 locate_toolchain_exec(gcc CMAKE_C_COMPILER)
 locate_toolchain_exec(g++ CMAKE_CXX_COMPILER)
 if ($ENV{CCC_CC} MATCHES ".*gcc.*")
 set(CMAKE_PROGRAM_PATH "${CMAKE_PROGRAM_PATH};${CROSS_ROOTFS}/cross-tools-x86_64/bin")
 locate_toolchain_exec(gcc CMAKE_C_COMPILER)
 locate_toolchain_exec(g++ CMAKE_CXX_COMPILER)
 else()
 set(CMAKE_C_COMPILER_EXTERNAL_TOOLCHAIN "${CROSS_ROOTFS}/cross-tools-x86_64")
 set(CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN "${CROSS_ROOTFS}/cross-tools-x86_64")
 set(CMAKE_ASM_COMPILER_EXTERNAL_TOOLCHAIN "${CROSS_ROOTFS}/cross-tools-x86_64")
 endif()

 # let CMake set up the correct search paths
 include(Platform/Haiku)
Expand Down

6 changes: 5 additions & 1 deletion
eng/native/configureplatform.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -494,7 +494,11 @@ if(NOT CLR_CMAKE_TARGET_BROWSER AND NOT CLR_CMAKE_TARGET_WASI)
 # The default linker on Solaris also does not support PIE.
 if(NOT CLR_CMAKE_TARGET_ANDROID AND NOT CLR_CMAKE_TARGET_SUNOS AND NOT CLR_CMAKE_TARGET_APPLE AND NOT MSVC)
 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie")
 add_compile_options($<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:-fPIE>)
 if(CLR_CMAKE_TARGET_HAIKU)
 add_compile_options($<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:-fPIC>)
 else()
 add_compile_options($<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:-fPIE>)
 endif()
 add_compile_options($<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,SHARED_LIBRARY>:-fPIC>)
 endif()

Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/gc/unix/gcenv.unix.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -208,7 +208,7 @@ bool GCToOSInterface::Initialize()

#else // HAVE_SCHED_GETAFFINITY

 for (size_t i = 0; i < configuredCpuCount; i++)
 for (int i = 0; i < configuredCpuCount; i++)
 {
 g_processAffinitySet.Add(i);
 }
Expand Down

4 changes: 2 additions & 2 deletions
src/native/libs/System.Native/pal_environment.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,8 +25,8 @@ char** SystemNative_GetEnviron(void)
#endif
}

void SystemNative_FreeEnviron(char** environ)
void SystemNative_FreeEnviron(char** environment)
{
 // no op
 (void)environ;
 (void)environment;
}

2 changes: 1 addition & 1 deletion
src/native/libs/System.Native/pal_mount.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@
#endif // __HAIKU__

// Android does not define MNTOPT_RO
#ifndef MNTOPT_RO
#if !defined(MNTOPT_RO) && (HAVE_SYS_MNTENT_H || HAVE_MNTENT_H)
#define MNTOPT_RO "r"
#endif
#endif
Expand Down

2 changes: 1 addition & 1 deletion
src/native/libs/System.Native/pal_networking.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3681,6 +3681,7 @@ int32_t SystemNative_SendFile(intptr_t out_fd, intptr_t in_fd, int64_t offset, i
 // Emulate sendfile using a simple read/send loop.
 *sent = 0;
 char* buffer = NULL;
 size_t bufferLength = Min((size_t)count, 80 * 1024 * sizeof(char));

 // Save the original input file position and seek to the offset position
 off_t inputFileOrigOffset = lseek(infd, 0, SEEK_CUR);
Expand All@@ -3690,7 +3691,6 @@ int32_t SystemNative_SendFile(intptr_t out_fd, intptr_t in_fd, int64_t offset, i
 }

 // Allocate a buffer
 size_t bufferLength = Min((size_t)count, 80 * 1024 * sizeof(char));
 buffer = (char*)malloc(bufferLength);
 if (buffer == NULL)
 {
Expand Down

13 changes: 9 additions & 4 deletions
src/native/libs/System.Native/pal_process.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -784,24 +784,29 @@ static int32_t ConvertRLimitResourcesPalToPlatform(RLimitResources value)
#elif defined(RLIMIT_VMEM)
 case PAL_RLIMIT_RSS:
 return RLIMIT_VMEM;
#else
 case PAL_RLIMIT_RSS:
 break;
#endif
#ifdef RLIMIT_MEMLOCK
 case PAL_RLIMIT_MEMLOCK:
 return RLIMIT_MEMLOCK;
#elif defined(RLIMIT_VMEM)
 case PAL_RLIMIT_MEMLOCK:
 return RLIMIT_VMEM;
#else
 case PAL_RLIMIT_MEMLOCK:
 break;
#endif
#ifdef RLIMIT_NPROC
 case PAL_RLIMIT_NPROC:
 return RLIMIT_NPROC;
#else
 case PAL_RLIMIT_NPROC:
 break;
#endif
 case PAL_RLIMIT_NOFILE:
 return RLIMIT_NOFILE;
#if !defined(RLIMIT_RSS) || !(defined(RLIMIT_MEMLOCK) || defined(RLIMIT_VMEM)) || !defined(RLIMIT_NPROC)
 default:
 break;
#endif
 }

 assert_msg(false, "Unknown RLIMIT value", (int)value);
Expand Down

4 changes: 4 additions & 0 deletions
src/native/libs/System.Security.Cryptography.Native/pal_evp_pkey.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1005,7 +1005,11 @@ EVP_PKEY* CryptoNative_LoadKeyFromProvider(const char* providerName, const char*
 EvpPKeyExtraHandle* extra = (EvpPKeyExtraHandle*)malloc(sizeof(EvpPKeyExtraHandle));
 extra->prov = prov;
 extra->libCtx = libCtx;
#if defined(TARGET_HAIKU) && defined(__clang__)
 __c11_atomic_init(&extra->refCount, 1);
#else
 atomic_init(&extra->refCount, 1);
#endif
 *extraHandle = extra;
 }

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Add ability to use clang with GNU toolchain on Haiku#127392

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

 Merged

jkoritzinsky
merged 13 commits into

from

Apr 25, 2026
 Merged


Add ability to use clang with GNU toolchain on Haiku
#127392
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
39dd9dd

Add ability to use clang with GNU toolchain on Haiku


am11 Apr 24, 2026
a17a93d

Cleanups


am11 Apr 24, 2026
ae17673

Update configureplatform.cmake


am11 Apr 24, 2026
c8fe8e3

Update pal_environment.c


am11 Apr 24, 2026
cddb405

Update pal_mount.c


am11 Apr 24, 2026
a1b4527

Update pal_networking.c


am11 Apr 24, 2026
8ec028b

Update pal_process.c


am11 Apr 24, 2026
865bfb5

Update pal_evp_pkey.c


am11 Apr 24, 2026
8c928d1

Merge branch 'main' into patch-53


am11 Apr 24, 2026
c1312bf

Update pal_evp_pkey.c


am11 Apr 24, 2026
0d3664b

Keep gcc working


am11 Apr 25, 2026
9610702

Update pal_evp_pkey.c


am11 Apr 25, 2026
d71b4e6

Update gcenv.unix.cpp


am11 Apr 25, 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


12 changes: 9 additions & 3 deletions
eng/common/cross/toolchain.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -225,13 +225,19 @@ elseif(ILLUMOS)
 locate_toolchain_exec(g++ CMAKE_CXX_COMPILER)
elseif(HAIKU)
 set(CMAKE_SYSROOT "${CROSS_ROOTFS}")
 set(CMAKE_PROGRAM_PATH "${CMAKE_PROGRAM_PATH};${CROSS_ROOTFS}/cross-tools-x86_64/bin")
 set(CMAKE_SYSTEM_PREFIX_PATH "${CROSS_ROOTFS}")
 set(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES} -lssp")
 set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lssp")

 locate_toolchain_exec(gcc CMAKE_C_COMPILER)
 locate_toolchain_exec(g++ CMAKE_CXX_COMPILER)
 if ($ENV{CCC_CC} MATCHES ".*gcc.*")
 set(CMAKE_PROGRAM_PATH "${CMAKE_PROGRAM_PATH};${CROSS_ROOTFS}/cross-tools-x86_64/bin")
 locate_toolchain_exec(gcc CMAKE_C_COMPILER)
 locate_toolchain_exec(g++ CMAKE_CXX_COMPILER)
 else()
 set(CMAKE_C_COMPILER_EXTERNAL_TOOLCHAIN "${CROSS_ROOTFS}/cross-tools-x86_64")
 set(CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN "${CROSS_ROOTFS}/cross-tools-x86_64")
 set(CMAKE_ASM_COMPILER_EXTERNAL_TOOLCHAIN "${CROSS_ROOTFS}/cross-tools-x86_64")
 endif()

 # let CMake set up the correct search paths
 include(Platform/Haiku)
Expand Down

6 changes: 5 additions & 1 deletion
eng/native/configureplatform.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -494,7 +494,11 @@ if(NOT CLR_CMAKE_TARGET_BROWSER AND NOT CLR_CMAKE_TARGET_WASI)
 # The default linker on Solaris also does not support PIE.
 if(NOT CLR_CMAKE_TARGET_ANDROID AND NOT CLR_CMAKE_TARGET_SUNOS AND NOT CLR_CMAKE_TARGET_APPLE AND NOT MSVC)
 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie")
 add_compile_options($<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:-fPIE>)
 if(CLR_CMAKE_TARGET_HAIKU)
 add_compile_options($<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:-fPIC>)
 else()
 add_compile_options($<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:-fPIE>)
 endif()
 add_compile_options($<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,SHARED_LIBRARY>:-fPIC>)
 endif()

Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/gc/unix/gcenv.unix.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -208,7 +208,7 @@ bool GCToOSInterface::Initialize()

#else // HAVE_SCHED_GETAFFINITY

 for (size_t i = 0; i < configuredCpuCount; i++)
 for (int i = 0; i < configuredCpuCount; i++)
 {
 g_processAffinitySet.Add(i);
 }
Expand Down

4 changes: 2 additions & 2 deletions
src/native/libs/System.Native/pal_environment.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,8 +25,8 @@ char** SystemNative_GetEnviron(void)
#endif
}

void SystemNative_FreeEnviron(char** environ)
void SystemNative_FreeEnviron(char** environment)
{
 // no op
 (void)environ;
 (void)environment;
}

2 changes: 1 addition & 1 deletion
src/native/libs/System.Native/pal_mount.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@
#endif // __HAIKU__

// Android does not define MNTOPT_RO
#ifndef MNTOPT_RO
#if !defined(MNTOPT_RO) && (HAVE_SYS_MNTENT_H || HAVE_MNTENT_H)
#define MNTOPT_RO "r"
#endif
#endif
Expand Down

2 changes: 1 addition & 1 deletion
src/native/libs/System.Native/pal_networking.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3681,6 +3681,7 @@ int32_t SystemNative_SendFile(intptr_t out_fd, intptr_t in_fd, int64_t offset, i
 // Emulate sendfile using a simple read/send loop.
 *sent = 0;
 char* buffer = NULL;
 size_t bufferLength = Min((size_t)count, 80 * 1024 * sizeof(char));

 // Save the original input file position and seek to the offset position
 off_t inputFileOrigOffset = lseek(infd, 0, SEEK_CUR);
Expand All@@ -3690,7 +3691,6 @@ int32_t SystemNative_SendFile(intptr_t out_fd, intptr_t in_fd, int64_t offset, i
 }

 // Allocate a buffer
 size_t bufferLength = Min((size_t)count, 80 * 1024 * sizeof(char));
 buffer = (char*)malloc(bufferLength);
 if (buffer == NULL)
 {
Expand Down

13 changes: 9 additions & 4 deletions
src/native/libs/System.Native/pal_process.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -784,24 +784,29 @@ static int32_t ConvertRLimitResourcesPalToPlatform(RLimitResources value)
#elif defined(RLIMIT_VMEM)
 case PAL_RLIMIT_RSS:
 return RLIMIT_VMEM;
#else
 case PAL_RLIMIT_RSS:
 break;
#endif
#ifdef RLIMIT_MEMLOCK
 case PAL_RLIMIT_MEMLOCK:
 return RLIMIT_MEMLOCK;
#elif defined(RLIMIT_VMEM)
 case PAL_RLIMIT_MEMLOCK:
 return RLIMIT_VMEM;
#else
 case PAL_RLIMIT_MEMLOCK:
 break;
#endif
#ifdef RLIMIT_NPROC
 case PAL_RLIMIT_NPROC:
 return RLIMIT_NPROC;
#else
 case PAL_RLIMIT_NPROC:
 break;
#endif
 case PAL_RLIMIT_NOFILE:
 return RLIMIT_NOFILE;
#if !defined(RLIMIT_RSS) || !(defined(RLIMIT_MEMLOCK) || defined(RLIMIT_VMEM)) || !defined(RLIMIT_NPROC)
 default:
 break;
#endif
 }

 assert_msg(false, "Unknown RLIMIT value", (int)value);
Expand Down

4 changes: 4 additions & 0 deletions
src/native/libs/System.Security.Cryptography.Native/pal_evp_pkey.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1005,7 +1005,11 @@ EVP_PKEY* CryptoNative_LoadKeyFromProvider(const char* providerName, const char*
 EvpPKeyExtraHandle* extra = (EvpPKeyExtraHandle*)malloc(sizeof(EvpPKeyExtraHandle));
 extra->prov = prov;
 extra->libCtx = libCtx;
#if defined(TARGET_HAIKU) && defined(__clang__)
 __c11_atomic_init(&extra->refCount, 1);
#else
 atomic_init(&extra->refCount, 1);
#endif
 *extraHandle = extra;
 }

Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Add ability to use clang with GNU toolchain on Haiku#127392

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

 Merged

jkoritzinsky
merged 13 commits into

from

Apr 25, 2026
 Merged


Add ability to use clang with GNU toolchain on Haiku
#127392
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
39dd9dd

Add ability to use clang with GNU toolchain on Haiku


am11 Apr 24, 2026
a17a93d

Cleanups


am11 Apr 24, 2026
ae17673

Update configureplatform.cmake


am11 Apr 24, 2026
c8fe8e3

Update pal_environment.c


am11 Apr 24, 2026
cddb405

Update pal_mount.c


am11 Apr 24, 2026
a1b4527

Update pal_networking.c


am11 Apr 24, 2026
8ec028b

Update pal_process.c


am11 Apr 24, 2026
865bfb5

Update pal_evp_pkey.c


am11 Apr 24, 2026
8c928d1

Merge branch 'main' into patch-53


am11 Apr 24, 2026
c1312bf

Update pal_evp_pkey.c


am11 Apr 24, 2026
0d3664b

Keep gcc working


am11 Apr 25, 2026
9610702

Update pal_evp_pkey.c


am11 Apr 25, 2026
d71b4e6

Update gcenv.unix.cpp


am11 Apr 25, 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


12 changes: 9 additions & 3 deletions
eng/common/cross/toolchain.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -225,13 +225,19 @@ elseif(ILLUMOS)
 locate_toolchain_exec(g++ CMAKE_CXX_COMPILER)
elseif(HAIKU)
 set(CMAKE_SYSROOT "${CROSS_ROOTFS}")
 set(CMAKE_PROGRAM_PATH "${CMAKE_PROGRAM_PATH};${CROSS_ROOTFS}/cross-tools-x86_64/bin")
 set(CMAKE_SYSTEM_PREFIX_PATH "${CROSS_ROOTFS}")
 set(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES} -lssp")
 set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lssp")

 locate_toolchain_exec(gcc CMAKE_C_COMPILER)
 locate_toolchain_exec(g++ CMAKE_CXX_COMPILER)
 if ($ENV{CCC_CC} MATCHES ".*gcc.*")
 set(CMAKE_PROGRAM_PATH "${CMAKE_PROGRAM_PATH};${CROSS_ROOTFS}/cross-tools-x86_64/bin")
 locate_toolchain_exec(gcc CMAKE_C_COMPILER)
 locate_toolchain_exec(g++ CMAKE_CXX_COMPILER)
 else()
 set(CMAKE_C_COMPILER_EXTERNAL_TOOLCHAIN "${CROSS_ROOTFS}/cross-tools-x86_64")
 set(CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN "${CROSS_ROOTFS}/cross-tools-x86_64")
 set(CMAKE_ASM_COMPILER_EXTERNAL_TOOLCHAIN "${CROSS_ROOTFS}/cross-tools-x86_64")
 endif()

 # let CMake set up the correct search paths
 include(Platform/Haiku)
Expand Down

6 changes: 5 additions & 1 deletion
eng/native/configureplatform.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -494,7 +494,11 @@ if(NOT CLR_CMAKE_TARGET_BROWSER AND NOT CLR_CMAKE_TARGET_WASI)
 # The default linker on Solaris also does not support PIE.
 if(NOT CLR_CMAKE_TARGET_ANDROID AND NOT CLR_CMAKE_TARGET_SUNOS AND NOT CLR_CMAKE_TARGET_APPLE AND NOT MSVC)
 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie")
 add_compile_options($<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:-fPIE>)
 if(CLR_CMAKE_TARGET_HAIKU)
 add_compile_options($<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:-fPIC>)
 else()
 add_compile_options($<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:-fPIE>)
 endif()
 add_compile_options($<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,SHARED_LIBRARY>:-fPIC>)
 endif()

Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/gc/unix/gcenv.unix.cpp

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -208,7 +208,7 @@ bool GCToOSInterface::Initialize()

#else // HAVE_SCHED_GETAFFINITY

 for (size_t i = 0; i < configuredCpuCount; i++)
 for (int i = 0; i < configuredCpuCount; i++)
 {
 g_processAffinitySet.Add(i);
 }
Expand Down

4 changes: 2 additions & 2 deletions
src/native/libs/System.Native/pal_environment.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,8 +25,8 @@ char** SystemNative_GetEnviron(void)
#endif
}

void SystemNative_FreeEnviron(char** environ)
void SystemNative_FreeEnviron(char** environment)
{
 // no op
 (void)environ;
 (void)environment;
}

2 changes: 1 addition & 1 deletion
src/native/libs/System.Native/pal_mount.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,7 @@
#endif // __HAIKU__

// Android does not define MNTOPT_RO
#ifndef MNTOPT_RO
#if !defined(MNTOPT_RO) && (HAVE_SYS_MNTENT_H || HAVE_MNTENT_H)
#define MNTOPT_RO "r"
#endif
#endif
Expand Down

2 changes: 1 addition & 1 deletion
src/native/libs/System.Native/pal_networking.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3681,6 +3681,7 @@ int32_t SystemNative_SendFile(intptr_t out_fd, intptr_t in_fd, int64_t offset, i
 // Emulate sendfile using a simple read/send loop.
 *sent = 0;
 char* buffer = NULL;
 size_t bufferLength = Min((size_t)count, 80 * 1024 * sizeof(char));

 // Save the original input file position and seek to the offset position
 off_t inputFileOrigOffset = lseek(infd, 0, SEEK_CUR);
Expand All@@ -3690,7 +3691,6 @@ int32_t SystemNative_SendFile(intptr_t out_fd, intptr_t in_fd, int64_t offset, i
 }

 // Allocate a buffer
 size_t bufferLength = Min((size_t)count, 80 * 1024 * sizeof(char));
 buffer = (char*)malloc(bufferLength);
 if (buffer == NULL)
 {
Expand Down

13 changes: 9 additions & 4 deletions
src/native/libs/System.Native/pal_process.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -784,24 +784,29 @@ static int32_t ConvertRLimitResourcesPalToPlatform(RLimitResources value)
#elif defined(RLIMIT_VMEM)
 case PAL_RLIMIT_RSS:
 return RLIMIT_VMEM;
#else
 case PAL_RLIMIT_RSS:
 break;
#endif
#ifdef RLIMIT_MEMLOCK
 case PAL_RLIMIT_MEMLOCK:
 return RLIMIT_MEMLOCK;
#elif defined(RLIMIT_VMEM)
 case PAL_RLIMIT_MEMLOCK:
 return RLIMIT_VMEM;
#else
 case PAL_RLIMIT_MEMLOCK:
 break;
#endif
#ifdef RLIMIT_NPROC
 case PAL_RLIMIT_NPROC:
 return RLIMIT_NPROC;
#else
 case PAL_RLIMIT_NPROC:
 break;
#endif
 case PAL_RLIMIT_NOFILE:
 return RLIMIT_NOFILE;
#if !defined(RLIMIT_RSS) || !(defined(RLIMIT_MEMLOCK) || defined(RLIMIT_VMEM)) || !defined(RLIMIT_NPROC)
 default:
 break;
#endif
 }

 assert_msg(false, "Unknown RLIMIT value", (int)value);
Expand Down

4 changes: 4 additions & 0 deletions
src/native/libs/System.Security.Cryptography.Native/pal_evp_pkey.c

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1005,7 +1005,11 @@ EVP_PKEY* CryptoNative_LoadKeyFromProvider(const char* providerName, const char*
 EvpPKeyExtraHandle* extra = (EvpPKeyExtraHandle*)malloc(sizeof(EvpPKeyExtraHandle));
 extra->prov = prov;
 extra->libCtx = libCtx;
#if defined(TARGET_HAIKU) && defined(__clang__)
 __c11_atomic_init(&extra->refCount, 1);
#else
 atomic_init(&extra->refCount, 1);
#endif
 *extraHandle = extra;
 }

Expand Down
Loading