2008-03-11 Joel Sherrill <joel.sherrill@oarcorp.com>

	* mptests/mp01/mptest.ads, mptests/mp02/mptest.ads,
	mptests/mp03/mptest.ads, mptests/mp04/mptest.ads,
	mptests/mp05/mptest.ads, mptests/mp06/mptest.ads,
	mptests/mp07/mptest.ads, mptests/mp08/mptest.ads,
	mptests/mp09/mptest.ads, mptests/mp10/mptest.ads,
	mptests/mp11/mptest.ads, mptests/mp12/mptest.ads,
	mptests/mp13/mptest.ads, mptests/mp14/mptest.ads,
	samples/base_mp/mptest.ads, samples/base_sp/sptest.ads,
	samples/hello/sptest.ads, samples/nsecs/sptest.ads,
	samples/ticker/sptest.ads, sptests/sp01/sptest.ads,
	sptests/sp02/sptest.ads, sptests/sp03/sptest.ads,
	sptests/sp04/sptest.ads, sptests/sp05/sptest.ads,
	sptests/sp06/sptest.ads, sptests/sp07/sptest.ads,
	sptests/sp08/sptest.ads, sptests/sp09/sptest.ads,
	sptests/sp11/sptest.ads, sptests/sp12/sptest.ads,
	sptests/sp13/sptest.ads, sptests/sp14/sptest.ads,
	sptests/sp15/sptest.ads, sptests/sp16/sptest.ads,
	sptests/sp17/sptest.ads, sptests/sp19/sptest.ads,
	sptests/sp20/sptest.ads, sptests/sp22/sptest.ads,
	sptests/sp23/sptest.ads, sptests/sp24/sptest.ads,
	sptests/sp25/sptest.ads, sptests/spname01/spname01.adb,
	tmtests/tm01/tmtest.ads, tmtests/tm02/tmtest.ads,
	tmtests/tm03/tmtest.ads, tmtests/tm04/tmtest.ads,
	tmtests/tm05/tmtest.ads, tmtests/tm06/tmtest.ads,
	tmtests/tm07/tmtest.ads, tmtests/tm08/tmtest.ads,
	tmtests/tm09/tmtest.ads, tmtests/tm10/tmtest.ads,
	tmtests/tm11/tmtest.ads, tmtests/tm12/tmtest.ads,
	tmtests/tm13/tmtest.ads, tmtests/tm14/tmtest.ads,
	tmtests/tm15/tmtest.ads, tmtests/tm16/tmtest.ads,
	tmtests/tm17/tmtest.ads, tmtests/tm18/tmtest.ads,
	tmtests/tm19/tmtest.ads, tmtests/tm20/tmtest.adb,
	tmtests/tm20/tmtest.ads, tmtests/tm21/tmtest.ads,
	tmtests/tm22/tmtest.ads, tmtests/tm23/tmtest.ads,
	tmtests/tm24/tmtest.ads, tmtests/tm25/tmtest.ads,
	tmtests/tm28/tmtest.ads, tmtests/tm29/tmtest.ads,
	tmtests/tmck/tmtest.ads, tmtests/tmoverhd/tmtest.ads:
	Added pragma Convention C as required by gcc > 4.3.

23 files changed, 96 insertions, 3 deletions

diff --git a/c/src/ada-tests/sptests/sp01/sptest.ads b/c/src/ada-tests/sptests/sp01/sptest.ads
index fc8fd325a7..bb628effde 100644
--- a/c/src/ada-tests/sptests/sp01/sptest.ads
+++ b/c/src/ada-tests/sptests/sp01/sptest.ads
@@ -43,6 +43,7 @@ package SPTEST is
    procedure INIT (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, INIT);
 
 --
 --  TASK_1_THROUGH_3
@@ -55,5 +56,6 @@ package SPTEST is
    procedure TASK_1_THROUGH_3 (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, TASK_1_THROUGH_3);
 
 end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp02/sptest.ads b/c/src/ada-tests/sptests/sp02/sptest.ads
