From 9712a7e77dc12f7569858b81d620d85301f50ede Mon Sep 17 00:00:00 2001
From: Andrew Boie <andrew.p.boie@intel.com>
Date: Mon, 11 Nov 2013 16:17:20 -0800
Subject: [PATCH 08/74] allow 32-bit compilation with 64-bit compiler

Also removed unused LIB_PATH from some Makefiles.

Change-Id: I7d28d18f7531b51b6121a2ffb88bcaedec57c467
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
---
 Cryptlib/Makefile         | 5 +++--
 Cryptlib/OpenSSL/Makefile | 4 +---
 Makefile                  | 3 +++
 lib/Makefile              | 3 +++
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Cryptlib/Makefile b/Cryptlib/Makefile
index a05a4db..d24e59e 100644
--- a/Cryptlib/Makefile
+++ b/Cryptlib/Makefile
@@ -1,7 +1,5 @@
 ARCH		= $(shell uname -m | sed s,i[3456789]86,ia32,)
 
-LIB_PATH	= /usr/lib64
-
 EFI_INCLUDE	= /usr/include/efi
 EFI_INCLUDES	= -nostdinc -IInclude -I$(EFI_INCLUDE) -I$(EFI_INCLUDE)/$(ARCH) -I$(EFI_INCLUDE)/protocol
 EFI_PATH	= /usr/lib64/gnuefi
@@ -14,6 +12,9 @@ CFLAGS		= -ggdb -O0 -I. -fno-stack-protector -fno-strict-aliasing -fpic -fshort-
 ifeq ($(ARCH),x86_64)
 	CFLAGS	+= -DEFI_FUNCTION_WRAPPER -DGNU_EFI_USE_MS_ABI
 endif
+ifeq ($(ARCH),ia32)
+	CFLAGS	+= -m32
+endif
 LDFLAGS		= -nostdlib -znocombreloc
 
 TARGET		= libcryptlib.a
diff --git a/Cryptlib/OpenSSL/Makefile b/Cryptlib/OpenSSL/Makefile
index 3d5a87c..8e2f2a6 100644
--- a/Cryptlib/OpenSSL/Makefile
+++ b/Cryptlib/OpenSSL/Makefile
@@ -1,7 +1,5 @@
 ARCH		= $(shell uname -m | sed s,i[3456789]86,ia32,)
 
-LIB_PATH	= /usr/lib64
-
 EFI_INCLUDE	= /usr/include/efi
 EFI_INCLUDES	= -I../Include -I$(EFI_INCLUDE) -I$(EFI_INCLUDE)/$(ARCH) -I$(EFI_INCLUDE)/protocol
 EFI_PATH	= /usr/lib64/gnuefi
@@ -15,7 +13,7 @@ ifeq ($(ARCH),x86_64)
 	CFLAGS	+= -DEFI_FUNCTION_WRAPPER -DGNU_EFI_USE_MS_ABI -DSIXTY_FOUR_BIT_LONG
 endif
 ifeq ($(ARCH),ia32)
-	CFLAGS	+= -DTHIRTY_TWO_BIT
+	CFLAGS	+= -m32 -DTHIRTY_TWO_BIT
 endif
 LDFLAGS		= -nostdlib -znocombreloc
 
diff --git a/Makefile b/Makefile
index d619ff4..e65d28d 100644
--- a/Makefile
+++ b/Makefile
@@ -28,6 +28,9 @@ endif
 ifeq ($(ARCH),x86_64)
 	CFLAGS	+= -DEFI_FUNCTION_WRAPPER -DGNU_EFI_USE_MS_ABI
 endif
+ifeq ($(ARCH),ia32)
+	CFLAGS	+= -m32
+endif
 ifneq ($(origin VENDOR_CERT_FILE), undefined)
 	CFLAGS += -DVENDOR_CERT_FILE=\"$(VENDOR_CERT_FILE)\"
 endif
diff --git a/lib/Makefile b/lib/Makefile
index adb0347..a9c9cf6 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -17,6 +17,9 @@ CFLAGS          = -ggdb -O0 -fno-stack-protector -fno-strict-aliasing -fpic \
 ifeq ($(ARCH),x86_64)
         CFLAGS  += -DEFI_FUNCTION_WRAPPER -DGNU_EFI_USE_MS_ABI
 endif
+ifeq ($(ARCH),ia32)
+        CFLAGS  += -m32
+endif
 
 lib.a: $(LIBFILES)
 	ar rcs lib.a $(LIBFILES)
-- 
1.9.3