| Message ID | 90a4851b08270678352f4f53f86d94af78647499.1728858179.git.sam@gentoo.org |
|---|---|
| State | New |
| Headers | show |
| Series | libstdc++: testsuite: adjust name_fortify test for pre-defined _FORTIFY_SOURCE | expand |
On Sun, 13 Oct 2024 at 23:23, Sam James <sam@gentoo.org> wrote: > > Otherwise we get failures with toolchains that have _FORTIFY_SOURCE > defined already to a different value like 3. I was going to say we could do: #ifndef _FORTIFY_SOURCE #define _FORTIFY_SOURCE 2 #endif But I realised that the original names.cc test will already run with whatever default value the toolchain uses. So this looks fine, thanks. > > libstdc++-v3/ChangeLog: > > * testsuite/17_intro/names_fortify.cc: Undefine _FORTIFY_SOURCE. > --- > I'll commit later if no objections. > > libstdc++-v3/testsuite/17_intro/names_fortify.cc | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/libstdc++-v3/testsuite/17_intro/names_fortify.cc b/libstdc++-v3/testsuite/17_intro/names_fortify.cc > index c975412074be..f24af21f8a70 100644 > --- a/libstdc++-v3/testsuite/17_intro/names_fortify.cc > +++ b/libstdc++-v3/testsuite/17_intro/names_fortify.cc > @@ -1,6 +1,7 @@ > // { dg-do compile { target *-*-linux* } } > // { dg-add-options no_pch } > > +#undef _FORTIFY_SOURCE > #define _FORTIFY_SOURCE 2 > // Now we can define the macros to poison uses of non-reserved names: > #include "names.cc" > -- > 2.47.0 >
Jonathan Wakely <jwakely@redhat.com> writes: > On Sun, 13 Oct 2024 at 23:23, Sam James <sam@gentoo.org> wrote: >> >> Otherwise we get failures with toolchains that have _FORTIFY_SOURCE >> defined already to a different value like 3. > > I was going to say we could do: > > #ifndef _FORTIFY_SOURCE > #define _FORTIFY_SOURCE 2 > #endif > > But I realised that the original names.cc test will already run with > whatever default value the toolchain uses. So this looks fine, thanks. Thanks, pushed. > [...]
diff --git a/libstdc++-v3/testsuite/17_intro/names_fortify.cc b/libstdc++-v3/testsuite/17_intro/names_fortify.cc index c975412074be..f24af21f8a70 100644 --- a/libstdc++-v3/testsuite/17_intro/names_fortify.cc +++ b/libstdc++-v3/testsuite/17_intro/names_fortify.cc @@ -1,6 +1,7 @@ // { dg-do compile { target *-*-linux* } } // { dg-add-options no_pch } +#undef _FORTIFY_SOURCE #define _FORTIFY_SOURCE 2 // Now we can define the macros to poison uses of non-reserved names: #include "names.cc"