From 7b646ac34412fa8d8e70632bfc66256d8ecf1d1c76cb4d8f369a047adfe51c18 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 6 Nov 2008 21:14:38 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libhugetlbfs?expand=0&rev=9 --- libhugetlbfs.changes | 5 +++++ libhugetlbfs.small_bss.patch | 17 +++++++++++++++++ libhugetlbfs.spec | 6 +++++- 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 libhugetlbfs.small_bss.patch diff --git a/libhugetlbfs.changes b/libhugetlbfs.changes index d18a456..9aa7c65 100644 --- a/libhugetlbfs.changes +++ b/libhugetlbfs.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Nov 6 14:59:22 CET 2008 - olh@suse.de + +- fix libhugetlbfs 32bit test case xB.linkhuge failure (bnc#442209 - LTC49702) + ------------------------------------------------------------------- Tue Oct 21 14:24:22 CEST 2008 - olh@suse.de diff --git a/libhugetlbfs.small_bss.patch b/libhugetlbfs.small_bss.patch new file mode 100644 index 0000000..c0b9b63 --- /dev/null +++ b/libhugetlbfs.small_bss.patch @@ -0,0 +1,17 @@ +--- + elflink.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/elflink.c ++++ b/elflink.c +@@ -622,6 +622,10 @@ static int verify_segment_layout(struct + unsigned long prev_end = segs[i - 1].end; + unsigned long start = segs[i].start; + ++ /* Don't worry about consecutive normal page segments */ ++ if (!segs[i - 1].huge && !segs[i].huge) ++ continue; ++ + /* Make sure alignment hasn't caused segments to overlap */ + if (prev_end > start) { + WARNING("Layout problem with segments %i and %i:\n\t" diff --git a/libhugetlbfs.spec b/libhugetlbfs.spec index 08088d5..e2c7874 100644 --- a/libhugetlbfs.spec +++ b/libhugetlbfs.spec @@ -24,7 +24,7 @@ License: LGPL v2.1 or later Group: Development/Libraries/Other Summary: hugetlbfs helper library Version: 2.0 -Release: 7 +Release: 8 Url: http://libhugetlbfs.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-build %define my_make_flags V=1 CFLAGS="$RPM_OPT_FLAGS -g -fPIC" BUILDTYPE=NATIVEONLY PREFIX=/usr LIBDIR32=%{_libdir} DESTDIR=$RPM_BUILD_ROOT @@ -34,6 +34,7 @@ Patch1: libhugetlbfs.ia64-libdir.patch Patch2: libhugetlbfs.s390.patch Patch3: libhugetlbfs.tests-malloc.patch Patch4: libhugetlbfs.linkerscript.patch +Patch5: libhugetlbfs.small_bss.patch %description libhugetlbfs interacts with the Linux hugetlbfs to make large pages @@ -53,6 +54,7 @@ Authors: %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build make %{my_make_flags} libs $tests @@ -79,6 +81,8 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/lib* %changelog +* Thu Nov 06 2008 olh@suse.de +- fix libhugetlbfs 32bit test case xB.linkhuge failure (bnc#442209 - LTC49702) * Tue Oct 21 2008 olh@suse.de - handle older binutils versions in elf32ppclinux.xBDT (bnc#436451 - LTC49076) * Wed Aug 27 2008 olh@suse.de