From ec63e05b4e9888d5bc1597984172787f9e8bc194 Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins@redhat.com>
Date: Feb 15 2006 22:50:15 +0000
Subject: The correct naming convention for RHEL is

RHEL4_x86_64_gcc3_OPT.OBJ
The makefiles were assuming that if the string 86 was found in uname -m
it should use x86 for the arch.  However, it should only do this if
uname -m is not x86_64.  Also, for RHEL/Linux, we do not have to add the
NS64TAG just before the _OPT (or _DBG) since it's already in the arch.
Other platforms continue to use the other naming convention.  The
default naming convention for the mozilla components is
Linux2.6_x86_64_glibc_PTH_64_OPT.OBJ.  I considered using Wan-Teh's
instructions about source builds, but that would cause many changes to
be made to our makefiles, so I just changed the way we calculate the
mozilla OBJDIR name from the regular OBJDIR name.

---

diff --git a/buildpaths.mk b/buildpaths.mk
index 4ecad81..41c6fa8 100644
--- a/buildpaths.mk
+++ b/buildpaths.mk
@@ -57,10 +57,10 @@ ifdef MOZILLA_SOURCE_ROOT
   # subdir of mozilla/dist, and their naming convention is different than
   # ours - we need to map ours to theirs
   ifneq (,$(findstring RHEL3,$(NSOBJDIR_NAME)))
-    MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH_,$(subst RHEL3,Linux2.4,$(NSOBJDIR_NAME)))
+    MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL3,Linux2.4,$(NSOBJDIR_NAME)))
   else
   ifneq (,$(findstring RHEL4,$(NSOBJDIR_NAME)))
-    MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH_,$(subst RHEL4,Linux2.6,$(NSOBJDIR_NAME)))
+    MOZ_OBJDIR_NAME = $(subst _gcc3_,_glibc_PTH$(NS64TAG)_,$(subst RHEL4,Linux2.6,$(NSOBJDIR_NAME)))
   else
     MOZ_OBJDIR_NAME = $(NSOBJDIR_NAME)
   endif
diff --git a/internal_comp_deps.mk b/internal_comp_deps.mk
index 0b409c1..a038f81 100644
--- a/internal_comp_deps.mk
+++ b/internal_comp_deps.mk
@@ -146,7 +146,7 @@ LDAPOBJDIR = $(FULL_RTL_OBJDIR)
 # LDAP does not have PTH version, so here is the hack which treat non PTH
 # version as PTH version
 ifeq ($(USE_PTHREADS), 1)
-  LDAP_RELEASE = $(LDAP_SBC)/$(LDAPCOMP_DIR)/$(LDAP_VERSION)/$(NSOBJDIR_NAME1)
+  LDAP_RELEASE = $(LDAP_SBC)/$(LDAPCOMP_DIR)/$(LDAP_VERSION)/$(NSOBJDIR_NAME)
 else
   LDAP_RELEASE = $(LDAP_SBC)/$(LDAPCOMP_DIR)/$(LDAP_VERSION)/$(LDAPOBJDIR)
 endif
diff --git a/nsconfig.mk b/nsconfig.mk
index a7d1fc1..e8cd9fc 100644
--- a/nsconfig.mk
+++ b/nsconfig.mk
@@ -39,8 +39,12 @@ include $(BUILD_ROOT)/component_versions.mk
 
 NSOS_TEST1       := $(shell uname -m)
 ifeq ($(NSOS_ARCH),Linux)
-  ifeq (86,$(findstring 86,$(NSOS_TEST1)))
-    NSOS_TEST1    = x86
+
+  ifneq (x86_64, $(NSOS_TEST1))
+    ifeq (86,$(findstring 86,$(NSOS_TEST1)))
+      # if it's x86_64, just leave it - otherwise, convert iX86 to just x86
+      NSOS_TEST1    = x86
+    endif
   endif
 
   ifeq ($(USE_LIBC),1)
@@ -56,12 +60,11 @@ ifeq ($(NSOS_ARCH),Linux)
   NSCONFIG_NOTAG  = $(NSCONFIG)
 else
   ifeq ($(NSOS_ARCH),RHEL)
-    ifeq (86,$(findstring 86,$(NSOS_TEST1)))
-      NSOS_TEST1    = x86
-    endif
-    ifeq ($(USE_64), 1)
-      NSOS_TEST2   := $(NSOS_TEST1)$(NS64TAG)
-      NSOS_TEST1   := $(NSOS_TEST2)
+    ifneq (x86_64, $(NSOS_TEST1))
+      ifeq (86,$(findstring 86,$(NSOS_TEST1)))
+        # if it's x86_64, just leave it - otherwise, convert iX86 to just x86
+        NSOS_TEST1    = x86
+      endif
     endif
     NSCONFIG        = $(NSOS_ARCH)$(NSOS_RELEASE)_$(NSOS_TEST1)_$(GCC_VERSION)
     NSCONFIG_NOTAG  = $(NSCONFIG)
@@ -84,6 +87,9 @@ else
       NSCONFIG_NOTAG   = $(NSOS_ARCH)$(NSOS_RELEASE_NOTAG)
     endif
     endif
+# add _64 tag on all platforms except linux/rhel
+	NSCONFIG += $(NS64TAG)
+	NSCONFIG_NOTAG += $(NS64TAG)
   endif
 endif
 
@@ -469,17 +475,13 @@ ifeq ($(NSOS_ARCH),WINNT)
     NSOBJDIR_NAME     = $(NSCONFIG)$(PROCESSOR_ARCHITECTURE)$(NSOBJDIR_TAG).OBJ
     NSOBJDIR_NAME_32     = $(NSCONFIG)$(PROCESSOR_ARCHITECTURE)$(NSOBJDIR_TAG).OBJ
   else
-    NSOBJDIR_NAME     = $(NSCONFIG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ
-    NSOBJDIR_NAME_32     = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ
+    NSOBJDIR_NAME     = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ
+    NSOBJDIR_NAME_32     = $(subst $(NS64TAG),,$(NSOBJDIR_NAME))
   endif
 else
-  NSOBJDIR_NAME     = $(NSCONFIG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ
-  NSOBJDIR_NAME_32  = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ
-  NSOBJDIR_NAME1    = $(NSCONFIG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ
-  NSOBJDIR_NAMEeh   = $(NSCONFIG)_eh$(NS64TAG)$(NSOBJDIR_TAG).OBJ
-  NSOBJDIR_NAMEaCC   = $(NSCONFIG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ
-  NSOBJDIR_NAME_NOTAG = $(NSCONFIG_NOTAG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ
-  NSOBJDIR_NAME1_NOTAG = $(NSCONFIG_NOTAG)$(NS64TAG)$(NSOBJDIR_TAG).OBJ
+  NSOBJDIR_NAME     = $(NSCONFIG)$(NSOBJDIR_TAG).OBJ
+  NSOBJDIR_NAME_32  = $(subst $(NS64TAG),,$(NSOBJDIR_NAME))
+  NSOBJDIR_NAME_NOTAG = $(NSCONFIG_NOTAG)$(NSOBJDIR_TAG).OBJ
 endif
 # platforms without full rtl debugging versions of libraries i.e. not NT
 NSCP_DIST			  := $(ABS_ROOT_PARENT)/dist