From b239fc8346a896e67ba504d159ae16c227ab7cd2 Mon Sep 17 00:00:00 2001
From: "julien.pierre.bugs%sun.com"
 <julien.pierre.bugs%sun.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 5 Jul 2005 22:48:38 +0000
Subject: [PATCH] Fix for 297849 . Allow x86 build on Linux x86_64 machine.
 r=wtchang

git-svn-id: svn://10.0.0.236/trunk@175660 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/security/coreconf/Linux.mk    | 11 +++++++++--
 mozilla/security/coreconf/Linux2.1.mk |  2 +-
 mozilla/security/coreconf/Linux2.2.mk |  2 +-
 mozilla/security/coreconf/Linux2.4.mk |  2 +-
 mozilla/security/coreconf/Linux2.5.mk |  2 +-
 mozilla/security/coreconf/Linux2.6.mk |  2 +-
 6 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/mozilla/security/coreconf/Linux.mk b/mozilla/security/coreconf/Linux.mk
index 7907ce3c279..86b807d4d63 100644
--- a/mozilla/security/coreconf/Linux.mk
+++ b/mozilla/security/coreconf/Linux.mk
@@ -69,8 +69,14 @@ ifeq ($(OS_TEST),ia64)
 	CPU_ARCH	= ia64
 else
 ifeq ($(OS_TEST),x86_64)
+ifeq ($(USE_64),1)
 	OS_REL_CFLAGS	= -DLINUX1_2 -D_XOPEN_SOURCE
 	CPU_ARCH	= x86_64
+else
+	OS_REL_CFLAGS	= -DLINUX1_2 -Di386 -D_XOPEN_SOURCE
+	CPU_ARCH	= x86
+	ARCHFLAG    = -m32
+endif
 else
 ifeq ($(OS_TEST),sparc)
 	OS_REL_CFLAGS   = -DLINUX1_2 -D_XOPEN_SOURCE
@@ -140,7 +146,7 @@ ifeq ($(USE_PTHREADS),1)
 OS_PTHREAD = -lpthread 
 endif
 
-OS_CFLAGS		= $(DSO_CFLAGS) $(OS_REL_CFLAGS) -ansi -Wall -pipe -DLINUX -Dlinux -D_POSIX_SOURCE -D_BSD_SOURCE -DHAVE_STRERROR
+OS_CFLAGS		= $(DSO_CFLAGS) $(OS_REL_CFLAGS) $(ARCHFLAG) -ansi -Wall -pipe -DLINUX -Dlinux -D_POSIX_SOURCE -D_BSD_SOURCE -DHAVE_STRERROR
 OS_LIBS			= $(OS_PTHREAD) -ldl -lc
 
 ifdef USE_PTHREADS
@@ -150,8 +156,9 @@ endif
 ARCH			= linux
 
 DSO_CFLAGS		= -fPIC
-DSO_LDOPTS		= -shared
+DSO_LDOPTS		= -shared $(ARCHFLAG)
 DSO_LDFLAGS		=
+LDFLAGS += $(ARCHFLAG)
 
 # INCLUDES += -I/usr/include -Y/usr/include/linux
 G++INCLUDES		= -I/usr/include/g++
diff --git a/mozilla/security/coreconf/Linux2.1.mk b/mozilla/security/coreconf/Linux2.1.mk
index 300659d4aab..93d2d8eb6d2 100644
--- a/mozilla/security/coreconf/Linux2.1.mk
+++ b/mozilla/security/coreconf/Linux2.1.mk
@@ -38,7 +38,7 @@
 include $(CORE_DEPTH)/coreconf/Linux.mk
 ifeq ($(OS_RELEASE),2.1)
         OS_REL_CFLAGS   += -DLINUX2_1
-        MKSHLIB         = $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
+        MKSHLIB         = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
         ifdef BUILD_OPT
                 OPTIMIZER       = -O2
         endif
diff --git a/mozilla/security/coreconf/Linux2.2.mk b/mozilla/security/coreconf/Linux2.2.mk
index 72de8d55f6c..a2a72d2693c 100644
--- a/mozilla/security/coreconf/Linux2.2.mk
+++ b/mozilla/security/coreconf/Linux2.2.mk
@@ -38,7 +38,7 @@
 include $(CORE_DEPTH)/coreconf/Linux.mk
 
 OS_REL_CFLAGS   += -DLINUX2_1
-MKSHLIB         = $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
+MKSHLIB         = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
 ifdef BUILD_OPT
             OPTIMIZER       = -O2
 endif
diff --git a/mozilla/security/coreconf/Linux2.4.mk b/mozilla/security/coreconf/Linux2.4.mk
index 72de8d55f6c..a2a72d2693c 100644
--- a/mozilla/security/coreconf/Linux2.4.mk
+++ b/mozilla/security/coreconf/Linux2.4.mk
@@ -38,7 +38,7 @@
 include $(CORE_DEPTH)/coreconf/Linux.mk
 
 OS_REL_CFLAGS   += -DLINUX2_1
-MKSHLIB         = $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
+MKSHLIB         = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
 ifdef BUILD_OPT
             OPTIMIZER       = -O2
 endif
diff --git a/mozilla/security/coreconf/Linux2.5.mk b/mozilla/security/coreconf/Linux2.5.mk
index 72de8d55f6c..a2a72d2693c 100644
--- a/mozilla/security/coreconf/Linux2.5.mk
+++ b/mozilla/security/coreconf/Linux2.5.mk
@@ -38,7 +38,7 @@
 include $(CORE_DEPTH)/coreconf/Linux.mk
 
 OS_REL_CFLAGS   += -DLINUX2_1
-MKSHLIB         = $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
+MKSHLIB         = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
 ifdef BUILD_OPT
             OPTIMIZER       = -O2
 endif
diff --git a/mozilla/security/coreconf/Linux2.6.mk b/mozilla/security/coreconf/Linux2.6.mk
index 72de8d55f6c..a2a72d2693c 100644
--- a/mozilla/security/coreconf/Linux2.6.mk
+++ b/mozilla/security/coreconf/Linux2.6.mk
@@ -38,7 +38,7 @@
 include $(CORE_DEPTH)/coreconf/Linux.mk
 
 OS_REL_CFLAGS   += -DLINUX2_1
-MKSHLIB         = $(CC) -shared -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
+MKSHLIB         = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
 ifdef BUILD_OPT
             OPTIMIZER       = -O2
 endif