From 49f6242b34f1daf9591b262c48723b7f2e7883d3 Mon Sep 17 00:00:00 2001
From: akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 25 Oct 2011 12:54:21 +0000
Subject: [PATCH] * include/ruby/defines.h: use "__sparc" instead of "sparc"
 and   "__sparc__".

* dln.c: ditto.

  [ruby-dev:44694]



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33524 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog              |  9 +++++++++
 dln.c                  | 10 +++++-----
 include/ruby/defines.h |  2 +-
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3990d81c0d..9c56a36b91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Tue Oct 25 21:52:31 2011  Tanaka Akira  <akr@fsij.org>
+
+	* include/ruby/defines.h: use "__sparc" instead of "sparc" and
+	  "__sparc__".
+
+	* dln.c: ditto.
+
+	  [ruby-dev:44694]
+
 Tue Oct 25 06:34:39 2011  Eric Hodel  <drbrain@segment7.net>
 
 	* re.c (match_aref):  Use <code> around indexing examples to prevent
diff --git a/dln.c b/dln.c
index 20eaa5e364..6e472f08b9 100644
--- a/dln.c
+++ b/dln.c
@@ -228,7 +228,7 @@ load_header(int fd, struct exec *hdrp, long disp)
 #define RELOC_TARGET_SIZE(r)		((r)->r_length)
 #endif
 
-#if defined(__sun) && defined(sparc)
+#if defined(__sun) && defined(__sparc)
 /* Sparc (Sun 4) macros */
 #  undef relocation_info
 #  define relocation_info reloc_info_sparc
@@ -530,7 +530,7 @@ reloc_undef(int no, struct undef *undef, struct reloc_arg *arg)
 {
     int datum;
     char *address;
-#if defined(__sun) && defined(sparc)
+#if defined(__sun) && defined(__sparc)
     unsigned int mask = 0;
 #endif
 
@@ -539,7 +539,7 @@ reloc_undef(int no, struct undef *undef, struct reloc_arg *arg)
     datum = arg->value;
 
     if (R_PCREL(&(undef->reloc))) datum -= undef->base;
-#if defined(__sun) && defined(sparc)
+#if defined(__sun) && defined(__sparc)
     datum += undef->reloc.r_addend;
     datum >>= R_RIGHTSHIFT(&(undef->reloc));
     mask = (1 << R_BITSIZE(&(undef->reloc))) - 1;
@@ -763,7 +763,7 @@ load_1(int fd, long disp, const char *need_init)
 	while (rel < rel_end) {
 	    char *address = (char*)(rel->r_address + block);
 	    long datum = 0;
-#if defined(__sun) && defined(sparc)
+#if defined(__sun) && defined(__sparc)
 	    unsigned int mask = 0;
 #endif
 
@@ -798,7 +798,7 @@ load_1(int fd, long disp, const char *need_init)
 	    } /* end .. is static */
 	    if (R_PCREL(rel)) datum -= block;
 
-#if defined(__sun) && defined(sparc)
+#if defined(__sun) && defined(__sparc)
 	    datum += rel->r_addend;
 	    datum >>= R_RIGHTSHIFT(rel);
 	    mask = (1 << R_BITSIZE(rel)) - 1;
diff --git a/include/ruby/defines.h b/include/ruby/defines.h
index 875e870ed3..58336c1ebd 100644
--- a/include/ruby/defines.h
+++ b/include/ruby/defines.h
@@ -197,7 +197,7 @@ void xfree(void*);
         /* MB_CUR_MAX will not work well in C locale */
 #endif
 
-#if defined(sparc) || defined(__sparc__)
+#if defined(__sparc)
 static inline void
 flush_register_windows(void)
 {