index 9c8010ece6..1dd42d3eea 100644
--- a/c/src/ada-tests/sptests/sp02/sptest.ads
+++ b/c/src/ada-tests/sptests/sp02/sptest.ads
@@ -46,6 +46,7 @@ package SPTEST is
    procedure INIT (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, INIT);
 
 --
 --  PREEMPT_TASK
@@ -58,6 +59,7 @@ package SPTEST is
    procedure PREEMPT_TASK (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, PREEMPT_TASK);
 
 --
 --  TASK_1
@@ -70,6 +72,7 @@ package SPTEST is
    procedure TASK_1 (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, TASK_1);
 
 --
 --  TASK_2
@@ -82,6 +85,7 @@ package SPTEST is
    procedure TASK_2 (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, TASK_2);
 
 --
 --  TASK_3
@@ -94,5 +98,6 @@ package SPTEST is
    procedure TASK_3 (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, TASK_3);
 
 end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp03/sptest.ads b/c/src/ada-tests/sptests/sp03/sptest.ads
index f1bff42706..5a54139d89 100644
--- a/c/src/ada-tests/sptests/sp03/sptest.ads
+++ b/c/src/ada-tests/sptests/sp03/sptest.ads
@@ -43,6 +43,7 @@ package SPTEST is
    procedure INIT (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, INIT);
 
 --
 --  TASK_1
@@ -56,9 +57,10 @@ package SPTEST is
    procedure TASK_1 (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, TASK_1);
 
 --
---  TASK_1
+--  TASK_2
 --
 --  DESCRIPTION:
 --
@@ -69,5 +71,6 @@ package SPTEST is
    procedure TASK_2 (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, TASK_2);
 
 end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp04/sptest.ads b/c/src/ada-tests/sptests/sp04/sptest.ads
index f165636192..6bbd930e85 100644
--- a/c/src/ada-tests/sptests/sp04/sptest.ads
+++ b/c/src/ada-tests/sptests/sp04/sptest.ads
@@ -58,6 +58,7 @@ package SPTEST is
    procedure INIT (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, INIT);
 
 --
 --  TASK_1
@@ -70,6 +71,7 @@ package SPTEST is
    procedure TASK_1 (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, TASK_1);
 
 --
 --  TASK_2
@@ -83,6 +85,7 @@ package SPTEST is
    procedure TASK_2 (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, TASK_2);
 
 --
 --  TASK_3
@@ -96,6 +99,7 @@ package SPTEST is
    procedure TASK_3 (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, TASK_3);
 
 --
 --  TASK_SWITCH
@@ -111,6 +115,7 @@ package SPTEST is
       UNUSED : in     RTEMS.TCB_POINTER;
       HEIR   : in     RTEMS.TCB_POINTER
    );
+   pragma Convention (C, TASK_SWITCH);
 
 --
 --  This is the User Extension Table for this test.
diff --git a/c/src/ada-tests/sptests/sp05/sptest.ads b/c/src/ada-tests/sptests/sp05/sptest.ads
index 24427a5704..f0f7288360 100644
--- a/c/src/ada-tests/sptests/sp05/sptest.ads
+++ b/c/src/ada-tests/sptests/sp05/sptest.ads
@@ -43,6 +43,7 @@ package SPTEST is
    procedure INIT (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, INIT);
 
 --
 --  TASK_1
@@ -55,6 +56,7 @@ package SPTEST is
    procedure TASK_1 (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, TASK_1);
 
 --
 --  TASK_2
@@ -67,6 +69,7 @@ package SPTEST is
    procedure TASK_2 (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, TASK_2);
 
 --
 --  TASK_3
@@ -79,5 +82,6 @@ package SPTEST is
    procedure TASK_3 (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, TASK_3);
 
 end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp06/sptest.ads b/c/src/ada-tests/sptests/sp06/sptest.ads
index 680b2835b7..ec04f0c1e9 100644
--- a/c/src/ada-tests/sptests/sp06/sptest.ads
+++ b/c/src/ada-tests/sptests/sp06/sptest.ads
@@ -50,6 +50,7 @@ package SPTEST is
    procedure INIT (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, INIT);
 
 --
 --  TASK_1
