commit f3c39b26b5a152eb2f1713842d0346d53204894c
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jun 09 23:21:22 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jun 09 23:21:22 2016 +0000
tree 243a953b4f18b7c95707962f4be850936ffd164b
parent 4bc95c0f302d7bab1cb1927cf696516debd853f1
parent 20788aec002ab3f6dea4e01665a439933161d11c

Merge "Add ctermid."

libm/Android.bp

diff --git a/libm/Android.bp b/libm/Android.bp
index f22050e..08f1c66 100644
--- a/libm/Android.bp
+++ b/libm/Android.bp
@@ -1,6 +1,3 @@
-// ANDROIDMK TRANSLATION ERROR: unsupported conditional
-// ifneq ($(TARGET_USE_PRIVATE_LIBM),true)
-
 bionic_coverage = false
 
 //
@@ -522,13 +519,6 @@
         "-Wno-uninitialized",
         "-Wno-unknown-pragmas",
         "-fvisibility=hidden",
-
-        // Workaround the GCC "(long)fn -> lfn" optimization bug which will result in
-        // self recursions for lrint, lrintf, and lrintl.
-        // BUG: 14225968
-        "-fno-builtin-rint",
-        "-fno-builtin-rintf",
-        "-fno-builtin-rintl",
     ],
     conlyflags: ["-std=gnu11"],
 
@@ -541,6 +531,3 @@
     },
     stl: "none",
 }
-
-// ANDROIDMK TRANSLATION ERROR: endif from unsupported contitional
-// endif