From patchwork Mon Feb 22 23:31:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anders Roxell X-Patchwork-Id: 62643 Delivered-To: patch@linaro.org Received: by 10.112.43.199 with SMTP id y7csp1532670lbl; Mon, 22 Feb 2016 15:37:56 -0800 (PST) X-Received: by 10.140.239.66 with SMTP id k63mr40422830qhc.11.1456184276286; Mon, 22 Feb 2016 15:37:56 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id 128si31649333qhw.119.2016.02.22.15.37.55; Mon, 22 Feb 2016 15:37:56 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 8970061D12; Mon, 22 Feb 2016 23:37:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id CCC0D617BF; Mon, 22 Feb 2016 23:37:52 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id C5BE6619CE; Mon, 22 Feb 2016 23:37:50 +0000 (UTC) Received: from mail-lb0-f175.google.com (mail-lb0-f175.google.com [209.85.217.175]) by lists.linaro.org (Postfix) with ESMTPS id 5C767617BF for ; Mon, 22 Feb 2016 23:37:49 +0000 (UTC) Received: by mail-lb0-f175.google.com with SMTP id bc4so91455939lbc.2 for ; Mon, 22 Feb 2016 15:37:49 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=sU3Fvlsvue1uJWoV7xlS5ATNeNGluTY6zbfC76oEzrY=; b=TLeUjwDtC8Db6LxkIYVHHJFKZ76oaAgjxB1GaN4ReKFT/ZTmjL+B0LaKDk3pA4rQNm I2/6gw7GWKsBcn93++l2dERgYvg33FY/vWFkOcegxycsFmOBqSV289wSZ3BQCFoH9DM9 3+TgiCOq3wcpU9qwoN5wBiDzpSqqm4q4WMZbYWT2ArueGmKohjbrvXYsNhzCqNfY38kF xhh6ldlWzwMZocFoOvao5Ti0+bfDTyM3Oj8JY6izsw9OLpqh5CHn8RD/v8GUnrvroRIh 9o4VguY6RMPJskEFySFTkUnZAkfJ6iXNIh9yUov++7M/A+NF6hgh5012H1PuoYIMOVge 000w== X-Gm-Message-State: AG10YOQcAByG07B6KPYHyOsNg1pUVuKNGKswa9XPLg0Ij8eG5aB64/EXq2SeGFzA8mbo7skS4eY= X-Received: by 10.112.52.100 with SMTP id s4mr3765487lbo.108.1456184268200; Mon, 22 Feb 2016 15:37:48 -0800 (PST) Received: from localhost (c-932171d5.07-21-73746f28.cust.bredbandsbolaget.se. [213.113.33.147]) by smtp.gmail.com with ESMTPSA id s75sm3606098lfs.21.2016.02.22.15.37.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Feb 2016 15:37:47 -0800 (PST) From: Anders Roxell To: christophe.milard@linaro.org Date: Tue, 23 Feb 2016 00:31:17 +0100 Message-Id: <1456183877-9490-1-git-send-email-anders.roxell@linaro.org> X-Mailer: git-send-email 2.1.4 X-Topics: patch Cc: lng-odp@lists.linaro.org Subject: [lng-odp] [API-NEXT PATCH] linux-generic: Makefile: fix broken include path X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" 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" Fix build error while building an application against ODP /media/data/src/install-odp-api-next/include/odp/api/cpu.h:20:26: fatal error: odp/cpu_arch.h: No such file or directory #include compilation terminated. Signed-off-by: Anders Roxell --- platform/linux-generic/Makefile.am | 2 +- .../linux-generic/arch/linux/odp/api/cpu_arch.h | 22 ++++++++++++++++++ platform/linux-generic/arch/linux/odp/cpu_arch.h | 22 ------------------ .../linux-generic/arch/mips64/odp/api/cpu_arch.h | 26 +++++++++++++++++++++ platform/linux-generic/arch/mips64/odp/cpu_arch.h | 26 --------------------- .../linux-generic/arch/powerpc/odp/api/cpu_arch.h | 1 + platform/linux-generic/arch/powerpc/odp/cpu_arch.h | 1 - platform/linux-generic/arch/x86/odp/api/cpu_arch.h | 27 ++++++++++++++++++++++ platform/linux-generic/arch/x86/odp/cpu_arch.h | 27 ---------------------- platform/linux-generic/include/odp/api/cpu.h | 2 +- 10 files changed, 78 insertions(+), 78 deletions(-) create mode 100644 platform/linux-generic/arch/linux/odp/api/cpu_arch.h delete mode 100644 platform/linux-generic/arch/linux/odp/cpu_arch.h create mode 100644 platform/linux-generic/arch/mips64/odp/api/cpu_arch.h delete mode 100644 platform/linux-generic/arch/mips64/odp/cpu_arch.h create mode 120000 platform/linux-generic/arch/powerpc/odp/api/cpu_arch.h delete mode 120000 platform/linux-generic/arch/powerpc/odp/cpu_arch.h create mode 100644 platform/linux-generic/arch/x86/odp/api/cpu_arch.h delete mode 100644 platform/linux-generic/arch/x86/odp/cpu_arch.h diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 00c8ac9..d0e1641 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -56,7 +56,7 @@ odpapiinclude_HEADERS = \ $(srcdir)/include/odp/api/timer.h \ $(srcdir)/include/odp/api/traffic_mngr.h \ $(srcdir)/include/odp/api/version.h \ - $(srcdir)/arch/@ARCH@/odp/cpu_arch.h + $(srcdir)/arch/@ARCH@/odp/api/cpu_arch.h odpapiplatincludedir= $(includedir)/odp/api/plat odpapiplatinclude_HEADERS = \ diff --git a/platform/linux-generic/arch/linux/odp/api/cpu_arch.h b/platform/linux-generic/arch/linux/odp/api/cpu_arch.h new file mode 100644 index 0000000..1c79f87 --- /dev/null +++ b/platform/linux-generic/arch/linux/odp/api/cpu_arch.h @@ -0,0 +1,22 @@ +/* Copyright (c) 2016, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_PLAT_CPU_ARCH_H_ +#define ODP_PLAT_CPU_ARCH_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +static inline void odp_cpu_pause(void) +{ +} + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/platform/linux-generic/arch/linux/odp/cpu_arch.h b/platform/linux-generic/arch/linux/odp/cpu_arch.h deleted file mode 100644 index 1c79f87..0000000 --- a/platform/linux-generic/arch/linux/odp/cpu_arch.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright (c) 2016, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef ODP_PLAT_CPU_ARCH_H_ -#define ODP_PLAT_CPU_ARCH_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -static inline void odp_cpu_pause(void) -{ -} - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/platform/linux-generic/arch/mips64/odp/api/cpu_arch.h b/platform/linux-generic/arch/mips64/odp/api/cpu_arch.h new file mode 100644 index 0000000..3bfa0dc --- /dev/null +++ b/platform/linux-generic/arch/mips64/odp/api/cpu_arch.h @@ -0,0 +1,26 @@ +/* Copyright (c) 2016, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_PLAT_CPU_ARCH_H_ +#define ODP_PLAT_CPU_ARCH_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +static inline void odp_cpu_pause(void) +{ + __asm__ __volatile__ ("nop"); + __asm__ __volatile__ ("nop"); + __asm__ __volatile__ ("nop"); + __asm__ __volatile__ ("nop"); +} + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/platform/linux-generic/arch/mips64/odp/cpu_arch.h b/platform/linux-generic/arch/mips64/odp/cpu_arch.h deleted file mode 100644 index 3bfa0dc..0000000 --- a/platform/linux-generic/arch/mips64/odp/cpu_arch.h +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright (c) 2016, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef ODP_PLAT_CPU_ARCH_H_ -#define ODP_PLAT_CPU_ARCH_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -static inline void odp_cpu_pause(void) -{ - __asm__ __volatile__ ("nop"); - __asm__ __volatile__ ("nop"); - __asm__ __volatile__ ("nop"); - __asm__ __volatile__ ("nop"); -} - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/platform/linux-generic/arch/powerpc/odp/api/cpu_arch.h b/platform/linux-generic/arch/powerpc/odp/api/cpu_arch.h new file mode 120000 index 0000000..0617d7f --- /dev/null +++ b/platform/linux-generic/arch/powerpc/odp/api/cpu_arch.h @@ -0,0 +1 @@ +../../linux/odp/cpu_arch.h \ No newline at end of file diff --git a/platform/linux-generic/arch/powerpc/odp/cpu_arch.h b/platform/linux-generic/arch/powerpc/odp/cpu_arch.h deleted file mode 120000 index 0617d7f..0000000 --- a/platform/linux-generic/arch/powerpc/odp/cpu_arch.h +++ /dev/null @@ -1 +0,0 @@ -../../linux/odp/cpu_arch.h \ No newline at end of file diff --git a/platform/linux-generic/arch/x86/odp/api/cpu_arch.h b/platform/linux-generic/arch/x86/odp/api/cpu_arch.h new file mode 100644 index 0000000..997a954 --- /dev/null +++ b/platform/linux-generic/arch/x86/odp/api/cpu_arch.h @@ -0,0 +1,27 @@ +/* Copyright (c) 2016, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef ODP_PLAT_CPU_ARCH_H_ +#define ODP_PLAT_CPU_ARCH_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +static inline void odp_cpu_pause(void) +{ +#ifdef __SSE2__ + __asm__ __volatile__ ("pause"); +#else + __asm__ __volatile__ ("rep; nop"); +#endif +} + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/platform/linux-generic/arch/x86/odp/cpu_arch.h b/platform/linux-generic/arch/x86/odp/cpu_arch.h deleted file mode 100644 index 997a954..0000000 --- a/platform/linux-generic/arch/x86/odp/cpu_arch.h +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright (c) 2016, Linaro Limited - * All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#ifndef ODP_PLAT_CPU_ARCH_H_ -#define ODP_PLAT_CPU_ARCH_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -static inline void odp_cpu_pause(void) -{ -#ifdef __SSE2__ - __asm__ __volatile__ ("pause"); -#else - __asm__ __volatile__ ("rep; nop"); -#endif -} - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/platform/linux-generic/include/odp/api/cpu.h b/platform/linux-generic/include/odp/api/cpu.h index e0bdc9e..d49c782 100644 --- a/platform/linux-generic/include/odp/api/cpu.h +++ b/platform/linux-generic/include/odp/api/cpu.h @@ -17,7 +17,7 @@ extern "C" { #endif -#include +#include #include