From ccdea1c4ad67431d3ba2460d8aab49f27d110da3 Mon Sep 17 00:00:00 2001
From: Nekotekina <nekotekina@gmail.com>
Date: Sat, 13 Mar 2021 18:03:08 +0300
Subject: [PATCH] Enable -Wduplicated-branches (GCC)

---
 Utilities/JIT.h                             | 3 +++
 rpcs3/cmake_modules/ConfigureCompiler.cmake | 2 +-
 rpcs3/stb_image.cpp                         | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Utilities/JIT.h b/Utilities/JIT.h
index c4fe904124..0ca8930641 100644
--- a/Utilities/JIT.h
+++ b/Utilities/JIT.h
@@ -15,6 +15,9 @@
 #pragma GCC diagnostic ignored "-Wold-style-cast"
 #pragma GCC diagnostic ignored "-Wunused-parameter"
 #pragma GCC diagnostic ignored "-Wstrict-aliasing"
+#ifndef __clang__
+#pragma GCC diagnostic ignored "-Wduplicated-branches"
+#endif
 #include <asmjit/asmjit.h>
 #pragma GCC diagnostic pop
 #endif
diff --git a/rpcs3/cmake_modules/ConfigureCompiler.cmake b/rpcs3/cmake_modules/ConfigureCompiler.cmake
index 962cc49291..7c51909955 100644
--- a/rpcs3/cmake_modules/ConfigureCompiler.cmake
+++ b/rpcs3/cmake_modules/ConfigureCompiler.cmake
@@ -50,7 +50,7 @@ else()
 		add_compile_options(-Werror=suggest-override)
 		add_compile_options(-Wclobbered)
 		add_compile_options(-Wcast-function-type)
-		#add_compile_options(-Wduplicated-branches)
+		add_compile_options(-Wduplicated-branches)
 		#add_compile_options(-Wduplicated-cond)
 		#add_compile_options(-Wredundant-decls)
 	endif()
diff --git a/rpcs3/stb_image.cpp b/rpcs3/stb_image.cpp
index 361b94e48a..43e33e80d7 100644
--- a/rpcs3/stb_image.cpp
+++ b/rpcs3/stb_image.cpp
@@ -17,6 +17,9 @@
 #pragma GCC diagnostic ignored "-Wextra"
 #pragma GCC diagnostic ignored "-Wold-style-cast"
 #pragma GCC diagnostic ignored "-Wstrict-aliasing"
+#ifndef __clang__
+#pragma GCC diagnostic ignored "-Wduplicated-branches"
+#endif
 #include <stb_image.h>
 #include <stb_truetype.h>
 #pragma GCC diagnostic pop