aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH.J. Lu <hongjiu.lu@intel.com>2009-05-21 18:38:11 -0700
committerUlrich Drepper <drepper@redhat.com>2009-05-21 18:38:11 -0700
commite7535de78f5e027e91cab6d4288a45b03ba0097f (patch)
treee23fee4308cc2fd8be0af5d3f20df4e57a969687
parent3533b1a6a6a6b7e350b7a9459f8152b1f9f0364a (diff)
downloadglibc-e7535de78f5e027e91cab6d4288a45b03ba0097f.tar
glibc-e7535de78f5e027e91cab6d4288a45b03ba0097f.tar.gz
glibc-e7535de78f5e027e91cab6d4288a45b03ba0097f.tar.bz2
glibc-e7535de78f5e027e91cab6d4288a45b03ba0097f.zip
Add missing .text directives.
The ____longjmp_chk functions on x86 and x86-64 were placed in .rodata.str1.1.
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/i386/__longjmp.S1
-rw-r--r--sysdeps/x86_64/__longjmp.S3
3 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 5ff02794b5..bbd282c08c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-21 H.J. Lu <hongjiu.lu@intel.com>
+
+ * sysdeps/i386/__longjmp.S: Add .text.
+ * sysdeps/x86_64/__longjmp.S: Likewise.
+
2009-05-21 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/kernel-features.h: Don't define
diff --git a/sysdeps/i386/__longjmp.S b/sysdeps/i386/__longjmp.S
index 15c9e55ec7..8b0732056a 100644
--- a/sysdeps/i386/__longjmp.S
+++ b/sysdeps/i386/__longjmp.S
@@ -28,6 +28,7 @@
#define JBUF PARMS
#define VAL JBUF+PTR_SIZE
+ .text
ENTRY (BP_SYM (__longjmp))
ENTER
diff --git a/sysdeps/x86_64/__longjmp.S b/sysdeps/x86_64/__longjmp.S
index 7649e99242..24552ece37 100644
--- a/sysdeps/x86_64/__longjmp.S
+++ b/sysdeps/x86_64/__longjmp.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001,2004,2005,2006 Free Software Foundation, Inc.
+/* Copyright (C) 2001,2004,2005,2006,2009 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
@@ -23,6 +23,7 @@
/* Jump to the position specified by ENV, causing the
setjmp call there to return VAL, or 1 if VAL is 0.
void __longjmp (__jmp_buf env, int val). */
+ .text
ENTRY(__longjmp)
/* Restore registers. */
movq (JB_RSP*8)(%rdi),%r8