← Back to branch summary

~ubuntu-branches/ubuntu/lucid/webkit/lucid-updates

« back to all changes in this revision

Viewing changes to JavaScriptCore/assembler/MacroAssemblerARM.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Gustavo Noronha Silva
  • Date: 2010-01-06 21:25:06 UTC
  • mfrom: (1.2.6 upstream) (4.3.7 sid)
  • Revision ID: james.westby@ubuntu.com-20100106212506-gd0czn4zrwf1j19l
http://bugs.debian.org/529271
http://bugs.debian.org/559420
* New upstream release
- adds basic Content-Encoding support, thanks to soup
  (Closes: #529271)
- fixes over-advertising content types as supported by
  the media player (Closes: #559420)
* debian/control:
- updated libsoup build requirement (>= 2.28.2)
* debian/libwebkit-1.0-2.symbols:
- updated with new symbols
* debian/copyright:
- updated information since 1.1.17
* Imported patch from https://bugs.webkit.org/show_bug.cgi?id=30623
- I am shipping this patch because I believe it is correct, it is the
  way to go, it fixes a race, and it needs testing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
JavaScriptCore/assembler/MacroAssemblerARM.cpp
26
26
 
27
27
#include "config.h"
28
28
 
29
 
#if ENABLE(ASSEMBLER) && PLATFORM(ARM_TRADITIONAL)
 
29
#if ENABLE(ASSEMBLER) && CPU(ARM_TRADITIONAL)
30
30
 
31
31
#include "MacroAssemblerARM.h"
32
32
 
33
 
#if PLATFORM(LINUX)
 
33
#if OS(LINUX)
34
34
#include <sys/types.h>
35
35
#include <sys/stat.h>
36
36
#include <fcntl.h>
43
43
 
44
44
static bool isVFPPresent()
45
45
{
46
 
#if PLATFORM(LINUX)
 
46
#if OS(LINUX)
47
47
    int fd = open("/proc/self/auxv", O_RDONLY);
48
48
    if (fd > 0) {
49
49
        Elf32_auxv_t aux;
62
62
 
63
63
const bool MacroAssemblerARM::s_isVFPPresent = isVFPPresent();
64
64
 
65
 
#if defined(ARM_REQUIRE_NATURAL_ALIGNMENT) && ARM_REQUIRE_NATURAL_ALIGNMENT
 
65
#if CPU(ARMV5_OR_LOWER)
 
66
/* On ARMv5 and below, natural alignment is required. */
66
67
void MacroAssemblerARM::load32WithUnalignedHalfWords(BaseIndex address, RegisterID dest)
67
68
{
68
69
    ARMWord op2;
91
92
 
92
93
}
93
94
 
94
 
#endif // ENABLE(ASSEMBLER) && PLATFORM(ARM_TRADITIONAL)
 
95
#endif // ENABLE(ASSEMBLER) && CPU(ARM_TRADITIONAL)