--- ./include/obstack.h_orig	2017-05-22 05:46:33 -0500
+++ ./include/obstack.h	2017-05-22 05:49:16 -0500
@@ -199,16 +199,14 @@
 
 /* Declare the external functions we use; they are in obstack.c.  */
 
-extern void _obstack_newchunk (struct obstack *, _OBSTACK_SIZE_T);
+extern void _obstack_newchunk (struct obstack *, long);
 extern void _obstack_free (struct obstack *, void *);
-extern int _obstack_begin (struct obstack *,
-                           _OBSTACK_SIZE_T, _OBSTACK_SIZE_T,
+extern long _obstack_begin (struct obstack *, long, long,
                            void *(*) (size_t), void (*) (void *));
-extern int _obstack_begin_1 (struct obstack *,
-                             _OBSTACK_SIZE_T, _OBSTACK_SIZE_T,
+extern long _obstack_begin_1 (struct obstack *, long, long,
                              void *(*) (void *, size_t),
                              void (*) (void *, void *), void *);
-extern _OBSTACK_SIZE_T _obstack_memory_used (struct obstack *)
+extern long _obstack_memory_used (struct obstack *)
   __attribute_pure__;
 
 
@@ -297,7 +295,7 @@
 # define obstack_make_room(OBSTACK, length)				      \
   __extension__								      \
     ({ struct obstack *__o = (OBSTACK);					      \
-       _OBSTACK_SIZE_T __len = (length);				      \
+       long __len = (length);				      \
        if (obstack_room (__o) < __len)					      \
          _obstack_newchunk (__o, __len);				      \
        (void) 0; })
@@ -313,7 +311,7 @@
 # define obstack_grow(OBSTACK, where, length)				      \
   __extension__								      \
     ({ struct obstack *__o = (OBSTACK);					      \
-       _OBSTACK_SIZE_T __len = (length);				      \
+       long __len = (length);				      \
        if (obstack_room (__o) < __len)					      \
          _obstack_newchunk (__o, __len);				      \
        memcpy (__o->next_free, where, __len);				      \
@@ -323,7 +321,7 @@
 # define obstack_grow0(OBSTACK, where, length)				      \
   __extension__								      \
     ({ struct obstack *__o = (OBSTACK);					      \
-       _OBSTACK_SIZE_T __len = (length);				      \
+       long __len = (length);				      \
        if (obstack_room (__o) < __len + 1)				      \
          _obstack_newchunk (__o, __len + 1);				      \
        memcpy (__o->next_free, where, __len);				      \
@@ -375,7 +373,7 @@
 # define obstack_blank(OBSTACK, length)					      \
   __extension__								      \
     ({ struct obstack *__o = (OBSTACK);					      \
-       _OBSTACK_SIZE_T __len = (length);				      \
+       long __len = (length);				      \
        if (obstack_room (__o) < __len)					      \
          _obstack_newchunk (__o, __len);				      \
        obstack_blank_fast (__o, __len); })
--- ./libiberty/obstack.c_orig	2017-01-21 07:48:42 -0600
+++ ./libiberty/obstack.c	2017-05-22 05:49:30 -0500
@@ -152,9 +152,9 @@
   return 1;
 }
 
-int
+long
 _obstack_begin (struct obstack *h,
-                _OBSTACK_SIZE_T size, _OBSTACK_SIZE_T alignment,
+                long size, long alignment,
                 void *(*chunkfun) (size_t),
                 void (*freefun) (void *))
 {
@@ -164,9 +164,9 @@
   return _obstack_begin_worker (h, size, alignment);
 }
 
-int
+long
 _obstack_begin_1 (struct obstack *h,
-                  _OBSTACK_SIZE_T size, _OBSTACK_SIZE_T alignment,
+                  long size, long alignment,
                   void *(*chunkfun) (void *, size_t),
                   void (*freefun) (void *, void *),
                   void *arg)
@@ -185,7 +185,7 @@
    to the beginning of the new one.  */
 
 void
-_obstack_newchunk (struct obstack *h, _OBSTACK_SIZE_T length)
+_obstack_newchunk (struct obstack *h, long length)
 {
   struct _obstack_chunk *old_chunk = h->chunk;
   struct _obstack_chunk *new_chunk = 0;
@@ -294,11 +294,11 @@
     abort ();
 }
 
-_OBSTACK_SIZE_T
+long
 _obstack_memory_used (struct obstack *h)
 {
   struct _obstack_chunk *lp;
-  _OBSTACK_SIZE_T nbytes = 0;
+  register long nbytes = 0;
 
   for (lp = h->chunk; lp != 0; lp = lp->prev)
     {
