Changeset 80e5391 in rtems


Ignore:
Timestamp:
Jul 7, 2000, 7:36:14 PM (21 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
586f260
Parents:
acddd7d2
Message:

Moved old_exception_processing and new_exception_processing directories
from score/cpu to libcpu because the determination of which to use is
based on RTEMS_CPU_MODEL. Thus it can not be determined based solely on
multilib information.

Files:
4 deleted
17 edited

Legend:

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

    racddd7d2 r80e5391  
    66ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
    77
    8 if PPC_NEW_EXCEPTION_PROCESSING
    9 CPUDIR = new_exception_processing
    10 else
    11 CPUDIR = old_exception_processing
    12 endif
    13 
    14 SUBDIRS = shared $(CPUDIR)
     8SUBDIRS = shared
    159
    1610include $(top_srcdir)/../../../../../../automake/subdirs.am
  • c/src/exec/score/cpu/powerpc/configure.in

    racddd7d2 r80e5391  
    44
    55AC_PREREQ(2.13)
    6 AC_INIT(new_exception_processing)
     6AC_INIT(shared)
    77RTEMS_TOP(../../../../../..)
    88AC_CONFIG_AUX_DIR(../../../../../..)
     
    2828RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
    2929
    30 # FIXME: This is in contradiction to multilibs
    31 RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
    32 
    33 # FIXME: This is in contradiction to multilibs
    34 AM_CONDITIONAL(PPC_NEW_EXCEPTION_PROCESSING,test "$RTEMS_CPU_MODEL" = "mpc750" -o "$RTEMS_CPU_MODEL" = "mpc604")
    35 
    3630# Explicitly list all Makefiles here
    3731AC_OUTPUT(
    3832Makefile
    39 shared/Makefile
    40 new_exception_processing/Makefile
    41 old_exception_processing/Makefile)
     33shared/Makefile)
  • c/src/exec/score/cpu/powerpc/new_exception_processing/Makefile.am

    racddd7d2 r80e5391  
    44
    55AUTOMAKE_OPTIONS = foreign 1.4
     6ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
    67
    78C_FILES = cpu.c
     
    1617
    1718include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
    18 include $(top_srcdir)/../../../../../../automake/lib.am
     19include $(top_srcdir)/../../../../../automake/lib.am
    1920
    2021#
     
    2526    $(ROOT_H_FILES:%=$(PROJECT_INCLUDE)/%) \
    2627    $(RTEMS_SCORE_H_FILES:%=$(PROJECT_INCLUDE)/rtems/score/%)
    27 
    28 ##TMPINSTALL_FILES += \
    29 ##$(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o
    30 
    31 ##$(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o
    32 ##      $(INSTALL_DATA) $< $@
    3328
    3429$(PROJECT_INCLUDE):
     
    5853EXTRA_DIST = $(C_FILES) $(S_FILES)
    5954
    60 include $(top_srcdir)/../../../../../../automake/local.am
     55include $(top_srcdir)/../../../../../automake/local.am
  • c/src/exec/score/cpu/powerpc/old_exception_processing/Makefile.am

    racddd7d2 r80e5391  
    44
    55AUTOMAKE_OPTIONS = foreign 1.4
     6ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
    67
    78# C source names
     
    1819
    1920include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
    20 include $(top_srcdir)/../../../../../../automake/lib.am
     21include $(top_srcdir)/../../../../../automake/lib.am
    2122
    2223PREINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/rtems/score \
     
    4142        $(INSTALL_DATA) $< $@
    4243
    43 REL = ../$(ARCH)/rtems-cpu.rel
     44REL = $(ARCH)/rtems-cpu.rel
    4445
    4546$(REL): $(C_O_FILES) $(S_O_FILES)
     
    5556EXTRA_DIST = TODO rtems.S $(C_FILES) $(S_FILES) $(UNUSED_FILES)
    5657
    57 include $(top_srcdir)/../../../../../../automake/local.am
     58include $(top_srcdir)/../../../../../automake/local.am
  • c/src/lib/libbsp/powerpc/dmv177/wrapup/Makefile.am

    racddd7d2 r80e5391  
    1515# bummer; have to use $foreach since % pattern subst rules only replace 1x
    1616OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \
    17     $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.o)
     17 $(wildcard ../../../../libcpu/powerpc/old_exception_processing/$(ARCH)/*.rel) \
     18 $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.o)
    1819LIB = $(ARCH)/libbsp.a
    1920
  • c/src/lib/libbsp/powerpc/eth_comm/wrapup/Makefile.am

    racddd7d2 r80e5391  
    1717# bummer; have to use $foreach since % pattern subst rules only replace 1x
    1818OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \
    19     $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.o) \
    20     $(wildcard ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/*/$(ARCH)/*.o)
     19 $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.o) \
     20 $(wildcard ../../../../libcpu/powerpc/new_exception_processing/$(ARCH)/*.rel) \
     21 $(wildcard ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/*/$(ARCH)/*.o)
    2122LIB = $(ARCH)/libbsp.a
    2223
  • c/src/lib/libbsp/powerpc/helas403/wrapup/Makefile.am

    racddd7d2 r80e5391  
    1111# bummer; have to use $foreach since % pattern subst rules only replace 1x
    1212OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \
    13     $(foreach piece, $(CPU_PIECES), ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(piece)/$(ARCH)/$(piece).rel)
     13 $(wildcard ../../../../libcpu/powerpc/old_exception_processing/$(ARCH)/*.rel) \
     14 $(foreach piece, $(CPU_PIECES), ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(piece)/$(ARCH)/$(piece).rel)
    1415
    1516LIB = $(ARCH)/libbsp.a
  • c/src/lib/libbsp/powerpc/mbx8xx/wrapup/Makefile.am

    racddd7d2 r80e5391  
    1717# bummer; have to use $foreach since % pattern subst rules only replace 1x
    1818OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \
    19     $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.o) \
    20     $(wildcard ../../../../libcpu/$(RTEMS_CPU)/mpc8xx/*/$(ARCH)/*.o)
     19 $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.o) \
     20 $(wildcard ../../../../libcpu/powerpc/old_exception_processing/$(ARCH)/*.rel) \
     21 $(wildcard ../../../../libcpu/$(RTEMS_CPU)/mpc8xx/*/$(ARCH)/*.o)
    2122LIB = $(ARCH)/libbsp.a
    2223
  • c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.am

    racddd7d2 r80e5391  
    99# bummer; have to use $foreach since % pattern subst rules only replace 1x
    1010OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.o) \
    11     $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.o) \
    12     $(wildcard ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/*/$(ARCH)/*.o) \
    13     $(wildcard ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/*/$(ARCH)/*.o)
     11 $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.o) \
     12 $(wildcard ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/*/$(ARCH)/*.o) \
     13 $(wildcard ../../../../libcpu/powerpc/new_exception_processing/$(ARCH)/*.rel) \
     14 $(wildcard ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/*/$(ARCH)/*.o)
    1415LIB = $(ARCH)/libbsp.a
    1516
  • c/src/lib/libbsp/powerpc/papyrus/wrapup/Makefile.am

    racddd7d2 r80e5391  
    1111# bummer; have to use $foreach since % pattern subst rules only replace 1x
    1212OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \
    13     $(foreach piece, $(CPU_PIECES), ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(piece)/$(ARCH)/$(piece).rel)
     13 $(wildcard ../../../../libcpu/powerpc/old_exception_processing/$(ARCH)/*.rel) \
     14 $(foreach piece, $(CPU_PIECES), ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(piece)/$(ARCH)/$(piece).rel)
    1415
    1516LIB = $(ARCH)/libbsp.a
  • c/src/lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.am

    racddd7d2 r80e5391  
    1515
    1616# bummer; have to use $foreach since % pattern subst rules only replace 1x
    17 OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o))
     17OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \
     18 $(wildcard ../../../../libcpu/powerpc/old_exception_processing/$(ARCH)/*.rel)
    1819LIB = $(ARCH)/libbsp.a
    1920
  • c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.am

    racddd7d2 r80e5391  
    1818BSP_PIECES = startup clock console timer vectors $(BSP_MP_O_PIECES)
    1919
     20
    2021# bummer; have to use $foreach since % pattern subst rules only replace 1x
    2122OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \
    22     $(foreach piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/$(piece).rel)
    23 
     23 $(wildcard ../../../../libcpu/powerpc/old_exception_processing/$(ARCH)/*.rel) \
     24 $(foreach piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/$(piece).rel)
    2425LIB = $(ARCH)/libbsp.a
    2526
  • c/src/lib/libbsp/powerpc/score603e/wrapup/Makefile.am

    racddd7d2 r80e5391  
    99
    1010# bummer; have to use $foreach since % pattern subst rules only replace 1x
    11 OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o))
     11OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \
     12 $(wildcard ../../../../libcpu/powerpc/old_exception_processing/$(ARCH)/*.rel)
    1213LIB = $(ARCH)/libbsp.a
    1314
  • c/src/lib/libcpu/powerpc/Makefile.am

    racddd7d2 r80e5391  
    99if shared
    1010SHARED_LIB = shared
     11endif
     12
     13if new_exception_processing
     14EXCEPTION_SUBDIR = new_exception_processing
     15else
     16EXCEPTION_SUBDIR = old_exception_processing
    1117endif
    1218
     
    2430endif
    2531
    26 SUBDIRS = $(SHARED_LIB) $(CPU_SUBDIR) wrapup
     32SUBDIRS = $(SHARED_LIB) $(EXCEPTION_SUBDIR) $(CPU_SUBDIR) wrapup
    2733
    2834include $(top_srcdir)/../../../../../automake/subdirs.am
  • c/src/lib/libcpu/powerpc/configure.in

    racddd7d2 r80e5391  
    3434|| test "$RTEMS_CPU_MODEL" = "mpc860" \
    3535|| test "$RTEMS_CPU_MODEL" = "mpc8xx" )
     36
     37AM_CONDITIONAL(new_exception_processing, \
     38test "$RTEMS_CPU_MODEL" = "mpc750" || \
     39test "$RTEMS_CPU_MODEL" = "mpc604")
    3640
    3741AM_CONDITIONAL(mpc505, test "$RTEMS_CPU_MODEL" = "mpc505")
     
    7175mpc6xx/timer/Makefile
    7276mpc6xx/wrapup/Makefile
     77new_exception_processing/Makefile
     78old_exception_processing/Makefile
    7379shared/Makefile
    7480shared/include/Makefile
  • c/src/lib/libcpu/powerpc/wrapup/Makefile.am

    racddd7d2 r80e5391  
    1111CPU_SPECIFIC_OBJS = $(wildcard ../$(RTEMS_CPU_MODEL)/*/$(ARCH)/*.o)
    1212FAMILY_OBJS = \
    13     $(wildcard ../shared/$(ARCH)/*.o ../shared/*/$(ARCH)/*.o ../mpc6xx/*/$(ARCH)/*.o)
     13    $(wildcard ../shared/$(ARCH)/*.o ../shared/*/$(ARCH)/*.o \
     14         ../old_exception_processing/*/$(ARCH)/*.o \
     15         ../new_exception_processing/*/$(ARCH)/*.o \
     16         ../mpc6xx/*/$(ARCH)/*.o)
    1417
    1518LIB = $(ARCH)/libcpu.a
  • cpukit/score/cpu/powerpc/Makefile.am

    racddd7d2 r80e5391  
    66ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
    77
    8 if PPC_NEW_EXCEPTION_PROCESSING
    9 CPUDIR = new_exception_processing
    10 else
    11 CPUDIR = old_exception_processing
    12 endif
    13 
    14 SUBDIRS = shared $(CPUDIR)
     8SUBDIRS = shared
    159
    1610include $(top_srcdir)/../../../../../../automake/subdirs.am
Note: See TracChangeset for help on using the changeset viewer.