struct xxx -> xxx_t

a-pop · Igor Wodiany · commit f70c1d6d1de8 · 2019-10-04T12:18:33.000+01:00
diff --git a/gcc/libgcc/config/aarch64/linux-unwind.h b/gcc/libgcc/config/aarch64/linux-unwind.h
@@ -52,7 +52,7 @@ aarch64_fallback_frame_state (struct _Unwind_Context *context,
   struct rt_sigframe
   {
     siginfo_t info;
-    struct ucontext uc;
+    ucontext_t uc;
   };
 
   struct rt_sigframe *rt_;
diff --git a/gcc/libgcc/config/alpha/linux-unwind.h b/gcc/libgcc/config/alpha/linux-unwind.h
@@ -51,7 +51,7 @@ alpha_fallback_frame_state (struct _Unwind_Context *context,
     {
       struct rt_sigframe {
 	siginfo_t info;
-	struct ucontext uc;
+	ucontext_t uc;
       } *rt_ = context->cfa;
       sc = &rt_->uc.uc_mcontext;
     }
diff --git a/gcc/libgcc/config/bfin/linux-unwind.h b/gcc/libgcc/config/bfin/linux-unwind.h
@@ -52,7 +52,7 @@ bfin_fallback_frame_state (struct _Unwind_Context *context,
 	void *puc;
 	char retcode[8];
 	siginfo_t info;
-	struct ucontext uc;
+	ucontext_t uc;
       } *rt_ = context->cfa;
 
       /* The void * cast is necessary to avoid an aliasing warning.
diff --git a/gcc/libgcc/config/i386/linux-unwind.h b/gcc/libgcc/config/i386/linux-unwind.h
@@ -58,7 +58,7 @@ x86_64_fallback_frame_state (struct _Unwind_Context *context,
   if (*(unsigned char *)(pc+0) == 0x48
       && *(unsigned long long *)(pc+1) == RT_SIGRETURN_SYSCALL)
     {
-      struct ucontext *uc_ = context->cfa;
+      ucontext_t *uc_ = context->cfa;
       /* The void * cast is necessary to avoid an aliasing warning.
          The aliasing warning is correct, but should not be a problem
          because it does not alias anything.  */
@@ -138,7 +138,7 @@ x86_fallback_frame_state (struct _Unwind_Context *context,
 	siginfo_t *pinfo;
 	void *puc;
 	siginfo_t info;
-	struct ucontext uc;
+	ucontext_t uc;
       } *rt_ = context->cfa;
       /* The void * cast is necessary to avoid an aliasing warning.
          The aliasing warning is correct, but should not be a problem
diff --git a/gcc/libgcc/config/m68k/linux-unwind.h b/gcc/libgcc/config/m68k/linux-unwind.h
@@ -33,7 +33,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 /* <sys/ucontext.h> is unfortunately broken right now.  */
 struct uw_ucontext {
 	unsigned long	  uc_flags;
-	struct ucontext  *uc_link;
+	ucontext_t	 *uc_link;
 	stack_t		  uc_stack;
 	mcontext_t	  uc_mcontext;
 	unsigned long	  uc_filler[80];
diff --git a/gcc/libgcc/config/nios2/linux-unwind.h b/gcc/libgcc/config/nios2/linux-unwind.h
@@ -38,7 +38,7 @@ struct nios2_mcontext {
 
 struct nios2_ucontext {
   unsigned long uc_flags;
-  struct ucontext *uc_link;
+  ucontext_t *uc_link;
   stack_t uc_stack;
   struct nios2_mcontext uc_mcontext;
   sigset_t uc_sigmask;	/* mask last for extensibility */
diff --git a/gcc/libgcc/config/pa/linux-unwind.h b/gcc/libgcc/config/pa/linux-unwind.h
@@ -80,7 +80,7 @@ pa32_fallback_frame_state (struct _Unwind_Context *context,
   struct sigcontext *sc;
   struct rt_sigframe {
     siginfo_t info;
-    struct ucontext uc;
+    ucontext_t uc;
   } *frame;
 
   /* rt_sigreturn trampoline:
diff --git a/gcc/libgcc/config/sh/linux-unwind.h b/gcc/libgcc/config/sh/linux-unwind.h
@@ -180,7 +180,7 @@ sh_fallback_frame_state (struct _Unwind_Context *context,
     {
       struct rt_sigframe {
 	siginfo_t info;
-	struct ucontext uc;
+	ucontext_t uc;
       } *rt_ = context->cfa;
       /* The void * cast is necessary to avoid an aliasing warning.
          The aliasing warning is correct, but should not be a problem
diff --git a/gcc/libgcc/config/tilepro/linux-unwind.h b/gcc/libgcc/config/tilepro/linux-unwind.h
@@ -61,7 +61,7 @@ tile_fallback_frame_state (struct _Unwind_Context *context,
   struct rt_sigframe {
     unsigned char save_area[C_ABI_SAVE_AREA_SIZE];
     siginfo_t info;
-    struct ucontext uc;
+    ucontext_t uc;
   } *rt_;
 
   /* Return if this is not a signal handler.  */
diff --git a/gcc/libgcc/config/xtensa/linux-unwind.h b/gcc/libgcc/config/xtensa/linux-unwind.h
@@ -64,7 +64,7 @@ xtensa_fallback_frame_state (struct _Unwind_Context *context,
 
   struct rt_sigframe {
     siginfo_t info;
-    struct ucontext uc;
+    ucontext_t uc;
   } *rt_;
 
   /* movi a2, __NR_rt_sigreturn; syscall */
diff --git a/gcc/libjava/include/i386-signal.h b/gcc/libjava/include/i386-signal.h
@@ -29,7 +29,7 @@ static void _Jv_##_name (int, siginfo_t *,			\
 #define HANDLE_DIVIDE_OVERFLOW						\
 do									\
 {									\
-  struct ucontext *_uc = (struct ucontext *)_p;				\
+  ucontext_t *_uc = (ucontext_t *)_p;					\
   gregset_t &_gregs = _uc->uc_mcontext.gregs;				\
   unsigned char *_eip = (unsigned char *)_gregs[REG_EIP];		\
 									\
diff --git a/gcc/libjava/include/s390-signal.h b/gcc/libjava/include/s390-signal.h
@@ -51,7 +51,7 @@ do									\
   struct                                                                \
   {                                                                     \
     unsigned long int uc_flags;                                         \
-    struct ucontext *uc_link;                                           \
+    ucontext_t *uc_link;                                                \
     stack_t uc_stack;                                                   \
     mcontext_t uc_mcontext;                                             \
     unsigned long sigmask[2];                                           \
diff --git a/gcc/libjava/include/x86_64-signal.h b/gcc/libjava/include/x86_64-signal.h
@@ -28,7 +28,7 @@ static void _Jv_##_name (int, siginfo_t *,			\
 #define HANDLE_DIVIDE_OVERFLOW						\
 do									\
 {									\
-  struct ucontext *_uc = (struct ucontext *)_p;				\
+  ucontext_t *_uc = (ucontext_t *)_p;					\
   gregset_t &_gregs = _uc->uc_mcontext.gregs;				\
   unsigned char *_rip = (unsigned char *)_gregs[REG_RIP];		\
 									\
diff --git a/gcc/libsanitizer/sanitizer_common/sanitizer_linux.cc b/gcc/libsanitizer/sanitizer_common/sanitizer_linux.cc
@@ -514,8 +514,7 @@ uptr internal_prctl(int option, uptr arg2, uptr arg3, uptr arg4, uptr arg5) {
 }
 #endif
 
-uptr internal_sigaltstack(const struct sigaltstack *ss,
-                         struct sigaltstack *oss) {
+uptr internal_sigaltstack(const void *ss, void *oss) {
   return internal_syscall(SYSCALL(sigaltstack), (uptr)ss, (uptr)oss);
 }
 
diff --git a/gcc/libsanitizer/sanitizer_common/sanitizer_linux.h b/gcc/libsanitizer/sanitizer_common/sanitizer_linux.h
@@ -18,7 +18,6 @@
 #include "sanitizer_platform_limits_posix.h"
 
 struct link_map;  // Opaque type returned by dlopen().
-struct sigaltstack;
 
 namespace __sanitizer {
 // Dirent structure for getdents(). Note that this structure is different from
@@ -27,8 +26,7 @@ struct linux_dirent;
 
 // Syscall wrappers.
 uptr internal_getdents(fd_t fd, struct linux_dirent *dirp, unsigned int count);
-uptr internal_sigaltstack(const struct sigaltstack* ss,
-                          struct sigaltstack* oss);
+uptr internal_sigaltstack(const void* ss, void* oss);
 uptr internal_sigprocmask(int how, __sanitizer_sigset_t *set,
     __sanitizer_sigset_t *oldset);
 void internal_sigfillset(__sanitizer_sigset_t *set);
diff --git a/gcc/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc b/gcc/libsanitizer/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc
@@ -234,7 +234,7 @@ static int TracerThread(void* argument) {
 
   // Alternate stack for signal handling.
   InternalScopedBuffer<char> handler_stack_memory(kHandlerStackSize);
-  struct sigaltstack handler_stack;
+  stack_t handler_stack;
   internal_memset(&handler_stack, 0, sizeof(handler_stack));
   handler_stack.ss_sp = handler_stack_memory.data();
   handler_stack.ss_size = kHandlerStackSize;
diff --git a/gcc/libsanitizer/tsan/tsan_platform_linux.cc b/gcc/libsanitizer/tsan/tsan_platform_linux.cc
@@ -377,7 +377,7 @@ bool IsGlobalVar(uptr addr) {
 int ExtractResolvFDs(void *state, int *fds, int nfd) {
 #if SANITIZER_LINUX
   int cnt = 0;
-  __res_state *statp = (__res_state*)state;
+  struct __res_state *statp = (struct __res_state*)state;
   for (int i = 0; i < MAXNS && cnt < nfd; i++) {
     if (statp->_u._ext.nsaddrs[i] && statp->_u._ext.nssocks[i] != -1)
       fds[cnt++] = statp->_u._ext.nssocks[i];

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ aarch64_fallback_frame_state (struct _Unwind_Context *context,`
`52`	`52`	`struct rt_sigframe`
`53`	`53`	`{`
`54`	`54`	`siginfo_t info;`
`55`		`- struct ucontext uc;`
	`55`	`+ ucontext_t uc;`
`56`	`56`	`};`
`57`	`57`
`58`	`58`	`struct rt_sigframe *rt_;`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ alpha_fallback_frame_state (struct _Unwind_Context *context,`
`51`	`51`	`{`
`52`	`52`	`struct rt_sigframe {`
`53`	`53`	`siginfo_t info;`
`54`		`- struct ucontext uc;`
	`54`	`+ ucontext_t uc;`
`55`	`55`	`} *rt_ = context->cfa;`
`56`	`56`	`sc = &rt_->uc.uc_mcontext;`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ sh_fallback_frame_state (struct _Unwind_Context *context,`
`180`	`180`	`{`
`181`	`181`	`struct rt_sigframe {`
`182`	`182`	`siginfo_t info;`
`183`		`- struct ucontext uc;`
	`183`	`+ ucontext_t uc;`
`184`	`184`	`} *rt_ = context->cfa;`
`185`	`185`	`/* The void * cast is necessary to avoid an aliasing warning.`
`186`	`186`	`The aliasing warning is correct, but should not be a problem`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ static void _Jv_##_name (int, siginfo_t *, \`
`29`	`29`	`#define HANDLE_DIVIDE_OVERFLOW \`
`30`	`30`	`do \`
`31`	`31`	`{ \`
`32`		`- struct ucontext _uc = (struct ucontext )_p; \`
	`32`	`+ ucontext_t _uc = (ucontext_t )_p; \`
`33`	`33`	`gregset_t &_gregs = _uc->uc_mcontext.gregs; \`
`34`	`34`	`unsigned char _eip = (unsigned char )_gregs[REG_EIP]; \`
`35`	`35`	`\`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ static void _Jv_##_name (int, siginfo_t *, \`
`28`	`28`	`#define HANDLE_DIVIDE_OVERFLOW \`
`29`	`29`	`do \`
`30`	`30`	`{ \`
`31`		`- struct ucontext _uc = (struct ucontext )_p; \`
	`31`	`+ ucontext_t _uc = (ucontext_t )_p; \`
`32`	`32`	`gregset_t &_gregs = _uc->uc_mcontext.gregs; \`
`33`	`33`	`unsigned char _rip = (unsigned char )_gregs[REG_RIP]; \`
`34`	`34`	`\`
Original file line number	Diff line number	Diff line change
`@@ -514,8 +514,7 @@ uptr internal_prctl(int option, uptr arg2, uptr arg3, uptr arg4, uptr arg5) {`
`514`	`514`	`}`
`515`	`515`	`#endif`
`516`	`516`
`517`		`-uptr internal_sigaltstack(const struct sigaltstack *ss,`
`518`		`- struct sigaltstack *oss) {`
	`517`	`+uptr internal_sigaltstack(const void ss, void oss) {`
`519`	`518`	`return internal_syscall(SYSCALL(sigaltstack), (uptr)ss, (uptr)oss);`
`520`	`519`	`}`
`521`	`520`