about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2016-11-28 23:13:46 +0000
committerJoseph Myers <joseph@codesourcery.com>2016-11-28 23:13:46 +0000
commitb3daf3ee099d6c1e1e04a08221a6f68e79ced834 (patch)
tree96a1cb23fd066afbf98af56fa466bef8f31e3711
parent547e970409b18021b63bfded0ffd852b8dcc4d3a (diff)
downloadglibc-b3daf3ee099d6c1e1e04a08221a6f68e79ced834.tar.gz
glibc-b3daf3ee099d6c1e1e04a08221a6f68e79ced834.tar.xz
glibc-b3daf3ee099d6c1e1e04a08221a6f68e79ced834.zip
Work around IA64 tst-setcontext2.c compile failure.
Building tests for IA64 runs into a build failure compiling
stdlib/tst-setcontext2.c:

tst-setcontext2.c: In function 'do_test':
tst-setcontext2.c:210:20: error: passing argument 1 of 'sigismember' from incompatible pointer type [-Werror=incompatible-pointer-types]
   if (sigismember (&oldctx.uc_sigmask, SIGUSR2) != 1)
                    ^

Indeed, the IA64 uc_sigmask as unsigned long rather than the larger
userspace sigset_t.  Fixing this might be hard; this patch works
around the build failure by making IA64 wrap the test with a version
that #defines sigismember to add a cast (I'd welcome a better approach
for fixing this).

Tested (compilation only) for ia64.

	* sysdeps/unix/sysv/linux/ia64/tst-setcontext2.c: New file.
-rw-r--r--ChangeLog2
-rw-r--r--sysdeps/unix/sysv/linux/ia64/tst-setcontext2.c24
2 files changed, 26 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 6d9b1629a6..591b4c0cac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2016-11-28  Joseph Myers  <joseph@codesourcery.com>
 
+	* sysdeps/unix/sysv/linux/ia64/tst-setcontext2.c: New file.
+
 	* sysdeps/ia64/fpu/libm-symbols.h: Make contents conditional on
 	[!__STRICT_ANSI__ && !__cplusplus].
 
diff --git a/sysdeps/unix/sysv/linux/ia64/tst-setcontext2.c b/sysdeps/unix/sysv/linux/ia64/tst-setcontext2.c
new file mode 100644
index 0000000000..7adc059440
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/ia64/tst-setcontext2.c
@@ -0,0 +1,24 @@
+/* Work around incorrect type of IA64 uc_sigmask.
+   Copyright (C) 2016 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#include <signal.h>
+
+#undef sigismember
+#define sigismember(set, signo) sigismember ((const sigset_t *) (set), (signo))
+
+#include <stdlib/tst-setcontext2.c>