[commits] r15385 - in /fsf/trunk/libc: ChangeLog Makeconfig Makerules config.make.in sysdeps/posix/spawni.c tls.make.c

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Tue Sep 20 00:02:22 2011
New Revision: 15385

Log:
Import glibc-mainline for 2011-09-20

Removed:
    fsf/trunk/libc/tls.make.c
Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/Makeconfig
    fsf/trunk/libc/Makerules
    fsf/trunk/libc/config.make.in
    fsf/trunk/libc/sysdeps/posix/spawni.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Tue Sep 20 00:02:22 2011
@@ -1,3 +1,19 @@
+2011-09-19  Roland McGrath  <roland@xxxxxxxxxxxxx>
+
+	* sysdeps/posix/spawni.c (script_execute): Always define it.
+	It will be optimized away if unused.
+	(maybe_script_execute): New function.
+	(__spawni): Call it.
+
+	* Makerules: Don't include tls.make.
+	(config-tls): Always set to thread.
+	* tls.make.c: File removed.
+
+2011-09-19  Mike Frysinger  <vapier@xxxxxxxxxx>
+
+	* Makeconfig (CPPFLAGS): Prepend $(CPPFLAGS-config).
+	* config.make.in (CPPFLAGS-config): New substituted variable.
+
 2011-09-15  Ulrich Drepper  <drepper@xxxxxxxxx>
 
 	* sysdeps/ieee754/dbl-64/wordsize-64/s_finite.c: New file.

Modified: fsf/trunk/libc/Makeconfig
==============================================================================
--- fsf/trunk/libc/Makeconfig (original)
+++ fsf/trunk/libc/Makeconfig Tue Sep 20 00:02:22 2011
@@ -703,7 +703,7 @@
 # Note that we can't use -std=* in CPPFLAGS, because it overrides
 # the implicit -lang-asm and breaks cpp behavior for .S files--notably
 # it causes cpp to stop predefining __ASSEMBLER__.
-CPPFLAGS = $($(subdir)-CPPFLAGS) $(+includes) $(defines) \
+CPPFLAGS = $(CPPFLAGS-config) $($(subdir)-CPPFLAGS) $(+includes) $(defines) \
 	   -include $(..)include/libc-symbols.h $(sysdep-CPPFLAGS) \
 	   $(CPPFLAGS-$(suffix $@)) \
 	   $(foreach lib,$(libof-$(basename $(@F))) \

Modified: fsf/trunk/libc/Makerules
==============================================================================
--- fsf/trunk/libc/Makerules (original)
+++ fsf/trunk/libc/Makerules Tue Sep 20 00:02:22 2011
@@ -1260,11 +1260,7 @@
 endif
 
 ifeq ($(firstword $(sysd-sorted-done) f)$(firstword $(generating) f),tf)
--include $(common-objpfx)tls.make
-config-tls := tls
-ifeq ($(use-thread),yes)
 config-tls := thread
-endif
 check-abi-config := \
   $(config-machine)-$(config-vendor)-$(config-os)/$(config-tls)
 endif

Modified: fsf/trunk/libc/config.make.in
==============================================================================
--- fsf/trunk/libc/config.make.in (original)
+++ fsf/trunk/libc/config.make.in Tue Sep 20 00:02:22 2011
@@ -106,6 +106,7 @@
 CXX = @CXX@
 BUILD_CC = @BUILD_CC@
 CFLAGS = @CFLAGS@
+CPPFLAGS-config = @CPPFLAGS@
 ASFLAGS-config = @ASFLAGS_config@
 AR = @AR@
 MAKEINFO = @MAKEINFO@

Modified: fsf/trunk/libc/sysdeps/posix/spawni.c
==============================================================================
--- fsf/trunk/libc/sysdeps/posix/spawni.c (original)
+++ fsf/trunk/libc/sysdeps/posix/spawni.c Tue Sep 20 00:02:22 2011
@@ -39,7 +39,6 @@
 #define SPAWN_ERROR	127
 
 
-#if SHLIB_COMPAT (libc, GLIBC_2_2, GLIBC_2_15)
 /* The file is accessible but it is not an executable file.  Invoke
    the shell to interpret it as a script.  */
 static void
@@ -66,11 +65,16 @@
     __execve (new_argv[0], new_argv, envp);
   }
 }
-# define tryshell (xflags & SPAWN_XFLAGS_TRY_SHELL)
-#else
-# define tryshell 0
-#endif
-
+
+static inline void
+maybe_script_execute (const char *file, char *const argv[], char *const envp[],
+                      int xflags)
+{
+  if (SHLIB_COMPAT (libc, GLIBC_2_2, GLIBC_2_15)
+      && (xflags & SPAWN_XFLAGS_TRY_SHELL)
+      && errno == ENOEXEC)
+    script_execute (file, argv, envp);
+}
 
 /* Spawn a new process executing PATH with the attributes describes in *ATTRP.
    Before running the process perform the actions described in FILE-ACTIONS. */
@@ -237,8 +241,7 @@
       /* The FILE parameter is actually a path.  */
       __execve (file, argv, envp);
 
-      if (tryshell && errno == ENOEXEC)
-	script_execute (file, argv, envp);
+      maybe_script_execute (file, argv, envp, xflags);
 
       /* Oh, oh.  `execve' returns.  This is bad.  */
       _exit (SPAWN_ERROR);
@@ -283,8 +286,7 @@
       /* Try to execute this name.  If it works, execv will not return.  */
       __execve (startp, argv, envp);
 
-      if (tryshell && errno == ENOEXEC)
-	script_execute (startp, argv, envp);
+      maybe_script_execute (startp, argv, envp, xflags);
 
       switch (errno)
 	{

Removed: fsf/trunk/libc/tls.make.c
==============================================================================
--- fsf/trunk/libc/tls.make.c (original)
+++ fsf/trunk/libc/tls.make.c (removed)
@@ -1,5 +1,0 @@
-/* This produces a makefile fragment saying `use-thread = yes' or no.  */
-
-#include <tls.h>
-
-@@@ use-thread = yes @@@