Skip to content

Commit 99f87de

Browse files
Copilotjkotas
andauthored
Remove obsolete ARMV7L CMake defines (#128199)
Remove obsolete ARMV7L-specific host/target CMake define wiring --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: jkotas <6668460+jkotas@users.noreply.github.com> Co-authored-by: Jan Kotas <jkotas@microsoft.com>
1 parent f397c83 commit 99f87de

2 files changed

Lines changed: 8 additions & 26 deletions

File tree

eng/native/configureplatform.cmake

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ if(CLR_CMAKE_HOST_OS STREQUAL linux)
4343
set(CLR_CMAKE_HOST_UNIX_AMD64 1)
4444
elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL armv7l OR CMAKE_SYSTEM_PROCESSOR STREQUAL armv8l)
4545
set(CLR_CMAKE_HOST_UNIX_ARM 1)
46-
set(CLR_CMAKE_HOST_UNIX_ARMV7L 1)
4746
elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL arm OR CMAKE_SYSTEM_PROCESSOR STREQUAL armv7-a)
4847
set(CLR_CMAKE_HOST_UNIX_ARM 1)
4948
elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL armv6 OR CMAKE_SYSTEM_PROCESSOR STREQUAL armv6l)
@@ -238,10 +237,6 @@ endif(CLR_CMAKE_TARGET_OS STREQUAL wasi)
238237
if(CLR_CMAKE_HOST_UNIX_ARM)
239238
set(CLR_CMAKE_HOST_ARCH_ARM 1)
240239
set(CLR_CMAKE_HOST_ARCH "arm")
241-
242-
if(CLR_CMAKE_HOST_UNIX_ARMV7L)
243-
set(CLR_CMAKE_HOST_ARCH_ARMV7L 1)
244-
endif()
245240
elseif(CLR_CMAKE_HOST_UNIX_ARMV6)
246241
set(CLR_CMAKE_HOST_ARCH_ARMV6 1)
247242
set(CLR_CMAKE_HOST_ARCH "armv6")
@@ -299,12 +294,6 @@ endif()
299294
# if target arch is not specified then host & target are same
300295
if(NOT DEFINED CLR_CMAKE_TARGET_ARCH OR CLR_CMAKE_TARGET_ARCH STREQUAL "" )
301296
set(CLR_CMAKE_TARGET_ARCH ${CLR_CMAKE_HOST_ARCH})
302-
303-
# This is required for "arm" targets (CMAKE_SYSTEM_PROCESSOR "armv7l"),
304-
# for which this flag otherwise won't be set up below
305-
if (CLR_CMAKE_HOST_ARCH_ARMV7L)
306-
set(CLR_CMAKE_TARGET_ARCH_ARMV7L 1)
307-
endif()
308297
endif()
309298

310299
# Set target architecture variables
@@ -324,7 +313,6 @@ elseif(CLR_CMAKE_TARGET_ARCH STREQUAL armv6)
324313
set(CLR_CMAKE_TARGET_ARCH_ARMV6 1)
325314
elseif(CLR_CMAKE_TARGET_ARCH STREQUAL armel)
326315
set(CLR_CMAKE_TARGET_ARCH_ARM 1)
327-
set(CLR_CMAKE_TARGET_ARCH_ARMV7L 1)
328316
set(ARM_SOFTFP 1)
329317
elseif(CLR_CMAKE_TARGET_ARCH STREQUAL s390x)
330318
set(CLR_CMAKE_TARGET_ARCH_S390X 1)

src/native/libs/CMakeLists.txt

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -83,20 +83,14 @@ if (CLR_CMAKE_TARGET_UNIX OR CLR_CMAKE_TARGET_BROWSER OR CLR_CMAKE_TARGET_WASI)
8383

8484
add_definitions(-DDEBUG)
8585
elseif (UPPERCASE_CMAKE_BUILD_TYPE STREQUAL RELEASE)
86-
# Use O1 option when the clang version is smaller than 3.9
87-
# Otherwise use O3 option in release build
88-
if (CLR_CMAKE_TARGET_ARCH_ARMV7L AND DEFINED ENV{CROSSCOMPILE} AND CMAKE_C_COMPILER_VERSION VERSION_LESS 3.9)
89-
add_compile_options (-O1)
90-
else ()
91-
if(CLR_CMAKE_TARGET_ANDROID)
92-
# -O2 optimization generates faster/smaller code on Android
93-
# TODO: This duplicates the settings in eng/native/configureoptimization.cmake, we should unify it
94-
add_compile_options (-O2)
95-
elseif (CLR_CMAKE_TARGET_BROWSER)
96-
add_compile_options (-Oz)
97-
else()
98-
add_compile_options (-O3)
99-
endif ()
86+
if(CLR_CMAKE_TARGET_ANDROID)
87+
# -O2 optimization generates faster/smaller code on Android
88+
# TODO: This duplicates the settings in eng/native/configureoptimization.cmake, we should unify it
89+
add_compile_options (-O2)
90+
elseif (CLR_CMAKE_TARGET_BROWSER)
91+
add_compile_options (-Oz)
92+
else()
93+
add_compile_options (-O3)
10094
endif ()
10195
else ()
10296
message(FATAL_ERROR "Unknown build type. Set CMAKE_BUILD_TYPE to DEBUG or RELEASE.")

0 commit comments

Comments
 (0)