[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Commits] r21646 - in /fsf/trunk/libc: ./ conform/data/ conform/data/sys/ timezone/

To: commits@xxxxxxxxxx
Subject: [Commits] r21646 - in /fsf/trunk/libc: ./ conform/data/ conform/data/sys/ timezone/
From: eglibc@xxxxxxxxxx
Date: Sun, 11 Nov 2012 00:01:52 -0000

Author: eglibc
Date: Sun Nov 11 00:01:51 2012
New Revision: 21646

Log:
Import glibc-mainline for 2012-11-11

Removed:
    fsf/trunk/libc/timezone/version.h
Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/NEWS
    fsf/trunk/libc/conform/data/semaphore.h-data
    fsf/trunk/libc/conform/data/sys/socket.h-data
    fsf/trunk/libc/conform/data/time.h-data
    fsf/trunk/libc/conform/data/unistd.h-data
    fsf/trunk/libc/conform/data/wchar.h-data
    fsf/trunk/libc/timezone/Makefile
    fsf/trunk/libc/timezone/README

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Sun Nov 11 00:01:51 2012
@@ -1,4 +1,28 @@
+2012-11-10  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* conform/data/semaphore.h-data [XPG3 || XPG4]: Disable whole
+	file.
+	[UNIX98] (sem_timedwait): Do not expect.
+	* conform/data/sys/socket.h-data [XPG3]: Disable whole file.
+	[XPG4 || UNIX98] (sockatmark): Do not expect.
+	* conform/data/time.h-data [XPG3 || XPG4 || UNIX98]
+	(clock_getcpuclockid): Do not expect.
+	[XPG3 || XPG4 || UNIX98] (clock_nanosleep): Do not expect.
+	* conform/data/unistd.h-data [XPG3 || XPG4 || UNIX98] (setegid):
+	Do not expect.
+	[XPG3 || XPG4 || UNIX98] (seteuid): Likewise.
+	* conform/data/wchar.h-data [UNIX98] (vfwscanf): Do not expect.
+	[UNIX98] (vwscanf): Likewise.
+	[UNIX98] (vswscanf): Likewise.
+
 2012-11-09  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* timezone/version.h: Remove file.
+	* timezone/README: Do not refer to version.h.
+	* timezone/Makefile ($(objpfx)zic.o): New dependency on
+	$(objpfx)version.h.
+	($(objpfx)zdump.o): Likewise.
+	($(objpfx)version.h): New target.
 
 	* timezone/tzselect.ksh: Change to verbatim copy from tzcode
 	2012i.

Modified: fsf/trunk/libc/NEWS
==============================================================================
--- fsf/trunk/libc/NEWS (original)
+++ fsf/trunk/libc/NEWS Sun Nov 11 00:01:51 2012
@@ -20,6 +20,8 @@
   14638, 14645, 14648, 14652, 14660, 14661, 14669, 14683, 14694, 14716,
   14743, 14767, 14783, 14784, 14785, 14793, 14796, 14797, 14801, 14805,
   14807, 14809, 14811, 14815, 14821, 14824.
+
+* Port to ARM AArch64 contributed by Linaro.
 
 * Support for STT_GNU_IFUNC symbols added for s390 and s390x.
   Optimized versions of memcpy, memset, and memcmp added for System z10 and

Modified: fsf/trunk/libc/conform/data/semaphore.h-data
==============================================================================
--- fsf/trunk/libc/conform/data/semaphore.h-data (original)
+++ fsf/trunk/libc/conform/data/semaphore.h-data Sun Nov 11 00:01:51 2012
@@ -1,4 +1,4 @@
-#if !defined ISO && !defined ISO99 && !defined ISO11
+#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined XPG3 && !defined XPG4
 type sem_t
 
 constant SEM_FAILED
@@ -9,7 +9,7 @@
 function int sem_init (sem_t*, int, unsigned int)
 function {sem_t*} sem_open (const char*, int, ...)
 function int sem_post (sem_t*)
-# if !defined POSIX
+# if !defined POSIX && !defined UNIX98
 function int sem_timedwait (sem_t*, const struct timespec*)
 # endif
 function int sem_trywait (sem_t*)

Modified: fsf/trunk/libc/conform/data/sys/socket.h-data
==============================================================================
--- fsf/trunk/libc/conform/data/sys/socket.h-data (original)
+++ fsf/trunk/libc/conform/data/sys/socket.h-data Sun Nov 11 00:01:51 2012
@@ -1,4 +1,4 @@
-#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX
+#if !defined ISO && !defined ISO99 && !defined ISO11 && !defined POSIX && !defined XPG3
 type socklen_t
 
 type sa_family_t
@@ -111,7 +111,9 @@
 function int shutdown (int, int)
 function int socket (int, int, int)
 function int socketpair (int, int, int, int[2])
+#if !defined XPG4 && !defined UNIX98
 function int sockatmark (int)
+#endif
 
 allow-header sys/uio.h
 

Modified: fsf/trunk/libc/conform/data/time.h-data
==============================================================================
--- fsf/trunk/libc/conform/data/time.h-data (original)
+++ fsf/trunk/libc/conform/data/time.h-data Sun Nov 11 00:01:51 2012
@@ -71,12 +71,12 @@
 # endif
 
 function {char*} asctime_r (const struct tm*, char*)
