Revision: 11573 Author: [email protected] Date: Wed May 16 02:43:05 2012 Log: Merged r11559 into 3.10 branch.
Fix ucontext structure for Android on x86 Original CL: https://chromiumcodereview.appspot.com/10310116 [email protected] Review URL: https://chromiumcodereview.appspot.com/10386164 http://code.google.com/p/v8/source/detail?r=11573 Modified: /branches/3.10/src/platform-linux.cc /branches/3.10/src/version.cc ======================================= --- /branches/3.10/src/platform-linux.cc Tue Apr 17 04:57:53 2012 +++ /branches/3.10/src/platform-linux.cc Wed May 16 02:43:05 2012 @@ -966,43 +966,22 @@ #elif !defined(__GLIBC__) && defined(__i386__) // x86 version for Android. -struct _libc_fpreg { - uint16_t significand[4]; - uint16_t exponent; +struct sigcontext { + uint32_t gregs[19]; + void* fpregs; + uint32_t oldmask; + uint32_t cr2; }; -struct _libc_fpstate { - uint64_t cw; - uint64_t sw; - uint64_t tag; - uint64_t ipoff; - uint64_t cssel; - uint64_t dataoff; - uint64_t datasel; - struct _libc_fpreg _st[8]; - uint64_t status; -}; - -typedef struct _libc_fpstate *fpregset_t; - -typedef struct mcontext { - int32_t gregs[19]; - fpregset_t fpregs; - int64_t oldmask; - int64_t cr2; -} mcontext_t; - -typedef uint64_t __sigset_t; - +typedef uint32_t __sigset_t; +typedef struct sigcontext mcontext_t; typedef struct ucontext { - uint64_t uc_flags; - struct ucontext *uc_link; + uint32_t uc_flags; + struct ucontext* uc_link; stack_t uc_stack; mcontext_t uc_mcontext; __sigset_t uc_sigmask; - struct _libc_fpstate __fpregs_mem; } ucontext_t; - enum { REG_EBP = 6, REG_ESP = 7, REG_EIP = 14 }; #endif ======================================= --- /branches/3.10/src/version.cc Tue May 15 01:33:15 2012 +++ /branches/3.10/src/version.cc Wed May 16 02:43:05 2012 @@ -35,7 +35,7 @@ #define MAJOR_VERSION 3 #define MINOR_VERSION 10 #define BUILD_NUMBER 8 -#define PATCH_LEVEL 6 +#define PATCH_LEVEL 7 // Use 1 for candidates and 0 otherwise. // (Boolean macro values are not supported by all preprocessors.) #define IS_CANDIDATE_VERSION 0 -- v8-dev mailing list [email protected] http://groups.google.com/group/v8-dev
