From 416d6b0338b05118f3e9c6d31d44183a47b1a4eb Mon Sep 17 00:00:00 2001
From: illusion0001 <37698908+illusion0001@users.noreply.github.com>
Date: Fri, 23 Jun 2023 07:01:36 -0500
Subject: [PATCH] Link `SceLibcInternal` first and make libc printf default

---
 .github/README.md                       | 4 ----
 .github/workflows/CI.yml                | 8 ++++----
 Makefile                                | 9 ++-------
 plugin_src/afr/Makefile                 | 8 ++------
 plugin_src/aio_fix_505/Makefile         | 8 ++------
 plugin_src/button_swap/Makefile         | 8 ++------
 plugin_src/fliprate_remover/Makefile    | 8 ++------
 plugin_src/force_1080p_display/Makefile | 8 ++------
 plugin_src/force_30_fps/Makefile        | 8 ++------
 plugin_src/game_call_example/Makefile   | 8 ++------
 plugin_src/game_patch/Makefile          | 8 ++------
 plugin_src/gamepad_helper/Makefile      | 6 +-----
 plugin_src/no_share_watermark/Makefile  | 8 ++------
 plugin_src/plugin_loader/Makefile       | 8 ++------
 plugin_src/plugin_template/Makefile     | 8 ++------
 15 files changed, 29 insertions(+), 86 deletions(-)

