From patchwork Thu Apr 23 14:24:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 69187 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 41403A034E; Thu, 23 Apr 2020 16:25:02 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 14E271C132; Thu, 23 Apr 2020 16:25:02 +0200 (CEST) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id A68171C130 for ; Thu, 23 Apr 2020 16:24:59 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1587651899; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2eKVNLOwRMmhmpn05QmGyGeo76HL+vYVxjyUD+Hv3r0=; b=cX2m2CF2daWDBIo5o14Pk6zxNMCjIBajGeNv9lj2Gcmmqy6E2UnvfimJ9Cx6B36UMnxvsV x1qsGuqgQhMnaPm3BKGWSad3Yda+tNICzWZFLsbyOViCzq4x/7CNLfOV0JlGUDvdGe6ZsQ UJFaN9iWDhNJ0o0mwyfaccGLImWm2Vk= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-291-2RU3HntOPxOy0PRc-Ut-Ag-1; Thu, 23 Apr 2020 10:24:57 -0400 X-MC-Unique: 2RU3HntOPxOy0PRc-Ut-Ag-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 87C50461; Thu, 23 Apr 2020 14:24:56 +0000 (UTC) Received: from dmarchan.remote.csb (unknown [10.40.195.1]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4D1D81C94C; Thu, 23 Apr 2020 14:24:54 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: thomas@monjalon.net Date: Thu, 23 Apr 2020 16:24:36 +0200 Message-Id: <20200423142436.12810-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [dpdk-dev] [PATCH] eal: fix build on armv7 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Caught by OBS on armv7: In file included from .../lib/librte_eal/include/rte_string_fns.h:21, from .../lib/librte_kvargs/rte_kvargs.c:9: .../lib/librte_eal/include/rte_common.h:67:37: error: expected '=', ',', ';', 'asm' or '__attribute__' before '__rte_aligned' 67 | typedef uint64_t unaligned_uint64_t __rte_aligned(1); | ^~~~~~~~~~~~~ .../lib/librte_eal/include/rte_common.h:68:37: error: expected '=', ',', ';', 'asm' or '__attribute__' before '__rte_aligned' 68 | typedef uint32_t unaligned_uint32_t __rte_aligned(1); | ^~~~~~~~~~~~~ .../lib/librte_eal/include/rte_common.h:69:37: error: expected '=', ',', ';', 'asm' or '__attribute__' before '__rte_aligned' 69 | typedef uint16_t unaligned_uint16_t __rte_aligned(1); | ^~~~~~~~~~~~~ make[3]: *** [.../mk/internal/rte.compile-pre.mk:116: rte_kvargs.o] Error 1 Fixes: f35e5b3e07b2 ("replace alignment attributes") Signed-off-by: David Marchand Acked-by: Thomas Monjalon Acked-by: Thomas Monjalon --- lib/librte_eal/include/rte_common.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/librte_eal/include/rte_common.h b/lib/librte_eal/include/rte_common.h index 733447b736..668e8b0af8 100644 --- a/lib/librte_eal/include/rte_common.h +++ b/lib/librte_eal/include/rte_common.h @@ -63,6 +63,11 @@ extern "C" { __GNUC_PATCHLEVEL__) #endif +/** + * Force alignment + */ +#define __rte_aligned(a) __attribute__((__aligned__(a))) + #ifdef RTE_ARCH_STRICT_ALIGN typedef uint64_t unaligned_uint64_t __rte_aligned(1); typedef uint32_t unaligned_uint32_t __rte_aligned(1); @@ -73,11 +78,6 @@ typedef uint32_t unaligned_uint32_t; typedef uint16_t unaligned_uint16_t; #endif -/** - * Force alignment - */ -#define __rte_aligned(a) __attribute__((__aligned__(a))) - /** * Force a structure to be packed */