nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1886035 - Update some SpiderMonkey defines from XP_MACOSX to XP_DARWIN, r=spidermonkey-reviewers,jandem

Browse source 
XP_IOS should be treated more like other apple platforms, as they use
roughly the same architecture.

Differential Revision: https://phabricator.services.mozilla.com/D205003
This commit is contained in:
Nika Layzell 2024-03-20 20:57:19 +00:00
parent 3f860e3e9f
commit 4ee9f538d9
4 changed files with 6 additions and 6 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

2
js/public/HeapAPI.h
View file

@ -45,7 +45,7 @@ const size_t ArenaShift = 12;
const size_t ArenaSize = size_t(1) << ArenaShift; const size_t ArenaSize = size_t(1) << ArenaShift;
const size_t ArenaMask = ArenaSize - 1; const size_t ArenaMask = ArenaSize - 1;
#if defined(XP_MACOSX) && defined(__aarch64__) #if defined(XP_DARWIN) && defined(__aarch64__)
const size_t PageShift = 14; const size_t PageShift = 14;
#else #else
const size_t PageShift = 12; const size_t PageShift = 12;

2
js/public/RootingAPI.h
View file

@ -232,7 +232,7 @@ struct SafelyInitialized {
// |T| per C++11 [expr.type.conv]p2 -- will produce a safely-initialized, // |T| per C++11 [expr.type.conv]p2 -- will produce a safely-initialized,
// safely-usable T that it can return. // safely-usable T that it can return.
#if defined(XP_WIN) || defined(XP_MACOSX) || \ #if defined(XP_WIN) || defined(XP_DARWIN) || \
(defined(XP_UNIX) && !defined(__clang__)) (defined(XP_UNIX) && !defined(__clang__))
// That presumption holds for pointers, where value initialization produces // That presumption holds for pointers, where value initialization produces

6
js/src/jit/PerfSpewer.cpp
View file

@ -23,7 +23,7 @@
# define gettid() static_cast<pid_t>(syscall(__NR_gettid)) # define gettid() static_cast<pid_t>(syscall(__NR_gettid))
#endif #endif
#if defined(JS_ION_PERF) && (defined(ANDROID) || defined(XP_MACOSX)) #if defined(JS_ION_PERF) && (defined(ANDROID) || defined(XP_DARWIN))
# include <limits.h> # include <limits.h>
# include <stdlib.h> # include <stdlib.h>
# include <unistd.h> # include <unistd.h>
@ -42,7 +42,7 @@ char* get_current_dir_name() {
} }
#endif #endif
#if defined(JS_ION_PERF) && defined(XP_MACOSX) #if defined(JS_ION_PERF) && defined(XP_DARWIN)
# include <pthread.h> # include <pthread.h>
# include <unistd.h> # include <unistd.h>
@ -128,7 +128,7 @@ static uint64_t GetMonotonicTimestamp() {
return TimeStamp::Now().RawClockMonotonicNanosecondsSinceBoot(); return TimeStamp::Now().RawClockMonotonicNanosecondsSinceBoot();
# elif XP_WIN # elif XP_WIN
return TimeStamp::Now().RawQueryPerformanceCounterValue().value(); return TimeStamp::Now().RawQueryPerformanceCounterValue().value();
# elif XP_MACOSX # elif XP_DARWIN
return TimeStamp::Now().RawMachAbsoluteTimeNanoseconds(); return TimeStamp::Now().RawMachAbsoluteTimeNanoseconds();
# else # else
MOZ_CRASH("no timestamp"); MOZ_CRASH("no timestamp");

2
js/src/jit/arm64/vixl/Cpu-vixl.cpp
View file

@ -214,7 +214,7 @@ CPUFeatures CPU::InferCPUFeaturesFromOS(
for (size_t i = 0; i < kFeatureBitCount; i++) { for (size_t i = 0; i < kFeatureBitCount; i++) {
if (auxv & (1UL << i)) features.Combine(kFeatureBits[i]); if (auxv & (1UL << i)) features.Combine(kFeatureBits[i]);
} }
#elif defined(XP_MACOSX) #elif defined(XP_DARWIN)
// Apple processors have kJSCVT, kDotProduct, and kAtomics features. // Apple processors have kJSCVT, kDotProduct, and kAtomics features.
features.Combine(CPUFeatures::kJSCVT, CPUFeatures::kDotProduct, features.Combine(CPUFeatures::kJSCVT, CPUFeatures::kDotProduct,
CPUFeatures::kAtomics); CPUFeatures::kAtomics);