Backed out 2 changesets (bug 1440203) for Backout conflicts with Bug …

…1654103. CLOSED TREE Backed out changeset 6e44c037b2dc (bug 1440203) Backed out changeset ab11665d8607 (bug 1440203)
iaxat · Oct 22, 2020 · 0b08f6e · 0b08f6e
1 parent 26b7826
commit 0b08f6e
Show file tree

Hide file tree

Showing 8 changed files with 96 additions and 480 deletions.
diff --git a/browser/base/content/test/performance/browser_startup_mainthreadio.js b/browser/base/content/test/performance/browser_startup_mainthreadio.js
@@ -809,14 +809,6 @@ add_task(async function() {
         continue;
       }
 
-      // "Files" from memfd_create() are similar to tmpfs but never
-      // exist in the filesystem; however, they have names which are
-      // exposed in procfs, and the I/O interposer observes when
-      // they're close()d.
-      if (LINUX && filename.startsWith("/memfd:")) {
-        continue;
-      }
-
       // Shared memory uses temporary files on MacOS <= 10.11 to avoid
       // a kernel security bug that will never be patched (see
       // https://crbug.com/project-zero/1671 for details).  This can

diff --git a/build/moz.configure/headers.configure b/build/moz.configure/headers.configure
@@ -67,14 +67,6 @@ check_headers(
     "byteswap.h",
 )
 
-# memfd_create(2) -- Note that older versions of the Linux man-pages
-# project incorrectly cite <sys/memfd.h>, which doesn't exist; this
-# was fixed in the man-pages-5.00 release.
-set_define('HAVE_MEMFD_CREATE',
-           try_compile(includes=['sys/mman.h'],
-                       body='memfd_create("", 0);',
-                       check_msg='for memfd_create in sys/mman.h'))
-
 # TODO: Move these checks to file specific to --enable-project=js.
 have_perf_event_h = check_header("linux/perf_event.h", when=building_linux)
 

diff --git a/config/system-headers.mozbuild b/config/system-headers.mozbuild
@@ -1352,10 +1352,5 @@ if CONFIG['OS_TARGET'] == 'Linux' and CONFIG['CPU_ARCH'].startswith('mips'):
         'sys/cachectl.h',
     ]
 
-if CONFIG['OS_TARGET'] == 'FreeBSD':
-    system_headers += [
-        'sys/capsicum.h',
-    ]
-
 if CONFIG['MOZ_APP_SYSTEM_HEADERS']:
     include("../" + CONFIG['MOZ_BUILD_APP'] + "/app-system-headers.mozbuild")
diff --git a/ipc/chromium/src/base/linux_memfd_defs.h b/ipc/chromium/src/base/linux_memfd_defs.h
diff --git a/ipc/chromium/src/base/shared_memory.h b/ipc/chromium/src/base/shared_memory.h
@@ -216,9 +216,8 @@ class SharedMemory {
   // If true indicates this came from an external source so needs extra checks
   // before being mapped.
   bool external_section_ = false;
-#elif defined(OS_POSIX) && !defined(ANDROID)
+#elif defined(OS_POSIX)
   mozilla::UniqueFileHandle frozen_file_;
-  bool is_memfd_ = false;
 #endif
   bool read_only_ = false;
   bool freezeable_ = false;