author | Tanguy Pruvot <tanguy.pruvot@gmail.com> | 2014-08-06 13:38:40 (GMT) |
---|---|---|
committer | Tanguy Pruvot <tanguy.pruvot@gmail.com> | 2014-08-06 14:28:58 (GMT) |
commit | d4d813326ca5a923d876f6320290fe8336a6dc7b (patch) | |
tree | 31403885200516c3c7d6ab463e18dc9ac328b173 | |
parent | 29cf8c21823d9d4a6a1f841d28de7f4dfa76788f (diff) | |
download | busybox-d4d813326ca5a923d876f6320290fe8336a6dc7b.zip busybox-d4d813326ca5a923d876f6320290fe8336a6dc7b.tar.gz busybox-d4d813326ca5a923d876f6320290fe8336a6dc7b.tar.bz2 |
android: remove syscalls implemented in libbb
We missed the addition of libbb/missing_syscalls.c in 1.21
This also fix 'busybox date -s "2014-08-06 14:15:15"'
(tested in recovery too)
Change-Id: I2a1297e894638f000734b15757100c2d48984ed3
-rw-r--r-- | Android.mk | 4 | ||||
-rw-r--r-- | android/libc/arch-arm/syscalls/adjtimex.S | 20 | ||||
-rw-r--r-- | android/libc/arch-arm/syscalls/getsid.S | 19 | ||||
-rw-r--r-- | android/libc/arch-arm/syscalls/stime.S | 24 | ||||
-rw-r--r-- | android/libc/arch-mips/syscalls/adjtimex.S | 23 | ||||
-rw-r--r-- | android/libc/arch-mips/syscalls/getsid.S | 22 | ||||
-rw-r--r-- | android/libc/arch-mips/syscalls/stime.S | 23 | ||||
-rw-r--r-- | android/libc/arch-x86/syscalls/adjtimex.S | 36 | ||||
-rw-r--r-- | android/libc/arch-x86/syscalls/getsid.S | 32 | ||||
-rw-r--r-- | android/libc/arch-x86/syscalls/stime.S | 36 | ||||
-rw-r--r-- | busybox-full.sources | 5 | ||||
-rw-r--r-- | busybox-minimal.sources | 20 | ||||
-rw-r--r-- | include/android.h | 2 |
13 files changed, 25 insertions, 241 deletions
@@ -89,9 +89,9 @@ BUSYBOX_SRC_FILES = \ android/libc/pty.c \ android/android.c -BUSYBOX_ASM_FILES := adjtimex.S stime.S +BUSYBOX_ASM_FILES = ifneq ($(BIONIC_L),true) - BUSYBOX_ASM_FILES += getsid.S swapon.S swapoff.S sysinfo.S + BUSYBOX_ASM_FILES += swapon.S swapoff.S sysinfo.S endif ifneq ($(filter arm x86 mips,$(TARGET_ARCH)),) diff --git a/android/libc/arch-arm/syscalls/adjtimex.S b/android/libc/arch-arm/syscalls/adjtimex.S deleted file mode 100644 index 18c04b0..0000000 --- a/android/libc/arch-arm/syscalls/adjtimex.S +++ b/dev/null @@ -1,20 +0,0 @@ -/* Generated by gensyscalls.py. Do not edit. */ - -#ifdef BIONIC_L -# include <private/bionic_asm.h> -#else -# include <asm/unistd.h> -# include <linux/err.h> -# include <machine/asm.h> -#endif - -ENTRY(adjtimex) - mov ip, r7 - ldr r7, =__NR_adjtimex - swi #0 - mov r7, ip - cmn r0, #(MAX_ERRNO + 1) - bxls lr - neg r0, r0 - b __set_errno -END(adjtimex) diff --git a/android/libc/arch-arm/syscalls/getsid.S b/android/libc/arch-arm/syscalls/getsid.S deleted file mode 100644 index fd9e9ee..0000000 --- a/android/libc/arch-arm/syscalls/getsid.S +++ b/dev/null @@ -1,19 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include <asm/unistd.h> - - .text - .type getsid, #function - .globl getsid - .align 4 - .fnstart - -getsid: - .save {r4, r7} - stmfd sp!, {r4, r7} - ldr r7, =__NR_getsid - swi #0 - ldmfd sp!, {r4, r7} - movs r0, r0 - bxpl lr - b __set_errno - .fnend diff --git a/android/libc/arch-arm/syscalls/stime.S b/android/libc/arch-arm/syscalls/stime.S deleted file mode 100644 index f10a288..0000000 --- a/android/libc/arch-arm/syscalls/stime.S +++ b/dev/null @@ -1,24 +0,0 @@ -/* Generated by gensyscalls.py. Do not edit. */ - -#ifdef BIONIC_L -# include <private/bionic_asm.h> -#else -# include <asm/unistd.h> -# include <linux/err.h> -# include <machine/asm.h> -#endif - -#ifndef __NR_stime -#define __NR_stime (__NR_SYSCALL_BASE + 25) -#endif - -ENTRY(stime) - mov ip, r7 - ldr r7, =__NR_stime - swi #0 - mov r7, ip - cmn r0, #(MAX_ERRNO + 1) - bxls lr - neg r0, r0 - b __set_errno -END(stime) diff --git a/android/libc/arch-mips/syscalls/adjtimex.S b/android/libc/arch-mips/syscalls/adjtimex.S deleted file mode 100644 index f56a1f5..0000000 --- a/android/libc/arch-mips/syscalls/adjtimex.S +++ b/dev/null @@ -1,23 +0,0 @@ -/* Generated by gensyscalls.py. Do not edit. */ - -#ifdef BIONIC_L -#include <private/bionic_asm.h> -#else -#include <asm/unistd.h> -#endif - -ENTRY(adjtimex) - .set noreorder - .cpload t9 - li v0, __NR_adjtimex - syscall - bnez a3, 1f - move a0, v0 - j ra - nop -1: - la t9,__set_errno - j t9 - nop - .set reorder -END(adjtimex) diff --git a/android/libc/arch-mips/syscalls/getsid.S b/android/libc/arch-mips/syscalls/getsid.S deleted file mode 100644 index c960407..0000000 --- a/android/libc/arch-mips/syscalls/getsid.S +++ b/dev/null @@ -1,22 +0,0 @@ -/* autogenerated by gensyscalls.py */ -#include <asm/unistd.h> - .text - .globl getsid - .align 4 - .ent getsid - -getsid: - .set noreorder - .cpload $t9 - li $v0, (4000+151) - syscall - bnez $a3, 1f - move $a0, $v0 - j $ra - nop -1: - la $t9,__set_errno - j $t9 - nop - .set reorder - .end getsid diff --git a/android/libc/arch-mips/syscalls/stime.S b/android/libc/arch-mips/syscalls/stime.S deleted file mode 100644 index 429f579..0000000 --- a/android/libc/arch-mips/syscalls/stime.S +++ b/dev/null @@ -1,23 +0,0 @@ -/* Generated by gensyscalls.py. Do not edit. */ - -#ifdef BIONIC_L -#include <private/bionic_asm.h> -#else -#include <asm/unistd.h> -#endif - -ENTRY(stime) - .set noreorder - .cpload t9 - li v0, __NR_stime - syscall - bnez a3, 1f - move a0, v0 - j ra - nop -1: - la t9,__set_errno - j t9 - nop - .set reorder -END(stime) diff --git a/android/libc/arch-x86/syscalls/adjtimex.S b/android/libc/arch-x86/syscalls/adjtimex.S deleted file mode 100644 index 0667b21b..0000000 --- a/android/libc/arch-x86/syscalls/adjtimex.S +++ b/dev/null @@ -1,36 +0,0 @@ -/* Generated by gensyscalls.py. Do not edit. */ - -#ifdef BIONIC_L -# include <private/bionic_asm.h> -#else -# include <asm/unistd.h> -# include <linux/err.h> -# include <machine/asm.h> - .text - .type adjtimex, @function - .globl adjtimex - .align 4 -#endif - -ENTRY(adjtimex) - pushl %ebx -#ifdef BIONIC_L - .cfi_def_cfa_offset 8 - .cfi_rel_offset ebx, 0 -#endif - mov 8(%esp), %ebx - movl $__NR_adjtimex, %eax - int $0x80 - cmpl $-MAX_ERRNO, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp -#ifndef BIONIC_L - orl $-1, %eax -#endif -1: - popl %ebx - ret -END(adjtimex) diff --git a/android/libc/arch-x86/syscalls/getsid.S b/android/libc/arch-x86/syscalls/getsid.S deleted file mode 100644 index e8e53f0..0000000 --- a/android/libc/arch-x86/syscalls/getsid.S +++ b/dev/null @@ -1,32 +0,0 @@ -/* autogenerated by gensyscalls.py */ - -#ifdef BIONIC_L -# include <private/bionic_asm.h> -#else -# include <asm/unistd.h> -# include <asm/unistd.h> -# include <linux/err.h> -# include <machine/asm.h> -#endif - - .text - .type getsid, @function - .globl getsid - .align 4 - -getsid: - pushl %ebx - mov 8(%esp), %ebx - movl $__NR_getsid, %eax - int $0x80 - cmpl $-MAX_ERRNO, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp - orl $-1, %eax -1: - popl %ebx - ret - diff --git a/android/libc/arch-x86/syscalls/stime.S b/android/libc/arch-x86/syscalls/stime.S deleted file mode 100644 index b8a579b..0000000 --- a/android/libc/arch-x86/syscalls/stime.S +++ b/dev/null @@ -1,36 +0,0 @@ -/* Generated by gensyscalls.py. Do not edit. */ - -#ifdef BIONIC_L -# include <private/bionic_asm.h> -#else -# include <asm/unistd.h> -# include <linux/err.h> -# include <machine/asm.h> - .text - .type stime, @function - .globl stime - .align 4 -#endif - -ENTRY(stime) - pushl %ebx -#ifdef BIONIC_L - .cfi_def_cfa_offset 8 - .cfi_rel_offset ebx, 0 -#endif - mov 8(%esp), %ebx - movl $__NR_stime, %eax - int $0x80 - cmpl $-MAX_ERRNO, %eax - jb 1f - negl %eax - pushl %eax - call __set_errno - addl $4, %esp -#ifndef BIONIC_L - orl $-1, %eax -#endif -1: - popl %ebx - ret -END(stime) diff --git a/busybox-full.sources b/busybox-full.sources index b65472c..789b12d 100644 --- a/busybox-full.sources +++ b/busybox-full.sources @@ -27,6 +27,7 @@ findutils/find.c findutils/grep.c findutils/xargs.c init/halt.c init/mesg.c +libbb/missing_syscalls.c libbb/appletlib.c libbb/ask_confirmation.c libbb/bb_askpass.c libbb/bb_do_delay.c libbb/bb_pwd.c libbb/bb_qsort.c libbb/bb_strtonum.c libbb/change_identity.c libbb/chomp.c libbb/compare_string_array.c libbb/concat_path_file.c libbb/concat_subpath_file.c libbb/copy_file.c libbb/copyfd.c libbb/crc32.c libbb/percent_decode.c libbb/default_error_retval.c libbb/device_open.c libbb/dump.c libbb/execable.c libbb/fclose_nonstdin.c @@ -43,8 +44,8 @@ libbb/safe_gethostname.c libbb/safe_poll.c libbb/safe_strncpy.c libbb/safe_write libbb/simplify_path.c libbb/single_argv.c libbb/skip_whitespace.c libbb/speed_table.c libbb/str_tolower.c libbb/strrstr.c libbb/time.c libbb/trim.c libbb/u_signal_names.c libbb/udp_io.c libbb/unicode.c libbb/uuencode.c libbb/vdprintf.c libbb/verror_msg.c libbb/vfork_daemon_rexec.c libbb/warn_ignoring_args.c libbb/wfopen.c libbb/wfopen_input.c -libbb/write.c libbb/xatonum.c libbb/xconnect.c libbb/xfunc_die.c libbb/xfuncs.c libbb/xfuncs_printf.c libbb/xgetcwd.c -libbb/xgethostbyname.c libbb/xreadlink.c libbb/xrealloc_vector.c libbb/xregcomp.c +libbb/write.c libbb/xatonum.c libbb/xconnect.c libbb/xfunc_die.c libbb/xfuncs.c libbb/xfuncs_printf.c +libbb/xgetcwd.c libbb/xgethostbyname.c libbb/xreadlink.c libbb/xrealloc_vector.c libbb/xregcomp.c libbb/endofname.c libbb/in_ether.c libbb/nuke_str.c libpwdgrp/uidgid_get.c diff --git a/busybox-minimal.sources b/busybox-minimal.sources index 5c9b8ec..6445ff2 100644 --- a/busybox-minimal.sources +++ b/busybox-minimal.sources @@ -13,7 +13,25 @@ e2fsprogs/e2fs_lib.c e2fsprogs/chattr.c e2fsprogs/lsattr.c e2fsprogs/tune2fs.c editors/awk.c editors/cmp.c editors/diff.c editors/patch.c editors/sed.c findutils/find.c findutils/grep.c findutils/xargs.c -libbb/appletlib.c libbb/ask_confirmation.c libbb/bb_askpass.c libbb/bb_do_delay.c libbb/bb_pwd.c libbb/bb_qsort.c libbb/bb_strtonum.c libbb/change_identity.c libbb/chomp.c libbb/compare_string_array.c libbb/concat_path_file.c libbb/concat_subpath_file.c libbb/copy_file.c libbb/copyfd.c libbb/crc32.c libbb/default_error_retval.c libbb/device_open.c libbb/dump.c libbb/execable.c libbb/fclose_nonstdin.c libbb/fflush_stdout_and_exit.c libbb/fgets_str.c libbb/find_mount_point.c libbb/find_pid_by_name.c libbb/find_root_device.c libbb/full_write.c libbb/get_console.c libbb/get_last_path_component.c libbb/get_line_from_file.c libbb/get_shell_name.c libbb/endofname.c libbb/in_ether.c libbb/get_volsize.c libbb/getopt32.c libbb/getpty.c libbb/herror_msg.c libbb/human_readable.c libbb/inet_common.c libbb/info_msg.c libbb/inode_hash.c libbb/isdirectory.c libbb/kernel_version.c libbb/last_char_is.c libbb/lineedit.c libbb/lineedit_ptr_hack.c libbb/llist.c libbb/login.c libbb/loop.c libbb/make_directory.c libbb/makedev.c libbb/match_fstype.c libbb/hash_md5_sha.c libbb/bb_bswap_64.c libbb/messages.c libbb/mode_string.c libbb/mtab.c libbb/parse_config.c libbb/parse_mode.c libbb/perror_msg.c libbb/perror_nomsg.c libbb/perror_nomsg_and_die.c libbb/pidfile.c libbb/platform.c libbb/print_flags.c libbb/printable.c libbb/printable_string.c libbb/process_escape_sequence.c libbb/procps.c libbb/progress.c libbb/ptr_to_globals.c libbb/read.c libbb/read_key.c libbb/read_printf.c libbb/recursive_action.c libbb/remove_file.c libbb/run_shell.c libbb/safe_gethostname.c libbb/safe_poll.c libbb/safe_strncpy.c libbb/safe_write.c libbb/setup_environment.c libbb/signals.c libbb/simplify_path.c libbb/single_argv.c libbb/skip_whitespace.c libbb/speed_table.c libbb/str_tolower.c libbb/strrstr.c libbb/time.c libbb/trim.c libbb/u_signal_names.c libbb/udp_io.c libbb/uuencode.c libbb/vdprintf.c libbb/verror_msg.c libbb/vfork_daemon_rexec.c libbb/warn_ignoring_args.c libbb/wfopen.c libbb/wfopen_input.c libbb/write.c libbb/xatonum.c libbb/xconnect.c libbb/xfunc_die.c libbb/xfuncs.c libbb/xfuncs_printf.c libbb/xgetcwd.c libbb/xgethostbyname.c libbb/xreadlink.c libbb/xrealloc_vector.c libbb/xregcomp.c libbb/unicode.c +libbb/missing_syscalls.c +libbb/appletlib.c libbb/ask_confirmation.c libbb/bb_askpass.c libbb/bb_do_delay.c libbb/bb_pwd.c libbb/bb_qsort.c libbb/bb_strtonum.c +libbb/change_identity.c libbb/chomp.c libbb/compare_string_array.c libbb/concat_path_file.c libbb/concat_subpath_file.c libbb/copy_file.c libbb/copyfd.c +libbb/crc32.c libbb/default_error_retval.c libbb/device_open.c libbb/dump.c libbb/execable.c libbb/fclose_nonstdin.c +libbb/fflush_stdout_and_exit.c libbb/fgets_str.c libbb/find_mount_point.c libbb/find_pid_by_name.c libbb/find_root_device.c libbb/full_write.c +libbb/get_console.c libbb/get_last_path_component.c libbb/get_line_from_file.c libbb/get_shell_name.c libbb/endofname.c libbb/in_ether.c libbb/get_volsize.c +libbb/getopt32.c libbb/getpty.c libbb/herror_msg.c libbb/human_readable.c libbb/inet_common.c libbb/info_msg.c libbb/inode_hash.c libbb/isdirectory.c +libbb/kernel_version.c libbb/last_char_is.c libbb/lineedit.c libbb/lineedit_ptr_hack.c libbb/llist.c libbb/login.c libbb/loop.c +libbb/make_directory.c libbb/makedev.c libbb/match_fstype.c libbb/hash_md5_sha.c libbb/bb_bswap_64.c libbb/messages.c libbb/mode_string.c libbb/mtab.c +libbb/parse_config.c libbb/parse_mode.c libbb/perror_msg.c libbb/perror_nomsg.c libbb/perror_nomsg_and_die.c libbb/pidfile.c libbb/platform.c +libbb/print_flags.c libbb/printable.c libbb/printable_string.c libbb/process_escape_sequence.c libbb/procps.c libbb/progress.c +libbb/ptr_to_globals.c libbb/read.c libbb/read_key.c libbb/read_printf.c libbb/recursive_action.c libbb/remove_file.c libbb/run_shell.c +libbb/safe_gethostname.c libbb/safe_poll.c libbb/safe_strncpy.c libbb/safe_write.c libbb/setup_environment.c libbb/signals.c +libbb/simplify_path.c libbb/single_argv.c libbb/skip_whitespace.c libbb/speed_table.c libbb/str_tolower.c libbb/strrstr.c +libbb/time.c libbb/trim.c libbb/u_signal_names.c libbb/udp_io.c libbb/uuencode.c +libbb/vdprintf.c libbb/verror_msg.c libbb/vfork_daemon_rexec.c libbb/warn_ignoring_args.c libbb/wfopen.c +libbb/wfopen_input.c libbb/write.c libbb/xatonum.c libbb/xconnect.c libbb/xfunc_die.c libbb/xfuncs.c libbb/xfuncs_printf.c +libbb/xgetcwd.c libbb/xgethostbyname.c libbb/xreadlink.c libbb/xrealloc_vector.c libbb/xregcomp.c libbb/unicode.c + libpwdgrp/uidgid_get.c miscutils/bbconfig.c miscutils/dc.c miscutils/devmem.c miscutils/less.c miscutils/makedevs.c miscutils/mountpoint.c miscutils/nandwrite.c diff --git a/include/android.h b/include/android.h index 315667a..dbf17cd 100644 --- a/include/android.h +++ b/include/android.h @@ -33,7 +33,7 @@ char *mkdtemp(char *); char *bb_mktemp(char *); /* SYSCALLS */ -int stime(time_t *); +int stime(const time_t *); int swapon(const char *, int); int swapoff(const char *); int getsid(pid_t); |