[PATCH] libstdc++, testsuite, Darwin : Adjust for names used in system headers.

[PATCH] libstdc++, testsuite, Darwin : Adjust for names used in system headers.

[Iain Sandoe]

Hi,

What is slightly odd here is that this problem shows up for
installed testing, but not when the test-suite is run in-tree.

However, the issue is clear (and doesn’t need to depend on
figuring out why it doesn’t show in-tree).

tested on powerpc-darwin9, x86_64-darwin

OK for master?
thanks
Iain

====

For all current Darwin SDKs inttypes.h has:
extern intmax_t imaxabs(intmax_t j);

So we need to exclude j from the defined symbol starts.

libstdc++-v3/ChangeLog:

	* testsuite/17_intro/names.cc: Exclude j from the list
	of symbol starts on Darwin platform.
---
 libstdc++-v3/testsuite/17_intro/names.cc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/libstdc++-v3/testsuite/17_intro/names.cc b/libstdc++-v3/testsuite/17_intro/names.cc
index 4534d790772..624e3ed9ccf 100644
--- a/libstdc++-v3/testsuite/17_intro/names.cc
+++ b/libstdc++-v3/testsuite/17_intro/names.cc
@@ -197,6 +197,11 @@
 #undef v
 #endif
 
+#ifdef __APPLE__
+// inttypes.h:  extern intmax_t imaxabs(intmax_t j);
+#undef j
+#endif
+
 #ifdef __hpux__
 #undef d
 #undef r
-- 
2.24.1

Re: [PATCH] libstdc++, testsuite, Darwin : Adjust for names used in system headers.

[Jonathan Wakely]

On 15/03/21 00:40 +0000, Iain Sandoe wrote:
>Hi,
>
>What is slightly odd here is that this problem shows up for
>installed testing, but not when the test-suite is run in-tree.
>
>However, the issue is clear (and doesn’t need to depend on
>figuring out why it doesn’t show in-tree).
>
>tested on powerpc-darwin9, x86_64-darwin
>
>OK for master?
>thanks
>Iain
>
>====
>
>For all current Darwin SDKs inttypes.h has:
>extern intmax_t imaxabs(intmax_t j);
>
>So we need to exclude j from the defined symbol starts.
>
>libstdc++-v3/ChangeLog:
>
>	* testsuite/17_intro/names.cc: Exclude j from the list
>	of symbol starts on Darwin platform.

OK with adjusted changelog as discussed on IRC, thanks.


> libstdc++-v3/testsuite/17_intro/names.cc | 5 +++++
> 1 file changed, 5 insertions(+)
>
>diff --git a/libstdc++-v3/testsuite/17_intro/names.cc b/libstdc++-v3/testsuite/17_intro/names.cc
>index 4534d790772..624e3ed9ccf 100644
>--- a/libstdc++-v3/testsuite/17_intro/names.cc
>+++ b/libstdc++-v3/testsuite/17_intro/names.cc
>@@ -197,6 +197,11 @@
> #undef v
> #endif
>
>+#ifdef __APPLE__
>+// inttypes.h:  extern intmax_t imaxabs(intmax_t j);
>+#undef j
>+#endif
>+
> #ifdef __hpux__
> #undef d
> #undef r
>-- 
>2.24.1
>
>