# HG changeset patch
# Parent  168b3d6c2495c47b38ad3ec05d5ac3f3e6347113
Create a generalized exec hook that different architectures can hook
into if they need to, but default to no action.

diff -r 168b3d6c2495 libexec/rtld-elf/aarch64/rtld_machdep.h
--- a/libexec/rtld-elf/aarch64/rtld_machdep.h
+++ b/libexec/rtld-elf/aarch64/rtld_machdep.h
@@ -80,4 +80,6 @@ extern void *__tls_get_addr(tls_index *t
 #define	RTLD_DEFAULT_STACK_PF_EXEC	PF_X
 #define	RTLD_DEFAULT_STACK_EXEC		PROT_EXEC
 
+#define md_abi_variant_hook(x)
+
 #endif
diff -r 168b3d6c2495 libexec/rtld-elf/amd64/rtld_machdep.h
--- a/libexec/rtld-elf/amd64/rtld_machdep.h
+++ b/libexec/rtld-elf/amd64/rtld_machdep.h
@@ -79,4 +79,6 @@ void *__tls_get_addr(tls_index *ti) __ex
 #define	RTLD_DEFAULT_STACK_PF_EXEC	PF_X
 #define	RTLD_DEFAULT_STACK_EXEC		PROT_EXEC
 
+#define md_abi_variant_hook(x)
+
 #endif
diff -r 168b3d6c2495 libexec/rtld-elf/arm/reloc.c
--- a/libexec/rtld-elf/arm/reloc.c
+++ b/libexec/rtld-elf/arm/reloc.c
@@ -18,6 +18,41 @@
 #include "paths.h"
 
 void
+arm_abi_variant_hook(Elf_Auxinfo **aux_info)
+{
+	Elf_Word ehdr;
+
+	/*
+	 * If we're running an old kenrel that doesn't provide any data fail
+	 * safe by doing nothing.
+	 */
+	if (aux_info[AT_EHDRFLAGS] == NULL)
+		return;
+	ehdr = aux_info[AT_EHDRFLAGS]->a_un.a_val;
+
+	/*
+	 * Hard float binaries are the default, and use the default paths and
+	 * such.
+	 */
+	if (ehdr & EF_ARM_VFP_FLOAT)
+		return;
+
+	/*
+	 * This is a soft float binary. We need to use the soft float
+	 * settings. For the moment, the standard library path includes the hard
+	 * float paths as well. When upgrading, we need to execute the wrong
+	 * kind of binary until we've installed the new binaries. We could go
+	 * off whether or not /lib/soft exists, but the simplicity of having it
+	 * in the path wins.
+	 */
+	ld_path_elf_hints = _PATH_SOFT_ELF_HINTS;
+	ld_path_libmap_conf = _PATH_SOFT_LIBMAP_CONF;
+	ld_path_rtld = _PATH_SOFT_RTLD;
+	ld_standard_library_path = SOFT_STANDARD_LIBRARY_PATH;
+	ld_env_prefix = LD_SOFT_;
+}
+
+void
 init_pltgot(Obj_Entry *obj)
 {       
 	if (obj->pltgot != NULL) {
diff -r 168b3d6c2495 libexec/rtld-elf/arm/rtld_machdep.h
--- a/libexec/rtld-elf/arm/rtld_machdep.h
+++ b/libexec/rtld-elf/arm/rtld_machdep.h
@@ -75,4 +75,9 @@ extern void *__tls_get_addr(tls_index *t
 #define	RTLD_DEFAULT_STACK_PF_EXEC	PF_X
 #define	RTLD_DEFAULT_STACK_EXEC		PROT_EXEC
 
+extern void arm_abi_variant_hook(Elf_Auxinfo **);
+
+#define md_abi_variant_hook(x)		arm_abi_variant_hook(x)
+#define RTLD_VARIANT_ENV_NAMES
+
 #endif
diff -r 168b3d6c2495 libexec/rtld-elf/i386/rtld_machdep.h
--- a/libexec/rtld-elf/i386/rtld_machdep.h
+++ b/libexec/rtld-elf/i386/rtld_machdep.h
@@ -80,4 +80,6 @@ void *__tls_get_addr(tls_index *ti) __ex
 #define	RTLD_DEFAULT_STACK_PF_EXEC	PF_X
 #define	RTLD_DEFAULT_STACK_EXEC		PROT_EXEC
 
+#define md_abi_variant_hook(x)
+
 #endif
diff -r 168b3d6c2495 libexec/rtld-elf/mips/rtld_machdep.h
--- a/libexec/rtld-elf/mips/rtld_machdep.h
+++ b/libexec/rtld-elf/mips/rtld_machdep.h
@@ -75,4 +75,6 @@ extern void *__tls_get_addr(tls_index *t
 #define	RTLD_DEFAULT_STACK_PF_EXEC	PF_X
 #define	RTLD_DEFAULT_STACK_EXEC		PROT_EXEC
 
+#define md_abi_variant_hook(x)
+
 #endif
diff -r 168b3d6c2495 libexec/rtld-elf/paths.h
--- a/libexec/rtld-elf/paths.h
+++ b/libexec/rtld-elf/paths.h
@@ -59,6 +59,12 @@
 #define	LD_			"LD_"
 #endif
 
+#define	_PATH_SOFT_ELF_HINTS	"/var/run/ld-elf-soft.so.hints"
+#define	_PATH_SOFT_LIBMAP_CONF	"/etc/libmap-soft.conf"
+#define	_PATH_SOFT_RTLD		"/libexec/ld-elf-soft.so.1"
+#define	SOFT_STANDARD_LIBRARY_PATH "/lib/soft:/usr/lib/soft:/lib:/usr/lib"
+#define	LD_SOFT_		"LD_SOFT_"
+
 extern char *ld_path_elf_hints;
 extern char *ld_path_libmap_conf;
 extern char *ld_path_rtld;
diff -r 168b3d6c2495 libexec/rtld-elf/powerpc/rtld_machdep.h
--- a/libexec/rtld-elf/powerpc/rtld_machdep.h
+++ b/libexec/rtld-elf/powerpc/rtld_machdep.h
@@ -90,4 +90,6 @@ extern void *__tls_get_addr(tls_index* t
 #define	RTLD_DEFAULT_STACK_PF_EXEC	PF_X
 #define	RTLD_DEFAULT_STACK_EXEC		PROT_EXEC
 
+#define md_abi_variant_hook(x)
+
 #endif
diff -r 168b3d6c2495 libexec/rtld-elf/powerpc64/rtld_machdep.h
--- a/libexec/rtld-elf/powerpc64/rtld_machdep.h
+++ b/libexec/rtld-elf/powerpc64/rtld_machdep.h
@@ -82,4 +82,6 @@ extern void *__tls_get_addr(tls_index* t
 #define	RTLD_DEFAULT_STACK_PF_EXEC	PF_X
 #define	RTLD_DEFAULT_STACK_EXEC		PROT_EXEC
 
+#define md_abi_variant_hook(x)
+
 #endif
diff -r 168b3d6c2495 libexec/rtld-elf/rtld.c
--- a/libexec/rtld-elf/rtld.c
+++ b/libexec/rtld-elf/rtld.c
@@ -419,6 +419,8 @@ func_ptr_type
 
     trust = !issetugid();
 
+    md_exec_hook(aux_info);
+
     ld_bind_now = getenv(_LD("BIND_NOW"));
     /* 
      * If the process is tainted, then we un-set the dangerous environment
diff -r 168b3d6c2495 libexec/rtld-elf/sparc64/rtld_machdep.h
--- a/libexec/rtld-elf/sparc64/rtld_machdep.h
+++ b/libexec/rtld-elf/sparc64/rtld_machdep.h
@@ -71,4 +71,6 @@ extern void *__tls_get_addr(tls_index *t
 #define	RTLD_DEFAULT_STACK_PF_EXEC	0
 #define	RTLD_DEFAULT_STACK_EXEC		0
 
+#define md_abi_variant_hook(x)
+
 #endif