about summary refs log tree commit diff
diff options
context:
space:
mode:
authorKirill A. Shutemov <kirill@shutemov.name>2010-06-14 17:23:01 -0700
committerAndreas Schwab <schwab@redhat.com>2010-06-15 15:02:46 +0200
commit9a98163f266fee3ae00e2636b864e119b9cbf51f (patch)
tree4edd6729a5aae30c62fb1b8fa0065055ac9db6f7
parentedf8365a16069aa1b074c40982714f35486ad2b6 (diff)
downloadglibc-9a98163f266fee3ae00e2636b864e119b9cbf51f.tar.gz
glibc-9a98163f266fee3ae00e2636b864e119b9cbf51f.tar.xz
glibc-9a98163f266fee3ae00e2636b864e119b9cbf51f.zip
Flush cache after solving TEXTRELs if arch requires it.
(cherry picked from commit 80da2e093c0e465cfa6e561488aac51c236b6fd2)
-rw-r--r--ChangeLog5
-rw-r--r--elf/dl-reloc.c6
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e30fe1e41b..8590e355ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-02  Kirill A. Shutemov  <kirill@shutemov.name>
+
+	* elf/dl-reloc.c: Flush cache after solving TEXTRELs if arch
+	requires it.
+
 2010-06-02  Andreas Schwab  <schwab@redhat.com>
 
 	* nis/nss_nis/nis-initgroups.c (get_uid): Properly resize buffer.
diff --git a/elf/dl-reloc.c b/elf/dl-reloc.c
index 6c0069147d..23cb59cbc8 100644
--- a/elf/dl-reloc.c
+++ b/elf/dl-reloc.c
@@ -1,5 +1,5 @@
 /* Relocate a shared object and resolve its references to other loaded objects.
-   Copyright (C) 1995-2006, 2008, 2009 Free Software Foundation, Inc.
+   Copyright (C) 1995-2006, 2008, 2009, 2010 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
@@ -307,6 +307,10 @@ _dl_relocate_object (struct link_map *l, struct r_scope_elem *scope[],
 	  goto call_error;
 	}
 
+#ifdef CLEAR_CACHE
+      CLEAR_CACHE (textrels->start, textrels->start + textrels->len);
+#endif
+
       textrels = textrels->next;
     }