Skip to content
This repository was archived by the owner on May 21, 2019. It is now read-only.

Commit 593bc25

Browse files
Jorge Aparicioalexcrichton
authored andcommitted
move *vfp intrinsics from the arm set into the armhf set
the arm set is for targets that use the soft float (no FPU) ABI and the armhf set is for targets that use the hard float ABI. These *vfp intrinsics use FPU instructions so they can't be compiled for soft float targets.
1 parent 012bb6f commit 593bc25

File tree

1 file changed

+36
-35
lines changed

1 file changed

+36
-35
lines changed

lib/builtins/CMakeLists.txt

Lines changed: 36 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -228,8 +228,6 @@ else () # MSVC
228228
endif () # if (NOT MSVC)
229229

230230
set(arm_SOURCES
231-
arm/adddf3vfp.S
232-
arm/addsf3vfp.S
233231
arm/aeabi_cdcmp.S
234232
arm/aeabi_cdcmpeq_check_nan.c
235233
arm/aeabi_cfcmp.S
@@ -252,40 +250,11 @@ set(arm_SOURCES
252250
arm/clzdi2.S
253251
arm/clzsi2.S
254252
arm/comparesf2.S
255-
arm/divdf3vfp.S
256253
arm/divmodsi4.S
257-
arm/divsf3vfp.S
258254
arm/divsi3.S
259-
arm/eqdf2vfp.S
260-
arm/eqsf2vfp.S
261-
arm/extendsfdf2vfp.S
262-
arm/fixdfsivfp.S
263-
arm/fixsfsivfp.S
264-
arm/fixunsdfsivfp.S
265-
arm/fixunssfsivfp.S
266-
arm/floatsidfvfp.S
267-
arm/floatsisfvfp.S
268-
arm/floatunssidfvfp.S
269-
arm/floatunssisfvfp.S
270-
arm/gedf2vfp.S
271-
arm/gesf2vfp.S
272-
arm/gtdf2vfp.S
273-
arm/gtsf2vfp.S
274-
arm/ledf2vfp.S
275-
arm/lesf2vfp.S
276-
arm/ltdf2vfp.S
277-
arm/ltsf2vfp.S
278255
arm/modsi3.S
279-
arm/muldf3vfp.S
280-
arm/mulsf3vfp.S
281-
arm/nedf2vfp.S
282256
arm/negdf2vfp.S
283257
arm/negsf2vfp.S
284-
arm/nesf2vfp.S
285-
arm/restore_vfp_d8_d15_regs.S
286-
arm/save_vfp_d8_d15_regs.S
287-
arm/subdf3vfp.S
288-
arm/subsf3vfp.S
289258
arm/switch16.S
290259
arm/switch32.S
291260
arm/switch8.S
@@ -311,12 +280,9 @@ set(arm_SOURCES
311280
arm/sync_fetch_and_xor_4.S
312281
arm/sync_fetch_and_xor_8.S
313282
arm/sync_synchronize.S
314-
arm/truncdfsf2vfp.S
315283
arm/udivmodsi4.S
316284
arm/udivsi3.S
317285
arm/umodsi3.S
318-
arm/unorddf2vfp.S
319-
arm/unordsf2vfp.S
320286
${GENERIC_SOURCES})
321287

322288
set(aarch64_SOURCES
@@ -338,7 +304,42 @@ set(aarch64_SOURCES
338304
trunctfsf2.c
339305
${GENERIC_SOURCES})
340306

341-
set(armhf_SOURCES ${arm_SOURCES})
307+
set(armhf_SOURCES
308+
arm/adddf3vfp.S
309+
arm/addsf3vfp.S
310+
arm/divdf3vfp.S
311+
arm/divsf3vfp.S
312+
arm/eqdf2vfp.S
313+
arm/eqsf2vfp.S
314+
arm/extendsfdf2vfp.S
315+
arm/fixdfsivfp.S
316+
arm/fixsfsivfp.S
317+
arm/fixunsdfsivfp.S
318+
arm/fixunssfsivfp.S
319+
arm/floatsidfvfp.S
320+
arm/floatsisfvfp.S
321+
arm/floatunssidfvfp.S
322+
arm/floatunssisfvfp.S
323+
arm/gedf2vfp.S
324+
arm/gesf2vfp.S
325+
arm/gtdf2vfp.S
326+
arm/gtsf2vfp.S
327+
arm/ledf2vfp.S
328+
arm/lesf2vfp.S
329+
arm/ltdf2vfp.S
330+
arm/ltsf2vfp.S
331+
arm/muldf3vfp.S
332+
arm/mulsf3vfp.S
333+
arm/nedf2vfp.S
334+
arm/nesf2vfp.S
335+
arm/restore_vfp_d8_d15_regs.S
336+
arm/save_vfp_d8_d15_regs.S
337+
arm/subdf3vfp.S
338+
arm/subsf3vfp.S
339+
arm/truncdfsf2vfp.S
340+
arm/unorddf2vfp.S
341+
arm/unordsf2vfp.S
342+
${arm_SOURCES})
342343
set(armv7_SOURCES ${arm_SOURCES})
343344
set(armv7s_SOURCES ${arm_SOURCES})
344345
set(arm64_SOURCES ${aarch64_SOURCES})

0 commit comments

Comments
 (0)