This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch master updated. glibc-2.19-714-gdd0ba01


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, master has been updated
       via  dd0ba018122e88937a5f14b6594b9a40693b2e58 (commit)
       via  64df73c2ea0e02f7794ba2f08540a74a9bb198db (commit)
      from  f1eafb41fa71cb5d88fbeda3136c9be965eeaa41 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=dd0ba018122e88937a5f14b6594b9a40693b2e58

commit dd0ba018122e88937a5f14b6594b9a40693b2e58
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Sat Jun 28 06:15:54 2014 +0530

    Sync up mktime with gnulib
    
    From the gnulib commit log:
    
    commit e2646b0c6b5acda25e9ffeb4c12a5513a1e3b5ac
    Author: Paul Eggert <eggert@cs.ucla.edu>
    Date:   Fri Jun 27 11:35:44 2014 -0700
    
        mktime: merge #if/#ifdef usage from glibc
    
        * lib/mktime.c: Use "#if defined DEBUG && DEBUG", not "#if DEBUG",
        as that works with both Glibc's and Gnulib's style.
        See thread starting at Siddhesh Poyarekar's bug report at:
        http://lists.gnu.org/archive/html/bug-gnulib/2014-06/msg00102.html

diff --git a/ChangeLog b/ChangeLog
index 0f8b538..33ce8ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2014-06-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+	mktime: merge #if/#ifdef usage from glibc
+	* lib/mktime.c: Use "#if defined DEBUG && DEBUG", not "#if DEBUG",
+	as that works with both Glibc's and Gnulib's style.
+	See thread starting at Siddhesh Poyarekar's bug report at:
+	http://lists.gnu.org/archive/html/bug-gnulib/2014-06/msg00102.html
+
 2014-06-28  Siddhesh Poyarekar  <siddhesh@redhat.com>
 
 	* sysdeps/generic/memcopy.h: Define MEMCPY_OK_FOR_FWD_MEMMOVE.
diff --git a/time/mktime.c b/time/mktime.c
index f10e530..a52933e 100644
--- a/time/mktime.c
+++ b/time/mktime.c
@@ -38,7 +38,7 @@
 
 #include <string.h>		/* For the real memcpy prototype.  */
 
-#if DEBUG
+#if defined DEBUG && DEBUG
 # include <stdio.h>
 # include <stdlib.h>
 /* Make it work even if the system's libc has its own mktime routine.  */
@@ -600,7 +600,7 @@ libc_hidden_def (mktime)
 libc_hidden_weak (timelocal)
 #endif
 
-#if DEBUG
+#if defined DEBUG && DEBUG
 
 static int
 not_equal_tm (const struct tm *a, const struct tm *b)

http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=64df73c2ea0e02f7794ba2f08540a74a9bb198db

commit 64df73c2ea0e02f7794ba2f08540a74a9bb198db
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
Date:   Sat Jun 28 06:05:24 2014 +0530

    Fix Wundef warning for MEMCPY_OK_FOR_FWD_MEMMOVE
    
    Define MEMCPY_OK_FOR_FWD_MEMMOVE in memcopy.h and let arch-specific
    implementations of that file override the value if necessary.  This
    override is only useful for tile and moving this macro to memcopy.h
    allows us to remove the tile-specific memmove.c.

diff --git a/ChangeLog b/ChangeLog
index 3582966..0f8b538 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-06-28  Siddhesh Poyarekar  <siddhesh@redhat.com>
+
+	* sysdeps/generic/memcopy.h: Define MEMCPY_OK_FOR_FWD_MEMMOVE.
+	* sysdeps/tile/memcopy.h: Redefine MEMCPY_OK_FOR_FWD_MEMMOVE.
+	* sysdeps/tile/tilegx/memmove.c: Remove file.
+
 2014-06-27  Joseph Myers  <joseph@codesourcery.com>
 
 	* Makeconfig ($(common-objpfx)soversions.mk): Do not generate
diff --git a/sysdeps/generic/memcopy.h b/sysdeps/generic/memcopy.h
index 49e5363..b39a960 100644
--- a/sysdeps/generic/memcopy.h
+++ b/sysdeps/generic/memcopy.h
@@ -148,4 +148,6 @@ extern void _wordcopy_bwd_dest_aligned (long int, long int, size_t) __THROW;
 /* Threshold value for when to enter the unrolled loops.  */
 #define	OP_T_THRES	16
 
+#define MEMCPY_OK_FOR_FWD_MEMMOVE 0
+
 #endif /* memcopy.h */
diff --git a/sysdeps/tile/memcopy.h b/sysdeps/tile/memcopy.h
index e8326ee..8333101 100644
--- a/sysdeps/tile/memcopy.h
+++ b/sysdeps/tile/memcopy.h
@@ -19,6 +19,12 @@
 #include <sysdeps/generic/memcopy.h>
 #include <bits/wordsize.h>
 
+/* The tilegx implementation of memcpy is safe to use for memmove.  */
+#ifdef __tilegx__
+# undef MEMCPY_OK_FOR_FWD_MEMMOVE
+# define MEMCPY_OK_FOR_FWD_MEMMOVE 1
+#endif
+
 /* Support more efficient copying on tilegx32, which supports
    long long as a native 64-bit type.  */
 #if defined (__tilegx__) && __WORDSIZE == 32
diff --git a/sysdeps/tile/tilegx/memmove.c b/sysdeps/tile/tilegx/memmove.c
deleted file mode 100644
index 38323ce..0000000
--- a/sysdeps/tile/tilegx/memmove.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copy memory to memory until the specified number of bytes
-   has been copied.  Overlap is handled correctly.
-   Copyright (C) 2012-2014 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
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   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
-   <http://www.gnu.org/licenses/>.  */
-
-/* The tilegx implementation of memcpy is safe to use for memmove.  */
-#define MEMCPY_OK_FOR_FWD_MEMMOVE 1
-#include <string/memmove.c>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                     |   14 ++++++++++++++
 sysdeps/generic/memcopy.h     |    2 ++
 sysdeps/tile/memcopy.h        |    6 ++++++
 sysdeps/tile/tilegx/memmove.c |   22 ----------------------
 time/mktime.c                 |    4 ++--
 5 files changed, 24 insertions(+), 24 deletions(-)
 delete mode 100644 sysdeps/tile/tilegx/memmove.c


hooks/post-receive
-- 
GNU C Library master sources


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]