Fix unoptimized build on MSDOS.

 msdos/sedlibmk.inp (gl_LIBOBJS): Add execinfo.o.  Reported by Juan
 Manuel Guerrero <juan.guerrero@gmx.de>.

 src/conf_post.h (_GL_EXECINFO_INLINE) [MSDOS]: Don't define.

diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index c40d7295cbd88c639d6d72710963ec6229213ae8..3dd5476910e5b8b15c48fde210762fa754d42a76 100644 (file)
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,8 @@
+2014-08-25  Eli Zaretskii  <eliz@gnu.org>
+
+       * sedlibmk.inp (gl_LIBOBJS): Add execinfo.o.  Reported by Juan
+       Manuel Guerrero <juan.guerrero@gmx.de>.
+
 2014-08-23  Eli Zaretskii  <eliz@gnu.org>
 
        * sed2v2.inp [DJGPP <= 2.03]: Add a prototype for snprintf, to

diff --git a/msdos/sedlibmk.inp b/msdos/sedlibmk.inp
index badb30b0b657d6d9d9f85f0d26512326e23e9a81..b896eadc22d26701f7ceaa95c82a75b64b99d24f 100644 (file)
--- a/msdos/sedlibmk.inp
+++ b/msdos/sedlibmk.inp
@@ -315,6 +315,7 @@ am__cd = cd
 /^BYTESWAP_H *=/s/@[^@\n]*@/byteswap.h/
 /^DIRENT_H *=/s/@[^@\n]*@//
 /^ERRNO_H *=/s/@[^@\n]*@//
+/^EXECINFO_H *=/s/@[^@\n]*@/execinfo.h/
 /^STDBOOL_H *=/s/@[^@\n]*@//
 /^STDALIGN_H *=/s/@[^@\n]*@/stdalign.h/
 /^STDARG_H *=/s/@[^@\n]*@//
@@ -333,7 +334,7 @@ am__cd = cd
 /am__append_[1-9][0-9]* *=.*gettext\.h/s/@[^@\n]*@/\#/
 /am__append_2 *=.*verify\.h/s/@[^@\n]*@//
 /^@gl_GNULIB_ENABLED_tempname_TRUE@/s/@[^@\n]*@//
-/^gl_LIBOBJS *=/s/@[^@\n]*@/getopt.o getopt1.o memrchr.o sig2str.o time_r.o getloadavg.o pthread_sigmask.o mkostemp.o fpending.o fdatasync.o/
+/^gl_LIBOBJS *=/s/@[^@\n]*@/getopt.o getopt1.o memrchr.o sig2str.o time_r.o getloadavg.o pthread_sigmask.o mkostemp.o fpending.o fdatasync.o execinfo.o/
 /^am__append_[1-9][0-9]* *=/,/^[^      ]/{
   s/ *inttypes\.h//
   s| *sys/select\.h||

diff --git a/src/ChangeLog b/src/ChangeLog
index 4c774468e5e865472f6cee89dd881f7f4c71bdb7..8ca95025019ccfff54d60a76c5325845ab3c128a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2014-08-25  Eli Zaretskii  <eliz@gnu.org>
+
+       * conf_post.h (_GL_EXECINFO_INLINE) [MSDOS]: Don't define.
+
 2014-08-18  Eli Zaretskii  <eliz@gnu.org>
 
        * xdisp.c (handle_stop): Improve commentary.

diff --git a/src/conf_post.h b/src/conf_post.h
index 446c827561308603730be5bfd25ec2ad84cd2eb0..386d83f4b1f80286fbecc18f614695c2d54e1ec9 100644 (file)
--- a/src/conf_post.h
+++ b/src/conf_post.h
@@ -126,13 +126,6 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */
    so we could reuse it in readlinkat; see msdos.c.  */
 #define opendir sys_opendir
 
-/* The "portable" definition of _GL_INLINE on config.h does not work
-   with DJGPP GCC 3.4.4: it causes unresolved externals in sysdep.c,
-   although lib/execinfo.h is included and the inline functions there
-   are visible.  */
-#if __GNUC__ < 4
-# define _GL_EXECINFO_INLINE inline
-#endif
 /* End of gnulib-related stuff.  */
 
 #define emacs_raise(sig) msdos_fatal_signal (sig)