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

[Commits] r18195 - in /fsf/trunk/libc: ./ manual/ stdlib/ sysdeps/posix/ sysdeps/unix/ sysdeps/unix/sysv/



Author: eglibc
Date: Tue Apr 24 00:01:27 2012
New Revision: 18195

Log:
Import glibc-mainline for 2012-04-24

Added:
    fsf/trunk/libc/sysdeps/posix/gethostname.c
Removed:
    fsf/trunk/libc/sysdeps/unix/_exit.S
    fsf/trunk/libc/sysdeps/unix/execve.S
    fsf/trunk/libc/sysdeps/unix/sysv/gethostname.c
Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/NEWS
    fsf/trunk/libc/manual/Makefile
    fsf/trunk/libc/stdlib/stdlib.h

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Tue Apr 24 00:01:27 2012
@@ -1,3 +1,39 @@
+2012-04-23  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/gethostname.c: Move to ...
+	* sysdeps/posix/gethostname.c: ... here.
+
+	* sysdeps/unix/execve.S: Remove file.
+
+	* sysdeps/unix/_exit.S: Remove file.
+
+2012-04-23  Andreas Jaeger  <aj@xxxxxxx>
+
+	[BZ #13739]
+	* manual/Makefile: Remove make dist support, there's no
+	need for a stand-alone documentation tar ball.
+	(TEXI2DVI): Define always, it's not in Makeconfig.
+	(dist): Removed.
+	(tar-it): Removed.
+	(edition): Removed.
+	(glibc-doc-$(edition).tar): Removed
+	(%.Z): Removed.
+	(%.gz): Removed.
+	(%.uu): Removed.
+	(ETAGS): Remove, it's in Makeconfig.
+	(move-if-change): Remove, it's in Makeconfig.
+
+2013-04-23  Paul Eggert  <eggert@xxxxxxxxxxx>
+
+	[BZ #13970]
+	* stdlib/stdlib.h: Remove warn_unused_result attribute from strtol etc.
+	(strtod, strtof, strtold, strtol, strtoul, strtoq)
+	(strtouq, strtoll, strtoull, strtol_l, strtoul_l, strtoll_l, strtoull_l)
+	(strtod_l, strtof_l, strtold_l): Remove __wur.
+	It is not necessarily an error to ignore strtol's return value.
+	One can reliably look at the stored endptr to decide whether
+	the number had valid syntax.
+
 2012-04-21  Andreas Jaeger  <aj@xxxxxxx>
 
 	[BZ #13739]

Modified: fsf/trunk/libc/NEWS
==============================================================================
--- fsf/trunk/libc/NEWS (original)
+++ fsf/trunk/libc/NEWS Tue Apr 24 00:01:27 2012
@@ -18,10 +18,11 @@
   13525, 13526, 13527, 13528, 13529, 13530, 13531, 13532, 13533, 13547,
   13551, 13552, 13553, 13555, 13559, 13566, 13583, 13592, 13618, 13637,
   13656, 13658, 13673, 13691, 13695, 13704, 13705, 13706, 13726, 13738,
-  13760, 13761, 13786, 13792, 13806, 13824, 13840, 13841, 13844, 13846,
-  13851, 13852, 13854, 13871, 13872, 13873, 13879, 13883, 13892, 13895,
-  13908, 13910, 13911, 13912, 13913, 13915, 13916, 13917, 13918, 13919,
-  13920, 13921, 13926, 13927, 13928, 13938, 13963, 13967, 13973
+  13739, 13760, 13761, 13786, 13792, 13806, 13824, 13840, 13841, 13844,
+  13846, 13851, 13852, 13854, 13871, 13872, 13873, 13879, 13883, 13892,
+  13895, 13908, 13910, 13911, 13912, 13913, 13915, 13916, 13917, 13918,
+  13919, 13920, 13921, 13926, 13927, 13928, 13938, 13963, 13967, 13970,
+  13973
 
 * ISO C11 support:
 

Modified: fsf/trunk/libc/manual/Makefile
==============================================================================
--- fsf/trunk/libc/manual/Makefile (original)
+++ fsf/trunk/libc/manual/Makefile Tue Apr 24 00:01:27 2012
@@ -30,14 +30,9 @@
 pdf: libc.pdf
 
 # Get glibc's configuration info.
-ifneq (,$(wildcard ../Makeconfig))
 include ../Makeconfig
-else
-MAKEINFO = makeinfo
+
 TEXI2DVI = texi2dvi
-AWK = gawk
-endif
-
 TEXI2PDF = texi2dvi --pdf
 
 ifneq ($(strip $(MAKEINFO)),:)
@@ -45,10 +40,6 @@
 info: libc.info
 endif
 
-# scripts we use
-ifndef move-if-change
-move-if-change = ./move-if-change
-endif
 mkinstalldirs = $(..)scripts/mkinstalldirs
 
 chapters = $(addsuffix .texi, \
@@ -144,27 +135,6 @@
 	       libm-err.texi stamp-libm-err				    \
 	       $(filter-out summary.texi, $(nonexamples))		    \
 	       $(patsubst %.c.texi,examples/%.c, $(examples))
-
-tar-it = tar chovf $@ $^
-
-edition := $(shell sed -n 's/^@set EDITION \([0-9][0-9.]*\)[^0-9.]*.*$$/\1/p' \
-		       libc.texinfo)
-
-glibc-doc-$(edition).tar: $(doc-only-dist) $(distribute)
-	@rm -f glibc-doc-$(edition)
-	ln -s . glibc-doc-$(edition)
-	tar chovf $@ $(addprefix glibc-doc-$(edition)/,$^)
-	rm -f glibc-doc-$(edition)
-
-%.Z: %
-	compress -c $< > $@.new
-	mv -f $@.new $@
-%.gz: %
-	gzip -9 -c $< > $@.new
-	mv -f $@.new $@
-%.uu: %
-	uuencode $< < $< > $@.new
-	mv -f $@.new $@
 
 .PHONY: mostlyclean distclean realclean clean
 mostlyclean:
@@ -200,17 +170,6 @@
 installdirs:
 	$(mkinstalldirs) $(inst_infodir)
 
-.PHONY: dist
-dist: # glibc-doc-$(edition).tar.gz
-
-ifneq (,$(wildcard ../Make-dist))
-dist: ../Make-dist
-	$(MAKE) -f $< $(Make-dist-args)
-endif
-
-ifndef ETAGS
-ETAGS = etags -T
-endif
 TAGS: $(minimal-dist)
 	$(ETAGS) -o $@ $^
 

Modified: fsf/trunk/libc/stdlib/stdlib.h
==============================================================================
--- fsf/trunk/libc/stdlib/stdlib.h (original)
+++ fsf/trunk/libc/stdlib/stdlib.h Tue Apr 24 00:01:27 2012
@@ -163,18 +163,18 @@
 /* Convert a string to a floating-point number.  */
 extern double strtod (const char *__restrict __nptr,
 		      char **__restrict __endptr)
-     __THROW __nonnull ((1)) __wur;
+     __THROW __nonnull ((1));
 __END_NAMESPACE_STD
 
 #ifdef	__USE_ISOC99
 __BEGIN_NAMESPACE_C99
 /* Likewise for `float' and `long double' sizes of floating-point numbers.  */
 extern float strtof (const char *__restrict __nptr,
-		     char **__restrict __endptr) __THROW __nonnull ((1)) __wur;
+		     char **__restrict __endptr) __THROW __nonnull ((1));
 
 extern long double strtold (const char *__restrict __nptr,
 			    char **__restrict __endptr)
-     __THROW __nonnull ((1)) __wur;
+     __THROW __nonnull ((1));
 __END_NAMESPACE_C99
 #endif
 
@@ -182,11 +182,11 @@
 /* Convert a string to a long integer.  */
 extern long int strtol (const char *__restrict __nptr,
 			char **__restrict __endptr, int __base)
-     __THROW __nonnull ((1)) __wur;
+     __THROW __nonnull ((1));
 /* Convert a string to an unsigned long integer.  */
 extern unsigned long int strtoul (const char *__restrict __nptr,
 				  char **__restrict __endptr, int __base)
-     __THROW __nonnull ((1)) __wur;
+     __THROW __nonnull ((1));
 __END_NAMESPACE_STD
 
 #if defined __GLIBC_HAVE_LONG_LONG && defined __USE_BSD
@@ -194,12 +194,12 @@
 __extension__
 extern long long int strtoq (const char *__restrict __nptr,
 			     char **__restrict __endptr, int __base)
-     __THROW __nonnull ((1)) __wur;
+     __THROW __nonnull ((1));
 /* Convert a string to an unsigned quadword integer.  */
 __extension__
 extern unsigned long long int strtouq (const char *__restrict __nptr,
 				       char **__restrict __endptr, int __base)
-     __THROW __nonnull ((1)) __wur;
+     __THROW __nonnull ((1));
 #endif /* GCC and use BSD.  */
 
 #if defined __USE_ISOC99 || (defined __GLIBC_HAVE_LONG_LONG && defined __USE_MISC)
@@ -208,12 +208,12 @@
 __extension__
 extern long long int strtoll (const char *__restrict __nptr,
 			      char **__restrict __endptr, int __base)
-     __THROW __nonnull ((1)) __wur;
+     __THROW __nonnull ((1));
 /* Convert a string to an unsigned quadword integer.  */
 __extension__
 extern unsigned long long int strtoull (const char *__restrict __nptr,
 					char **__restrict __endptr, int __base)
-     __THROW __nonnull ((1)) __wur;
+     __THROW __nonnull ((1));
 __END_NAMESPACE_C99
 #endif /* ISO C99 or GCC and use MISC.  */
 
@@ -238,37 +238,37 @@
    use as an additional parameter.  */
 extern long int strtol_l (const char *__restrict __nptr,
 			  char **__restrict __endptr, int __base,
-			  __locale_t __loc) __THROW __nonnull ((1, 4)) __wur;
+			  __locale_t __loc) __THROW __nonnull ((1, 4));
 
 extern unsigned long int strtoul_l (const char *__restrict __nptr,
 				    char **__restrict __endptr,
 				    int __base, __locale_t __loc)
-     __THROW __nonnull ((1, 4)) __wur;
+     __THROW __nonnull ((1, 4));
 
 __extension__
 extern long long int strtoll_l (const char *__restrict __nptr,
 				char **__restrict __endptr, int __base,
 				__locale_t __loc)
-     __THROW __nonnull ((1, 4)) __wur;
+     __THROW __nonnull ((1, 4));
 
 __extension__
 extern unsigned long long int strtoull_l (const char *__restrict __nptr,
 					  char **__restrict __endptr,
 					  int __base, __locale_t __loc)
-     __THROW __nonnull ((1, 4)) __wur;
+     __THROW __nonnull ((1, 4));
 
 extern double strtod_l (const char *__restrict __nptr,
 			char **__restrict __endptr, __locale_t __loc)
-     __THROW __nonnull ((1, 3)) __wur;
+     __THROW __nonnull ((1, 3));
 
 extern float strtof_l (const char *__restrict __nptr,
 		       char **__restrict __endptr, __locale_t __loc)
-     __THROW __nonnull ((1, 3)) __wur;
+     __THROW __nonnull ((1, 3));
 
 extern long double strtold_l (const char *__restrict __nptr,
 			      char **__restrict __endptr,
 			      __locale_t __loc)
-     __THROW __nonnull ((1, 3)) __wur;
+     __THROW __nonnull ((1, 3));
 #endif /* GNU */
 
 

Added: fsf/trunk/libc/sysdeps/posix/gethostname.c
==============================================================================
--- fsf/trunk/libc/sysdeps/posix/gethostname.c (added)
+++ fsf/trunk/libc/sysdeps/posix/gethostname.c Tue Apr 24 00:01:27 2012
@@ -1,0 +1,48 @@
+/* Copyright (C) 1992, 1995, 1997, 2000, 2001 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/>.  */
+
+#include <errno.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/utsname.h>
+
+/* Put the name of the current host in no more than LEN bytes of NAME.
+   The result is null-terminated if LEN is large enough for the full
+   name and the terminator.  */
+int
+__gethostname (name, len)
+     char *name;
+     size_t len;
+{
+  struct utsname buf;
+  size_t node_len;
+
+  if (uname (&buf))
+    return -1;
+
+  node_len = strlen (buf.nodename) + 1;
+  memcpy (name, buf.nodename, len < node_len ? len : node_len);
+
+  if (node_len > len)
+    {
+      __set_errno (ENAMETOOLONG);
+      return -1;
+    }
+  return 0;
+}
+
+weak_alias (__gethostname, gethostname)

Removed: fsf/trunk/libc/sysdeps/unix/_exit.S
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/_exit.S (original)
+++ fsf/trunk/libc/sysdeps/unix/_exit.S (removed)
@@ -1,24 +1,0 @@
-/* Copyright (C) 1991,92,97,99,2002 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/>.  */
-
-#include <sysdep.h>
-
-PSEUDO (_exit, exit, 1)
-	/* Shouldn't get here.  */
-PSEUDO_END(_exit)
-libc_hidden_def (_exit)
-weak_alias (_exit, _Exit)

Removed: fsf/trunk/libc/sysdeps/unix/execve.S
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/execve.S (original)
+++ fsf/trunk/libc/sysdeps/unix/execve.S (removed)
@@ -1,32 +1,0 @@
-/* Copyright (C) 1991, 92, 93, 95, 96 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/>.  */
-
-#include <sysdep.h>
-
-/* Some systems misname the system call number macro for this.  */
-#if !defined (SYS_execve) && defined (SYS_exece)
-#define SYS_execve	SYS_exece
-#endif
-#if !defined (SYS_execve) && defined (SYS_exec)
-#define SYS_execve	SYS_exec
-#endif
-
-SYSCALL__ (execve, 3)
-	ret
-PSEUDO_END(__execve)
-
-weak_alias (__execve, execve)

Removed: fsf/trunk/libc/sysdeps/unix/sysv/gethostname.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/gethostname.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/gethostname.c (removed)
@@ -1,48 +1,0 @@
-/* Copyright (C) 1992, 1995, 1997, 2000, 2001 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/>.  */
-
-#include <errno.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/utsname.h>
-
-/* Put the name of the current host in no more than LEN bytes of NAME.
-   The result is null-terminated if LEN is large enough for the full
-   name and the terminator.  */
-int
-__gethostname (name, len)
-     char *name;
-     size_t len;
-{
-  struct utsname buf;
-  size_t node_len;
-
-  if (uname (&buf))
-    return -1;
-
-  node_len = strlen (buf.nodename) + 1;
-  memcpy (name, buf.nodename, len < node_len ? len : node_len);
-
-  if (node_len > len)
-    {
-      __set_errno (ENAMETOOLONG);
-      return -1;
-    }
-  return 0;
-}
-
-weak_alias (__gethostname, gethostname)

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