X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=scripts%2Flttng-modules%2Fparam-build.sh;h=13f4aaf91878255a70970f937224b569a9042794;hb=1af1b41431702839f3eb71f45a7e077180014284;hp=69a3338b74cb0ff7708ab285316a4d50cec06eb3;hpb=efdab1b70297ad807c5197f9e0e9e1e43d5b01a0;p=lttng-ci.git diff --git a/scripts/lttng-modules/param-build.sh b/scripts/lttng-modules/param-build.sh index 69a3338..13f4aaf 100644 --- a/scripts/lttng-modules/param-build.sh +++ b/scripts/lttng-modules/param-build.sh @@ -424,10 +424,10 @@ index bbb1d225..8deeacbc 100644 EOF fi - if ( { vergte "${kversion}" "3.15"; } && { verlt "${kversion}" "4.4"; } ) || + if ( { vergte "${kversion}" "3.14"; } && { verlt "${kversion}" "4.4"; } ) || ( { vergte "${kversion}" "4.15"; } && { verlt "${kversion}" "4.17"; } ); then # While the original motivation of this patch is for fixing builds using - # clang, the same error occurs between linux >= 3.15 and < 4.4, and in + # clang, the same error occurs between linux >= 3.14 and < 4.4, and in # 4.15, 4.16. # # This patch only partially applies due to changes in kernel/Makefile, @@ -445,6 +445,25 @@ EOF sed -i '/^.* += elfcore.o$/d' kernel/Makefile fi fi + # Same as above for the v4.4 branch + if ( { vergte "${kversion}" "4.4"; } && { verlt "${kversion}" "4.4.257"; } ); then + patch_linux_kernel 3140b0740b31cc63cf2ee08bc3f746b423eb068d + if grep -q elfcore.o kernel/Makefile ; then + sed -i '/^.* += elfcore.o$/d' kernel/Makefile + fi + fi + + if { vergte "${kversion}" "4.5"; } && { verlt "${kversion}" "4.8"; } ; then + # Kernels between v4.5 and v4.8 built with gcc >= 8 on arm will hit an + # assembler error : + # + # kernel/.tmp_fork.s: Assembler messages: + # kernel/.tmp_fork.s:1790: Error: .err encountered + # + # @see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85745 + # + patch_linux_kernel 9f73bd8bb445e0cbe4bcef6d4cfc788f1e184007 + fi # Newer binutils don't accept 3 operand 'cmp' instructions on ppc64 # Convert them to 'cmpw' which was previously done silently