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

Commit 01804d4

Browse files
Jorge Aparicioalexcrichton
Jorge Aparicio
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 2a84c64 commit 01804d4

File tree

1 file changed

+36
-35
lines changed

1 file changed

+36
-35
lines changed

lib/builtins/CMakeLists.txt

+36-35
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,6 @@ else () # MSVC
257257
endif () # if (NOT MSVC)
258258

259259
set(arm_SOURCES
260-
arm/adddf3vfp.S
261-
arm/addsf3vfp.S
262260
arm/aeabi_cdcmp.S
263261
arm/aeabi_cdcmpeq_check_nan.c
264262
arm/aeabi_cfcmp.S
@@ -281,40 +279,11 @@ set(arm_SOURCES
281279
arm/clzdi2.S
282280
arm/clzsi2.S
283281
arm/comparesf2.S
284-
arm/divdf3vfp.S
285282
arm/divmodsi4.S
286-
arm/divsf3vfp.S
287283
arm/divsi3.S
288-
arm/eqdf2vfp.S
289-
arm/eqsf2vfp.S
290-
arm/extendsfdf2vfp.S
291-
arm/fixdfsivfp.S
292-
arm/fixsfsivfp.S
293-
arm/fixunsdfsivfp.S
294-
arm/fixunssfsivfp.S
295-
arm/floatsidfvfp.S
296-
arm/floatsisfvfp.S
297-
arm/floatunssidfvfp.S
298-
arm/floatunssisfvfp.S
299-
arm/gedf2vfp.S
300-
arm/gesf2vfp.S
301-
arm/gtdf2vfp.S
302-
arm/gtsf2vfp.S
303-
arm/ledf2vfp.S
304-
arm/lesf2vfp.S
305-
arm/ltdf2vfp.S
306-
arm/ltsf2vfp.S
307284
arm/modsi3.S
308-
arm/muldf3vfp.S
309-
arm/mulsf3vfp.S
310-
arm/nedf2vfp.S
311285
arm/negdf2vfp.S
312286
arm/negsf2vfp.S
313-
arm/nesf2vfp.S
314-
arm/restore_vfp_d8_d15_regs.S
315-
arm/save_vfp_d8_d15_regs.S
316-
arm/subdf3vfp.S
317-
arm/subsf3vfp.S
318287
arm/switch16.S
319288
arm/switch32.S
320289
arm/switch8.S
@@ -340,12 +309,9 @@ set(arm_SOURCES
340309
arm/sync_fetch_and_xor_4.S
341310
arm/sync_fetch_and_xor_8.S
342311
arm/sync_synchronize.S
343-
arm/truncdfsf2vfp.S
344312
arm/udivmodsi4.S
345313
arm/udivsi3.S
346314
arm/umodsi3.S
347-
arm/unorddf2vfp.S
348-
arm/unordsf2vfp.S
349315
${GENERIC_SOURCES})
350316

351317
set(aarch64_SOURCES
@@ -367,7 +333,42 @@ set(aarch64_SOURCES
367333
trunctfsf2.c
368334
${GENERIC_SOURCES})
369335

370-
set(armhf_SOURCES ${arm_SOURCES})
336+
set(armhf_SOURCES
337+
arm/adddf3vfp.S
338+
arm/addsf3vfp.S
339+
arm/divdf3vfp.S
340+
arm/divsf3vfp.S
341+
arm/eqdf2vfp.S
342+
arm/eqsf2vfp.S
343+
arm/extendsfdf2vfp.S
344+
arm/fixdfsivfp.S
345+
arm/fixsfsivfp.S
346+
arm/fixunsdfsivfp.S
347+
arm/fixunssfsivfp.S
348+
arm/floatsidfvfp.S
349+
arm/floatsisfvfp.S
350+
arm/floatunssidfvfp.S
351+
arm/floatunssisfvfp.S
352+
arm/gedf2vfp.S
353+
arm/gesf2vfp.S
354+
arm/gtdf2vfp.S
355+
arm/gtsf2vfp.S
356+
arm/ledf2vfp.S
357+
arm/lesf2vfp.S
358+
arm/ltdf2vfp.S
359+
arm/ltsf2vfp.S
360+
arm/muldf3vfp.S
361+
arm/mulsf3vfp.S
362+
arm/nedf2vfp.S
363+
arm/nesf2vfp.S
364+
arm/restore_vfp_d8_d15_regs.S
365+
arm/save_vfp_d8_d15_regs.S
366+
arm/subdf3vfp.S
367+
arm/subsf3vfp.S
368+
arm/truncdfsf2vfp.S
369+
arm/unorddf2vfp.S
370+
arm/unordsf2vfp.S
371+
${arm_SOURCES})
371372
set(armv7_SOURCES ${arm_SOURCES})
372373
set(armv7s_SOURCES ${arm_SOURCES})
373374
set(armv7k_SOURCES ${arm_SOURCES})

0 commit comments

Comments
 (0)