diff options
| author | Christian Mauderer <Christian.Mauderer@embedded-brains.de> | 2014-03-21 12:07:28 +0100 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2014-03-24 08:31:49 +0100 |
| commit | 9d9df8b44ec306cd1e1ecb51086f57bace5cab73 (patch) | |
| tree | decd19aa17adac9de323cc52dec149f46afd9ef7 | |
| parent | posix: Prevent pthread_setspecific from returning EAGAIN. (diff) | |
| download | rtems-9d9df8b44ec306cd1e1ecb51086f57bace5cab73.tar.bz2 | |
libcsupport: Remove unused gxx-wrapper function.
The rtems_gxx_key_dtor function is not longer used by gcc.
| -rw-r--r-- | cpukit/libcsupport/include/rtems/gxx_wrappers.h | 2 | ||||
| -rw-r--r-- | cpukit/libcsupport/src/gxx_wrappers.c | 10 | ||||
| -rw-r--r-- | testsuites/libtests/gxx01/gxx01.doc | 1 | ||||
| -rw-r--r-- | testsuites/libtests/gxx01/gxx01.scn | 1 | ||||
| -rw-r--r-- | testsuites/libtests/gxx01/init.c | 7 |
5 files changed, 0 insertions, 21 deletions
diff --git a/cpukit/libcsupport/include/rtems/gxx_wrappers.h b/cpukit/libcsupport/include/rtems/gxx_wrappers.h index 33b163043f..801223e947 100644 --- a/cpukit/libcsupport/include/rtems/gxx_wrappers.h +++ b/cpukit/libcsupport/include/rtems/gxx_wrappers.h @@ -52,8 +52,6 @@ int rtems_gxx_once(__gthread_once_t *once, void (*func) (void)); int rtems_gxx_key_create (__gthread_key_t *key, void (*dtor) (void *)); -int rtems_gxx_key_dtor (__gthread_key_t key, void *ptr); - int rtems_gxx_key_delete (__gthread_key_t key); void *rtems_gxx_getspecific(__gthread_key_t key); diff --git a/cpukit/libcsupport/src/gxx_wrappers.c b/cpukit/libcsupport/src/gxx_wrappers.c index 711daa495a..0b9cad6591 100644 --- a/cpukit/libcsupport/src/gxx_wrappers.c +++ b/cpukit/libcsupport/src/gxx_wrappers.c @@ -77,16 +77,6 @@ int rtems_gxx_key_create (__gthread_key_t *key, void (*dtor) (void *)) return -1; } -int rtems_gxx_key_dtor (__gthread_key_t key, void *ptr) -{ - #ifdef DEBUG_GXX_WRAPPERS - printk( "gxx_wrappers: dtor key=%x, ptr=%x\n", key, ptr ); - #endif - - key->val = 0; - return 0; -} - int rtems_gxx_key_delete (__gthread_key_t key) { rtems_status_code status; diff --git a/testsuites/libtests/gxx01/gxx01.doc b/testsuites/libtests/gxx01/gxx01.doc index bb796816e0..568e26f49a 100644 --- a/testsuites/libtests/gxx01/gxx01.doc +++ b/testsuites/libtests/gxx01/gxx01.doc @@ -14,7 +14,6 @@ directives: rtems_gxx_once rtems_gxx_key_create - rtems_gxx_key_dtor rtems_gxx_key_delete rtems_gxx_getspecific rtems_gxx_setspecific diff --git a/testsuites/libtests/gxx01/gxx01.scn b/testsuites/libtests/gxx01/gxx01.scn index 5ffd49835f..cb9f6b505b 100644 --- a/testsuites/libtests/gxx01/gxx01.scn +++ b/testsuites/libtests/gxx01/gxx01.scn @@ -27,6 +27,5 @@ rtems_gxx_getspecific(key) already existing - OK rtems_gxx_key_delete(key) - OK rtems_gxx_getspecific(key) non-existent - OK rtems_gxx_key_delete(key) - OK -rtems_gxx_key_dtor(&key_obj) - OK *** END OF TEST GXX 01 *** diff --git a/testsuites/libtests/gxx01/init.c b/testsuites/libtests/gxx01/init.c index d725dc2e4b..f9252848de 100644 --- a/testsuites/libtests/gxx01/init.c +++ b/testsuites/libtests/gxx01/init.c @@ -129,7 +129,6 @@ void test_key(void) int sc; __gthread_key_t key; void *p; - __gthread_key key_obj; puts( "rtems_gxx_key_create(&key, NULL) - OK" ); sc = rtems_gxx_key_create(&key, NULL); @@ -166,12 +165,6 @@ void test_key(void) puts( "rtems_gxx_key_delete(key) - OK" ); sc = rtems_gxx_key_delete( key ); rtems_test_assert( sc == 0 ); - - memset( &key_obj, 0xff, sizeof( key_obj ) ); - puts( "rtems_gxx_key_dtor(&key_obj) - OK" ); - sc = rtems_gxx_key_dtor( &key_obj, key_dtor ); - rtems_test_assert( sc == 0 ); - rtems_test_assert( key_obj.val == 0 ); } rtems_task Init( |