fix hidden syscall __set_syscall_errno

Conflicts:

	Android.mk
	include-full/autoconf.h
	include-minimal/autoconf.h

2 files changed, 59 insertions, 1 deletions

diff --git a/Android.mk b/Android.mk
index 3230a91..a4702a3 100644
--- a/Android.mk
+++ b/Android.mk
@@ -111,12 +111,13 @@ include $(BUILD_STATIC_LIBRARY)
 include $(CLEAR_VARS)
 BUSYBOX_CONFIG:=full
 BUSYBOX_SUFFIX:=bionic
-LOCAL_SRC_FILES := $(BUSYBOX_SRC_FILES)
+LOCAL_SRC_FILES := $(BUSYBOX_SRC_FILES) android/libc/__set_errno.c
 LOCAL_C_INCLUDES := $(BUSYBOX_C_INCLUDES)
 LOCAL_CFLAGS := $(BUSYBOX_CFLAGS)
 LOCAL_MODULE := busybox
 LOCAL_MODULE_TAGS := eng
 LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
+LOCAL_REQUIRED_MODULES := libm
 LOCAL_STATIC_LIBRARIES := libclearsilverregex
 $(LOCAL_MODULE): busybox_prepare
 include $(BUILD_EXECUTABLE)
@@ -159,6 +160,7 @@ LOCAL_CFLAGS += \
 LOCAL_FORCE_STATIC_EXECUTABLE := true
 LOCAL_MODULE := static_busybox
 LOCAL_MODULE_TAGS := optional
+LOCAL_REQUIRED_MODULES := libm
 LOCAL_STATIC_LIBRARIES := libclearsilverregex libcutils libc libm
 LOCAL_MODULE_CLASS := UTILITY_EXECUTABLES
 LOCAL_MODULE_PATH := $(PRODUCT_OUT)/utilities
diff --git a/android/libc/__set_errno.c b/android/libc/__set_errno.c
new file mode 100644
index 0000000..163d404
--- a/dev/null
+++ b/android/libc/__set_errno.c
@@ -0,0 +1,56 @@
+/*
+ * 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 <errno.h>
+
+
+int __set_errno(int n)
+{
+    errno = n;
+    return -1;
+}
+
+/*
+ * this function is called from syscall stubs,
+ * (tail-called in the case of 0-4 arg versions)
+ */
+
+__LIBC_HIDDEN__
+int __set_syscall_errno(int n)
+{
+        /* some syscalls, mmap() for example, have valid return
+        ** values that are "negative".  Since errno values are not
+        ** greater than 131 on Linux, we will just consider 
+        ** anything significantly out of range as not-an-error
+        */
+    if(n > -256) {
+        return __set_errno(-n);
+    } else {
+        return n;
+    }
+}