From patchwork Wed Jul 16 10:44:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ankit Jindal X-Patchwork-Id: 33725 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f199.google.com (mail-ie0-f199.google.com [209.85.223.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0668220792 for ; Wed, 16 Jul 2014 10:45:26 +0000 (UTC) Received: by mail-ie0-f199.google.com with SMTP id tr6sf4320205ieb.6 for ; Wed, 16 Jul 2014 03:45:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:cc:subject :precedence:list-id:list-unsubscribe:list-archive:list-post :list-help:list-subscribe:mime-version:errors-to:sender :x-original-sender:x-original-authentication-results:mailing-list :content-type:content-transfer-encoding; bh=ALap5woSjHJ3FQFW5FaOSXNU+kssboG3FWCkoqca0Do=; b=g8yseDCvWc9rkCB6EyLPHH7/bHUiPgictKFCL7HQPKlHo4THTv+xAdhDFyeS6gxYo9 t2xLCoc0OCYXo3ZnN9iaow6Ab3ttte7UehOCHi4h3/5pi7h65ttrSLeXcnIQNk/GDDTW RLv7mbaLIjFff9xitdpnqvBYAJK51gCNzIRXQpiZ23o73o0LhFa2wkaAWWRu1m7XoqcM RRIPgDZR8YxG9waN5ygbflGPZScpWADGiu5ElyC114LSqFuIkSZ9o4uqAkqI8A9/RPOx kiWsD7zu+1YJCt9GziMI8zWUk+0eGEM2fSR2WIGR/xByuD4T2ZWA0SszcqYHj0rONiJT 0Jxg== X-Gm-Message-State: ALoCoQk1QasRNAZmd5cx7EOihIh9VtDWHXKsTlVPWWnZ2tADYugP4ILA1aFhqRnGVizWDNCrf4R3 X-Received: by 10.42.82.79 with SMTP id c15mr1309105icl.7.1405507526519; Wed, 16 Jul 2014 03:45:26 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.51.3 with SMTP id t3ls348373qga.82.gmail; Wed, 16 Jul 2014 03:45:26 -0700 (PDT) X-Received: by 10.52.243.135 with SMTP id wy7mr515817vdc.82.1405507526425; Wed, 16 Jul 2014 03:45:26 -0700 (PDT) Received: from mail-vc0-f173.google.com (mail-vc0-f173.google.com [209.85.220.173]) by mx.google.com with ESMTPS id rw10si8113103vcb.44.2014.07.16.03.45.26 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 16 Jul 2014 03:45:26 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.173 as permitted sender) client-ip=209.85.220.173; Received: by mail-vc0-f173.google.com with SMTP id hy10so1234780vcb.32 for ; Wed, 16 Jul 2014 03:45:26 -0700 (PDT) X-Received: by 10.52.248.146 with SMTP id ym18mr23245001vdc.8.1405507526324; Wed, 16 Jul 2014 03:45:26 -0700 (PDT) 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.221.37.5 with SMTP id tc5csp286861vcb; Wed, 16 Jul 2014 03:45:26 -0700 (PDT) X-Received: by 10.140.29.201 with SMTP id b67mr42843798qgb.44.1405507525900; Wed, 16 Jul 2014 03:45:25 -0700 (PDT) Received: from ip-10-141-164-156.ec2.internal (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTPS id j7si25673265qaz.83.2014.07.16.03.45.25 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 16 Jul 2014 03:45:25 -0700 (PDT) Received-SPF: none (google.com: lng-odp-bounces@lists.linaro.org does not designate permitted sender hosts) client-ip=54.225.227.206; Received: from localhost ([127.0.0.1] helo=ip-10-141-164-156.ec2.internal) by ip-10-141-164-156.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1X7Mfq-0001fg-PR; Wed, 16 Jul 2014 10:42:58 +0000 Received: from mail-pd0-f179.google.com ([209.85.192.179]) by ip-10-141-164-156.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1X7Mfl-0001dK-5H for lng-odp@lists.linaro.org; Wed, 16 Jul 2014 10:42:53 +0000 Received: by mail-pd0-f179.google.com with SMTP id ft15so1027165pdb.38 for ; Wed, 16 Jul 2014 03:45:13 -0700 (PDT) X-Received: by 10.70.34.228 with SMTP id c4mr28658620pdj.76.1405507513730; Wed, 16 Jul 2014 03:45:13 -0700 (PDT) Received: from pnqlab023.amcc.com ([182.73.239.130]) by mx.google.com with ESMTPSA id nz7sm22206162pdb.48.2014.07.16.03.45.11 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 16 Jul 2014 03:45:13 -0700 (PDT) From: Ankit Jindal To: lng-odp@lists.linaro.org Date: Wed, 16 Jul 2014 16:14:49 +0530 Message-Id: <1405507489-10129-1-git-send-email-ankit.jindal@linaro.org> X-Mailer: git-send-email 1.7.9.5 X-Topics: Architecture patch Cc: patches@apm.com, Tushar Jagad Subject: [lng-odp] [PATCH] Fix linux-generic compilation error for aarch64 X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: lng-odp-bounces@lists.linaro.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ankit.jindal@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.220.173 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 This patch mainly fixes compilation error by adding __aarch64__ in related headers. Signed-off-by: Ankit Jindal Signed-off-by: Tushar Jagad Reviewed-by: Anders Roxell --- include/odp_align.h | 2 +- platform/linux-generic/odp_system_info.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/odp_align.h b/include/odp_align.h index 83495a8..5ee61be 100644 --- a/include/odp_align.h +++ b/include/odp_align.h @@ -48,7 +48,7 @@ extern "C" { /** Cache line size */ #define ODP_CACHE_LINE_SIZE 64 -#elif defined __arm__ +#elif defined __arm__ || defined __aarch64__ /** Cache line size */ #define ODP_CACHE_LINE_SIZE 64 diff --git a/platform/linux-generic/odp_system_info.c b/platform/linux-generic/odp_system_info.c index f78b746..10665bb 100644 --- a/platform/linux-generic/odp_system_info.c +++ b/platform/linux-generic/odp_system_info.c @@ -160,7 +160,7 @@ static int cpuinfo_x86(FILE *file, odp_system_info_t *sysinfo) return 0; } -#elif defined __arm__ +#elif defined __arm__ || defined __aarch64__ static int cpuinfo_arm(FILE *file ODP_UNUSED, odp_system_info_t *sysinfo ODP_UNUSED) @@ -259,7 +259,7 @@ static odp_compiler_info_t compiler_info = { .cpu_arch_str = "x86", .cpuinfo_parser = cpuinfo_x86 - #elif defined __arm__ + #elif defined __arm__ || defined __aarch64__ .cpu_arch_str = "arm", .cpuinfo_parser = cpuinfo_arm