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.16-ports-merge-391-g4ff2d4c

From: hjl at sourceware dot org
To: glibc-cvs at sourceware dot org
Date: 28 Sep 2012 18:34:37 -0000
Subject: GNU C Library master sources branch master updated. glibc-2.16-ports-merge-391-g4ff2d4c
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  4ff2d4c2f6926eb1a2e924d2baccc87e72e5470b (commit)
       via  f8419467bb24483eaa564ecce9b8b316ed90585a (commit)
       via  9bac1d8624d3c628b473e20823fb5a154896714c (commit)
       via  25f5f885c6c0cec20554ca7b6c71fd1b7b50f51c (commit)
      from  c18b7473cb88e49d9f59ac2b1d2c68692202313d (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://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=4ff2d4c2f6926eb1a2e924d2baccc87e72e5470b

commit 4ff2d4c2f6926eb1a2e924d2baccc87e72e5470b
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Fri Sep 28 09:42:08 2012 -0700

    Remove mips VERSYMIDX macro definition

diff --git a/ports/ChangeLog.mips b/ports/ChangeLog.mips
index 8c41753..9df62cc 100644
--- a/ports/ChangeLog.mips
+++ b/ports/ChangeLog.mips
@@ -1,3 +1,7 @@
+2012-09-28  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* sysdeps/mips/dl-trampoline.c (VERSYMIDX): Likewise.
+
 2012-08-27  Joseph Myers  <joseph@codesourcery.com>
 
 	* sysdeps/unix/sysv/linux/mips/kernel-features.h
diff --git a/ports/sysdeps/mips/dl-trampoline.c b/ports/sysdeps/mips/dl-trampoline.c
index 3454eb3..e4886cc 100644
--- a/ports/sysdeps/mips/dl-trampoline.c
+++ b/ports/sysdeps/mips/dl-trampoline.c
@@ -112,8 +112,6 @@ elf_machine_runtime_link_map (ElfW(Addr) gpreg, ElfW(Addr) stub_pc)
    generated by the gnu linker. */
 int _dl_mips_gnu_objects = 1;
 
-#define VERSYMIDX(sym)  (DT_NUM + DT_THISPROCNUM + DT_VERSIONTAGIDX (sym))
-
 /* This is called from assembly stubs below which the compiler can't see.  */
 static ElfW(Addr)
 __dl_runtime_resolve (ElfW(Word), ElfW(Word), ElfW(Addr), ElfW(Addr))

http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=f8419467bb24483eaa564ecce9b8b316ed90585a

commit f8419467bb24483eaa564ecce9b8b316ed90585a
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Fri Sep 28 09:41:16 2012 -0700

    Remove arm ADDRIDX macro definition

diff --git a/ports/ChangeLog.arm b/ports/ChangeLog.arm
index b6c0225..6fb7cba 100644
--- a/ports/ChangeLog.arm
+++ b/ports/ChangeLog.arm
@@ -1,3 +1,7 @@
+2012-09-28  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* sysdeps/arm/dl-tlsdesc.h (ADDRIDX): Removed.
+
 2012-09-21  Joseph Myers  <joseph@codesourcery.com>
 
 	* sysdeps/arm/bits/atomic.h [!__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4]
diff --git a/ports/sysdeps/arm/dl-tlsdesc.h b/ports/sysdeps/arm/dl-tlsdesc.h
index 2b1131c..97951c0 100644
--- a/ports/sysdeps/arm/dl-tlsdesc.h
+++ b/ports/sysdeps/arm/dl-tlsdesc.h
@@ -20,12 +20,6 @@
 #ifndef _ARM_DL_TLSDESC_H
 # define _ARM_DL_TLSDESC_H 1
 
-/* Use this to access DT_TLSDESC_PLT and DT_TLSDESC_GOT.  */
-#ifndef ADDRIDX
-# define ADDRIDX(tag) (DT_NUM + DT_THISPROCNUM + DT_VERSIONTAGNUM \
-		       + DT_EXTRANUM + DT_VALNUM + DT_ADDRTAGIDX (tag))
-#endif
-
 /* Type used to represent a TLS descriptor in the GOT.  */
 struct tlsdesc
 {

http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=9bac1d8624d3c628b473e20823fb5a154896714c

commit 9bac1d8624d3c628b473e20823fb5a154896714c
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Fri Sep 28 11:30:57 2012 -0700

    Define VERSYMIDX/VALIDX/ADDRIDX in ldsodefs.h

diff --git a/ChangeLog b/ChangeLog
index 16e37d1..4374c71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2012-09-28  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf/dl-runtime.c (VERSYMIDX): Removed.
+	* elf/dl-version.c (VERSYMIDX): Likewise.
+	* elf/do-rel.h (VERSYMIDX): Likewise.
+	(VALIDX): Likewise.
+	* elf/dynamic-link.h (VERSYMIDX): Likewise.
+	* elf/rtld.c (VALIDX): Likewise.
+	(ADDRIDX): Likewise.
+	* sysdeps/generic/ldsodefs.h (VERSYMIDX): New macro.
+	(VALIDX): Likewise.
+	(ADDRIDX): Likewise.
+	* sysdeps/sparc/sparc32/dl-machine.h (VALIDX): Likewise.
+	* sysdeps/sparc/sparc64/dl-machine.h (VALIDX): Likewise.
+	* sysdeps/x86_64/dl-tlsdesc.h (ADDRIDX): Likewise.
+
 2012-09-28  Pino Toscano  <toscano.pino@tiscali.it>
 
 	* sysdeps/pthread/aio_fsync.c: Fix the file mode checking.
diff --git a/elf/dl-runtime.c b/elf/dl-runtime.c
index fdaa364..2e02a21 100644
--- a/elf/dl-runtime.c
+++ b/elf/dl-runtime.c
@@ -36,10 +36,6 @@
 # define PLTREL  ElfW(Rel)
 #endif
 
-#ifndef VERSYMIDX
-# define VERSYMIDX(sym)	(DT_NUM + DT_THISPROCNUM + DT_VERSIONTAGIDX (sym))
-#endif
-
 /* The fixup functions might have need special attributes.  If none
    are provided define the macro as empty.  */
 #ifndef ARCH_FIXUP_ATTRIBUTE
diff --git a/elf/dl-version.c b/elf/dl-version.c
index af7f899..b2ebb16 100644
--- a/elf/dl-version.c
+++ b/elf/dl-version.c
@@ -28,11 +28,6 @@
 #include <assert.h>
 
 
-#ifndef VERSYMIDX
-# define VERSYMIDX(tag)	(DT_NUM + DT_THISPROCNUM + DT_VERSIONTAGIDX (tag))
-#endif
-
-
 #define make_string(string, rest...) \
   ({									      \
     const char *all[] = { string, ## rest };				      \
diff --git a/elf/do-rel.h b/elf/do-rel.h
index 10d8f31..272b782 100644
--- a/elf/do-rel.h
+++ b/elf/do-rel.h
@@ -32,14 +32,6 @@
 			    (void *) (l_addr + relative->r_offset))
 #endif
 
-#ifndef VERSYMIDX
-# define VERSYMIDX(sym)	(DT_NUM + DT_THISPROCNUM + DT_VERSIONTAGIDX (sym))
-#endif
-#ifndef VALIDX
-# define VALIDX(tag) (DT_NUM + DT_THISPROCNUM + DT_VERSIONTAGNUM \
-		      + DT_EXTRANUM + DT_VALTAGIDX (tag))
-#endif
-
 /* Perform the relocations in MAP on the running program image as specified
    by RELTAG, SZTAG.  If LAZY is nonzero, this is the first pass on PLT
    relocations; they should be set up to call _dl_runtime_resolve, rather
diff --git a/elf/dynamic-link.h b/elf/dynamic-link.h
index 44f53b3..d982c52 100644
--- a/elf/dynamic-link.h
+++ b/elf/dynamic-link.h
@@ -88,10 +88,6 @@ elf_machine_lazy_rel (struct link_map *map,
 
 #include <dl-machine.h>
 
-#ifndef VERSYMIDX
-# define VERSYMIDX(sym)	(DT_NUM + DT_THISPROCNUM + DT_VERSIONTAGIDX (sym))
-#endif
-
 
 /* Read the dynamic section at DYN and fill in INFO with indices DT_*.  */
 #ifndef RESOLVE_MAP
diff --git a/elf/rtld.c b/elf/rtld.c
index ed0a86b..ed5d062 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -254,15 +254,6 @@ RTLD_START
 # error "sysdeps/MACHINE/dl-machine.h fails to define RTLD_START"
 #endif
 
-#ifndef VALIDX
-# define VALIDX(tag) (DT_NUM + DT_THISPROCNUM + DT_VERSIONTAGNUM \
-		      + DT_EXTRANUM + DT_VALTAGIDX (tag))
-#endif
-#ifndef ADDRIDX
-# define ADDRIDX(tag) (DT_NUM + DT_THISPROCNUM + DT_VERSIONTAGNUM \
-		       + DT_EXTRANUM + DT_VALNUM + DT_ADDRTAGIDX (tag))
-#endif
-
 /* This is the second half of _dl_start (below).  It can be inlined safely
    under DONT_USE_BOOTSTRAP_MAP, where it is careful not to make any GOT
    references.  When the tools don't permit us to avoid using a GOT entry
diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h
index 72048ea..c667e34 100644
--- a/sysdeps/generic/ldsodefs.h
+++ b/sysdeps/generic/ldsodefs.h
@@ -41,6 +41,12 @@
 
 __BEGIN_DECLS
 
+#define VERSYMIDX(sym)	(DT_NUM + DT_THISPROCNUM + DT_VERSIONTAGIDX (sym))
+#define VALIDX(tag)	(DT_NUM + DT_THISPROCNUM + DT_VERSIONTAGNUM \
+			 + DT_EXTRANUM + DT_VALTAGIDX (tag))
+#define ADDRIDX(tag)	(DT_NUM + DT_THISPROCNUM + DT_VERSIONTAGNUM \
+			 + DT_EXTRANUM + DT_VALNUM + DT_ADDRTAGIDX (tag))
+
 /* We use this macro to refer to ELF types independent of the native wordsize.
    `ElfW(TYPE)' is used in place of `Elf32_TYPE' or `Elf64_TYPE'.  */
 #define ELFW(type)	_ElfW (ELF, __ELF_NATIVE_CLASS, type)
