pool/libhugetlbfs
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 286973 from Base:System

Browse Source 
- update to 2.18
  to solve build failures for ppc/ppc64.
  remove following patches now included in 2.18:
    libhugetlbfs-ppc64le.patch
    libhugetlbfs.ppc64le.step2.patch
    libhugetlbfs.ppc64le.step3.patch
    libhugetlbfs.ppc64le.step4.patch
- Add fix_plt_extrasz_always_returning_0_on_ppc64le.patch
  already upstream. (forwarded request 286944 from michel_mno)

OBS-URL: https://build.opensuse.org/request/show/286973
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libhugetlbfs?expand=0&rev=40
This commit is contained in:
Dominique Leuenberger 2015-02-22 16:26:21 +00:00 committed by Git OBS Bridge
commit de600aadb8
9 changed files with 59 additions and 723 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
fix_plt_extrasz_always_returning_0_on_ppc64le.patch Normal file
View File

@ -0,0 +1,39 @@
Subject: fix plt_extrasz() always returning 0 on ppc64le
From: Signed-off-by: Jan Stancek <jstancek@redhat.com>
libhugetlbfs.so is not linked with elf64lppc.o on ppc64le,
which makes plt_extrasz() always return 0.
This is causing failures (SIGSEGV) in these tests:
HUGETLB_ELFMAP=W linkhuge_rw (16M: 64):
HUGETLB_ELFMAP=RW linkhuge_rw (16M: 64):
HUGETLB_SHARE=0 HUGETLB_ELFMAP=W linkhuge_rw (16M: 64):
HUGETLB_SHARE=1 HUGETLB_ELFMAP=W linkhuge_rw (16M: 64):
HUGETLB_SHARE=0 HUGETLB_ELFMAP=RW linkhuge_rw (16M: 64):
HUGETLB_SHARE=1 HUGETLB_ELFMAP=RW linkhuge_rw (16M: 64):
as they miss some already initialized data when performing
"minimal copy" in get_extracopy().
This patch links also elf64lppc.o, which defines powerpc
specific version of plt_extrasz().
Signed-off-by: Jan Stancek <jstancek@redhat.com>
---
Makefile | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/Makefile b/Makefile
index b24bd0f..8cf469f 100644
--- a/Makefile
+++ b/Makefile
@@ -142,6 +142,9 @@ endif
ifeq ($(ELF64),elf64ppc)
LIBOBJS64 += obj64/$(ELF64).o
endif
+ifeq ($(ELF64),elf64lppc)
+LIBOBJS64 += obj64/$(ELF64).o
+endif
LIBOBJS32 += $(LIBOBJS:%=obj32/%)
LIBOBJS64 += $(LIBOBJS:%=obj64/%)
-- 1.7.1

3
libhugetlbfs-2.17.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3ef1dd19ebeefe2cefaf8bdbc40400dbfb9b3c546a7e4cf2ab0cdf381ff7fe93
size 180829

3
libhugetlbfs-2.18.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8c6ed5e884988e0c879a3705455ece153cf805f69cb9c710334e2711acbb6a06
size 181275

40
libhugetlbfs-ppc64le.patch
View File

@ -1,40 +0,0 @@
Add ppc64le support
Signed-off-by: Anton Blanchard <anton@samba.org>
---
Index: libhugetlbfs-2.17/Makefile
===================================================================
--- libhugetlbfs-2.17.orig/Makefile
+++ libhugetlbfs-2.17/Makefile
@@ -46,6 +46,11 @@ ifneq ($(BUILDTYPE),NATIVEONLY)
CC32 = $(CC) -m32
ELF32 = elf32ppclinux
endif
+else
+ifeq ($(ARCH),ppc64le)
+CC64 = $(CC) -m64
+ELF64 = elf64lppc
+TMPLIB64 = lib64
else
ifeq ($(ARCH),powerpc)
CC32 = $(CC) -m32
@@ -106,6 +110,7 @@ $(error "Unrecognized architecture ($(AR
endif
endif
endif
+endif
endif
endif
endif
--- libhugetlbfs-2.17.orig/contrib/tlbmiss_cost.sh
+++ libhugetlbfs-2.17/contrib/tlbmiss_cost.sh
@@ -44,7 +44,7 @@ cpumhz() {
FNAME="cpu MHz"
FINDEX=4
case "`uname -m`" in
- ppc64)
+ ppc64|ppc64le)
FNAME="clock"
FINDEX=3
;;

13
libhugetlbfs.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Fri Feb 20 12:11:44 UTC 2015 - normand@linux.vnet.ibm.com
- update to 2.18
to solve build failures for ppc/ppc64.
remove following patches now included in 2.18:
libhugetlbfs-ppc64le.patch
libhugetlbfs.ppc64le.step2.patch
libhugetlbfs.ppc64le.step3.patch
libhugetlbfs.ppc64le.step4.patch
- Add fix_plt_extrasz_always_returning_0_on_ppc64le.patch
already upstream.
-------------------------------------------------------------------
Wed Mar 26 12:37:06 UTC 2014 - dmueller@suse.com

