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 hjl/size/master created. glibc-2.17-119-gadc4a3e


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, hjl/size/master has been created
        at  adc4a3ee6aa83aace8c2ea8c69113290b9af372c (commit)

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

commit adc4a3ee6aa83aace8c2ea8c69113290b9af372c
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Wed Jan 16 07:34:59 2013 -0800

    Remove R_X86_64_SIZE

diff --git a/ChangeLog.size b/ChangeLog.size
index 8a5feb7..de38463 100644
--- a/ChangeLog.size
+++ b/ChangeLog.size
@@ -4,6 +4,5 @@
 	* sysdeps/i386/dl-machine.h (elf_machine_rel): Handle
 	R_386_SIZE32.
 	(elf_machine_rela): Likewise.
-	* sysdeps/x86_64/dl-machine.h (R_X86_64_SIZE): New macro.
-	(elf_machine_rela): Handle R_X86_64_SIZE64, R_X86_64_SIZE
-	and R_X86_64_SIZE32.
+	* sysdeps/x86_64/dl-machine.h (elf_machine_rela): Handle
+	R_X86_64_SIZE64 and R_X86_64_SIZE32.
diff --git a/sysdeps/x86_64/dl-machine.h b/sysdeps/x86_64/dl-machine.h
index e9a7cf4..4768c69 100644
--- a/sysdeps/x86_64/dl-machine.h
+++ b/sysdeps/x86_64/dl-machine.h
@@ -190,13 +190,6 @@ _dl_start_user:\n\
 /* The x86-64 never uses Elf64_Rel/Elf32_Rel relocations.  */
 #define ELF_MACHINE_NO_REL 1
 
-/* Size relocation.  */
-#ifdef __ILP32__
-# define R_X86_64_SIZE	R_X86_64_SIZE32
-#else
-# define R_X86_64_SIZE	R_X86_64_SIZE64
-#endif
-
 /* We define an initialization function.  This is called very early in
    _dl_sysdep_start.  */
 #define DL_PLATFORM_INIT dl_platform_init ()