diff --git a/sysdeps/sparc/sparc32/dl-machine.h b/sysdeps/sparc/sparc32/dl-machine.h
index 2dfeeb2..04ce785 100644
--- a/sysdeps/sparc/sparc32/dl-machine.h
+++ b/sysdeps/sparc/sparc32/dl-machine.h
@@ -29,11 +29,6 @@
 #include <tls.h>
 #include <dl-plt.h>
 
-#ifndef VALIDX
-# define VALIDX(tag) (DT_NUM + DT_THISPROCNUM + DT_VERSIONTAGNUM \
-		      + DT_EXTRANUM + DT_VALTAGIDX (tag))
-#endif
-
 /* Return nonzero iff ELF header is compatible with the running host.  */
 static inline int
 elf_machine_matches_host (const Elf32_Ehdr *ehdr)
diff --git a/sysdeps/sparc/sparc64/dl-machine.h b/sysdeps/sparc/sparc64/dl-machine.h
index 2f8bbe1..dec2fa0 100644
--- a/sysdeps/sparc/sparc64/dl-machine.h
+++ b/sysdeps/sparc/sparc64/dl-machine.h
@@ -27,11 +27,6 @@
 #include <sysdep.h>
 #include <dl-plt.h>
 
-#ifndef VALIDX
-# define VALIDX(tag) (DT_NUM + DT_THISPROCNUM + DT_VERSIONTAGNUM \
-		      + DT_EXTRANUM + DT_VALTAGIDX (tag))
-#endif
-
 #define ELF64_R_TYPE_ID(info)	((info) & 0xff)
 #define ELF64_R_TYPE_DATA(info) ((info) >> 8)
 
