aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorPaul Eggert2016-09-20 08:30:17 -0700
committerPaul Eggert2016-09-20 08:32:15 -0700
commitd9741b61c8e446de084cc4dc609aaa8e5702118d (patch)
treebc7dee77f208e70918e0c15aa91eb728f27b0c47 /admin
parent83fbb3a6dd75e01a768cb6b3348b7c947711ee46 (diff)
downloademacs-d9741b61c8e446de084cc4dc609aaa8e5702118d.tar.gz
emacs-d9741b61c8e446de084cc4dc609aaa8e5702118d.zip
Use flexmembers on IBM XL C for AIX
This removes a workaround where Emacs did not use flexible array members when compiled with IBM XL C. Instead, avoid the problem by making the aliasing issues more obvious to this compiler. * admin/merge-gnulib: Don’t remove m4/flexmember.m4. * m4/flexmember.m4: Copy from gnulib. * configure.ac (AC_C_FLEXIBLE_ARRAY_MEMBER): Remove workaround. * src/alloc.c (allocate_string_data): Rephrase to avoid aliasing problem that would otherwise mess up code generated for flexible array members by IBM XL C for AIX, V12.1. * src/conf_post.h (FLEXIBLE_ARRAY_MEMBER): Remove; now done by gnulib code.
Diffstat (limited to 'admin')
-rwxr-xr-xadmin/merge-gnulib2
1 files changed, 1 insertions, 1 deletions
diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index 1e3b7599626..ada80b4ae86 100755
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -93,7 +93,7 @@ test -x "$gnulib_srcdir"/gnulib-tool || {
93} 93}
94 94
95"$gnulib_srcdir"/gnulib-tool --dir="$src" $GNULIB_TOOL_FLAGS $GNULIB_MODULES && 95"$gnulib_srcdir"/gnulib-tool --dir="$src" $GNULIB_TOOL_FLAGS $GNULIB_MODULES &&
96rm -- "$src"lib/gl_openssl.h "$src"m4/fcntl-o.m4 "$src"m4/flexmember.m4 \ 96rm -- "$src"lib/gl_openssl.h "$src"m4/fcntl-o.m4 \
97 "$src"m4/gl-openssl.m4 \ 97 "$src"m4/gl-openssl.m4 \
98 "$src"m4/gnulib-cache.m4"$src" m4/warn-on-use.m4 && 98 "$src"m4/gnulib-cache.m4"$src" m4/warn-on-use.m4 &&
99cp -- "$gnulib_srcdir"/build-aux/texinfo.tex "$src"doc/misc && 99cp -- "$gnulib_srcdir"/build-aux/texinfo.tex "$src"doc/misc &&