diff options
author | Jakub Jelinek <jakub@redhat.com> | 2005-07-02 10:52:21 +0200 |
---|---|---|
committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2005-07-02 10:52:21 +0200 |
commit | 77008252819720c987f11b3dade670e2b3ba09b8 (patch) | |
tree | 1cb854702400de0149fb900c82b137e5603e222b /libssp/sprintf-chk.c | |
parent | f60d648137b2d2cda1c598996b9598d559715117 (diff) | |
download | gcc-77008252819720c987f11b3dade670e2b3ba09b8.zip gcc-77008252819720c987f11b3dade670e2b3ba09b8.tar.gz gcc-77008252819720c987f11b3dade670e2b3ba09b8.tar.bz2 |
Makefile.def (target_modules): Add libssp.
* Makefile.def (target_modules): Add libssp.
* configure.in (target_libraries): Add target-libssp.
* configure: Rebuilt.
* Makefile.in: Rebuilt.
gcc/
* gcc.c (LINK_SSP_SPEC): Define.
(link_ssp_spec): New variable.
(LINK_COMMAND_SPEC): Add %(link_ssp).
(static_specs): Add link_ssp_spec.
* configure.ac (TARGET_LIBC_PROVIDES_SSP): New test.
* configure: Rebuilt.
* config.in: Rebuilt.
* config/rs6000/linux.h (TARGET_THREAD_SSP_OFFSET): Define.
* config/rs6000/linux64.h (TARGET_THREAD_SSP_OFFSET): Likewise.
* config/i386/linux.h (TARGET_THREAD_SSP_OFFSET): Likewise.
* config/i386/linux64.h (TARGET_THREAD_SSP_OFFSET): Likewise.
* config/rs6000/rs6000.md (stack_protect_set, stack_protect_test):
If TARGET_THREAD_SSP_OFFSET is defined, use -0x7010(13) resp.
-0x7008(2) instead of reading __stack_chk_guard variable.
* config/i386/i386.md (UNSPEC_SP_SET, UNSPEC_SP_TEST): Change
number.
(UNSPEC_SP_TLS_SET, UNSPEC_SP_TLS_TEST): New constants.
(stack_protect_set, stack_protect_test): Use *_tls* patterns
if TARGET_THREAD_SSP_OFFSET is defined.
(stack_tls_protect_set_si, stack_tls_protect_set_di,
stack_tls_protect_test_si, stack_tls_protect_test_di): New insns.
Revert:
2005-06-27 Richard Henderson <rth@redhat.com>
* libgcc-std.ver (GCC_4.1.0): New.
* libgcc.h (__stack_chk_guard): Declare.
(__stack_chk_fail, __stack_chk_fail_local): Declare.
* libgcc2.c (L_stack_chk, L_stack_chk_local): New.
* mklibgcc.in (lib2funcs): Add them.
From-SVN: r101531
Diffstat (limited to 'libssp/sprintf-chk.c')
-rw-r--r-- | libssp/sprintf-chk.c | 68 |
1 files changed, 68 insertions, 0 deletions
diff --git a/libssp/sprintf-chk.c b/libssp/sprintf-chk.c new file mode 100644 index 0000000..7b084c2 --- /dev/null +++ b/libssp/sprintf-chk.c @@ -0,0 +1,68 @@ +/* Checking sprintf. + Copyright (C) 2005 Free Software Foundation, Inc. + +This file is part of GCC. + +GCC is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; either version 2, or (at your option) any later +version. + +In addition to the permissions in the GNU General Public License, the +Free Software Foundation gives you unlimited permission to link the +compiled version of this file into combinations with other programs, +and to distribute those combinations without any restriction coming +from the use of this file. (The General Public License restrictions +do apply in other respects; for example, they cover modification of +the file, and distribution when not linked into a combine +executable.) + +GCC is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with GCC; see the file COPYING. If not, write to the Free +Software Foundation, 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. */ + +/* As a special exception, if you link this library with files compiled with + GCC to produce an executable, this does not cause the resulting executable + to be covered by the GNU General Public License. This exception does not + however invalidate any other reasons why the executable file might be + covered by the GNU General Public License. */ + +#include "config.h" +#include <ssp/ssp.h> +#include <stdarg.h> +#ifdef HAVE_LIMITS_H +# include <limits.h> +#endif +#ifdef HAVE_STDIO_H +# include <stdio.h> +#endif + +extern void __chk_fail (void) __attribute__((__noreturn__)); + +#ifdef HAVE_USABLE_VSNPRINTF +int +__sprintf_chk (char *s, int flags __attribute__((unused)), + size_t slen, const char *format, ...) +{ + va_list arg; + int done; + + va_start (arg, format); + if (slen > (size_t) INT_MAX) + done = vsprintf (s, format, arg); + else + { + done = vsnprintf (s, slen, format, arg); + if (done >= 0 && (size_t) done >= slen) + __chk_fail (); + } + va_end (arg); + return done; +} +#endif |