commit a1f9ef061542624eb397dac481e805d678b43ea1
author Gilles Peskine <Gilles.Peskine@arm.com> Wed Sep 30 22:18:13 2020 +0200
committer Gilles Peskine <Gilles.Peskine@arm.com> Thu Oct 01 11:27:17 2020 +0200
tree ec59a5e7d49ea5b36d4bb24956357f14b1bdf408
parent c6468ee24778e2ff1b30a23c67ca0bf1e1d9c03b

Fix the build when _GNU_SOURCE is defined to a non-empty value

Fix #3432.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

ChangeLog.d/_GNU_SOURCE-redefined.txt

diff --git a/ChangeLog.d/_GNU_SOURCE-redefined.txt b/ChangeLog.d/_GNU_SOURCE-redefined.txt
new file mode 100644
index 0000000..59c8a15
--- /dev/null
+++ b/ChangeLog.d/_GNU_SOURCE-redefined.txt
@@ -0,0 +1,3 @@
+Bugfix
+   * Fix the build when the macro _GNU_SOURCE is defined to a non-empty value.
+     Fix #3432.

library/entropy_poll.c

diff --git a/library/entropy_poll.c b/library/entropy_poll.c
index 4bf660e..5250a7b 100644
--- a/library/entropy_poll.c
+++ b/library/entropy_poll.c
@@ -17,7 +17,7 @@
  *  limitations under the License.
  */
 
-#if defined(__linux__)
+#if defined(__linux__) && !defined(_GNU_SOURCE)
 /* Ensure that syscall() is available even when compiling with -std=c99 */
 #define _GNU_SOURCE
 #endif