Changeset 1feedea in rtems


Ignore:
Timestamp:
Jan 24, 2002, 2:13:15 PM (19 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
c3a79fa
Parents:
2fc6dc3
Message:

2002-01-23 Ralf Corsepius <corsepiu@…>

  • 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.
Files:
2 deleted
10 edited

Legend:

Unmodified
Added
Removed
  • c/src/exec/score/cpu/unix/ChangeLog

    r2fc6dc3 r1feedea  
     12002-01-23      Ralf Corsepius  <corsepiu@faw.uni-ulm.de>
     2
     3        * Makefile.am: Merge in rtems/Makefile.am and
     4        rtems/score/Makefile.am. Remove gensize. Require automake-1.5.
     5        * rtems/Makefile.am: Removed.
     6        * rtems/score/Makefile.am: Removed.
     7        * rtems/score/.cvsignore: Add unixsize.h*. Add stamp-h*.
     8        * configure.ac: Add AM_CONFIG_HEADER(rtems/score/unixsize.h).
     9        * rtems/score/cpu.h: Replace CPU_CONTEXT_SIZE_IN_BYTES with
     10        SIZEOF_CPU_CONTEXT.
     11
    1122001-12-19      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    213
  • c/src/exec/score/cpu/unix/Makefile.am

    r2fc6dc3 r1feedea  
    33##
    44
    5 AUTOMAKE_OPTIONS = foreign 1.4
     5AUTOMAKE_OPTIONS = foreign 1.5
    66ACLOCAL_AMFLAGS = -I ../../../../../../aclocal
    77
     
    1010include $(top_srcdir)/../../../../../../automake/lib.am
    1111
    12 SUBDIRS = rtems
     12AM_CPPFLAGS += -DCPU_SYNC_IO $(LIBC_DEFINES)
    1313
    14 AM_CPPFLAGS += -DCPU_SYNC_IO $(LIBC_DEFINES)
     14$(PROJECT_INCLUDE)/%.h: %.h
     15        $(INSTALL_DATA) $< $@
     16
     17$(PROJECT_INCLUDE):
     18        $(mkinstalldirs) $@
     19
     20$(PROJECT_INCLUDE)/rtems:
     21        $(mkinstalldirs) $@
     22
     23$(PROJECT_INCLUDE)/rtems/score:
     24        $(mkinstalldirs) $@
     25
     26include_rtems_scoredir = $(includedir)/rtems/score
     27include_rtems_score_HEADERS = \
     28    rtems/score/unixtypes.h \
     29    rtems/score/cpu.h \
     30    rtems/score/unix.h \
     31    rtems/score/unixsize.h
     32PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems/score \
     33    $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h)
    1534
    1635C_FILES = cpu.c
     
    3049EXTRA_DIST = cpu.c
    3150
    32 include $(top_srcdir)/../../../../../../automake/subdirs.am
    3351include $(top_srcdir)/../../../../../../automake/local.am
  • c/src/exec/score/cpu/unix/configure.ac

    r2fc6dc3 r1feedea  
    2828
    2929# The only use of System V IPC is the UNIX port when multiprocessing.
    30 if test "$HAS_MP" = "yes"; then
    31   RTEMS_CHECK_SYSV_UNIX
    32 fi
     30AS_IF([test "$HAS_MP" = "yes"],
     31  [RTEMS_CHECK_SYSV_UNIX])
     32
     33## The code fragment below had been used in tools/cpu/unix/gensize.c.
     34## FIXME:
     35## * The sun-stuff needs to be looked after.
     36## * The pad very likely is not necessary.
     37AC_CHECK_SIZEOF([CPU_CONTEXT],[],[
     38#if defined(__sun__) && defined(__sparc__) && \
     39    defined(__unix__) && defined(__svr4__)
     40#undef  _POSIX_C_SOURCE 
     41#define _POSIX_C_SOURCE 3
     42#undef  __STRICT_ANSI__
     43#endif
     44
     45#include <stdio.h>
     46#include <setjmp.h>
     47
     48typedef struct {
     49  jmp_buf     regs;
     50  int         isr_level;
     51  int         pad[4]; /* just in case */
     52} CPU_CONTEXT;
     53])
     54
     55AM_CONFIG_HEADER(rtems/score/unixsize.h)
    3356
    3457# Explicitly list all Makefiles here
    35 AC_CONFIG_FILES([Makefile
    36 rtems/Makefile
    37 rtems/score/Makefile])
     58AC_CONFIG_FILES([Makefile])
    3859AC_OUTPUT
  • c/src/exec/score/cpu/unix/rtems/score/.cvsignore

    r2fc6dc3 r1feedea  
    11Makefile
    22Makefile.in
     3unixsize.h*
     4stamp-h*
  • c/src/exec/score/cpu/unix/rtems/score/cpu.h

    r2fc6dc3 r1feedea  
    494494
    495495typedef struct {
    496   char      Area[ CPU_CONTEXT_SIZE_IN_BYTES ] CONTEXT_STRUCTURE_ALIGNMENT;
     496  char      Area[ SIZEOF_CPU_CONTEXT ] CONTEXT_STRUCTURE_ALIGNMENT;
    497497} Context_Control;
    498498
  • cpukit/score/cpu/unix/ChangeLog

    r2fc6dc3 r1feedea  
     12002-01-23      Ralf Corsepius  <corsepiu@faw.uni-ulm.de>
     2
     3        * Makefile.am: Merge in rtems/Makefile.am and
     4        rtems/score/Makefile.am. Remove gensize. Require automake-1.5.
     5        * rtems/Makefile.am: Removed.
     6        * rtems/score/Makefile.am: Removed.
     7        * rtems/score/.cvsignore: Add unixsize.h*. Add stamp-h*.
     8        * configure.ac: Add AM_CONFIG_HEADER(rtems/score/unixsize.h).
     9        * rtems/score/cpu.h: Replace CPU_CONTEXT_SIZE_IN_BYTES with
     10        SIZEOF_CPU_CONTEXT.
     11
    1122001-12-19      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    213
  • cpukit/score/cpu/unix/Makefile.am

    r2fc6dc3 r1feedea  
    33##
    44
    5 AUTOMAKE_OPTIONS = foreign 1.4
     5AUTOMAKE_OPTIONS = foreign 1.5
    66ACLOCAL_AMFLAGS = -I ../../../../../../aclocal
    77
     
    1010include $(top_srcdir)/../../../../../../automake/lib.am
    1111
    12 SUBDIRS = rtems
     12AM_CPPFLAGS += -DCPU_SYNC_IO $(LIBC_DEFINES)
    1313
    14 AM_CPPFLAGS += -DCPU_SYNC_IO $(LIBC_DEFINES)
     14$(PROJECT_INCLUDE)/%.h: %.h
     15        $(INSTALL_DATA) $< $@
     16
     17$(PROJECT_INCLUDE):
     18        $(mkinstalldirs) $@
     19
     20$(PROJECT_INCLUDE)/rtems:
     21        $(mkinstalldirs) $@
     22
     23$(PROJECT_INCLUDE)/rtems/score:
     24        $(mkinstalldirs) $@
     25
     26include_rtems_scoredir = $(includedir)/rtems/score
     27include_rtems_score_HEADERS = \
     28    rtems/score/unixtypes.h \
     29    rtems/score/cpu.h \
     30    rtems/score/unix.h \
     31    rtems/score/unixsize.h
     32PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems/score \
     33    $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h)
    1534
    1635C_FILES = cpu.c
     
    3049EXTRA_DIST = cpu.c
    3150
    32 include $(top_srcdir)/../../../../../../automake/subdirs.am
    3351include $(top_srcdir)/../../../../../../automake/local.am
  • cpukit/score/cpu/unix/configure.ac

    r2fc6dc3 r1feedea  
    2828
    2929# The only use of System V IPC is the UNIX port when multiprocessing.
    30 if test "$HAS_MP" = "yes"; then
    31   RTEMS_CHECK_SYSV_UNIX
    32 fi
     30AS_IF([test "$HAS_MP" = "yes"],
     31  [RTEMS_CHECK_SYSV_UNIX])
     32
     33## The code fragment below had been used in tools/cpu/unix/gensize.c.
     34## FIXME:
     35## * The sun-stuff needs to be looked after.
     36## * The pad very likely is not necessary.
     37AC_CHECK_SIZEOF([CPU_CONTEXT],[],[
     38#if defined(__sun__) && defined(__sparc__) && \
     39    defined(__unix__) && defined(__svr4__)
     40#undef  _POSIX_C_SOURCE 
     41#define _POSIX_C_SOURCE 3
     42#undef  __STRICT_ANSI__
     43#endif
     44
     45#include <stdio.h>
     46#include <setjmp.h>
     47
     48typedef struct {
     49  jmp_buf     regs;
     50  int         isr_level;
     51  int         pad[4]; /* just in case */
     52} CPU_CONTEXT;
     53])
     54
     55AM_CONFIG_HEADER(rtems/score/unixsize.h)
    3356
    3457# Explicitly list all Makefiles here
    35 AC_CONFIG_FILES([Makefile
    36 rtems/Makefile
    37 rtems/score/Makefile])
     58AC_CONFIG_FILES([Makefile])
    3859AC_OUTPUT
  • cpukit/score/cpu/unix/rtems/score/.cvsignore

    r2fc6dc3 r1feedea  
    11Makefile
    22Makefile.in
     3unixsize.h*
     4stamp-h*
  • cpukit/score/cpu/unix/rtems/score/cpu.h

    r2fc6dc3 r1feedea  
    494494
    495495typedef struct {
    496   char      Area[ CPU_CONTEXT_SIZE_IN_BYTES ] CONTEXT_STRUCTURE_ALIGNMENT;
     496  char      Area[ SIZEOF_CPU_CONTEXT ] CONTEXT_STRUCTURE_ALIGNMENT;
    497497} Context_Control;
    498498
Note: See TracChangeset for help on using the changeset viewer.