diff mbox series

[v2,5/8] linux-user/hppa: Move errno definitions to 'target_errno_defs.h'

Message ID 20210708141121.1731691-6-f4bug@amsat.org
State New
Headers show
Series linux-user: target <-> host errno conversion code refactor | expand

Commit Message

Philippe Mathieu-Daudé July 8, 2021, 2:11 p.m. UTC 
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 linux-user/hppa/target_errno_defs.h | 210 ++++++++++++++++++++++++++++
 linux-user/hppa/target_syscall.h    | 210 ----------------------------
 2 files changed, 210 insertions(+), 210 deletions(-)

Comments

Laurent Vivier July 8, 2021, 3:25 p.m. UTC | #1 
Le 08/07/2021 à 16:11, Philippe Mathieu-Daudé a écrit :
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>  linux-user/hppa/target_errno_defs.h | 210 ++++++++++++++++++++++++++++
>  linux-user/hppa/target_syscall.h    | 210 ----------------------------
>  2 files changed, 210 insertions(+), 210 deletions(-)
> 
> diff --git a/linux-user/hppa/target_errno_defs.h b/linux-user/hppa/target_errno_defs.h
> index d6e9676ce25..17ece226c8d 100644
> --- a/linux-user/hppa/target_errno_defs.h
> +++ b/linux-user/hppa/target_errno_defs.h
> @@ -3,4 +3,214 @@
>  
>  #include "../generic/target_errno_defs.h"
>  
> +#undef TARGET_EWOULDBLOCK
> +#define TARGET_EWOULDBLOCK     TARGET_EAGAIN /* Operation would block */
> +#undef  TARGET_ENOMSG
> +#define TARGET_ENOMSG          35
> +#undef  TARGET_EIDRM
> +#define TARGET_EIDRM           36
> +#undef  TARGET_ECHRNG
> +#define TARGET_ECHRNG          37
> +#undef  TARGET_EL2NSYNC
> +#define TARGET_EL2NSYNC        38
> +#undef  TARGET_EL3HLT
> +#define TARGET_EL3HLT          39
> +#undef  TARGET_EL3RST
> +#define TARGET_EL3RST          40
> +#undef  TARGET_ELNRNG
> +#define TARGET_ELNRNG          41
> +#undef  TARGET_EUNATCH
> +#define TARGET_EUNATCH         42
> +#undef  TARGET_ENOCSI
> +#define TARGET_ENOCSI          43
> +#undef  TARGET_EL2HLT
> +#define TARGET_EL2HLT          44
> +#undef  TARGET_EDEADLK
> +#define TARGET_EDEADLK         45
> +#undef  TARGET_ENOLCK
> +#define TARGET_ENOLCK          46
> +#undef  TARGET_EILSEQ
> +#define TARGET_EILSEQ          47
> +
> +#undef  TARGET_ENONET
> +#define TARGET_ENONET          50
> +#undef  TARGET_ENODATA
> +#define TARGET_ENODATA         51
> +#undef  TARGET_ETIME
> +#define TARGET_ETIME           52
> +#undef  TARGET_ENOSR
> +#define TARGET_ENOSR           53
> +#undef  TARGET_ENOSTR
> +#define TARGET_ENOSTR          54
> +#undef  TARGET_ENOPKG
> +#define TARGET_ENOPKG          55
> +
> +#undef  TARGET_ENOLINK
> +#define TARGET_ENOLINK         57
> +#undef  TARGET_EADV
> +#define TARGET_EADV            58
> +#undef  TARGET_ESRMNT
> +#define TARGET_ESRMNT          59
> +#undef  TARGET_ECOMM
> +#define TARGET_ECOMM           60
> +#undef  TARGET_EPROTO
> +#define TARGET_EPROTO          61
> +
> +#undef  TARGET_EMULTIHOP
> +#define TARGET_EMULTIHOP       64
> +
> +#undef  TARGET_EDOTDOT
> +#define TARGET_EDOTDOT         66
> +#undef  TARGET_EBADMSG
> +#define TARGET_EBADMSG         67
> +#undef  TARGET_EUSERS
> +#define TARGET_EUSERS          68
> +#undef  TARGET_EDQUOT
> +#define TARGET_EDQUOT          69
> +#undef  TARGET_ESTALE
> +#define TARGET_ESTALE          70
> +#undef  TARGET_EREMOTE
> +#define TARGET_EREMOTE         71
> +#undef  TARGET_EOVERFLOW
> +#define TARGET_EOVERFLOW       72
> +
> +#undef  TARGET_EBADE
> +#define TARGET_EBADE           160
> +#undef  TARGET_EBADR
> +#define TARGET_EBADR           161
> +#undef  TARGET_EXFULL
> +#define TARGET_EXFULL          162
> +#undef  TARGET_ENOANO
> +#define TARGET_ENOANO          163
> +#undef  TARGET_EBADRQC
> +#define TARGET_EBADRQC         164
> +#undef  TARGET_EBADSLT
> +#define TARGET_EBADSLT         165
> +#undef  TARGET_EBFONT
> +#define TARGET_EBFONT          166
> +#undef  TARGET_ENOTUNIQ
> +#define TARGET_ENOTUNIQ        167
> +#undef  TARGET_EBADFD
> +#define TARGET_EBADFD          168
> +#undef  TARGET_EREMCHG
> +#define TARGET_EREMCHG         169
> +#undef  TARGET_ELIBACC
> +#define TARGET_ELIBACC         170
> +#undef  TARGET_ELIBBAD
> +#define TARGET_ELIBBAD         171
> +#undef  TARGET_ELIBSCN
> +#define TARGET_ELIBSCN         172
> +#undef  TARGET_ELIBMAX
> +#define TARGET_ELIBMAX         173
> +#undef  TARGET_ELIBEXEC
> +#define TARGET_ELIBEXEC        174
> +#undef  TARGET_ERESTART
> +#define TARGET_ERESTART        175
> +#undef  TARGET_ESTRPIPE
> +#define TARGET_ESTRPIPE        176
> +#undef  TARGET_EUCLEAN
> +#define TARGET_EUCLEAN         177
> +#undef  TARGET_ENOTNAM
> +#define TARGET_ENOTNAM         178
> +#undef  TARGET_ENAVAIL
> +#define TARGET_ENAVAIL         179
> +#undef  TARGET_EISNAM
> +#define TARGET_EISNAM          180
> +#undef  TARGET_EREMOTEIO
> +#define TARGET_EREMOTEIO       181
> +#undef  TARGET_ENOMEDIUM
> +#define TARGET_ENOMEDIUM       182
> +#undef  TARGET_EMEDIUMTYPE
> +#define TARGET_EMEDIUMTYPE     183
> +#undef  TARGET_ENOKEY
> +#define TARGET_ENOKEY          184
> +#undef  TARGET_EKEYEXPIRED
> +#define TARGET_EKEYEXPIRED     185
> +#undef  TARGET_EKEYREVOKED
> +#define TARGET_EKEYREVOKED     186
> +#undef  TARGET_EKEYREJECTED
> +#define TARGET_EKEYREJECTED    187
> +
> +/* Never used in linux.  */
> +/* #define TARGET_ENOSYM          215 */
> +#undef  TARGET_ENOTSOCK
> +#define TARGET_ENOTSOCK        216
> +#undef  TARGET_EDESTADDRREQ
> +#define TARGET_EDESTADDRREQ    217
> +#undef  TARGET_EMSGSIZE
> +#define TARGET_EMSGSIZE        218
> +#undef  TARGET_EPROTOTYPE
> +#define TARGET_EPROTOTYPE      219
> +#undef  TARGET_ENOPROTOOPT
> +#define TARGET_ENOPROTOOPT     220
> +#undef  TARGET_EPROTONOSUPPORT
> +#define TARGET_EPROTONOSUPPORT 221
> +#undef  TARGET_ESOCKTNOSUPPORT
> +#define TARGET_ESOCKTNOSUPPORT 222
> +#undef  TARGET_EOPNOTSUPP
> +#define TARGET_EOPNOTSUPP      223
> +#undef  TARGET_EPFNOSUPPORT
> +#define TARGET_EPFNOSUPPORT    224
> +#undef  TARGET_EAFNOSUPPORT
> +#define TARGET_EAFNOSUPPORT    225
> +#undef  TARGET_EADDRINUSE
> +#define TARGET_EADDRINUSE      226
> +#undef  TARGET_EADDRNOTAVAIL
> +#define TARGET_EADDRNOTAVAIL   227
> +#undef  TARGET_ENETDOWN
> +#define TARGET_ENETDOWN        228
> +#undef  TARGET_ENETUNREACH
> +#define TARGET_ENETUNREACH     229
> +#undef  TARGET_ENETRESET
> +#define TARGET_ENETRESET       230
> +#undef  TARGET_ECONNABORTED
> +#define TARGET_ECONNABORTED    231
> +#undef  TARGET_ECONNRESET
> +#define TARGET_ECONNRESET      232
> +#undef  TARGET_ENOBUFS
> +#define TARGET_ENOBUFS         233
> +#undef  TARGET_EISCONN
> +#define TARGET_EISCONN         234
> +#undef  TARGET_ENOTCONN
> +#define TARGET_ENOTCONN        235
> +#undef  TARGET_ESHUTDOWN
> +#define TARGET_ESHUTDOWN       236
> +#undef  TARGET_ETOOMANYREFS
> +#define TARGET_ETOOMANYREFS    237
> +#undef  TARGET_ETIMEDOUT
> +#define TARGET_ETIMEDOUT       238
> +#undef  TARGET_ECONNREFUSED
> +#define TARGET_ECONNREFUSED    239
> +#define TARGET_EREMOTERELEASE  240
> +#undef  TARGET_EHOSTDOWN
> +#define TARGET_EHOSTDOWN       241
> +#undef  TARGET_EHOSTUNREACH
> +#define TARGET_EHOSTUNREACH    242
> +
> +#undef  TARGET_EALREADY
> +#define TARGET_EALREADY        244
> +#undef  TARGET_EINPROGRESS
> +#define TARGET_EINPROGRESS     245
> +#undef  TARGET_ENOTEMPTY
> +#define TARGET_ENOTEMPTY       247
> +#undef  TARGET_ENAMETOOLONG
> +#define TARGET_ENAMETOOLONG    248
> +#undef  TARGET_ELOOP
> +#define TARGET_ELOOP           249
> +#undef  TARGET_ENOSYS
> +#define TARGET_ENOSYS          251
> +
> +#undef  TARGET_ECANCELED
> +#define TARGET_ECANCELED       253
> +
> +#undef  TARGET_EOWNERDEAD
> +#define TARGET_EOWNERDEAD      254
> +#undef  TARGET_ENOTRECOVERABLE
> +#define TARGET_ENOTRECOVERABLE 255
> +
> +#undef  TARGET_ERFKILL
> +#define TARGET_ERFKILL         256
> +#undef  TARGET_EHWPOISON
> +#define TARGET_EHWPOISON       257
> +
>  #endif
> diff --git a/linux-user/hppa/target_syscall.h b/linux-user/hppa/target_syscall.h
> index 97a095656d8..0018bcb5c4d 100644
> --- a/linux-user/hppa/target_syscall.h
> +++ b/linux-user/hppa/target_syscall.h
> @@ -27,214 +27,4 @@ struct target_pt_regs {
>  #define TARGET_MCL_FUTURE  2
>  #define TARGET_MCL_ONFAULT 4
>  
> -#undef  TARGET_EWOULDBLOCK
> -#define TARGET_EWOULDBLOCK     TARGET_EAGAIN /* Operation would block */
> -#undef  TARGET_ENOMSG
> -#define TARGET_ENOMSG          35
> -#undef  TARGET_EIDRM
> -#define TARGET_EIDRM           36
> -#undef  TARGET_ECHRNG
> -#define TARGET_ECHRNG          37
> -#undef  TARGET_EL2NSYNC
> -#define TARGET_EL2NSYNC        38
> -#undef  TARGET_EL3HLT
> -#define TARGET_EL3HLT          39
> -#undef  TARGET_EL3RST
> -#define TARGET_EL3RST          40
> -#undef  TARGET_ELNRNG
> -#define TARGET_ELNRNG          41
> -#undef  TARGET_EUNATCH
> -#define TARGET_EUNATCH         42
> -#undef  TARGET_ENOCSI
> -#define TARGET_ENOCSI          43
> -#undef  TARGET_EL2HLT
> -#define TARGET_EL2HLT          44
> -#undef  TARGET_EDEADLK
> -#define TARGET_EDEADLK         45
> -#undef  TARGET_ENOLCK
> -#define TARGET_ENOLCK          46
> -#undef  TARGET_EILSEQ
> -#define TARGET_EILSEQ          47
> -
> -#undef  TARGET_ENONET
> -#define TARGET_ENONET          50
> -#undef  TARGET_ENODATA
> -#define TARGET_ENODATA         51
> -#undef  TARGET_ETIME
> -#define TARGET_ETIME           52
> -#undef  TARGET_ENOSR
> -#define TARGET_ENOSR           53
> -#undef  TARGET_ENOSTR
> -#define TARGET_ENOSTR          54
> -#undef  TARGET_ENOPKG
> -#define TARGET_ENOPKG          55
> -
> -#undef  TARGET_ENOLINK
> -#define TARGET_ENOLINK         57
> -#undef  TARGET_EADV
> -#define TARGET_EADV            58
> -#undef  TARGET_ESRMNT
> -#define TARGET_ESRMNT          59
> -#undef  TARGET_ECOMM
> -#define TARGET_ECOMM           60
> -#undef  TARGET_EPROTO
> -#define TARGET_EPROTO          61
> -
> -#undef  TARGET_EMULTIHOP
> -#define TARGET_EMULTIHOP       64
> -
> -#undef  TARGET_EDOTDOT
> -#define TARGET_EDOTDOT         66
> -#undef  TARGET_EBADMSG
> -#define TARGET_EBADMSG         67
> -#undef  TARGET_EUSERS
> -#define TARGET_EUSERS          68
> -#undef  TARGET_EDQUOT
> -#define TARGET_EDQUOT          69
> -#undef  TARGET_ESTALE
> -#define TARGET_ESTALE          70
> -#undef  TARGET_EREMOTE
> -#define TARGET_EREMOTE         71
> -#undef  TARGET_EOVERFLOW
> -#define TARGET_EOVERFLOW       72
> -
> -#undef  TARGET_EBADE
> -#define TARGET_EBADE           160
> -#undef  TARGET_EBADR
> -#define TARGET_EBADR           161
> -#undef  TARGET_EXFULL
> -#define TARGET_EXFULL          162
> -#undef  TARGET_ENOANO
> -#define TARGET_ENOANO          163
> -#undef  TARGET_EBADRQC
> -#define TARGET_EBADRQC         164
> -#undef  TARGET_EBADSLT
> -#define TARGET_EBADSLT         165
> -#undef  TARGET_EBFONT
> -#define TARGET_EBFONT          166
> -#undef  TARGET_ENOTUNIQ
> -#define TARGET_ENOTUNIQ        167
> -#undef  TARGET_EBADFD
> -#define TARGET_EBADFD          168
> -#undef  TARGET_EREMCHG
> -#define TARGET_EREMCHG         169
> -#undef  TARGET_ELIBACC
> -#define TARGET_ELIBACC         170
> -#undef  TARGET_ELIBBAD
> -#define TARGET_ELIBBAD         171
> -#undef  TARGET_ELIBSCN
> -#define TARGET_ELIBSCN         172
> -#undef  TARGET_ELIBMAX
> -#define TARGET_ELIBMAX         173
> -#undef  TARGET_ELIBEXEC
> -#define TARGET_ELIBEXEC        174
> -#undef  TARGET_ERESTART
> -#define TARGET_ERESTART        175
> -#undef  TARGET_ESTRPIPE
> -#define TARGET_ESTRPIPE        176
> -#undef  TARGET_EUCLEAN
> -#define TARGET_EUCLEAN         177
> -#undef  TARGET_ENOTNAM
> -#define TARGET_ENOTNAM         178
> -#undef  TARGET_ENAVAIL
> -#define TARGET_ENAVAIL         179
> -#undef  TARGET_EISNAM
> -#define TARGET_EISNAM          180
> -#undef  TARGET_EREMOTEIO
> -#define TARGET_EREMOTEIO       181
> -#undef  TARGET_ENOMEDIUM
> -#define TARGET_ENOMEDIUM       182
> -#undef  TARGET_EMEDIUMTYPE
> -#define TARGET_EMEDIUMTYPE     183
> -#undef  TARGET_ENOKEY
> -#define TARGET_ENOKEY          184
> -#undef  TARGET_EKEYEXPIRED
> -#define TARGET_EKEYEXPIRED     185
> -#undef  TARGET_EKEYREVOKED
> -#define TARGET_EKEYREVOKED     186
> -#undef  TARGET_EKEYREJECTED
> -#define TARGET_EKEYREJECTED    187
> -
> -/* Never used in linux.  */
> -/* #define TARGET_ENOSYM          215 */
> -#undef  TARGET_ENOTSOCK
> -#define TARGET_ENOTSOCK        216
> -#undef  TARGET_EDESTADDRREQ
> -#define TARGET_EDESTADDRREQ    217
> -#undef  TARGET_EMSGSIZE
> -#define TARGET_EMSGSIZE        218
> -#undef  TARGET_EPROTOTYPE
> -#define TARGET_EPROTOTYPE      219
> -#undef  TARGET_ENOPROTOOPT
> -#define TARGET_ENOPROTOOPT     220
> -#undef  TARGET_EPROTONOSUPPORT
> -#define TARGET_EPROTONOSUPPORT 221
> -#undef  TARGET_ESOCKTNOSUPPORT
> -#define TARGET_ESOCKTNOSUPPORT 222
> -#undef  TARGET_EOPNOTSUPP
> -#define TARGET_EOPNOTSUPP      223
> -#undef  TARGET_EPFNOSUPPORT
> -#define TARGET_EPFNOSUPPORT    224
> -#undef  TARGET_EAFNOSUPPORT
> -#define TARGET_EAFNOSUPPORT    225
> -#undef  TARGET_EADDRINUSE
> -#define TARGET_EADDRINUSE      226
> -#undef  TARGET_EADDRNOTAVAIL
> -#define TARGET_EADDRNOTAVAIL   227
> -#undef  TARGET_ENETDOWN
> -#define TARGET_ENETDOWN        228
> -#undef  TARGET_ENETUNREACH
> -#define TARGET_ENETUNREACH     229
> -#undef  TARGET_ENETRESET
> -#define TARGET_ENETRESET       230
> -#undef  TARGET_ECONNABORTED
> -#define TARGET_ECONNABORTED    231
> -#undef  TARGET_ECONNRESET
> -#define TARGET_ECONNRESET      232
> -#undef  TARGET_ENOBUFS
> -#define TARGET_ENOBUFS         233
> -#undef  TARGET_EISCONN
> -#define TARGET_EISCONN         234
> -#undef  TARGET_ENOTCONN
> -#define TARGET_ENOTCONN        235
> -#undef  TARGET_ESHUTDOWN
> -#define TARGET_ESHUTDOWN       236
> -#undef  TARGET_ETOOMANYREFS
> -#define TARGET_ETOOMANYREFS    237
> -#undef  TARGET_ETIMEDOUT
> -#define TARGET_ETIMEDOUT       238
> -#undef  TARGET_ECONNREFUSED
> -#define TARGET_ECONNREFUSED    239
> -#define TARGET_EREMOTERELEASE  240
> -#undef  TARGET_EHOSTDOWN
> -#define TARGET_EHOSTDOWN       241
> -#undef  TARGET_EHOSTUNREACH
> -#define TARGET_EHOSTUNREACH    242
> -
> -#undef  TARGET_EALREADY
> -#define TARGET_EALREADY        244
> -#undef  TARGET_EINPROGRESS
> -#define TARGET_EINPROGRESS     245
> -#undef  TARGET_ENOTEMPTY
> -#define TARGET_ENOTEMPTY       247
> -#undef  TARGET_ENAMETOOLONG
> -#define TARGET_ENAMETOOLONG    248
> -#undef  TARGET_ELOOP
> -#define TARGET_ELOOP           249
> -#undef  TARGET_ENOSYS
> -#define TARGET_ENOSYS          251
> -
> -#undef  TARGET_ECANCELED
> -#define TARGET_ECANCELED       253
> -
> -#undef  TARGET_EOWNERDEAD
> -#define TARGET_EOWNERDEAD      254
> -#undef  TARGET_ENOTRECOVERABLE
> -#define TARGET_ENOTRECOVERABLE 255
> -
> -#undef  TARGET_ERFKILL
> -#define TARGET_ERFKILL         256
> -#undef  TARGET_EHWPOISON
> -#define TARGET_EHWPOISON       257
> -
>  #endif /* HPPA_TARGET_SYSCALL_H */
> 

Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Richard Henderson July 8, 2021, 3:35 p.m. UTC | #2 
On 7/8/21 7:11 AM, Philippe Mathieu-Daudé wrote:
> Signed-off-by: Philippe Mathieu-Daudé<f4bug@amsat.org>
> ---
>   linux-user/hppa/target_errno_defs.h | 210 ++++++++++++++++++++++++++++
>   linux-user/hppa/target_syscall.h    | 210 ----------------------------
>   2 files changed, 210 insertions(+), 210 deletions(-)

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

r~
diff mbox series

Patch

diff --git a/linux-user/hppa/target_errno_defs.h b/linux-user/hppa/target_errno_defs.h
index d6e9676ce25..17ece226c8d 100644
--- a/linux-user/hppa/target_errno_defs.h
+++ b/linux-user/hppa/target_errno_defs.h
@@ -3,4 +3,214 @@ 
 
 #include "../generic/target_errno_defs.h"
 
+#undef TARGET_EWOULDBLOCK
+#define TARGET_EWOULDBLOCK     TARGET_EAGAIN /* Operation would block */
+#undef  TARGET_ENOMSG
+#define TARGET_ENOMSG          35
+#undef  TARGET_EIDRM
+#define TARGET_EIDRM           36
+#undef  TARGET_ECHRNG
+#define TARGET_ECHRNG          37
+#undef  TARGET_EL2NSYNC
+#define TARGET_EL2NSYNC        38
+#undef  TARGET_EL3HLT
+#define TARGET_EL3HLT          39
+#undef  TARGET_EL3RST
+#define TARGET_EL3RST          40
+#undef  TARGET_ELNRNG
+#define TARGET_ELNRNG          41
+#undef  TARGET_EUNATCH
+#define TARGET_EUNATCH         42
+#undef  TARGET_ENOCSI
+#define TARGET_ENOCSI          43
+#undef  TARGET_EL2HLT
+#define TARGET_EL2HLT          44
+#undef  TARGET_EDEADLK
+#define TARGET_EDEADLK         45
+#undef  TARGET_ENOLCK
+#define TARGET_ENOLCK          46
+#undef  TARGET_EILSEQ
+#define TARGET_EILSEQ          47
+
+#undef  TARGET_ENONET
+#define TARGET_ENONET          50
+#undef  TARGET_ENODATA
+#define TARGET_ENODATA         51
+#undef  TARGET_ETIME
+#define TARGET_ETIME           52
+#undef  TARGET_ENOSR
+#define TARGET_ENOSR           53
+#undef  TARGET_ENOSTR
+#define TARGET_ENOSTR          54
+#undef  TARGET_ENOPKG
+#define TARGET_ENOPKG          55
+
+#undef  TARGET_ENOLINK
+#define TARGET_ENOLINK         57
+#undef  TARGET_EADV
+#define TARGET_EADV            58
+#undef  TARGET_ESRMNT
+#define TARGET_ESRMNT          59
+#undef  TARGET_ECOMM
+#define TARGET_ECOMM           60
+#undef  TARGET_EPROTO
+#define TARGET_EPROTO          61
+
+#undef  TARGET_EMULTIHOP
+#define TARGET_EMULTIHOP       64
+
+#undef  TARGET_EDOTDOT
+#define TARGET_EDOTDOT         66
+#undef  TARGET_EBADMSG
+#define TARGET_EBADMSG         67
+#undef  TARGET_EUSERS
+#define TARGET_EUSERS          68
+#undef  TARGET_EDQUOT
+#define TARGET_EDQUOT          69
+#undef  TARGET_ESTALE
+#define TARGET_ESTALE          70
+#undef  TARGET_EREMOTE
+#define TARGET_EREMOTE         71
+#undef  TARGET_EOVERFLOW
+#define TARGET_EOVERFLOW       72
+
+#undef  TARGET_EBADE
+#define TARGET_EBADE           160
+#undef  TARGET_EBADR
+#define TARGET_EBADR           161
+#undef  TARGET_EXFULL
+#define TARGET_EXFULL          162
+#undef  TARGET_ENOANO
+#define TARGET_ENOANO          163
+#undef  TARGET_EBADRQC
+#define TARGET_EBADRQC         164
+#undef  TARGET_EBADSLT
+#define TARGET_EBADSLT         165
+#undef  TARGET_EBFONT
+#define TARGET_EBFONT          166
+#undef  TARGET_ENOTUNIQ
+#define TARGET_ENOTUNIQ        167
+#undef  TARGET_EBADFD
+#define TARGET_EBADFD          168
+#undef  TARGET_EREMCHG
+#define TARGET_EREMCHG         169
+#undef  TARGET_ELIBACC
+#define TARGET_ELIBACC         170
+#undef  TARGET_ELIBBAD
+#define TARGET_ELIBBAD         171
+#undef  TARGET_ELIBSCN
+#define TARGET_ELIBSCN         172
+#undef  TARGET_ELIBMAX
+#define TARGET_ELIBMAX         173
+#undef  TARGET_ELIBEXEC
+#define TARGET_ELIBEXEC        174
+#undef  TARGET_ERESTART
+#define TARGET_ERESTART        175
+#undef  TARGET_ESTRPIPE
+#define TARGET_ESTRPIPE        176
+#undef  TARGET_EUCLEAN
+#define TARGET_EUCLEAN         177
+#undef  TARGET_ENOTNAM
+#define TARGET_ENOTNAM         178
+#undef  TARGET_ENAVAIL
+#define TARGET_ENAVAIL         179
+#undef  TARGET_EISNAM
+#define TARGET_EISNAM          180
+#undef  TARGET_EREMOTEIO
+#define TARGET_EREMOTEIO       181
+#undef  TARGET_ENOMEDIUM
+#define TARGET_ENOMEDIUM       182
+#undef  TARGET_EMEDIUMTYPE
+#define TARGET_EMEDIUMTYPE     183
+#undef  TARGET_ENOKEY
+#define TARGET_ENOKEY          184
+#undef  TARGET_EKEYEXPIRED
+#define TARGET_EKEYEXPIRED     185
+#undef  TARGET_EKEYREVOKED
+#define TARGET_EKEYREVOKED     186
+#undef  TARGET_EKEYREJECTED
+#define TARGET_EKEYREJECTED    187
+
+/* Never used in linux.  */
+/* #define TARGET_ENOSYM          215 */
+#undef  TARGET_ENOTSOCK
+#define TARGET_ENOTSOCK        216
+#undef  TARGET_EDESTADDRREQ
+#define TARGET_EDESTADDRREQ    217
+#undef  TARGET_EMSGSIZE
+#define TARGET_EMSGSIZE        218
+#undef  TARGET_EPROTOTYPE
+#define TARGET_EPROTOTYPE      219
+#undef  TARGET_ENOPROTOOPT
+#define TARGET_ENOPROTOOPT     220
+#undef  TARGET_EPROTONOSUPPORT
+#define TARGET_EPROTONOSUPPORT 221
+#undef  TARGET_ESOCKTNOSUPPORT
+#define TARGET_ESOCKTNOSUPPORT 222
+#undef  TARGET_EOPNOTSUPP
+#define TARGET_EOPNOTSUPP      223
+#undef  TARGET_EPFNOSUPPORT
+#define TARGET_EPFNOSUPPORT    224
+#undef  TARGET_EAFNOSUPPORT
+#define TARGET_EAFNOSUPPORT    225
+#undef  TARGET_EADDRINUSE
+#define TARGET_EADDRINUSE      226
+#undef  TARGET_EADDRNOTAVAIL
+#define TARGET_EADDRNOTAVAIL   227
+#undef  TARGET_ENETDOWN
+#define TARGET_ENETDOWN        228
+#undef  TARGET_ENETUNREACH
+#define TARGET_ENETUNREACH     229
+#undef  TARGET_ENETRESET
+#define TARGET_ENETRESET       230
+#undef  TARGET_ECONNABORTED
+#define TARGET_ECONNABORTED    231
+#undef  TARGET_ECONNRESET
+#define TARGET_ECONNRESET      232
+#undef  TARGET_ENOBUFS
+#define TARGET_ENOBUFS         233
+#undef  TARGET_EISCONN
+#define TARGET_EISCONN         234
+#undef  TARGET_ENOTCONN
+#define TARGET_ENOTCONN        235
+#undef  TARGET_ESHUTDOWN
+#define TARGET_ESHUTDOWN       236
+#undef  TARGET_ETOOMANYREFS
+#define TARGET_ETOOMANYREFS    237
+#undef  TARGET_ETIMEDOUT
+#define TARGET_ETIMEDOUT       238
+#undef  TARGET_ECONNREFUSED
+#define TARGET_ECONNREFUSED    239
+#define TARGET_EREMOTERELEASE  240
+#undef  TARGET_EHOSTDOWN
+#define TARGET_EHOSTDOWN       241
+#undef  TARGET_EHOSTUNREACH
+#define TARGET_EHOSTUNREACH    242
+
+#undef  TARGET_EALREADY
+#define TARGET_EALREADY        244
+#undef  TARGET_EINPROGRESS
+#define TARGET_EINPROGRESS     245
+#undef  TARGET_ENOTEMPTY
+#define TARGET_ENOTEMPTY       247
+#undef  TARGET_ENAMETOOLONG
+#define TARGET_ENAMETOOLONG    248
+#undef  TARGET_ELOOP
+#define TARGET_ELOOP           249
+#undef  TARGET_ENOSYS
+#define TARGET_ENOSYS          251
+
+#undef  TARGET_ECANCELED
+#define TARGET_ECANCELED       253
+
+#undef  TARGET_EOWNERDEAD
+#define TARGET_EOWNERDEAD      254
+#undef  TARGET_ENOTRECOVERABLE
+#define TARGET_ENOTRECOVERABLE 255
+
+#undef  TARGET_ERFKILL
+#define TARGET_ERFKILL         256
+#undef  TARGET_EHWPOISON
+#define TARGET_EHWPOISON       257
+
 #endif
diff --git a/linux-user/hppa/target_syscall.h b/linux-user/hppa/target_syscall.h
index 97a095656d8..0018bcb5c4d 100644
--- a/linux-user/hppa/target_syscall.h
+++ b/linux-user/hppa/target_syscall.h
@@ -27,214 +27,4 @@  struct target_pt_regs {
 #define TARGET_MCL_FUTURE  2
 #define TARGET_MCL_ONFAULT 4
 
-#undef  TARGET_EWOULDBLOCK
-#define TARGET_EWOULDBLOCK     TARGET_EAGAIN /* Operation would block */
-#undef  TARGET_ENOMSG
-#define TARGET_ENOMSG          35
-#undef  TARGET_EIDRM
-#define TARGET_EIDRM           36
-#undef  TARGET_ECHRNG
-#define TARGET_ECHRNG          37
-#undef  TARGET_EL2NSYNC
-#define TARGET_EL2NSYNC        38
-#undef  TARGET_EL3HLT
-#define TARGET_EL3HLT          39
-#undef  TARGET_EL3RST
-#define TARGET_EL3RST          40
-#undef  TARGET_ELNRNG
-#define TARGET_ELNRNG          41
-#undef  TARGET_EUNATCH
-#define TARGET_EUNATCH         42
-#undef  TARGET_ENOCSI
-#define TARGET_ENOCSI          43
-#undef  TARGET_EL2HLT
-#define TARGET_EL2HLT          44
-#undef  TARGET_EDEADLK
-#define TARGET_EDEADLK         45
-#undef  TARGET_ENOLCK
-#define TARGET_ENOLCK          46
-#undef  TARGET_EILSEQ
-#define TARGET_EILSEQ          47
-
-#undef  TARGET_ENONET
-#define TARGET_ENONET          50
-#undef  TARGET_ENODATA
-#define TARGET_ENODATA         51
-#undef  TARGET_ETIME
-#define TARGET_ETIME           52
-#undef  TARGET_ENOSR
-#define TARGET_ENOSR           53
-#undef  TARGET_ENOSTR
-#define TARGET_ENOSTR          54
-#undef  TARGET_ENOPKG
-#define TARGET_ENOPKG          55
-
-#undef  TARGET_ENOLINK
-#define TARGET_ENOLINK         57
-#undef  TARGET_EADV
-#define TARGET_EADV            58
-#undef  TARGET_ESRMNT
-#define TARGET_ESRMNT          59
-#undef  TARGET_ECOMM
-#define TARGET_ECOMM           60
-#undef  TARGET_EPROTO
-#define TARGET_EPROTO          61
-
-#undef  TARGET_EMULTIHOP
-#define TARGET_EMULTIHOP       64
-
-#undef  TARGET_EDOTDOT
-#define TARGET_EDOTDOT         66
-#undef  TARGET_EBADMSG
-#define TARGET_EBADMSG         67
-#undef  TARGET_EUSERS
-#define TARGET_EUSERS          68
-#undef  TARGET_EDQUOT
-#define TARGET_EDQUOT          69
-#undef  TARGET_ESTALE
-#define TARGET_ESTALE          70
-#undef  TARGET_EREMOTE
-#define TARGET_EREMOTE         71
-#undef  TARGET_EOVERFLOW
-#define TARGET_EOVERFLOW       72
-
-#undef  TARGET_EBADE
-#define TARGET_EBADE           160
-#undef  TARGET_EBADR
-#define TARGET_EBADR           161
-#undef  TARGET_EXFULL
-#define TARGET_EXFULL          162
-#undef  TARGET_ENOANO
-#define TARGET_ENOANO          163
-#undef  TARGET_EBADRQC
-#define TARGET_EBADRQC         164
-#undef  TARGET_EBADSLT
-#define TARGET_EBADSLT         165
-#undef  TARGET_EBFONT
-#define TARGET_EBFONT          166
-#undef  TARGET_ENOTUNIQ
-#define TARGET_ENOTUNIQ        167
-#undef  TARGET_EBADFD
-#define TARGET_EBADFD          168
-#undef  TARGET_EREMCHG
-#define TARGET_EREMCHG         169
-#undef  TARGET_ELIBACC
-#define TARGET_ELIBACC         170
-#undef  TARGET_ELIBBAD
-#define TARGET_ELIBBAD         171
-#undef  TARGET_ELIBSCN
-#define TARGET_ELIBSCN         172
-#undef  TARGET_ELIBMAX
-#define TARGET_ELIBMAX         173
-#undef  TARGET_ELIBEXEC
-#define TARGET_ELIBEXEC        174
-#undef  TARGET_ERESTART
-#define TARGET_ERESTART        175
-#undef  TARGET_ESTRPIPE
-#define TARGET_ESTRPIPE        176
-#undef  TARGET_EUCLEAN
-#define TARGET_EUCLEAN         177
-#undef  TARGET_ENOTNAM
-#define TARGET_ENOTNAM         178
-#undef  TARGET_ENAVAIL
-#define TARGET_ENAVAIL         179
-#undef  TARGET_EISNAM
-#define TARGET_EISNAM          180
-#undef  TARGET_EREMOTEIO
-#define TARGET_EREMOTEIO       181
-#undef  TARGET_ENOMEDIUM
-#define TARGET_ENOMEDIUM       182
-#undef  TARGET_EMEDIUMTYPE
-#define TARGET_EMEDIUMTYPE     183
-#undef  TARGET_ENOKEY
-#define TARGET_ENOKEY          184
-#undef  TARGET_EKEYEXPIRED
-#define TARGET_EKEYEXPIRED     185
-#undef  TARGET_EKEYREVOKED
-#define TARGET_EKEYREVOKED     186
-#undef  TARGET_EKEYREJECTED
-#define TARGET_EKEYREJECTED    187
-
-/* Never used in linux.  */
-/* #define TARGET_ENOSYM          215 */
-#undef  TARGET_ENOTSOCK
-#define TARGET_ENOTSOCK        216
-#undef  TARGET_EDESTADDRREQ
-#define TARGET_EDESTADDRREQ    217
-#undef  TARGET_EMSGSIZE
-#define TARGET_EMSGSIZE        218
-#undef  TARGET_EPROTOTYPE
-#define TARGET_EPROTOTYPE      219
-#undef  TARGET_ENOPROTOOPT
-#define TARGET_ENOPROTOOPT     220
-#undef  TARGET_EPROTONOSUPPORT
-#define TARGET_EPROTONOSUPPORT 221
-#undef  TARGET_ESOCKTNOSUPPORT
-#define TARGET_ESOCKTNOSUPPORT 222
-#undef  TARGET_EOPNOTSUPP
-#define TARGET_EOPNOTSUPP      223
-#undef  TARGET_EPFNOSUPPORT
-#define TARGET_EPFNOSUPPORT    224
-#undef  TARGET_EAFNOSUPPORT
-#define TARGET_EAFNOSUPPORT    225
-#undef  TARGET_EADDRINUSE
-#define TARGET_EADDRINUSE      226
-#undef  TARGET_EADDRNOTAVAIL
-#define TARGET_EADDRNOTAVAIL   227
-#undef  TARGET_ENETDOWN
-#define TARGET_ENETDOWN        228
-#undef  TARGET_ENETUNREACH
-#define TARGET_ENETUNREACH     229
-#undef  TARGET_ENETRESET
-#define TARGET_ENETRESET       230
-#undef  TARGET_ECONNABORTED
-#define TARGET_ECONNABORTED    231
-#undef  TARGET_ECONNRESET
-#define TARGET_ECONNRESET      232
-#undef  TARGET_ENOBUFS
-#define TARGET_ENOBUFS         233
-#undef  TARGET_EISCONN
-#define TARGET_EISCONN         234
-#undef  TARGET_ENOTCONN
-#define TARGET_ENOTCONN        235
-#undef  TARGET_ESHUTDOWN
-#define TARGET_ESHUTDOWN       236
-#undef  TARGET_ETOOMANYREFS
-#define TARGET_ETOOMANYREFS    237
-#undef  TARGET_ETIMEDOUT
-#define TARGET_ETIMEDOUT       238
-#undef  TARGET_ECONNREFUSED
-#define TARGET_ECONNREFUSED    239
-#define TARGET_EREMOTERELEASE  240
-#undef  TARGET_EHOSTDOWN
-#define TARGET_EHOSTDOWN       241
-#undef  TARGET_EHOSTUNREACH
-#define TARGET_EHOSTUNREACH    242
-
-#undef  TARGET_EALREADY
-#define TARGET_EALREADY        244
-#undef  TARGET_EINPROGRESS
-#define TARGET_EINPROGRESS     245
-#undef  TARGET_ENOTEMPTY
-#define TARGET_ENOTEMPTY       247
-#undef  TARGET_ENAMETOOLONG
-#define TARGET_ENAMETOOLONG    248
-#undef  TARGET_ELOOP
-#define TARGET_ELOOP           249
-#undef  TARGET_ENOSYS
-#define TARGET_ENOSYS          251
-
-#undef  TARGET_ECANCELED
-#define TARGET_ECANCELED       253
-
-#undef  TARGET_EOWNERDEAD
-#define TARGET_EOWNERDEAD      254
-#undef  TARGET_ENOTRECOVERABLE
-#define TARGET_ENOTRECOVERABLE 255
-
-#undef  TARGET_ERFKILL
-#define TARGET_ERFKILL         256
-#undef  TARGET_EHWPOISON
-#define TARGET_EHWPOISON       257
-
 #endif /* HPPA_TARGET_SYSCALL_H */