GNU C Library master sources branch master updated. glibc-2.28.9000-590-g83e6b59

[azanella at sourceware dot org]

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  83e6b59625f45db1eee93e5684091f740c52a083 (commit)
      from  b96e22d080688867d24a9015fd50c199144d0e47 (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=83e6b59625f45db1eee93e5684091f740c52a083

commit 83e6b59625f45db1eee93e5684091f740c52a083
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date:   Fri Jan 25 08:10:15 2019 -0200

    [elf] Revert 8e889c5da3 (BZ#24122)
    
    It triggers an invalid build issue on GCC8+ and does not covers all
    corner cases.

diff --git a/elf/Makefile b/elf/Makefile
index c24d765..9cf5cd8 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -187,7 +187,7 @@ tests += restest1 preloadtest loadfail multiload origtest resolvfail \
 	 tst-nodelete2 tst-audit11 tst-audit12 tst-dlsym-error tst-noload \
 	 tst-latepthread tst-tls-manydynamic tst-nodelete-dlclose \
 	 tst-debug1 tst-main1 tst-absolute-sym tst-absolute-zero tst-big-note \
-	 tst-unwind-ctor tst-unwind-main tst-audit13
+	 tst-unwind-ctor tst-unwind-main
 #	 reldep9
 tests-internal += loadtest unload unload2 circleload1 \
 	 neededtest neededtest2 neededtest3 neededtest4 \
@@ -275,8 +275,7 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \
 		tst-latepthreadmod $(tst-tls-many-dynamic-modules) \
 		tst-nodelete-dlclose-dso tst-nodelete-dlclose-plugin \
 		tst-main1mod tst-libc_dlvsym-dso tst-absolute-sym-lib \
-		tst-absolute-zero-lib tst-big-note-lib tst-unwind-ctor-lib \
-		tst-audit13mod1
+		tst-absolute-zero-lib tst-big-note-lib tst-unwind-ctor-lib
 # Most modules build with _ISOMAC defined, but those filtered out
 # depend on internal headers.
 modules-names-tests = $(filter-out ifuncmod% tst-libc_dlvsym-dso tst-tlsmod%,\
@@ -1383,10 +1382,6 @@ tst-audit12-ENV = LD_AUDIT=$(objpfx)tst-auditmod12.so
 $(objpfx)tst-audit12mod1.so: $(objpfx)tst-audit12mod2.so
 LDFLAGS-tst-audit12mod2.so = -Wl,--version-script=tst-audit12mod2.map
 
-$(objpfx)tst-audit13.out: $(objpfx)tst-audit13mod1.so
-LDFLAGS-tst-audit13mod1.so = -Wl,-z,lazy
-tst-audit13-ENV = LD_AUDIT=$(objpfx)tst-audit13mod1.so
-
 # Override -z defs, so that we can reference an undefined symbol.
 # Force lazy binding for the same reason.
 LDFLAGS-tst-latepthreadmod.so = \
diff --git a/elf/rtld.c b/elf/rtld.c
index 9e0f752..5d97f41 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -1453,12 +1453,10 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
 
 	      unsigned int (*laversion) (unsigned int);
 	      unsigned int lav;
-	      if (err_str != NULL)
-		goto not_loaded;
-
-	      if ((laversion = largs.result) != NULL
-		  && (lav = laversion (LAV_CURRENT)) > 0
-		  && lav <= LAV_CURRENT)
+	      if  (err_str == NULL
+		   && (laversion = largs.result) != NULL
+		   && (lav = laversion (LAV_CURRENT)) > 0
+		   && lav <= LAV_CURRENT)
 		{
 		  /* Allocate structure for the callback function pointers.
 		     This call can never fail.  */
@@ -1540,25 +1538,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
 		  assert (GL(dl_ns)[ns]._ns_nloaded == 0);
 
 		  GL(dl_tls_max_dtv_idx) = tls_idx;
-		  if (GLRO(dl_debug_mask) & DL_DEBUG_FILES)
-		    {
-		      _dl_debug_printf ("\
-\nfile=%s cannot be loaded as audit interface; ignored.\n", name);
-		      if (laversion == NULL)
-			_dl_debug_printf (
-"  la_version function not found.\n");
-		      else
-			{
-			  if (lav == 0)
-			    _dl_debug_printf (
-"  auditor requested to be ignored (returned version of 0).\n");
-			  else
-			    _dl_debug_printf (
-"  auditor disabled since expected version %d is greater than "
-"supported version %d.\n",
-					      lav, LAV_CURRENT);
-			}
-		    }
+		  goto not_loaded;
 		}
 	    }
 	}
diff --git a/elf/tst-audit13.c b/elf/tst-audit13.c
deleted file mode 100644
index 6f587ba..0000000
--- a/elf/tst-audit13.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Check for invalid audit version (BZ#24122).
-   Copyright (C) 2019 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 <stdio.h>
-
-static int
-do_test (void)
-{
-  puts ("plt call");
-  return 0;
-}
-
-#include <support/test-driver.c>
diff --git a/elf/tst-audit13mod1.c b/elf/tst-audit13mod1.c
deleted file mode 100644
index cf017e2..0000000
--- a/elf/tst-audit13mod1.c
+++ /dev/null
@@ -1,93 +0,0 @@
-/* Check for invalid audit version (BZ#24122).
-   Copyright (C) 2019 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 <link.h>
-#include <stdlib.h>
-
-unsigned int
-la_version (unsigned int version)
-{
-  /* The audit specification says that a version of 0 or a version
-     greater than any version supported by the dynamic loader shall
-     cause the module to be ignored.  */
-  return 0;
-}
-
-void
-la_activity (uintptr_t *cookie, unsigned int flag)
-{
-  exit (EXIT_FAILURE);
-}
-
-char *
-la_objsearch (const char *name, uintptr_t *cookie, unsigned int flag)
-{
-  exit (EXIT_FAILURE);
-}
-
-unsigned int
-la_objopen (struct link_map *map, Lmid_t lmid, uintptr_t * cookie)
-{
-  exit (EXIT_FAILURE);
-}
-
-void
-la_preinit (uintptr_t * cookie)
-{
-  exit (EXIT_FAILURE);
-}
-
-uintptr_t
-#if __ELF_NATIVE_CLASS == 32
-la_symbind32 (Elf32_Sym *sym, unsigned int ndx, uintptr_t *refcook,
-              uintptr_t *defcook, unsigned int *flags, const char *symname)
-#else
-la_symbind64 (Elf64_Sym *sym, unsigned int ndx, uintptr_t *refcook,
-              uintptr_t *defcook, unsigned int *flags, const char *symname)
-#endif
-{
-  exit (EXIT_FAILURE);
-}
-
-unsigned int
-la_objclose (uintptr_t * cookie)
-{
-  exit (EXIT_FAILURE);
-}
-
-#include <tst-audit.h>
-#if (!defined (pltenter) || !defined (pltexit) || !defined (La_regs) \
-     || !defined (La_retval) || !defined (int_retval))
-# error "architecture specific code needed in sysdeps/CPU/tst-audit.h"
-#endif
-
-ElfW(Addr)
-pltenter (ElfW(Sym) *sym, unsigned int ndx, uintptr_t *refcook,
-          uintptr_t *defcook, La_regs *regs, unsigned int *flags,
-          const char *symname, long int *framesizep)
-{
-  exit (EXIT_FAILURE);
-}
-
-unsigned int
-pltexit (ElfW(Sym) *sym, unsigned int ndx, uintptr_t *refcook,
-         uintptr_t *defcook, const La_regs *inregs, La_retval *outregs,
-         const char *symname)
-{
-  exit (EXIT_FAILURE);
-}

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

Summary of changes:
 elf/Makefile          |    9 +----
 elf/rtld.c            |   30 +++-------------
 elf/tst-audit13.c     |   28 ---------------
 elf/tst-audit13mod1.c |   93 -------------------------------------------------
 4 files changed, 7 insertions(+), 153 deletions(-)
 delete mode 100644 elf/tst-audit13.c
 delete mode 100644 elf/tst-audit13mod1.c


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