diff --git a/depmod-Ignore_PowerPC64_ABIv2_.TOC.symbol.patch b/depmod-Ignore_PowerPC64_ABIv2_.TOC.symbol.patch new file mode 100644 index 0000000..995f2a1 --- /dev/null +++ b/depmod-Ignore_PowerPC64_ABIv2_.TOC.symbol.patch @@ -0,0 +1,27 @@ +Subject: [PATCH] depmod: Ignore PowerPC64 ABIv2 .TOC. symbo + +The .TOC. symbol on the PowerPC64 ABIv2 identifies the GOT +pointer, similar to how other architectures use _GLOBAL_OFFSET_TABLE_. + +This is not a symbol that needs relocation, and should be ignored +by depmod. + +--- + tools/depmod.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/tools/depmod.c b/tools/depmod.c +index 6e9bb4d..a2e07c1 100644 +--- a/tools/depmod.c ++++ b/tools/depmod.c +@@ -2153,6 +2153,8 @@ static void depmod_add_fake_syms(struct depmod *depmod) + depmod_symbol_add(depmod, "__this_module", true, 0, NULL); + /* On S390, this is faked up too */ + depmod_symbol_add(depmod, "_GLOBAL_OFFSET_TABLE_", true, 0, NULL); ++ /* On PowerPC64 ABIv2, .TOC. is more or less _GLOBAL_OFFSET_TABLE_ */ ++ depmod_symbol_add(depmod, "TOC.", true, 0, NULL); + } + + static int depmod_load_symvers(struct depmod *depmod, const char *filename) +-- +2.5.0 diff --git a/kmod-testsuite.spec b/kmod-testsuite.spec index c18c8bb..d70d9ac 100644 --- a/kmod-testsuite.spec +++ b/kmod-testsuite.spec @@ -1,7 +1,7 @@ # # spec file for package kmod-testsuite # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed diff --git a/kmod.changes b/kmod.changes index 18245f8..8fde05f 100644 --- a/kmod.changes +++ b/kmod.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Feb 9 15:15:56 UTC 2016 - dvaleev@suse.com + +- Fix kernel master build for ppc64le + depmod-Ignore_PowerPC64_ABIv2_.TOC.symbol.patch + ------------------------------------------------------------------- Mon Dec 7 14:27:13 UTC 2015 - jengelh@inai.de diff --git a/kmod.spec b/kmod.spec index 1c84156..c906d8e 100644 --- a/kmod.spec +++ b/kmod.spec @@ -1,7 +1,7 @@ # # spec file for package kmod # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -36,6 +36,7 @@ Patch3: 0009-libkmod-Implement-filtering-of-unsupported-modules-o.patch Patch4: 0010-modprobe-Implement-allow-unsupported-modules.patch Patch5: 0011-Do-not-filter-unsupported-modules-when-running-a-van.patch Patch7: 0001-use-correct-sort-method-in-test-array.patch +Patch8: depmod-Ignore_PowerPC64_ABIv2_.TOC.symbol.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake @@ -101,7 +102,7 @@ in %lname. %prep %setup -q -n kmod-%version -%patch -P 1 -P 2 -P 3 -P 4 -P 5 -P 7 -p1 +%patch -P 1 -P 2 -P 3 -P 4 -P 5 -P 7 -p1 -P 8 -p1 %build autoreconf -fi