[oe] [meta-oe][PATCH] libhugetlbfs: use next branch instead of master
Khem Raj
raj.khem at gmail.com
Mon Dec 11 17:28:05 UTC 2017
On Sun, Dec 10, 2017 at 3:05 AM, Fathi Boudra <fathi.boudra at linaro.org> wrote:
> Master hasn't been updated since 2 years (December 2015). Next branch
> received some fixes/updates and is only 23 commits ahead of master.
>
> Switch from master to next branch:
next branches are prone to rebase and can be problematic. Its probably better
to have each patch backported on top of master.
> * update PV to include SRCPV and "+next" string
> * update SRCREV
> * update SRC_URI to use next branch
> * drop Force-text-segment-alignment-to-0x08000000-for-i386-.patch which is
> a backported patch from next branch
>
> Signed-off-by: Fathi Boudra <fathi.boudra at linaro.org>
> ---
> ...segment-alignment-to-0x08000000-for-i386-.patch | 92 ----------------------
> .../libhugetlbfs/libhugetlbfs_git.bb | 7 +-
> 2 files changed, 3 insertions(+), 96 deletions(-)
> delete mode 100644 meta-oe/recipes-benchmark/libhugetlbfs/files/Force-text-segment-alignment-to-0x08000000-for-i386-.patch
>
> diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/Force-text-segment-alignment-to-0x08000000-for-i386-.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/Force-text-segment-alignment-to-0x08000000-for-i386-.patch
> deleted file mode 100644
> index ce6974d7c..000000000
> --- a/meta-oe/recipes-benchmark/libhugetlbfs/files/Force-text-segment-alignment-to-0x08000000-for-i386-.patch
> +++ /dev/null
> @@ -1,92 +0,0 @@
> -From 3c6f8d0e3c0694f79244ec6ad5ad9ba3ca26bc0a Mon Sep 17 00:00:00 2001
> -From: Yang Shi <yang.shi at linaro.org>
> -Date: Mon, 7 Dec 2015 14:12:13 -0800
> -Subject: [PATCH] Force text segment alignment to 0x08000000 for i386 with gold
> - linker
> -
> -Upstream-Status: Backport
> -
> -When build libhugetlbfs tests with gold linker for i386, the below error occurs:
> -
> -i586-oe-linux-gcc -m32 -march=i586 -Wl,-O1 -Wl,--hash-style=gnu
> --Wl,--as-needed
> ---sysroot=/home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemux86 -I..
> --O2
> --Wall -g -o obj32/linkhuge_rw.o -c linkhuge_rw.c
> -| i586-oe-linux-gcc -m32 -march=i586 -Wl,-O1 -Wl,--hash-style=gnu
> --Wl,--as-needed
> ---sysroot=/home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemux86
> --B./obj32
> --Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,noexecstack -ldl
> --L../obj32
> --o obj32/linkhuge_rw -Wl,--no-as-needed -lpthread -ldl -lhugetlbfs_privutils
> --Wl,--hugetlbfs-align obj32/linkhuge_rw.o obj32/testutils.o
> -| i586-oe-linux-ld: internal error in do_write, at
> -/home/jenkins/oe/world/shr-core/tmp-glibc/work/x86_64-oe-linux/binutils-cross-i586/2.25-r0/git/gold/output.cc:464
> -| collect2: error: ld returned 1 exit status
> -
> -But, it works well with GNU linker. --hugetlbfs-align flag passes
> -"-zcommon-page-size=$SLICE_SIZE -zmax-page-size=$SLICE_SIZE", that are supported by gold linker too.
> -But, it looks gold linker deal with them in a different way from gnu linker for i586.
> -
> -The readelf shows the below result with GNU linker:
> -
> -Elf file type is EXEC (Executable file)
> -Entry point 0x8048fbd
> -There are 8 program headers, starting at offset 52
> -
> -Program Headers:
> - Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align
> - PHDR 0x000034 0x08000034 0x08000034 0x00100 0x00100 R E 0x4
> - INTERP 0x048134 0x08048134 0x08048134 0x00013 0x00013 R 0x1
> - [Requesting program interpreter: /lib/ld-linux.so.2]
> - LOAD 0x000000 0x08000000 0x08000000 0x5a5bc 0x5a5bc R E 0x400000
> - LOAD 0x05a5bc 0x0845a5bc 0x0845a5bc 0x1028c 0x202cc RW 0x400000
> - DYNAMIC 0x05a5d0 0x0845a5d0 0x0845a5d0 0x000e8 0x000e8 RW 0x4
> - NOTE 0x048148 0x08048148 0x08048148 0x00044 0x00044 R 0x4
> - GNU_EH_FRAME 0x059e5c 0x08059e5c 0x08059e5c 0x0009c 0x0009c R 0x4
> - GNU_STACK 0x000000 0x00000000 0x00000000 0x00000 0x00000 RW 0x10
> -
> -"--relax" linker option doesn't solve this problem.
> -Forced textsegment alignment to 0x08000000 with gold linker, the build will pass and
> -readelf shows the same result with GNU linker:
> -
> -Elf file type is EXEC (Executable file)
> -Entry point 0x8048fbd
> -There are 8 program headers, starting at offset 52
> -
> -Program Headers:
> - Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align
> - PHDR 0x000034 0x08000034 0x08000034 0x00100 0x00100 R E 0x4
> - INTERP 0x048134 0x08048134 0x08048134 0x00013 0x00013 R 0x1
> - [Requesting program interpreter: /lib/ld-linux.so.2]
> - LOAD 0x000000 0x08000000 0x08000000 0x5a5bc 0x5a5bc R E 0x400000
> - LOAD 0x05a5bc 0x0845a5bc 0x0845a5bc 0x1028c 0x202cc RW 0x400000
> - DYNAMIC 0x05a5d0 0x0845a5d0 0x0845a5d0 0x000e8 0x000e8 RW 0x4
> - NOTE 0x048148 0x08048148 0x08048148 0x00044 0x00044 R 0x4
> - GNU_EH_FRAME 0x059e5c 0x08059e5c 0x08059e5c 0x0009c 0x0009c R 0x4
> - GNU_STACK 0x000000 0x00000000 0x00000000 0x00000 0x00000 RW 0x10
> -
> -The fix just have impact on hugelink_rw test case, which needs --hugetlbfs-align flag.
> -
> -Signed-off-by: Yang Shi <yang.shi at linaro.org>
> -Signed-off-by: Eric B Munson <emunson at mgebm.net>
> ----
> - ld.hugetlbfs | 1 +
> - 1 file changed, 1 insertion(+)
> -
> -diff --git a/ld.hugetlbfs b/ld.hugetlbfs
> -index 4417442..32bc6fb 100755
> ---- a/ld.hugetlbfs
> -+++ b/ld.hugetlbfs
> -@@ -98,6 +98,7 @@ if [ "$HTLB_ALIGN" == "slice" ]; then
> - # otherwise it will be NULL.
> - case "$EMU" in
> - armelf*_linux_eabi) HTLBOPTS="$HTLBOPTS -Ttext-segment=$SLICE_SIZE" ;;
> -+ elf_i386) HTLBOPTS="$HTLBOPTS -Ttext-segment=0x08000000" ;;
> - esac
> - fi
> -
> ---
> -2.0.2
> -
> diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
> index a63494a62..499e99f91 100644
> --- a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
> +++ b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
> @@ -7,18 +7,17 @@ DEPENDS = "sysfsutils perl"
> RDEPENDS_${PN} += "bash perl python python-io python-lang python-subprocess python-resource ${PN}-perl"
> RDEPENDS_${PN}-tests += "bash"
>
> -PV = "2.20"
> +PV = "2.20+git${SRCPV}+next"
> PE = "1"
>
> -SRCREV = "e44180072b796c0e28e53c4d01ef6279caaa2a99"
> +SRCREV = "02df38e93e25e07f4d54edae94fb4ec90b7a2824"
> SRC_URI = " \
> - git://github.com/libhugetlbfs/libhugetlbfs.git;protocol=https \
> + git://github.com/libhugetlbfs/libhugetlbfs.git;protocol=https;branch=next \
> file://skip-checking-LIB32-and-LIB64-if-they-point-to-the-s.patch \
> file://libhugetlbfs-avoid-search-host-library-path-for-cros.patch \
> file://tests-Makefile-install-static-4G-edge-testcases.patch \
> file://0001-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch \
> file://libhugetlbfs-elf_i386-avoid-search-host-library-path.patch \
> - file://Force-text-segment-alignment-to-0x08000000-for-i386-.patch \
> "
>
> S = "${WORKDIR}/git"
> --
> 2.15.1
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
More information about the Openembedded-devel
mailing list