diff options
Diffstat (limited to 'payloads/libpayload/libc')
| -rw-r--r-- | payloads/libpayload/libc/Makefile.mk | 2 | ||||
| -rw-r--r-- | payloads/libpayload/libc/exec.c | 52 |
2 files changed, 1 insertions, 53 deletions
diff --git a/payloads/libpayload/libc/Makefile.mk b/payloads/libpayload/libc/Makefile.mk index 2840476619..c9fc17a7b5 100644 --- a/payloads/libpayload/libc/Makefile.mk +++ b/payloads/libpayload/libc/Makefile.mk @@ -29,7 +29,7 @@ libc-$(CONFIG_LP_LIBC) += malloc.c printf.c console.c string.c libc-$(CONFIG_LP_LIBC) += memory.c ctype.c lib.c libgcc.c -libc-$(CONFIG_LP_LIBC) += rand.c time.c exec.c +libc-$(CONFIG_LP_LIBC) += rand.c time.c libc-$(CONFIG_LP_LIBC) += readline.c getopt_long.c sysinfo.c libc-$(CONFIG_LP_LIBC) += args.c libc-$(CONFIG_LP_LIBC) += strlcpy.c diff --git a/payloads/libpayload/libc/exec.c b/payloads/libpayload/libc/exec.c deleted file mode 100644 index ae75a3e510..0000000000 --- a/payloads/libpayload/libc/exec.c +++ /dev/null @@ -1,52 +0,0 @@ -/* - * - * Copyright (C) 2008 Advanced Micro Devices, Inc. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. 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. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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 <libpayload-config.h> -#include <libpayload.h> - -#if CONFIG(LP_ARCH_X86) -extern void i386_do_exec(long addr, int argc, char **argv, int *ret); -#endif - -/** - * Execute code in memory. - * - * @param addr TODO - * @param argc TODO - * @param argv TODO - * @return Return the return value from the entry point. - */ -int exec(long addr, int argc, char **argv) -{ - int val = -1; - -#if CONFIG(LP_ARCH_X86) - i386_do_exec(addr, argc, argv, &val); -#endif - return val; -} |