commit b380b7d78cf4dbd034f51fcf7fc8ebdb037330c3
author Elliott Hughes <enh@google.com> Wed Mar 18 01:05:23 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 18 01:05:24 2015 +0000
tree a7267fa3a7635c394f47fd409ad11058a6f4df3b
parent d917b20b613fd51e5f1056c8648fe8769ae8161e
parent ee7649c5ac5f1e56cc8193cd4cee73004c04893d

Merge "set errno to ENOENT in getauxval per glibc 2.19"

libc/bionic/getauxval.cpp

diff --git a/libc/bionic/getauxval.cpp b/libc/bionic/getauxval.cpp
index bc41824..22922b9 100644
--- a/libc/bionic/getauxval.cpp
+++ b/libc/bionic/getauxval.cpp
@@ -31,6 +31,7 @@
 #include <sys/auxv.h>
 #include <private/bionic_auxv.h>
 #include <elf.h>
+#include <errno.h>
 
 __LIBC_HIDDEN__ ElfW(auxv_t)* __libc_auxv = NULL;
 
@@ -40,5 +41,6 @@
       return v->a_un.a_val;
     }
   }
+  errno = ENOENT;
   return 0;
 }

tests/getauxval_test.cpp

diff --git a/tests/getauxval_test.cpp b/tests/getauxval_test.cpp
index b331150..6ce00f1 100644
--- a/tests/getauxval_test.cpp
+++ b/tests/getauxval_test.cpp
@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+#include <errno.h>
 #include <sys/cdefs.h>
 #include <gtest/gtest.h>
 
@@ -53,7 +54,9 @@
 
 TEST(getauxval, unexpected_values) {
 #if defined(GETAUXVAL_CAN_COMPILE)
+  errno = 0;
   ASSERT_EQ((unsigned long int) 0, getauxval(0xdeadbeef));
+  ASSERT_EQ(ENOENT, errno);
 #else
   GTEST_LOG_(INFO) << "This test does nothing.\n";
 #endif