From patchwork Wed Jul 22 20:48:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anders Roxell X-Patchwork-Id: 51374 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f72.google.com (mail-la0-f72.google.com [209.85.215.72]) by patches.linaro.org (Postfix) with ESMTPS id 3ED6F228EF for ; Wed, 22 Jul 2015 20:49:20 +0000 (UTC) Received: by lafd3 with SMTP id d3sf62110446laf.1 for ; Wed, 22 Jul 2015 13:49:18 -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:delivered-to:from:to:date :message-id:subject:precedence:list-id:list-unsubscribe:list-archive :list-post:list-help:list-subscribe:mime-version:content-type :content-transfer-encoding:errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=34RNI45h5nTwBesYHxU0GnZguU1xTyQg9mIRjQb884g=; b=HLuEa+tihemQxxmHRq1NwLxxF0ZcXgzUw0hLYq5yqG9U/x8PJK1odtFaMYMYwBWyd5 VcyXA9tTp93K5+bsjA8zeaTYjA9eKx2IyH7lH33J5UakcMoTGJtuHZqAKmlsBdDs/RuZ XlWGZvJZQgZOoH6IfhMkWDpOETYDJxLwkM0DD3AzQKkj4luX9P3yhsiIbhYjz+PmvTX1 QO6rJfkDFj42MvWTlJF4YPWnknFv+jj8Ea15DIcwv6+SNXHb+JI5lzOj6LcN3faM5F3a CWqwUo6U1mFZGRbCwgj7HW94EyMu05tOCqqMx7ewRqgt4QzyQAAwc4c0DcdU7lyfrd2q V8rw== X-Gm-Message-State: ALoCoQmpyc+mVBSaAHbrOyeAvd/TbfTza+1u77E+PdbOLUrVkKGzhJGQdnrxTplYvF491BqMznDL X-Received: by 10.180.90.106 with SMTP id bv10mr2510129wib.6.1437598158848; Wed, 22 Jul 2015 13:49:18 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.23.162 with SMTP id n2ls150477laf.82.gmail; Wed, 22 Jul 2015 13:49:18 -0700 (PDT) X-Received: by 10.112.63.169 with SMTP id h9mr4174333lbs.104.1437598158620; Wed, 22 Jul 2015 13:49:18 -0700 (PDT) Received: from mail-la0-f41.google.com (mail-la0-f41.google.com. [209.85.215.41]) by mx.google.com with ESMTPS id n4si2171511laj.18.2015.07.22.13.49.18 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Jul 2015 13:49:18 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.41 as permitted sender) client-ip=209.85.215.41; Received: by lagw2 with SMTP id w2so145258611lag.3 for ; Wed, 22 Jul 2015 13:49:18 -0700 (PDT) X-Received: by 10.112.219.70 with SMTP id pm6mr4053257lbc.41.1437598158471; Wed, 22 Jul 2015 13:49:18 -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.112.7.198 with SMTP id l6csp155956lba; Wed, 22 Jul 2015 13:49:17 -0700 (PDT) X-Received: by 10.140.237.70 with SMTP id i67mr7174075qhc.44.1437598157194; Wed, 22 Jul 2015 13:49:17 -0700 (PDT) Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id 6si3097384qhx.21.2015.07.22.13.49.15; Wed, 22 Jul 2015 13:49:17 -0700 (PDT) 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; Received: by lists.linaro.org (Postfix, from userid 109) id 9062F61DA9; Wed, 22 Jul 2015 20:49:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252.ec2.internal X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from ip-10-142-244-252.ec2.internal (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 0C11F61D90; Wed, 22 Jul 2015 20:49:11 +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 A745761D96; Wed, 22 Jul 2015 20:49:02 +0000 (UTC) Received: from mail-la0-f41.google.com (mail-la0-f41.google.com [209.85.215.41]) by lists.linaro.org (Postfix) with ESMTPS id BCF7561D14 for ; Wed, 22 Jul 2015 20:49:01 +0000 (UTC) Received: by laah7 with SMTP id h7so13903458laa.0 for ; Wed, 22 Jul 2015 13:49:00 -0700 (PDT) X-Received: by 10.112.72.8 with SMTP id z8mr4157506lbu.24.1437598140293; Wed, 22 Jul 2015 13:49:00 -0700 (PDT) Received: from localhost (c-2ec208bd-74736162.cust.telenor.se. [46.194.8.189]) by smtp.gmail.com with ESMTPSA id zf3sm532417lbb.2.2015.07.22.13.48.59 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Jul 2015 13:48:59 -0700 (PDT) From: Anders Roxell To: lng-odp@lists.linaro.org Date: Wed, 22 Jul 2015 22:48:55 +0200 Message-Id: <1437598135-20291-1-git-send-email-anders.roxell@linaro.org> X-Mailer: git-send-email 2.1.4 X-Topics: patch Subject: [lng-odp] [PATCH] linux-generic: Makefile.am: fix basename conflicts X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 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" X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: anders.roxell@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.215.41 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 Building generated this warning message: "copying selected object files to avoid basename conflicts..." Reported-by: Mile Holmes Signed-off-by: Anders Roxell --- platform/linux-generic/Makefile.am | 2 +- .../linux-generic/arch/linux/{odp_time.c => odp_time_optimisation.c} | 0 .../linux-generic/arch/mips64/{odp_time.c => odp_time_optimisation.c} | 0 platform/linux-generic/arch/x86/{odp_time.c => odp_time_optimisation.c} | 0 4 files changed, 1 insertion(+), 1 deletion(-) rename platform/linux-generic/arch/linux/{odp_time.c => odp_time_optimisation.c} (100%) rename platform/linux-generic/arch/mips64/{odp_time.c => odp_time_optimisation.c} (100%) rename platform/linux-generic/arch/x86/{odp_time.c => odp_time_optimisation.c} (100%) diff --git a/platform/linux-generic/arch/linux/odp_time.c b/platform/linux-generic/arch/linux/odp_time_optimisation.c similarity index 100% rename from platform/linux-generic/arch/linux/odp_time.c rename to platform/linux-generic/arch/linux/odp_time_optimisation.c diff --git a/platform/linux-generic/arch/mips64/odp_time.c b/platform/linux-generic/arch/mips64/odp_time_optimisation.c similarity index 100% rename from platform/linux-generic/arch/mips64/odp_time.c rename to platform/linux-generic/arch/mips64/odp_time_optimisation.c diff --git a/platform/linux-generic/arch/x86/odp_time.c b/platform/linux-generic/arch/x86/odp_time_optimisation.c similarity index 100% rename from platform/linux-generic/arch/x86/odp_time.c rename to platform/linux-generic/arch/x86/odp_time_optimisation.c diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 4ee781c..937f082 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -157,4 +157,4 @@ __LIB__libodp_la_SOURCES = \ odp_timer.c \ odp_version.c \ odp_weak.c \ - arch/@ARCH@/odp_time.c + arch/@ARCH@/odp_time_optimisation.c