summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2019-11-30 15:05:28 +0100
committerwolfbeast <mcwerewolf@wolfbeast.com>2019-11-30 15:05:28 +0100
commit388073a03915ca37889f205d8df15b3c85aee965 (patch)
tree8034f4763e66ff4966dd476f8555470746cfe98c
parenta7878bacfdb8479ac27a8bc5cc02842dd4f49281 (diff)
downloadUXP-388073a03915ca37889f205d8df15b3c85aee965.tar
UXP-388073a03915ca37889f205d8df15b3c85aee965.tar.gz
UXP-388073a03915ca37889f205d8df15b3c85aee965.tar.lz
UXP-388073a03915ca37889f205d8df15b3c85aee965.tar.xz
UXP-388073a03915ca37889f205d8df15b3c85aee965.zip
Issue #1307 - Part 2: Remove disabled code blocks
-rw-r--r--memory/mozjemalloc/jemalloc.c43
-rw-r--r--memory/mozjemalloc/rb.h7
2 files changed, 1 insertions, 49 deletions
diff --git a/memory/mozjemalloc/jemalloc.c b/memory/mozjemalloc/jemalloc.c
index 6fccc0a03..7228515e6 100644
--- a/memory/mozjemalloc/jemalloc.c
+++ b/memory/mozjemalloc/jemalloc.c
@@ -181,9 +181,6 @@
#if defined(MOZ_MEMORY_LINUX) && !defined(MOZ_MEMORY_ANDROID)
#define _GNU_SOURCE /* For mremap(2). */
-#if 0 /* Enable in order to test decommit code on Linux. */
-# define MALLOC_DECOMMIT
-#endif
#endif
#include <sys/types.h>
@@ -440,46 +437,6 @@ void *_mmap(void *addr, size_t length, int prot, int flags,
#ifdef MOZ_MEMORY_DARWIN
# define NO_TLS
#endif
-#if 0
-#ifdef __i386__
-# define QUANTUM_2POW_MIN 4
-# define SIZEOF_PTR_2POW 2
-# define CPU_SPINWAIT __asm__ volatile("pause")
-#endif
-#ifdef __ia64__
-# define QUANTUM_2POW_MIN 4
-# define SIZEOF_PTR_2POW 3
-#endif
-#ifdef __alpha__
-# define QUANTUM_2POW_MIN 4
-# define SIZEOF_PTR_2POW 3
-# define NO_TLS
-#endif
-#ifdef __sparc64__
-# define QUANTUM_2POW_MIN 4
-# define SIZEOF_PTR_2POW 3
-# define NO_TLS
-#endif
-#ifdef __amd64__
-# define QUANTUM_2POW_MIN 4
-# define SIZEOF_PTR_2POW 3
-# define CPU_SPINWAIT __asm__ volatile("pause")
-#endif
-#ifdef __arm__
-# define QUANTUM_2POW_MIN 3
-# define SIZEOF_PTR_2POW 2
-# define NO_TLS
-#endif
-#ifdef __mips__
-# define QUANTUM_2POW_MIN 3
-# define SIZEOF_PTR_2POW 2
-# define NO_TLS
-#endif
-#ifdef __powerpc__
-# define QUANTUM_2POW_MIN 4
-# define SIZEOF_PTR_2POW 2
-#endif
-#endif
#define SIZEOF_PTR (1U << SIZEOF_PTR_2POW)
diff --git a/memory/mozjemalloc/rb.h b/memory/mozjemalloc/rb.h
index 53a926d46..431ad9ddb 100644
--- a/memory/mozjemalloc/rb.h
+++ b/memory/mozjemalloc/rb.h
@@ -1,7 +1,7 @@
/******************************************************************************
*
* Copyright (C) 2008 Jason Evans <jasone@FreeBSD.org>.
- * Copyright (C) 2015-2018 Mark Straver <moonchild@palemoon.org>
+ * Copyright (C) 2015-2019 Mark Straver <moonchild@palemoon.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -72,11 +72,6 @@
#ifndef RB_H_
#define RB_H_
-#if 0
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/lib/libc/stdlib/rb.h 178995 2008-05-14 18:33:13Z jasone $");
-#endif
-
/* Node structure. */
#define rb_node(a_type) \
struct { \