Changeset ac815430 in rtems


Ignore:
Timestamp:
Jun 14, 2000, 5:07:54 PM (21 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
c63a5cf
Parents:
61bd0301
Message:

Patch rtems-rc-20000614-sh.tar.gz from Ralf Corsepius
<corsepiu@…> that migrates the SH port to
multilib'ing. This patch involved moving a number of
files in the CVS repository, adding new files, and
deleting files from their previous location. Ralf
gave good instructions (not repeated here) and here
are his notes:

Note 1: In this version, I did not change the installation points of
the headers which are moved inside of the source-tree. This is a
temporary hack for not breaking compatibility with 4.5 based BSPs,
but will probably not last once having real multilibs (We would have
include file conflicts when several BSPs/CPU_MODELS share a common
installation prefix).

Note 2: I hope not to have broken too much, but I would not be
astonished if something goes wrong.

Note 3: There are more patches to come :)

Files:
4 added
7 deleted
26 edited

Legend:

Unmodified
Added
Removed
  • c/src/exec/score/cpu/sh/Makefile.am

    r61bd0301 rac815430  
    2222        $(INSTALL_DATA) $< $@
    2323
    24 C_FILES = cpu.c cpu_asm.c isp$(RTEMS_CPU_MODEL).c
     24C_FILES = cpu.c
    2525C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
    2626
     
    4141.PRECIOUS: $(REL)
    4242
    43 EXTRA_DIST = asm.h cpu.c cpu_asm.c ispsh7032.c ispsh7045.c rtems.c
     43EXTRA_DIST = asm.h cpu.c rtems.c
    4444
    4545include $(top_srcdir)/../../../../../../automake/subdirs.am
  • c/src/exec/score/cpu/sh/rtems/score/Makefile.am

    r61bd0301 rac815430  
    55AUTOMAKE_OPTIONS = foreign 1.4
    66
    7 H_FILES = cpu.h shtypes.h sh.h sh_io.h isp$(RTEMS_CPU_MODEL).h \
    8     io$(RTEMS_CPU_MODEL).h
    9 noinst_HEADERS = cpu.h shtypes.h sh.h sh_io.h iosh7032.h ispsh7032.h \
    10     iosh7045.h ispsh7045.h
     7H_FILES = cpu.h shtypes.h sh.h sh_io.h
     8noinst_HEADERS = cpu.h shtypes.h sh.h sh_io.h
    119
    1210#
  • c/src/exec/score/cpu/sh/rtems/score/sh.h

    r61bd0301 rac815430  
    4141 
    4242#if defined(rtems_multilib)
     43
    4344/*
    4445 *  Figure out all CPU Model Feature Flags based upon compiler
     
    5051#define SH_HAS_SEPARATE_STACKS 1
    5152
    52 #elif defined(sh7032)
    53 #define CPU_MODEL_NAME  "SH7032"
    54 #define SH_HAS_FPU      0
     53#else
    5554
    56 #elif defined (sh7045)
    57 #define CPU_MODEL_NAME  "SH7045"
    58 #define SH_HAS_FPU      0
     55#if defined(__sh1__) || defined(__sh2__) || defined(__sh3__)
     56#define SH_HAS_FPU      0
     57#else
     58#define SH_HAS_FPU      1
     59#endif
    5960
    60 #else
    61 #error "Unsupported CPU Model"
    62  
    63 #endif
     61/* this should not be here */
     62#define CPU_MODEL_NAME  "SH-Multilib"
     63
     64#endif /* multilib */
    6465
    6566/*
  • c/src/lib/libbsp/sh/gensh1/wrapup/Makefile.am

    r61bd0301 rac815430  
    1010
    1111# pieces to pick up out of libcpu/sh/sh7032
    12 CPU_PIECES = null clock timer sci delay
     12CPU_PIECES = null clock timer sci delay score
    1313
    1414# bummer; have to use $foreach since % pattern subst rules only replace 1x
  • c/src/lib/libbsp/sh/gensh2/wrapup/Makefile.am

    r61bd0301 rac815430  
    1010
    1111# pieces to pick up out of libcpu/sh
    12 CPU_PIECES = null clock timer sci
     12CPU_PIECES = null clock timer sci score
    1313
    1414# bummer; have to use $foreach since % pattern subst rules only replace 1x
  • c/src/lib/libcpu/sh/Makefile.am

    r61bd0301 rac815430  
    66ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
    77
    8 SUBDIRS = @RTEMS_CPU_MODEL@
     8SUBDIRS = @subdirs@
    99
    1010include $(top_srcdir)/../../../../../automake/subdirs.am
  • c/src/lib/libcpu/sh/configure.in

    r61bd0301 rac815430  
    2121RTEMS_PROJECT_ROOT
    2222
    23 RTEMS_PROG_CC_FOR_TARGET
    24 RTEMS_CANONICALIZE_TOOLS
    25 
    2623RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
    2724RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
    2825
     26if test -d ${srcdir}/$RTEMS_CPU_MODEL; then
     27RTEMS_CPU_MODEL_SUBDIR="$RTEMS_CPU_MODEL"
     28fi
     29AC_CONFIG_SUBDIRS($RTEMS_CPU_MODEL_SUBDIR)
     30
    2931# Explicitly list all Makefiles here
    3032AC_OUTPUT(
    31 Makefile
    32 sh7032/Makefile
    33 sh7032/null/Makefile
    34 sh7032/clock/Makefile
    35 sh7032/delay/Makefile
    36 sh7032/include/Makefile
    37 sh7032/timer/Makefile
    38 sh7032/sci/Makefile
    39 sh7045/Makefile
    40 sh7045/clock/Makefile
    41 sh7045/include/Makefile
    42 sh7045/null/Makefile
    43 sh7045/sci/Makefile
    44 sh7045/timer/Makefile)
     33Makefile)
  • c/src/lib/libcpu/sh/sh7032/Makefile.am

    r61bd0301 rac815430  
    44
    55AUTOMAKE_OPTIONS = foreign 1.4
     6ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
    67
    7 SUBDIRS = include clock timer null sci delay
     8SUBDIRS = include score clock timer null sci delay
    89
    9 include $(top_srcdir)/../../../../../automake/subdirs.am
    10 include $(top_srcdir)/../../../../../automake/local.am
     10include $(top_srcdir)/../../../../../../automake/subdirs.am
     11include $(top_srcdir)/../../../../../../automake/local.am
  • c/src/lib/libcpu/sh/sh7032/clock/Makefile.am

    r61bd0301 rac815430  
    1313
    1414include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
    15 include $(top_srcdir)/../../../../../automake/lib.am
     15include $(top_srcdir)/../../../../../../automake/lib.am
    1616
    1717#
     
    2828EXTRA_DIST = ckinit.c
    2929
    30 include $(top_srcdir)/../../../../../automake/local.am
     30include $(top_srcdir)/../../../../../../automake/local.am
  • c/src/lib/libcpu/sh/sh7032/delay/Makefile.am

    r61bd0301 rac815430  
    1313
    1414include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
    15 include $(top_srcdir)/../../../../../automake/lib.am
     15include $(top_srcdir)/../../../../../../automake/lib.am
    1616
    1717#
     
    2828EXTRA_DIST = delay.c
    2929
    30 include $(top_srcdir)/../../../../../automake/local.am
     30include $(top_srcdir)/../../../../../../automake/local.am
  • c/src/lib/libcpu/sh/sh7032/include/Makefile.am

    r61bd0301 rac815430  
    66
    77H_FILES = null.h sci.h sh7_pfc.h sh7_sci.h
     8SCORE_H_FILES= ispsh7032.h iosh7032.h
    89
    910# NOTE: Unlike other CPUS, we install into a subdirectory to avoid
     
    1617        $(INSTALL_DATA) $< $@
    1718
     19$(PROJECT_INCLUDE)/rtems/score/%.h: %.h
     20        $(INSTALL_DATA) $< $@
     21
    1822TMPINSTALL_FILES += $(PROJECT_INCLUDE)/sh \
    19     $(H_FILES:%=$(PROJECT_INCLUDE)/sh/%)
     23    $(H_FILES:%.h=$(PROJECT_INCLUDE)/sh/%.h) \
     24    $(SCORE_H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h)
    2025
    2126all-local: $(TMPINSTALL_FILES)
     
    2328EXTRA_DIST = null.h sci.h sh7_pfc.h sh7_sci.h
    2429
    25 include $(top_srcdir)/../../../../../automake/local.am
     30include $(top_srcdir)/../../../../../../automake/local.am
  • c/src/lib/libcpu/sh/sh7032/null/Makefile.am

    r61bd0301 rac815430  
    1313
    1414include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
    15 include $(top_srcdir)/../../../../../automake/lib.am
     15include $(top_srcdir)/../../../../../../automake/lib.am
    1616
    1717#
     
    2828EXTRA_DIST = close.c cntrl.c init.c open.c read.c write.c
    2929
    30 include $(top_srcdir)/../../../../../automake/local.am
     30include $(top_srcdir)/../../../../../../automake/local.am
  • c/src/lib/libcpu/sh/sh7032/sci/Makefile.am

    r61bd0301 rac815430  
    1313
    1414include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
    15 include $(top_srcdir)/../../../../../automake/lib.am
     15include $(top_srcdir)/../../../../../../automake/lib.am
    1616
    1717#
     
    2828EXTRA_DIST = sci.c
    2929
    30 include $(top_srcdir)/../../../../../automake/local.am
     30include $(top_srcdir)/../../../../../../automake/local.am
  • c/src/lib/libcpu/sh/sh7032/score/cpu_asm.c

    r61bd0301 rac815430  
    4444#include <rtems/score/sh.h>
    4545
    46 #if defined(sh7032)
    4746#include <rtems/score/ispsh7032.h>
    4847#include <rtems/score/iosh7032.h>
    49 #elif defined (sh7045)
    50 #include <rtems/score/ispsh7045.h>
    51 #include <rtems/score/iosh7045.h>
    52 #endif
    53 
    5448#include <rtems/score/sh_io.h>
    5549
  • c/src/lib/libcpu/sh/sh7032/score/ispsh7032.c

    r61bd0301 rac815430  
    3232#include <rtems/score/shtypes.h>
    3333#include <rtems/score/ispsh7032.h>
    34 
    35 #if !defined(sh7032)
    36 #error Wrong CPU MODEL
    37 #endif
    3834
    3935/*
  • c/src/lib/libcpu/sh/sh7032/timer/Makefile.am

    r61bd0301 rac815430  
    1313
    1414include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
    15 include $(top_srcdir)/../../../../../automake/lib.am
     15include $(top_srcdir)/../../../../../../automake/lib.am
    1616
    1717#
     
    2828EXTRA_DIST = timer.c
    2929
    30 include $(top_srcdir)/../../../../../automake/local.am
     30include $(top_srcdir)/../../../../../../automake/local.am
  • c/src/lib/libcpu/sh/sh7045/Makefile.am

    r61bd0301 rac815430  
    44
    55AUTOMAKE_OPTIONS = foreign 1.4
     6ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
    67
    7 SUBDIRS = include clock sci timer null
     8SUBDIRS = include score clock sci timer null
    89
    9 include $(top_srcdir)/../../../../../automake/subdirs.am
    10 include $(top_srcdir)/../../../../../automake/local.am
     10include $(top_srcdir)/../../../../../../automake/subdirs.am
     11include $(top_srcdir)/../../../../../../automake/local.am
  • c/src/lib/libcpu/sh/sh7045/clock/Makefile.am

    r61bd0301 rac815430  
    1313
    1414include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
    15 include $(top_srcdir)/../../../../../automake/lib.am
     15include $(top_srcdir)/../../../../../../automake/lib.am
    1616
    1717#
     
    2828EXTRA_DIST = ckinit.c
    2929
    30 include $(top_srcdir)/../../../../../automake/local.am
     30include $(top_srcdir)/../../../../../../automake/local.am
  • c/src/lib/libcpu/sh/sh7045/include/Makefile.am

    r61bd0301 rac815430  
    66
    77H_FILES = io_types.h null.h sci.h sh7_pfc.h sh7_sci.h
     8SCORE_H_FILES = ispsh7045.h iosh7045.h
    89
    910# NOTE: Unlike other CPUS, we install into a subdirectory to avoid
     
    1617        $(INSTALL_DATA) $< $@
    1718
     19$(PROJECT_INCLUDE)/rtems/score/%.h: %.h
     20        $(INSTALL_DATA) $< $@
     21
    1822TMPINSTALL_FILES += $(PROJECT_INCLUDE)/sh \
    19     $(H_FILES:%=$(PROJECT_INCLUDE)/sh/%)
     23    $(H_FILES:%.h=$(PROJECT_INCLUDE)/sh/%.h) \
     24    $(SCORE_H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h)
    2025
    2126all-local: $(TMPINSTALL_FILES)
     
    2328EXTRA_DIST = io_types.h null.h sci.h sh7_pfc.h sh7_sci.h
    2429
    25 include $(top_srcdir)/../../../../../automake/local.am
     30include $(top_srcdir)/../../../../../../automake/local.am
  • c/src/lib/libcpu/sh/sh7045/null/Makefile.am

    r61bd0301 rac815430  
    1313
    1414include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
    15 include $(top_srcdir)/../../../../../automake/lib.am
     15include $(top_srcdir)/../../../../../../automake/lib.am
    1616
    1717#
     
    2828EXTRA_DIST = close.c cntrl.c init.c open.c read.c write.c
    2929
    30 include $(top_srcdir)/../../../../../automake/local.am
     30include $(top_srcdir)/../../../../../../automake/local.am
  • c/src/lib/libcpu/sh/sh7045/sci/Makefile.am

    r61bd0301 rac815430  
    1313
    1414include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
    15 include $(top_srcdir)/../../../../../automake/lib.am
     15include $(top_srcdir)/../../../../../../automake/lib.am
    1616
    1717#
     
    2828EXTRA_DIST = sci.c
    2929
    30 include $(top_srcdir)/../../../../../automake/local.am
     30include $(top_srcdir)/../../../../../../automake/local.am
  • c/src/lib/libcpu/sh/sh7045/score/cpu_asm.c

    r61bd0301 rac815430  
    4444#include <rtems/score/sh.h>
    4545
    46 #if defined(sh7032)
    47 #include <rtems/score/ispsh7032.h>
    48 #include <rtems/score/iosh7032.h>
    49 #elif defined (sh7045)
    5046#include <rtems/score/ispsh7045.h>
    5147#include <rtems/score/iosh7045.h>
    52 #endif
    53 
    5448#include <rtems/score/sh_io.h>
    5549
  • c/src/lib/libcpu/sh/sh7045/score/ispsh7045.c

    r61bd0301 rac815430  
    4343#include <rtems/system.h>
    4444#include <rtems/score/shtypes.h>
    45 
    46 #if !defined (sh7045)
    47 #error Wrong CPU MODEL
    48 #endif
    4945
    5046/*
  • c/src/lib/libcpu/sh/sh7045/timer/Makefile.am

    r61bd0301 rac815430  
    1313
    1414include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
    15 include $(top_srcdir)/../../../../../automake/lib.am
     15include $(top_srcdir)/../../../../../../automake/lib.am
    1616
    1717#
     
    2828EXTRA_DIST = timer.c
    2929
    30 include $(top_srcdir)/../../../../../automake/local.am
     30include $(top_srcdir)/../../../../../../automake/local.am
  • cpukit/score/cpu/sh/Makefile.am

    r61bd0301 rac815430  
    2222        $(INSTALL_DATA) $< $@
    2323
    24 C_FILES = cpu.c cpu_asm.c isp$(RTEMS_CPU_MODEL).c
     24C_FILES = cpu.c
    2525C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
    2626
     
    4141.PRECIOUS: $(REL)
    4242
    43 EXTRA_DIST = asm.h cpu.c cpu_asm.c ispsh7032.c ispsh7045.c rtems.c
     43EXTRA_DIST = asm.h cpu.c rtems.c
    4444
    4545include $(top_srcdir)/../../../../../../automake/subdirs.am
  • cpukit/score/cpu/sh/rtems/score/sh.h

    r61bd0301 rac815430  
    4141 
    4242#if defined(rtems_multilib)
     43
    4344/*
    4445 *  Figure out all CPU Model Feature Flags based upon compiler
     
    5051#define SH_HAS_SEPARATE_STACKS 1
    5152
    52 #elif defined(sh7032)
    53 #define CPU_MODEL_NAME  "SH7032"
    54 #define SH_HAS_FPU      0
     53#else
    5554
    56 #elif defined (sh7045)
    57 #define CPU_MODEL_NAME  "SH7045"
    58 #define SH_HAS_FPU      0
     55#if defined(__sh1__) || defined(__sh2__) || defined(__sh3__)
     56#define SH_HAS_FPU      0
     57#else
     58#define SH_HAS_FPU      1
     59#endif
    5960
    60 #else
    61 #error "Unsupported CPU Model"
    62  
    63 #endif
     61/* this should not be here */
     62#define CPU_MODEL_NAME  "SH-Multilib"
     63
     64#endif /* multilib */
    6465
    6566/*
Note: See TracChangeset for help on using the changeset viewer.