diff options
| author | Elliott Hughes <enh@google.com> | 2014-05-22 19:49:11 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2014-05-22 19:49:11 -0700 |
| commit | ced906c849704f379d7191822f6d74993d4fa296 (patch) | |
| tree | 3bac511fef3da9b482019edced149a849a541fbc /libc/arch-arm/bionic | |
| parent | ea7dc32080114af59789c119ca6aa4814426ea42 (diff) | |
| download | bionic-ced906c849704f379d7191822f6d74993d4fa296.zip bionic-ced906c849704f379d7191822f6d74993d4fa296.tar.gz bionic-ced906c849704f379d7191822f6d74993d4fa296.tar.bz2 | |
Lose the hand-written futex assembler.
Also stop exporting 'futex'.
Bug: 12250341
Change-Id: Icc4fa4296cd04dfe0d1061822c69e2eb40c3433a
Diffstat (limited to 'libc/arch-arm/bionic')
| -rw-r--r-- | libc/arch-arm/bionic/futex_arm.S | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/libc/arch-arm/bionic/futex_arm.S b/libc/arch-arm/bionic/futex_arm.S deleted file mode 100644 index 89a1e96..0000000 --- a/libc/arch-arm/bionic/futex_arm.S +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (C) 2008 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include <private/bionic_asm.h> - -// int __futex_syscall4(volatile void* ftx, int op, int val, const struct timespec* timeout) -ENTRY_PRIVATE(__futex_syscall4) - mov ip, r7 - ldr r7, =__NR_futex - swi #0 - mov r7, ip - bx lr -END(__futex_syscall4) |