2002-08-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* sptests/sp09/sptest.adb: Add Result to SCREEN_13.
	Remove Status from TASK_1.
	* sptests/sp21/sptest.adb: Add Result to TASK_1.
	* tmtests/tm20/tmtest.adb: Remove various RETURN_VALUEs.
	* ada.am: Remove ADACOMPILE, ADAC. Add AM_LDFLAGS, LDFLAGS.
	* configure.ac: Check for m4. Abort if HAS_GNAT = no.
This commit is contained in:
Ralf Corsepius
2002-08-27 06:57:46 +00:00
parent c94a454628
commit a846105767
6 changed files with 23 additions and 17 deletions

View File

@@ -1,3 +1,12 @@
2002-08-27 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* sptests/sp09/sptest.adb: Add Result to SCREEN_13.
Remove Status from TASK_1.
* sptests/sp21/sptest.adb: Add Result to TASK_1.
* tmtests/tm20/tmtest.adb: Remove various RETURN_VALUEs.
* ada.am: Remove ADACOMPILE, ADAC. Add AM_LDFLAGS, LDFLAGS.
* configure.ac: Check for m4. Abort if HAS_GNAT = no.
2002-08-26 Joel Sherrill <joel@OARcorp.com>
* tm27 and tm27 are irrelevant as Ada binding tests.
@@ -9,12 +18,6 @@
even though this test is not supported.
* sptests/sp19/sp19.adb: New file.
2002-08-26 Joel Sherrill <joel@OARcorp.com>
* sptests/sp19/sptest.adb: Modified to follow pattern of SP01
even though this test is not supported.
* sptests/sp19/sp19.adb: New file.
2002-08-26 Joel Sherrill <joel@OARcorp.com>
* mptests/mp01/mptest.ads, mptests/mp02/mptest.ads,

View File

@@ -1,8 +1,5 @@
SUFFIXES = .adb .ali .ads
ADACOMPILE = $(ADAC) $(AM_ADAFLAGS) $(ADAFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
ADAC = @ADAC@ $(GCCSPECS)
GNATMAKE = @GNATMAKE@ -cargs $(GCCSPECS) -largs $(GCCSPECS)
AM_ADAFLAGS = -I$(PROJECT_ROOT)/lib/include/adainclude \
@@ -12,7 +9,8 @@ AM_ADAFLAGS = -I$(PROJECT_ROOT)/lib/include/adainclude \
GNATCOMPILE = $(GNATMAKE) \
-margs $(AM_ADAFLAGS) $(ADAFLAGS) \
-cargs $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) \
-largs $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-largs $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS)
CLEANFILES = *.ali *.o b~*.adb b~*.ads

View File

@@ -14,6 +14,7 @@ RTEMS_CANONICAL_HOST
AM_INIT_AUTOMAKE([no-define foreign 1.6])
AM_MAINTAINER_MODE
AC_CHECK_PROGS([M4],[gm4 m4])
RTEMS_PROG_GNAT
RTEMS_CANONICALIZE_TOOLS
@@ -24,7 +25,11 @@ RTEMS_CHECK_CPU
RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
AM_CONDITIONAL([ADA],[test x"$HAVE_GNAT" = x"yes"])
AS_IF([test x"$HAVE_GNAT" = x"no"],[
AC_MSG_ERROR([No acceptable GNATMAKE found.])
])
RTEMS_CHECK_TOOL([GNATPREP],[gnatprep],[])
# FIXME: Enable building the examples which are known to be broken
AM_CONDITIONAL([EXPADA],

View File

@@ -2651,6 +2651,7 @@ package body SPTEST is
procedure SCREEN_13
is
RESULT : RTEMS.Unsigned32;
TIME : RTEMS.TIME_OF_DAY;
STATUS : RTEMS.STATUS_CODES;
begin
@@ -2687,6 +2688,7 @@ package body SPTEST is
RTEMS.DEVICE_MAJOR_NUMBER'LAST,
0,
RTEMS.NULL_ADDRESS,
RESULT,
STATUS
);
TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
@@ -3024,7 +3026,6 @@ package body SPTEST is
procedure TASK_1 (
ARGUMENT : in RTEMS.TASK_ARGUMENT
) is
STATUS : RTEMS.STATUS_CODES;
begin
SPTEST.SCREEN_1;

View File

@@ -76,6 +76,7 @@ package body SPTEST is
procedure TASK_1 (
ARGUMENT : in RTEMS.TASK_ARGUMENT
) is
RESULT : RTEMS.Unsigned32;
STATUS : RTEMS.STATUS_CODES;
begin
@@ -85,6 +86,7 @@ package body SPTEST is
SPTEST.NO_DRIVER_MAJOR,
0,
RTEMS.NULL_ADDRESS,
RESULT,
STATUS
);
TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "IO_INITIALIZE" );
@@ -153,6 +155,7 @@ package body SPTEST is
SPTEST.STUB_DRIVER_MAJOR,
0,
RTEMS.NULL_ADDRESS,
RESULT,
STATUS
);
TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "IO_INITIALIZE" );
@@ -221,6 +224,7 @@ package body SPTEST is
SPTEST.INVALID_DRIVER_MAJOR,
0,
RTEMS.NULL_ADDRESS,
RESULT,
STATUS
);
TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(

View File

@@ -432,7 +432,6 @@ package body TMTEST is
1,
0,
RTEMS.NULL_ADDRESS,
RETURN_VALUE,
STATUS
);
end loop;
@@ -453,7 +452,6 @@ package body TMTEST is
1,
0,
RTEMS.NULL_ADDRESS,
RETURN_VALUE,
STATUS
);
end loop;
@@ -474,7 +472,6 @@ package body TMTEST is
1,
0,
RTEMS.NULL_ADDRESS,
RETURN_VALUE,
STATUS
);
end loop;
@@ -495,7 +492,6 @@ package body TMTEST is
1,
0,
RTEMS.NULL_ADDRESS,
RETURN_VALUE,
STATUS
);
end loop;
@@ -516,7 +512,6 @@ package body TMTEST is
1,
0,
RTEMS.NULL_ADDRESS,
RETURN_VALUE,
STATUS
);
end loop;