X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Flttng-modules%2Fparam-build.sh;h=405c61f0ee87dc4a87d67142977e35935facd558;hb=88b3026879d7a56fbb2c892b8a1c9bca0fecc3b4;hp=51a7ae1a6393b795734e1fd97f490ffdcabdb280;hpb=cbd45bc3d0c1d620c93d1d58e5fd2a59c2d06049;p=lttng-ci.git

diff --git a/scripts/lttng-modules/param-build.sh b/scripts/lttng-modules/param-build.sh
index 51a7ae1..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,21 +93,20 @@ 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 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 vergte "$KVERSION" "4.13-rc1"; then
+        if [ -f "arch/arm64/kernel/ftrace-mod.S" ]; then
             make arch/arm64/kernel/ftrace-mod.o CC="$CC" ${koutput}
         fi
     fi
@@ -334,13 +338,18 @@ if [ "${karch}" = "powerpc" ]; then
     cp -a --parents arch/powerpc/lib/crtsavres.[So] "${LNXHDRDIR}/"
 fi
 
-# On arm64 this object is required to build with ftrace support
+# On arm64 between 4.13 and 1.15 this object is required to build with ftrace support
 if [ "${karch}" = "arm64" ]; then
-    if vergte "$KVERSION" "4.13-rc1"; then
+    if [ -f "arch/arm64/kernel/ftrace-mod.S" ]; then
         cp -a --parents arch/arm64/kernel/ftrace-mod.[So] "${LNXHDRDIR}/"
     fi
 fi
 
+# Newer kernels need objtool to build modules when CONFIG_STACK_VALIDATION=y
+if [ -f tools/objtool/objtool ]; then
+  cp -a --parents tools/objtool/objtool "${LNXHDRDIR}/"
+fi
+
 # Copy modules related stuff, if available
 if [ -s Module.symvers ]; then
     cp Module.symvers "${LNXHDRDIR}"