From 1feedea303bb827de155296bd6ce1f96990537bf Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 24 Jan 2002 14:13:15 +0000 Subject: 2002-01-23 Ralf Corsepius * Makefile.am: Merge in rtems/Makefile.am and rtems/score/Makefile.am. Remove gensize. Require automake-1.5. * rtems/Makefile.am: Removed. * rtems/score/Makefile.am: Removed. * rtems/score/.cvsignore: Add unixsize.h*. Add stamp-h*. * configure.ac: Add AM_CONFIG_HEADER(rtems/score/unixsize.h). * rtems/score/cpu.h: Replace CPU_CONTEXT_SIZE_IN_BYTES with SIZEOF_CPU_CONTEXT. --- c/src/exec/score/cpu/unix/rtems/Makefile.am | 10 ------- c/src/exec/score/cpu/unix/rtems/score/.cvsignore | 2 ++ c/src/exec/score/cpu/unix/rtems/score/Makefile.am | 36 ----------------------- c/src/exec/score/cpu/unix/rtems/score/cpu.h | 2 +- 4 files changed, 3 insertions(+), 47 deletions(-) delete mode 100644 c/src/exec/score/cpu/unix/rtems/Makefile.am delete mode 100644 c/src/exec/score/cpu/unix/rtems/score/Makefile.am (limited to 'c/src/exec/score/cpu/unix/rtems') diff --git a/c/src/exec/score/cpu/unix/rtems/Makefile.am b/c/src/exec/score/cpu/unix/rtems/Makefile.am deleted file mode 100644 index ef7df82af7..0000000000 --- a/c/src/exec/score/cpu/unix/rtems/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -## -## $Id$ -## - -AUTOMAKE_OPTIONS = foreign 1.4 - -SUBDIRS = score - -include $(top_srcdir)/../../../../../../automake/subdirs.am -include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/exec/score/cpu/unix/rtems/score/.cvsignore b/c/src/exec/score/cpu/unix/rtems/score/.cvsignore index 282522db03..7a3170081d 100644 --- a/c/src/exec/score/cpu/unix/rtems/score/.cvsignore +++ b/c/src/exec/score/cpu/unix/rtems/score/.cvsignore @@ -1,2 +1,4 @@ Makefile Makefile.in +unixsize.h* +stamp-h* diff --git a/c/src/exec/score/cpu/unix/rtems/score/Makefile.am b/c/src/exec/score/cpu/unix/rtems/score/Makefile.am deleted file mode 100644 index 37dd8c9d6a..0000000000 --- a/c/src/exec/score/cpu/unix/rtems/score/Makefile.am +++ /dev/null @@ -1,36 +0,0 @@ -## -## $Id$ -## - -AUTOMAKE_OPTIONS = foreign 1.4 - -include_rtems_scoredir = $(includedir)/rtems/score - -GENSIZE = $(PROJECT_TOPdir)/tools/cpu/unix/gensize - -GENERIC_H_FILES = unixsize.h -include_rtems_score_HEADERS = cpu.h unixtypes.h unix.h - -# -# (OPTIONAL) Add local stuff here using += -# - -unixsize.h: $(GENSIZE) cpu.h - $(RM) $@ - $(GENSIZE) > $@ - -CLEANFILES = unixsize.h - -PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems/score \ - $(GENERIC_H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) \ - $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) - -$(PROJECT_INCLUDE)/rtems/score: - $(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/rtems/score/%.h: %.h - $(INSTALL_DATA) $< $@ - -all-local: $(PREINSTALL_FILES) - -include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/exec/score/cpu/unix/rtems/score/cpu.h b/c/src/exec/score/cpu/unix/rtems/score/cpu.h index 1e5271291d..984b414281 100644 --- a/c/src/exec/score/cpu/unix/rtems/score/cpu.h +++ b/c/src/exec/score/cpu/unix/rtems/score/cpu.h @@ -493,7 +493,7 @@ extern "C" { #endif typedef struct { - char Area[ CPU_CONTEXT_SIZE_IN_BYTES ] CONTEXT_STRUCTURE_ALIGNMENT; + char Area[ SIZEOF_CPU_CONTEXT ] CONTEXT_STRUCTURE_ALIGNMENT; } Context_Control; typedef struct { -- cgit v1.2.3