From 7a76a4d046ea96bb9ee9281062fb785e3c16b5c2 Mon Sep 17 00:00:00 2001
From: Michael Jeanson <mjeanson@efficios.com>
Date: Mon, 8 Jan 2018 14:20:51 -0500
Subject: [PATCH] jjb: fix x86-32 kernel builds for lttng-modules

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
---
 scripts/lttng-modules/param-build.sh | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/scripts/lttng-modules/param-build.sh b/scripts/lttng-modules/param-build.sh
index 814489c..405c61f 100644
--- a/scripts/lttng-modules/param-build.sh
+++ b/scripts/lttng-modules/param-build.sh
@@ -65,6 +65,11 @@ prepare_lnx_sources() {
         cp CONFIGS/"${ubuntu_config}" "${outdir}"/.config
         ;;
       *)
+        # Force 32bit build on x86-32, default is 64bit
+        if [ "$arch" = "x86-32" ]; then
+	  export ARCH="i386"
+        fi
+
         # Que sera sera
         make "${vanilla_config}" CC="$CC" ${koutput}
         ;;
@@ -88,19 +93,18 @@ prepare_lnx_sources() {
         echo "CONFIG_KALLSYMS_ALL=y";
     } >> "${outdir}"/.config
 
+    # Debug
+    #cat "${outdir}"/.config
 
     make "$oldconf_target" CC="$CC" ${koutput}
     make modules_prepare CC="$CC" ${koutput}
 
-    # Debug
-    #cat "${outdir}"/.config
-
     # On powerpc this object is required to link modules
     if [ "${karch}" = "powerpc" ]; then
         make arch/powerpc/lib/crtsavres.o CC="$CC" ${koutput}
     fi
 
-    # On arm64 between 4.13 and 1.15 this object is required to build with ftrace support
+    # On arm64 between 4.13 and 4.15 this object is required to build with ftrace support
     if [ "${karch}" = "arm64" ]; then
         if [ -f "arch/arm64/kernel/ftrace-mod.S" ]; then
             make arch/arm64/kernel/ftrace-mod.o CC="$CC" ${koutput}
-- 
2.34.1