diff options
| author | Elliott Hughes <enh@google.com> | 2019-07-15 10:17:16 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2019-07-15 10:17:16 -0700 |
| commit | 8947972afd8b222ebd974dcf74d79259c06dc34b (patch) | |
| tree | e0c94bf278f8eeaa4415253bcfb5576d7877ef7b /libm | |
| parent | 7d10422499a323874084dbed969418db436fd771 (diff) | |
| download | bionic-8947972afd8b222ebd974dcf74d79259c06dc34b.tar.gz | |
SSE4.1 is part of the Android x86/x86-64 ABI.
We shouldn't be treating this as a special variant.
Test: builds
Change-Id: I80722f941b5aefe34d777db329453cbedf249620
Diffstat (limited to 'libm')
| -rw-r--r-- | libm/Android.bp | 76 |
1 files changed, 32 insertions, 44 deletions
diff --git a/libm/Android.bp b/libm/Android.bp index 6d17e8643..59466e490 100644 --- a/libm/Android.bp +++ b/libm/Android.bp @@ -324,8 +324,16 @@ cc_library { x86: { srcs: [ "i387/fenv.c", + "x86/ceil.S", + "x86/ceilf.S", + "x86/floor.S", + "x86/floorf.S", + "x86/rint.S", + "x86/rintf.S", "x86/sqrt.S", "x86/sqrtf.S", + "x86/trunc.S", + "x86/truncf.S", "x86/e_acos.S", "x86/e_asin.S", "x86/e_atan2.S", @@ -359,37 +367,23 @@ cc_library { "upstream-freebsd/lib/msun/src/e_sqrtf.c", "upstream-freebsd/lib/msun/src/s_atan.c", "upstream-freebsd/lib/msun/src/s_cbrt.c", + "upstream-freebsd/lib/msun/src/s_ceil.c", + "upstream-freebsd/lib/msun/src/s_ceilf.c", "upstream-freebsd/lib/msun/src/s_cos.c", "upstream-freebsd/lib/msun/src/s_expm1.c", + "upstream-freebsd/lib/msun/src/s_floor.c", + "upstream-freebsd/lib/msun/src/s_floorf.c", "upstream-freebsd/lib/msun/src/s_log1p.c", "upstream-freebsd/lib/msun/src/s_lrint.c", "upstream-freebsd/lib/msun/src/s_lrintf.c", + "upstream-freebsd/lib/msun/src/s_rint.c", + "upstream-freebsd/lib/msun/src/s_rintf.c", "upstream-freebsd/lib/msun/src/s_sin.c", "upstream-freebsd/lib/msun/src/s_tan.c", "upstream-freebsd/lib/msun/src/s_tanh.c", + "upstream-freebsd/lib/msun/src/s_trunc.c", + "upstream-freebsd/lib/msun/src/s_truncf.c", ], - sse4_1: { - srcs: [ - "x86/ceil.S", - "x86/ceilf.S", - "x86/floor.S", - "x86/floorf.S", - "x86/rint.S", - "x86/rintf.S", - "x86/trunc.S", - "x86/truncf.S", - ], - exclude_srcs: [ - "upstream-freebsd/lib/msun/src/s_ceil.c", - "upstream-freebsd/lib/msun/src/s_ceilf.c", - "upstream-freebsd/lib/msun/src/s_floor.c", - "upstream-freebsd/lib/msun/src/s_floorf.c", - "upstream-freebsd/lib/msun/src/s_rint.c", - "upstream-freebsd/lib/msun/src/s_rintf.c", - "upstream-freebsd/lib/msun/src/s_trunc.c", - "upstream-freebsd/lib/msun/src/s_truncf.c", - ], - }, local_include_dirs: ["i387"], pack_relocations: false, ldflags: ["-Wl,--hash-style=both"], @@ -399,8 +393,16 @@ cc_library { x86_64: { srcs: [ "amd64/fenv.c", + "x86_64/ceil.S", + "x86_64/ceilf.S", + "x86_64/floor.S", + "x86_64/floorf.S", + "x86_64/rint.S", + "x86_64/rintf.S", "x86_64/sqrt.S", "x86_64/sqrtf.S", + "x86_64/trunc.S", + "x86_64/truncf.S", "x86_64/e_acos.S", "x86_64/e_asin.S", "x86_64/e_atan2.S", @@ -431,39 +433,25 @@ cc_library { "upstream-freebsd/lib/msun/src/e_sqrtf.c", "upstream-freebsd/lib/msun/src/s_atan.c", "upstream-freebsd/lib/msun/src/s_cbrt.c", + "upstream-freebsd/lib/msun/src/s_ceil.c", + "upstream-freebsd/lib/msun/src/s_ceilf.c", "upstream-freebsd/lib/msun/src/s_cos.c", "upstream-freebsd/lib/msun/src/s_expm1.c", + "upstream-freebsd/lib/msun/src/s_floor.c", + "upstream-freebsd/lib/msun/src/s_floorf.c", "upstream-freebsd/lib/msun/src/s_log1p.c", "upstream-freebsd/lib/msun/src/s_llrint.c", "upstream-freebsd/lib/msun/src/s_llrintf.c", "upstream-freebsd/lib/msun/src/s_lrint.c", "upstream-freebsd/lib/msun/src/s_lrintf.c", + "upstream-freebsd/lib/msun/src/s_rint.c", + "upstream-freebsd/lib/msun/src/s_rintf.c", "upstream-freebsd/lib/msun/src/s_sin.c", "upstream-freebsd/lib/msun/src/s_tan.c", "upstream-freebsd/lib/msun/src/s_tanh.c", + "upstream-freebsd/lib/msun/src/s_trunc.c", + "upstream-freebsd/lib/msun/src/s_truncf.c", ], - sse4_1: { - srcs: [ - "x86_64/ceil.S", - "x86_64/ceilf.S", - "x86_64/floor.S", - "x86_64/floorf.S", - "x86_64/rint.S", - "x86_64/rintf.S", - "x86_64/trunc.S", - "x86_64/truncf.S", - ], - exclude_srcs: [ - "upstream-freebsd/lib/msun/src/s_ceil.c", - "upstream-freebsd/lib/msun/src/s_ceilf.c", - "upstream-freebsd/lib/msun/src/s_floor.c", - "upstream-freebsd/lib/msun/src/s_floorf.c", - "upstream-freebsd/lib/msun/src/s_rint.c", - "upstream-freebsd/lib/msun/src/s_rintf.c", - "upstream-freebsd/lib/msun/src/s_trunc.c", - "upstream-freebsd/lib/msun/src/s_truncf.c", - ], - }, version_script: ":libm.x86_64.map", }, }, |