@@ -300,9 +293,11 @@ elf_machine_rela (struct link_map *map, const ElfW(Rela) *reloc,
 	  *(Elf64_Addr *) (uintptr_t) reloc_addr
 	    = (Elf64_Addr) sym->st_size + reloc->r_addend;
 	  break;
-#  endif
 
-	case R_X86_64_SIZE:
+	case R_X86_64_SIZE32:
+#  else
+	case R_X86_64_SIZE64:
+#  endif
 	  /* Set to symbol size plus addend.  */
 	  value = sym->st_size;
 # endif

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

commit 634c5d8fb6419b1aa2ff95e704fa3f57f5bf1ccd
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Wed Jan 16 07:09:30 2013 -0800

    Remove extra ()

diff --git a/sysdeps/x86_64/dl-machine.h b/sysdeps/x86_64/dl-machine.h
index 382caa4..e9a7cf4 100644
--- a/sysdeps/x86_64/dl-machine.h
+++ b/sysdeps/x86_64/dl-machine.h
@@ -297,7 +297,7 @@ elf_machine_rela (struct link_map *map, const ElfW(Rela) *reloc,
 #  ifdef __ILP32__
 	case R_X86_64_SIZE64:
 	  /* Set to symbol size plus addend.  */
-	  *((Elf64_Addr *) (uintptr_t) reloc_addr)
+	  *(Elf64_Addr *) (uintptr_t) reloc_addr
 	    = (Elf64_Addr) sym->st_size + reloc->r_addend;
 	  break;
 #  endif

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

commit e08c0cf31f60c93d8c4902f7a90fcecbb955e17d
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Tue Jan 15 13:33:08 2013 -0800

    Implement x86 SIZE32/SIZE64 relocations

diff --git a/ChangeLog.size b/ChangeLog.size
new file mode 100644
index 0000000..8a5feb7
--- /dev/null
+++ b/ChangeLog.size
@@ -0,0 +1,9 @@
+2013-01-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* elf/elf.h (R_386_SIZE32): New relocation.
+	* sysdeps/i386/dl-machine.h (elf_machine_rel): Handle
+	R_386_SIZE32.
+	(elf_machine_rela): Likewise.
+	* sysdeps/x86_64/dl-machine.h (R_X86_64_SIZE): New macro.
+	(elf_machine_rela): Handle R_X86_64_SIZE64, R_X86_64_SIZE
+	and R_X86_64_SIZE32.
diff --git a/elf/elf.h b/elf/elf.h
index 9a31373..9bc5004 100644
--- a/elf/elf.h
+++ b/elf/elf.h
@@ -1229,7 +1229,7 @@ typedef struct
 #define R_386_TLS_DTPMOD32 35		/* ID of module containing symbol */
 #define R_386_TLS_DTPOFF32 36		/* Offset in TLS block */
 #define R_386_TLS_TPOFF32  37		/* Negated offset in static TLS block */
-/* 38? */
+#define R_386_SIZE32	   38 		/* 32-bit symbol size */
 #define R_386_TLS_GOTDESC  39		/* GOT offset for TLS descriptor.  */
 #define R_386_TLS_DESC_CALL 40		/* Marker of call through TLS
 					   descriptor for
diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h
index 9e36687..a1e40d8 100644
--- a/sysdeps/i386/dl-machine.h
+++ b/sysdeps/i386/dl-machine.h
@@ -348,6 +348,12 @@ elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc,
 
       switch (r_type)
 	{
+# ifndef RTLD_BOOTSTRAP
+	case R_386_SIZE32:
+	  /* Set to symbol size plus addend.  */
+	  *reloc_addr += sym->st_size;
+	  break;
+# endif
 	case R_386_GLOB_DAT:
 	case R_386_JMP_SLOT:
 	  *reloc_addr = value;
@@ -507,6 +513,9 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
 
       switch (ELF32_R_TYPE (reloc->r_info))
 	{
+	case R_386_SIZE32:
+	  /* Set to symbol size plus addend.  */
+	  value = sym->st_size;
 	case R_386_GLOB_DAT:
 	case R_386_JMP_SLOT:
 	case R_386_32:
diff --git a/sysdeps/x86_64/dl-machine.h b/sysdeps/x86_64/dl-machine.h
index 660f1aa..382caa4 100644
--- a/sysdeps/x86_64/dl-machine.h
+++ b/sysdeps/x86_64/dl-machine.h
@@ -190,6 +190,13 @@ _dl_start_user:\n\
 /* The x86-64 never uses Elf64_Rel/Elf32_Rel relocations.  */
 #define ELF_MACHINE_NO_REL 1
 
+/* Size relocation.  */
+#ifdef __ILP32__
+# define R_X86_64_SIZE	R_X86_64_SIZE32
+#else
+# define R_X86_64_SIZE	R_X86_64_SIZE64
+#endif
+
 /* We define an initialization function.  This is called very early in
    _dl_sysdep_start.  */
 #define DL_PLATFORM_INIT dl_platform_init ()
@@ -286,6 +293,19 @@ elf_machine_rela (struct link_map *map, const ElfW(Rela) *reloc,
 
       switch (r_type)
 	{
+# ifndef RTLD_BOOTSTRAP
+#  ifdef __ILP32__
+	case R_X86_64_SIZE64:
+	  /* Set to symbol size plus addend.  */
+	  *((Elf64_Addr *) (uintptr_t) reloc_addr)
+	    = (Elf64_Addr) sym->st_size + reloc->r_addend;
+	  break;
+#  endif
+
+	case R_X86_64_SIZE:
+	  /* Set to symbol size plus addend.  */
+	  value = sym->st_size;
+# endif
 	case R_X86_64_GLOB_DAT:
 	case R_X86_64_JUMP_SLOT:
 	  *reloc_addr = value + reloc->r_addend;
@@ -394,6 +414,11 @@ elf_machine_rela (struct link_map *map, const ElfW(Rela) *reloc,
 	     relocation updates the whole 64-bit entry.  */
 	  *(Elf64_Addr *) reloc_addr = (Elf64_Addr) value + reloc->r_addend;
 	  break;
+#  ifndef __ILP32__
+	case R_X86_64_SIZE32:
+	  /* Set to symbol size plus addend.  */
+	  value = sym->st_size;
+#  endif
 	case R_X86_64_32:
 	  value += reloc->r_addend;
 	  *(unsigned int *) reloc_addr = value;

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


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]