[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[6242] pretest 5.9.91: gnulib --add-import
|
From: |
karl |
|
Subject: |
[6242] pretest 5.9.91: gnulib --add-import |
|
Date: |
Sun, 03 May 2015 23:27:01 +0000 |
Revision: 6242
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6242
Author: karl
Date: 2015-05-03 23:26:59 +0000 (Sun, 03 May 2015)
Log Message:
-----------
pretest 5.9.91: gnulib --add-import
Modified Paths:
--------------
trunk/build-aux/config.rpath
trunk/gnulib/lib/stddef.in.h
trunk/gnulib/lib/tempname.c
trunk/gnulib/lib/vasnprintf.c
trunk/gnulib/lib/xalloc.h
trunk/gnulib/m4/codeset.m4
trunk/gnulib/m4/extern-inline.m4
trunk/gnulib/m4/intl.m4
trunk/gnulib/m4/intldir.m4
trunk/gnulib/m4/intlmacosx.m4
trunk/gnulib/m4/lcmessage.m4
trunk/gnulib/m4/lib-ld.m4
trunk/gnulib/m4/lib-link.m4
trunk/gnulib/m4/lib-prefix.m4
trunk/gnulib/m4/lstat.m4
trunk/gnulib/m4/progtest.m4
Modified: trunk/build-aux/config.rpath
===================================================================
--- trunk/build-aux/config.rpath 2015-05-03 23:18:07 UTC (rev 6241)
+++ trunk/build-aux/config.rpath 2015-05-03 23:26:59 UTC (rev 6242)
@@ -2,7 +2,7 @@
# Output a system dependent set of variables, describing how to set the
# run time search path of shared libraries in an executable.
#
-# Copyright 1996-2014 Free Software Foundation, Inc.
+# Copyright 1996-2015 Free Software Foundation, Inc.
# Taken from GNU libtool, 2001
# Originally by Gordon Matzigkeit <address@hidden>, 1996
#
Modified: trunk/gnulib/lib/stddef.in.h
===================================================================
--- trunk/gnulib/lib/stddef.in.h 2015-05-03 23:18:07 UTC (rev 6241)
+++ trunk/gnulib/lib/stddef.in.h 2015-05-03 23:26:59 UTC (rev 6242)
@@ -83,12 +83,23 @@
/* Some platforms lack max_align_t. */
#if address@hidden@
+/* On the x86, the maximum storage alignment of double, long, etc. is 4,
+ but GCC's C11 ABI for x86 says that max_align_t has an alignment of 8,
+ and the C11 standard allows this. Work around this problem by
+ using __alignof__ (which returns 8 for double) rather than _Alignof
+ (which returns 4), and align each union member accordingly. */
+# ifdef __GNUC__
+# define _GL_STDDEF_ALIGNAS(type) \
+ __attribute__ ((__aligned__ (__alignof__ (type))))
+# else
+# define _GL_STDDEF_ALIGNAS(type) /* */
+# endif
typedef union
{
- char *__p;
- double __d;
- long double __ld;
- long int __i;
+ char *__p _GL_STDDEF_ALIGNAS (char *);
+ double __d _GL_STDDEF_ALIGNAS (double);
+ long double __ld _GL_STDDEF_ALIGNAS (long double);
+ long int __i _GL_STDDEF_ALIGNAS (long int);
} max_align_t;
#endif
Modified: trunk/gnulib/lib/tempname.c
===================================================================
--- trunk/gnulib/lib/tempname.c 2015-05-03 23:18:07 UTC (rev 6241)
+++ trunk/gnulib/lib/tempname.c 2015-05-03 23:26:59 UTC (rev 6242)
@@ -269,13 +269,13 @@
}
static int
-try_dir (char *tmpl, void *flags)
+try_dir (char *tmpl, void *flags _GL_UNUSED)
{
return __mkdir (tmpl, S_IRUSR | S_IWUSR | S_IXUSR);
}
static int
-try_nocreate (char *tmpl, void *flags)
+try_nocreate (char *tmpl, void *flags _GL_UNUSED)
{
struct_stat64 st;
Modified: trunk/gnulib/lib/vasnprintf.c
===================================================================
--- trunk/gnulib/lib/vasnprintf.c 2015-05-03 23:18:07 UTC (rev 6241)
+++ trunk/gnulib/lib/vasnprintf.c 2015-05-03 23:26:59 UTC (rev 6242)
@@ -1886,7 +1886,7 @@
else
{
do
- result[length++] = (unsigned char) *cp++;
+ result[length++] = *cp++;
while (--n > 0);
}
}
@@ -4793,7 +4793,7 @@
{
const FCHAR_T *mp = dp->width_start;
do
- *fbp++ = (unsigned char) *mp++;
+ *fbp++ = *mp++;
while (--n > 0);
}
}
@@ -4814,7 +4814,7 @@
{
const FCHAR_T *mp = dp->precision_start;
do
- *fbp++ = (unsigned char) *mp++;
+ *fbp++ = *mp++;
while (--n > 0);
}
}
@@ -5382,7 +5382,7 @@
tmpsrc += count;
tmpdst += count;
for (n = count; n > 0; n--)
- *--tmpdst = (unsigned char) *--tmpsrc;
+ *--tmpdst = *--tmpsrc;
}
}
#endif
Modified: trunk/gnulib/lib/xalloc.h
===================================================================
--- trunk/gnulib/lib/xalloc.h 2015-05-03 23:18:07 UTC (rev 6241)
+++ trunk/gnulib/lib/xalloc.h 2015-05-03 23:26:59 UTC (rev 6242)
@@ -41,7 +41,8 @@
# define _GL_ATTRIBUTE_MALLOC
#endif
-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)
+#if ! defined __clang__ && \
+ (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3))
# define _GL_ATTRIBUTE_ALLOC_SIZE(args) __attribute__ ((__alloc_size__ args))
#else
# define _GL_ATTRIBUTE_ALLOC_SIZE(args)
Modified: trunk/gnulib/m4/codeset.m4
===================================================================
--- trunk/gnulib/m4/codeset.m4 2015-05-03 23:18:07 UTC (rev 6241)
+++ trunk/gnulib/m4/codeset.m4 2015-05-03 23:26:59 UTC (rev 6242)
@@ -1,5 +1,5 @@
# codeset.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2000-2002, 2006, 2008-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2000-2002, 2006, 2008-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,
dnl with or without modifications, as long as this notice is preserved.
Modified: trunk/gnulib/m4/extern-inline.m4
===================================================================
--- trunk/gnulib/m4/extern-inline.m4 2015-05-03 23:18:07 UTC (rev 6241)
+++ trunk/gnulib/m4/extern-inline.m4 2015-05-03 23:26:59 UTC (rev 6242)
@@ -74,12 +74,13 @@
# define _GL_EXTERN_INLINE static _GL_UNUSED
#endif
-/* In GCC, suppress bogus "no previous prototype for 'FOO'"
+/* In GCC 4.6 (inclusive) to 5.1 (exclusive),
+ suppress bogus "no previous prototype for 'FOO'"
and "no previous declaration for 'FOO'" diagnostics,
when FOO is an inline function in the header; see
<https://gcc.gnu.org/bugzilla/show_bug.cgi?id=54113> and
<https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63877>. */
-#if 4 < __GNUC__ + (6 <= __GNUC_MINOR__)
+#if __GNUC__ == 4 && 6 <= __GNUC_MINOR__
# if defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__
# define _GL_INLINE_HEADER_CONST_PRAGMA
# else
Modified: trunk/gnulib/m4/intl.m4
===================================================================
--- trunk/gnulib/m4/intl.m4 2015-05-03 23:18:07 UTC (rev 6241)
+++ trunk/gnulib/m4/intl.m4 2015-05-03 23:26:59 UTC (rev 6242)
@@ -1,5 +1,5 @@
-# intl.m4 serial 27 (gettext-0.18.3)
-dnl Copyright (C) 1995-2015 Free Software Foundation, Inc.
+# intl.m4 serial 28 (gettext-0.19)
+dnl Copyright (C) 1995-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,
dnl with or without modifications, as long as this notice is preserved.
@@ -42,6 +42,8 @@
AC_REQUIRE([gl_XSIZE])dnl
AC_REQUIRE([gl_FCNTL_O_FLAGS])dnl
AC_REQUIRE([gt_INTL_MACOSX])dnl
+ AC_REQUIRE([gl_EXTERN_INLINE])dnl
+ AC_REQUIRE([gt_GL_ATTRIBUTE])dnl
dnl Support for automake's --enable-silent-rules.
case "$enable_silent_rules" in
@@ -240,8 +242,7 @@
dnl intl/plural.c is generated from intl/plural.y. It requires bison,
dnl because plural.y uses bison specific features. It requires at least
- dnl bison-1.26 because earlier versions generate a plural.c that doesn't
- dnl compile.
+ dnl bison-2.7 for %define api.pure.
dnl bison is only needed for the maintainer (who touches plural.y). But in
dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
dnl the rule in general Makefile. Now, some people carelessly touch the
@@ -258,7 +259,7 @@
ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.*
\([0-9]*\.[0-9.]*\).*$/\1/p'`
case $ac_prog_version in
'') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
- 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
+ 2.[7-9]* | [3-9].*)
changequote([,])dnl
ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
*) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
@@ -269,3 +270,29 @@
INTLBISON=:
fi
])
+
+dnl Copies _GL_UNUSED and _GL_ATTRIBUTE_PURE definitions from
+dnl gnulib-common.m4 as a fallback, if the project isn't using Gnulib.
+AC_DEFUN([gt_GL_ATTRIBUTE], [
+ m4_ifndef([gl_[]COMMON],
+ AH_VERBATIM([gt_gl_attribute],
+[/* Define as a marker that can be attached to declarations that might not
+ be used. This helps to reduce warnings, such as from
+ GCC -Wunused-parameter. */
+#ifndef _GL_UNUSED
+# if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
+# define _GL_UNUSED __attribute__ ((__unused__))
+# else
+# define _GL_UNUSED
+# endif
+#endif
+
+/* The __pure__ attribute was added in gcc 2.96. */
+#ifndef _GL_ATTRIBUTE_PURE
+# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
+# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__))
+# else
+# define _GL_ATTRIBUTE_PURE /* empty */
+# endif
+#endif
+]))])
Modified: trunk/gnulib/m4/intldir.m4
===================================================================
--- trunk/gnulib/m4/intldir.m4 2015-05-03 23:18:07 UTC (rev 6241)
+++ trunk/gnulib/m4/intldir.m4 2015-05-03 23:26:59 UTC (rev 6242)
@@ -1,5 +1,5 @@
# intldir.m4 serial 2 (gettext-0.18)
-dnl Copyright (C) 2006, 2009-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2006, 2009-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,
dnl with or without modifications, as long as this notice is preserved.
Modified: trunk/gnulib/m4/intlmacosx.m4
===================================================================
--- trunk/gnulib/m4/intlmacosx.m4 2015-05-03 23:18:07 UTC (rev 6241)
+++ trunk/gnulib/m4/intlmacosx.m4 2015-05-03 23:26:59 UTC (rev 6242)
@@ -1,5 +1,5 @@
# intlmacosx.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2004-2015 Free Software Foundation, Inc.
+dnl Copyright (C) 2004-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,
dnl with or without modifications, as long as this notice is preserved.
Modified: trunk/gnulib/m4/lcmessage.m4
===================================================================
--- trunk/gnulib/m4/lcmessage.m4 2015-05-03 23:18:07 UTC (rev 6241)
+++ trunk/gnulib/m4/lcmessage.m4 2015-05-03 23:26:59 UTC (rev 6242)
@@ -1,5 +1,5 @@
# lcmessage.m4 serial 7 (gettext-0.18.2)
-dnl Copyright (C) 1995-2002, 2004-2005, 2008-2015 Free Software Foundation,
+dnl Copyright (C) 1995-2002, 2004-2005, 2008-2014 Free Software Foundation,
dnl Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
Modified: trunk/gnulib/m4/lib-ld.m4
===================================================================
--- trunk/gnulib/m4/lib-ld.m4 2015-05-03 23:18:07 UTC (rev 6241)
+++ trunk/gnulib/m4/lib-ld.m4 2015-05-03 23:26:59 UTC (rev 6242)
@@ -1,5 +1,5 @@
# lib-ld.m4 serial 6
-dnl Copyright (C) 1996-2003, 2009-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 1996-2003, 2009-2015 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
Modified: trunk/gnulib/m4/lib-link.m4
===================================================================
--- trunk/gnulib/m4/lib-link.m4 2015-05-03 23:18:07 UTC (rev 6241)
+++ trunk/gnulib/m4/lib-link.m4 2015-05-03 23:26:59 UTC (rev 6242)
@@ -1,5 +1,5 @@
# lib-link.m4 serial 26 (gettext-0.18.2)
-dnl Copyright (C) 2001-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2015 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
Modified: trunk/gnulib/m4/lib-prefix.m4
===================================================================
--- trunk/gnulib/m4/lib-prefix.m4 2015-05-03 23:18:07 UTC (rev 6241)
+++ trunk/gnulib/m4/lib-prefix.m4 2015-05-03 23:26:59 UTC (rev 6242)
@@ -1,5 +1,5 @@
# lib-prefix.m4 serial 7 (gettext-0.18)
-dnl Copyright (C) 2001-2005, 2008-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2005, 2008-2015 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
Modified: trunk/gnulib/m4/lstat.m4
===================================================================
--- trunk/gnulib/m4/lstat.m4 2015-05-03 23:18:07 UTC (rev 6241)
+++ trunk/gnulib/m4/lstat.m4 2015-05-03 23:26:59 UTC (rev 6242)
@@ -1,4 +1,4 @@
-# serial 26
+# serial 27
# Copyright (C) 1997-2001, 2003-2015 Free Software Foundation, Inc.
#
@@ -37,30 +37,28 @@
[gl_cv_func_lstat_dereferences_slashed_symlink],
[rm -f conftest.sym conftest.file
echo >conftest.file
- if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then
- AC_RUN_IFELSE(
- [AC_LANG_PROGRAM(
- [AC_INCLUDES_DEFAULT],
- [[struct stat sbuf;
- /* Linux will dereference the symlink and fail, as required by
- POSIX. That is better in the sense that it means we will not
- have to compile and use the lstat wrapper. */
- return lstat ("conftest.sym/", &sbuf) == 0;
- ]])],
- [gl_cv_func_lstat_dereferences_slashed_symlink=yes],
- [gl_cv_func_lstat_dereferences_slashed_symlink=no],
- [case "$host_os" in
- # Guess yes on glibc systems.
- *-gnu*) gl_cv_func_lstat_dereferences_slashed_symlink="guessing
yes" ;;
- # If we don't know, assume the worst.
- *) gl_cv_func_lstat_dereferences_slashed_symlink="guessing
no" ;;
- esac
- ])
- else
- # If the 'ln -s' command failed, then we probably don't even
- # have an lstat function.
- gl_cv_func_lstat_dereferences_slashed_symlink="guessing no"
- fi
+ AC_RUN_IFELSE(
+ [AC_LANG_PROGRAM(
+ [AC_INCLUDES_DEFAULT],
+ [[struct stat sbuf;
+ if (symlink ("conftest.file", "conftest.sym") != 0)
+ return 1;
+ /* Linux will dereference the symlink and fail, as required by
+ POSIX. That is better in the sense that it means we will not
+ have to compile and use the lstat wrapper. */
+ return lstat ("conftest.sym/", &sbuf) == 0;
+ ]])],
+ [gl_cv_func_lstat_dereferences_slashed_symlink=yes],
+ [gl_cv_func_lstat_dereferences_slashed_symlink=no],
+ [case "$host_os" in
+ *-gnu*)
+ # Guess yes on glibc systems.
+ gl_cv_func_lstat_dereferences_slashed_symlink="guessing yes" ;;
+ *)
+ # If we don't know, assume the worst.
+ gl_cv_func_lstat_dereferences_slashed_symlink="guessing no" ;;
+ esac
+ ])
rm -f conftest.sym conftest.file
])
case "$gl_cv_func_lstat_dereferences_slashed_symlink" in
Modified: trunk/gnulib/m4/progtest.m4
===================================================================
--- trunk/gnulib/m4/progtest.m4 2015-05-03 23:18:07 UTC (rev 6241)
+++ trunk/gnulib/m4/progtest.m4 2015-05-03 23:26:59 UTC (rev 6242)
@@ -1,5 +1,5 @@
# progtest.m4 serial 7 (gettext-0.18.2)
-dnl Copyright (C) 1996-2003, 2005, 2008-2014 Free Software Foundation, Inc.
+dnl Copyright (C) 1996-2003, 2005, 2008-2015 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [6242] pretest 5.9.91: gnulib --add-import,
karl <=