From patchwork Fri Aug 7 10:52:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anders Roxell X-Patchwork-Id: 52022 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f199.google.com (mail-wi0-f199.google.com [209.85.212.199]) by patches.linaro.org (Postfix) with ESMTPS id 3335B22EAD for ; Fri, 7 Aug 2015 10:54:43 +0000 (UTC) Received: by wijp15 with SMTP id p15sf16341336wij.3 for ; Fri, 07 Aug 2015 03:54:42 -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=H51jukfFFeIm3cmpW1PXbn2UnkQzteM7qtZS4AjvfRU=; b=UZtReyVdWDdKaMLJYMm91PF8r8nvBLHTMViSkMvRXI/ALo7SVLf2vHoay9imXT/0Z+ WfsDnCFAa5EtaEBm+4m8uz7AcNlelnP5DRt4omPH/uTyMJFrDtYjNKcOuPa/TuACTDvQ L77N7urEwC9K71hN0zehb+W4awgg+9Ucb2H3Ikr0LZHaBW6yU+q8FHZn0fvtpiDUEhlB rIyCseP7VnRPIGxY5JDnQa2LESLOMIAqME9M2NweeOMP7+SKuBsGdVzqsFIftifeQCqa EffW9Th9+FgldGRqfy4BbGbtO4IXT1G7vhUJlGnAxr4l5/0W83X7CgE9qcmSxoB3Kwth 0gUg== X-Gm-Message-State: ALoCoQkHOhlbcaA1EMOz8tHrTWFX8wDStXRNGcrsb7oyGW6sV3MDlVb/Ul95zAElbteZ3L3CnE/a X-Received: by 10.112.218.10 with SMTP id pc10mr1952756lbc.8.1438944882466; Fri, 07 Aug 2015 03:54:42 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.6.233 with SMTP id e9ls137486laa.99.gmail; Fri, 07 Aug 2015 03:54:42 -0700 (PDT) X-Received: by 10.152.234.75 with SMTP id uc11mr6894323lac.20.1438944882254; Fri, 07 Aug 2015 03:54:42 -0700 (PDT) Received: from mail-lb0-f174.google.com (mail-lb0-f174.google.com. [209.85.217.174]) by mx.google.com with ESMTPS id kg7si7135854lbc.176.2015.08.07.03.54.42 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Aug 2015 03:54:42 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.174 as permitted sender) client-ip=209.85.217.174; Received: by lbbyj8 with SMTP id yj8so58671876lbb.0 for ; Fri, 07 Aug 2015 03:54:42 -0700 (PDT) X-Received: by 10.153.7.66 with SMTP id da2mr6793998lad.117.1438944882147; Fri, 07 Aug 2015 03:54:42 -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 l6csp287807lba; Fri, 7 Aug 2015 03:54:41 -0700 (PDT) X-Received: by 10.140.34.135 with SMTP id l7mr11630206qgl.79.1438944880667; Fri, 07 Aug 2015 03:54:40 -0700 (PDT) Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id 128si17248278qhh.8.2015.08.07.03.54.39; Fri, 07 Aug 2015 03:54:40 -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 C7E3A62189; Fri, 7 Aug 2015 10:54:39 +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 8E47562138; Fri, 7 Aug 2015 10:54:37 +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 224066214E; Fri, 7 Aug 2015 10:54:35 +0000 (UTC) Received: from mail-lb0-f170.google.com (mail-lb0-f170.google.com [209.85.217.170]) by lists.linaro.org (Postfix) with ESMTPS id D0C0762106 for ; Fri, 7 Aug 2015 10:54:33 +0000 (UTC) Received: by lbbyj8 with SMTP id yj8so58669850lbb.0 for ; Fri, 07 Aug 2015 03:54:32 -0700 (PDT) X-Received: by 10.112.149.164 with SMTP id ub4mr6897207lbb.65.1438944872431; Fri, 07 Aug 2015 03:54:32 -0700 (PDT) Received: from localhost (c-b03670d5.07-21-73746f28.cust.bredbandsbolaget.se. [213.112.54.176]) by smtp.gmail.com with ESMTPSA id j2sm2090314lag.10.2015.08.07.03.54.31 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Aug 2015 03:54:31 -0700 (PDT) From: Anders Roxell To: lng-odp@lists.linaro.org Date: Fri, 7 Aug 2015 12:52:17 +0200 Message-Id: <1438944737-19404-1-git-send-email-anders.roxell@linaro.org> X-Mailer: git-send-email 2.1.4 X-Topics: patch Subject: [lng-odp] [PATCHv3] 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.217.174 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 --- So resending this patch with minor changes. * reduce the long filename with 6 chars (we like short names) =) * Had to fix another random bug [1] before this patch could be applied. Note: this patch will not apply without [1] applied first. and resending v3 with the -M flag... Cheers, Anders [1] https://lists.linaro.org/pipermail/lng-odp/2015-August/014015.html platform/linux-generic/Makefile.am | 8 ++++---- .../linux-generic/arch/linux/{odp_time.c => odp_time_cycles.c} | 0 .../linux-generic/arch/mips64/{odp_time.c => odp_time_cycles.c} | 0 platform/linux-generic/arch/x86/{odp_time.c => odp_time_cycles.c} | 0 4 files changed, 4 insertions(+), 4 deletions(-) rename platform/linux-generic/arch/linux/{odp_time.c => odp_time_cycles.c} (100%) rename platform/linux-generic/arch/mips64/{odp_time.c => odp_time_cycles.c} (100%) rename platform/linux-generic/arch/x86/{odp_time.c => odp_time_cycles.c} (100%) diff --git a/platform/linux-generic/arch/linux/odp_time.c b/platform/linux-generic/arch/linux/odp_time_cycles.c similarity index 100% rename from platform/linux-generic/arch/linux/odp_time.c rename to platform/linux-generic/arch/linux/odp_time_cycles.c diff --git a/platform/linux-generic/arch/mips64/odp_time.c b/platform/linux-generic/arch/mips64/odp_time_cycles.c similarity index 100% rename from platform/linux-generic/arch/mips64/odp_time.c rename to platform/linux-generic/arch/mips64/odp_time_cycles.c diff --git a/platform/linux-generic/arch/x86/odp_time.c b/platform/linux-generic/arch/x86/odp_time_cycles.c similarity index 100% rename from platform/linux-generic/arch/x86/odp_time.c rename to platform/linux-generic/arch/x86/odp_time_cycles.c diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index c0f7220..ed4add5 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -160,9 +160,9 @@ __LIB__libodp_la_SOURCES = \ odp_timer.c \ odp_version.c \ odp_weak.c \ - arch/@ARCH@/odp_time.c + arch/@ARCH@/odp_time_cycles.c EXTRA_DIST = \ - arch/linux/odp_time.c \ - arch/mips64/odp_time.c \ - arch/x86/odp_time.c + arch/linux/odp_time_cycles.c \ + arch/mips64/odp_time_cycles.c \ + arch/x86/odp_time_cycles.c