From e0f3da497f4ccf7ce8fedcd0a62ed07f8f443462 Mon Sep 17 00:00:00 2001
From: Cameron Cawley <[EMAIL REDACTED]>
Date: Thu, 12 May 2022 12:18:23 +0100
Subject: [PATCH] Remove unused SDL_ASSEMBLY_ROUTINES define
---
CMakeLists.txt | 2 --
configure | 3 ---
configure.ac | 2 --
include/SDL_config.h.cmake | 1 -
include/SDL_config.h.in | 1 -
include/SDL_config_macosx.h | 1 -
include/SDL_config_os2.h | 3 ---
include/SDL_config_windows.h | 5 -----
include/SDL_config_winrt.h | 5 -----
9 files changed, 23 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 22e23a33ca6..2ce31aba84e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -635,7 +635,6 @@ endif()
if(SDL_ASSEMBLY)
if(USE_GCC OR USE_CLANG)
- set(SDL_ASSEMBLY_ROUTINES 1)
# TODO: Those all seem to be quite GCC specific - needs to be
# reworked for better compiler support
set(HAVE_ASSEMBLY TRUE)
@@ -853,7 +852,6 @@ if(SDL_ASSEMBLY)
set(HAVE_SSE2 TRUE)
set(HAVE_SSE3 TRUE)
check_include_file("immintrin.h" HAVE_IMMINTRIN_H)
- set(SDL_ASSEMBLY_ROUTINES 1)
endif()
endif()
diff --git a/configure b/configure
index 069b263245c..3943176a089 100755
--- a/configure
+++ b/configure
@@ -18246,9 +18246,6 @@ if test x$enable_assembly = xyes; then
SUMMARY_modules="${SUMMARY_modules} assembly"
-$as_echo "#define SDL_ASSEMBLY_ROUTINES 1" >>confdefs.h
-
-
# Make sure that we don't generate floating point code that would
# cause illegal instruction exceptions on older processors
case "$host" in
diff --git a/configure.ac b/configure.ac
index 2958d3a4fcd..87cdcf327c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -583,8 +583,6 @@ AC_ARG_ENABLE(assembly,
if test x$enable_assembly = xyes; then
SUMMARY_modules="${SUMMARY_modules} assembly"
- AC_DEFINE(SDL_ASSEMBLY_ROUTINES, 1, [ ])
-
# Make sure that we don't generate floating point code that would
# cause illegal instruction exceptions on older processors
case "$host" in
diff --git a/include/SDL_config.h.cmake b/include/SDL_config.h.cmake
index 8445ac2e2df..9e058218d65 100644
--- a/include/SDL_config.h.cmake
+++ b/include/SDL_config.h.cmake
@@ -498,7 +498,6 @@
#cmakedefine SDL_LOCALE_DUMMY @SDL_LOCALE_DUMMY@
/* Enable assembly routines */
-#cmakedefine SDL_ASSEMBLY_ROUTINES @SDL_ASSEMBLY_ROUTINES@
#cmakedefine SDL_ALTIVEC_BLITTERS @SDL_ALTIVEC_BLITTERS@
#cmakedefine SDL_ARM_SIMD_BLITTERS @SDL_ARM_SIMD_BLITTERS@
#cmakedefine SDL_ARM_NEON_BLITTERS @SDL_ARM_NEON_BLITTERS@
diff --git a/include/SDL_config.h.in b/include/SDL_config.h.in
index 97b6e140d55..cd322ce879e 100644
--- a/include/SDL_config.h.in
+++ b/include/SDL_config.h.in
@@ -465,7 +465,6 @@
#undef SDL_LOCALE_DUMMY
/* Enable assembly routines */
-#undef SDL_ASSEMBLY_ROUTINES
#undef SDL_ALTIVEC_BLITTERS
#undef SDL_ARM_SIMD_BLITTERS
#undef SDL_ARM_NEON_BLITTERS
diff --git a/include/SDL_config_macosx.h b/include/SDL_config_macosx.h
index f752a7b1de3..023ecaae329 100644
--- a/include/SDL_config_macosx.h
+++ b/include/SDL_config_macosx.h
@@ -269,7 +269,6 @@
#define SDL_FILESYSTEM_COCOA 1
/* Enable assembly routines */
-#define SDL_ASSEMBLY_ROUTINES 1
#ifdef __ppc__
#define SDL_ALTIVEC_BLITTERS 1
#endif
diff --git a/include/SDL_config_os2.h b/include/SDL_config_os2.h
index ae11ccdebd5..130dd324a6a 100644
--- a/include/SDL_config_os2.h
+++ b/include/SDL_config_os2.h
@@ -56,9 +56,6 @@
#define SDL_TIMER_OS2 1
#define SDL_FILESYSTEM_OS2 1
-/* Enable assembly routines */
-#define SDL_ASSEMBLY_ROUTINES 1
-
/* use libsamplerate for audio rate conversion. */
/*#define HAVE_LIBSAMPLERATE_H 1 */
diff --git a/include/SDL_config_windows.h b/include/SDL_config_windows.h
index 7c2d746437e..90f5ddc0605 100644
--- a/include/SDL_config_windows.h
+++ b/include/SDL_config_windows.h
@@ -301,11 +301,6 @@ typedef unsigned int uintptr_t;
/* Enable filesystem support */
#define SDL_FILESYSTEM_WINDOWS 1
-/* Enable assembly routines (Win64 doesn't have inline asm) */
-#ifndef _WIN64
-#define SDL_ASSEMBLY_ROUTINES 1
-#endif
-
#endif /* SDL_config_windows_h_ */
/* vi: set ts=4 sw=4 expandtab: */
diff --git a/include/SDL_config_winrt.h b/include/SDL_config_winrt.h
index 9d8d2ebd683..75aef4ebbdf 100644
--- a/include/SDL_config_winrt.h
+++ b/include/SDL_config_winrt.h
@@ -257,9 +257,4 @@ typedef unsigned int uintptr_t;
/* Enable system power support */
#define SDL_POWER_WINRT 1
-/* Enable assembly routines (Win64 doesn't have inline asm) */
-#ifndef _WIN64
-#define SDL_ASSEMBLY_ROUTINES 1
-#endif
-
#endif /* SDL_config_winrt_h_ */