diff --git a/toolkit/content/aboutSupport.js b/toolkit/content/aboutSupport.js index 98f044987fb0..2d347c23bb0d 100644 --- a/toolkit/content/aboutSupport.js +++ b/toolkit/content/aboutSupport.js @@ -76,9 +76,6 @@ var snapshotFormatters = { $("application-box").textContent = data.name; $("useragent-box").textContent = data.userAgent; $("os-box").textContent = data.osVersion; - if (AppConstants.platform == "macosx") { - $("rosetta-box").textContent = data.rosetta; - } $("binary-box").textContent = Services.dirsvc.get( "XREExeF", Ci.nsIFile diff --git a/toolkit/content/aboutSupport.xhtml b/toolkit/content/aboutSupport.xhtml index f6d6a6ae79e2..6aec04b7be71 100644 --- a/toolkit/content/aboutSupport.xhtml +++ b/toolkit/content/aboutSupport.xhtml @@ -134,15 +134,6 @@ -#ifdef XP_MACOSX - - - - - - -#endif - diff --git a/toolkit/locales/en-US/toolkit/about/aboutSupport.ftl b/toolkit/locales/en-US/toolkit/about/aboutSupport.ftl index efad72c5bf38..4521efe9f66c 100644 --- a/toolkit/locales/en-US/toolkit/about/aboutSupport.ftl +++ b/toolkit/locales/en-US/toolkit/about/aboutSupport.ftl @@ -58,9 +58,6 @@ app-basics-enabled-plugins = Enabled Plugins app-basics-build-config = Build Configuration app-basics-user-agent = User Agent app-basics-os = OS -# Rosetta is Apple's translation process to run apps containing x86_64 -# instructions on Apple Silicon. This should remain in English. -app-basics-rosetta = Rosetta Translated app-basics-memory-use = Memory Use app-basics-performance = Performance app-basics-service-workers = Registered Service Workers diff --git a/toolkit/modules/Troubleshoot.jsm b/toolkit/modules/Troubleshoot.jsm index 6cce21b76c74..4758b52f1bc4 100644 --- a/toolkit/modules/Troubleshoot.jsm +++ b/toolkit/modules/Troubleshoot.jsm @@ -230,11 +230,6 @@ var dataProviders = { ); } catch (e) {} - // MacOSX: Check for rosetta status, if it exists - try { - data.rosetta = Services.sysinfo.getProperty("rosettaStatus"); - } catch (e) {} - data.numTotalWindows = 0; data.numFissionWindows = 0; data.numRemoteWindows = 0; diff --git a/xpcom/base/nsSystemInfo.cpp b/xpcom/base/nsSystemInfo.cpp index ab8c7f4aaf0b..ce944fa67c55 100644 --- a/xpcom/base/nsSystemInfo.cpp +++ b/xpcom/base/nsSystemInfo.cpp @@ -523,25 +523,6 @@ static nsresult GetAppleModelId(nsAutoCString& aModelId) { aModelId.Truncate(numChars - 1); return NS_OK; } - -static nsresult ProcessIsRosettaTranslated(bool& isRosetta) { -# if defined(__aarch64__) - // There is no need to call sysctlbyname() if we are running as arm64. - isRosetta = false; -# else - int ret = 0; - size_t size = sizeof(ret); - if (sysctlbyname("sysctl.proc_translated", &ret, &size, NULL, 0) == -1) { - if (errno != ENOENT) { - fprintf(stderr, "Failed to check for translation environment\n"); - } - isRosetta = false; - } else { - isRosetta = (ret == 1); - } -# endif - return NS_OK; -} #endif using namespace mozilla; @@ -958,11 +939,6 @@ nsresult nsSystemInfo::Init() { rv = SetPropertyAsACString(u"appleModelId"_ns, modelId); NS_ENSURE_SUCCESS(rv, rv); } - bool isRosetta; - if (NS_SUCCEEDED(ProcessIsRosettaTranslated(isRosetta))) { - rv = SetPropertyAsBool(u"rosettaStatus"_ns, isRosetta); - NS_ENSURE_SUCCESS(rv, rv); - } #endif #if defined(MOZ_WIDGET_GTK)