@@ -62,6 +63,7 @@ package SPTEST is
    procedure TASK_1 (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, TASK_1);
 
 --
 --  TASK_2
@@ -74,6 +76,7 @@ package SPTEST is
    procedure TASK_2 (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, TASK_2);
 
 --
 --  TASK_3
@@ -86,5 +89,6 @@ package SPTEST is
    procedure TASK_3 (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, TASK_3);
 
 end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp07/sptest.ads b/c/src/ada-tests/sptests/sp07/sptest.ads
index bc41a147eb..2195acb399 100644
--- a/c/src/ada-tests/sptests/sp07/sptest.ads
+++ b/c/src/ada-tests/sptests/sp07/sptest.ads
@@ -51,6 +51,7 @@ package SPTEST is
    procedure INIT (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, INIT);
 
 --
 --  TASK_1
@@ -63,6 +64,7 @@ package SPTEST is
    procedure TASK_1 (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, TASK_1);
 
 --
 --  TASK_2
@@ -75,6 +77,7 @@ package SPTEST is
    procedure TASK_2 (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, TASK_2);
 
 --
 --  TASK_3
@@ -87,6 +90,7 @@ package SPTEST is
    procedure TASK_3 (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, TASK_3);
 
 --
 --  TASK_4
@@ -99,6 +103,7 @@ package SPTEST is
    procedure TASK_4 (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, TASK_4);
 
 --
 --  TASK_CREATE_EXTENSION
@@ -112,6 +117,7 @@ package SPTEST is
       UNUSED       : in     RTEMS.TCB_POINTER;
       CREATED_TASK : in     RTEMS.TCB_POINTER
    ) return RTEMS.Boolean;
+   pragma Convention (C, TASK_CREATE_EXTENSION);
 
 --
 --  TASK_DELETE_EXTENSION
@@ -125,6 +131,7 @@ package SPTEST is
       RUNNING_TASK : in     RTEMS.TCB_POINTER;
       DELETED_TASK : in     RTEMS.TCB_POINTER
    );
+   pragma Convention (C, TASK_DELETE_EXTENSION);
 
 --
 --  TASK_RESTART_EXTENSION
@@ -138,6 +145,7 @@ package SPTEST is
       UNUSED         : in     RTEMS.TCB_POINTER;
       RESTARTED_TASK : in     RTEMS.TCB_POINTER
    );
+   pragma Convention (C, TASK_RESTART_EXTENSION);
 
 --
 --  TASK_START_EXTENSION
@@ -151,6 +159,7 @@ package SPTEST is
       UNUSED       : in     RTEMS.TCB_POINTER;
       STARTED_TASK : in     RTEMS.TCB_POINTER
    );
+   pragma Convention (C, TASK_START_EXTENSION);
 
 --
 --  TASK_EXIT_EXTENSION
@@ -164,6 +173,7 @@ package SPTEST is
    procedure TASK_EXIT_EXTENSION (
       RUNNING_TASK : in     RTEMS.TCB_POINTER
    );
+   pragma Convention (C, TASK_EXIT_EXTENSION);
 
 --
 --  This is the User Extension Table for this test.
diff --git a/c/src/ada-tests/sptests/sp08/sptest.ads b/c/src/ada-tests/sptests/sp08/sptest.ads
index 6b24e4401c..caabb8280e 100644
--- a/c/src/ada-tests/sptests/sp08/sptest.ads
+++ b/c/src/ada-tests/sptests/sp08/sptest.ads
@@ -43,6 +43,7 @@ package SPTEST is
    procedure INIT (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, INIT);
 
 --
 --  PUT_MODE
@@ -69,5 +70,6 @@ package SPTEST is
    procedure TASK_1 (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, TASK_1);
 
 end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp09/sptest.ads b/c/src/ada-tests/sptests/sp09/sptest.ads
