branch release/7.1 updated: Further obstack alignment fix for sparc64

[Gavin D. Smith]

This is an automated email from the git hooks/post-receive script.

gavin pushed a commit to branch release/7.1
in repository texinfo.

The following commit(s) were added to refs/heads/release/7.1 by this push:
     new c106b85ae5 Further obstack alignment fix for sparc64
c106b85ae5 is described below

commit c106b85ae5a6bb24de227f50e5d2a1ce81ba7868
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Wed Nov 15 18:09:43 2023 +0000

    Further obstack alignment fix for sparc64
    
    * tp/Texinfo/XS/gnulib/lib/obstack.h: Add defines using rpl_
    prefix for gnulib functions.  Investigation and fix by Bruno Haible.
    
    * tp/Texinfo/XS/parsetexi/tree.c: Revert change from 2023-11-13.
---
 ChangeLog                          | 9 +++++++++
 tp/Texinfo/XS/gnulib/lib/obstack.h | 6 ++++++
 tp/Texinfo/XS/parsetexi/tree.c     | 7 +------
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0dcdb1a904..2145debc22 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2023-11-15  Gavin Smith <gavinsmith0123@gmail.com>
+
+       Further obstack alignment fix for sparc64
+
+       * tp/Texinfo/XS/gnulib/lib/obstack.h: Add defines using rpl_
+       prefix for gnulib functions.  Investigation and fix by Bruno Haible.
+
+       * tp/Texinfo/XS/parsetexi/tree.c: Revert change from 2023-11-13.
+
 2023-11-14  Gavin Smith <gavinsmith0123@gmail.com>
 
        * tp/Texinfo/command_data.txt
diff --git a/tp/Texinfo/XS/gnulib/lib/obstack.h 
b/tp/Texinfo/XS/gnulib/lib/obstack.h
index cb080c33b5..af8c5ba01c 100644
--- a/tp/Texinfo/XS/gnulib/lib/obstack.h
+++ b/tp/Texinfo/XS/gnulib/lib/obstack.h
@@ -164,6 +164,12 @@
 # endif
 #endif
 
+#define _obstack_begin rpl_obstack_begin
+#define _obstack_newchunk rpl_obstack_newchunk
+#define _obstack_allocated_p rpl_obstack_allocated_p
+#define _obstack_free rpl_obstack_free
+#define _obstack_memory_used rpl_obstack_memory_used
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/tp/Texinfo/XS/parsetexi/tree.c b/tp/Texinfo/XS/parsetexi/tree.c
index 09db6fc151..f2d69e0454 100644
--- a/tp/Texinfo/XS/parsetexi/tree.c
+++ b/tp/Texinfo/XS/parsetexi/tree.c
@@ -43,12 +43,7 @@ reset_obstacks (void)
   if (obs_element_first)
     obstack_free (&obs_element, obs_element_first);
   else
-    {
-      /* Specify 8-byte alignment.  Needed for SPARC. */
-      obstack_alignment_mask (&obs_element) = 7;
-
-      obstack_init (&obs_element);
-    }
+    obstack_init (&obs_element);
 
   obs_element_first = obstack_alloc (&obs_element, sizeof (int));
 }