diff mbox

[PATCHv3] linux-generic: Makefile.am: fix basename conflicts

Message ID 1438944737-19404-1-git-send-email-anders.roxell@linaro.org
State Accepted
Commit bb00e77670ac298d81c75e0cb21a3d89e09b59d8
Headers show

Commit Message

Anders Roxell Aug. 7, 2015, 10:52 a.m. UTC 
Building generated this warning message:
"copying selected object files to avoid basename conflicts..."

Reported-by: Mile Holmes <mike.holmes@linaro.org>
Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
---
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

Comments

Maxim Uvarov Aug. 7, 2015, 11:19 a.m. UTC | #1 
Merged,
Maxim.

On 08/07/15 13:52, Anders Roxell wrote:
> Building generated this warning message:
> "copying selected object files to avoid basename conflicts..."
>
> Reported-by: Mile Holmes <mike.holmes@linaro.org>
> Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
> ---
> 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/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
> 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 mbox

Patch

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