[Emacs-diffs] emacs-24 r117457: Fix unoptimized build on MSDOS.

[Eli Zaretskii]

------------------------------------------------------------
revno: 117457
revision-id: address@hidden
parent: address@hidden
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-24
timestamp: Mon 2014-08-25 20:44:27 +0300
message:
  Fix unoptimized build on MSDOS.
  
   msdos/sedlibmk.inp (gl_LIBOBJS): Add execinfo.o.  Reported by Juan
   Manuel Guerrero <address@hidden>.
  
   src/conf_post.h (_GL_EXECINFO_INLINE) [MSDOS]: Don't define.
modified:
  msdos/ChangeLog                changelog-20091113204419-o5vbwnq5f7feedwu-1535
  msdos/sedlibmk.inp             sedlibmk.inp-20110219160449-wt33nubk11e3gf7o-2
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/conf_post.h                conf_post.h-20120730211826-q0qbxxwh2emw52hd-1

=== modified file 'msdos/ChangeLog'
--- a/msdos/ChangeLog   2014-08-23 08:22:46 +0000
+++ b/msdos/ChangeLog   2014-08-25 17:44:27 +0000
@@ -1,3 +1,8 @@
+2014-08-25  Eli Zaretskii  <address@hidden>
+
+       * sedlibmk.inp (gl_LIBOBJS): Add execinfo.o.  Reported by Juan
+       Manuel Guerrero <address@hidden>.
+
 2014-08-23  Eli Zaretskii  <address@hidden>
 
        * sed2v2.inp [DJGPP <= 2.03]: Add a prototype for snprintf, to

=== modified file 'msdos/sedlibmk.inp'
--- a/msdos/sedlibmk.inp        2014-04-16 13:27:28 +0000
+++ b/msdos/sedlibmk.inp        2014-08-25 17:44:27 +0000
@@ -315,6 +315,7 @@
 /^BYTESWAP_H *=/s/@address@hidden@/byteswap.h/
 /^DIRENT_H *=/s/@address@hidden@//
 /^ERRNO_H *=/s/@address@hidden@//
+/^EXECINFO_H *=/s/@address@hidden@/execinfo.h/
 /^STDBOOL_H *=/s/@address@hidden@//
 /^STDALIGN_H *=/s/@address@hidden@/stdalign.h/
 /^STDARG_H *=/s/@address@hidden@//
@@ -333,7 +334,7 @@
 /am__append_[1-9][0-9]* *=.*gettext\.h/s/@address@hidden@/\#/
 /am__append_2 *=.*verify\.h/s/@address@hidden@//
 /address@hidden@/s/@address@hidden@//
-/^gl_LIBOBJS *=/s/@address@hidden@/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/@address@hidden@/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||

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-08-18 15:38:56 +0000
+++ b/src/ChangeLog     2014-08-25 17:44:27 +0000
@@ -1,3 +1,7 @@
+2014-08-25  Eli Zaretskii  <address@hidden>
+
+       * conf_post.h (_GL_EXECINFO_INLINE) [MSDOS]: Don't define.
+
 2014-08-18  Eli Zaretskii  <address@hidden>
 
        * xdisp.c (handle_stop): Improve commentary.

=== modified file 'src/conf_post.h'
--- a/src/conf_post.h   2014-05-30 20:19:29 +0000
+++ b/src/conf_post.h   2014-08-25 17:44:27 +0000
@@ -126,13 +126,6 @@
    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)