Ticket #1671: gxx_wrappers.patch

libcsupport/src/gxx_wrappers.c

@@ -26 +26 @@
 #endif
 
 #include <stdlib.h>
-#include <stdio.h>
 
 #include <rtems.h>
-#include <rtems/system.h>
-#include <rtems/error.h>
-#include <rtems/rtems/tasks.h>
 
 /* uncomment this if you need to debug this interface */
 /*#define DEBUG_GXX_WRAPPERS 1*/
@@ -145 +141 @@
      */
     status = rtems_task_variable_add( RTEMS_SELF, (void **)key, key->dtor );
     if ( status != RTEMS_SUCCESSFUL ) {
-       rtems_panic ("rtems_gxx_getspecific");
+      _Internal_error_Occurred(
+        INTERNAL_ERROR_CORE,
+        true,
+        INTERNAL_ERROR_GXX_KEY_ADD_FAILED
+      );
     }
     key->val = (void *)0;
   }
@@ -212 +212 @@
         status
       );
     #endif
-    rtems_panic ("rtems_gxx_mutex_init");
+    _Internal_error_Occurred(
+      INTERNAL_ERROR_CORE,
+      true,
+      INTERNAL_ERROR_GXX_MUTEX_INIT_FAILED
+    );
   }
   #ifdef DEBUG_GXX_WRAPPERS
     printk( "gxx_wrappers: mutex init complete =%X\n", *mutex );

score/include/rtems/score/interr.h

@@ -70 +70 @@
   INTERNAL_ERROR_IMPLEMENTATION_BLOCKING_OPERATION_CANCEL,
   INTERNAL_ERROR_MUTEX_OBTAIN_FROM_BAD_STATE,
   INTERNAL_ERROR_UNLIMITED_AND_MAXIMUM_IS_0,
-  INTERNAL_ERROR_SHUTDOWN_WHEN_NOT_UP
+  INTERNAL_ERROR_SHUTDOWN_WHEN_NOT_UP,
+  INTERNAL_ERROR_GXX_KEY_ADD_FAILED,
+  INTERNAL_ERROR_GXX_MUTEX_INIT_FAILED
 } Internal_errors_Core_list;
 
 typedef uint32_t Internal_errors_t;