bug fix7sandbox/soong9/gopatch

Change-Id: Ic27bfc0d084d1a54f7343acfe0705aaace6a1ed0

2 files changed, 3 insertions, 8 deletions

diff --git a/linux-user/main.c b/linux-user/main.c
index 57b7bcc3b..0cfc09bb7 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -3800,7 +3800,7 @@ void stop_all_tasks(void)
 void init_task_state(TaskState *ts)
 {
     ts->used = 1;
-    ts->sigaltstack_used = (struct target_sigaltstack1) {
+    ts->sigaltstack_used = (struct target_sigaltstack) {
         .ss_sp = 0,
         .ss_size = 0,
         .ss_flags = TARGET_SS_DISABLE,
diff --git a/linux-user/qemu.h b/linux-user/qemu.h
index ecc61f751..fc6633af0 100644
--- a/linux-user/qemu.h
+++ b/linux-user/qemu.h
@@ -17,6 +17,7 @@
 #include "target_syscall.h"
 #include "exec/gdbstub.h"
 #include "qemu/queue.h"
+#include "target_signal.h"
 
 #define THREAD __thread
 
@@ -30,12 +31,6 @@
  * task_struct fields in the kernel
  */
 
-typedef struct target_sigaltstack1 {
-    abi_ulong ss_sp;
-    abi_int ss_flags;
-    abi_ulong ss_size;
-};
-
 struct image_info {
         abi_ulong       load_bias;
         abi_ulong       load_addr;
@@ -155,7 +150,7 @@ typedef struct TaskState {
     int signal_pending;
 
     /* This thread's sigaltstack, if it has one */
-    struct target_sigaltstack1 sigaltstack_used;
+    struct target_sigaltstack sigaltstack_used;
 } __attribute__((aligned(16))) TaskState;
 
 extern char *exec_path;