basdefs.h: Add and use RTEMS_UNUSED

11 files changed, 21 insertions, 18 deletions

diff --git a/cpukit/score/include/rtems/score/basedefs.h b/cpukit/score/include/rtems/score/basedefs.h
index 831a40b672..3b6723ecae 100644
--- a/cpukit/score/include/rtems/score/basedefs.h
+++ b/cpukit/score/include/rtems/score/basedefs.h
@@ -217,11 +217,14 @@
  *  in a variable argument method.
  */
 #if defined(__GNUC__)
-  #define RTEMS_COMPILER_UNUSED_ATTRIBUTE __attribute__((unused))
+  #define RTEMS_UNUSED __attribute__((__unused__))
 #else
-  #define RTEMS_COMPILER_UNUSED_ATTRIBUTE
+  #define RTEMS_UNUSED
 #endif
 
+/* Provided for backward compatibility */
+#define RTEMS_COMPILER_UNUSED_ATTRIBUTE RTEMS_UNUSED
+
 /**
  *  Instructs the compiler that a specific structure or union members will be
  *  placed so that the least memory is used.
diff --git a/cpukit/score/include/rtems/score/objectimpl.h b/cpukit/score/include/rtems/score/objectimpl.h
index 1919cd1d64..80c50a5b56 100644
--- a/cpukit/score/include/rtems/score/objectimpl.h
+++ b/cpukit/score/include/rtems/score/objectimpl.h
@@ -774,7 +774,7 @@ RTEMS_INLINE_ROUTINE bool _Objects_Is_local_id(
 #if defined(RTEMS_MULTIPROCESSING)
   Objects_Id id
 #else
-  Objects_Id id __attribute__((unused))
+  Objects_Id id RTEMS_UNUSED
 #endif
 )
 {
diff --git a/cpukit/score/include/rtems/score/sysstate.h b/cpukit/score/include/rtems/score/sysstate.h
index 7548c1f80b..fbdeff95fa 100644
--- a/cpukit/score/include/rtems/score/sysstate.h
+++ b/cpukit/score/include/rtems/score/sysstate.h
@@ -80,7 +80,7 @@ RTEMS_INLINE_ROUTINE void _System_state_Handler_initialization (
 #if defined(RTEMS_MULTIPROCESSING)
   bool  is_multiprocessing
 #else
-  bool  is_multiprocessing __attribute__((unused))
+  bool  is_multiprocessing RTEMS_UNUSED
 #endif
 )
 {
diff --git a/cpukit/score/src/corebarrierrelease.c b/cpukit/score/src/corebarrierrelease.c
index 98865ec95f..c6d29b9f03 100644
--- a/cpukit/score/src/corebarrierrelease.c
+++ b/cpukit/score/src/corebarrierrelease.c
@@ -29,8 +29,8 @@ uint32_t _CORE_barrier_Release(
   Objects_Id                           id,
   CORE_barrier_API_mp_support_callout  api_barrier_mp_support
 #else
-  Objects_Id                           id __attribute__((unused)),
-  CORE_barrier_API_mp_support_callout  api_barrier_mp_support __attribute__((unused))
+  Objects_Id                           id RTEMS_UNUSED,
+  CORE_barrier_API_mp_support_callout  api_barrier_mp_support RTEMS_UNUSED
 #endif
 )
 {
diff --git a/cpukit/score/src/coremsgbroadcast.c b/cpukit/score/src/coremsgbroadcast.c
index 3ee587ccfb..95a8650f26 100644
--- a/cpukit/score/src/coremsgbroadcast.c
+++ b/cpukit/score/src/coremsgbroadcast.c
@@ -29,8 +29,8 @@ CORE_message_queue_Status _CORE_message_queue_Broadcast(
     Objects_Id                                 id,
     CORE_message_queue_API_mp_support_callout  api_message_queue_mp_support,
   #else
-    Objects_Id                                 id __attribute__((unused)),
-    CORE_message_queue_API_mp_support_callout  api_message_queue_mp_support __attribute__((unused)),
+    Objects_Id                                 id RTEMS_UNUSED,
+    CORE_message_queue_API_mp_support_callout  api_message_queue_mp_support RTEMS_UNUSED,
   #endif
   uint32_t                                  *count,
   ISR_lock_Context                          *lock_context
diff --git a/cpukit/score/src/coremsgsubmit.c b/cpukit/score/src/coremsgsubmit.c
index 351c76b750..d068cc4a05 100644
--- a/cpukit/score/src/coremsgsubmit.c
+++ b/cpukit/score/src/coremsgsubmit.c
@@ -34,7 +34,7 @@ CORE_message_queue_Status _CORE_message_queue_Submit(
   #if defined(RTEMS_MULTIPROCESSING)
     CORE_message_queue_API_mp_support_callout  api_message_queue_mp_support,
   #else
-    CORE_message_queue_API_mp_support_callout  api_message_queue_mp_support  __attribute__((unused)),
+    CORE_message_queue_API_mp_support_callout  api_message_queue_mp_support  RTEMS_UNUSED,
   #endif
   CORE_message_queue_Submit_types            submit_type,
   bool                                       wait,
diff --git a/cpukit/score/src/coremutexsurrender.c b/cpukit/score/src/coremutexsurrender.c
index 7d9c57f98b..b4e69c8698 100644
--- a/cpukit/score/src/coremutexsurrender.c
+++ b/cpukit/score/src/coremutexsurrender.c
@@ -91,8 +91,8 @@ CORE_mutex_Status _CORE_mutex_Surrender(
   Objects_Id                         id,
   CORE_mutex_API_mp_support_callout  api_mutex_mp_support,
 #else
-  Objects_Id                         id __attribute__((unused)),
-  CORE_mutex_API_mp_support_callout  api_mutex_mp_support __attribute__((unused)),
+  Objects_Id                         id RTEMS_UNUSED,
+  CORE_mutex_API_mp_support_callout  api_mutex_mp_support RTEMS_UNUSED,
 #endif
   ISR_lock_Context                  *lock_context
 )
diff --git a/cpukit/score/src/heapextend.c b/cpukit/score/src/heapextend.c
index 34d2b756fb..00e402a5b2 100644
--- a/cpukit/score/src/heapextend.c
+++ b/cpukit/score/src/heapextend.c
@@ -121,7 +121,7 @@ uintptr_t _Heap_Extend(
   Heap_Control *heap,
   void *extend_area_begin_ptr,
   uintptr_t extend_area_size,
-  uintptr_t unused __attribute__((unused))
+  uintptr_t unused RTEMS_UNUSED
 )
 {
   Heap_Statistics *const stats = &heap->stats;
diff --git a/cpukit/score/src/heapgetinfo.c b/cpukit/score/src/heapgetinfo.c
index 287d269922..36afe957d0 100644
--- a/cpukit/score/src/heapgetinfo.c
+++ b/cpukit/score/src/heapgetinfo.c
@@ -24,7 +24,7 @@
 #include <rtems/score/heapimpl.h>
 
 static bool _Heap_Get_information_visitor(
-  const Heap_Block *block __attribute__((unused)),
+  const Heap_Block *block RTEMS_UNUSED,
   uintptr_t block_size,
   bool block_is_used,
   void *visitor_arg
diff --git a/cpukit/score/src/heapnoextend.c b/cpukit/score/src/heapnoextend.c
index 60f0f8d8c7..d961c5a77e 100644
--- a/cpukit/score/src/heapnoextend.c
+++ b/cpukit/score/src/heapnoextend.c
@@ -27,10 +27,10 @@
 #include <rtems/score/heapimpl.h>
 
 uintptr_t _Heap_No_extend(
-  Heap_Control *unused_0 __attribute__((unused)),
-  void *unused_1 __attribute__((unused)),
-  uintptr_t unused_2 __attribute__((unused)),
-  uintptr_t unused_3 __attribute__((unused))
+  Heap_Control *unused_0 RTEMS_UNUSED,
+  void *unused_1 RTEMS_UNUSED,
+  uintptr_t unused_2 RTEMS_UNUSED,
+  uintptr_t unused_3 RTEMS_UNUSED
 )
 {
   return 0;
diff --git a/cpukit/score/src/threadqflush.c b/cpukit/score/src/threadqflush.c
index 530941b13b..8dca3f9fd4 100644
--- a/cpukit/score/src/threadqflush.c
+++ b/cpukit/score/src/threadqflush.c
@@ -26,7 +26,7 @@ void _Thread_queue_Flush(
 #if defined(RTEMS_MULTIPROCESSING)
   Thread_queue_Flush_callout  remote_extract_callout,
 #else
-  Thread_queue_Flush_callout  remote_extract_callout __attribute__((unused)),
+  Thread_queue_Flush_callout  remote_extract_callout RTEMS_UNUSED,
 #endif
   uint32_t                    status
 )