Blame SOURCES/ltrace-0.7.91-s390-irelative.patch

d947ed
@@ -, +, @@ 
d947ed
---
d947ed
 sysdeps/linux-gnu/s390/arch.h |  2 ++
d947ed
 sysdeps/linux-gnu/s390/plt.c  | 22 ++++++++++++++++++++++
d947ed
 2 files changed, 24 insertions(+)
d947ed
--- a/sysdeps/linux-gnu/s390/arch.h	
d947ed
+++ a/sysdeps/linux-gnu/s390/arch.h	
d947ed
@@ -1,5 +1,6 @@ 
d947ed
 /*
d947ed
  * This file is part of ltrace.
d947ed
+ * Copyright (C) 2013 Petr Machata, Red Hat Inc.
d947ed
  * Copyright (C) 2001 IBM Poughkeepsie, IBM Corporation
d947ed
  *
d947ed
  * This program is free software; you can redistribute it and/or
d947ed
@@ -25,6 +26,7 @@ 
d947ed
 #define ARCH_HAVE_FETCH_ARG
d947ed
 #define ARCH_HAVE_SIZEOF
d947ed
 #define ARCH_HAVE_ALIGNOF
d947ed
+#define ARCH_HAVE_ADD_PLT_ENTRY
d947ed
 
d947ed
 #define LT_ELFCLASS	ELFCLASS32
d947ed
 #define LT_ELF_MACHINE	EM_S390
d947ed
--- a/sysdeps/linux-gnu/s390/plt.c	
d947ed
+++ a/sysdeps/linux-gnu/s390/plt.c	
d947ed
@@ -1,5 +1,6 @@ 
d947ed
 /*
d947ed
  * This file is part of ltrace.
d947ed
+ * Copyright (C) 2013 Petr Machata, Red Hat Inc.
d947ed
  * Copyright (C) 2004,2008,2009 Juan Cespedes
d947ed
  *
d947ed
  * This program is free software; you can redistribute it and/or
d947ed
@@ -19,9 +20,12 @@ 
d947ed
  */
d947ed
 
d947ed
 #include <gelf.h>
d947ed
+#include <stdbool.h>
d947ed
+
d947ed
 #include "proc.h"
d947ed
 #include "common.h"
d947ed
 #include "library.h"
d947ed
+#include "trace.h"
d947ed
 
d947ed
 GElf_Addr
d947ed
 arch_plt_sym_val(struct ltelf *lte, size_t ndx, GElf_Rela * rela) {
d947ed
@@ -33,3 +37,21 @@ sym2addr(struct process *proc, struct library_symbol *sym)
d947ed
 {
d947ed
 	return sym->enter_addr;
d947ed
 }
d947ed
+
d947ed
+enum plt_status
d947ed
+arch_elf_add_plt_entry(struct process *proc, struct ltelf *lte,
d947ed
+		       const char *a_name, GElf_Rela *rela, size_t ndx,
d947ed
+		       struct library_symbol **ret)
d947ed
+{
d947ed
+#ifdef R_390_IRELATIVE
d947ed
+	bool irelative = GELF_R_TYPE(rela->r_info) == R_390_IRELATIVE;
d947ed
+#else
d947ed
+	bool irelative = false;
d947ed
+#endif
d947ed
+
d947ed
+	if (irelative)
d947ed
+		return linux_elf_add_plt_entry_irelative(proc, lte, rela,
d947ed
+							 ndx, ret);
d947ed
+
d947ed
+	return PLT_DEFAULT;
d947ed
+}
d947ed
--