Browse Source

revert to working build

Jon Lipstate 1 month ago
parent
commit
57bc45ae30
3 changed files with 6 additions and 7 deletions
  1. 2 2
      base/runtime/core_builtin.odin
  2. 2 2
      core/testing/signal_handler_libc.odin
  3. 2 3
      src/main.cpp

+ 2 - 2
base/runtime/core_builtin.odin

@@ -54,8 +54,8 @@ container_of :: #force_inline proc "contextless" (ptr: $P/^$Field_Type, $T: type
 
 
 when !NO_DEFAULT_TEMP_ALLOCATOR {
-	when ODIN_ARCH == .i386 && ODIN_OS == .Windows && ODIN_NO_CRT {
-		// Thread-local storage doesn't work on Windows i386 without CRT
+	when ODIN_ARCH == .i386 && ODIN_OS == .Windows {
+		// Thread-local storage is problematic on Windows i386
 		global_default_temp_allocator_data: Default_Temp_Allocator
 	} else {
 		@thread_local global_default_temp_allocator_data: Default_Temp_Allocator

+ 2 - 2
core/testing/signal_handler_libc.odin

@@ -24,8 +24,8 @@ import "core:terminal/ansi"
 @(private="file") stop_test_passed: libc.sig_atomic_t
 @(private="file") stop_test_alert:  libc.sig_atomic_t
 
-when ODIN_ARCH == .i386 && ODIN_OS == .Windows && ODIN_NO_CRT {
-	// Thread-local storage doesn't work on Windows i386 without CRT
+when ODIN_ARCH == .i386 && ODIN_OS == .Windows {
+	// Thread-local storage is problematic on Windows i386
 	@(private="file")
 	local_test_index: libc.sig_atomic_t
 	@(private="file")

+ 2 - 3
src/main.cpp

@@ -3619,9 +3619,8 @@ int main(int arg_count, char const **arg_ptr) {
 	// }
 	
 	// Warn about Windows i386 thread-local storage limitations
-	if (build_context.metrics.arch == TargetArch_i386 && build_context.metrics.os == TargetOs_windows && build_context.no_crt) {
-		gb_printf_err("Warning: Thread-local storage is not supported on Windows i386 with -no-crt.\n");
-		gb_printf_err("         Multi-threaded code will not work correctly.\n");
+	if (build_context.metrics.arch == TargetArch_i386 && build_context.metrics.os == TargetOs_windows) {
+		gb_printf_err("Warning: Thread-local storage is disabled on Windows i386.\n");
 	}
 
 	// Check chosen microarchitecture. If not found or ?, print list.