Title: [174171] branches/safari-600.1.17-branch/Source
- Revision
- 174171
- Author
- lforsch...@apple.com
- Date
- 2014-10-01 14:24:05 -0700 (Wed, 01 Oct 2014)
Log Message
Merged r174162.
Modified Paths
Diff
Modified: branches/safari-600.1.17-branch/Source/_javascript_Core/ChangeLog (174170 => 174171)
--- branches/safari-600.1.17-branch/Source/_javascript_Core/ChangeLog 2014-10-01 21:08:17 UTC (rev 174170)
+++ branches/safari-600.1.17-branch/Source/_javascript_Core/ChangeLog 2014-10-01 21:24:05 UTC (rev 174171)
@@ -1,3 +1,18 @@
+2014-10-01 Lucas Forschler <lforsch...@apple.com>
+
+ Merge r174162
+
+ 2014-10-01 Brent Fulgham <bfulg...@apple.com>
+
+ [Win] 32-bit _javascript_Core should limit itself to the C loop
+ https://bugs.webkit.org/show_bug.cgi?id=137304
+ <rdar://problem/18375370>
+
+ Reviewed by Michael Saboff.
+
+ * _javascript_Core.vcxproj/LLInt/LLIntAssembly/build-LLIntAssembly.pl:
+ Use the C loop for 32-bit builds.
+
2014-08-21 Matthew Hanson <matthew_han...@apple.com>
Merge r172707. <rdar://problem/18043281>
Modified: branches/safari-600.1.17-branch/Source/_javascript_Core/_javascript_Core.vcxproj/LLInt/LLIntAssembly/build-LLIntAssembly.pl (174170 => 174171)
--- branches/safari-600.1.17-branch/Source/_javascript_Core/_javascript_Core.vcxproj/LLInt/LLIntAssembly/build-LLIntAssembly.pl 2014-10-01 21:08:17 UTC (rev 174170)
+++ branches/safari-600.1.17-branch/Source/_javascript_Core/_javascript_Core.vcxproj/LLInt/LLIntAssembly/build-LLIntAssembly.pl 2014-10-01 21:24:05 UTC (rev 174171)
@@ -62,7 +62,13 @@
close(OUTPUTFILENAME);
# If you want to enable the LLINT C loop, set OUTPUTFILENAME to "LLIntAssembly.h"
-my $OUTPUTFILENAME = File::Spec->catfile($DERIVED_SOURCES_DIR, 'LowLevelInterpreterWin.asm');
+# We only want the C loop for 32-bit Windows so we can continue to support old CPUs.
+my $OUTPUTFILENAME;
+if ("$ARGV[3]" eq "32") {
+ $OUTPUTFILENAME = File::Spec->catfile($DERIVED_SOURCES_DIR, 'LLIntAssembly.h');
+} else {
+ $OUTPUTFILENAME = File::Spec->catfile($DERIVED_SOURCES_DIR, 'LowLevelInterpreterWin.asm');
+}
my $offlineAsm = File::Spec->catfile($XSRCROOT, 'offlineasm', 'asm.rb');
my $lowLevelInterpreter = File::Spec->catfile($XSRCROOT, 'llint', 'LowLevelInterpreter.asm');
Modified: branches/safari-600.1.17-branch/Source/WTF/ChangeLog (174170 => 174171)
--- branches/safari-600.1.17-branch/Source/WTF/ChangeLog 2014-10-01 21:08:17 UTC (rev 174170)
+++ branches/safari-600.1.17-branch/Source/WTF/ChangeLog 2014-10-01 21:24:05 UTC (rev 174171)
@@ -1,3 +1,17 @@
+2014-10-01 Lucas Forschler <lforsch...@apple.com>
+
+ Merge r174162
+
+ 2014-10-01 Brent Fulgham <bfulg...@apple.com>
+
+ [Win] 32-bit _javascript_Core should limit itself to the C loop
+ https://bugs.webkit.org/show_bug.cgi?id=137304
+ <rdar://problem/18375370>
+
+ Reviewed by Michael Saboff.
+
+ * wtf/Platform.h: Force the C loop when building for 32-bit Windows.
+
2014-08-28 Roger Fong <roger_f...@apple.com>
Unreviewed build fix. Specify which version of cygwin python to use.
Modified: branches/safari-600.1.17-branch/Source/WTF/wtf/Platform.h (174170 => 174171)
--- branches/safari-600.1.17-branch/Source/WTF/wtf/Platform.h 2014-10-01 21:08:17 UTC (rev 174170)
+++ branches/safari-600.1.17-branch/Source/WTF/wtf/Platform.h 2014-10-01 21:24:05 UTC (rev 174171)
@@ -718,6 +718,12 @@
#define ENABLE_CONCURRENT_JIT 1
#endif
+/* We do not want to allow LLInt on 32-bit Windows so that we can support some ancient
+ CPUs that do not have SSE2 support */
+#if OS(WINDOWS) && !CPU(X86_64)
+#define ENABLE_LLINT_C_LOOP 1
+#endif
+
/* Disable the JIT if we force the LLInt C Loop */
#if defined(ENABLE_LLINT_C_LOOP) && ENABLE_LLINT_C_LOOP
#undef ENABLE_JIT
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
