[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r117643: Merge from gnulib, incorporating:
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] trunk r117643: Merge from gnulib, incorporating: |
Date: |
Mon, 04 Aug 2014 18:44:57 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117643
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Mon 2014-08-04 11:44:49 -0700
message:
Merge from gnulib, incorporating:
2014-08-04 extern-inline: port to FreeBSD, DragonFly
* lib/gnulib.mk: Regenerate (comment change only).
* m4/extern-inline.m4: Update from gnulib.
modified:
ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1538
lib/gnulib.mk gnulib.mk-20110108211121-3ig4un4ogtyyca3s-7
m4/extern-inline.m4
externinline.m4-20120802044541-is9k4clv7vxbxmzw-4
=== modified file 'ChangeLog'
--- a/ChangeLog 2014-08-02 21:50:13 +0000
+++ b/ChangeLog 2014-08-04 18:44:49 +0000
@@ -1,3 +1,10 @@
+2014-08-04 Paul Eggert <address@hidden>
+
+ Merge from gnulib, incorporating:
+ 2014-08-04 extern-inline: port to FreeBSD, DragonFly
+ * lib/gnulib.mk: Regenerate (comment change only).
+ * m4/extern-inline.m4: Update from gnulib.
+
2014-08-02 Paul Eggert <address@hidden>
* configure.ac (HAVE_TIMERFD): Also check for TFD_NONBLOCK,
=== modified file 'lib/gnulib.mk'
--- a/lib/gnulib.mk 2014-05-17 08:11:31 +0000
+++ b/lib/gnulib.mk 2014-08-04 18:44:49 +0000
@@ -21,7 +21,7 @@
# the same distribution terms as the rest of that program.
#
# Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib
--m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux
--avoid=close --avoid=dup --avoid=fchdir --avoid=fstat --avoid=malloc-posix
--avoid=msvc-inval --avoid=msvc-nothrow --avoid=open --avoid=openat-die
--avoid=opendir --avoid=raise --avoid=save-cwd --avoid=select
--avoid=sigprocmask --avoid=stdarg --avoid=stdbool --avoid=threadlib
--makefile-name=gnulib.mk --conditional-dependencies --no-libtool
--macro-prefix=gl --no-vc-files alloca-opt byteswap c-ctype c-strcase
careadlinkat close-stream count-one-bits count-trailing-zeros crypto/md5
crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dtotimespec dup2 environ
execinfo faccessat fcntl fcntl-h fdatasync fdopendir filemode fstatat fsync
getloadavg getopt-gnu gettime gettimeofday intprops largefile lstat
manywarnings memrchr mkostemp mktime pipe2 pselect pthread_sigmask putenv qacl
readlink readlinkat sig2str socklen stat-time stdalign stdio strftime strtoimax
strtoumax symlink sys_stat sys_time time timer-time timespec-add timespec-sub
unsetenv update-copyright utimens warnings
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib
--m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux
--avoid=close --avoid=dup --avoid=fchdir --avoid=fstat --avoid=malloc-posix
--avoid=msvc-inval --avoid=msvc-nothrow --avoid=open --avoid=openat-die
--avoid=opendir --avoid=raise --avoid=save-cwd --avoid=select
--avoid=sigprocmask --avoid=stdarg --avoid=stdbool --avoid=threadlib
--makefile-name=gnulib.mk --conditional-dependencies --no-libtool
--macro-prefix=gl --no-vc-files alloca-opt binary-io byteswap c-ctype c-strcase
careadlinkat close-stream count-one-bits count-trailing-zeros crypto/md5
crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dtotimespec dup2 environ
execinfo faccessat fcntl fcntl-h fdatasync fdopendir filemode fstatat fsync
getloadavg getopt-gnu gettime gettimeofday intprops largefile lstat
manywarnings memrchr mkostemp mktime pipe2 pselect pthread_sigmask putenv qacl
readlink readlinkat sig2str socklen stat-time stdalign stdio strftime strtoimax
strtoumax symlink sys_stat sys_time time timer-time timespec-add timespec-sub
unsetenv update-copyright utimens warnings
MOSTLYCLEANFILES += core *.stackdump
=== modified file 'm4/extern-inline.m4'
--- a/m4/extern-inline.m4 2014-01-01 07:43:34 +0000
+++ b/m4/extern-inline.m4 2014-08-04 18:44:49 +0000
@@ -19,13 +19,28 @@
'reference to static identifier "f" in extern inline function'.
This bug was observed with Sun C 5.12 SunOS_i386 2011/11/16.
- Suppress the use of extern inline on problematic Apple configurations.
- OS X 10.8 and earlier mishandle it; see, e.g.,
- <http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html>.
+ Suppress extern inline (with or without __attribute__ ((__gnu_inline__)))
+ on configurations that mistakenly use 'static inline' to implement
+ functions or macros in standard C headers like <ctype.h>. For example,
+ if isdigit is mistakenly implemented via a static inline function,
+ a program containing an extern inline function that calls isdigit
+ may not work since the C standard prohibits extern inline functions
+ from calling static functions. This bug is known to occur on:
+
+ OS X 10.8 and earlier; see:
+ http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html
+
+ DragonFly; see
+
http://muscles.dragonflybsd.org/bulk/bleeding-edge-potential/latest-per-pkg/ah-tty-0.3.12.log
+
+ FreeBSD; see:
+ http://lists.gnu.org/archive/html/bug-gnulib/2014-07/msg00104.html
+
OS X 10.9 has a macro __header_inline indicating the bug is fixed for C and
for clang but remains for g++; see <http://trac.macports.org/ticket/41033>.
- Perhaps Apple will fix this some day. */
-#if (defined __APPLE__ \
+ Assume DragonFly and FreeBSD will be similar. */
+#if (((defined __APPLE__ && defined __MACH__) \
+ || defined __DragonFly__ || defined __FreeBSD__) \
&& (defined __header_inline \
? (defined __cplusplus && defined __GNUC_STDC_INLINE__ \
&& ! defined __clang__) \
@@ -33,19 +48,19 @@
&& (defined __GNUC__ || defined __cplusplus)) \
|| (defined _FORTIFY_SOURCE && 0 < _FORTIFY_SOURCE \
&& defined __GNUC__ && ! defined __cplusplus))))
-# define _GL_EXTERN_INLINE_APPLE_BUG
+# define _GL_EXTERN_INLINE_STDHEADER_BUG
#endif
#if ((__GNUC__ \
? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \
: (199901L <= __STDC_VERSION__ \
&& !defined __HP_cc \
&& !(defined __SUNPRO_C && __STDC__))) \
- && !defined _GL_EXTERN_INLINE_APPLE_BUG)
+ && !defined _GL_EXTERN_INLINE_STDHEADER_BUG)
# define _GL_INLINE inline
# define _GL_EXTERN_INLINE extern inline
# define _GL_EXTERN_INLINE_IN_USE
#elif (2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __STRICT_ANSI__ \
- && !defined _GL_EXTERN_INLINE_APPLE_BUG)
+ && !defined _GL_EXTERN_INLINE_STDHEADER_BUG)
# if defined __GNUC_GNU_INLINE__ && __GNUC_GNU_INLINE__
/* __gnu_inline__ suppresses a GCC 4.2 diagnostic. */
# define _GL_INLINE extern inline __attribute__ ((__gnu_inline__))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r117643: Merge from gnulib, incorporating:,
Paul Eggert <=