Fix warning about ptr arithmetic with void*

HookedBehemoth · Oct 9, 2024 · 5fb2957 · 5fb2957
1 parent 49438db
commit 5fb2957
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -31,7 +31,7 @@ SOURCES		:=	source
 #---------------------------------------------------------------------------------
 ARCH	:=	-march=armv8-a+crc+crypto -mtune=cortex-a57 -mtp=soft -fPIE
 
-CFLAGS	:=	-g -Wall -O2 -ffunction-sections \
+CFLAGS	:=	-g -Wall -Wextra -Wpedantic -Werror -O2 -ffunction-sections \
 			$(ARCH) $(DEFINES)
 
 CFLAGS	+=	$(INCLUDE) -D__SWITCH__

diff --git a/source/main.cpp b/source/main.cpp
@@ -34,7 +34,7 @@ void __libnx_init(void*, Handle main_thread, void*) {
     tv->magic      = THREADVARS_MAGIC;
     tv->thread_ptr = NULL;
     tv->reent      = _impure_ptr;
-    tv->tls_tp     = __tls_start-2*sizeof(void*); // subtract size of Thread Control Block (TCB)
+    tv->tls_tp     = (void*)((uintptr_t)__tls_start-2*sizeof(void*)); // subtract size of Thread Control Block (TCB)
     tv->handle     = main_thread;
 
     while ((armGetSystemTick() / armGetSystemTickFreq()) < 10)