diff options
| author | ebotcazou <ebotcazou@138bc75d-0d04-0410-961f-82ee72b054a4> | 2018-01-16 20:40:30 +0000 |
|---|---|---|
| committer | ebotcazou <ebotcazou@138bc75d-0d04-0410-961f-82ee72b054a4> | 2018-01-16 20:40:30 +0000 |
| commit | e9c9bd6dd980d0d3aee673d5be80b93acad8e84c (patch) | |
| tree | 06ef52cfe7e3b90f169f81446edefbd4b78342a2 | |
| parent | bd6ebad533300848c7663032ee48af420ad7f6c6 (diff) | |
* testsuite/17_intro/names.cc: Undefine 'y' on SPARC/Linux.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branch@256755 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libstdc++-v3/ChangeLog | 4 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/17_intro/names.cc | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index e0c46e0a9aa1..eec848812355 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,7 @@ +2018-01-16 Eric Botcazou <ebotcazou@adacore.com> + + * testsuite/17_intro/names.cc: Undefine 'y' on SPARC/Linux. + 2018-01-13 Jonathan Wakely <jwakely@redhat.com> * python/libstdcxx/v6/printers.py (register_type_printers): Remove diff --git a/libstdc++-v3/testsuite/17_intro/names.cc b/libstdc++-v3/testsuite/17_intro/names.cc index 1873deb6936a..158895e89d23 100644 --- a/libstdc++-v3/testsuite/17_intro/names.cc +++ b/libstdc++-v3/testsuite/17_intro/names.cc @@ -112,4 +112,8 @@ #undef r #endif +#if defined (__linux__) && defined (__sparc__) +#undef y +#endif + #include <bits/stdc++.h> |