Skip to content

Commit 2aa575f

Browse files
committed
Revert D120327 "compiler-rt: Add udivmodei5 to builtins and add bitint library"
It has several problems like not-compilable weak attribute with MSVC (and the usage needs further scrutiny), and " different types for formal and actual parameter" https://lab.llvm.org/buildbot/#/builders/127/builds/27760/steps/7/logs/stdio This reverts commit 8843245, 492c5c0, bf2dc4b.
1 parent 78a6f59 commit 2aa575f

File tree

14 files changed

+0
-21161
lines changed

14 files changed

+0
-21161
lines changed

compiler-rt/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ include(CompilerRTUtils)
3434

3535
option(COMPILER_RT_BUILD_BUILTINS "Build builtins" ON)
3636
mark_as_advanced(COMPILER_RT_BUILD_BUILTINS)
37-
option(COMPILER_RT_BUILD_BITINT "Build bitint" ON)
38-
mark_as_advanced(COMPILER_RT_BUILD_BITINT)
3937
option(COMPILER_RT_BUILD_CRT "Build crtbegin.o/crtend.o" ON)
4038
mark_as_advanced(COMPILER_RT_BUILD_CRT)
4139
option(COMPILER_RT_CRT_USE_EH_FRAME_REGISTRY "Use eh_frame in crtbegin.o/crtend.o" ON)

compiler-rt/cmake/builtin-config-ix.cmake

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,6 @@ set(ALL_BUILTIN_SUPPORTED_ARCH
6565
${RISCV32} ${RISCV64} ${SPARC} ${SPARCV9}
6666
${WASM32} ${WASM64} ${VE})
6767

68-
set(ALL_BITINT_SUPPORTED_ARCH
69-
${ALL_BUILTIN_SUPPORTED_ARCH})
70-
7168
include(CompilerRTUtils)
7269
include(CompilerRTDarwinUtils)
7370

@@ -198,7 +195,6 @@ if(APPLE)
198195
endforeach()
199196

200197
list_intersect(BUILTIN_SUPPORTED_ARCH ALL_BUILTIN_SUPPORTED_ARCH COMPILER_RT_SUPPORTED_ARCH)
201-
list_intersect(BITINT_SUPPORTED_ARCH ALL_BITINT_SUPPORTED_ARCH COMPILER_RT_SUPPORTED_ARCH)
202198

203199
else()
204200
# If we're not building the builtins standalone, just rely on the tests in
@@ -210,8 +206,6 @@ else()
210206
# Architectures supported by compiler-rt libraries.
211207
filter_available_targets(BUILTIN_SUPPORTED_ARCH
212208
${ALL_BUILTIN_SUPPORTED_ARCH})
213-
filter_available_targets(BITINT_SUPPORTED_ARCH
214-
${ALL_BITINT_SUPPORTED_ARCH})
215209
endif()
216210

217211
message(STATUS "Builtin supported architectures: ${BUILTIN_SUPPORTED_ARCH}")

compiler-rt/lib/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@ if(COMPILER_RT_BUILD_BUILTINS)
1717
add_subdirectory(builtins)
1818
endif()
1919

20-
if(COMPILER_RT_BUILD_BITINT)
21-
add_subdirectory(bitint)
22-
endif()
23-
2420
if(COMPILER_RT_BUILD_CRT)
2521
add_subdirectory(crt)
2622
endif()

compiler-rt/lib/bitint/CMakeLists.txt

Lines changed: 0 additions & 11 deletions
This file was deleted.

compiler-rt/lib/builtins/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,6 @@ set(GENERIC_SOURCES
174174
udivmoddi4.c
175175
udivmodsi4.c
176176
udivmodti4.c
177-
udivmodei5.c
178177
udivsi3.c
179178
udivti3.c
180179
umoddi3.c

compiler-rt/lib/builtins/int_lib.h

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -110,29 +110,6 @@ COMPILER_RT_ABI su_int __udivsi3(su_int n, su_int d);
110110

111111
COMPILER_RT_ABI su_int __udivmodsi4(su_int a, su_int b, su_int *rem);
112112
COMPILER_RT_ABI du_int __udivmoddi4(du_int a, du_int b, du_int *rem);
113-
114-
/// Computes the unsigned division of a / b for two large integers
115-
/// composed of n significant words.
116-
/// Writes the quotient to quo and the remainder to rem.
117-
///
118-
/// \param quo The quotient represented by n words. Must be non-null.
119-
/// \param rem The remainder represented by n words. Must be non-null.
120-
/// \param a The dividend represented by n + 1 words. Must be non-null.
121-
/// \param b The divisor represented by n words. Must be non-null.
122-
123-
/// \note The word order is in host endianness.
124-
/// \note Might modify a and b.
125-
/// \note The storage of 'a' needs to hold n + 1 elements because some
126-
/// implementations need extra scratch space in the most significant word.
127-
/// The value of that word is ignored.
128-
COMPILER_RT_ABI void __udivmodei5(su_int *quo, su_int *rem, su_int *a,
129-
su_int *b, unsigned int n);
130-
131-
/// Computes the signed division of a / b.
132-
/// See __udivmodei5 for details.
133-
COMPILER_RT_ABI void __divmodei5(su_int *quo, su_int *rem, su_int *a, su_int *b,
134-
unsigned int words);
135-
136113
#ifdef CRT_HAS_128BIT
137114
COMPILER_RT_ABI int __clzti2(ti_int a);
138115
COMPILER_RT_ABI tu_int __udivmodti4(tu_int a, tu_int b, tu_int *rem);

compiler-rt/lib/builtins/udivmodei5.c

Lines changed: 0 additions & 173 deletions
This file was deleted.

compiler-rt/test/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,6 @@ if(COMPILER_RT_CAN_EXECUTE_TESTS)
6060
if(COMPILER_RT_BUILD_BUILTINS)
6161
add_subdirectory(builtins)
6262
endif()
63-
if(COMPILER_RT_BUILD_BITINT)
64-
add_subdirectory(bitint)
65-
endif()
6663
if(COMPILER_RT_BUILD_SANITIZERS)
6764
compiler_rt_test_runtime(interception)
6865

compiler-rt/test/bitint/CMakeLists.txt

Lines changed: 0 additions & 23 deletions
This file was deleted.

compiler-rt/test/bitint/Unit/bitint_test.c

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)