From b739b89fd6030a6b8ac88e1d25d1b538ac6d5106 Mon Sep 17 00:00:00 2001
From: Falco Girgis <gyrovorbis@gmail.com>
Date: Sun, 16 Mar 2025 12:57:52 -0500
Subject: [PATCH] Fixing issues with previous merge.

---
 miami/Makefile           |  4 ----
 src/liberty/skel/dc/dc.h |  2 +-
 src/miami/skel/dc/dc.cpp | 13 -------------
 src/miami/skel/dc/dc.h   |  2 +-
 4 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/miami/Makefile b/miami/Makefile
index 0e4a9c5d..3ba3910f 100644
--- a/miami/Makefile
+++ b/miami/Makefile
@@ -136,11 +136,7 @@ CXXFLAGS += $(if $(WITH_32MB),-O3,-Os) \
 	$(if $(WITH_PROF),-DWITH_PROF=\"$(WITH_PROF)\") \
 	-MMD -MP -ffunction-sections -fdata-sections -ffast-math \
 	-fmerge-all-constants -fomit-frame-pointer -ml -std=gnu++20 \
-<<<<<<< HEAD
-	-fno-exceptions -fno-rtti -fipa-pta -Wno-write-strings \
-=======
 	-fno-exceptions -fno-rtti -fipa-pta -fno-PIC -Wno-write-strings \
->>>>>>> origin/main
 	-Wno-deprecated-enum-enum-conversion -Wno-deprecated-enum-float-conversion \
 	-Wno-multichar -Wno-unused-value -Wno-char-subscripts -Wno-reorder \
 	-Wno-unused-function -Wno-class-memaccess -fno-permissive \
diff --git a/src/liberty/skel/dc/dc.h b/src/liberty/skel/dc/dc.h
index bf935fc8..08c3b1fa 100644
--- a/src/liberty/skel/dc/dc.h
+++ b/src/liberty/skel/dc/dc.h
@@ -1,3 +1,3 @@
 #pragma once
 
-extern "C" const char* getExecutableTag();
+extern "C" const char* getExecutableTag();
\ No newline at end of file
diff --git a/src/miami/skel/dc/dc.cpp b/src/miami/skel/dc/dc.cpp
index d2a72a44..7c997e69 100644
--- a/src/miami/skel/dc/dc.cpp
+++ b/src/miami/skel/dc/dc.cpp
@@ -2015,11 +2015,7 @@ __attribute__((noinline)) void stacktrace() {
 		: "+r" (sp), "+r" (pr)
 		:
 		: );
-<<<<<<< HEAD
-	dbglog(DBG_CRITICAL, "DCA3: %s\n", getExecutableTag());
-=======
 	dbglog(DBG_CRITICAL, "%s\n", getExecutableTag());
->>>>>>> origin/main
 	dbglog(DBG_CRITICAL, "Stack trace: %p ", (void*)pr);
 	int found = 0;
 	if(!(sp & 3) && sp > 0x8c000000 && sp < _arch_mem_top) {
@@ -2068,24 +2064,15 @@ __attribute__((noinline)) void stacktrace() {
 
 #endif
 
-<<<<<<< HEAD
-const char* getExecutableTag() {
-	return GIT_VERSION ":" CI_JOB_ID;
-=======
 // extern "C" cus also used by KOS
 extern "C" const char* getExecutableTag() {
 	return "dca-miami " GIT_VERSION ":" CI_JOB_ID;
->>>>>>> origin/main
 }
 
 int
 main(int argc, char *argv[])
 {
-<<<<<<< HEAD
-    dbglog(DBG_CRITICAL, "DCA3: %s\n", getExecutableTag());
-=======
     dbglog(DBG_CRITICAL, "%s\n", getExecutableTag());
->>>>>>> origin/main
 	#if !defined(DC_SIM)
 	std::set_terminate([]() {
 		fflush(stdout);
diff --git a/src/miami/skel/dc/dc.h b/src/miami/skel/dc/dc.h
index bf935fc8..08c3b1fa 100644
--- a/src/miami/skel/dc/dc.h
+++ b/src/miami/skel/dc/dc.h
@@ -1,3 +1,3 @@
 #pragma once
 
-extern "C" const char* getExecutableTag();
+extern "C" const char* getExecutableTag();
\ No newline at end of file