diff options
| author | Dmitry Shachnev <mitya57@gmail.com> | 2014-06-05 21:33:13 +0400 |
|---|---|---|
| committer | Dmitry Shachnev <mitya57@gmail.com> | 2014-06-05 21:33:13 +0400 |
| commit | 8c715512be76a7df16c682fcb29c7c1c9a6ff902 (patch) | |
| tree | 563b9128557577c825c8ced79b7426de56eaada6 | |
| parent | f824be39a043d363de51d8831ed3549e1e0e4133 (diff) | |
| download | qtdeclarative-8c715512be76a7df16c682fcb29c7c1c9a6ff902.tar.gz | |
Add freebsd_registers.diff to fix build failure on kFreeBSD.
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/patches/freebsd_registers.diff | 35 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 39 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index aa9c5d9..b7bff5a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ qtdeclarative-opensource-src (5.3.0-4) UNRELEASED; urgency=medium [ Timo Jyrinki ] * Move a Quick Widgets private header to qtdeclarative5-private-dev. + [ Dmitry Shachnev ] + * Add freebsd_registers.diff to fix build failure on kFreeBSD. + -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Wed, 28 May 2014 05:48:28 +0000 qtdeclarative-opensource-src (5.3.0-3) experimental; urgency=medium diff --git a/debian/patches/freebsd_registers.diff b/debian/patches/freebsd_registers.diff new file mode 100644 index 0000000..4615814 --- /dev/null +++ b/debian/patches/freebsd_registers.diff @@ -0,0 +1,35 @@ +Description: make qv4assembler.cpp work on all OSes +Author: Dmitry Shachnev <mitya57@gmail.com> +Forwarded: no +Last-Update: 2014-06-05 + +--- a/src/qml/jit/qv4assembler.cpp ++++ b/src/qml/jit/qv4assembler.cpp +@@ -96,25 +96,17 @@ + /* Platform/Calling convention/Architecture specific section */ + + #if CPU(X86_64) +-# if OS(LINUX) || OS(MAC_OS_X) +-static const Assembler::RegisterID calleeSavedRegisters[] = { +- JSC::X86Registers::ebx, +- JSC::X86Registers::r12, // LocalsRegister +- JSC::X86Registers::r13, +- JSC::X86Registers::r14, // ContextRegister +- JSC::X86Registers::r15 +-}; +-# elif OS(WINDOWS) + static const Assembler::RegisterID calleeSavedRegisters[] = { + JSC::X86Registers::ebx, ++# if !(OS(WINDOWS)) + JSC::X86Registers::esi, + JSC::X86Registers::edi, ++# endif + JSC::X86Registers::r12, // LocalsRegister + JSC::X86Registers::r13, + JSC::X86Registers::r14, // ContextRegister + JSC::X86Registers::r15 + }; +-# endif + #endif + + #if CPU(X86) diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..ea9378a --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +freebsd_registers.diff |