From df49c60c9671e4a28e636964d744c1f59fb6cb68 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 12 Jun 2000 15:00:15 +0000 Subject: Merged from 4.5.0-beta3a --- c/src/exec/score/include/rtems/Makefile.am | 9 +++------ c/src/exec/score/include/rtems/score/Makefile.am | 17 ++++++++--------- c/src/exec/score/include/rtems/score/thread.h | 3 ++- c/src/exec/score/include/rtems/system.h | 4 ++-- 4 files changed, 15 insertions(+), 18 deletions(-) (limited to 'c/src/exec/score/include/rtems') diff --git a/c/src/exec/score/include/rtems/Makefile.am b/c/src/exec/score/include/rtems/Makefile.am index f09b99a313..f4ac2b1717 100644 --- a/c/src/exec/score/include/rtems/Makefile.am +++ b/c/src/exec/score/include/rtems/Makefile.am @@ -8,18 +8,15 @@ H_FILES = debug.h system.h noinst_HEADERS = $(H_FILES) -PREINSTALL_FILES = \ -$(PROJECT_INCLUDE)/rtems \ -$(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \ + $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%) $(PROJECT_INCLUDE)/rtems: @$(mkinstalldirs) $@ $(PROJECT_INCLUDE)/rtems/%.h: %.h $(INSTALL_DATA) $< $@ -all-am: $(PREINSTALL_FILES) -debug-am: $(PREINSTALL_FILES) -profile-am: $(PREINSTALL_FILES) +all-local: $(PREINSTALL_FILES) SUBDIRS = score diff --git a/c/src/exec/score/include/rtems/score/Makefile.am b/c/src/exec/score/include/rtems/score/Makefile.am index 4507d51b33..01468381c6 100644 --- a/c/src/exec/score/include/rtems/score/Makefile.am +++ b/c/src/exec/score/include/rtems/score/Makefile.am @@ -11,10 +11,10 @@ include $(RTEMS_ROOT)/make/leaf.cfg MP_H_FILES = mpci.h mppkt.h objectmp.h threadmp.h # H_FILES that get installed in the rtems/score subdirectoy -STD_H_FILES = address.h apiext.h bitfield.h chain.h context.h copyrt.h coremsg.h \ - coremutex.h coresem.h heap.h interr.h isr.h object.h priority.h stack.h \ - states.h sysstate.h thread.h threadq.h tod.h tqdata.h userext.h \ - watchdog.h wkspace.h +STD_H_FILES = address.h apiext.h bitfield.h chain.h context.h copyrt.h \ + coremsg.h coremutex.h coresem.h heap.h interr.h isr.h object.h \ + priority.h stack.h states.h sysstate.h thread.h threadq.h tod.h tqdata.h \ + userext.h watchdog.h wkspace.h TARGOPTS = targopts.h if HAS_MP @@ -23,9 +23,8 @@ else H_FILES = $(STD_H_FILES) $(TARGOPTS) endif -PREINSTALL_FILES = \ -$(PROJECT_INCLUDE)/rtems/score \ -$(H_FILES:%=$(PROJECT_INCLUDE)/rtems/score/%) +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \ + $(H_FILES:%=$(PROJECT_INCLUDE)/rtems/score/%) $(PROJECT_INCLUDE)/rtems/score: @$(mkinstalldirs) $@ @@ -45,7 +44,7 @@ CLEANFILES += $(TARGOPTS) RTEMS_CPU_DEFINED = $(subst .,_,$(RTEMS_CPU)) # make the target dependent options file -$(TARGOPTS): +$(TARGOPTS): @echo "/* target board dependent options file */" >$@ @echo "/* automatically generated -- DO NOT EDIT!! */" >>$@ @echo >>$@ @@ -89,7 +88,7 @@ $(TARGOPTS): @echo >>$@ @echo "#endif" >>$@ -all: $(PREINSTALL_FILES) +all-local: $(PREINSTALL_FILES) EXTRA_DIST = $(STD_H_FILES) $(MP_H_FILES) diff --git a/c/src/exec/score/include/rtems/score/thread.h b/c/src/exec/score/include/rtems/score/thread.h index ec48864a9f..4c8032f558 100644 --- a/c/src/exec/score/include/rtems/score/thread.h +++ b/c/src/exec/score/include/rtems/score/thread.h @@ -94,7 +94,8 @@ struct rtems_task_variable_tt; struct rtems_task_variable_tt { struct rtems_task_variable_tt *next; void **ptr; - void *var; + void *gval; + void *tval; void (*dtor)(void *); }; diff --git a/c/src/exec/score/include/rtems/system.h b/c/src/exec/score/include/rtems/system.h index 6db19e8c62..b1a2382ea4 100644 --- a/c/src/exec/score/include/rtems/system.h +++ b/c/src/exec/score/include/rtems/system.h @@ -187,10 +187,10 @@ SCORE_EXTERN rtems_cpu_table _CPU_Table; /* CPU dependent info */ (_CPU_Table.stack_free_hook) /* - * XXX weird RTEMS stuff + * XXX weird RTEMS stuff that probably should be somewhere else. */ -#define RTEMS_MAXIMUM_NAME_LENGTH 4 +#define RTEMS_MAXIMUM_NAME_LENGTH sizeof(rtems_name) #ifdef __cplusplus } -- cgit v1.2.3