diff options
| author | Liubov Dmitrieva <ldmitrie@sourceware.org> | 2013-08-30 18:37:28 +0400 |
|---|---|---|
| committer | Liubov Dmitrieva <ldmitrie@sourceware.org> | 2013-10-23 23:51:44 +0400 |
| commit | 029183a4ca3f765f63e7b64bc260622f02b04539 (patch) | |
| tree | c7f6912d9575e27f691f219ad9437e9af39e016e /sysdeps/x86_64/multiarch/memcpy_chk.S | |
| parent | 01d5454d13d2c21b9a08b28441d37a7ddce089a6 (diff) | |
| download | glibc-ldmitrie/intel_mpx.tar.gz glibc-ldmitrie/intel_mpx.tar.xz glibc-ldmitrie/intel_mpx.zip | |
Implemented bound check support for string/memory routines for x86_64. ldmitrie/intel_mpx
TODO: Fix bound check support in strcmp-sse2 and implement in strspn, strstr and strcspn.
Diffstat (limited to 'sysdeps/x86_64/multiarch/memcpy_chk.S')
| -rw-r--r-- | sysdeps/x86_64/multiarch/memcpy_chk.S | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sysdeps/x86_64/multiarch/memcpy_chk.S b/sysdeps/x86_64/multiarch/memcpy_chk.S index ad01d8cd9f..6f87f2686d 100644 --- a/sysdeps/x86_64/multiarch/memcpy_chk.S +++ b/sysdeps/x86_64/multiarch/memcpy_chk.S @@ -18,14 +18,15 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#include <sysdep.h> -#include <init-arch.h> +#if !defined __CHKP__ && !defined __CHKWR__ +# include <sysdep.h> +# include <init-arch.h> /* Define multiple versions only for the definition in lib and for DSO. There are no multiarch memcpy functions for static binaries. */ -#ifndef NOT_IN_libc -# ifdef SHARED +# ifndef NOT_IN_libc +# ifdef SHARED .text ENTRY(__memcpy_chk) .type __memcpy_chk, @gnu_indirect_function @@ -41,7 +42,8 @@ ENTRY(__memcpy_chk) leaq __memcpy_chk_ssse3_back(%rip), %rax 2: ret END(__memcpy_chk) -# else -# include "../memcpy_chk.S" +# else +# include "../memcpy_chk.S" +# endif # endif #endif |