70
libhugetlbfs.ppc64le.step2.patch
View File

@ -1,70 +0,0 @@
Subject: libhugetlbfs.ppc64le.step2
From: Michel Normand <normand@linux.vnet.ibm.com>
Need to create the elf64lppc.c supposed to be a soft link of elf64ppc.c
But do not know hwo to do that via a patch <= TODO
Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com>
---
elf64lppc.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 54 insertions(+)
Index: libhugetlbfs-2.16/elf64lppc.c
===================================================================
--- /dev/null
+++ libhugetlbfs-2.16/elf64lppc.c
@@ -0,0 +1,54 @@
+/*
+ * libhugetlbfs - Easy use of Linux hugepages
+ * Copyright (C) 2008 Adam Litke, IBM Corporation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include <elf.h>
+#include <link.h>
+
+#include "libhugetlbfs_internal.h"
+
+/*
+ * The powerpc 64-bit ELF ABI defines the location and size of the plt as
+ * follows (see the ELF ABI and powerpc64 supplement for details):
+ *
+ * Location: (data segment p_vaddr) + (data segment p_filesz)
+ * Size: (dynamic symbol table DT_PTRELSZ entry) + 24
+ *
+ * plt entries have likely been initialized when the libhugetlbfs remapping
+ * code runs, we must copy these entries when preparing the data segment. Tell
+ * the arch-independent code how many bytes to copy.
+ */
+ElfW(Word) plt_extrasz(ElfW(Dyn) *dyntab)
+{
+ int i;
+ ElfW(Word) pltrelsz = 0;
+
+ /* Find the needed information in the dynamic section */
+ for (i = 0; dyntab[i].d_tag != DT_NULL; i++)
+ if (dyntab[i].d_tag == DT_PLTRELSZ)
+ pltrelsz = dyntab[i].d_un.d_val;
+
+ /* pltrelsz indicates the size of all plt entries used to cache
+ * symbol lookups, but does not include the reserved entry at PLT[0].
+ * 24 bytes is the ABI-defined size of a plt entry.
+ */
+ if (pltrelsz)
+ return pltrelsz + 24;
+ else
+ return 0;
+}

91
libhugetlbfs.ppc64le.step3.patch
View File

