Module: xenomai-3
Branch: next
Commit: 2d6a18b8aecccce8a55a0185b77d3437736da5c0
URL:    
http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=2d6a18b8aecccce8a55a0185b77d3437736da5c0

Author: Philippe Gerum <r...@xenomai.org>
Date:   Sat Nov  5 19:09:00 2016 +0100

boilerplate/libc: do not combine weak and inline attributes

gcc5 discards the weak attribute for inline symbols.

This is a forward port of
http://git.xenomai.org/xenomai-2.6.git/commit/?id=917dcebb26ec492f276cdc3b55867aa90e01fa12

---

 include/boilerplate/libc.h |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/boilerplate/libc.h b/include/boilerplate/libc.h
index 0e51b86..d8b0334 100644
--- a/include/boilerplate/libc.h
+++ b/include/boilerplate/libc.h
@@ -137,9 +137,9 @@ int pthread_setaffinity_np(pthread_t thread, size_t 
cpusetsize,
  * during sleep time. This is a non-issue for Cobalt, as the libcobalt
  * implementation will always be picked instead.
  */
-__weak inline int clock_nanosleep(clockid_t clock_id, int flags,
-                                 const struct timespec *request,
-                                 struct timespec *remain)
+__weak int clock_nanosleep(clockid_t clock_id, int flags,
+                          const struct timespec *request,
+                          struct timespec *remain)
 {
        struct timespec now, tmp;
 
@@ -163,14 +163,14 @@ __weak inline int clock_nanosleep(clockid_t clock_id, int 
flags,
  * Might be declared in uClibc headers but not actually implemented,
  * so we make the placeholder a weak symbol.
  */
-__weak inline int sched_getcpu(void)
+__weak int sched_getcpu(void)
 {
        return 0;   /* outdated uClibc: assume uniprocessor. */
 }
 #endif /* !HAVE_SCHED_GETCPU */
 
 #ifndef HAVE_SHM_OPEN
-__weak inline int shm_open(const char *name, int oflag, mode_t mode)
+__weak int shm_open(const char *name, int oflag, mode_t mode)
 {
        errno = ENOSYS;
        return -1;
@@ -178,7 +178,7 @@ __weak inline int shm_open(const char *name, int oflag, 
mode_t mode)
 #endif /* !HAVE_SHM_OPEN */
 
 #ifndef HAVE_SHM_UNLINK
-__weak inline int shm_unlink(const char *name)
+__weak int shm_unlink(const char *name)
 {
        errno = ENOSYS;
        return -1;


_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
https://xenomai.org/mailman/listinfo/xenomai-git

Reply via email to