From patchwork Thu Nov 6 19:23:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gary.robertson@linaro.org X-Patchwork-Id: 40367 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f71.google.com (mail-ee0-f71.google.com [74.125.83.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 59E0024687 for ; Thu, 6 Nov 2014 19:24:56 +0000 (UTC) Received: by mail-ee0-f71.google.com with SMTP id e51sf2545943eek.10 for ; Thu, 06 Nov 2014 11:24:55 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:delivered-to:from:to:date :message-id:in-reply-to:references:subject:precedence:reply-to :list-id:list-unsubscribe:list-archive:list-post:list-help :list-subscribe:mime-version:sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list:content-type :content-transfer-encoding; bh=m0IijLMkXYUZKkivV5iRkFKIh0/VPOkkr6ndqEcDmq8=; b=kVU5zU+SjMbqIFHnjoG16W7BsEMf48qtFIYO21S4i/n3T7eqRNpfhpTjM9WHQVGw50 EYDcnz6vd6+i5djs2zlg+BFcsJ6Yh0WUivI9cfU1M1jRsmbWFi/5yFO9gdbZAlw9/Pwk HMKGfdaBkK1Lh2ijlSskmOhyH7d1pH48h2A/+g9Hp7Imr56bCz0Yq/jdDFV0nUD2A2Ni w7o2nwpI4t3HyCxBKNYLJYHapP1TUQ/DVM68n2kbHXCWD9xQkdL+t9dnmHOeJXQmUrnf 18AtjPu6F4oQdZeGF4ZpmO/r8l1shIj3ZPtYMHElKmbd1NmrhcaXhEIZD7jpY2TYgdf2 kfrQ== X-Gm-Message-State: ALoCoQkIKHbLiacw/rRC1QJLN5xCe1Q689IhXqkh22HWO+uRvWedrn3Z8pp9ju83xRtchyMLqRoq X-Received: by 10.194.91.180 with SMTP id cf20mr996275wjb.4.1415301895042; Thu, 06 Nov 2014 11:24:55 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.153.7.68 with SMTP id da4ls105808lad.87.gmail; Thu, 06 Nov 2014 11:24:54 -0800 (PST) X-Received: by 10.152.5.100 with SMTP id r4mr7036065lar.26.1415301894858; Thu, 06 Nov 2014 11:24:54 -0800 (PST) Received: from mail-lb0-f182.google.com (mail-lb0-f182.google.com. [209.85.217.182]) by mx.google.com with ESMTPS id zm10si12414039lbb.125.2014.11.06.11.24.54 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 06 Nov 2014 11:24:54 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.182 as permitted sender) client-ip=209.85.217.182; Received: by mail-lb0-f182.google.com with SMTP id f15so1598985lbj.41 for ; Thu, 06 Nov 2014 11:24:54 -0800 (PST) X-Received: by 10.112.202.104 with SMTP id kh8mr7026512lbc.46.1415301894606; Thu, 06 Nov 2014 11:24:54 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.184.201 with SMTP id ew9csp95184lbc; Thu, 6 Nov 2014 11:24:53 -0800 (PST) X-Received: by 10.68.106.161 with SMTP id gv1mr6595162pbb.1.1415301892771; Thu, 06 Nov 2014 11:24:52 -0800 (PST) Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id mi6si6870133pab.17.2014.11.06.11.24.51 for ; Thu, 06 Nov 2014 11:24:52 -0800 (PST) Received-SPF: none (google.com: openembedded-devel-bounces@lists.openembedded.org does not designate permitted sender hosts) client-ip=140.211.169.62; Received: from mail.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 2294071FF3; Thu, 6 Nov 2014 19:24:49 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-oi0-f46.google.com (mail-oi0-f46.google.com [209.85.218.46]) by mail.openembedded.org (Postfix) with ESMTP id CC27D7067B for ; Thu, 6 Nov 2014 19:23:40 +0000 (UTC) Received: by mail-oi0-f46.google.com with SMTP id g201so1275652oib.33 for ; Thu, 06 Nov 2014 11:23:41 -0800 (PST) X-Received: by 10.182.210.232 with SMTP id mx8mr5427884obc.46.1415301821022; Thu, 06 Nov 2014 11:23:41 -0800 (PST) Received: from honkintosh.cybertech.lan (65-120-133-114.dia.static.qwest.net. [65.120.133.114]) by mx.google.com with ESMTPSA id 2sm3016019obq.29.2014.11.06.11.23.39 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 06 Nov 2014 11:23:40 -0800 (PST) From: "Gary S. Robertson" To: openembedded-devel@lists.openembedded.org Date: Thu, 6 Nov 2014 13:23:03 -0600 Message-Id: <1415301783-5342-4-git-send-email-gary.robertson@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1415301783-5342-1-git-send-email-gary.robertson@linaro.org> References: <1415301783-5342-1-git-send-email-gary.robertson@linaro.org> Subject: [oe] [PATCH 3/3] libhugetlbfs: fix page size and text offset for arm arches X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: openembedded-devel@lists.openembedded.org List-Id: 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 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: gary.robertson@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.182 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: "Gary S. Robertson" Fixed computation of page size and text segment offset for various arm architectures - including both LE and BE variants of armv7 as well as aarch64 Signed-off-by: Gary S. Robertson --- ...rch64-fix-page-size-not-properly-computed.patch | 32 ----------- ...s-arm-arches-fix-page-size-and-text-offse.patch | 57 ++++++++++++++++++++ .../libhugetlbfs/libhugetlbfs_git.bb | 1 + 3 files changed, 58 insertions(+), 32 deletions(-) delete mode 100644 meta-oe/recipes-benchmark/libhugetlbfs/files/0001-aarch64-fix-page-size-not-properly-computed.patch create mode 100644 meta-oe/recipes-benchmark/libhugetlbfs/files/0001-ld.hugetlbfs-arm-arches-fix-page-size-and-text-offse.patch diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-aarch64-fix-page-size-not-properly-computed.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-aarch64-fix-page-size-not-properly-computed.patch deleted file mode 100644 index da60ba0..0000000 --- a/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-aarch64-fix-page-size-not-properly-computed.patch +++ /dev/null @@ -1,32 +0,0 @@ -Subject: [PATCH] aarch64: fix page size not properly computed - -There's 2 issues fixed: -* typo on MB variable (MB -> $MB) -* some linker variants are missing (linux and big endian) - - aarch64elfb - - aarch64linux - - aarch64linuxb - -Signed-off-by: Fathi Boudra - -Upstream-Status: Submitted ---- - ld.hugetlbfs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ld.hugetlbfs b/ld.hugetlbfs -index df446dd..6553547 100755 ---- a/ld.hugetlbfs -+++ b/ld.hugetlbfs -@@ -87,7 +87,7 @@ elf32ppclinux|elf64ppc) HPAGE_SIZE=$((16*$MB)) SLICE_SIZE=$((256*$MB)) ;; - elf64lppc) HPAGE_SIZE=$((16*$MB)) SLICE_SIZE=$((256*$MB)) ;; - elf_i386|elf_x86_64) HPAGE_SIZE=$((4*$MB)) SLICE_SIZE=$HPAGE_SIZE ;; - elf_s390|elf64_s390) HPAGE_SIZE=$((1*$MB)) SLICE_SIZE=$HPAGE_SIZE ;; --armelf_linux_eabi|aarch64elf) HPAGE_SIZE=$((2*MB)) SLICE_SIZE=$HPAGE_SIZE ;; -+armelf_linux_eabi|aarch64elf*|aarch64linux*) HPAGE_SIZE=$((2*$MB)) SLICE_SIZE=$HPAGE_SIZE ;; - esac - - if [ "$HTLB_ALIGN" == "slice" ]; then --- -1.9.2 - diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-ld.hugetlbfs-arm-arches-fix-page-size-and-text-offse.patch b/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-ld.hugetlbfs-arm-arches-fix-page-size-and-text-offse.patch new file mode 100644 index 0000000..68cd71b --- /dev/null +++ b/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-ld.hugetlbfs-arm-arches-fix-page-size-and-text-offse.patch @@ -0,0 +1,57 @@ +From 1ab6f7f9b34fc745451140fc21db6763dffc5785 Mon Sep 17 00:00:00 2001 +From: "Gary S. Robertson" +Date: Thu, 25 Sep 2014 14:57:06 -0500 +Subject: [libhugetlbfs][PATCH] ld.hugetlbfs: arm arches - fix page size and text offset + setup + +There's 3 issues fixed: +* typo on MB variable (MB -> $MB) +* some linker variants are missing (linux and big endian) + - armelfb_linux_eabi + - aarch64elfb + - aarch64linux + - aarch64linuxb +* text segment offset was not specified for armv7 BE + +NOTE: This patch replaces and makes obsolete the following previously + submitted patch: + + aarch64: fix page size not properly computed + by: Fathi Boudra + +Upstream Status: Submitted + +Signed-off-by: Gary S. Robertson +--- + ld.hugetlbfs | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/ld.hugetlbfs b/ld.hugetlbfs +index df446dd..4417442 100755 +--- a/ld.hugetlbfs ++++ b/ld.hugetlbfs +@@ -87,7 +87,7 @@ elf32ppclinux|elf64ppc) HPAGE_SIZE=$((16*$MB)) SLICE_SIZE=$((256*$MB)) ;; + elf64lppc) HPAGE_SIZE=$((16*$MB)) SLICE_SIZE=$((256*$MB)) ;; + elf_i386|elf_x86_64) HPAGE_SIZE=$((4*$MB)) SLICE_SIZE=$HPAGE_SIZE ;; + elf_s390|elf64_s390) HPAGE_SIZE=$((1*$MB)) SLICE_SIZE=$HPAGE_SIZE ;; +-armelf_linux_eabi|aarch64elf) HPAGE_SIZE=$((2*MB)) SLICE_SIZE=$HPAGE_SIZE ;; ++armelf*_linux_eabi|aarch64elf*|aarch64linux*) HPAGE_SIZE=$((2*$MB)) SLICE_SIZE=$HPAGE_SIZE ;; + esac + + if [ "$HTLB_ALIGN" == "slice" ]; then +@@ -96,9 +96,9 @@ if [ "$HTLB_ALIGN" == "slice" ]; then + + # targeting the ARM platform one needs to explicitly set the text segment offset + # otherwise it will be NULL. +- if [ "$EMU" == "armelf_linux_eabi" ]; then +- HTLBOPTS="$HTLBOPTS -Ttext-segment=$SLICE_SIZE" +- fi ++ case "$EMU" in ++ armelf*_linux_eabi) HTLBOPTS="$HTLBOPTS -Ttext-segment=$SLICE_SIZE" ;; ++ esac + fi + + ${LD} "${args[@]}" ${HTLBOPTS} +-- +1.7.9.5 + diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb index 0af77f1..e490848 100644 --- a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb +++ b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb @@ -20,6 +20,7 @@ SRC_URI = "git://git.code.sf.net/p/libhugetlbfs/code \ file://0001-replace-lib-lib64-hardcoded-values-by-LIBDIR32-LIBDI.patch \ file://0001-Extend-arm32-support-to-include-BE-variants.patch \ file://0001-libhugetlbfs-Recognize-all-ix86-arches.patch \ + file://0001-ld.hugetlbfs-arm-arches-fix-page-size-and-text-offse.patch \ " S = "${WORKDIR}/git"