Alexey Neyman
4 years ago
committed by
GitHub
commit
7d621cd831
@ -1,30 +0,0 @@
|
||||
commit 2c8ab83ec84662f4916b5237da3e4330956a32eb
|
||||
Author: Alexey Neyman <stilor@att.net>
|
||||
Date: Sat Sep 29 13:12:08 2018 -0700
|
||||
|
||||
Create symlink to <bfd/diagnostics.h> in bfd-headers
|
||||
|
||||
Included by <bfd/bfd.h>.
|
||||
|
||||
Signed-off-by: Alexey Neyman <stilor@att.net>
|
||||
|
||||
diff --git a/Makefile.in b/Makefile.in
|
||||
index cfad06c..8162cba 100644
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -123,11 +123,14 @@ sinclude .deps
|
||||
$(CC) -MM $(CPPFLAGS) $(srcdir)/*.c > .deps
|
||||
|
||||
|
||||
+# Not all versions of binutils have all these headers, some may end up
|
||||
+# as dangling symlinks
|
||||
bfd-headers/.stamp:
|
||||
rm -rf bfd-headers
|
||||
mkdir bfd-headers
|
||||
ln -sf $(BFD_INCLUDE_DIR)/bfd.h bfd-headers/bfd.h
|
||||
- for f in ansidecl filenames hashtab libiberty symcat; do \
|
||||
+ ln -sf $(BFD_INCLUDE_DIR)/diagnostics.h bfd-headers/diagnostics.h
|
||||
+ for f in ansidecl filenames hashtab libiberty symcat diagnostics; do \
|
||||
ln -sf $(BINUTILS_INCLUDE_DIR)/$$f.h bfd-headers/$$f.h || exit 1; \
|
||||
done
|
||||
ln -sf $(BINUTILS_INCLUDE_DIR)/elf bfd-headers/elf
|
||||
@ -1,2 +1,2 @@
|
||||
repository='git https://github.com/uclinux-dev/elf2flt.git'
|
||||
repository_cset='6d80ab6c93409e796f85da404bde84b841231531'
|
||||
repository_cset='7e33f28df198c46764021ed14408bd262751e148'
|
||||
|
||||
@ -1 +0,0 @@
|
||||
experimental='yes'
|
||||
@ -1 +0,0 @@
|
||||
experimental='yes'
|
||||
@ -0,0 +1,91 @@
|
||||
commit 2c8b6de913973274e877639658e9e7273a012adb
|
||||
Author: Dmitry V. Levin <ldv@altlinux.org>
|
||||
Date: Tue Jan 8 19:23:44 2019 +0000
|
||||
|
||||
mips o32: fix build
|
||||
|
||||
Commit 917c2ccf3a67 "Refactor stack pointers" moved mips_REG_* macros
|
||||
from linux/mips/arch_regs.h to linux/mips/arch_regs.c because these
|
||||
macros are no longer used outside syscall.c or files included by
|
||||
syscall.c, but this caused a build regression on mips o32 because
|
||||
decode_syscall_subcall() uses mips_REG_SP prior to its definition.
|
||||
|
||||
* syscall.c (decode_syscall_subcall): Move ...
|
||||
* linux/mips/get_syscall_args.c: ... here.
|
||||
* NEWS: Mention this fix.
|
||||
|
||||
Reported-by: Baruch Siach <baruch@tkos.co.il>
|
||||
Fixes: v4.26~61 "Refactor stack pointers"
|
||||
|
||||
diff --git a/linux/mips/get_syscall_args.c b/linux/mips/get_syscall_args.c
|
||||
index 387aa852..e2889f98 100644
|
||||
--- a/linux/mips/get_syscall_args.c
|
||||
+++ b/linux/mips/get_syscall_args.c
|
||||
@@ -37,3 +37,29 @@ arch_get_syscall_args(struct tcb *tcp)
|
||||
#endif
|
||||
return 1;
|
||||
}
|
||||
+
|
||||
+#ifdef SYS_syscall_subcall
|
||||
+static void
|
||||
+decode_syscall_subcall(struct tcb *tcp)
|
||||
+{
|
||||
+ if (!scno_is_valid(tcp->u_arg[0]))
|
||||
+ return;
|
||||
+ tcp->scno = tcp->u_arg[0];
|
||||
+ tcp->qual_flg = qual_flags(tcp->scno);
|
||||
+ tcp->s_ent = &sysent[tcp->scno];
|
||||
+ memmove(&tcp->u_arg[0], &tcp->u_arg[1],
|
||||
+ sizeof(tcp->u_arg) - sizeof(tcp->u_arg[0]));
|
||||
+ /*
|
||||
+ * Fetching the last arg of 7-arg syscalls (fadvise64_64
|
||||
+ * and sync_file_range) requires additional code,
|
||||
+ * see linux/mips/get_syscall_args.c
|
||||
+ */
|
||||
+ if (tcp->s_ent->nargs == MAX_ARGS) {
|
||||
+ if (umoven(tcp,
|
||||
+ mips_REG_SP + MAX_ARGS * sizeof(tcp->u_arg[0]),
|
||||
+ sizeof(tcp->u_arg[0]),
|
||||
+ &tcp->u_arg[MAX_ARGS - 1]) < 0)
|
||||
+ tcp->u_arg[MAX_ARGS - 1] = 0;
|
||||
+ }
|
||||
+}
|
||||
+#endif /* SYS_syscall_subcall */
|
||||
diff --git a/syscall.c b/syscall.c
|
||||
index d78f51dd..51fcc721 100644
|
||||
--- a/syscall.c
|
||||
+++ b/syscall.c
|
||||
@@ -349,31 +349,8 @@ decode_ipc_subcall(struct tcb *tcp)
|
||||
#endif /* SYS_ipc_subcall */
|
||||
|
||||
#ifdef SYS_syscall_subcall
|
||||
-static void
|
||||
-decode_syscall_subcall(struct tcb *tcp)
|
||||
-{
|
||||
- if (!scno_is_valid(tcp->u_arg[0]))
|
||||
- return;
|
||||
- tcp->scno = tcp->u_arg[0];
|
||||
- tcp->qual_flg = qual_flags(tcp->scno);
|
||||
- tcp->s_ent = &sysent[tcp->scno];
|
||||
- memmove(&tcp->u_arg[0], &tcp->u_arg[1],
|
||||
- sizeof(tcp->u_arg) - sizeof(tcp->u_arg[0]));
|
||||
-# ifdef LINUX_MIPSO32
|
||||
- /*
|
||||
- * Fetching the last arg of 7-arg syscalls (fadvise64_64
|
||||
- * and sync_file_range) requires additional code,
|
||||
- * see linux/mips/get_syscall_args.c
|
||||
- */
|
||||
- if (tcp->s_ent->nargs == MAX_ARGS) {
|
||||
- if (umoven(tcp,
|
||||
- mips_REG_SP + MAX_ARGS * sizeof(tcp->u_arg[0]),
|
||||
- sizeof(tcp->u_arg[0]),
|
||||
- &tcp->u_arg[MAX_ARGS - 1]) < 0)
|
||||
- tcp->u_arg[MAX_ARGS - 1] = 0;
|
||||
- }
|
||||
-# endif /* LINUX_MIPSO32 */
|
||||
-}
|
||||
+/* The implementation is architecture specific. */
|
||||
+static void decode_syscall_subcall(struct tcb *);
|
||||
#endif /* SYS_syscall_subcall */
|
||||
|
||||
static void
|
||||
@ -0,0 +1,38 @@
|
||||
CT_CONFIG_VERSION="2"
|
||||
CT_EXPERIMENTAL=y
|
||||
CT_ALLOW_BUILD_AS_ROOT=y
|
||||
CT_ALLOW_BUILD_AS_ROOT_SURE=y
|
||||
CT_DEBUG_CT=y
|
||||
CT_DEBUG_CT_SAVE_STEPS=y
|
||||
CT_ARCH_XTENSA=y
|
||||
CT_MULTILIB=y
|
||||
CT_TARGET_CFLAGS="-mlongcalls"
|
||||
CT_TARGET_VENDOR="fsf"
|
||||
CT_BINUTILS_SRC_DEVEL=y
|
||||
CT_BINUTILS_DEVEL_URL="https://github.com/espressif/binutils-gdb.git"
|
||||
CT_BINUTILS_DEVEL_BRANCH="esp32-2018r1_binutils-2_30"
|
||||
CT_BINUTILS_V_2_30=y
|
||||
CT_NEWLIB_SRC_DEVEL=y
|
||||
CT_NEWLIB_DEVEL_URL="https://github.com/espressif/newlib-esp32.git"
|
||||
CT_NEWLIB_DEVEL_BRANCH="esp32-2018r1_newlib-2_2_0"
|
||||
CT_LIBC_NEWLIB_TARGET_CFLAGS="-DSIGNAL_PROVIDED -DABORT_PROVIDED -DMALLOC_PROVIDED"
|
||||
CT_LIBC_NEWLIB_DISABLE_SUPPLIED_SYSCALLS=y
|
||||
CT_GCC_SRC_DEVEL=y
|
||||
CT_GCC_DEVEL_VCS_git=y
|
||||
CT_GCC_DEVEL_URL="https://github.com/espressif/gcc.git"
|
||||
CT_GCC_DEVEL_BRANCH="esp32-2018r1_gcc-8_2_0"
|
||||
CT_CC_GCC_ENABLE_CXX_FLAGS="-fno-rtti -ffunction-sections"
|
||||
CT_CC_GCC_CORE_EXTRA_CONFIG_ARRAY="--enable-threads=posix"
|
||||
CT_CC_GCC_EXTRA_CONFIG_ARRAY="--disable-libstdcxx-verbose --enable-threads=posix --enable-gcov-custom-rtio"
|
||||
# CT_CC_GCC_STATIC_LIBSTDCXX is not set
|
||||
# CT_CC_CXA_ATEXIT is not set
|
||||
# CT_CC_GCC_LDBL_128 is not set
|
||||
CT_CC_LANG_CXX=y
|
||||
CT_DEBUG_GDB=y
|
||||
CT_GDB_SRC_DEVEL=y
|
||||
CT_GDB_DEVEL_URL="https://github.com/espressif/binutils-gdb.git"
|
||||
CT_GDB_DEVEL_BRANCH="esp32-2018r1_gdb-8_1"
|
||||
CT_GDB_V_8_1=y
|
||||
CT_ISL_V_0_19=y
|
||||
CT_COMP_TOOLS_AUTOCONF=y
|
||||
CT_COMP_TOOLS_AUTOMAKE=y
|
||||
@ -0,0 +1,4 @@
|
||||
reporter_name="Anton Maklakov"
|
||||
reporter_url=""
|
||||
reporter_comment="Modified from the configuration reported in #985 to not include
|
||||
overlays."
|
||||
Loading…
Reference in New Issue