From patchwork Mon Oct 21 08:16:54 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Riku Voipio X-Patchwork-Id: 21196 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f199.google.com (mail-pd0-f199.google.com [209.85.192.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 2CD5B20356 for ; Mon, 21 Oct 2013 08:17:07 +0000 (UTC) Received: by mail-pd0-f199.google.com with SMTP id y10sf7106321pdj.2 for ; Mon, 21 Oct 2013 01:17:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=mime-version:x-gm-message-state:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=XPcbG1XQlBFFYW1lYcD2IiGUoONvNxgX8d0dLj07dpw=; b=A8OqdtIHPTZDXAX5EB7Qg1heIi46sIXIXc5VPkM5wprRt/vS1ZR4NwWjez3HWjxMNT Ghqa/1yR7qZIVPN/kUuLFhDB1aTMUyb5cPK3zJUbTvl97j0Xa0c9b3q4/JvUDaVv4i+q gpZPyyv5Ccs9FyL8cnlhryq1yY9Hg6hwwmi2EM+Xo6e/g1wurilLZEe23PNh37In1w4d RN61eo+jWVMv2PvCvtq07nsuRxJzyDAn0NidJ8MPi5MYjEkOk1oTaw5Di6RFKvTmuZE9 UvCJFzo7Y8FXJwPKpjtSG60vaZIXiOxaB9QQHY0iFV3iRyR+HyIe/UdonsI9404CrYpN uYDA== X-Received: by 10.66.17.234 with SMTP id r10mr2076201pad.40.1382343426330; Mon, 21 Oct 2013 01:17:06 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.81.9 with SMTP id v9ls2004333qex.99.gmail; Mon, 21 Oct 2013 01:17:06 -0700 (PDT) X-Received: by 10.58.144.168 with SMTP id sn8mr290288veb.33.1382343426201; Mon, 21 Oct 2013 01:17:06 -0700 (PDT) Received: from mail-ve0-f170.google.com (mail-ve0-f170.google.com [209.85.128.170]) by mx.google.com with ESMTPS id xz7si4264884vcb.125.2013.10.21.01.17.06 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 21 Oct 2013 01:17:06 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.170 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.170; Received: by mail-ve0-f170.google.com with SMTP id db12so3832391veb.15 for ; Mon, 21 Oct 2013 01:17:06 -0700 (PDT) X-Gm-Message-State: ALoCoQmpq9eYP3R7wOCg6GevvtYZZJ1IcAHfjy8MkGgRNOBGtVZL0amJgEO8tEYUIhektzQypMSs X-Received: by 10.221.40.10 with SMTP id to10mr298783vcb.22.1382343425750; Mon, 21 Oct 2013 01:17:05 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp134016vcz; Mon, 21 Oct 2013 01:17:05 -0700 (PDT) X-Received: by 10.194.9.70 with SMTP id x6mr12263513wja.22.1382343424697; Mon, 21 Oct 2013 01:17:04 -0700 (PDT) Received: from afflict.kos.to (afflict.kos.to. [92.243.29.197]) by mx.google.com with ESMTPS id j3si4070021wiw.78.2013.10.21.01.17.03 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 21 Oct 2013 01:17:04 -0700 (PDT) Received-SPF: neutral (google.com: 92.243.29.197 is neither permitted nor denied by best guess record for domain of riku.voipio@linaro.org) client-ip=92.243.29.197; Received: from localhost.localdomain (91-157-208-114.elisa-laajakaista.fi [91.157.208.114]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by afflict.kos.to (Postfix) with ESMTPSA id D3A1226553; Mon, 21 Oct 2013 10:17:02 +0200 (CEST) From: Riku Voipio To: openembedded-core@lists.openembedded.org Cc: patches@linaro.org, Riku Voipio Subject: [PATCH 2/3] ltp: Fix aarch64 build Date: Mon, 21 Oct 2013 11:16:54 +0300 Message-Id: <1382343415-30035-2-git-send-email-riku.voipio@linaro.org> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1382343415-30035-1-git-send-email-riku.voipio@linaro.org> References: <1382343415-30035-1-git-send-email-riku.voipio@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: riku.voipio@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.170 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Add backported patch from upstream to allow building on ltp Aarch64. --- meta/recipes-extended/ltp/files/fix-arm64.patch | 59 +++++++++++++++++++++++++ meta/recipes-extended/ltp/ltp_20130904.bb | 1 + 2 files changed, 60 insertions(+) create mode 100644 meta/recipes-extended/ltp/files/fix-arm64.patch diff --git a/meta/recipes-extended/ltp/files/fix-arm64.patch b/meta/recipes-extended/ltp/files/fix-arm64.patch new file mode 100644 index 0000000..383467d --- /dev/null +++ b/meta/recipes-extended/ltp/files/fix-arm64.patch @@ -0,0 +1,59 @@ +Upstream-Status: Backport + +commit e5c18eaa4b8f9f73516eaf68213d6beee80cf3b5 +Author: Riku Voipio +Date: Fri Oct 11 12:09:08 2013 +0300 + + Remove bogus Aarch64 system call numbers + + Aarch64 build fails with: + + cacheflush01.c:52:26: fatal error: asm/cachectl.h: No such file or directory + #include + + This is caused by bogus definitions of cacheflush and set_tls, which are + private 32bit ARM system calls. These should not be used on native + Aarch64 binaries. If they need to be tested, it is better done using ltp + compiled for 32bit ARM. + + Signed-off-by: Riku Voipio + Signed-off-by: Mike Frysinger + + +Index: ltp-full-20130904/testcases/kernel/include/aarch64.in +=================================================================== +--- ltp-full-20130904.orig/testcases/kernel/include/aarch64.in 2013-09-04 10:18:22.000000000 +0300 ++++ ltp-full-20130904/testcases/kernel/include/aarch64.in 2013-10-11 11:20:47.565921406 +0300 +@@ -253,5 +253,3 @@ + syncfs 267 + setns 268 + sendmmsg 269 +-cacheflush 0x1002 +-set_tls 0x1005 +Index: ltp-full-20130904/testcases/kernel/include/linux_syscall_numbers.h +=================================================================== +--- ltp-full-20130904.orig/testcases/kernel/include/linux_syscall_numbers.h 2013-09-04 10:18:22.000000000 +0300 ++++ ltp-full-20130904/testcases/kernel/include/linux_syscall_numbers.h 2013-10-11 11:22:20.013925880 +0300 +@@ -801,12 +801,6 @@ + # ifndef __NR_sendmmsg + # define __NR_sendmmsg 269 + # endif +-# ifndef __NR_cacheflush +-# define __NR_cacheflush 0x1002 +-# endif +-# ifndef __NR_set_tls +-# define __NR_set_tls 0x1005 +-# endif + #endif + + +@@ -12754,9 +12748,6 @@ + # ifndef __NR_settimeofday + # define __NR_settimeofday __LTP__NR_INVALID_SYSCALL + # endif +-# ifndef __NR_set_tls +-# define __NR_set_tls __LTP__NR_INVALID_SYSCALL +-# endif + # ifndef __NR_setuid + # define __NR_setuid __LTP__NR_INVALID_SYSCALL + # endif diff --git a/meta/recipes-extended/ltp/ltp_20130904.bb b/meta/recipes-extended/ltp/ltp_20130904.bb index 43fe780..cf016f9 100644 --- a/meta/recipes-extended/ltp/ltp_20130904.bb +++ b/meta/recipes-extended/ltp/ltp_20130904.bb @@ -22,6 +22,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ DEPENDS = "attr libaio libcap acl openssl" SRC_URI = "${SOURCEFORGE_MIRROR}/project/ltp/LTP%20Source/ltp-${PV}/ltp-full-${PV}.tar.bz2 \ + file://fix-arm64.patch \ " SRC_URI[md5sum] = "0cf2ccb7199f8318d413c62a085629f0"