sysdeps/sh/dl-machine.h: Define ELF_MACHINE_RUNTIME_FIXUP_PARAMS.

Cherry-pick commit d072f3f7724d85ceaf230806660235f0cf2f9c3b

Conflicts:
	ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 368ede106e6f395182fde4939077971f0d1b47f0..133ee1b97f6d70d4273c74ea8526a45b26b01229 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-20  Thomas Schwinge  <thomas@codesourcery.com>
+
+       * sysdeps/sh/dl-machine.h (ELF_MACHINE_RUNTIME_FIXUP_PARAMS): New
+       macro.
+
 2012-11-14  H.J. Lu  <hongjiu.lu@intel.com>
 
        [BZ #14831]

diff --git a/sysdeps/sh/dl-machine.h b/sysdeps/sh/dl-machine.h
index 53656aff929c01b2ff0247d35256a2077a84b7ba..1bb5d156c2640e7597f4c4f7a62dbd45bb9665e1 100644 (file)
--- a/sysdeps/sh/dl-machine.h
+++ b/sysdeps/sh/dl-machine.h
@@ -1,6 +1,5 @@
 /* Machine-dependent ELF dynamic relocation inline functions.  SH version.
-   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2011
-   Free Software Foundation, Inc.
+   Copyright (C) 1999-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -116,6 +115,7 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile)
 }
 
 #define ELF_MACHINE_RUNTIME_FIXUP_ARGS int plt_type
+#define ELF_MACHINE_RUNTIME_FIXUP_PARAMS plt_type
 
 /* Mask identifying addresses reserved for the user program,
    where the dynamic linker should not map anything.  */