Merge "Fix -Wshorten-64-to-32 errors in Haystack"
This commit is contained in:
committed by
Android (Google) Code Review
commit
5d41a77815
@@ -42,7 +42,7 @@ bool supports_membarier_syscall() {
|
|||||||
// Reference:
|
// Reference:
|
||||||
// * membarrier(2)
|
// * membarrier(2)
|
||||||
// * art::jit::JitMemoryRegion::CommitCode
|
// * art::jit::JitMemoryRegion::CommitCode
|
||||||
int membarrier_function(int command) {
|
long membarrier_function(int command) {
|
||||||
static bool supports_membarier = supports_membarier_syscall();
|
static bool supports_membarier = supports_membarier_syscall();
|
||||||
if (supports_membarier) {
|
if (supports_membarier) {
|
||||||
return syscall(__NR_membarrier, command, 0);
|
return syscall(__NR_membarrier, command, 0);
|
||||||
@@ -55,7 +55,7 @@ int membarrier_function(int command) {
|
|||||||
# pragma message \
|
# pragma message \
|
||||||
"(info): __NR_membarrier unavailable; membarrier_function will be no-op."
|
"(info): __NR_membarrier unavailable; membarrier_function will be no-op."
|
||||||
|
|
||||||
int membarrier_function(int) {
|
long membarrier_function(int) {
|
||||||
errno = ENOSYS;
|
errno = ENOSYS;
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user