diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | sysdeps/sh/____longjmp_chk.S | 14 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sh/____longjmp_chk.S | 12 |
3 files changed, 13 insertions, 17 deletions
@@ -1,5 +1,9 @@ 2012-06-23 Thomas Schwinge <thomas@codesourcery.com> + * sysdeps/sh/____longjmp_chk.S (CALL_FAIL): Don't plan for the call to + __fortify_fail returning. + * sysdeps/unix/sysv/linux/sh/____longjmp_chk.S (CALL_FAIL): Likewise. + * sysdeps/unix/sysv/linux/sh/____longjmp_chk.S: New file, based on sysdeps/sh/____longjmp_chk.S. * sysdeps/unix/sysv/linux/sh/sigaltstack-offsets.sym: New file, based diff --git a/sysdeps/sh/____longjmp_chk.S b/sysdeps/sh/____longjmp_chk.S index 5d17f3a..e8d5f68 100644 --- a/sysdeps/sh/____longjmp_chk.S +++ b/sysdeps/sh/____longjmp_chk.S @@ -1,4 +1,4 @@ -/* Copyright (C) 2009 Free Software Foundation, Inc. +/* Copyright (C) 2009-2012 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 @@ -33,31 +33,27 @@ longjmp_msg: add r0, r12; \ bsrf r1; \ add r12, r4; \ + /* Unreachable. */ \ .Lfail0: \ - bra 0f; \ - nop; \ .align 2; \ .Lgot: \ .long _GLOBAL_OFFSET_TABLE_; \ .Lstr: \ .long longjmp_msg@GOTOFF; \ .Lfail: \ - .long __GI___fortify_fail@PLT-(.Lfail0-.); \ -0: + .long __GI___fortify_fail@PLT-(.Lfail0-.); #else # define CALL_FAIL \ mov.l .Lfail, r1; \ mov.l .Lstr, r4; \ jsr @r1; \ nop; \ - bra 0f; \ - nop; \ + /* Unreachable. */ \ .align 2; \ .Lstr: \ .long longjmp_msg; \ .Lfail: \ - .long __fortify_fail; \ -0: + .long __fortify_fail; #endif #define CHECK_SP(reg) \ diff --git a/sysdeps/unix/sysv/linux/sh/____longjmp_chk.S b/sysdeps/unix/sysv/linux/sh/____longjmp_chk.S index d034afc..bcf828b 100644 --- a/sysdeps/unix/sysv/linux/sh/____longjmp_chk.S +++ b/sysdeps/unix/sysv/linux/sh/____longjmp_chk.S @@ -38,30 +38,26 @@ longjmp_msg: bsrf r1; \ add r12, r4; \ .Lfail0: \ - bra 0f; \ - nop; \ + /* Unreachable. */ \ .align 2; \ .Lgot: \ .long _GLOBAL_OFFSET_TABLE_; \ .Lstr: \ .long longjmp_msg@GOTOFF; \ .Lfail: \ - .long __GI___fortify_fail@PLT-(.Lfail0-.); \ -0: + .long __GI___fortify_fail@PLT-(.Lfail0-.); #else # define CALL_FAIL \ mov.l .Lfail, r1; \ mov.l .Lstr, r4; \ jsr @r1; \ nop; \ - bra 0f; \ - nop; \ + /* Unreachable. */ \ .align 2; \ .Lstr: \ .long longjmp_msg; \ .Lfail: \ - .long __fortify_fail; \ -0: + .long __fortify_fail; #endif #define CHECK_SP(reg) \ |