diff mbox

[2.6.34-rc2] sh: Fix FDPIC binary loader

Message ID 4BAC849A.9090403@codesourcery.com (mailing list archive)
State Accepted
Commit 4a71997a3279a339e7336ea5d0cd27282e2dea44
Headers show

Commit Message

Andrew Stubbs March 26, 2010, 9:55 a.m. UTC 
None
diff mbox

Patch

diff --git a/arch/sh/include/asm/elf.h b/arch/sh/include/asm/elf.h
index ac04255..b2fefb3 100644
--- a/arch/sh/include/asm/elf.h
+++ b/arch/sh/include/asm/elf.h
@@ -211,15 +211,17 @@  extern void __kernel_vsyscall;

  #define VSYSCALL_AUX_ENT                                       \
         if (vdso_enabled)                                       \
-               NEW_AUX_ENT(AT_SYSINFO_EHDR, VDSO_BASE);
+               NEW_AUX_ENT(AT_SYSINFO_EHDR, VDSO_BASE);        \
+       else                                                    \
+               NEW_AUX_ENT(AT_IGNORE, 0); /* Match AT_VECTOR_SIZE_ARCH.  */
  #else
-#define VSYSCALL_AUX_ENT
+#define VSYSCALL_AUX_ENT NEW_AUX_ENT(AT_IGNORE, 0);
  #endif /* CONFIG_VSYSCALL */

  #ifdef CONFIG_SH_FPU
  #define FPU_AUX_ENT    NEW_AUX_ENT(AT_FPUCW, FPSCR_INIT)
  #else
-#define FPU_AUX_ENT
+#define FPU_AUX_ENT    NEW_AUX_ENT(AT_IGNORE, 0);
  #endif

  extern int l1i_cache_shape, l1d_cache_shape, l2_cache_shape;