@ -1,91 +0,0 @@
Subject: libhugetlbfs ppc64le step3
From: Michel Normand <normand@linux.vnet.ibm.com>
sys-elf64ppc.S updated to support PowerPC ABI V2
and create a soft link as sys-elf64lppc.S
TODO: I do not know how to create a soft link via patch
Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com>
---
sys-elf64lppc.S | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
sys-elf64ppc.S | 7 ++++++-
2 files changed, 54 insertions(+), 1 deletion(-)
Index: libhugetlbfs-2.16/sys-elf64ppc.S
===================================================================
--- libhugetlbfs-2.16.orig/sys-elf64ppc.S
+++ libhugetlbfs-2.16/sys-elf64ppc.S
@@ -20,7 +20,7 @@
*/
.text
-
+#if _CALL_ELF != 2
.align 2
.globl direct_syscall
.globl .direct_syscall
@@ -32,6 +32,11 @@ direct_syscall:
.previous
.type .direct_syscall,@function
.direct_syscall:
+#else
+ .globl direct_syscall
+ .type direct_syscall,@function
+direct_syscall:
+#endif
mr 0,3
mr 3,4
mr 4,5
Index: libhugetlbfs-2.16/sys-elf64lppc.S
===================================================================
--- /dev/null
+++ libhugetlbfs-2.16/sys-elf64lppc.S
@@ -0,0 +1,48 @@
+/*
+ * libhugetlbfs - Easy use of Linux hugepages
+ * Copyright (C) 2007 David Gibson, IBM Corporation.
+ *
+ * Based on code from the GNU C Library, Copyright Free Software Foundation, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+ .text
+#if _CALL_ELF != 2
+ .align 2
+ .globl direct_syscall
+ .globl .direct_syscall
+ .section ".opd","aw"
+direct_syscall:
+ .quad .direct_syscall
+ .quad .TOC.@tocbase
+ .quad 0
+ .previous
+ .type .direct_syscall,@function
+.direct_syscall:
+#else
+ .globl direct_syscall
+ .type direct_syscall,@function
+direct_syscall:
+#endif
+ mr 0,3
+ mr 3,4
+ mr 4,5
+ mr 5,6
+ mr 6,7
+ mr 7,8
+ mr 8,9
+ sc
+ blr

509
libhugetlbfs.ppc64le.step4.patch
View File

@ -1,509 +0,0 @@
Subject: libhugetlbfs ppc64le step4
From: Michel Normand <normand@linux.vnet.ibm.com>
create two ld scripts for elf64lppc from existing elf64ppc
they only differ by the OUTPUT_FORMAT line:
elf64-powerpcle in place of elf64-powerpc
Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com>
---
ldscripts/elf64lppc.xB | 245 +++++++++++++++++++++++++++++++++++++++++++++++
ldscripts/elf64lppc.xBDT | 241 ++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 486 insertions(+)
Index: libhugetlbfs-2.16/ldscripts/elf64lppc.xB
===================================================================
--- /dev/null
+++ libhugetlbfs-2.16/ldscripts/elf64lppc.xB
@@ -0,0 +1,245 @@
+/* Linker script for normal executables with BSS in hugepages */
+OUTPUT_FORMAT("elf64-powerpcle", "elf64-powerpcle",
+ "elf64-powerpcle")
+OUTPUT_ARCH(powerpc:common64)
+ENTRY(_start)
+SEARCH_DIR("/usr/powerpc64-linux-gnu/lib64"); SEARCH_DIR("/usr/local/lib64"); SEARCH_DIR("/lib64"); SEARCH_DIR("/usr/lib64"); SEARCH_DIR("/usr/powerpc64-linux-gnu/lib"); SEARCH_DIR("/usr/local/lib"); SEARCH_DIR("/lib"); SEARCH_DIR("/usr/lib");
+INPUT(-lhugetlbfs);
+PHDRS
+{
+ headers PT_PHDR PHDRS ;
+ interp PT_INTERP ;
+ text PT_LOAD FILEHDR PHDRS ;
+ data PT_LOAD ;
+ htlb PT_LOAD FLAGS (0x00100007);
+ dynamic PT_DYNAMIC ;
+ note PT_NOTE ;
+ /* this is the value of PT_GNU_EH_FRAME as defined in
+ usr/include/elf.h but binutils does not recognize that identifier
+ as it does other PT_ constants. */
+ eh_frame_hdr 1685382480 FLAGS (0x00000004);
+}
+SECTIONS
+{
+ /* Read-only sections, merged into text segment: */
+ __executable_start = 0x10000000; . = 0x10000000 + SIZEOF_HEADERS;
+ .interp : { *(.interp) } :text :interp
+ .note.SuSE : { *(.note.SuSE) } :text :note
+ .note.ABI-tag : { *(.note.ABI-tag) } :text :note
+ .note.gnu.build-id : { *(.note.gnu.build-id) } :text :note
+ .hash : { *(.hash) } :text
+ .dynsym : { *(.dynsym) }
+ .dynstr : { *(.dynstr) }
+ .gnu.version : { *(.gnu.version) }
+ .gnu.version_d : { *(.gnu.version_d) }
+ .gnu.version_r : { *(.gnu.version_r) }
+ .rel.init : { *(.rel.init) }
+ .rela.init : { *(.rela.init) }
+ .rel.text : { *(.rel.text .rel.text.* .rel.gnu.linkonce.t.*) }
+ .rela.text : { *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*) }
+ .rel.fini : { *(.rel.fini) }
+ .rela.fini : { *(.rela.fini) }
+ .rel.rodata : { *(.rel.rodata .rel.rodata.* .rel.gnu.linkonce.r.*) }
+ .rela.rodata : { *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*) }
+ .rel.data.rel.ro : { *(.rel.data.rel.ro*) }
+ .rela.data.rel.ro : { *(.rel.data.rel.ro*) }
+ .rel.data : { *(.rel.data .rel.data.* .rel.gnu.linkonce.d.*) }
+ .rela.data : { *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*) }
+ .rel.tdata : { *(.rel.tdata .rel.tdata.* .rel.gnu.linkonce.td.*) }
+ .rela.tdata : { *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*) }
+ .rel.tbss : { *(.rel.tbss .rel.tbss.* .rel.gnu.linkonce.tb.*) }
+ .rela.tbss : { *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*) }
+ .rel.ctors : { *(.rel.ctors) }
+ .rela.ctors : { *(.rela.ctors) }
+ .rel.dtors : { *(.rel.dtors) }
+ .rela.dtors : { *(.rela.dtors) }
+ .rel.got : { *(.rel.got) }
+ .rela.got : { *(.rela.got) }
+ .rela.toc : { *(.rela.toc) }
+ .rel.sdata : { *(.rel.sdata .rel.sdata.* .rel.gnu.linkonce.s.*) }
+ .rela.sdata : { *(.rela.sdata .rela.sdata.* .rela.gnu.linkonce.s.*) }
+ .rel.sbss : { *(.rel.sbss .rel.sbss.* .rel.gnu.linkonce.sb.*) }
+ .rela.sbss : { *(.rela.sbss .rela.sbss.* .rela.gnu.linkonce.sb.*) }
+ .rel.sdata2 : { *(.rel.sdata2 .rel.sdata2.* .rel.gnu.linkonce.s2.*) }
+ .rela.sdata2 : { *(.rela.sdata2 .rela.sdata2.* .rela.gnu.linkonce.s2.*) }
+ .rel.sbss2 : { *(.rel.sbss2 .rel.sbss2.* .rel.gnu.linkonce.sb2.*) }
+ .rela.sbss2 : { *(.rela.sbss2 .rela.sbss2.* .rela.gnu.linkonce.sb2.*) }
+ .rel.bss : { *(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*) }
+ .rela.bss : { *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) }
+ .rel.plt : { *(.rel.plt) }
+ .rela.plt : { *(.rela.plt) }
+ .rela.tocbss : { *(.rela.tocbss) }
+ .init :
+ {
+ KEEP (*(.init))
+ } =0x60000000
+ .text :
+ {
+ *(.text .stub .text.* .gnu.linkonce.t.*)
+ KEEP (*(.text.*personality*))
+ /* .gnu.warning sections are handled specially by elf32.em. */
+ *(.gnu.warning)
+ *(.sfpr .glink)
+ } =0x60000000
+ .fini :
+ {
+ KEEP (*(.fini))
+ } =0x60000000
+ PROVIDE (__etext = .);
+ PROVIDE (_etext = .);
+ PROVIDE (etext = .);
+ .rodata : { *(.rodata .rodata.* .gnu.linkonce.r.*) }
+ .rodata1 : { *(.rodata1) }
+ .sdata2 :
+ {
+ *(.sdata2 .sdata2.* .gnu.linkonce.s2.*)
+ }
+ .sbss2 : { *(.sbss2 .sbss2.* .gnu.linkonce.sb2.*) }
+ .eh_frame_hdr : { *(.eh_frame_hdr) } :text :eh_frame_hdr
+/* .eh_frame : ONLY_IF_RO { KEEP (*(.eh_frame)) }*/
+/* .gcc_except_table : ONLY_IF_RO { *(.gcc_except_table .gcc_except_table.*) }*/
+ /* Adjust the address for the data segment. We want to adjust up to
+ the same address within the page on the next page up. */
+ . = ALIGN (0x10000) - ((0x10000 - .) & (0x10000 - 1)); . = DATA_SEGMENT_ALIGN (0x10000, 0x1000);
+ /* Exception handling */
+ .eh_frame : /*ONLY_IF_RW*/ { KEEP (*(.eh_frame)) } :data
+ .gcc_except_table : /*ONLY_IF_RW*/ { *(.gcc_except_table .gcc_except_table.*) }
+ /* Thread Local Storage sections */
+ .tdata : { *(.tdata .tdata.* .gnu.linkonce.td.*) }
+ .tbss : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) }
+ .preinit_array :
+ {
+ PROVIDE /*_HIDDEN*/ (__preinit_array_start = .);
+ KEEP (*(.preinit_array))
+ PROVIDE /*_HIDDEN*/ (__preinit_array_end = .);
+ }
+ .init_array :
+ {
+ PROVIDE /*_HIDDEN*/ (__init_array_start = .);
+ KEEP (*(SORT(.init_array.*)))
+ KEEP (*(.init_array))
+ PROVIDE /*_HIDDEN*/ (__init_array_end = .);
+ }
+ .fini_array :
+ {
+ PROVIDE /*_HIDDEN*/ (__fini_array_start = .);
+ KEEP (*(.fini_array))
+ KEEP (*(SORT(.fini_array.*)))
+ PROVIDE /*_HIDDEN*/ (__fini_array_end = .);
+ }
+ .ctors :
+ {
+ /* gcc uses crtbegin.o to find the start of
+ the constructors, so we make sure it is
+ first. Because this is a wildcard, it
+ doesn't matter if the user does not
+ actually link against crtbegin.o; the
+ linker won't look for a file to match a
+ wildcard. The wildcard also means that it
+ doesn't matter which directory crtbegin.o
+ is in. */
+ KEEP (*crtbegin*.o(.ctors))
+ /* We don't want to include the .ctor section from
+ from the crtend.o file until after the sorted ctors.
+ The .ctor section from the crtend file contains the
+ end of ctors marker and it must be last */
+ KEEP (*(EXCLUDE_FILE (*crtend*.o ) .ctors))
+ KEEP (*(SORT(.ctors.*)))
+ KEEP (*(.ctors))
+ }
+ .dtors :
+ {
+ KEEP (*crtbegin*.o(.dtors))
+ KEEP (*(EXCLUDE_FILE (*crtend*.o ) .dtors))
+ KEEP (*(SORT(.dtors.*)))
+ KEEP (*(.dtors))
+ }
+ .jcr : { KEEP (*(.jcr)) }
+ .data.rel.ro : { *(.data.rel.ro.local) *(.data.rel.ro*) }
+ .dynamic : { *(.dynamic) } :dynamic :data
+/* . = DATA_SEGMENT_RELRO_END (0, .);*/
+ .data :
+ {
+ *(.data .data.* .gnu.linkonce.d.*)
+ KEEP (*(.gnu.linkonce.d.*personality*))
+ SORT(CONSTRUCTORS)
+ }
+ .data1 : { *(.data1) }
+ .toc1 ALIGN(8) : { *(.toc1) }
+ .opd ALIGN(8) : { KEEP (*(.opd)) }
+ .got ALIGN(8) : { *(.got .toc) }
+ /* We want the small data sections together, so single-instruction offsets
+ can access them all, and initialized data all before uninitialized, so
+ we can shorten the on-disk segment size. */
+ .sdata :
+ {
+ *(.sdata .sdata.* .gnu.linkonce.s.*)
+ }
+ _edata = .; PROVIDE (edata = .);
+ .plt : { *(.plt) }
+ . = ALIGN(64 / 8);
+ . = ALIGN(64 / 8);
+ . = DATA_SEGMENT_END (.);
+ /* Hugepage area:
+ * Saving hugepages is more important than saving executable size, so
+ * we don't attempt to maintain congruence here.
+ * In order to map hugepages into the address space, we must advance the
+ * location counter to a segment boundary. If the address is < 4G, the
+ * next segment will be on a 256M boundary. For higher areas, we have a
+ * 1TB granularity. */
+ . = (. < 0x100000000) ? ALIGN(0x10000000) : ALIGN(0x10000000000);
+ /* HACK: workaround fact that kernel may not cope with segments with zero
+ * filesize */
+ .hugetlb.data : { LONG(1) } :htlb
+ __bss_start = .;
+ .tocbss ALIGN(8) : { *(.tocbss)} :htlb
+ .sbss :
+ {
+
+ *(.dynsbss)
+ *(.sbss .sbss.* .gnu.linkonce.sb.*)
+ *(.scommon)
+ }
+ .bss :
+ {
+ *(.dynbss)
+ *(.bss .bss.* .gnu.linkonce.b.*)
+ *(COMMON)
+ }
+ _end = .;
+ PROVIDE (end = .);
+ /* Stabs debugging sections. */
+ .stab 0 : { *(.stab) }
+ .stabstr 0 : { *(.stabstr) }
+ .stab.excl 0 : { *(.stab.excl) }
+ .stab.exclstr 0 : { *(.stab.exclstr) }
+ .stab.index 0 : { *(.stab.index) }
+ .stab.indexstr 0 : { *(.stab.indexstr) }
+ .comment 0 : { *(.comment) }
+ /* DWARF debug sections.
+ Symbols in the DWARF debugging sections are relative to the beginning
+ of the section so we begin them at 0. */
+ /* DWARF 1 */
+ .debug 0 : { *(.debug) }
+ .line 0 : { *(.line) }
+ /* GNU DWARF 1 extensions */
+ .debug_srcinfo 0 : { *(.debug_srcinfo) }
+ .debug_sfnames 0 : { *(.debug_sfnames) }
+ /* DWARF 1.1 and DWARF 2 */
+ .debug_aranges 0 : { *(.debug_aranges) }
+ .debug_pubnames 0 : { *(.debug_pubnames) }
+ /* DWARF 2 */
+ .debug_info 0 : { *(.debug_info .gnu.linkonce.wi.*) }
+ .debug_abbrev 0 : { *(.debug_abbrev) }
+ .debug_line 0 : { *(.debug_line) }
+ .debug_frame 0 : { *(.debug_frame) }
+ .debug_str 0 : { *(.debug_str) }
+ .debug_loc 0 : { *(.debug_loc) }
+ .debug_macinfo 0 : { *(.debug_macinfo) }
+ /* SGI/MIPS DWARF 2 extensions */
+ .debug_weaknames 0 : { *(.debug_weaknames) }
+ .debug_funcnames 0 : { *(.debug_funcnames) }
+ .debug_typenames 0 : { *(.debug_typenames) }
+ .debug_varnames 0 : { *(.debug_varnames) }
+ /DISCARD/ : { *(.note.GNU-stack) }
+}
Index: libhugetlbfs-2.16/ldscripts/elf64lppc.xBDT
===================================================================
--- /dev/null
+++ libhugetlbfs-2.16/ldscripts/elf64lppc.xBDT
@@ -0,0 +1,241 @@
+/* Linker script for normal executables with text, data and BSS in hugepages */
+OUTPUT_FORMAT("elf64-powerpcle", "elf64-powerpcle",
+ "elf64-powerpcle")
+OUTPUT_ARCH(powerpc:common64)
+ENTRY(_start)
+SEARCH_DIR("/usr/powerpc64-linux-gnu/lib64"); SEARCH_DIR("/usr/local/lib64"); SEARCH_DIR("/lib64"); SEARCH_DIR("/usr/lib64"); SEARCH_DIR("/usr/powerpc64-linux-gnu/lib"); SEARCH_DIR("/usr/local/lib"); SEARCH_DIR("/lib"); SEARCH_DIR("/usr/lib");
+INPUT( -lhugetlbfs );
+PHDRS
+{
+ headers PT_PHDR PHDRS ;
+ interp PT_INTERP ;
+ htext PT_LOAD FILEHDR PHDRS FLAGS (0x00100005);
+ hdata PT_LOAD FLAGS (0x00100007);
+ dynamic PT_DYNAMIC ;
+ note PT_NOTE ;
+ /* this is the value of PT_GNU_EH_FRAME as defined in
+ usr/include/elf.h but binutils does not recognize that identifier
+ as it does other PT_ constants. */
+ eh_frame_hdr 1685382480 FLAGS (0x00000004);
+}
+SECTIONS
+{
+ /* Read-only sections, merged into text segment: */
+ __executable_start = 0x10000000; . = 0x10000000 + SIZEOF_HEADERS;
+ .interp : { *(.interp) } :interp :htext
+ .note.SuSE : { *(.note.SuSE) } :htext :note
+ .note.ABI-tag : { *(.note.ABI-tag) } :htext :note
+ .note.gnu.build-id : { *(.note.gnu.build-id) } :htext :note
+ .hash : { *(.hash) } :htext
+ .dynsym : { *(.dynsym) } :htext
+ .dynstr : { *(.dynstr) } :htext
+ .gnu.version : { *(.gnu.version) } :htext
+ .gnu.version_d : { *(.gnu.version_d) } :htext
+ .gnu.version_r : { *(.gnu.version_r) } :htext
+ .rel.init : { *(.rel.init) } :htext
+ .rela.init : { *(.rela.init) } :htext
+ .rel.text : { *(.rel.text .rel.text.* .rel.gnu.linkonce.t.*) } :htext
+ .rela.text : { *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*) } :htext
+ .rel.fini : { *(.rel.fini) } :htext
+ .rela.fini : { *(.rela.fini) } :htext
+ .rel.rodata : { *(.rel.rodata .rel.rodata.* .rel.gnu.linkonce.r.*) } :htext
+ .rela.rodata : { *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*) } :htext
+ .rel.data.rel.ro : { *(.rel.data.rel.ro*) } :htext
+ .rela.data.rel.ro : { *(.rel.data.rel.ro*) } :htext
+ .rel.data : { *(.rel.data .rel.data.* .rel.gnu.linkonce.d.*) } :htext
+ .rela.data : { *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*) } :htext
+ .rel.tdata : { *(.rel.tdata .rel.tdata.* .rel.gnu.linkonce.td.*) } :htext
+ .rela.tdata : { *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*) } :htext
+ .rel.tbss : { *(.rel.tbss .rel.tbss.* .rel.gnu.linkonce.tb.*) } :htext
+ .rela.tbss : { *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*) } :htext
+ .rel.ctors : { *(.rel.ctors) } :htext
+ .rela.ctors : { *(.rela.ctors) } :htext
+ .rel.dtors : { *(.rel.dtors) } :htext
+ .rela.dtors : { *(.rela.dtors) } :htext
+ .rel.got : { *(.rel.got) } :htext
+ .rela.got : { *(.rela.got) } :htext
+ .rela.toc : { *(.rela.toc) } :htext
+ .rel.sdata : { *(.rel.sdata .rel.sdata.* .rel.gnu.linkonce.s.*) } :htext
+ .rela.sdata : { *(.rela.sdata .rela.sdata.* .rela.gnu.linkonce.s.*) } :htext
+ .rel.sbss : { *(.rel.sbss .rel.sbss.* .rel.gnu.linkonce.sb.*) } :htext
+ .rela.sbss : { *(.rela.sbss .rela.sbss.* .rela.gnu.linkonce.sb.*) } :htext
+ .rel.sdata2 : { *(.rel.sdata2 .rel.sdata2.* .rel.gnu.linkonce.s2.*) } :htext
+ .rela.sdata2 : { *(.rela.sdata2 .rela.sdata2.* .rela.gnu.linkonce.s2.*) } :htext
+ .rel.sbss2 : { *(.rel.sbss2 .rel.sbss2.* .rel.gnu.linkonce.sb2.*) } :htext
+ .rela.sbss2 : { *(.rela.sbss2 .rela.sbss2.* .rela.gnu.linkonce.sb2.*) } :htext
+ .rel.bss : { *(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*) } :htext
+ .rela.bss : { *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) } :htext
+ .rel.plt : { *(.rel.plt) } :htext
+ .rela.plt : { *(.rela.plt) } :htext
+ .rela.tocbss : { *(.rela.tocbss) } :htext
+ .init :
+ {
+ KEEP (*(.init))
+ } :htext =0x60000000
+ .text :
+ {
+ *(.text .stub .text.* .gnu.linkonce.t.*)
+ KEEP (*(.text.*personality*))
+ /* .gnu.warning sections are handled specially by elf32.em. */
+ *(.gnu.warning)
+ *(.sfpr .glink)
+ } :htext =0x60000000
+ .fini :
+ {
+ KEEP (*(.fini))
+ } :htext =0x60000000
+ PROVIDE (__etext = .);
+ PROVIDE (_etext = .);
+ PROVIDE (etext = .);
+ .rodata : { *(.rodata .rodata.* .gnu.linkonce.r.*) } :htext
+ .rodata1 : { *(.rodata1) } :htext
+ .sdata2 :
+ {
+ *(.sdata2 .sdata2.* .gnu.linkonce.s2.*)
+ } :htext
+ .sbss2 : { *(.sbss2 .sbss2.* .gnu.linkonce.sb2.*) } :htext
+ .eh_frame_hdr : { *(.eh_frame_hdr) } :htext :eh_frame_hdr
+/* .eh_frame : ONLY_IF_RO { KEEP (*(.eh_frame)) } :htext */
+/* .gcc_except_table : ONLY_IF_RO { *(.gcc_except_table .gcc_except_table.*) } :htext */
+
+ /* We don't maintain address congruence here, because saving
+ * hugepages is more important than saving executable size. */
+ . = ALIGN (. + 0x1000000, 0x1000000); /* Align to next 16MB hugepage */
+ /* Exception handling */
+ .eh_frame : /*ONLY_IF_RW*/ { KEEP (*(.eh_frame)) } :hdata
+ .gcc_except_table : /*ONLY_IF_RW*/ { *(.gcc_except_table .gcc_except_table.*) } :hdata
+ /* Thread Local Storage sections */
+ .tdata : { *(.tdata .tdata.* .gnu.linkonce.td.*) } :hdata
+ .tbss : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) } :hdata
+ .preinit_array :
+ {
+ PROVIDE /*_HIDDEN*/ (__preinit_array_start = .);
+ KEEP (*(.preinit_array))
+ PROVIDE /*_HIDDEN*/ (__preinit_array_end = .);
+ } :hdata
+ .init_array :
+ {
+ PROVIDE /*_HIDDEN*/ (__init_array_start = .);
+ KEEP (*(SORT(.init_array.*)))
+ KEEP (*(.init_array))
+ PROVIDE /*_HIDDEN*/ (__init_array_end = .);
+ } :hdata
+ .fini_array :
+ {
+ PROVIDE /*_HIDDEN*/ (__fini_array_start = .);
+ KEEP (*(.fini_array))
+ KEEP (*(SORT(.fini_array.*)))
+ PROVIDE /*_HIDDEN*/ (__fini_array_end = .);
+ } :hdata
+ .ctors :
+ {
+ /* gcc uses crtbegin.o to find the start of
+ the constructors, so we make sure it is
+ first. Because this is a wildcard, it
+ doesn't matter if the user does not
+ actually link against crtbegin.o; the
+ linker won't look for a file to match a
+ wildcard. The wildcard also means that it
+ doesn't matter which directory crtbegin.o
+ is in. */
+ KEEP (*crtbegin*.o(.ctors))
+ /* We don't want to include the .ctor section from
+ from the crtend.o file until after the sorted ctors.
+ The .ctor section from the crtend file contains the
+ end of ctors marker and it must be last */
+ KEEP (*(EXCLUDE_FILE (*crtend*.o ) .ctors))
+ KEEP (*(SORT(.ctors.*)))
+ KEEP (*(.ctors))
+ } :hdata
+ .dtors :
+ {
+ KEEP (*crtbegin*.o(.dtors))
+ KEEP (*(EXCLUDE_FILE (*crtend*.o ) .dtors))
+ KEEP (*(SORT(.dtors.*)))
+ KEEP (*(.dtors))
+ } :hdata
+ .jcr : { KEEP (*(.jcr)) } :hdata
+ .data.rel.ro : { *(.data.rel.ro.local) *(.data.rel.ro*) } :hdata
+ .dynamic : { *(.dynamic) } :dynamic :hdata
+/* . = DATA_SEGMENT_RELRO_END (0, .);*/
+ .data :
+ {
+ *(.data .data.* .gnu.linkonce.d.*)
+ KEEP (*(.gnu.linkonce.d.*personality*))
+ SORT(CONSTRUCTORS)
+ } :hdata
+ .data1 : { *(.data1)} :hdata
+ .toc1 ALIGN(8) : { *(.toc1) } :hdata
+ .opd ALIGN(8) : { KEEP (*(.opd)) } :hdata
+ .got ALIGN(8) : { *(.got .toc) } :hdata
+ /* We want the small data sections together, so single-instruction offsets
+ can access them all, and initialized data all before uninitialized, so
+ we can shorten the on-disk segment size. */
+ .sdata :
+ {
+ *(.sdata .sdata.* .gnu.linkonce.s.*)
+ } :hdata
+ _edata = .; PROVIDE (edata = .);
+ __bss_start = .;
+ .tocbss ALIGN(8) : { *(.tocbss)} :hdata
+ .sbss :
+ {
+ *(.dynsbss)
+ *(.sbss .sbss.* .gnu.linkonce.sb.*)
+ *(.scommon)
+ } :hdata
+ .plt : { *(.plt) } :hdata
+ .bss :
+ {
+ *(.dynbss)
+ *(.bss .bss.* .gnu.linkonce.b.*)
+ *(COMMON)
+ /*
+ * Align here to ensure that the .bss section occupies space up to
+ * _end. Additionally (for huge pages) align to a segment boundary.
+ * This ensures that no normal page mappings will be created in this
+ * segment (after the bss) which could interfere with remapping.
+ *
+ * XXX: This ALIGN will need to be extended to handle the case where
+ * ends above 1T -- in which case the alignment should be 1T.
+ */
+ . = ALIGN(256*1024*1024);
+ } :hdata
+ _end = .;
+ PROVIDE (end = .);
+/*. = DATA_SEGMENT_END (.);*/
+ /* Stabs debugging sections. */
+ .stab 0 : { *(.stab) }
+ .stabstr 0 : { *(.stabstr) }
+ .stab.excl 0 : { *(.stab.excl) }
+ .stab.exclstr 0 : { *(.stab.exclstr) }
+ .stab.index 0 : { *(.stab.index) }
+ .stab.indexstr 0 : { *(.stab.indexstr) }
+ .comment 0 : { *(.comment) }
+ /* DWARF debug sections.
+ Symbols in the DWARF debugging sections are relative to the beginning
+ of the section so we begin them at 0. */
+ /* DWARF 1 */
+ .debug 0 : { *(.debug) }
+ .line 0 : { *(.line) }
+ /* GNU DWARF 1 extensions */
+ .debug_srcinfo 0 : { *(.debug_srcinfo) }
+ .debug_sfnames 0 : { *(.debug_sfnames) }
+ /* DWARF 1.1 and DWARF 2 */
+ .debug_aranges 0 : { *(.debug_aranges) }
+ .debug_pubnames 0 : { *(.debug_pubnames) }
+ /* DWARF 2 */
+ .debug_info 0 : { *(.debug_info .gnu.linkonce.wi.*) }
+ .debug_abbrev 0 : { *(.debug_abbrev) }
+ .debug_line 0 : { *(.debug_line) }
+ .debug_frame 0 : { *(.debug_frame) }
+ .debug_str 0 : { *(.debug_str) }
+ .debug_loc 0 : { *(.debug_loc) }
+ .debug_macinfo 0 : { *(.debug_macinfo) }
+ /* SGI/MIPS DWARF 2 extensions */
+ .debug_weaknames 0 : { *(.debug_weaknames) }
+ .debug_funcnames 0 : { *(.debug_funcnames) }
+ .debug_typenames 0 : { *(.debug_typenames) }
+ .debug_varnames 0 : { *(.debug_varnames) }
+ /DISCARD/ : { *(.note.GNU-stack) }
+}

