Skip to content

Commit 7953534

Browse files
authored
Merge pull request #1492 from sumanthkorikkar/restrict-mno-pic-data-is-text-relative
s390/kpatch-build: Restrict -mno-pic-data-is-text-relative flag
2 parents 7552b46 + dd1bd9a commit 7953534

1 file changed

Lines changed: 11 additions & 1 deletion

File tree

kpatch-build/kpatch-build

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,15 @@ use_klp_arch()
269269
fi
270270
}
271271

272+
use_s390_no_pic_data_is_text_relative_flag()
273+
{
274+
if kernel_is_rhel; then
275+
! rhel_kernel_version_gte 5.14.0-595.el9
276+
else
277+
! kernel_version_gte 6.10.0
278+
fi
279+
}
280+
272281
support_klp_replace()
273282
{
274283
if kernel_is_rhel; then
@@ -1285,7 +1294,8 @@ if [[ "$ARCH" = "ppc64le" ]]; then
12851294
fi
12861295

12871296
if [[ "$ARCH" = "s390x" ]]; then
1288-
ARCH_KCFLAGS="-mno-pic-data-is-text-relative -fno-section-anchors"
1297+
ARCH_KCFLAGS="-fno-section-anchors"
1298+
use_s390_no_pic_data_is_text_relative_flag && ARCH_KCFLAGS+=" -mno-pic-data-is-text-relative"
12891299
! kernel_version_gte 6.10.0 && ARCH_KCFLAGS+=" -fPIE"
12901300
fi
12911301

0 commit comments

Comments
 (0)