-#if !defined POSIX
+#if !defined POSIX && !defined XPG3 && !defined XPG4 && !defined UNIX98
 function int clock_getcpuclockid (pid_t, clockid_t*)
 #endif
 function int clock_getres (clockid_t, struct timespec*)
 function int clock_gettime (clockid_t, struct timespec*)
-#if !defined POSIX
+#if !defined POSIX && !defined XPG3 && !defined XPG4 && !defined UNIX98
 function int clock_nanosleep (clockid_t, int, const struct timespec*, struct timespec*)
 #endif
 function int clock_settime (clockid_t, const struct timespec*)

Modified: fsf/trunk/libc/conform/data/unistd.h-data
==============================================================================
--- fsf/trunk/libc/conform/data/unistd.h-data (original)
+++ fsf/trunk/libc/conform/data/unistd.h-data Sun Nov 11 00:01:51 2012
@@ -472,7 +472,7 @@
 #if !defined XOPEN2K && !defined XOPEN2K8 && !defined POSIX && !defined POSIX2008
 function {void*} sbrk (intptr_t)
 #endif
-#ifndef POSIX
+#if !defined POSIX && !defined XPG3 && !defined XPG4 && !defined UNIX98
 function int setegid (gid_t)
 function int seteuid (uid_t)
 #endif

Modified: fsf/trunk/libc/conform/data/wchar.h-data
==============================================================================
--- fsf/trunk/libc/conform/data/wchar.h-data (original)
+++ fsf/trunk/libc/conform/data/wchar.h-data Sun Nov 11 00:01:51 2012
@@ -60,11 +60,17 @@
 # endif
 function wint_t ungetwc (wint_t, FILE*)
 function int vfwprintf (FILE*, const wchar_t*, __gnuc_va_list)
+# ifndef UNIX98
 function int vfwscanf (FILE*, const wchar_t*, __gnuc_va_list)
+# endif
 function int vwprintf (const wchar_t*, __gnuc_va_list)
+# ifndef UNIX98
 function int vwscanf (const wchar_t*, __gnuc_va_list)
+# endif
 function int vswprintf (wchar_t*, size_t, const wchar_t*, __gnuc_va_list)
+# ifndef UNIX98
 function int vswscanf (const wchar_t*, const wchar_t*, __gnuc_va_list)
+# endif
 # if defined XOPEN2K8 || defined POSIX2008
 function {wchar_t*} wcpcpy (wchar_t*, const wchar_t*)
 function {wchar_t*} wcpncpy (wchar_t*, const wchar_t*, size_t)

Modified: fsf/trunk/libc/timezone/Makefile
==============================================================================
--- fsf/trunk/libc/timezone/Makefile (original)
+++ fsf/trunk/libc/timezone/Makefile Sun Nov 11 00:01:51 2012
@@ -53,6 +53,13 @@
 
 
 $(objpfx)zic: $(objpfx)scheck.o $(objpfx)ialloc.o
+
+$(objpfx)zic.o $(objpfx)zdump.o: $(objpfx)version.h
+
+$(objpfx)version.h: $(common-objpfx)config.make
+	echo 'static char const TZVERSION[]="$(PKGVERSION)$(version)";' \
+	    > $@.new
+	mv -f $@.new $@
 
 tz-cflags = -DTZDIR='"$(zonedir)"' \
 	    -DTZDEFAULT='"$(localtime-file)"' \

Modified: fsf/trunk/libc/timezone/README
==============================================================================
--- fsf/trunk/libc/timezone/README (original)
+++ fsf/trunk/libc/timezone/README Sun Nov 11 00:01:51 2012
@@ -1,9 +1,7 @@
 The files
 	zic.c zdump.c ialloc.c scheck.c tzfile.h
 	private.h tzselect.ksh checktab.awk
-come from the tzcode package by Arthur David Olson et.al.; the file
-	version.h
-has the contents that would be generated by that package's Makefile.
+come from the tzcode package by Arthur David Olson et.al.
 
 The files
 	africa antarctica asia australasia europe

Removed: fsf/trunk/libc/timezone/version.h
==============================================================================
--- fsf/trunk/libc/timezone/version.h (original)
+++ fsf/trunk/libc/timezone/version.h (removed)
@@ -1,1 +1,0 @@
-static char const TZVERSION[]="tz2012i";

_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits

Prev by Date: [Commits] r21630 - in /fsf/trunk/libc: ChangeLog Makefile timezone/Makefile timezone/README timezone/tzselect.ksh
Next by Date: [Commits] r21678 - in /fsf/trunk/libc: ChangeLog sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c
Previous by thread: [Commits] r21630 - in /fsf/trunk/libc: ChangeLog Makefile timezone/Makefile timezone/README timezone/tzselect.ksh
Next by thread: [Commits] r21678 - in /fsf/trunk/libc: ChangeLog sysdeps/unix/sysv/linux/sparc/sparc64/get_clockfreq.c
Index(es):
- Date
- Thread