X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=src%2Furcu.c;h=902b8f839a75b4df7e0b077ed780a2f0b0c4a433;hp=c36119aeb466673c03c810dc2ea372eea568f10f;hb=f99c6e92aaa1582e6cd19d93d44d91d968f39aa7;hpb=4477a87021ffbfbfdb2a2084d05a084171343d36

diff --git a/src/urcu.c b/src/urcu.c
index c36119a..902b8f8 100644
--- a/src/urcu.c
+++ b/src/urcu.c
@@ -23,6 +23,7 @@
  * IBM's contributions to this file may be relicensed under LGPLv2 or later.
  */
 
+#define URCU_NO_COMPAT_IDENTIFIERS
 #define _BSD_SOURCE
 #define _LGPL_SOURCE
 #define _DEFAULT_SOURCE
@@ -37,6 +38,7 @@
 #include <stdbool.h>
 #include <poll.h>
 
+#include <urcu/config.h>
 #include <urcu/arch.h>
 #include <urcu/wfcqueue.h>
 #include <urcu/map/urcu.h>
@@ -92,8 +94,6 @@ static int urcu_memb_has_sys_membarrier_private_expedited;
  * uninitialized variable.
  */
 int urcu_memb_has_sys_membarrier = 0;
-__attribute__((alias("urcu_memb_has_sys_membarrier")))
-extern int rcu_has_sys_membarrier_memb;
 #endif
 
 void __attribute__((constructor)) rcu_init(void);
@@ -103,8 +103,6 @@ void __attribute__((constructor)) rcu_init(void);
 void rcu_init(void)
 {
 }
-__attribute__((alias(urcu_stringify(rcu_init))))
-void alias_rcu_init(void);
 #endif
 
 #ifdef RCU_SIGNAL
@@ -130,16 +128,12 @@ static pthread_mutex_t rcu_gp_lock = PTHREAD_MUTEX_INITIALIZER;
  */
 static pthread_mutex_t rcu_registry_lock = PTHREAD_MUTEX_INITIALIZER;
 struct urcu_gp rcu_gp = { .ctr = URCU_GP_COUNT };
-__attribute__((alias(urcu_stringify(rcu_gp))))
-extern struct urcu_gp alias_rcu_gp;
 
 /*
  * Written to only by each individual reader. Read by both the reader and the
  * writers.
  */
 DEFINE_URCU_TLS(struct urcu_reader, rcu_reader);
-__attribute__((alias(urcu_stringify(rcu_reader))))
-extern struct urcu_reader alias_rcu_reader;
 
 static CDS_LIST_HEAD(registry);
 
@@ -447,7 +441,7 @@ void synchronize_rcu(void)
 	/*
 	 * Wait for readers to observe original parity or be quiescent.
 	 * wait_for_readers() can release and grab again rcu_registry_lock
-	 * interally.
+	 * internally.
 	 */
 	wait_for_readers(&registry, &cur_snap_readers, &qsreaders);
 
@@ -489,7 +483,7 @@ void synchronize_rcu(void)
 	/*
 	 * Wait for readers to observe new parity or be quiescent.
 	 * wait_for_readers() can release and grab again rcu_registry_lock
-	 * interally.
+	 * internally.
 	 */
 	wait_for_readers(&cur_snap_readers, NULL, &qsreaders);
 
@@ -515,8 +509,6 @@ out:
 	 */
 	urcu_wake_all_waiters(&waiters);
 }
-__attribute__((alias(urcu_stringify(synchronize_rcu))))
-void alias_synchronize_rcu();
 
 /*
  * library wrappers to be used by non-LGPL compatible source code.
@@ -526,22 +518,16 @@ void rcu_read_lock(void)
 {
 	_rcu_read_lock();
 }
-__attribute__((alias(urcu_stringify(rcu_read_lock))))
-void alias_rcu_read_lock();
 
 void rcu_read_unlock(void)
 {
 	_rcu_read_unlock();
 }
-__attribute__((alias(urcu_stringify(rcu_read_unlock))))
-void alias_rcu_read_unlock();
 
 int rcu_read_ongoing(void)
 {
 	return _rcu_read_ongoing();
 }
-__attribute__((alias(urcu_stringify(rcu_read_ongoing))))
-void alias_rcu_read_ongoing();
 
 void rcu_register_thread(void)
 {
@@ -556,8 +542,6 @@ void rcu_register_thread(void)
 	cds_list_add(&URCU_TLS(rcu_reader).node, &registry);
 	mutex_unlock(&rcu_registry_lock);
 }
-__attribute__((alias(urcu_stringify(rcu_register_thread))))
-void alias_rcu_register_thread();
 
 void rcu_unregister_thread(void)
 {
@@ -567,8 +551,6 @@ void rcu_unregister_thread(void)
 	cds_list_del(&URCU_TLS(rcu_reader).node);
 	mutex_unlock(&rcu_registry_lock);
 }
-__attribute__((alias(urcu_stringify(rcu_unregister_thread))))
-void alias_rcu_unregister_thread();
 
 #ifdef RCU_MEMBARRIER
 
@@ -616,12 +598,12 @@ void rcu_init(void)
 	init_done = 1;
 	rcu_sys_membarrier_init();
 }
-__attribute__((alias(urcu_stringify(rcu_init))))
-void alias_rcu_init(void);
 #endif
 
 #ifdef RCU_SIGNAL
-static void sigrcu_handler(int signo, siginfo_t *siginfo, void *context)
+static void sigrcu_handler(int signo __attribute__((unused)),
+		siginfo_t *siginfo __attribute__((unused)),
+		void *context __attribute__((unused)))
 {
 	/*
 	 * Executing this cmm_smp_mb() is the only purpose of this signal handler.
@@ -657,8 +639,6 @@ void rcu_init(void)
 	if (ret)
 		urcu_die(errno);
 }
-__attribute__((alias(urcu_stringify(rcu_init))))
-void alias_rcu_init(void);
 
 void rcu_exit(void)
 {
@@ -671,13 +651,10 @@ void rcu_exit(void)
 	 * assert(cds_list_empty(&registry));
 	 */
 }
-__attribute__((alias(urcu_stringify(rcu_exit))))
-void alias_rcu_exit(void);
 
 #endif /* #ifdef RCU_SIGNAL */
 
 DEFINE_RCU_FLAVOR(rcu_flavor);
-DEFINE_RCU_FLAVOR_ALIAS(rcu_flavor, alias_rcu_flavor);
 
 #include "urcu-call-rcu-impl.h"
 #include "urcu-defer-impl.h"