From: <gerg@snapgear.com>
To: linux-m68k@vger.kernel.org, uclinux-dev@uclinux.org
Cc: Greg Ungerer <gerg@uclinux.org>
Subject: [PATCH v2 6/6] m68k: let Makefile sort out compiling mmu and non-mmu lib/checksum.c
Date: Wed, 20 Apr 2011 15:54:40 +1000 [thread overview]
Message-ID: <1303278880-16153-8-git-send-email-gerg@snapgear.com> (raw)
In-Reply-To: <1303278880-16153-7-git-send-email-gerg@snapgear.com>
From: Greg Ungerer <gerg@uclinux.org>
We don't need an arch/m68k/lib/checksum.c wrapper to include the correct
mmu or non-mmu version of the checksum code. Let the Makefile just build
the appropriate one.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
---
arch/m68k/lib/Makefile | 6 +++---
arch/m68k/lib/checksum.c | 5 -----
2 files changed, 3 insertions(+), 8 deletions(-)
delete mode 100644 arch/m68k/lib/checksum.c
diff --git a/arch/m68k/lib/Makefile b/arch/m68k/lib/Makefile
index 2438d02..df421e5 100644
--- a/arch/m68k/lib/Makefile
+++ b/arch/m68k/lib/Makefile
@@ -4,11 +4,11 @@
#
lib-y := ashldi3.o ashrdi3.o lshrdi3.o muldi3.o \
- memcpy.o memset.o memmove.o checksum.o
+ memcpy.o memset.o memmove.o
ifdef CONFIG_MMU
-lib-y += string.o uaccess.o
+lib-y += string.o uaccess.o checksum_mm.o
else
-lib-y += mulsi3.o divsi3.o udivsi3.o modsi3.o umodsi3.o delay.o
+lib-y += mulsi3.o divsi3.o udivsi3.o modsi3.o umodsi3.o delay.o checksum_no.o
endif
diff --git a/arch/m68k/lib/checksum.c b/arch/m68k/lib/checksum.c
deleted file mode 100644
index 1297536..0000000
--- a/arch/m68k/lib/checksum.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifdef CONFIG_MMU
-#include "checksum_mm.c"
-#else
-#include "checksum_no.c"
-#endif
--
1.7.0.4
next prev parent reply other threads:[~2011-04-20 5:57 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-20 5:54 [PATCH v2 0/6] m68knommu: merge and clean up of arch/m68k/lib files gerg
2011-04-20 5:54 ` gerg
2011-04-20 5:54 ` [PATCH v2 1/6] m68k: merge mmu and non-mmu versions of muldi3 gerg
2011-04-20 5:54 ` [PATCH v2 2/6] m68k: merge mmu and non-mmu versions of lib/Makefile gerg
2011-04-20 5:54 ` [PATCH v2 3/6] m68k: remove duplicate memmove() implementation gerg
2011-04-20 5:54 ` [PATCH v2 4/6] m68k: remove duplicate memset() implementation gerg
2011-04-20 5:54 ` [PATCH v2 5/6] m68k: remove duplicate memcpy() implementation gerg
2011-04-20 5:54 ` gerg [this message]
2011-04-20 8:06 ` [PATCH v2 1/6] m68k: merge mmu and non-mmu versions of muldi3 Sam Ravnborg
2011-04-20 8:55 ` [uClinux-dev] " Geert Uytterhoeven
2011-04-20 9:12 ` Philippe De Muyter
2011-04-20 9:31 ` [uClinux-dev] " Greg Ungerer
2011-04-20 9:55 ` Philippe De Muyter
2011-04-20 10:18 ` Greg Ungerer
2011-04-20 10:38 ` Andreas Schwab
2011-04-20 10:38 ` Philippe De Muyter
2011-04-20 11:01 ` Greg Ungerer
2011-04-20 11:23 ` Philippe De Muyter
2011-04-20 8:57 ` Philippe De Muyter
2011-04-20 9:08 ` Greg Ungerer
2011-04-20 6:04 ` [PATCH v2 0/6] m68knommu: merge and clean up of arch/m68k/lib files Greg Ungerer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1303278880-16153-8-git-send-email-gerg@snapgear.com \
--to=gerg@snapgear.com \
--cc=gerg@uclinux.org \
--cc=linux-m68k@vger.kernel.org \
--cc=uclinux-dev@uclinux.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox