--- gcc/objc/sarray.h	2018/04/24 18:20:11	1.1.1.2
+++ gcc/objc/sarray.h	2018/04/24 18:26:46	1.1.1.3
@@ -1,5 +1,5 @@
 /* Sparse Arrays for Objective C dispatch tables
-   Copyright (C) 1993 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1995 Free Software Foundation, Inc.
 
 Author: Kresten Krab Thorup
 
@@ -17,7 +17,8 @@ GNU General Public License for more deta
 
 You should have received a copy of the GNU General Public License
 along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 /* As a special exception, if you link this library with files
    compiled with GCC to produce an executable, this does not cause
@@ -51,7 +52,7 @@ extern int idxsize;
 /* An unsigned integer of same size as a pointer */
 #define SIZET_BITS (sizeof(size_t)*8)
 
-#if defined(sparc) || defined(OBJC_SPARSE2)
+#if defined(__sparc__) || defined(OBJC_SPARSE2)
 #define PRECOMPUTE_SELECTORS
 #endif
 
@@ -89,7 +90,7 @@ struct soffset {
   unsigned int boffset : SIZET_BITS/4;
   unsigned int ioffset : SIZET_BITS/4;
 #else /* OBJC_SPARSE2 */
-#ifdef sparc
+#ifdef __sparc__
   unsigned int boffset : (SIZET_BITS - 2) - BUCKET_BITS;
   unsigned int eoffset : BUCKET_BITS;
   unsigned int unused  : 2;
@@ -135,7 +136,7 @@ struct sarray {
   short version;
   short ref_count;
   struct sarray* is_copy_of;
-  int capacity;
+  size_t capacity;
 };
 
 struct sarray* sarray_new(int, void* default_element);