diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-09 10:28:59 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-09 10:28:59 +0200 |
| commit | aecc6ad8b78226ed54ca362dc357f37db78c4025 (patch) | |
| tree | 56c0ad7a8b3e297c18b5254d9ef5de4de2a5703d /masm | |
| parent | d4d1b00f8b9a685141ba18282e6bd906e9a9aee0 (diff) | |
Fix compilation on amd64 (not working yet, just building)
Diffstat (limited to 'masm')
| -rw-r--r-- | masm/assembler/MacroAssembler.h | 2 | ||||
| -rw-r--r-- | masm/config.h | 1 | ||||
| -rw-r--r-- | masm/disassembler/udis86/ud_opcode.pyc | bin | 7170 -> 7230 bytes | |||
| -rw-r--r-- | masm/disassembler/udis86/ud_optable.pyc | bin | 2793 -> 2814 bytes | |||
| -rw-r--r-- | masm/stubs/WTFStubs.cpp | 2 |
5 files changed, 3 insertions, 2 deletions
diff --git a/masm/assembler/MacroAssembler.h b/masm/assembler/MacroAssembler.h index 1a9af2989b..43c9b470f7 100644 --- a/masm/assembler/MacroAssembler.h +++ b/masm/assembler/MacroAssembler.h @@ -578,7 +578,7 @@ public: default: { if (value <= 0xff) return false; -#if CPU(X86_64) +#if CPU(X86_64) && 0 JSValue jsValue = JSValue::decode(reinterpret_cast<void*>(value)); if (jsValue.isInt32()) return shouldBlind(Imm32(jsValue.asInt32())); diff --git a/masm/config.h b/masm/config.h index d462525611..7e0779fc45 100644 --- a/masm/config.h +++ b/masm/config.h @@ -6,5 +6,6 @@ #include <wtf/Vector.h> #endif #include <limits.h> +#include <math.h> #endif // MASM_CONFIG_H diff --git a/masm/disassembler/udis86/ud_opcode.pyc b/masm/disassembler/udis86/ud_opcode.pyc Binary files differindex cade0c2172..75a1d62f26 100644 --- a/masm/disassembler/udis86/ud_opcode.pyc +++ b/masm/disassembler/udis86/ud_opcode.pyc diff --git a/masm/disassembler/udis86/ud_optable.pyc b/masm/disassembler/udis86/ud_optable.pyc Binary files differindex 8f36a9c0b1..76896dc409 100644 --- a/masm/disassembler/udis86/ud_optable.pyc +++ b/masm/disassembler/udis86/ud_optable.pyc diff --git a/masm/stubs/WTFStubs.cpp b/masm/stubs/WTFStubs.cpp index 072bfdb84f..7e16bbc4d8 100644 --- a/masm/stubs/WTFStubs.cpp +++ b/masm/stubs/WTFStubs.cpp @@ -7,7 +7,7 @@ namespace WTF { -void* fastMalloc(unsigned int size) +void* fastMalloc(size_t size) { return malloc(size); } |