index 30670e49c5..97eb00d04f 100644
--- a/c/src/ada-tests/sptests/sp09/sptest.ads
+++ b/c/src/ada-tests/sptests/sp09/sptest.ads
@@ -192,6 +192,7 @@ package SPTEST is
    procedure INIT (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, INIT);
 
 --
 --  DELAYED_SUBPROGRAM
@@ -206,6 +207,7 @@ package SPTEST is
       IGNORED_ID      : in     RTEMS.ID;  
       IGNORED_ADDRESS : in     RTEMS.ADDRESS 
    );
+   pragma Convention (C, DELAYED_SUBPROGRAM);
 
 --
 --  TASK_1
@@ -218,6 +220,7 @@ package SPTEST is
    procedure TASK_1 (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, TASK_1);
 
 --
 --  TASK_2
@@ -230,6 +233,7 @@ package SPTEST is
    procedure TASK_2 (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, TASK_2);
 
 --
 --  TASK_3
@@ -242,6 +246,7 @@ package SPTEST is
    procedure TASK_3 (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, TASK_3);
 
 --
 --  TASK_4
@@ -254,6 +259,7 @@ package SPTEST is
    procedure TASK_4 (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, TASK_4);
 
 --
 --  SCREEN_1
diff --git a/c/src/ada-tests/sptests/sp11/sptest.ads b/c/src/ada-tests/sptests/sp11/sptest.ads
index 4788d80e24..62225fedfe 100644
--- a/c/src/ada-tests/sptests/sp11/sptest.ads
+++ b/c/src/ada-tests/sptests/sp11/sptest.ads
@@ -53,6 +53,7 @@ package SPTEST is
       IGNORED_ID      : in     RTEMS.ID;  
       IGNORED_ADDRESS : in     RTEMS.ADDRESS 
    ); 
+   pragma Convention (C, TA1_SEND_18_TO_SELF_5_SECONDS);
 
 --
 --  TA1_SEND_8_TO_SELF_60_SECONDS
@@ -67,6 +68,7 @@ package SPTEST is
       IGNORED_ID      : in     RTEMS.ID;  
       IGNORED_ADDRESS : in     RTEMS.ADDRESS 
    ); 
+   pragma Convention (C, TA1_SEND_8_TO_SELF_60_SECONDS);
 
 --
 --  TA1_SEND_9_TO_SELF_5_SECONDS
@@ -81,6 +83,7 @@ package SPTEST is
       IGNORED_ID      : in     RTEMS.ID;  
       IGNORED_ADDRESS : in     RTEMS.ADDRESS 
    ); 
+   pragma Convention (C, TA1_SEND_9_TO_SELF_60_SECONDS);
 
 --
 --  TA1_SEND_10_TO_SELF
@@ -95,6 +98,7 @@ package SPTEST is
       IGNORED_ID      : in     RTEMS.ID;  
       IGNORED_ADDRESS : in     RTEMS.ADDRESS 
    ); 
+   pragma Convention (C, TA1_SEND_10_TO_SELF);
 
 --
 --  TA1_SEND_1_TO_SELF_EVERY_SECOND
@@ -109,6 +113,7 @@ package SPTEST is
       IGNORED_ID      : in     RTEMS.ID;  
       IGNORED_ADDRESS : in     RTEMS.ADDRESS 
    ); 
+   pragma Convention (C, TA1_SEND_1_TO_SELF_EVERY_SECOND);
 
 --
 --  TA1_SEND_11_TO_SELF
@@ -123,6 +128,7 @@ package SPTEST is
       IGNORED_ID      : in     RTEMS.ID;  
       IGNORED_ADDRESS : in     RTEMS.ADDRESS 
    ); 
+   pragma Convention (C, TA1_SEND_11_TO_SELF);
 
 --
 --  TA2_SEND_10_TO_SELF
@@ -137,6 +143,7 @@ package SPTEST is
       IGNORED_ID      : in     RTEMS.ID;  
       IGNORED_ADDRESS : in     RTEMS.ADDRESS 
    ); 
