This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch hjl/pr19463 created. glibc-2.22-673-g3e9418a
- From: hjl at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 14 Jan 2016 17:48:45 -0000
- Subject: GNU C Library master sources branch hjl/pr19463 created. glibc-2.22-673-g3e9418a
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, hjl/pr19463 has been created
at 3e9418ac915a1557007b3f2c7643635a97252f5f (commit)
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=3e9418ac915a1557007b3f2c7643635a97252f5f
commit 3e9418ac915a1557007b3f2c7643635a97252f5f
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Thu Jan 14 06:43:38 2016 -0800
Add libc_feclearexcept_env
diff --git a/include/fenv.h b/include/fenv.h
index de4d46f..c728d69 100644
--- a/include/fenv.h
+++ b/include/fenv.h
@@ -42,6 +42,20 @@ struct rm_ctx
fenv_t env;
bool updated_status;
};
+
+/* Clear the supported exceptions represented by EXCEPTS and update the
+ exceptions in the floating-point environment in the object pointed
+ to by ENVP.. */
+static __always_inline int
+default_libc_feclearexcept_env (fenv_t *env __attribute__ ((unused)),
+ int excepts)
+{
+ return feclearexcept (excepts);
+}
+
+# ifndef libc_feclearexcept_env
+# define libc_feclearexcept_env default_libc_feclearexcept_env
+# endif
#endif
#endif
diff --git a/sysdeps/i386/fpu/fenv_private.h b/sysdeps/i386/fpu/fenv_private.h
index e20e1f1..76f9801 100644
--- a/sysdeps/i386/fpu/fenv_private.h
+++ b/sysdeps/i386/fpu/fenv_private.h
@@ -214,6 +214,13 @@ libc_feupdateenv_387 (fenv_t *e)
libc_feupdateenv_test_387 (e, 0);
}
+static __always_inline int
+libc_feclearexcept_env_sse (fenv_t *e, int excepts)
+{
+ e->__mxcsr &= ~excepts;
+ return feclearexcept (excepts);
+}
+
static __always_inline void
libc_feholdsetround_sse (fenv_t *e, int r)
{
@@ -273,6 +280,8 @@ libc_feresetround_387 (fenv_t *e)
# define libc_feupdateenvf libc_feupdateenv_sse
# define libc_feholdsetroundf libc_feholdsetround_sse
# define libc_feresetroundf libc_feresetround_sse
+# undef libc_feclearexcept_env
+# define libc_feclearexcept_env libc_feclearexcept_env_sse
#else
# define libc_feholdexceptf libc_feholdexcept_387
# define libc_fesetroundf libc_fesetround_387
diff --git a/sysdeps/ieee754/dbl-64/s_fma.c b/sysdeps/ieee754/dbl-64/s_fma.c
index bc3677d..b33d014 100644
--- a/sysdeps/ieee754/dbl-64/s_fma.c
+++ b/sysdeps/ieee754/dbl-64/s_fma.c
@@ -201,7 +201,7 @@ __fma (double x, double y, double z)
/* Ensure the arithmetic is not scheduled after feclearexcept call. */
math_force_eval (m2);
math_force_eval (a2);
- feclearexcept (FE_INEXACT);
+ libc_feclearexcept_env (&env, FE_INEXACT);
/* If the result is an exact zero, ensure it has the correct sign. */
if (a1 == 0 && m2 == 0)
diff --git a/sysdeps/ieee754/ldbl-128/s_fmal.c b/sysdeps/ieee754/ldbl-128/s_fmal.c
index ac30027..f819817 100644
--- a/sysdeps/ieee754/ldbl-128/s_fmal.c
+++ b/sysdeps/ieee754/ldbl-128/s_fmal.c
@@ -206,7 +206,7 @@ __fmal (long double x, long double y, long double z)
/* Ensure the arithmetic is not scheduled after feclearexcept call. */
math_force_eval (m2);
math_force_eval (a2);
- feclearexcept (FE_INEXACT);
+ libc_feclearexcept_env (&env, FE_INEXACT);
/* If the result is an exact zero, ensure it has the correct sign. */
if (a1 == 0 && m2 == 0)
diff --git a/sysdeps/ieee754/ldbl-96/s_fma.c b/sysdeps/ieee754/ldbl-96/s_fma.c
index 5fbdda7..b678c74 100644
--- a/sysdeps/ieee754/ldbl-96/s_fma.c
+++ b/sysdeps/ieee754/ldbl-96/s_fma.c
@@ -68,7 +68,7 @@ __fma (double x, double y, double z)
/* Ensure the arithmetic is not scheduled after feclearexcept call. */
math_force_eval (m2);
math_force_eval (a2);
- feclearexcept (FE_INEXACT);
+ libc_feclearexcept_env (&env, FE_INEXACT);
/* If the result is an exact zero, ensure it has the correct sign. */
if (a1 == 0 && m2 == 0)
diff --git a/sysdeps/ieee754/ldbl-96/s_fmal.c b/sysdeps/ieee754/ldbl-96/s_fmal.c
index 57774cf..ce674da 100644
--- a/sysdeps/ieee754/ldbl-96/s_fmal.c
+++ b/sysdeps/ieee754/ldbl-96/s_fmal.c
@@ -204,7 +204,7 @@ __fmal (long double x, long double y, long double z)
/* Ensure the arithmetic is not scheduled after feclearexcept call. */
math_force_eval (m2);
math_force_eval (a2);
- feclearexcept (FE_INEXACT);
+ libc_feclearexcept_env (&env, FE_INEXACT);
/* If the result is an exact zero, ensure it has the correct sign. */
if (a1 == 0 && m2 == 0)
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=e8ee7fd23c82217620df3eb622f2d71cf6588802
commit e8ee7fd23c82217620df3eb622f2d71cf6588802
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Thu Jan 14 04:15:03 2016 -0800
Use TIME_T_MAX and TIME_T_MIN in tst-mktime2.c
GCC 5.3 compiles
for (time_t_max = 1; 0 < time_t_max; time_t_max *= 2)
continue;
into an infinite loop with -Os. We can copy TIME_T_MAX and TIME_T_MIN
from time/mktime.c.
[BZ #19466]
* time/tst-mktime2.c (TYPE_SIGNED): New.
(TYPE_MINIMUM): Likewise.
(TYPE_MAXIMUM): Likewise.
(TIME_T_MIN): Likewise.
(TIME_T_MAX): Likewise.
(do_test): Initialize time_t_max and time_t_min with TIME_T_MAX
and TIME_T_MIN.
diff --git a/time/tst-mktime2.c b/time/tst-mktime2.c
index bc7cc58..fd40ab7 100644
--- a/time/tst-mktime2.c
+++ b/time/tst-mktime2.c
@@ -5,6 +5,29 @@
#include <stdlib.h>
#include <unistd.h>
+/* True if the arithmetic type T is signed. */
+#define TYPE_SIGNED(t) (! ((t) 0 < (t) -1))
+
+/* The maximum and minimum values for the integer type T. These
+ macros have undefined behavior if T is signed and has padding bits.
+ If this is a problem for you, please let us know how to fix it for
+ your host. */
+#define TYPE_MINIMUM(t) \
+ ((t) (! TYPE_SIGNED (t) \
+ ? (t) 0 \
+ : ~ TYPE_MAXIMUM (t)))
+#define TYPE_MAXIMUM(t) \
+ ((t) (! TYPE_SIGNED (t) \
+ ? (t) -1 \
+ : ((((t) 1 << (sizeof (t) * CHAR_BIT - 2)) - 1) * 2 + 1)))
+
+#ifndef TIME_T_MIN
+# define TIME_T_MIN TYPE_MINIMUM (time_t)
+#endif
+#ifndef TIME_T_MAX
+# define TIME_T_MAX TYPE_MAXIMUM (time_t)
+#endif
+
static time_t time_t_max;
static time_t time_t_min;
@@ -113,12 +136,8 @@ do_test (void)
isn't worth using anyway. */
alarm (60);
- for (time_t_max = 1; 0 < time_t_max; time_t_max *= 2)
- continue;
- time_t_max--;
- if ((time_t) -1 < 0)
- for (time_t_min = -1; (time_t) (time_t_min * 2) < 0; time_t_min *= 2)
- continue;
+ time_t_max = TIME_T_MAX;
+ time_t_min = TIME_T_MIN;
delta = time_t_max / 997; /* a suitable prime number */
for (i = 0; i < N_STRINGS; i++)
{
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=9c66ecc2e8d7e746f46834d92e8a06b983fea63a
commit 9c66ecc2e8d7e746f46834d92e8a06b983fea63a
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Wed Jan 13 15:03:46 2016 -0800
Avoid strdup/strndup/strsep
diff --git a/include/string.h b/include/string.h
index a684fd9..1734d36 100644
--- a/include/string.h
+++ b/include/string.h
@@ -68,6 +68,12 @@ extern __typeof (strncasecmp_l) __strncasecmp_l;
__new[__len] = '\0'; \
(char *) memcpy (__new, __old, __len); \
}))
+
+# ifdef __OPTIMIZE_SIZE__
+# define strdup(s) __strdup ((s))
+# define strndup(s, n) __strndup ((s), (n))
+# define strsep(s, d) __strsep ((s), (d))
+# endif
#endif
libc_hidden_proto (__mempcpy)
@@ -96,6 +102,7 @@ libc_hidden_proto (memmem)
extern __typeof (memmem) __memmem;
libc_hidden_proto (__memmem)
libc_hidden_proto (__ffs)
+libc_hidden_proto (__strsep)
libc_hidden_builtin_proto (memchr)
libc_hidden_builtin_proto (memcpy)
diff --git a/string/strsep.c b/string/strsep.c
index 1054774..1d98885 100644
--- a/string/strsep.c
+++ b/string/strsep.c
@@ -66,4 +66,5 @@ __strsep (char **stringp, const char *delim)
}
weak_alias (__strsep, strsep)
strong_alias (__strsep, __strsep_g)
+libc_hidden_def (__strsep)
libc_hidden_def (__strsep_g)
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=d2da95de19cb3a3333fc82853b00701fe31c3172
commit d2da95de19cb3a3333fc82853b00701fe31c3172
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Wed Jan 13 14:10:34 2016 -0800
Allow inline in sys/sysmacros.h when building glibc
diff --git a/sysdeps/unix/sysv/linux/sys/sysmacros.h b/sysdeps/unix/sysv/linux/sys/sysmacros.h
index 4c4a697..f9e2696 100644
--- a/sysdeps/unix/sysv/linux/sys/sysmacros.h
+++ b/sysdeps/unix/sysv/linux/sys/sysmacros.h
@@ -34,7 +34,7 @@ extern unsigned long long int gnu_dev_makedev (unsigned int __major,
unsigned int __minor)
__THROW __attribute_const__;
-#ifdef __USE_EXTERN_INLINES
+#if defined __USE_EXTERN_INLINES || defined _LIBC
__extension__ __extern_inline __attribute_const__ unsigned int
__NTH (gnu_dev_major (unsigned long long int __dev))
{
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=5a760a8e4e927e59345838eeabb0458df7f0968e
commit 5a760a8e4e927e59345838eeabb0458df7f0968e
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Wed Jan 13 13:31:34 2016 -0800
Include <bits/stdio.h> when building glibc
diff --git a/libio/bits/stdio.h b/libio/bits/stdio.h
index df57e7c..0c60296 100644
--- a/libio/bits/stdio.h
+++ b/libio/bits/stdio.h
@@ -27,7 +27,7 @@
#endif
-#ifdef __USE_EXTERN_INLINES
+#if defined __USE_EXTERN_INLINES || defined _LIBC
/* For -D_FORTIFY_SOURCE{,=2} bits/stdio2.h will define a different
inline. */
# if !(__USE_FORTIFY_LEVEL > 0 && defined __fortify_function)
@@ -138,7 +138,8 @@ __NTH (ferror_unlocked (FILE *__stream))
#endif /* Use extern inlines. */
-#if defined __USE_MISC && defined __GNUC__ && defined __OPTIMIZE__ \
+#if defined __USE_MISC && defined __GNUC__ \
+ && defined __OPTIMIZE__ && !defined __OPTIMIZE_SIZE__ \
&& !defined __cplusplus
/* Perform some simple optimizations. */
# define fread_unlocked(ptr, size, n, stream) \
diff --git a/libio/stdio.h b/libio/stdio.h
index d8d7fa0..44738a4 100644
--- a/libio/stdio.h
+++ b/libio/stdio.h
@@ -929,7 +929,7 @@ extern void funlockfile (FILE *__stream) __THROW;
/* If we are compiling with optimizing read this file. It contains
several optimizing inline functions and macros. */
-#ifdef __USE_EXTERN_INLINES
+#if defined __USE_EXTERN_INLINES || defined _LIBC
# include <bits/stdio.h>
#endif
#if __USE_FORTIFY_LEVEL > 0 && defined __fortify_function
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=7f77f3a8eba7cce62170adb2da4cda568d551bda
commit 7f77f3a8eba7cce62170adb2da4cda568d551bda
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Wed Jan 13 17:26:00 2016 -0800
Add bits/string-1.h
diff --git a/bits/string.h b/bits/string.h
index b88a6bc..faa6870 100644
--- a/bits/string.h
+++ b/bits/string.h
@@ -8,7 +8,4 @@
#ifndef _BITS_STRING_H
#define _BITS_STRING_H 1
-/* Define if architecture can access unaligned multi-byte variables. */
-#define _STRING_ARCH_unaligned 0
-
#endif /* bits/string.h */
diff --git a/string/Makefile b/string/Makefile
index 9c87419..96dbf1e 100644
--- a/string/Makefile
+++ b/string/Makefile
@@ -24,7 +24,7 @@ include ../Makeconfig
headers := string.h strings.h memory.h endian.h bits/endian.h \
argz.h envz.h byteswap.h bits/byteswap.h bits/byteswap-16.h \
- bits/string.h bits/string2.h bits/string3.h
+ bits/string-1.h bits/string.h bits/string2.h bits/string3.h
routines := strcat strchr strcmp strcoll strcpy strcspn \
strverscmp strdup strndup \
diff --git a/sysdeps/m68k/m680x0/m68020/bits/string.h b/string/bits/string-1.h
similarity index 63%
rename from sysdeps/m68k/m680x0/m68020/bits/string.h
rename to string/bits/string-1.h
index 88505bb..0b665e1 100644
--- a/sysdeps/m68k/m680x0/m68020/bits/string.h
+++ b/string/bits/string-1.h
@@ -1,5 +1,5 @@
-/* Optimized, inlined string functions. m680x0 version, x >= 2.
- Copyright (C) 1997-2016 Free Software Foundation, Inc.
+/* Define _STRING_ARCH_unaligned.
+ Copyright (C) 2016 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -13,13 +13,13 @@
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library. If not, see
+ License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
#ifndef _STRING_H
-# error "Never use <bits/string.h> directly; include <string.h> instead."
+# error "Never use <bits/string-1.h> directly; include <string.h> instead."
#endif
-/* Currently the only purpose of this file is to tell the generic inline
- macros that unaligned memory access is possible. */
-#define _STRING_ARCH_unaligned 1
+/* Define to 1 if architecture can access unaligned multi-byte
+ variables. */
+#define _STRING_ARCH_unaligned 0
diff --git a/string/string.h b/string/string.h
index 1f3e348..6038bca 100644
--- a/string/string.h
+++ b/string/string.h
@@ -602,6 +602,9 @@ extern char *basename (const char *__filename) __THROW __nonnull ((1));
#endif
+/* Get _STRING_ARCH_unaligned. */
+# include <bits/string-1.h>
+
#if defined __GNUC__ && __GNUC__ >= 2
# if defined __OPTIMIZE__ && !defined __OPTIMIZE_SIZE__ \
&& !defined __NO_INLINE__ && !defined __cplusplus
diff --git a/sysdeps/aarch64/bits/string.h b/sysdeps/aarch64/bits/string-1.h
similarity index 78%
copy from sysdeps/aarch64/bits/string.h
copy to sysdeps/aarch64/bits/string-1.h
index 3c2a50b..bd153a4 100644
--- a/sysdeps/aarch64/bits/string.h
+++ b/sysdeps/aarch64/bits/string-1.h
@@ -1,5 +1,5 @@
-/* Optimized, inlined string functions. AArch64 version.
- Copyright (C) 2015-2016 Free Software Foundation, Inc.
+/* Define _STRING_ARCH_unaligned. AArch64 version.
+ Copyright (C) 2016 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -17,8 +17,8 @@
<http://www.gnu.org/licenses/>. */
#ifndef _STRING_H
-# error "Never use <bits/string.h> directly; include <string.h> instead."
+# error "Never use <bits/string-1.h> directly; include <string.h> instead."
#endif
/* AArch64 implementations support efficient unaligned access. */
-#define _STRING_ARCH_unaligned 1
+#define _STRING_ARCH_unaligned 1
diff --git a/sysdeps/aarch64/bits/string.h b/sysdeps/m68k/m680x0/m68020/bits/string-1.h
similarity index 71%
copy from sysdeps/aarch64/bits/string.h
copy to sysdeps/m68k/m680x0/m68020/bits/string-1.h
index 3c2a50b..22a791b 100644
--- a/sysdeps/aarch64/bits/string.h
+++ b/sysdeps/m68k/m680x0/m68020/bits/string-1.h
@@ -1,5 +1,5 @@
-/* Optimized, inlined string functions. AArch64 version.
- Copyright (C) 2015-2016 Free Software Foundation, Inc.
+/* Define _STRING_ARCH_unaligned. m680x0 version, x >= 2.
+ Copyright (C) 2016 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -17,8 +17,9 @@
<http://www.gnu.org/licenses/>. */
#ifndef _STRING_H
-# error "Never use <bits/string.h> directly; include <string.h> instead."
+# error "Never use <bits/string-1.h> directly; include <string.h> instead."
#endif
-/* AArch64 implementations support efficient unaligned access. */
-#define _STRING_ARCH_unaligned 1
+/* Tell the generic inline macros that unaligned memory access is
+ possible. */
+#define _STRING_ARCH_unaligned 1
diff --git a/sysdeps/aarch64/bits/string.h b/sysdeps/s390/bits/string-1.h
similarity index 72%
copy from sysdeps/aarch64/bits/string.h
copy to sysdeps/s390/bits/string-1.h
index 3c2a50b..895a9b1 100644
--- a/sysdeps/aarch64/bits/string.h
+++ b/sysdeps/s390/bits/string-1.h
@@ -1,5 +1,5 @@
-/* Optimized, inlined string functions. AArch64 version.
- Copyright (C) 2015-2016 Free Software Foundation, Inc.
+/* Define _STRING_ARCH_unaligned. S/390 version.
+ Copyright (C) 2016 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -17,8 +17,8 @@
<http://www.gnu.org/licenses/>. */
#ifndef _STRING_H
-# error "Never use <bits/string.h> directly; include <string.h> instead."
+# error "Never use <bits/string-1.h> directly; include <string.h> instead."
#endif
-/* AArch64 implementations support efficient unaligned access. */
-#define _STRING_ARCH_unaligned 1
+/* The s390 processors can access unaligned multi-byte variables. */
+#define _STRING_ARCH_unaligned 1
diff --git a/sysdeps/s390/bits/string.h b/sysdeps/s390/bits/string.h
index 09201d9..8e4d605 100644
--- a/sysdeps/s390/bits/string.h
+++ b/sysdeps/s390/bits/string.h
@@ -21,9 +21,6 @@
# error "Never use <bits/string.h> directly; include <string.h> instead."
#endif
-/* The s390 processors can access unaligned multi-byte variables. */
-#define _STRING_ARCH_unaligned 1
-
/* We only provide optimizations if the user selects them and if
GNU CC is used. */
#if !defined __NO_STRING_INLINES && defined __USE_STRING_INLINES \
diff --git a/sysdeps/sparc/bits/string.h b/sysdeps/sparc/bits/string.h
index 3054f62..336b58e 100644
--- a/sysdeps/sparc/bits/string.h
+++ b/sysdeps/sparc/bits/string.h
@@ -20,9 +20,6 @@
# error "Never use <bits/string.h> directly; include <string.h> instead."
#endif
-/* Define if architecture can access unaligned multi-byte variables. */
-#define _STRING_ARCH_unaligned 0
-
/* sparc32 and sparc64 strchr(x, '\0') perform better than
__rawmemchr(x, '\0'). */
#define _HAVE_STRING_ARCH_strchr 1
diff --git a/sysdeps/aarch64/bits/string.h b/sysdeps/x86/bits/string-1.h
similarity index 72%
rename from sysdeps/aarch64/bits/string.h
rename to sysdeps/x86/bits/string-1.h
index 3c2a50b..1a8c2df 100644
--- a/sysdeps/aarch64/bits/string.h
+++ b/sysdeps/x86/bits/string-1.h
@@ -1,5 +1,5 @@
-/* Optimized, inlined string functions. AArch64 version.
- Copyright (C) 2015-2016 Free Software Foundation, Inc.
+/* Define _STRING_ARCH_unaligned. i486/x86-64 version.
+ Copyright (C) 2016 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -17,8 +17,8 @@
<http://www.gnu.org/licenses/>. */
#ifndef _STRING_H
-# error "Never use <bits/string.h> directly; include <string.h> instead."
+# error "Never use <bits/string-1.h> directly; include <string.h> instead."
#endif
-/* AArch64 implementations support efficient unaligned access. */
-#define _STRING_ARCH_unaligned 1
+/* The ix86 processors can access unaligned multi-byte variables. */
+#define _STRING_ARCH_unaligned 1
diff --git a/sysdeps/x86/bits/string.h b/sysdeps/x86/bits/string.h
index 1a0682b..b952d38 100644
--- a/sysdeps/x86/bits/string.h
+++ b/sysdeps/x86/bits/string.h
@@ -20,9 +20,6 @@
# error "Never use <bits/string.h> directly; include <string.h> instead."
#endif
-/* The ix86 processors can access unaligned multi-byte variables. */
-#define _STRING_ARCH_unaligned 1
-
/* Enable inline functions only for i486 or better when compiling for
ia32. */
#if !defined __x86_64__ && (defined __i486__ || defined __pentium__ \
-----------------------------------------------------------------------
hooks/post-receive
--
GNU C Library master sources