From: Nicolas Pitre Date: Fri, 4 Nov 2005 17:17:30 +0000 (+0000) Subject: [ARM] 3097/1: change library link ordering X-Git-Tag: v2.6.15-rc1~452^2~25^2~3 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30c2f90b68b9bcdba83d386d56533d3e884be021;p=linux-2.6 [ARM] 3097/1: change library link ordering Patch from Nicolas Pitre We have an optimized sha1 routine (arch/arm/lib/sha1.S) meant to override the generic one in lib/sha1.c. Unfortunately lib/lib.a is listed _before_ arch/arm/lib/lib.a in the link argument list and therefore the architecture specific lib functions are not picked up before the generic versions. This patch is a quick fix to change that ordering for ARM. Here's what the kbuild maintainer had to say about it (was also CC'd on lkml): On Wed, 2 Nov 2005, Sam Ravnborg wrote: > This looks like an obvious way to achive correct ordering. > We could change it so arch defines always took precedence but > the above is so simple that it is not worth the effort. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King --- diff --git a/arch/arm/Makefile b/arch/arm/Makefile index c422759438..114cda7f1b 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -144,7 +144,7 @@ drivers-$(CONFIG_OPROFILE) += arch/arm/oprofile/ drivers-$(CONFIG_ARCH_CLPS7500) += drivers/acorn/char/ drivers-$(CONFIG_ARCH_L7200) += drivers/acorn/char/ -libs-y += arch/arm/lib/ +libs-y := arch/arm/lib/ $(libs-y) # Default target when executing plain make ifeq ($(CONFIG_XIP_KERNEL),y)