summaryrefslogtreecommitdiff
path: root/libc/signal
diff options
context:
space:
mode:
authorCarmelo Amoroso <carmelo.amoroso@st.com>2010-11-28 21:09:47 +0100
committerCarmelo Amoroso <carmelo.amoroso@st.com>2010-11-28 21:09:47 +0100
commit57f6cce72c889f2e7b342e87a565a064320a6ee2 (patch)
tree5466406472918d3adb63398f5fb9ea1511a5e73f /libc/signal
parent4ec89b87bc0eea8d9ca6b50564d12eeb3b1b0119 (diff)
parent5dea871ac73ef4608022c058b50adc946917f9b9 (diff)
Merge commit 'origin/master' into prelink
Conflicts: ldso/include/dl-hash.h Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
Diffstat (limited to 'libc/signal')
-rw-r--r--libc/signal/sigsetops.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/libc/signal/sigsetops.c b/libc/signal/sigsetops.c
index c47a87b0e..fa5fe6acf 100644
--- a/libc/signal/sigsetops.c
+++ b/libc/signal/sigsetops.c
@@ -3,7 +3,7 @@
#include <features.h>
-#define _EXTERN_INLINE
+#define __PROVIDE_OUT_OF_LINE_SIGSETFN
#ifndef __USE_EXTERN_INLINES
# define __USE_EXTERN_INLINES 1
#endif
@@ -12,6 +12,9 @@
/* Since we massaged signal.h into emitting non-inline function
* definitions, we need to finish PLT avoidance trick: */
+#undef __sigismember
+#undef __sigaddset
+#undef __sigdelset
libc_hidden_def(__sigismember)
libc_hidden_def(__sigaddset)
libc_hidden_def(__sigdelset)