diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-02-15 14:14:30 -0800 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2012-02-15 14:14:30 -0800 |
| commit | eed066b7ac0df859a0144ddde604e99ebf95d4d6 (patch) | |
| tree | 0f7e23cb3bee46701b33748c93f6e709ce64e4d1 /src | |
| parent | c0da2aebebbad031964546f63a3434225b0c83ab (diff) | |
| parent | f8d66dab97635631a6bc30fa0071a2eb22566264 (diff) | |
| download | android_external_v8-eed066b7ac0df859a0144ddde604e99ebf95d4d6.tar.gz android_external_v8-eed066b7ac0df859a0144ddde604e99ebf95d4d6.tar.bz2 android_external_v8-eed066b7ac0df859a0144ddde604e99ebf95d4d6.zip | |
resolved conflicts for merge of f8d66dab to master
Change-Id: I66e6f68b1c5b5d1f0ad5347eabe8b99e6f9bad77
Diffstat (limited to 'src')
| -rw-r--r-- | src/platform-linux.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/platform-linux.cc b/src/platform-linux.cc index b152dae9..032cdaaa 100644 --- a/src/platform-linux.cc +++ b/src/platform-linux.cc @@ -855,7 +855,7 @@ Semaphore* OS::CreateSemaphore(int count) { } -#if !defined(__GLIBC__) && (defined(__arm__) || defined(__thumb__)) +#if !defined(__GLIBC__) && (defined(__arm__) || defined(__thumb__) || defined(__i386__)) // Android runs a fairly new Linux kernel, so signal info is there, // but the C library doesn't have the structs defined. @@ -877,6 +877,7 @@ typedef struct ucontext { __sigset_t uc_sigmask; } ucontext_t; enum ArmRegisters {R15 = 15, R13 = 13, R11 = 11}; +enum X86Registers {REG_EIP = 14, REG_ESP = 7, REG_EBP = 6}; #endif |