From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
To: barebox@lists.infradead.org
Subject: [PATCH 3/3] mk68: rename macro __M68K__ to __m68k__ as it's prodive by gcc
Date: Fri, 24 Sep 2010 09:20:22 +0200 [thread overview]
Message-ID: <1285312822-25116-3-git-send-email-plagnioj@jcrosoft.com> (raw)
In-Reply-To: <1285312822-25116-1-git-send-email-plagnioj@jcrosoft.com>
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
arch/m68k/Makefile | 3 +--
include/image.h | 4 ++--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile
index ec70028..86afb24 100644
--- a/arch/m68k/Makefile
+++ b/arch/m68k/Makefile
@@ -18,8 +18,7 @@
# along with barebox. If not, see <http://www.gnu.org/licenses/>.
#
-CPPFLAGS += -isystem $(gccincdir) -D __M68K__ \
- -fno-strict-aliasing
+CPPFLAGS += -isystem $(gccincdir) -fno-strict-aliasing
machine-$(CONFIG_ARCH_MCF54xx) := mcfv4e
diff --git a/include/image.h b/include/image.h
index add5e02..2c5956d 100644
--- a/include/image.h
+++ b/include/image.h
@@ -96,7 +96,7 @@
#define IH_ARCH IH_ARCH_MIPS
#elif defined(__nios__)
#define IH_ARCH IH_ARCH_NIOS
-#elif defined(__M68K__)
+#elif defined(__m68k__)
#define IH_ARCH IH_ARCH_M68K
#elif defined(__microblaze__)
#define IH_ARCH IH_ARCH_MICROBLAZE
@@ -348,7 +348,7 @@ static inline int image_check_target_arch(const image_header_t *hdr)
if (!image_check_arch(hdr, IH_ARCH_BLACKFIN))
#elif defined(__I386__)
if (!image_check_arch(hdr, IH_ARCH_I386))
-#elif defined(__M68K__)
+#elif defined(__m68k__)
if (!image_check_arch(hdr, IH_ARCH_M68K))
#elif defined(__microblaze__)
if (!image_check_arch(hdr, IH_ARCH_MICROBLAZE))
--
1.7.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
prev parent reply other threads:[~2010-09-24 7:21 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-24 7:20 [PATCH 1/3] blackfin: remove duplicated PAGE_SIZE define Jean-Christophe PLAGNIOL-VILLARD
2010-09-24 7:20 ` [PATCH 2/3] ipe337: fix default env Jean-Christophe PLAGNIOL-VILLARD
2010-09-24 7:20 ` Jean-Christophe PLAGNIOL-VILLARD [this message]
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=1285312822-25116-3-git-send-email-plagnioj@jcrosoft.com \
--to=plagnioj@jcrosoft.com \
--cc=barebox@lists.infradead.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