summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2003-01-03 22:51:40 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2003-01-03 22:51:40 +0000
commit0f9e7f9670cf6c36cf34b4ad5e18e8d7ee0244a8 (patch)
tree8428a26d24d8ee5aa10f6c672dc020b93c1160d8
parente1fe652508520a6a10ee99cdfc30c5cb2606d626 (diff)
downloadrtems-0f9e7f9670cf6c36cf34b4ad5e18e8d7ee0244a8.tar.bz2
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.
-rw-r--r--c/src/ada-tests/ChangeLog10
-rw-r--r--c/src/ada-tests/ada.am5
-rw-r--r--c/src/ada-tests/samples/ticker/Makefile.am4
-rw-r--r--c/src/ada-tests/sptests/sp01/Makefile.am4
-rw-r--r--c/src/ada-tests/sptests/sp01/config.h2
-rw-r--r--c/src/ada-tests/sptests/sp04/Makefile.am4
-rw-r--r--c/src/ada-tests/sptests/sp04/config.h2
-rw-r--r--c/src/ada-tests/support/init.c3
8 files changed, 30 insertions, 4 deletions
diff --git a/c/src/ada-tests/ChangeLog b/c/src/ada-tests/ChangeLog
index 94b97bdea1..d86dd8e762 100644
--- a/c/src/ada-tests/ChangeLog
+++ b/c/src/ada-tests/ChangeLog
@@ -1,5 +1,15 @@
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
them unless multiprocessing is enabled.
diff --git a/c/src/ada-tests/ada.am b/c/src/ada-tests/ada.am
index 5a8c551137..dad226c953 100644
--- a/c/src/ada-tests/ada.am
+++ b/c/src/ada-tests/ada.am
@@ -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 $@
diff --git a/c/src/ada-tests/samples/ticker/Makefile.am b/c/src/ada-tests/samples/ticker/Makefile.am
index 38cac3143d..28617fc9c8 100644
--- a/c/src/ada-tests/samples/ticker/Makefile.am
+++ b/c/src/ada-tests/samples/ticker/Makefile.am
@@ -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
diff --git a/c/src/ada-tests/sptests/sp01/Makefile.am b/c/src/ada-tests/sptests/sp01/Makefile.am
index f29bf0af06..a69f6a5782 100644
--- a/c/src/ada-tests/sptests/sp01/Makefile.am
+++ b/c/src/ada-tests/sptests/sp01/Makefile.am
@@ -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
diff --git a/c/src/ada-tests/sptests/sp01/config.h b/c/src/ada-tests/sptests/sp01/config.h
index bfb614cd4e..3ae82fa4db 100644
--- a/c/src/ada-tests/sptests/sp01/config.h
+++ b/c/src/ada-tests/sptests/sp01/config.h
@@ -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 */
diff --git a/c/src/ada-tests/sptests/sp04/Makefile.am b/c/src/ada-tests/sptests/sp04/Makefile.am
index 4934e421bd..5eef5f6aa0 100644
--- a/c/src/ada-tests/sptests/sp04/Makefile.am
+++ b/c/src/ada-tests/sptests/sp04/Makefile.am
@@ -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
diff --git a/c/src/ada-tests/sptests/sp04/config.h b/c/src/ada-tests/sptests/sp04/config.h
index 8a9352ccc9..dc9e15e9ce 100644
--- a/c/src/ada-tests/sptests/sp04/config.h
+++ b/c/src/ada-tests/sptests/sp04/config.h
@@ -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 */
diff --git a/c/src/ada-tests/support/init.c b/c/src/ada-tests/support/init.c
index eb5aeffd73..1f218ef0dd 100644
--- a/c/src/ada-tests/support/init.c
+++ b/c/src/ada-tests/support/init.c
@@ -42,4 +42,7 @@ rtems_id tcb_to_id(
*/
#define CONFIGURE_INIT
+#define CONFIGURE_GNAT_RTEMS
+#define CONFIGURE_MEMORY_OVERHEAD (256)
+
#include <config.h>