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

Fix build errors for compiler-rt on Android #3

Closed
wants to merge 2 commits into from
Closed

Fix build errors for compiler-rt on Android #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96c902c
Fixed _clearcache implementation
vhbit Jun 14, 2014
7b97b84
Turned off compilation of sync functions
vhbit Jun 14, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/builtins/clear_cache.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@ __clear_cache(void* start, void* end)

sysarch(ARM_SYNC_ICACHE, &arg);
#elif defined(ANDROID)
const register int start_reg __asm("r0") = (int) (intptr_t) start;
register int start_reg __asm("r0") = (int) (intptr_t) start;
const register int end_reg __asm("r1") = (int) (intptr_t) end;
const register int flags __asm("r2") = 0;
const register int syscall_nr __asm("r7") = __ARM_NR_cacheflush;
__asm __volatile("svc 0x0" : "=r"(start_reg)
: "r"(syscall_nr), "r"(start_reg), "r"(end_reg), "r"(flags) : "r0");
: "r"(syscall_nr), "r"(start_reg), "r"(end_reg), "r"(flags));
if (start_reg != 0) {
compilerrt_abort();
}
Expand Down
31 changes: 30 additions & 1 deletion make/platform/triple.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,34 @@ endif
# Filter out stuff that gcc cannot compile (these are only needed for clang-generated code anywasys).
CommonFunctions_gcc := $(filter-out atomic enable_execute_stack,$(CommonFunctions))

FUNCTIONS.builtins := $(CommonFunctions_gcc) $(value ArchFunctions.$(Arch))
# Filter out stuff which is not available on specific target
# For example, sync_fetch_and_add_4 uses Thumb instructions, which are unavailable
# when building for arm-linux-androideabi
ifeq ($(TargetTriple),arm-linux-androideabi)
ArchDisabledFunctions := \
sync_fetch_and_add_4 \
sync_fetch_and_sub_4 \
sync_fetch_and_and_4 \
sync_fetch_and_or_4 \
sync_fetch_and_xor_4 \
sync_fetch_and_nand_4 \
sync_fetch_and_max_4 \
sync_fetch_and_umax_4 \
sync_fetch_and_min_4 \
sync_fetch_and_umin_4 \
sync_fetch_and_add_8 \
sync_fetch_and_sub_8 \
sync_fetch_and_and_8 \
sync_fetch_and_or_8 \
sync_fetch_and_xor_8 \
sync_fetch_and_nand_8 \
sync_fetch_and_max_8 \
sync_fetch_and_umax_8 \
sync_fetch_and_min_8 \
sync_fetch_and_umin_8
endif

ArchEnabledFunctions := $(filter-out $(ArchDisabledFunctions),$(value ArchFunctions.$(Arch)))

FUNCTIONS.builtins := $(CommonFunctions_gcc) $(ArchEnabledFunctions)