Author: andrew
Date: Thu Jul 9 12:51:50 2015
New Revision: 285313
URL: https://svnweb.freebsd.org/changeset/base/285313
Log:
Clean up the types used in <machine/ucontext.h> on arm64. As some ports
include this file without first including the headers needed for uint32_t
and the like use the __foo type.
Obtained from: ABT Systems Ltd
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/arm64/include/pcb.h
head/sys/arm64/include/ucontext.h
Modified: head/sys/arm64/include/pcb.h
==============================================================================
--- head/sys/arm64/include/pcb.h Thu Jul 9 12:04:45 2015
(r285312)
+++ head/sys/arm64/include/pcb.h Thu Jul 9 12:51:50 2015
(r285313)
@@ -49,7 +49,7 @@ struct pcb {
__uint128_t pcb_vfp[32];
uint32_t pcb_fpcr;
uint32_t pcb_fpsr;
- u_int pcb_fpflags;
+ int pcb_fpflags;
#define PCB_FP_STARTED 0x01
u_int pcb_vfpcpu; /* Last cpu this thread ran VFP code */
};
Modified: head/sys/arm64/include/ucontext.h
==============================================================================
--- head/sys/arm64/include/ucontext.h Thu Jul 9 12:04:45 2015
(r285312)
+++ head/sys/arm64/include/ucontext.h Thu Jul 9 12:51:50 2015
(r285313)
@@ -34,29 +34,29 @@
#define _MACHINE_UCONTEXT_H_
struct gpregs {
- unsigned long long gp_x[30];
- unsigned long long gp_lr;
- unsigned long long gp_sp;
- unsigned long long gp_elr;
- uint32_t gp_spsr;
- u_int gp_pad;
+ __register_t gp_x[30];
+ __register_t gp_lr;
+ __register_t gp_sp;
+ __register_t gp_elr;
+ __uint32_t gp_spsr;
+ int gp_pad;
};
struct fpregs {
__uint128_t fp_q[32];
- uint32_t fp_sr;
- uint32_t fp_cr;
- u_int fp_flags;
- u_int fp_pad;
+ __uint32_t fp_sr;
+ __uint32_t fp_cr;
+ int fp_flags;
+ int fp_pad;
};
struct __mcontext {
struct gpregs mc_gpregs;
struct fpregs mc_fpregs;
- u_int mc_flags;
+ int mc_flags;
#define _MC_FP_VALID 0x1 /* Set when mc_fpregs has valid
data */
- u_int mc_pad; /* Padding */
- uint64_t mc_spare[8]; /* Space for expansion, set to zero */
+ int mc_pad; /* Padding */
+ __uint64_t mc_spare[8]; /* Space for expansion, set to zero */
};
typedef struct __mcontext mcontext_t;
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