+   pragma Convention (C, TA2_SEND_10_TO_SELF);
 
 --
 --  INIT
@@ -149,6 +156,7 @@ package SPTEST is
    procedure INIT (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, INIT);
 
 --
 --  TASK_1
@@ -161,6 +169,7 @@ package SPTEST is
    procedure TASK_1 (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, TASK_1);
 
 --
 --  TASK_2
@@ -173,5 +182,6 @@ package SPTEST is
    procedure TASK_2 (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, TASK_2);
 
 end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp12/sptest.ads b/c/src/ada-tests/sptests/sp12/sptest.ads
index 5a324d03c2..fa2e9adb77 100644
--- a/c/src/ada-tests/sptests/sp12/sptest.ads
+++ b/c/src/ada-tests/sptests/sp12/sptest.ads
@@ -50,6 +50,7 @@ package SPTEST is
    procedure INIT (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, INIT);
 
 --
 --  PRIORITY_TEST_DRIVER
@@ -77,6 +78,7 @@ package SPTEST is
    procedure PRIORITY_TASK (
       ITS_INDEX : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, PRIORITY_TASK);
 
 --
 --  TASK_1
@@ -89,6 +91,7 @@ package SPTEST is
    procedure TASK_1 (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, TASK_1);
 
 --
 --  TASK_2
@@ -101,6 +104,7 @@ package SPTEST is
    procedure TASK_2 (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, TASK_2);
 
 --
 --  TASK_3
@@ -113,6 +117,7 @@ package SPTEST is
    procedure TASK_3 (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, TASK_3);
 
 --
 --  TASK_4
@@ -125,6 +130,7 @@ package SPTEST is
    procedure TASK_4 (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, TASK_4);
 
 --
 --  TASK_5
@@ -137,5 +143,6 @@ package SPTEST is
    procedure TASK_5 (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, TASK_5);
 
 end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp13/sptest.ads b/c/src/ada-tests/sptests/sp13/sptest.ads
index 0a17a0f096..4eb9588422 100644
--- a/c/src/ada-tests/sptests/sp13/sptest.ads
+++ b/c/src/ada-tests/sptests/sp13/sptest.ads
@@ -64,6 +64,7 @@ package SPTEST is
    procedure INIT (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, INIT);
 
 --
 --  FILL_BUFFER
@@ -103,6 +104,7 @@ package SPTEST is
    procedure TASK_1 (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, TASK_1);
 
 --
 --  TASK_2
@@ -115,6 +117,7 @@ package SPTEST is
    procedure TASK_2 (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, TASK_2);
 
 --
 --  TASK_3
@@ -127,5 +130,6 @@ package SPTEST is
    procedure TASK_3 (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, TASK_3);
 
 end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp14/sptest.ads b/c/src/ada-tests/sptests/sp14/sptest.ads
index 48036a28e8..6a484f3737 100644
--- a/c/src/ada-tests/sptests/sp14/sptest.ads
+++ b/c/src/ada-tests/sptests/sp14/sptest.ads
@@ -77,6 +77,7 @@ package SPTEST is
    procedure INIT (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, INIT);
 
 --
 --  SIGNAL_3_TO_TASK_1
@@ -90,6 +91,7 @@ package SPTEST is
       ID      : in     RTEMS.ID;
       POINTER : in     RTEMS.ADDRESS
    );
+   pragma Convention (C, SIGNAL_3_TO_TASK_1);
 
 --
 --  PROCESS_ASR
@@ -102,6 +104,7 @@ package SPTEST is
    procedure PROCESS_ASR (
       THE_SIGNAL_SET : in     RTEMS.SIGNAL_SET
    );
+   pragma Convention (C, PROCESS_ASR);
 
 --
 --  TASK_1
@@ -114,6 +117,7 @@ package SPTEST is
    procedure TASK_1 (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, TASK_1);
 
 --
 --  TASK_2
@@ -126,5 +130,6 @@ package SPTEST is
    procedure TASK_2 (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, TASK_2);
 
 end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp15/sptest.ads b/c/src/ada-tests/sptests/sp15/sptest.ads
