Bug 925330 - don't use HAVE_64BIT_OS when building elfhack; r=glandium

build/unix/elfhack/inject.c

@@ -9,12 +9,12 @@
 #undef Elf_Ehdr
 #undef Elf_Addr
 
-#if BITS == 32
-#define Elf_Ehdr Elf32_Ehdr
-#define Elf_Addr Elf32_Addr
-#else
+#if defined(__LP64__)
 #define Elf_Ehdr Elf64_Ehdr
 #define Elf_Addr Elf64_Addr
+#else
+#define Elf_Ehdr Elf32_Ehdr
+#define Elf_Addr Elf32_Addr
 #endif
 
 extern __attribute__((visibility("hidden"))) void original_init(int argc, char **argv, char **env);

build/unix/elfhack/inject/Makefile.in

@@ -30,6 +30,5 @@ $(CSRCS): %.c: ../inject.c
 
 GARBAGE += $(CSRCS)
 
-DEFINES += -DBITS=$(if $(HAVE_64BIT_OS),64,32)
 CFLAGS := -O2 -fno-stack-protector $(filter -m% -I%,$(CFLAGS))
 $(CPU)-noinit.$(OBJ_SUFFIX): DEFINES += -DNOINIT