svn commit: r202642 - in stable/7/sys: amd64/include arm/include i386/include ia64/include powerpc/include sparc64/include sun4v/include

[Konstantin Belousov]

Author: kib
Date: Tue Jan 19 19:51:54 2010
New Revision: 202642
URL: http://svn.freebsd.org/changeset/base/202642

Log:
  MFC r197933:
  Define architectural load bases for PIE binaries.
  
  MFC r198203:
  Change the load base to below 2GB for sparc64/sun4v.

Modified:
  stable/7/sys/amd64/include/elf.h
  stable/7/sys/arm/include/elf.h
  stable/7/sys/i386/include/elf.h
  stable/7/sys/ia64/include/elf.h
  stable/7/sys/powerpc/include/elf.h
  stable/7/sys/sparc64/include/elf.h
  stable/7/sys/sun4v/include/elf.h
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/amd64/include/elf.h
==============================================================================
--- stable/7/sys/amd64/include/elf.h	Tue Jan 19 19:38:03 2010	(r202641)
+++ stable/7/sys/amd64/include/elf.h	Tue Jan 19 19:51:54 2010	(r202642)
@@ -106,4 +106,10 @@ __ElfType(Auxinfo);
 #define	ELF_TARG_MACH	EM_X86_64
 #define	ELF_TARG_VER	1
 
+#if __ELF_WORD_SIZE == 32
+#define	ET_DYN_LOAD_ADDR 0x01001000
+#else
+#define	ET_DYN_LOAD_ADDR 0x01021000
+#endif
+
 #endif /* !_MACHINE_ELF_H_ */

Modified: stable/7/sys/arm/include/elf.h
==============================================================================
--- stable/7/sys/arm/include/elf.h	Tue Jan 19 19:38:03 2010	(r202641)
+++ stable/7/sys/arm/include/elf.h	Tue Jan 19 19:51:54 2010	(r202642)
@@ -97,4 +97,7 @@ __ElfType(Auxinfo);
  * value.
  */
 #define MAGIC_TRAMP_NUMBER	0x5c000003
+
+#define	ET_DYN_LOAD_ADDR 0x12000
+
 #endif /* !_MACHINE_ELF_H_ */

Modified: stable/7/sys/i386/include/elf.h
==============================================================================
--- stable/7/sys/i386/include/elf.h	Tue Jan 19 19:38:03 2010	(r202641)
+++ stable/7/sys/i386/include/elf.h	Tue Jan 19 19:51:54 2010	(r202642)
@@ -105,4 +105,6 @@ __ElfType(Auxinfo);
 #define	ELF_TARG_MACH	EM_386
 #define	ELF_TARG_VER	1
 
+#define	ET_DYN_LOAD_ADDR 0x01001000
+
 #endif /* !_MACHINE_ELF_H_ */

Modified: stable/7/sys/ia64/include/elf.h
==============================================================================
--- stable/7/sys/ia64/include/elf.h	Tue Jan 19 19:38:03 2010	(r202641)
+++ stable/7/sys/ia64/include/elf.h	Tue Jan 19 19:51:54 2010	(r202642)
@@ -141,4 +141,6 @@ __ElfType(Auxinfo);
 
 #define	DT_IA_64_PLT_RESERVE	0x70000000
 
+#define	ET_DYN_LOAD_ADDR 0x2500000000000000
+
 #endif /* !_MACHINE_ELF_H_ */

Modified: stable/7/sys/powerpc/include/elf.h
==============================================================================
--- stable/7/sys/powerpc/include/elf.h	Tue Jan 19 19:38:03 2010	(r202641)
+++ stable/7/sys/powerpc/include/elf.h	Tue Jan 19 19:51:54 2010	(r202642)
@@ -96,4 +96,6 @@ __ElfType(Auxinfo);
 #define	ELF_TARG_MACH	EM_PPC
 #define	ELF_TARG_VER	1
 
+#define	ET_DYN_LOAD_ADDR 0x01010000
+
 #endif /* !_MACHINE_ELF_H_ */

Modified: stable/7/sys/sparc64/include/elf.h
==============================================================================
--- stable/7/sys/sparc64/include/elf.h	Tue Jan 19 19:38:03 2010	(r202641)
+++ stable/7/sys/sparc64/include/elf.h	Tue Jan 19 19:51:54 2010	(r202642)
@@ -97,4 +97,6 @@ __ElfType(Auxinfo);
 #define	ELF_TARG_MACH	ELF_ARCH
 #define	ELF_TARG_VER	1
 
+#define	ET_DYN_LOAD_ADDR 0x100000
+
 #endif /* !_MACHINE_ELF_H_ */

Modified: stable/7/sys/sun4v/include/elf.h
==============================================================================
--- stable/7/sys/sun4v/include/elf.h	Tue Jan 19 19:38:03 2010	(r202641)
+++ stable/7/sys/sun4v/include/elf.h	Tue Jan 19 19:51:54 2010	(r202642)
@@ -97,4 +97,6 @@ __ElfType(Auxinfo);
 #define	ELF_TARG_MACH	ELF_ARCH
 #define	ELF_TARG_VER	1
 
+#define	ET_DYN_LOAD_ADDR 0x100000
+
 #endif /* !_MACHINE_ELF_H_ */