tree a3dd507b37768b6761a0d5734a5595790ea03b5d
parent db6a8f61d7a779ba3c7181b1ac017fdad3fd7041
author Andrew Jeffery <andrew@aj.id.au> 1491287586 +0930
committer Florian Friedrich <ffried@me.com> 1492761636 +0200
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEErpBNaaF2yTI75pSfXy+MrfFbfIkFAlj5vCQACgkQXy+MrfFb
 fInPkBAAguJ0Ahw0qGnzMY/yeLcyJ7//puXzHmjH6X2P7peyx6c7JM1aqL8Rv9K5
 6fVjF2vGnH2Bbr5OBwRnwGFCHMMzJTbRgKK/Fl6oPkNuyKVrypOzJLrb4raISvVB
 QCyhdHNVGPGIF2/h1BTkKU3UmyjOOmuX5P3YKB9gbsx/0jSeKuCKilYYGObsgMrz
 j9/Omv1QkVxv541QxpX3t3VAQF5jQWfA2rAVXK+ylJpQi2UIDKxUR0aU5VdCspC3
 xjx4bl41rR3oIXeq22lRABaY9ERFoOlGa33+mN/ZApo2j+ReJWjRCOzWSQ6TpsER
 jOISVxR1gbF+Vx7ItdE44Fuoco3j5x6jnjzKlgvLDxtvEBjCYuU8DluT71hwttsx
 H+vZp2W3Gg+M3P5PkeE6t1qQEVQ/ONQXpFn2K4tUQA4bdX+NLL15PSC1XJOYBWeg
 bZO5zYWAZo0y/QPTCQRJZTLc3dCy/+C6lgx1n9L7dzmAoYKHakq/31y4jL5+w7SF
 xgK76nEC4f2cusrb39N25iIGALIBAz8dzcoTheLZXNZ0x5PDUG8VT6iNKGC5odmx
 sceMejnjXaWjVJlqYOU7YC2EjOhBvUW5Cv4QKShTfYMHx6vRKiCSGPgRqAtALCIr
 oGz0UmNLhoAkhSj+pxp0jQ6AE4ps9TBoGFY83aePoXM8nY+sU0g=
 =HoXq
 -----END PGP SIGNATURE-----

lock: Avoid use of undefined DISPATCH_INTERNAL_CRASH

Building swift-corelibs-libdispatch on powerpc64le under Linux lead to
the following build failure:

	/bin/bash ../libtool  --tag=CXX   --mode=compile /home/ubuntu/swift-dev/build/buildbot_incremental/llvm-linux-powerpc64le/bin/clang++ -DHAVE_CONFIG_H -I. -I../config  -I.. -I.. -I../private -DDISPATCH_USE_DTRACE=0 -I../libpwq/include -Wall -fvisibility=hidden -momit-leaf-frame-pointer  -isystem /usr/include/bsd -DLIBBSD_OVERLAY  -fblocks -I../src/BlocksRuntime -std=gnu++11 -fno-exceptions -O2 -c -o libdispatch_la-block.lo `test -f 'block.cpp' || echo './'`block.cpp
	libtool: compile:  /home/ubuntu/swift-dev/build/buildbot_incremental/llvm-linux-powerpc64le/bin/clang++ -DHAVE_CONFIG_H -I. -I../config -I.. -I.. -I../private -DDISPATCH_USE_DTRACE=0 -I../libpwq/include -Wall -fvisibility=hidden -momit-leaf-frame-pointer -isystem /usr/include/bsd -DLIBBSD_OVERLAY -fblocks -I../src/BlocksRuntime -std=gnu++11 -fno-exce
	ptions -O2 -c block.cpp  -fPIC -DPIC -o .libs/libdispatch_la-block.o
	In file included from block.cpp:32:
	In file included from ./internal.h:628:
	In file included from ./shims.h:171:
	./shims/lock.h:550:3: error: use of undeclared identifier 'DISPATCH_INTERNAL_CRASH'
			DISPATCH_INTERNAL_CRASH(errno, "sys_membarrier not supported");
			^
	1 error generated.
	Makefile:701: recipe for target 'libdispatch_la-block.lo' failed
	make[2]: *** [libdispatch_la-block.lo] Error 1
	make[2]: Leaving directory '/home/ubuntu/swift-dev/swift-corelibs-libdispatch/src'
	Makefile:541: recipe for target 'all' failed
	make[1]: *** [all] Error 2
	make[1]: Leaving directory '/home/ubuntu/swift-dev/swift-corelibs-libdispatch/src'
	Makefile:457: recipe for target 'all-recursive' failed
	make: *** [all-recursive] Error 1

Include ordering in internal.h is tightly constrained, so open-code the macro
to avoid the dependency problem.

Signed-off-by: Andrew Jeffery <andrew@aj.id.au>