diff options
author | Nicolas Pitre <nico@cam.org> | 2005-11-04 12:17:30 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-11-04 12:17:30 -0500 |
commit | 30c2f90b68b9bcdba83d386d56533d3e884be021 (patch) | |
tree | 7354a6dbed550e3abc14ac32afb1fc71e0181f35 /arch/arm/Makefile | |
parent | 74ec71e16189717d3f33ec7e5d22021480f4173b (diff) |
[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 <nico@cam.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/Makefile')
-rw-r--r-- | arch/arm/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index c422759438d5..114cda7f1b73 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
@@ -144,7 +144,7 @@ drivers-$(CONFIG_OPROFILE) += arch/arm/oprofile/ | |||
144 | drivers-$(CONFIG_ARCH_CLPS7500) += drivers/acorn/char/ | 144 | drivers-$(CONFIG_ARCH_CLPS7500) += drivers/acorn/char/ |
145 | drivers-$(CONFIG_ARCH_L7200) += drivers/acorn/char/ | 145 | drivers-$(CONFIG_ARCH_L7200) += drivers/acorn/char/ |
146 | 146 | ||
147 | libs-y += arch/arm/lib/ | 147 | libs-y := arch/arm/lib/ $(libs-y) |
148 | 148 | ||
149 | # Default target when executing plain make | 149 | # Default target when executing plain make |
150 | ifeq ($(CONFIG_XIP_KERNEL),y) | 150 | ifeq ($(CONFIG_XIP_KERNEL),y) |