Merge "libm: ARM: reorganize a bit to match ARM64"
This commit is contained in:
commit
dd8adc3534
@ -283,9 +283,8 @@ LOCAL_SRC_FILES_arm += \
|
||||
|
||||
else
|
||||
LOCAL_SRC_FILES_arm += \
|
||||
arm/e_sqrt.S \
|
||||
arm/e_sqrtf.S \
|
||||
arm/s_floor.S \
|
||||
arm/sqrt.S \
|
||||
arm/floor.S \
|
||||
|
||||
endif
|
||||
|
||||
|
@ -1,39 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 2013-2014, NVIDIA Corporation. All rights reserved.
|
||||
* Johhnny Qiu <joqiu@nvidia.com>
|
||||
* Shu Zhang <chazhang@nvidia.com>
|
||||
*
|
||||
* 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.
|
||||
* * Neither the name of The Linux Foundation nor the names of its
|
||||
* contributors may be used to endorse or promote products derived
|
||||
* from this software without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
|
||||
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
|
||||
* 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>
|
||||
|
||||
ENTRY(sqrtf)
|
||||
vmov.f32 s0, r0
|
||||
vsqrt.f32 s0, s0
|
||||
vmov.f32 r0, s0
|
||||
bx lr
|
||||
END(sqrtf)
|
@ -39,4 +39,11 @@ ENTRY(sqrt)
|
||||
bx lr
|
||||
END(sqrt)
|
||||
|
||||
ENTRY(sqrtf)
|
||||
vmov.f32 s0, r0
|
||||
vsqrt.f32 s0, s0
|
||||
vmov.f32 r0, s0
|
||||
bx lr
|
||||
END(sqrtf)
|
||||
|
||||
ALIAS_SYMBOL(sqrtl, sqrt);
|
Loading…
Reference in New Issue
Block a user