[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r117929: Merge from gnulib.
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] trunk r117929: Merge from gnulib. |
Date: |
Tue, 23 Sep 2014 18:20:43 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117929
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Tue 2014-09-23 11:20:38 -0700
message:
Merge from gnulib.
This incorporates:
2014-09-11 fcntl-h: fix compilation with Intel C++ compiler
2014-09-04 pthread, pthread_sigmask, threadlib: port to Ubuntu 14.04
modified:
ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1538
lib/fcntl.in.h fcntl.in.h-20121114044639-6884lvvwce8v0sgb-4
m4/pthread_sigmask.m4
pthread_sigmask.m4-20110706175601-0s7lvj1px2jwqvv1-2
=== modified file 'ChangeLog'
--- a/ChangeLog 2014-09-22 19:20:45 +0000
+++ b/ChangeLog 2014-09-23 18:20:38 +0000
@@ -1,3 +1,9 @@
+2014-09-23 Paul Eggert <address@hidden>
+
+ Merge from gnulib, incorporating:
+ 2014-09-11 fcntl-h: fix compilation with Intel C++ compiler
+ 2014-09-04 pthread, pthread_sigmask, threadlib: port to Ubuntu 14.04
+
2014-09-22 Jan Djärv <address@hidden>
* configure.ac: Increase headerpad_extra to 1000, update the comment
=== modified file 'lib/fcntl.in.h'
--- a/lib/fcntl.in.h 2014-06-15 00:06:30 +0000
+++ b/lib/fcntl.in.h 2014-09-23 18:20:38 +0000
@@ -34,7 +34,7 @@
extern "C" { ... } block, which leads to errors in C++ mode with the
overridden <sys/stat.h> from gnulib. These errors are known to be gone
with g++ version >= 4.3. */
-#if !(defined __GLIBC__ || defined __UCLIBC__) || (defined __cplusplus &&
defined GNULIB_NAMESPACE && !(__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__
>= 3)))
+#if !(defined __GLIBC__ || defined __UCLIBC__) || (defined __cplusplus &&
defined GNULIB_NAMESPACE && (defined __ICC || !(__GNUC__ > 4 || (__GNUC__ == 4
&& __GNUC_MINOR__ >= 3))))
# include <sys/stat.h>
#endif
address@hidden@ @NEXT_FCNTL_H@
@@ -53,7 +53,7 @@
extern "C" { ... } block, which leads to errors in C++ mode with the
overridden <sys/stat.h> from gnulib. These errors are known to be gone
with g++ version >= 4.3. */
-#if !(defined __GLIBC__ || defined __UCLIBC__) || (defined __cplusplus &&
defined GNULIB_NAMESPACE && !(__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__
>= 3)))
+#if !(defined __GLIBC__ || defined __UCLIBC__) || (defined __cplusplus &&
defined GNULIB_NAMESPACE && (defined __ICC || !(__GNUC__ > 4 || (__GNUC__ == 4
&& __GNUC_MINOR__ >= 3))))
# include <sys/stat.h>
#endif
/* The include_next requires a split double-inclusion guard. */
=== modified file 'm4/pthread_sigmask.m4'
--- a/m4/pthread_sigmask.m4 2014-05-29 15:05:06 +0000
+++ b/m4/pthread_sigmask.m4 2014-09-23 18:20:38 +0000
@@ -1,4 +1,4 @@
-# pthread_sigmask.m4 serial 14
+# pthread_sigmask.m4 serial 15
dnl Copyright (C) 2011-2014 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -40,7 +40,7 @@
LIBS="$gl_save_LIBS"
])
if test $gl_cv_func_pthread_sigmask_in_LIBMULTITHREAD = yes; then
- dnl pthread_sigmask is available with -lpthread.
+ dnl pthread_sigmask is available with -pthread or -lpthread.
LIB_PTHREAD_SIGMASK="$LIBMULTITHREAD"
else
dnl pthread_sigmask is not available at all.
@@ -86,7 +86,7 @@
AC_SUBST([LIB_PTHREAD_SIGMASK])
dnl We don't need a variable LTLIB_PTHREAD_SIGMASK, because when
dnl "$gl_threads_api" = posix, $LTLIBMULTITHREAD and $LIBMULTITHREAD are the
- dnl same: either both empty or both "-lpthread".
+ dnl same.
dnl Now test for some bugs in the system function.
if test $HAVE_PTHREAD_SIGMASK = 1; then
@@ -98,6 +98,7 @@
dnl no effect.
if test -z "$LIB_PTHREAD_SIGMASK"; then
case " $LIBS " in
+ *' -pthread '*) ;;
*' -lpthread '*) ;;
*)
AC_CACHE_CHECK([whether pthread_sigmask works without -lpthread],
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r117929: Merge from gnulib.,
Paul Eggert <=