aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2014-05-29 08:05:06 -0700
committerPaul Eggert2014-05-29 08:05:06 -0700
commit035159ed54cf2e1abc0439fbb6e628c9223f8e5d (patch)
treee99b3609d60f0bbda83dec913cf46cb5f32e2c6d /src
parent0bbb27fc3f52f87605cfadba62d52b72523b73a5 (diff)
downloademacs-035159ed54cf2e1abc0439fbb6e628c9223f8e5d.tar.gz
emacs-035159ed54cf2e1abc0439fbb6e628c9223f8e5d.zip
Don't substitute sigprocmask for pthread_sigmask.
sigprocmask isn't portable in a multithreaded process. * configure.ac (gl_THREADLIB): Remove dummy. Merge from gnulib, incorporating: 2014-05-28 pthread_sigmask, timer-time: use gl_THREADLIB only if needed * m4/pthread_sigmask.m4, m4/timer_time.m4: Update from gnulib. * src/Makefile.in (LIB_PTHREAD_SIGMASK): Remove; all uses removed. Fixes: debbugs:17561
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/Makefile.in6
2 files changed, 7 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 33b8257cc1c..5189712d490 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12014-05-29 Paul Eggert <eggert@cs.ucla.edu>
2
3 Don't substitute sigprocmask for pthread_sigmask (Bug#17561).
4 * Makefile.in (LIB_PTHREAD_SIGMASK): Remove; all uses removed.
5
12014-05-29 Eli Zaretskii <eliz@gnu.org> 62014-05-29 Eli Zaretskii <eliz@gnu.org>
2 7
3 * buffer.c (init_buffer): Accept an argument 'initialized'. 8 * buffer.c (init_buffer): Accept an argument 'initialized'.
diff --git a/src/Makefile.in b/src/Makefile.in
index 0f4130b4dac..d90e9e0eef3 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -125,7 +125,7 @@ LIBS_SYSTEM=@LIBS_SYSTEM@
125## -lm, or empty. 125## -lm, or empty.
126LIB_MATH=@LIB_MATH@ 126LIB_MATH=@LIB_MATH@
127 127
128## -lpthreads, or empty. 128## -lpthread, or empty.
129LIB_PTHREAD=@LIB_PTHREAD@ 129LIB_PTHREAD=@LIB_PTHREAD@
130 130
131LIBIMAGE=@LIBTIFF@ @LIBJPEG@ @LIBPNG@ @LIBGIF@ @LIBXPM@ 131LIBIMAGE=@LIBTIFF@ @LIBJPEG@ @LIBPNG@ @LIBGIF@ @LIBXPM@
@@ -293,8 +293,6 @@ LIBSELINUX_LIBS = @LIBSELINUX_LIBS@
293LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ 293LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
294LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ 294LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
295 295
296LIB_PTHREAD_SIGMASK = @LIB_PTHREAD_SIGMASK@
297
298INTERVALS_H = dispextern.h intervals.h composite.h 296INTERVALS_H = dispextern.h intervals.h composite.h
299 297
300GETLOADAVG_LIBS = @GETLOADAVG_LIBS@ 298GETLOADAVG_LIBS = @GETLOADAVG_LIBS@
@@ -413,7 +411,7 @@ LIBES = $(LIBS) $(W32_LIBS) $(LIBS_GNUSTEP) $(LIBX_BASE) $(LIBIMAGE) \
413 $(LIBXML2_LIBS) $(LIBGPM) $(LIBRESOLV) $(LIBS_SYSTEM) \ 411 $(LIBXML2_LIBS) $(LIBGPM) $(LIBRESOLV) $(LIBS_SYSTEM) \
414 $(LIBS_TERMCAP) $(GETLOADAVG_LIBS) $(SETTINGS_LIBS) $(LIBSELINUX_LIBS) \ 412 $(LIBS_TERMCAP) $(GETLOADAVG_LIBS) $(SETTINGS_LIBS) $(LIBSELINUX_LIBS) \
415 $(FREETYPE_LIBS) $(FONTCONFIG_LIBS) $(LIBOTF_LIBS) $(M17N_FLT_LIBS) \ 413 $(FREETYPE_LIBS) $(FONTCONFIG_LIBS) $(LIBOTF_LIBS) $(M17N_FLT_LIBS) \
416 $(LIBGNUTLS_LIBS) $(LIB_PTHREAD) $(LIB_PTHREAD_SIGMASK) \ 414 $(LIBGNUTLS_LIBS) $(LIB_PTHREAD) \
417 $(GFILENOTIFY_LIBS) $(LIB_MATH) $(LIBZ) 415 $(GFILENOTIFY_LIBS) $(LIB_MATH) $(LIBZ)
418 416
419all: emacs$(EXEEXT) $(OTHER_FILES) 417all: emacs$(EXEEXT) $(OTHER_FILES)