Opera 12.15 Source Code
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

ArmFixes.patch 4.9KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148
  1. diff --git a/modules/libgogi/pi_impl/mde_opfont.cpp b/modules/libgogi/pi_impl/mde_opfont.cpp
  2. index 44efd58..fb19e89 100644
  3. --- a/modules/libgogi/pi_impl/mde_opfont.cpp
  4. +++ b/modules/libgogi/pi_impl/mde_opfont.cpp
  5. @@ -28,8 +28,8 @@
  6. # include "modules/libfreetype/include/freetype/ftoutln.h"
  7. # else // FT_INTERNAL_FREETYPE
  8. # include <ft2build.h>
  9. -# include <freetype/ftglyph.h>
  10. -# include <freetype/ftoutln.h>
  11. +# include <freetype2/ftglyph.h>
  12. +# include <freetype2/ftoutln.h>
  13. # endif // FT_INTERNAL_FREETYPE
  14. # endif // MDF_FREETYPE_SUPPORT && MDEFONT_MODULE
  15. # ifdef MDF_AGFA_SUPPORT
  16. diff --git a/modules/mdefont/mdf_freetype.cpp b/modules/mdefont/mdf_freetype.cpp
  17. index 1708581..a6e7e4f 100644
  18. --- a/modules/mdefont/mdf_freetype.cpp
  19. +++ b/modules/mdefont/mdf_freetype.cpp
  20. @@ -23,10 +23,10 @@
  21. # include "modules/libfreetype/include/freetype/ftsnames.h"
  22. #else // FT_INTERNAL_FREETYPE
  23. # include <ft2build.h>
  24. -# include <freetype/tttables.h>
  25. -# include <freetype/ftoutln.h>
  26. -# include <freetype/ttnameid.h>
  27. -# include <freetype/ftsnames.h>
  28. +# include <freetype2/tttables.h>
  29. +# include <freetype2/ftoutln.h>
  30. +# include <freetype2/ttnameid.h>
  31. +# include <freetype2/ftsnames.h>
  32. #endif // FT_INTERNAL_FREETYPE
  33. #include FT_FREETYPE_H
  34. @@ -39,7 +39,7 @@
  35. # ifdef FT_INTERNAL_FREETYPE
  36. # include "modules/libfreetype/include/freetype/ftlcdfil.h"
  37. # else // FT_INTERNAL_FREETYPE
  38. -# include <freetype/ftlcdfil.h>
  39. +# include <freetype2/ftlcdfil.h>
  40. # endif // FT_INTERNAL_FREETYPE
  41. #endif // FT_USE_SMOOTH_LCD_RENDERING || FT_USE_SMOOTH_LCDV_RENDERING
  42. diff --git a/platforms/crashlog/src/crashlog_linux32.cpp b/platforms/crashlog/src/crashlog_linux32.cpp
  43. index c171961..8a21f5c 100644
  44. --- a/platforms/crashlog/src/crashlog_linux32.cpp
  45. +++ b/platforms/crashlog/src/crashlog_linux32.cpp
  46. @@ -9,7 +9,7 @@
  47. #include "core/pch.h"
  48. -#if defined(__linux__) && defined(i386)
  49. +#if defined(__linux__) && (defined(i386) || defined(__arm__))
  50. #include "platforms/crashlog/crashlog.h"
  51. #include "platforms/crashlog/gpu_info.h"
  52. @@ -352,6 +352,7 @@ bool GetGpuInfo(pid_t pid, GpuInfo * gpu_info, GpuInfo * ret_gpudata)
  53. void WriteCrashlog(pid_t pid, GpuInfo * gpu_info, char* log_filename, int log_filename_size, const char* location)
  54. {
  55. +#if !defined(__arm__)
  56. int status;
  57. UINT i;
  58. const char *signame = NULL;
  59. @@ -710,6 +711,7 @@ void WriteCrashlog(pid_t pid, GpuInfo * gpu_info, char* log_filename, int log_fi
  60. ptrace(PT_KILL, pid, 0, 0);
  61. waitpid(pid, &status, 0);
  62. +#endif
  63. }
  64. #endif // defined(__linux__) && defined(i386)
  65. diff --git a/platforms/quix/desktop_pi_impl/unix_opautoupdate.cpp b/platforms/quix/desktop_pi_impl/unix_opautoupdate.cpp
  66. index 473c488..3ce03fd 100644
  67. --- a/platforms/quix/desktop_pi_impl/unix_opautoupdate.cpp
  68. +++ b/platforms/quix/desktop_pi_impl/unix_opautoupdate.cpp
  69. @@ -57,6 +57,8 @@ OP_STATUS UnixOpAutoUpdate::GetArchitecture(OpString& arch)
  70. return arch.Set("sparc");
  71. #elif defined(__PPC__)
  72. return arch.Set("ppc");
  73. +#elif defined(__arm__)
  74. + return arch.Set("arm");
  75. #else
  76. #error "Fix me: unsupported architecture"
  77. return OpStatus::ERR;
  78. diff --git a/platforms/quix/module.build/gcc.conf.py b/platforms/quix/module.build/gcc.conf.py
  79. index 1970335..4e027db 100644
  80. --- a/platforms/quix/module.build/gcc.conf.py
  81. +++ b/platforms/quix/module.build/gcc.conf.py
  82. @@ -3,7 +3,7 @@ class GCC(default.GCC):
  83. def codeFlags(self):
  84. flags = super(GCC, self).codeFlags
  85. - if config.targetPlatform.wordsize == 32:
  86. - flags += ['-march=i686', '-mtune=generic']
  87. +# if config.targetPlatform.wordsize == 32:
  88. +# flags += ['-march=i686', '-mtune=generic']
  89. # We stick with the default (-march=x86-64) for 64-bit
  90. return flags
  91. diff --git a/platforms/unix/base/common/unix_opsysteminfo.cpp b/platforms/unix/base/common/unix_opsysteminfo.cpp
  92. index 522714b..7680f27 100644
  93. --- a/platforms/unix/base/common/unix_opsysteminfo.cpp
  94. +++ b/platforms/unix/base/common/unix_opsysteminfo.cpp
  95. @@ -791,43 +791,7 @@ uni_char* UnixOpSystemInfo::SerializeFileName(const uni_char *path)
  96. #ifdef OPSYSTEMINFO_CPU_FEATURES
  97. unsigned int UnixOpSystemInfo::GetCPUFeatures()
  98. {
  99. - int ecx = 0, edx = 0;
  100. - unsigned result = 0;
  101. - const int SSE2_MASK = 0x4000000; // sse2 capability is written on the 27th bit of edx
  102. - const int SSE3_MASK = 1; // // sse3 capability is written on the first bit of ecx
  103. - const int SSSE3_MASK = 0x200; // // ssse3 capability is written on the 10th bit of ecx
  104. -
  105. -
  106. - asm ("mov $1, %%eax\n\t"
  107. -#ifndef SIXTY_FOUR_BIT
  108. - "pushl %%ebx\n\t"
  109. -#endif
  110. - "cpuid\n\t"
  111. -#ifndef SIXTY_FOUR_BIT
  112. - "popl %%ebx\n\t"
  113. -#endif
  114. - : "=c"(ecx), "=d"(edx)
  115. - :
  116. - :"%eax"
  117. -#ifdef SIXTY_FOUR_BIT
  118. - , "%ebx"
  119. -#endif
  120. -);
  121. -
  122. - if (ecx & SSE3_MASK)
  123. - {
  124. - result |= CPU_FEATURES_IA32_SSE3;
  125. - }
  126. - if (ecx & SSSE3_MASK)
  127. - {
  128. - result |= CPU_FEATURES_IA32_SSSE3;
  129. - }
  130. - if (edx & SSE2_MASK)
  131. - {
  132. - result |= CPU_FEATURES_IA32_SSE2;
  133. - }
  134. -
  135. - return result;
  136. + return CPU_FEATURES_NONE;
  137. }
  138. #endif // OPSYSTEMINFO_CPU_FEATURES