diff --git a/.github/README.md b/.github/README.md
index 81d463b3..09afda39 100644
--- a/.github/README.md
+++ b/.github/README.md
@@ -244,10 +244,6 @@ export GOLDHEN_SDK=[directory of installation]
 ```
 3. Run `make` in the root of the repository or `make` individually; built binaries can be found in `bin/plugins`.
 
-# Troubleshooting log crashes
-
-If you ran into crashes related to print logging (usually during VA args assignment clearing stack) you can try building with printf `make LOG=PRINTF`.
-
 <!-- Win32 build script not up to date-->
 ### Windows
 
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 22934233..6feb85f4 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -82,11 +82,11 @@ jobs:
       working-directory: SDK
       run: echo "GOLDHEN_SDK=$(pwd)" >> $GITHUB_ENV
 
-    - name: Build (Release) (printf)
-      run: make LOG=PRINTF
+    - name: Build (Release)
+      run: make
 
-    - name: Build (Debug) (printf)
-      run: make LOG=PRINTF DEBUG=1
+    - name: Build (Debug)
+      run: make DEBUG=1
 
     - name: Push module artifact (Release prx)
       uses: actions/upload-artifact@v3
diff --git a/Makefile b/Makefile
index 8b1bb933..cff80dcd 100644
--- a/Makefile
+++ b/Makefile
@@ -9,13 +9,8 @@ else
 	DEBUG_FLAG=DEBUG=0
 endif
 
-ifeq ($(LOG), PRINTF)
-	LOG_TYPE=PRINTF=1
-	LOG_MSG=libc:printf
-else
-	LOG_TYPE=
-	LOG_MSG=GoldHEN:SDK:KernelLog
-endif
+LOG_TYPE=PRINTF=1
+LOG_MSG=libc:printf
 
 all: build hashes
 
diff --git a/plugin_src/afr/Makefile b/plugin_src/afr/Makefile
index 478cef43..52b8b2f1 100644
--- a/plugin_src/afr/Makefile
+++ b/plugin_src/afr/Makefile
@@ -1,13 +1,9 @@
 # Library metadata.
 
 DEBUG_FLAGS = -D__FINAL__=1
-LOG_TYPE = -D__USE_KLOG__
+LOG_TYPE = -D__USE_PRINTF__
 BUILD_TYPE = _final
 
-ifeq ($(PRINTF),1)
-    LOG_TYPE = -D__USE_PRINTF__
-endif
-
 ifeq ($(DEBUG),1)
     DEBUG_FLAGS = -D__FINAL__=0
 	BUILD_TYPE = _debug
@@ -22,7 +18,7 @@ TARGET_ELF   := $(BUILD_FOLDER)/elf$(TYPE)/$(OUTPUT_PRX)
 TARGETSTUB   := $(OUTPUT_PRX).so
 
 # Libraries linked into the ELF.
-LIBS := -lGoldHEN_Hook -lkernel -lSceLibcInternal -lSceSysmodule
+LIBS := -lSceLibcInternal -lGoldHEN_Hook -lkernel -lSceSysmodule
 
 EXTRAFLAGS := $(DEBUG_FLAGS) $(LOG_TYPE) -fcolor-diagnostics -Wall
 
diff --git a/plugin_src/aio_fix_505/Makefile b/plugin_src/aio_fix_505/Makefile
index 478bb929..95fd576a 100644
--- a/plugin_src/aio_fix_505/Makefile
+++ b/plugin_src/aio_fix_505/Makefile
@@ -1,13 +1,9 @@
 # Library metadata.
 
 DEBUG_FLAGS = -D__FINAL__=1
-LOG_TYPE = -D__USE_KLOG__
+LOG_TYPE = -D__USE_PRINTF__
 BUILD_TYPE = _final
 
-ifeq ($(PRINTF),1)
-    LOG_TYPE = -D__USE_PRINTF__
-endif
-
 ifeq ($(DEBUG),1)
     DEBUG_FLAGS = -D__FINAL__=0
     BUILD_TYPE = _debug
@@ -22,7 +18,7 @@ TARGET_ELF   := $(BUILD_FOLDER)/elf$(TYPE)/$(OUTPUT_PRX)
 TARGETSTUB   := $(OUTPUT_PRX).so
 
 # Libraries linked into the ELF.
-LIBS := -lGoldHEN_Hook -lkernel -lSceLibcInternal -lSceSysmodule
+LIBS := -lSceLibcInternal -lGoldHEN_Hook -lkernel -lSceSysmodule
 
 EXTRAFLAGS := $(DEBUG_FLAGS) $(LOG_TYPE) -fcolor-diagnostics -Wall
 
diff --git a/plugin_src/button_swap/Makefile b/plugin_src/button_swap/Makefile
index e3fe28b8..959fd4c4 100644
--- a/plugin_src/button_swap/Makefile
+++ b/plugin_src/button_swap/Makefile
@@ -1,13 +1,9 @@
 # Library metadata.
 
 DEBUG_FLAGS = -D__FINAL__=1
-LOG_TYPE = -D__USE_KLOG__
+LOG_TYPE = -D__USE_PRINTF__
 BUILD_TYPE = _final
 
-ifeq ($(PRINTF),1)
-    LOG_TYPE = -D__USE_PRINTF__
-endif
-
 ifeq ($(DEBUG),1)
     DEBUG_FLAGS = -D__FINAL__=0
     BUILD_TYPE = _debug
@@ -22,7 +18,7 @@ TARGET_ELF   := $(BUILD_FOLDER)/elf$(TYPE)/$(OUTPUT_PRX)
 TARGETSTUB   := $(OUTPUT_PRX).so
 
 # Libraries linked into the ELF.
-LIBS := -lGoldHEN_Hook -lkernel -lSceLibcInternal -lSceSysmodule -lSceSystemService
+LIBS := -lSceLibcInternal -lGoldHEN_Hook -lkernel -lSceSysmodule -lSceSystemService
 
 EXTRAFLAGS := $(DEBUG_FLAGS) $(LOG_TYPE) -fcolor-diagnostics -Wall
 
diff --git a/plugin_src/fliprate_remover/Makefile b/plugin_src/fliprate_remover/Makefile
index ed16bb69..2f2bf968 100644
--- a/plugin_src/fliprate_remover/Makefile
+++ b/plugin_src/fliprate_remover/Makefile
@@ -1,13 +1,9 @@
 # Library metadata.
 
 DEBUG_FLAGS = -D__FINAL__=1
-LOG_TYPE = -D__USE_KLOG__
+LOG_TYPE = -D__USE_PRINTF__
 BUILD_TYPE = _final
 
-ifeq ($(PRINTF),1)
-    LOG_TYPE = -D__USE_PRINTF__
-endif
-
 ifeq ($(DEBUG),1)
     DEBUG_FLAGS = -D__FINAL__=0
     BUILD_TYPE = _debug
@@ -22,7 +18,7 @@ TARGET_ELF   := $(BUILD_FOLDER)/elf$(TYPE)/$(OUTPUT_PRX)
 TARGETSTUB   := $(OUTPUT_PRX).so
 
 # Libraries linked into the ELF.
-LIBS := -lSceVideoOut -lGoldHEN_Hook -lkernel -lSceLibcInternal -lSceSysmodule
+LIBS := -lSceLibcInternal -lSceVideoOut -lGoldHEN_Hook -lkernel -lSceSysmodule
 
 EXTRAFLAGS := $(DEBUG_FLAGS) $(LOG_TYPE) -fcolor-diagnostics -Wall
 
diff --git a/plugin_src/force_1080p_display/Makefile b/plugin_src/force_1080p_display/Makefile
index ed16bb69..2f2bf968 100644
--- a/plugin_src/force_1080p_display/Makefile
+++ b/plugin_src/force_1080p_display/Makefile
@@ -1,13 +1,9 @@
 # Library metadata.
 
 DEBUG_FLAGS = -D__FINAL__=1
-LOG_TYPE = -D__USE_KLOG__
+LOG_TYPE = -D__USE_PRINTF__
 BUILD_TYPE = _final
 
-ifeq ($(PRINTF),1)
-    LOG_TYPE = -D__USE_PRINTF__
-endif
-
 ifeq ($(DEBUG),1)
     DEBUG_FLAGS = -D__FINAL__=0
     BUILD_TYPE = _debug
@@ -22,7 +18,7 @@ TARGET_ELF   := $(BUILD_FOLDER)/elf$(TYPE)/$(OUTPUT_PRX)
 TARGETSTUB   := $(OUTPUT_PRX).so
 
 # Libraries linked into the ELF.
-LIBS := -lSceVideoOut -lGoldHEN_Hook -lkernel -lSceLibcInternal -lSceSysmodule
+LIBS := -lSceLibcInternal -lSceVideoOut -lGoldHEN_Hook -lkernel -lSceSysmodule
 
 EXTRAFLAGS := $(DEBUG_FLAGS) $(LOG_TYPE) -fcolor-diagnostics -Wall
 
diff --git a/plugin_src/force_30_fps/Makefile b/plugin_src/force_30_fps/Makefile
index ed16bb69..2f2bf968 100644
--- a/plugin_src/force_30_fps/Makefile
+++ b/plugin_src/force_30_fps/Makefile
@@ -1,13 +1,9 @@
 # Library metadata.
 
 DEBUG_FLAGS = -D__FINAL__=1
-LOG_TYPE = -D__USE_KLOG__
+LOG_TYPE = -D__USE_PRINTF__
 BUILD_TYPE = _final
 
-ifeq ($(PRINTF),1)
-    LOG_TYPE = -D__USE_PRINTF__
-endif
-
 ifeq ($(DEBUG),1)
     DEBUG_FLAGS = -D__FINAL__=0
     BUILD_TYPE = _debug
@@ -22,7 +18,7 @@ TARGET_ELF   := $(BUILD_FOLDER)/elf$(TYPE)/$(OUTPUT_PRX)
 TARGETSTUB   := $(OUTPUT_PRX).so
 
 # Libraries linked into the ELF.
-LIBS := -lSceVideoOut -lGoldHEN_Hook -lkernel -lSceLibcInternal -lSceSysmodule
+LIBS := -lSceLibcInternal -lSceVideoOut -lGoldHEN_Hook -lkernel -lSceSysmodule
 
 EXTRAFLAGS := $(DEBUG_FLAGS) $(LOG_TYPE) -fcolor-diagnostics -Wall
 
diff --git a/plugin_src/game_call_example/Makefile b/plugin_src/game_call_example/Makefile
index 1f01a559..7211710b 100644
--- a/plugin_src/game_call_example/Makefile
+++ b/plugin_src/game_call_example/Makefile
@@ -1,13 +1,9 @@
 # Library metadata.
 
 DEBUG_FLAGS = -D__FINAL__=1
-LOG_TYPE = -D__USE_KLOG__
+LOG_TYPE = -D__USE_PRINTF__
 BUILD_TYPE = _final
 
-ifeq ($(PRINTF),1)
-    LOG_TYPE = -D__USE_PRINTF__
-endif
-
 ifeq ($(DEBUG),1)
     DEBUG_FLAGS = -D__FINAL__=0
     BUILD_TYPE = _debug
@@ -22,7 +18,7 @@ TARGET_ELF   := $(BUILD_FOLDER)/elf$(TYPE)/$(OUTPUT_PRX)
 TARGETSTUB   := $(OUTPUT_PRX).so
 
 # Libraries linked into the ELF.
-LIBS := -lGoldHEN_Hook -lkernel -lSceLibcInternal -lSceSysmodule
+LIBS := -lSceLibcInternal -lGoldHEN_Hook -lkernel -lSceSysmodule
 
 EXTRAFLAGS := $(DEBUG_FLAGS) $(LOG_TYPE) -fcolor-diagnostics -Wall
 
diff --git a/plugin_src/game_patch/Makefile b/plugin_src/game_patch/Makefile
index 444df8c1..64d99158 100644
--- a/plugin_src/game_patch/Makefile
+++ b/plugin_src/game_patch/Makefile
@@ -1,13 +1,9 @@
 # Library metadata.
 
 DEBUG_FLAGS = -D__FINAL__=1
-LOG_TYPE = -D__USE_KLOG__
+LOG_TYPE = -D__USE_PRINTF__
 BUILD_TYPE = _final
 
-ifeq ($(PRINTF),1)
-    LOG_TYPE = -D__USE_PRINTF__
-endif
-
 ifeq ($(DEBUG),1)
     DEBUG_FLAGS = -D__FINAL__=0
     BUILD_TYPE = _debug
@@ -22,7 +18,7 @@ TARGET_ELF   := $(BUILD_FOLDER)/elf$(TYPE)/$(OUTPUT_PRX)
 TARGETSTUB   := $(OUTPUT_PRX).so
 
 # Libraries linked into the ELF.
-LIBS := -lGoldHEN_Hook -lkernel -lSceLibcInternal -lSceSysmodule -lmxml
+LIBS := -lSceLibcInternal -lGoldHEN_Hook -lkernel -lSceSysmodule -lmxml
 
 EXTRAFLAGS := $(DEBUG_FLAGS) $(LOG_TYPE) -fcolor-diagnostics -Wall -D__PRX_BUILD__
 
diff --git a/plugin_src/gamepad_helper/Makefile b/plugin_src/gamepad_helper/Makefile
index 3814f797..9d753f7c 100644
--- a/plugin_src/gamepad_helper/Makefile
+++ b/plugin_src/gamepad_helper/Makefile
@@ -4,10 +4,6 @@ DEBUG_FLAGS = -D__FINAL__=1
 LOG_TYPE = -D__USE_PRINTF__
 BUILD_TYPE = _final
 
-ifeq ($(PRINTF),1)
-    LOG_TYPE = -D__USE_PRINTF__
-endif
-
 ifeq ($(DEBUG),1)
     DEBUG_FLAGS = -D__FINAL__=0
     BUILD_TYPE = _debug
@@ -22,7 +18,7 @@ TARGET_ELF   := $(BUILD_FOLDER)/elf$(TYPE)/$(OUTPUT_PRX)
 TARGETSTUB   := $(OUTPUT_PRX).so
 
 # Libraries linked into the ELF.
-LIBS := -lGoldHEN_Hook -lkernel -lSceLibcInternal -lSceSysmodule -lScePad
+LIBS := -lSceLibcInternal -lGoldHEN_Hook -lkernel -lSceSysmodule -lScePad
 
 EXTRAFLAGS := $(DEBUG_FLAGS) $(LOG_TYPE) -fcolor-diagnostics -Wall
 
diff --git a/plugin_src/no_share_watermark/Makefile b/plugin_src/no_share_watermark/Makefile
index b51626bf..120a4fac 100644
--- a/plugin_src/no_share_watermark/Makefile
+++ b/plugin_src/no_share_watermark/Makefile
@@ -1,13 +1,9 @@
 # Library metadata.
 
 DEBUG_FLAGS = -D__FINAL__=1
-LOG_TYPE = -D__USE_KLOG__
+LOG_TYPE = -D__USE_PRINTF__
 BUILD_TYPE = _final
 
-ifeq ($(PRINTF),1)
-    LOG_TYPE = -D__USE_PRINTF__
-endif
-
 ifeq ($(DEBUG),1)
     DEBUG_FLAGS = -D__FINAL__=0
     BUILD_TYPE = _debug
@@ -22,7 +18,7 @@ TARGET_ELF   := $(BUILD_FOLDER)/elf$(TYPE)/$(OUTPUT_PRX)
 TARGETSTUB   := $(OUTPUT_PRX).so
 
 # Libraries linked into the ELF.
-LIBS := -lSceScreenShot -lSceVideoRecording -lSceRemoteplay -lGoldHEN_Hook -lkernel -lSceLibcInternal -lSceSysmodule
+LIBS := -lSceLibcInternal -lSceScreenShot -lSceVideoRecording -lSceRemoteplay -lGoldHEN_Hook -lkernel -lSceSysmodule
 
 EXTRAFLAGS := $(DEBUG_FLAGS) $(LOG_TYPE) -fcolor-diagnostics -Wall
 
diff --git a/plugin_src/plugin_loader/Makefile b/plugin_src/plugin_loader/Makefile
index 1f01a559..7211710b 100644
--- a/plugin_src/plugin_loader/Makefile
+++ b/plugin_src/plugin_loader/Makefile
@@ -1,13 +1,9 @@
 # Library metadata.
 
 DEBUG_FLAGS = -D__FINAL__=1
-LOG_TYPE = -D__USE_KLOG__
+LOG_TYPE = -D__USE_PRINTF__
 BUILD_TYPE = _final
 
-ifeq ($(PRINTF),1)
-    LOG_TYPE = -D__USE_PRINTF__
-endif
-
 ifeq ($(DEBUG),1)
     DEBUG_FLAGS = -D__FINAL__=0
     BUILD_TYPE = _debug
@@ -22,7 +18,7 @@ TARGET_ELF   := $(BUILD_FOLDER)/elf$(TYPE)/$(OUTPUT_PRX)
 TARGETSTUB   := $(OUTPUT_PRX).so
 
 # Libraries linked into the ELF.
-LIBS := -lGoldHEN_Hook -lkernel -lSceLibcInternal -lSceSysmodule
+LIBS := -lSceLibcInternal -lGoldHEN_Hook -lkernel -lSceSysmodule
 
 EXTRAFLAGS := $(DEBUG_FLAGS) $(LOG_TYPE) -fcolor-diagnostics -Wall
 
diff --git a/plugin_src/plugin_template/Makefile b/plugin_src/plugin_template/Makefile
index 1f01a559..7211710b 100644
--- a/plugin_src/plugin_template/Makefile
+++ b/plugin_src/plugin_template/Makefile
@@ -1,13 +1,9 @@
 # Library metadata.
 
 DEBUG_FLAGS = -D__FINAL__=1
-LOG_TYPE = -D__USE_KLOG__
+LOG_TYPE = -D__USE_PRINTF__
 BUILD_TYPE = _final
 
-ifeq ($(PRINTF),1)
-    LOG_TYPE = -D__USE_PRINTF__
-endif
-
 ifeq ($(DEBUG),1)
     DEBUG_FLAGS = -D__FINAL__=0
     BUILD_TYPE = _debug
@@ -22,7 +18,7 @@ TARGET_ELF   := $(BUILD_FOLDER)/elf$(TYPE)/$(OUTPUT_PRX)
 TARGETSTUB   := $(OUTPUT_PRX).so
 
 # Libraries linked into the ELF.
-LIBS := -lGoldHEN_Hook -lkernel -lSceLibcInternal -lSceSysmodule
+LIBS := -lSceLibcInternal -lGoldHEN_Hook -lkernel -lSceSysmodule
 
 EXTRAFLAGS := $(DEBUG_FLAGS) $(LOG_TYPE) -fcolor-diagnostics -Wall