diff --git a/ChangeLog b/ChangeLog index 2a198e994777a6887c12c8617030e0518c9d0f5b..79fac5cea1c8eb7a1c4796c586e8cf89123f824d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2018-06-17 Niels Möller <nisse@lysator.liu.se> + + * testsuite/symbols-test: Exclude ____chkstk_darwin symbols, + produced by Apple's Xcode 10 compiler. Patch contributed by + Dominyk Tiller. + 2018-03-25 Niels Möller <nisse@lysator.liu.se> From Michael Weiser. diff --git a/testsuite/symbols-test b/testsuite/symbols-test index 051d3d2218b9a8d52a6ff8c8f2cc9239ee49c57e..01ca30ceea4853ae096414a0e4acf61db0e1827a 100755 --- a/testsuite/symbols-test +++ b/testsuite/symbols-test @@ -15,9 +15,12 @@ fi # # * gcc on x86 generates functions like __i686.get_pc_thunk.bx in pic # code. +# * LLVM shipped with Xcode/CLT 10+ on macOS builds the symbol +# ____chkstk_darwin into the majority of binaries/libraries, including +# both the libraries checked here. ( $NM -g ../libnettle.a || $NM ../libnettle.a ) \ - | grep ' [DRT] ' | egrep -v '( |^|\.)(\.?_?(_?nettle_)|get_pc_thunk)' \ + | grep ' [DRT] ' | egrep -v '( |^|\.)(\.?_?(_?nettle_)|get_pc_thunk|(_*chkstk_darwin))' \ | sort -k3 > test1.out if [ -s test1.out ] ; then @@ -27,7 +30,7 @@ if [ -s test1.out ] ; then fi if [ -s ../libhogweed.a ] ; then - PATTERN='\.?_?_?nettle_|get_pc_thunk' + PATTERN='\.?_?_?nettle_|get_pc_thunk|(_*chkstk_darwin)' if grep '^#define.*NETTLE_USE_MINI_GMP.*1$' ../version.h >/dev/null ; then PATTERN="$PATTERN|_?(mp_|mpz_|mpn_)" fi