index 97164c9c74..ec03089985 100644
--- a/c/src/ada-tests/sptests/sp15/sptest.ads
+++ b/c/src/ada-tests/sptests/sp15/sptest.ads
@@ -63,6 +63,7 @@ package SPTEST is
    procedure INIT (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, INIT);
 
 --
 --  PUT_ADDRESS_FROM_AREA_1
@@ -113,5 +114,6 @@ package SPTEST is
    procedure TASK_1 (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, TASK_1);
 
 end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp16/sptest.ads b/c/src/ada-tests/sptests/sp16/sptest.ads
index 54e9898362..783cf0a210 100644
--- a/c/src/ada-tests/sptests/sp16/sptest.ads
+++ b/c/src/ada-tests/sptests/sp16/sptest.ads
@@ -76,6 +76,7 @@ package SPTEST is
    procedure INIT (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, INIT);
 
 --
 --  PUT_ADDRESS_FROM_AREA_1
@@ -145,6 +146,7 @@ package SPTEST is
    procedure TASK_1 (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, TASK_1);
 
 --
 --  TASK_2
@@ -157,6 +159,7 @@ package SPTEST is
    procedure TASK_2 (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, TASK_2);
 
 --
 --  TASK_3
@@ -169,6 +172,7 @@ package SPTEST is
    procedure TASK_3 (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, TASK_3);
 
 --
 --  TASK_4
@@ -181,6 +185,7 @@ package SPTEST is
    procedure TASK_4 (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, TASK_4);
 
 --
 --  TASK_5
@@ -193,5 +198,6 @@ package SPTEST is
    procedure TASK_5 (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, TASK_5);
 
 end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp17/sptest.ads b/c/src/ada-tests/sptests/sp17/sptest.ads
index c6f5ff85d8..b3ff420993 100644
--- a/c/src/ada-tests/sptests/sp17/sptest.ads
+++ b/c/src/ada-tests/sptests/sp17/sptest.ads
@@ -49,6 +49,7 @@ package SPTEST is
    procedure INIT (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, INIT);
 
 --
 --  PROCESS_ASR
@@ -61,6 +62,7 @@ package SPTEST is
    procedure PROCESS_ASR (
       SIGNALS : in     RTEMS.SIGNAL_SET
    );
+   pragma Convention (C, PROCESS_ASR);
 
 --
 --  TASK_1
@@ -76,6 +78,7 @@ package SPTEST is
    procedure TASK_1 (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, TASK_1);
 
 --
 --  TASK_2
@@ -88,5 +91,6 @@ package SPTEST is
    procedure TASK_2 (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, TASK_2);
 
 end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp19/sptest.ads b/c/src/ada-tests/sptests/sp19/sptest.ads
index 3cb87585f9..ab663850c5 100644
--- a/c/src/ada-tests/sptests/sp19/sptest.ads
+++ b/c/src/ada-tests/sptests/sp19/sptest.ads
@@ -58,6 +58,7 @@ package SPTEST is
    procedure INIT (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, INIT);
 
 --
 --  FIRST_FP_TASK
@@ -70,6 +71,7 @@ package SPTEST is
    procedure FIRST_FP_TASK (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, FIRST_FP_TASK);
 
 --
 --  FP_TASK
@@ -83,6 +85,7 @@ package SPTEST is
    procedure FP_TASK (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, FP_TASK);
 
 --
 --  TASK_1
@@ -97,5 +100,6 @@ package SPTEST is
    procedure TASK_1 (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, TASK_1);
 
 end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp20/sptest.ads b/c/src/ada-tests/sptests/sp20/sptest.ads
index 5b2eed7548..523bdd7d64 100644
--- a/c/src/ada-tests/sptests/sp20/sptest.ads
+++ b/c/src/ada-tests/sptests/sp20/sptest.ads
@@ -77,6 +77,7 @@ package SPTEST is
    procedure INIT (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, INIT);
 
 --
 --  TASK_1_THROUGH_6
