Bug 1308092 - Include _GCOV in obj file path when coverage is enabled…

…, r=ttaubert

--HG--
extra : amend_source : ae58a72fe4de02981ab44dccba727a33eeb072e3

coreconf/arch.mk

@@ -6,28 +6,20 @@
 #######################################################################
 # Master "Core Components" macros for getting the OS architecture     #
 # defines these symbols:
-# 64BIT_TAG
 # OS_ARCH	(from uname -r)
 # OS_TEST	(from uname -m)
 # OS_RELEASE	(from uname -v and/or -r)
 # OS_TARGET	User defined, or set to OS_ARCH
 # CPU_ARCH  	(from unmame -m or -p, ONLY on WINNT)
 # OS_CONFIG	OS_TARGET + OS_RELEASE
-# ASAN_TAG
-# OBJDIR_TAG
+# OBJDIR_TAG    (uses ASAN_TAG, GCOV_TAG, 64BIT_TAG)
 # OBJDIR_NAME
 #######################################################################
 
 #
 # Macros for getting the OS architecture
 #
 
-ifeq ($(USE_64), 1)
-	64BIT_TAG=_64
-else
-	64BIT_TAG=
-endif
-
 OS_ARCH := $(subst /,_,$(shell uname -s))
 
 #
@@ -258,27 +250,34 @@ endif
 OS_CONFIG = $(OS_TARGET)$(OS_RELEASE)
 
 #
-# Set Address Sanitizer prefix.
+# OBJDIR_TAG depends on the predefined variable BUILD_OPT,
+# to distinguish between debug and release builds.
 #
 
 ifeq ($(USE_ASAN), 1)
     ASAN_TAG = _ASAN
 else
     ASAN_TAG =
 endif
-
-#
-# OBJDIR_TAG depends on the predefined variable BUILD_OPT,
-# to distinguish between debug and release builds.
-#
+ifeq ($(USE_GCOV), 1)
+    GCOV_TAG = _GCOV
+else
+    GCOV_TAG =
+endif
+ifeq ($(USE_64), 1)
+    64BIT_TAG = _64
+else
+    64BIT_TAG =
+endif
+OBJDIR_TAG_BASE=$(64BIT_TAG)$(ASAN_TAG)$(GCOV_TAG)
 
 ifdef BUILD_OPT
-    OBJDIR_TAG = $(64BIT_TAG)$(ASAN_TAG)_OPT
+    OBJDIR_TAG = $(OBJDIR_TAG_BASE)_OPT
 else
     ifdef BUILD_IDG
-	OBJDIR_TAG = $(64BIT_TAG)$(ASAN_TAG)_IDG
+	OBJDIR_TAG = $(OBJDIR_TAG_BASE)_IDG
     else
-	OBJDIR_TAG = $(64BIT_TAG)$(ASAN_TAG)_DBG
+	OBJDIR_TAG = $(OBJDIR_TAG_BASE)_DBG
     endif
 endif
 
@@ -291,10 +290,12 @@ endif
 # IMPL_STRATEGY may be defined too.
 #
 
+OBJDIR_NAME_PREFIX = $(OS_TARGET)$(OS_RELEASE)$(CPU_TAG)
+OBJDIR_NAME_SUFFIX = $(LIBC_TAG)$(IMPL_STRATEGY)$(OBJDIR_TAG).OBJ
 ifdef CROSS_COMPILE
-OBJDIR_NAME = $(OS_TARGET)$(OS_RELEASE)$(CPU_TAG)$(LIBC_TAG)$(IMPL_STRATEGY)$(OBJDIR_TAG).OBJ
+    OBJDIR_NAME := $(OBJDIR_NAME_PREFIX)$(LIBC_TAG)$(OBJDIR_NAME_SUFFIX)
 else
-OBJDIR_NAME = $(OS_TARGET)$(OS_RELEASE)$(CPU_TAG)$(COMPILER_TAG)$(LIBC_TAG)$(IMPL_STRATEGY)$(OBJDIR_TAG).OBJ
+    OBJDIR_NAME := $(OBJDIR_NAME_PREFIX)$(COMPILER_TAG)$(OBJDIR_NAME_SUFFIX)
 endif
 
 
@@ -305,11 +306,7 @@ ifndef BUILD_OPT
 # (RTL) in the debug build
 #
 ifdef USE_DEBUG_RTL
-    ifdef CROSS_COMPILE
-    OBJDIR_NAME = $(OS_TARGET)$(OS_RELEASE)$(CPU_TAG)$(IMPL_STRATEGY)$(OBJDIR_TAG).OBJD
-    else
-    OBJDIR_NAME = $(OS_TARGET)$(OS_RELEASE)$(CPU_TAG)$(COMPILER_TAG)$(IMPL_STRATEGY)$(OBJDIR_TAG).OBJD
-    endif
+    OBJDIR_NAME := $(OBJDIR_NAME)D
 endif
 endif
 endif