diff --git a/sysdeps/x86_64/dl-tlsdesc.h b/sysdeps/x86_64/dl-tlsdesc.h
index 06ede02..ec75090 100644
--- a/sysdeps/x86_64/dl-tlsdesc.h
+++ b/sysdeps/x86_64/dl-tlsdesc.h
@@ -20,12 +20,6 @@
 #ifndef _X86_64_DL_TLSDESC_H
 # define _X86_64_DL_TLSDESC_H 1
 
-/* Use this to access DT_TLSDESC_PLT and DT_TLSDESC_GOT.  */
-#ifndef ADDRIDX
-# define ADDRIDX(tag) (DT_NUM + DT_THISPROCNUM + DT_VERSIONTAGNUM \
-		       + DT_EXTRANUM + DT_VALNUM + DT_ADDRTAGIDX (tag))
-#endif
-
 /* Type used to represent a TLS descriptor in the GOT.  */
 struct tlsdesc
 {

http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=25f5f885c6c0cec20554ca7b6c71fd1b7b50f51c

commit 25f5f885c6c0cec20554ca7b6c71fd1b7b50f51c
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Fri Sep 28 11:25:56 2012 -0700

    Improve ChangeLog entry for x86_64 strncmp-ssse3.S

diff --git a/ChangeLog b/ChangeLog
index 207519b..16e37d1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -47,8 +47,8 @@
 
 2012-09-27  H.J. Lu  <hongjiu.lu@intel.com>
 
-	* sysdeps/x86_64/multiarch/strncmp-ssse3.S: Empty if not in
-	libc.so.
+	* sysdeps/x86_64/multiarch/strncmp-ssse3.S: Conditionalize
+	contents on [SHARED].
 
 2012-09-26  Marek Polacek  <polacek@redhat.com>
 

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

Summary of changes:
 ChangeLog                          |   20 ++++++++++++++++++--
 elf/dl-runtime.c                   |    4 ----
 elf/dl-version.c                   |    5 -----
 elf/do-rel.h                       |    8 --------
 elf/dynamic-link.h                 |    4 ----
 elf/rtld.c                         |    9 ---------
 ports/ChangeLog.arm                |    4 ++++
 ports/ChangeLog.mips               |    4 ++++
 ports/sysdeps/arm/dl-tlsdesc.h     |    6 ------
 ports/sysdeps/mips/dl-trampoline.c |    2 --
 sysdeps/generic/ldsodefs.h         |    6 ++++++
 sysdeps/sparc/sparc32/dl-machine.h |    5 -----
 sysdeps/sparc/sparc64/dl-machine.h |    5 -----
 sysdeps/x86_64/dl-tlsdesc.h        |    6 ------
 14 files changed, 32 insertions(+), 56 deletions(-)


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]