14
libhugetlbfs.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package libhugetlbfs
#
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -31,7 +31,7 @@ Group: Development/Libraries/Other
Obsoletes: libhugetlbfs-64bit
%endif
#
Version: 2.17
Version: 2.18
Release: 0
Url: http://libhugetlbfs.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -42,12 +42,9 @@ Patch2: libhugetlbfs.s390.patch
Patch4: libhugetlbfs.tests-malloc.patch
Patch7: libhugetlbfs_ia64_fix_missing_test.patch
Patch8: libhugetlbfs_fix_tests.patch
Patch9: libhugetlbfs-ppc64le.patch
Patch10: libhugetlbfs.ppc64le.step2.patch
Patch11: libhugetlbfs.ppc64le.step3.patch
Patch12: libhugetlbfs.ppc64le.step4.patch
Patch13: ignore-perl-modules.diff
Patch14: disable-rw-on-non-ldscripts.diff
Patch15: fix_plt_extrasz_always_returning_0_on_ppc64le.patch
%description
The libhugetlbfs package interacts with the Linux hugetlbfs to
@ -67,12 +64,9 @@ Devel package, header and static library, of libhugetlb
%patch4 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch11 -p1
%patch12 -p1
%patch13
%patch14
%patch15 -p1
%build
make %{my_make_flags}