From 8dbb7a08ec52057819db4ee234f9429ab99eb4ae Mon Sep 17 00:00:00 2001 From: Vineet Gupta Date: Wed, 27 May 2020 12:54:21 -0700 Subject: dl-runtime: reloc_{offset,index} now functions arch overide'able The existing macros are fragile and expect local variables with a certain name. Fix this by defining them as functions with default implementation in a new header dl-runtime.h which arches can override if need be. This came up during ARC port review, hence the need for argument pltgot in reloc_index() which is not needed by existing ports. This patch potentially only affects hppa/x86 ports, build tested for both those configs and a few more. Reviewed-by: Adhemerval Zanella --- sysdeps/hppa/dl-runtime.c | 4 ---- sysdeps/hppa/dl-runtime.h | 31 +++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 sysdeps/hppa/dl-runtime.h (limited to 'sysdeps/hppa') diff --git a/sysdeps/hppa/dl-runtime.c b/sysdeps/hppa/dl-runtime.c index 885a3f1837..2d061b150f 100644 --- a/sysdeps/hppa/dl-runtime.c +++ b/sysdeps/hppa/dl-runtime.c @@ -17,10 +17,6 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -/* Clear PA_GP_RELOC bit in relocation offset. */ -#define reloc_offset (reloc_arg & ~PA_GP_RELOC) -#define reloc_index (reloc_arg & ~PA_GP_RELOC) / sizeof (PLTREL) - #include /* The caller has encountered a partially relocated function descriptor. diff --git a/sysdeps/hppa/dl-runtime.h b/sysdeps/hppa/dl-runtime.h new file mode 100644 index 0000000000..6983aa0ae9 --- /dev/null +++ b/sysdeps/hppa/dl-runtime.h @@ -0,0 +1,31 @@ +/* Helpers for On-demand PLT fixup for shared objects. HPAA version. + Copyright (C) 2020 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 + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +/* Clear PA_GP_RELOC bit in relocation offset. */ +static inline uintptr_t +reloc_offset (uintptr_t plt0, uintptr_t pltn) +{ + return pltn & ~PA_GP_RELOC; +} + +static inline uintptr_t +reloc_index (uintptr_t plt0, uintptr_t pltn, size_t size) +{ + return (pltn & ~PA_GP_RELOC )/ size; +} -- cgit 1.4.1