From patchwork Sun Dec 10 11:05:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fathi Boudra X-Patchwork-Id: 121308 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp1583929qgn; Sun, 10 Dec 2017 03:05:52 -0800 (PST) X-Google-Smtp-Source: AGs4zMbJwHdpKB9LCCWBfCpTywZxFe5PyMvahFDleSYXWe4MnYgTaQwFd1rjWExcKx0kT0ziCLxK X-Received: by 10.101.87.196 with SMTP id q4mr34916587pgr.97.1512903952312; Sun, 10 Dec 2017 03:05:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512903952; cv=none; d=google.com; s=arc-20160816; b=huojsWcsnbrCbGuHjbq0SOkxqvwgL0coDzThBPcQD93skoMY32lpJ6RQJen+SPH2oJ tPnTdU/rJRcF+hcNIB5egFVtkuwN0hYte/clcVcY2dpOUqzXLcA6AJXoeuNn3iJTWNlS L4EucTOYiBm598GVoFTQQLpEhRAv4tAqdDepWpJ9Mc4kriOzEGXb7mHXwGCJRqU4LEK4 VGdvkL5Dp8FQo7WYz4SyTudVZ80K5fTQr0uaIHzf/7X85Cg5hb3nyAf33Ys3tUkWmpLp F/UsuG8JyPIyyv/eZqBXBHcTno4FlxX18Gkxww+F6iuIDJTCf8sMt0uNasMzwEa3nAsm 01hQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:message-id:date:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=90ZkZdYLk4fGbWxn9CkqARKu8PTAdiKGF+fYLzbugwE=; b=XsNXr234NfHgX5+0uL4II4ZRxp5zR7ZHmEjr0XL/W1xKijv6PobfKmCdFOu02t5idl h5CC44trWt2deyhGReNfft6APKSkpfVs+OOD634p68Dek81dHLpqOVBRqKDvFT5ePZ1D rWeZcvG0tyep9nHEd0tIrPgE59NK45yLyY3dVppe/ZOnzeA0qzi4ulc+81yzQGJwlWoR vCMJ7+QmywYSDNBq9ETXZjv5jrF+LlGdSuldbL1qm9ulZBzdpVgA8gh46hXF8aFbzrAh XDOmHcVWLuyfppaLQWK0tx3oSZDZooDmk5SAnWCNLTdc3cbXkoQithOroxUbRCu90eJ7 12/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=IaLotgUn; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id z64si8332237plh.764.2017.12.10.03.05.50; Sun, 10 Dec 2017 03:05:52 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=IaLotgUn; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 38D3F78558; Sun, 10 Dec 2017 11:05:41 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-lf0-f65.google.com (mail-lf0-f65.google.com [209.85.215.65]) by mail.openembedded.org (Postfix) with ESMTP id 5332271B2E for ; Sun, 10 Dec 2017 11:05:37 +0000 (UTC) Received: by mail-lf0-f65.google.com with SMTP id 74so16172981lfs.0 for ; Sun, 10 Dec 2017 03:05:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=8krQbkl+8kJrMObNr7zUjTR8dzkqDwejhVbAAYCGQec=; b=IaLotgUnDhzDQDa+CwWSyAGIa1VklRHdErtZbKcnErblhImXXWW47QflUcLSalOrQ9 unY2RT1gGBsJ5GJLuMjDnaiuAO6DiLYVlMHP1p5gyqF7tcq+wF9bkFczyjQcRJ9LsUGs GXlrEXR5V2sAwhsZoU+fbDZGIGXKlo0MR2y7s= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=8krQbkl+8kJrMObNr7zUjTR8dzkqDwejhVbAAYCGQec=; b=W1W4iDYX/a9kspoweJWQfoUL1JZaEjbDzxyAP0yymlnuzOOib/M/uqIIzuCLb5mhhT a9N+NAJ5yDjq4zEtswHgSR69sRPUjPzrCbLuXDSczQEEOxIq0PRivHbWkOFlqKLwWZSl FxpMTTsRU0SuKJQwW4Br8udbxxXKKe4tAfnZZW6y15bQDjiS8qvpnUB+YnJQN/XHioqt mQ7lAHnAJQVB+NeXeejSKq3zkyYdexMlkj/7h1FgzyMEaWwS6CtZ8zznK4DyrxvU5Yj/ UtXwgdyaDZ5X2x8Zg4Dq/3yWzla1wURkx/zojosBuJ2u+d13vhD1Ofb6Dsmkq0BeHlYY ME9Q== X-Gm-Message-State: AJaThX5EwT63busta7h1qmDp93rEzotHrmh62QHlYRKqd76SBqeqlbKC LHe6woBSTKCgltG4B48dUmhMES0/PZQ= X-Received: by 10.25.21.11 with SMTP id l11mr16111705lfi.142.1512903938208; Sun, 10 Dec 2017 03:05:38 -0800 (PST) Received: from localhost.localdomain (a91-156-68-101.elisa-laajakaista.fi. [91.156.68.101]) by smtp.gmail.com with ESMTPSA id r89sm2331594ljr.16.2017.12.10.03.05.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Dec 2017 03:05:35 -0800 (PST) From: Fathi Boudra To: openembedded-devel@lists.openembedded.org Date: Sun, 10 Dec 2017 13:05:31 +0200 Message-Id: <20171210110531.89035-1-fathi.boudra@linaro.org> X-Mailer: git-send-email 2.15.1 Cc: naresh.kamboju@linaro.org, koen.kooi@linaro.org Subject: [oe] [meta-oe][PATCH] libhugetlbfs: use next branch instead of master X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org 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: * 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 --- ...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 -- 2.15.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel 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 -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 -Signed-off-by: Eric B Munson ---- - 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"