@@ -89,6 +90,7 @@ package SPTEST is
    procedure TASK_1_THROUGH_6 (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, TASK_1_THROUGH_6);
 
 --
 --  GET_ALL_COUNTERS
diff --git a/c/src/ada-tests/sptests/sp22/sptest.ads b/c/src/ada-tests/sptests/sp22/sptest.ads
index 8abc5281a1..054b3ab15e 100644
--- a/c/src/ada-tests/sptests/sp22/sptest.ads
+++ b/c/src/ada-tests/sptests/sp22/sptest.ads
@@ -51,6 +51,7 @@ package SPTEST is
    procedure INIT (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, INIT);
 
 --
 --  DELAYED_RESUME
@@ -65,6 +66,7 @@ package SPTEST is
       IGNORED_ID      : in     RTEMS.ID;  
       IGNORED_ADDRESS : in     RTEMS.ADDRESS 
    );
+   pragma Convention (C, DELAYED_RESUME);
 
 --
 --  PRINT_TIME
@@ -87,5 +89,6 @@ package SPTEST is
    procedure TASK_1 (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, TASK_1);
 
 end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp23/sptest.ads b/c/src/ada-tests/sptests/sp23/sptest.ads
index febce87be1..878d484f69 100644
--- a/c/src/ada-tests/sptests/sp23/sptest.ads
+++ b/c/src/ada-tests/sptests/sp23/sptest.ads
@@ -101,6 +101,7 @@ package SPTEST is
    procedure INIT (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, INIT);
 
 --
 --  TASK_1
@@ -113,5 +114,6 @@ package SPTEST is
    procedure TASK_1 (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, TASK_1);
 
 end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp24/sptest.ads b/c/src/ada-tests/sptests/sp24/sptest.ads
index f6dd6f7326..e0f159cc29 100644
--- a/c/src/ada-tests/sptests/sp24/sptest.ads
+++ b/c/src/ada-tests/sptests/sp24/sptest.ads
@@ -51,6 +51,7 @@ package SPTEST is
    procedure INIT (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, INIT);
 
 --
 --  RESUME_TASK
@@ -65,6 +66,7 @@ package SPTEST is
       TIMER_ID        : in     RTEMS.ID;
       IGNORED_ADDRESS : in     RTEMS.ADDRESS 
    );
+   pragma Convention (C, RESUME_TASK);
 
 --
 --  TASK_1_THROUGH_3
@@ -77,5 +79,6 @@ package SPTEST is
    procedure TASK_1_THROUGH_3 (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, TASK_1_THROUGH_3);
 
 end SPTEST;
diff --git a/c/src/ada-tests/sptests/sp25/sptest.ads b/c/src/ada-tests/sptests/sp25/sptest.ads
index 1a61adb0fe..7ba3969f00 100644
--- a/c/src/ada-tests/sptests/sp25/sptest.ads
+++ b/c/src/ada-tests/sptests/sp25/sptest.ads
@@ -67,6 +67,7 @@ package SPTEST is
    procedure INIT (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, INIT);
 
 --
 --  PUT_ADDRESS_FROM_AREA_1
@@ -98,5 +99,6 @@ package SPTEST is
    procedure TASK_1 (
       ARGUMENT : in     RTEMS.TASK_ARGUMENT
    );
+   pragma Convention (C, TASK_1);
 
 end SPTEST;
diff --git a/c/src/ada-tests/sptests/spname01/spname01.adb b/c/src/ada-tests/sptests/spname01/spname01.adb
index eb35eefc0a..93719602da 100644
--- a/c/src/ada-tests/sptests/spname01/spname01.adb
+++ b/c/src/ada-tests/sptests/spname01/spname01.adb
@@ -24,8 +24,6 @@ with SPTEST;
 with TEST_SUPPORT;
 
 procedure SPNAME01 is
-  INIT_ID : RTEMS.ID;
-  STATUS  : RTEMS.STATUS_CODES;
 begin
 
    loop