diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2014-11-21 15:03:37 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2014-11-21 15:03:37 +0100 |
| commit | 7697b16f45c592826e6a6a1a3ac2ca7f6db530bc (patch) | |
| tree | 9578500e5d6ef3559736c97be6df6b094ea8a5af /libsanitizer | |
| parent | e984e36fe0a5a5378bb92238787baa6a264192d9 (diff) | |
| download | gcc-7697b16f45c592826e6a6a1a3ac2ca7f6db530bc.tar.gz | |
re PR sanitizer/64013 (libsanitizer fails to build)
PR sanitizer/64013
* sanitizer_common/sanitizer_linux.cc (FileExists): Cherry pick
upstream r222532.
From-SVN: r217921
Diffstat (limited to 'libsanitizer')
| -rw-r--r-- | libsanitizer/ChangeLog | 6 | ||||
| -rw-r--r-- | libsanitizer/sanitizer_common/sanitizer_linux.cc | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog index e3aab56e00b..ed32d032d8e 100644 --- a/libsanitizer/ChangeLog +++ b/libsanitizer/ChangeLog @@ -1,3 +1,9 @@ +2014-11-21 Jakub Jelinek <jakub@redhat.com> + + PR target/61137 + * config/ia64/ia64.c (ia64_attribute_takes_identifier_p): New function. + (TARGET_ATTRIBUTE_TAKES_IDENTIFIER_P): Redefine to it. + 2014-11-14 Uros Bizjak <ubizjak@gmail.com> * sanitizer_common/Makefile.am (AM_CXXFLAGS): Use -std=gnu++11. diff --git a/libsanitizer/sanitizer_common/sanitizer_linux.cc b/libsanitizer/sanitizer_common/sanitizer_linux.cc index 8c7979fc6b5..9feb307db9f 100644 --- a/libsanitizer/sanitizer_common/sanitizer_linux.cc +++ b/libsanitizer/sanitizer_common/sanitizer_linux.cc @@ -281,17 +281,15 @@ uptr internal_execve(const char *filename, char *const argv[], // ----------------- sanitizer_common.h bool FileExists(const char *filename) { -#if SANITIZER_USES_CANONICAL_LINUX_SYSCALLS struct stat st; +#if SANITIZER_USES_CANONICAL_LINUX_SYSCALLS if (internal_syscall(SYSCALL(newfstatat), AT_FDCWD, filename, &st, 0)) - return false; #else - struct stat st; if (internal_stat(filename, &st)) +#endif return false; // Sanity check: filename is a regular file. return S_ISREG(st.st_mode); -#endif } uptr GetTid() { |