From e7535de78f5e027e91cab6d4288a45b03ba0097f Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Thu, 21 May 2009 18:38:11 -0700 Subject: [PATCH] Add missing .text directives. The ____longjmp_chk functions on x86 and x86-64 were placed in .rodata.str1.1. --- ChangeLog | 5 +++++ sysdeps/i386/__longjmp.S | 1 + sysdeps/x86_64/__longjmp.S | 3 ++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5ff02794b5..bbd282c08c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-05-21 H.J. Lu + + * sysdeps/i386/__longjmp.S: Add .text. + * sysdeps/x86_64/__longjmp.S: Likewise. + 2009-05-21 Ulrich Drepper * 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