Bug 1167474 - Remove ELFHACK_BUILD hack. r=mshal
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 22 May 2015 10:44:05 +0900
changeset 245639 0ecd4281ab79b5e9c32d366fe1b2476a238a6b40
parent 245638 1921222e708e8b070b8ef5db215d5bec2217d375
child 245640 d4a4025d966e9142b1f74bbe95a8eddedbb05e55
push id28814
push userkwierso@gmail.com
push dateTue, 26 May 2015 23:16:29 +0000
treeherdermozilla-central@ff2e07228041 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1167474
milestone41.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1167474 - Remove ELFHACK_BUILD hack. r=mshal It used to be necessary because of how elfhack was built in the past, but it happens to be unnecessary nowadays.
build/unix/elfhack/inject/moz.build
build/unix/elfhack/moz.build
mozilla-config.h.in
--- a/build/unix/elfhack/inject/moz.build
+++ b/build/unix/elfhack/inject/moz.build
@@ -12,13 +12,11 @@ elif CONFIG['TARGET_CPU'].startswith('ar
     cpu = 'arm'
 else:
     cpu = CONFIG['TARGET_CPU']
 
 GENERATED_SOURCES += [
     "%s.c" % cpu,
 ]
 
-DEFINES['ELFHACK_BUILD'] = True
-
 NO_PGO = True
 
 NO_VISIBILITY_FLAGS = True
--- a/build/unix/elfhack/moz.build
+++ b/build/unix/elfhack/moz.build
@@ -20,11 +20,9 @@ if not CONFIG['CROSS_COMPILE']:
 
 HOST_SOURCES += [
     'elf.cpp',
     'elfhack.cpp',
 ]
 
 HostProgram('elfhack')
 
-DEFINES['ELFHACK_BUILD'] = True
-
 NO_PGO = True
--- a/mozilla-config.h.in
+++ b/mozilla-config.h.in
@@ -36,21 +36,18 @@
 #pragma clang diagnostic pop
 #endif
 
 /*
  * Force-include Char16.h in order to define PRUnichar as char16_t everywhere.
  * Note that this should be the first #include to make sure that prtypes.h does
  * not attempt to define PRUnichar.  This includes the following hunspell-specific
  * includes.
- *
- * We don't use this to build elfhack and elf-dynstr-gc since those builds happen
- * during the export tier.  Also, disable this when building assembly files too.
  */
-#if !defined(ELFHACK_BUILD) && !defined(__ASSEMBLER__)
+#if !defined(__ASSEMBLER__)
 #include "mozilla/Char16.h"
 #endif
 
 /*
  * Force-include hunspell_alloc_hooks.h and hunspell_fopen_hooks.h for hunspell,
  * so that we don't need to modify them directly.
  *
  * HUNSPELL_STATIC is defined in extensions/spellcheck/hunspell/src/Makefile.in,