2003-01-03 Joel Sherrill <joel@OARcorp.com>

* ada.am, samples/ticker/Makefile.am, sptests/sp01/Makefile.am,
	sptests/sp01/config.h, sptests/sp04/Makefile.am,
	sptests/sp04/config.h, support/init.c: Modified build rules slightly
	so gnat_main is used as the Ada main entry point.  Modified
	sp01 and sp04 Makefile.am's to compile and link with init.o.
	The test config.h's specified the Ada application requirements -- not
	the Classic API ones.
This commit is contained in:
Joel Sherrill
2003-01-03 22:51:40 +00:00
parent e1fe652508
commit 0f9e7f9670
8 changed files with 30 additions and 4 deletions

View File

@@ -1,3 +1,13 @@
2003-01-03 Joel Sherrill <joel@OARcorp.com>
* ada.am, samples/ticker/Makefile.am, sptests/sp01/Makefile.am,
sptests/sp01/config.h, sptests/sp04/Makefile.am,
sptests/sp04/config.h, support/init.c: Modified build rules slightly
so gnat_main is used as the Ada main entry point. Modified
sp01 and sp04 Makefile.am's to compile and link with init.o.
The test config.h's specified the Ada application requirements -- not
the Classic API ones.
2003-01-03 Joel Sherrill <joel@OARcorp.com>
* Makefile.am, configure.ac, samples/Makefile.am: Do not configure

View File

@@ -7,10 +7,13 @@ AM_ADAFLAGS = -I$(PROJECT_ROOT)/lib/include/adainclude \
-I$(top_srcdir)/support
GNATCOMPILE = $(GNATMAKE) \
-bargs -Mgnat_main \
-margs $(AM_ADAFLAGS) $(ADAFLAGS) \
-cargs $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) \
-largs $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS)
$(AM_LDFLAGS) $(LDFLAGS) init.o
CLEANFILES = *.ali *.o b~*.adb b~*.ads
%.o: %.c
$(CC) $(CFLAGS) -I@srcdir@ -c $< -o $@

View File

@@ -1,11 +1,13 @@
## $Id$
VPATH = @srcdir@:@srcdir@/../../support
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../../../automake/compile.am
include $(top_srcdir)/ada.am
ticker$(EXEEXT): ticker.adb
ticker$(EXEEXT): ticker.adb init.o
$(GNATCOMPILE) -margs -a $< -o $@
noinst_PROGRAMS = ticker

View File

@@ -1,5 +1,7 @@
## $Id$
VPATH = @srcdir@:@srcdir@/../../support
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../../../automake/compile.am
include $(top_srcdir)/../../../automake/lib.am
@@ -9,7 +11,7 @@ include $(top_srcdir)/ada.am
noinst_PROGRAMS = sp01
sp01_SOURCES = sp01.adb config.h sptest.adb sptest.ads
sp01$(EXEEXT): sp01.adb
sp01$(EXEEXT): sp01.adb init.o
$(GNATCOMPILE) -margs -a $< -o $@
EXTRA_DIST = sp01.scn

View File

@@ -28,6 +28,8 @@
#define CONFIGURE_MAXIMUM_POSIX_MUTEXES 20
#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES 10
#define CONFIGURE_MAXIMUM_TASKS 4
#include <confdefs.h>
/* end of include file */

View File

@@ -1,5 +1,7 @@
## $Id$
VPATH = @srcdir@:@srcdir@/../../support
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../../../automake/compile.am
include $(top_srcdir)/../../../automake/lib.am
@@ -12,7 +14,7 @@ endif
sp04_SOURCES = sp04.adb config.h sptest.adb sptest.ads
sp04$(EXEEXT): sp04.adb
sp04$(EXEEXT): sp04.adb init.o
$(GNATCOMPILE) -margs -a $< -o $@
EXTRA_DIST = sp04.scn

View File

@@ -31,6 +31,8 @@
#define CONFIGURE_MAXIMUM_POSIX_MUTEXES 20
#define CONFIGURE_MAXIMUM_POSIX_CONDITION_VARIABLES 10
#define CONFIGURE_MAXIMUM_TASKS 4
#include <confdefs.h>
/* end of include file */

View File

@@ -42,4 +42,7 @@ rtems_id tcb_to_id(
*/
#define CONFIGURE_INIT
#define CONFIGURE_GNAT_RTEMS
#define CONFIGURE_MEMORY_OVERHEAD (256)
#include <config.h>