Skip to content

Commit 35bfd8b

Browse files
keith-rollinkeith-rollin
committed
Remove 32-bit macOS support
https://bugs.webkit.org/show_bug.cgi?id=201282 <rdar://problem/54821667> Reviewed by Anders Carlsson. WebKit doesn’t support 32-bit Mac any more, so remove checks and code for that platform. Source/JavaScriptCore: * API/JSBase.h: * runtime/VM.h: Source/WTF: * wtf/Platform.h: Canonical link: https://commits.webkit.org/214974@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@249304 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 60500c2 commit 35bfd8b

5 files changed

Lines changed: 30 additions & 3 deletions

File tree

‎Source/JavaScriptCore/API/JSBase.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ JS_EXPORT void JSGarbageCollect(JSContextRef ctx);
145145

146146
/* Enable the Objective-C API for platforms with a modern runtime. NOTE: This is duplicated in VM.h. */
147147
#if !defined(JSC_OBJC_API_ENABLED)
148-
#if (defined(__clang__) && defined(__APPLE__) && ((defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && !defined(__i386__)) || (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE)))
148+
#if (defined(__clang__) && defined(__APPLE__) && (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) || (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE)))
149149
#define JSC_OBJC_API_ENABLED 1
150150
#else
151151
#define JSC_OBJC_API_ENABLED 0

‎Source/JavaScriptCore/ChangeLog‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
2019-08-29 Keith Rollin <krollin@apple.com>
2+
3+
Remove 32-bit macOS support
4+
https://bugs.webkit.org/show_bug.cgi?id=201282
5+
<rdar://problem/54821667>
6+
7+
Reviewed by Anders Carlsson.
8+
9+
WebKit doesn’t support 32-bit Mac any more, so remove checks and code
10+
for that platform.
11+
12+
* API/JSBase.h:
13+
* runtime/VM.h:
14+
115
2019-08-29 Keith Rollin <krollin@apple.com>
216

317
Remove support for macOS < 10.13 (part 3)

‎Source/JavaScriptCore/runtime/VM.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
// Enable the Objective-C API for platforms with a modern runtime. This has to match exactly what we
8686
// have in JSBase.h.
8787
#if !defined(JSC_OBJC_API_ENABLED)
88-
#if (defined(__clang__) && defined(__APPLE__) && ((defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && !defined(__i386__)) || (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE)))
88+
#if (defined(__clang__) && defined(__APPLE__) && (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) || (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE)))
8989
#define JSC_OBJC_API_ENABLED 1
9090
#else
9191
#define JSC_OBJC_API_ENABLED 0

‎Source/WTF/ChangeLog‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
2019-08-29 Keith Rollin <krollin@apple.com>
2+
3+
Remove 32-bit macOS support
4+
https://bugs.webkit.org/show_bug.cgi?id=201282
5+
<rdar://problem/54821667>
6+
7+
Reviewed by Anders Carlsson.
8+
9+
WebKit doesn’t support 32-bit Mac any more, so remove checks and code
10+
for that platform.
11+
12+
* wtf/Platform.h:
13+
114
2019-08-29 Chris Dumez <cdumez@apple.com>
215

316
CompletionHandler default constructor does not initialize `m_wasConstructedOnMainThread`

‎Source/WTF/wtf/Platform.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1481,7 +1481,7 @@
14811481
#define HAVE_SAFARI_SERVICES_FRAMEWORK 1
14821482
#endif
14831483

1484-
#if (PLATFORM(MAC) && !defined(__i386__)) || PLATFORM(IOS) || PLATFORM(WATCHOS)
1484+
#if PLATFORM(MAC) || PLATFORM(IOS) || PLATFORM(WATCHOS)
14851485
#define HAVE_SAFE_BROWSING 1
14861486
#endif
14871487

0 commit comments

Comments
 (0)