From patchwork Wed Aug 5 16:04:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Uvarov X-Patchwork-Id: 51961 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f197.google.com (mail-wi0-f197.google.com [209.85.212.197]) by patches.linaro.org (Postfix) with ESMTPS id 14F43229FD for ; Wed, 5 Aug 2015 16:05:49 +0000 (UTC) Received: by wicul11 with SMTP id ul11sf3249718wic.1 for ; Wed, 05 Aug 2015 09:05:48 -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:in-reply-to:references: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=gnKIUsodxF3/i0xQ0gXD2opnQQ9OyaqJRB7ehvPybvU=; b=VUQEkh4v2zKzOfnIJq7f3r6F9Xq5OIUG5voVLImsn/B8N16G0uu4OlP1whTzIjeql/ pADZKLDVidFNm7ax2rIlrIKEc4SDLGA+ydA9MS4BEvIrHpGSLT4b1qoQ5abaVXVl9TTN JtuIpPmJImkr3H4yZjKCcCtJ2+SVsckzTDxwRiZPX8BrELS2TYXGuWkbzBZXFK+FhtH8 NFW593vu1fmqaWqt60IiAtShqPJ1dwMI41Py9y0zslkTJbMOQ9SGevVfX90VRQ+mUgR0 RWE5gSutecS9Cxzs+LlYhNge0pzVgZyVw4yQ3V1FOuSLHDa5MB715Pqvmn/1HP4A7QXB I3Fg== X-Gm-Message-State: ALoCoQlnK5fYPEIyHoyRyy+7Txxrh5b26tU4tLFCcWCK4bj9cafOwSVlgeNEjCNA2+dMQYsIrVft X-Received: by 10.152.27.130 with SMTP id t2mr2972094lag.2.1438790747533; Wed, 05 Aug 2015 09:05:47 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.5.200 with SMTP id u8ls193811lau.55.gmail; Wed, 05 Aug 2015 09:05:47 -0700 (PDT) X-Received: by 10.112.126.101 with SMTP id mx5mr10109230lbb.35.1438790747375; Wed, 05 Aug 2015 09:05:47 -0700 (PDT) Received: from mail-lb0-f181.google.com (mail-lb0-f181.google.com. [209.85.217.181]) by mx.google.com with ESMTPS id y4si2430159laj.76.2015.08.05.09.05.47 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Aug 2015 09:05:47 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.181 as permitted sender) client-ip=209.85.217.181; Received: by lbbvv8 with SMTP id vv8so24742187lbb.1 for ; Wed, 05 Aug 2015 09:05:47 -0700 (PDT) X-Received: by 10.152.121.4 with SMTP id lg4mr9832581lab.112.1438790747199; Wed, 05 Aug 2015 09:05:47 -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 l6csp453911lba; Wed, 5 Aug 2015 09:05:46 -0700 (PDT) X-Received: by 10.107.159.135 with SMTP id i129mr10115177ioe.68.1438790745608; Wed, 05 Aug 2015 09:05:45 -0700 (PDT) Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id q10si2797638ioi.83.2015.08.05.09.05.44; Wed, 05 Aug 2015 09:05:45 -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 8EE8461FC4; Wed, 5 Aug 2015 16:05:44 +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 BE4DF61FC5; Wed, 5 Aug 2015 16:04:36 +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 DBD7561FC4; Wed, 5 Aug 2015 16:04:18 +0000 (UTC) Received: from mail-wi0-f182.google.com (mail-wi0-f182.google.com [209.85.212.182]) by lists.linaro.org (Postfix) with ESMTPS id 6BA8C61F28 for ; Wed, 5 Aug 2015 16:04:16 +0000 (UTC) Received: by wijp15 with SMTP id p15so54656401wij.0 for ; Wed, 05 Aug 2015 09:04:15 -0700 (PDT) X-Received: by 10.180.77.193 with SMTP id u1mr10716wiw.50.1438790655643; Wed, 05 Aug 2015 09:04:15 -0700 (PDT) Received: from localhost.localdomain ([87.120.178.39]) by smtp.gmail.com with ESMTPSA id y15sm5457452wib.7.2015.08.05.09.04.14 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 05 Aug 2015 09:04:15 -0700 (PDT) From: Maxim Uvarov To: lng-odp@lists.linaro.org Date: Wed, 5 Aug 2015 19:04:06 +0300 Message-Id: <1438790646-5670-3-git-send-email-maxim.uvarov@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1438790646-5670-1-git-send-email-maxim.uvarov@linaro.org> References: <1438790646-5670-1-git-send-email-maxim.uvarov@linaro.org> X-Topics: Architecture patch Subject: [lng-odp] [PATCH 2/2] linux-generic: rename arch odp_time.c to odp_time_cycles.c 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: maxim.uvarov@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.181 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..." That happed due to we have files with same name: ./platform/linux-generic/odp_time.c and platform/linux-generic/arch/.../odp_time.c Autotools builds 2 objects with corresponding name odp_time.o. Then that 2 objects packed to static library libodp.a. During linking libtool copies everything from one odp_time.o to other. So that final static lib has only one object odp_time.o. And libtool generates warning that it did some tricks with binaries and might be issues with debugging that code. Because of that arch/../odp_time.c has only one function - optimized odp_time_cycles() it's reasonable to rename arch files. So that warning disappears. But for better solve naming issue we should add some prefix/postfix to arch specific objects. That is easy with native Makefile but looks like autotools do not support postfix or prefix for object files and overloading compilation strange. For now we will try to not overlap names until better solution will be found. Signed-off-by: Maxim Uvarov --- platform/linux-generic/arch/linux/Makefile.am | 2 +- platform/linux-generic/arch/linux/{odp_time.c => odp_time_cycles.c} | 0 platform/linux-generic/arch/mips64/Makefile.am | 2 +- platform/linux-generic/arch/mips64/{odp_time.c => odp_time_cycles.c} | 0 platform/linux-generic/arch/x86/Makefile.am | 2 +- platform/linux-generic/arch/x86/{odp_time.c => odp_time_cycles.c} | 0 platform/linux-generic/m4/configure.m4 | 5 ++++- 7 files changed, 7 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/Makefile.am b/platform/linux-generic/arch/linux/Makefile.am index 5539e3a..7532db4 100644 --- a/platform/linux-generic/arch/linux/Makefile.am +++ b/platform/linux-generic/arch/linux/Makefile.am @@ -2,4 +2,4 @@ AM_CFLAGS += -I$(srcdir)/../../include AM_CFLAGS += -I$(top_srcdir)/include noinst_LTLIBRARIES = libodparch.la -libodparch_la_SOURCES = odp_time.c +libodparch_la_SOURCES = odp_time_cycles.c 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/Makefile.am b/platform/linux-generic/arch/mips64/Makefile.am index 5539e3a..7532db4 100644 --- a/platform/linux-generic/arch/mips64/Makefile.am +++ b/platform/linux-generic/arch/mips64/Makefile.am @@ -2,4 +2,4 @@ AM_CFLAGS += -I$(srcdir)/../../include AM_CFLAGS += -I$(top_srcdir)/include noinst_LTLIBRARIES = libodparch.la -libodparch_la_SOURCES = odp_time.c +libodparch_la_SOURCES = 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/Makefile.am b/platform/linux-generic/arch/x86/Makefile.am index 5539e3a..7532db4 100644 --- a/platform/linux-generic/arch/x86/Makefile.am +++ b/platform/linux-generic/arch/x86/Makefile.am @@ -2,4 +2,4 @@ AM_CFLAGS += -I$(srcdir)/../../include AM_CFLAGS += -I$(top_srcdir)/include noinst_LTLIBRARIES = libodparch.la -libodparch_la_SOURCES = odp_time.c +libodparch_la_SOURCES = 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/m4/configure.m4 b/platform/linux-generic/m4/configure.m4 index 697465a..fcf2023 100644 --- a/platform/linux-generic/m4/configure.m4 +++ b/platform/linux-generic/m4/configure.m4 @@ -18,4 +18,7 @@ AC_LINK_IFELSE( AC_SUBST([platform_with_arch], ["arch/${ARCH}"]) AC_CONFIG_FILES([platform/linux-generic/test/Makefile - platform/linux-generic/arch/${ARCH}/Makefile]) + platform/linux-generic/arch/linux/Makefile + platform/linux-generic/arch/mips64/Makefile + platform/linux-generic/arch/x86/Makefile ]) +