Changeset d6c83529 in rtems


Ignore:
Timestamp:
Nov 16, 1999, 3:48:11 PM (20 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
bd462d1
Parents:
fa3346f
Message:

Patch rtems-rc-19991105-1.diff.gz from Ralf Corsepius
<corsepiu@…> which does the following:

This is the configuration cleanup patch:

Main changes:

  • TARGET_ARCH removed
  • target.cfg.in moved to c/make/target.cfg.in (Only configured once for all BSPs of a target)
  • BARE_XXX variables appended to bsp.cfg.in
  • autogen renamed to bootstrap
  • removed stray variables from make/custom/*.cfg

To apply:

cd <source-tree>
rm c/src/make/target.cfg.in
cp autogen bootstrap
mkdir c/make
cp make/target.cfg.in c/make/target.cfg.in
rm make/target.cfg.in
rm autogen
patch -p1 < rtems-rc-19991105-1.diff

Files:
2 added
24 edited
2 moved

Legend:

Unmodified
Added
Removed
  • Makefile.am

    rfa3346f rd6c83529  
    5555
    5656noinst_SCRIPTS = \
    57 autogen
     57bootstrap
    5858
    5959EXTRA_DIST = \
  • bootstrap

    • Property mode changed from 100644 to 100755
  • c/Makefile.am

    rfa3346f rd6c83529  
    1313## triggered before $(RTEMS_BSP_LIST) subdirectories are made.
    1414SUBDIRS= \
     15make \
    1516. \
    1617$(RTEMS_BSP)
  • c/configure.in

    rfa3346f rd6c83529  
    9999AC_SUBST(RTEMS_BSP_LIST)
    100100
     101AC_CONFIG_SUBDIRS(make)
     102
    101103AC_OUTPUT(
    102104Makefile
  • c/make/target.cfg.in

    rfa3346f rd6c83529  
    4949RTEMS_CPU = @RTEMS_CPU@
    5050
    51 # the following are only used for the bare bsp
    52 BARE_CPU_MODEL = @BARE_CPU_MODEL@
    53 BARE_CPU_CFLAGS = @BARE_CPU_CFLAGS@
    54  
    5551XCFLAGS=$(CFLAGS_FOR_TARGET)
    5652 
  • c/src/make/Makefile.am

    rfa3346f rd6c83529  
    99
    1010GENERIC_FILES = \
    11 host.cfg target.cfg
     11host.cfg
    1212
    1313MAKE_FILES = README \
     
    3838        cp $< $@
    3939
    40 $(srcdir)/target.cfg.in: $(top_srcdir)/@RTEMS_TOPdir@/make/target.cfg.in
    41         cp $< $@
    4240endif
    4341
  • c/src/make/bsp.cfg.in

    rfa3346f rd6c83529  
    3030##
    3131HAS_NETWORKING = @HAS_NETWORKING@
     32
     33## Only used for the bare bsp
     34BARE_CPU_MODEL = @BARE_CPU_MODEL@
     35BARE_CPU_CFLAGS = @BARE_CPU_CFLAGS@
  • c/src/make/compilers/gcc-target-default.cfg

    rfa3346f rd6c83529  
    8383# Define this to yes if C++ is included in the development environment.
    8484# This requires that at least the GNU C++ compiler and libg++ be installed.
    85 ifeq ($(RTEMS_HAS_CPLUSPLUS),yes)
     85ifeq ($(HAS_CPLUSPLUS),yes)
    8686CPLUS_LD_LIBS += $(PROJECT_RELEASE)/lib/librtems++$(LIBSUFFIX_VA)
    8787endif
     
    173173# How to compile stuff into ${ARCH} subdirectory
    174174#
     175# OBSOLETE: we use make's default rules now
     176#
    175177# NOTE: we override COMPILE.[c|cc|S]
    176178# because gmake default rules use TARGET_ARCH for different purposes
    177179#
    178 
    179 COMPILE.c=$(CC) $(CPPFLAGS) $(CFLAGS) -c
    180 COMPILE.cc=$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c
    181 COMPILE.S=$(CC) $(ASFLAGS) $(CPPFLAGS) -c
     180#
     181# COMPILE.c=$(CC) $(CPPFLAGS) $(CFLAGS) -c
     182# COMPILE.cc=$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c
     183# COMPILE.S=$(CC) $(ASFLAGS) $(CPPFLAGS) -c
    182184
    183185${ARCH}/%.o: %.c
     
    198200${ARCH}/%.o: %.S
    199201        ${COMPILE.S} -DASM -o $@ $<
    200 
    201 # OBSOLETE: the rule above should be equivalent.
    202 # strip out C++ style comments.
    203 # ${ARCH}/%.o: %.S
    204 #       sed -e 's/\/\/.*$$//' < $< | \
    205 #           $(CPP) $(CPPFLAGS) -I. -I$(srcdir) -DASM - >$(ARCH)/$*.i
    206 #       $(AS) $(ASFLAGS) -o $@ $(ARCH)/$*.i
    207202
    208203# Make foo.rel from foo.o
     
    217212
    218213# Dependency files for use by gmake
    219 # NOTE: we don't put in $(TARGET_ARCH)
     214# NOTE: we don't put them into $(ARCH)
    220215#       so that 'make clean' doesn't blow it away
    221216
    222 DEPEND=Depends-$(TARGET_ARCH:o-%=%)
     217DEPEND=Depends-${ARCH}
    223218
    224219CLEAN_DEPEND=$(DEPEND).tmp
  • c/src/make/configure.in

    rfa3346f rd6c83529  
    125125main.cfg
    126126host.cfg
    127 target.cfg
    128127bsp.cfg
    129128custom/Makefile
  • c/src/make/custom/default.cfg.in

    rfa3346f rd6c83529  
    99#
    1010
    11 include $(RTEMS_ROOT)/make/target.cfg
     11include $(RTEMS_ROOT)/../make/target.cfg
    1212include $(RTEMS_ROOT)/make/host.cfg
    13 
    14 # Specify here the host and target "architectures"
    15 HOST_ARCH=o-$(RTEMS_HOST)
    16 ifndef TARGET_ARCH
    17 TARGET_ARCH=o-@RTEMS_BSP@
    18 endif
    1913
    2014include $(RTEMS_ROOT)/make/main.cfg
     
    2216
    2317## Target compiler config file, if any
    24 CONFIG.$(TARGET_ARCH).CC = $(RTEMS_ROOT)/make/compilers/gcc-target-default.cfg
     18CONFIG.CC = $(RTEMS_ROOT)/make/compilers/gcc-target-default.cfg
    2519
    2620## GCC specs extension file location
  • c/src/make/main.cfg.in

    rfa3346f rd6c83529  
    1818
    1919#
    20 # Target architecture; may be changed as per 'make "ARCH=${TARGET_ARCH}-debug"'
     20# Target architecture; may be changed as per 'make "ARCH=debug"'
    2121# This is where the object files get put.
    2222#
    2323
    24 ARCH=${TARGET_ARCH}
     24ARCH=o-optimize
    2525
    2626VARIANT=
     
    4444# Target variant names
    4545#
    46 TARGET_VARIANTS = debug profile
     46TARGET_VARIANTS = optimize debug profile
    4747
    4848#
    49 # Generate list of object directories: sun4, sun4-debug, sun4-profile
     49# Generate list of object directories: o-optimize, o-debug, o-profile
    5050#
    51 VARIANTS=${TARGET_ARCH} ${TARGET_VARIANTS:%=${TARGET_ARCH}-%}
     51VARIANTS=${TARGET_VARIANTS:%=o-%}
    5252
    5353#
  • c/src/tests/samples/cdtest/Makefile.in

    rfa3346f rd6c83529  
    5151
    5252DEFINES +=
    53 CPPFLAGS += -I$(LIBCC_INCLUDE)
     53CPPFLAGS +=
    5454CFLAGS +=
    5555
  • c/src/tests/samples/paranoia/Makefile.in

    rfa3346f rd6c83529  
    5353
    5454LD_PATHS +=
    55 LD_LIBS += $(LIBC_LIBM)
     55LD_LIBS += -lm
    5656LDFLAGS +=
    5757
  • make/Makefile.am

    rfa3346f rd6c83529  
    1515host.cfg.in \
    1616leaf.cfg \
    17 lib.cfg \
    18 target.cfg.in
     17lib.cfg
    1918
    2019SUBDIRS = \
  • make/compilers/gcc-target-default.cfg

    rfa3346f rd6c83529  
    8383# Define this to yes if C++ is included in the development environment.
    8484# This requires that at least the GNU C++ compiler and libg++ be installed.
    85 ifeq ($(RTEMS_HAS_CPLUSPLUS),yes)
     85ifeq ($(HAS_CPLUSPLUS),yes)
    8686CPLUS_LD_LIBS += $(PROJECT_RELEASE)/lib/librtems++$(LIBSUFFIX_VA)
    8787endif
     
    173173# How to compile stuff into ${ARCH} subdirectory
    174174#
     175# OBSOLETE: we use make's default rules now
     176#
    175177# NOTE: we override COMPILE.[c|cc|S]
    176178# because gmake default rules use TARGET_ARCH for different purposes
    177179#
    178 
    179 COMPILE.c=$(CC) $(CPPFLAGS) $(CFLAGS) -c
    180 COMPILE.cc=$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c
    181 COMPILE.S=$(CC) $(ASFLAGS) $(CPPFLAGS) -c
     180#
     181# COMPILE.c=$(CC) $(CPPFLAGS) $(CFLAGS) -c
     182# COMPILE.cc=$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c
     183# COMPILE.S=$(CC) $(ASFLAGS) $(CPPFLAGS) -c
    182184
    183185${ARCH}/%.o: %.c
     
    198200${ARCH}/%.o: %.S
    199201        ${COMPILE.S} -DASM -o $@ $<
    200 
    201 # OBSOLETE: the rule above should be equivalent.
    202 # strip out C++ style comments.
    203 # ${ARCH}/%.o: %.S
    204 #       sed -e 's/\/\/.*$$//' < $< | \
    205 #           $(CPP) $(CPPFLAGS) -I. -I$(srcdir) -DASM - >$(ARCH)/$*.i
    206 #       $(AS) $(ASFLAGS) -o $@ $(ARCH)/$*.i
    207202
    208203# Make foo.rel from foo.o
     
    217212
    218213# Dependency files for use by gmake
    219 # NOTE: we don't put in $(TARGET_ARCH)
     214# NOTE: we don't put them into $(ARCH)
    220215#       so that 'make clean' doesn't blow it away
    221216
    222 DEPEND=Depends-$(TARGET_ARCH:o-%=%)
     217DEPEND=Depends-${ARCH}
    223218
    224219CLEAN_DEPEND=$(DEPEND).tmp
  • make/custom/FreeBSD-posix.cfg

    rfa3346f rd6c83529  
    1111# This is the actual bsp directory used during the build process.
    1212RTEMS_BSP_FAMILY=posix
    13 TARGET_ARCH=o-freebsd2
    1413
    1514include $(RTEMS_ROOT)/make/custom/default.cfg
     
    2423LIBC_DEFINES += -DHEAPSPACE_MB=1
    2524
    26 
    27 # Define this to yes if C++ is included in the development environment
    28 # This requires that at least the GNU C++ compiler and libg++ be installed.
    29 ifeq ($(HAS_CPLUSPLUS),yes)
    30 CPLUS_LD_LIBS += $(PROJECT_RELEASE)/lib/librtems++$(LIBSUFFIX_VA)
    31 endif
    3225
    3326# optimize flag: typically -0, could use -O4 or -fast
  • make/custom/HPUX9-posix.cfg

    rfa3346f rd6c83529  
    1313# This is the actual bsp directory used during the build process.
    1414RTEMS_BSP_FAMILY=posix
    15 TARGET_ARCH=o-hpux9
    1615
    1716include $(RTEMS_ROOT)/make/custom/default.cfg
  • make/custom/Linux-posix.cfg

    rfa3346f rd6c83529  
    1212# This is the actual bsp directory used during the build process.
    1313RTEMS_BSP_FAMILY=posix
    14 TARGET_ARCH=o-linux1
    1514
    1615include $(RTEMS_ROOT)/make/custom/default.cfg
     
    2625
    2726DEFINES += -D_BSD_SOURCE
    28 
    29 # Define this to yes if C++ is included in the development environment
    30 # This requires that at least the GNU C++ compiler and libg++ be installed.
    31 ifeq ($(HAS_CPLUSPLUS),yes)
    32 CPLUS_LD_LIBS += $(PROJECT_RELEASE)/lib/librtems++$(LIBSUFFIX_VA)
    33 endif
    3427
    3528# optimize flag: typically -0, could use -O4 or -fast
  • make/custom/Solaris-posix.cfg

    rfa3346f rd6c83529  
    1212# This is the actual bsp directory used during the build process.
    1313RTEMS_BSP_FAMILY=posix
    14 TARGET_ARCH=o-solaris2
    1514
    1615include $(RTEMS_ROOT)/make/custom/default.cfg
     
    2322
    2423DEFINES += -D__EXTENSIONS__ -Dsolaris2
    25 
    26 # Define this to yes if C++ is included in the development environment
    27 # This requires that at least the GNU C++ compiler and libg++ be installed.
    28 ifeq ($(HAS_CPLUSPLUS),yes)
    29 CPLUS_LD_LIBS=$(PROJECT_RELEASE)/lib/librtems++$(LIBSUFFIX_VA)
    30 endif
    3124
    3225# optimize flag: typically -0, could use -O4 or -fast
  • make/custom/bare.cfg

    rfa3346f rd6c83529  
    1111
    1212RTEMS_CPU_MODEL=$(BARE_CPU_MODEL)
    13 
    14 TARGET_ARCH=o-$(RTEMS_BSP_FAMILY)-$(BARE_CPU_MODEL)
    1513
    1614CPU_CFLAGS=$(BARE_CPU_CFLAGS)
  • make/custom/default.cfg

    rfa3346f rd6c83529  
    1111include $(RTEMS_ROOT)/make/target.cfg
    1212include $(RTEMS_ROOT)/make/host.cfg
    13 
    14 # Specify here the host and target "architectures"
    15 ifndef TARGET_ARCH
    16 TARGET_ARCH=o-$(RTEMS_BSP)
    17 endif
    1813
    1914include $(RTEMS_ROOT)/make/main.cfg
     
    3126
    3227## Target compiler config file, if any
    33 CONFIG.$(TARGET_ARCH).CC = $(RTEMS_ROOT)/make/compilers/gcc-target-default.cfg
     28CONFIG.CC = $(RTEMS_ROOT)/make/compilers/gcc-target-default.cfg
    3429
    3530## GCC specs extension file location
  • make/custom/gen68360.cfg

    rfa3346f rd6c83529  
    88
    99ifeq ($(RTEMS_GEN68360_COMPANION_MODE),yes)
    10 TARGET_ARCH=o-gen68360_040
    1110RTEMS_CPU_MODEL=m68040
    1211else
    13 TARGET_ARCH=o-gen68360
    1412RTEMS_CPU_MODEL=mcpu32
    1513endif
  • make/custom/mvme162.cfg

    rfa3346f rd6c83529  
    1111ifeq ($(RTEMS_MVME162_MODEL),mvme162lx)
    1212
    13 TARGET_ARCH=o-mvme162lx
    1413RTEMS_CPU_MODEL=m68lc040
    1514
     
    1817
    1918RTEMS_MVME162_MODEL=mvme162
    20 TARGET_ARCH=o-mvme162
    2119RTEMS_CPU_MODEL=m68040
    2220
  • make/custom/ods68302.cfg

    rfa3346f rd6c83529  
    3232
    3333# debugging please
    34 CFLAGS_DEBUG_V+=-g
    35 
    36 # Define this to yes if C++ is included in the development environment.
    37 # This requires that at least the GNU C++ compiler and libg++ be installed.
    38 ifeq ($(RTEMS_HAS_CPLUSPLUS),yes)
    39 HAS_CPLUSPLUS=yes
    40 CPLUS_LD_LIBS=$(PROJECT_RELEASE)/lib/librtems++$(LIBSUFFIX_VA)
    41 endif
     34CFLAGS_DEBUG_V =
    4235
    4336START_BASE=start302
  • make/leaf.cfg

    rfa3346f rd6c83529  
    3838# Programs built on the host use automake generated rules.
    3939# This will not change $(ARCH) -- binaries will still be place as per target
    40 include ${CONFIG.$(TARGET_ARCH).CC}
     40include ${CONFIG.CC}
    4141ifeq (${DEPEND},$(wildcard ${DEPEND}))
    4242include ${DEPEND}                    # pull in dependencies if they exist
     
    4747#
    4848debug:
    49         $(MAKE) -f $(MAKEFILE) MAKEFILE=$(MAKEFILE) "ARCH=${TARGET_ARCH}-debug" \
     49        $(MAKE) -f $(MAKEFILE) MAKEFILE=$(MAKEFILE) "ARCH=o-debug" \
    5050      "CFLAGS_DEBUG=$(CFLAGS_DEBUG_V)" \
    5151      "CFLAGS_OPTIMIZE=$(CFLAGS_DEBUG_OPTIMIZE_V)" \
     
    5454profile:
    5555        $(MAKE) -f $(MAKEFILE) \
    56       MAKEFILE=$(MAKEFILE) "ARCH=${TARGET_ARCH}-profile" \
     56      MAKEFILE=$(MAKEFILE) "ARCH=o-profile" \
    5757      "CFLAGS_PROFILE=$(CFLAGS_PROFILE_V)" \
    5858      "LDFLAGS_PROFILE=$(LDFLAGS_PROFILE_V)" $(TARGET_VA)
     
    6464#
    6565
    66 VARIANT-$(TARGET_ARCH)-v =
    67 VARIANT-$(TARGET_ARCH)-debug-v = debug
    68 VARIANT-$(TARGET_ARCH)-profile-v = profile
     66VARIANT-o-optimize-v =
     67VARIANT-o-debug-v = debug
     68VARIANT-o-profile-v = profile
    6969
    7070VARIANT_VA = $(VARIANT-$(ARCH)-v)
     
    8787#
    8888
    89 LIBSUFFIX_$(TARGET_ARCH)_V=
    90 LIBSUFFIX_$(TARGET_ARCH)-debug_V=_g
    91 LIBSUFFIX_$(TARGET_ARCH)-profile_V=_p
     89LIBSUFFIX_o-optimize_V=
     90LIBSUFFIX_o-debug_V=_g
     91LIBSUFFIX_o-profile_V=_p
    9292
    9393LIB_VARIANT=$(LIBSUFFIX_$(ARCH)_V)
  • make/main.cfg

    rfa3346f rd6c83529  
    1818
    1919#
    20 # Target architecture; may be changed as per 'make "ARCH=${TARGET_ARCH}-debug"'
     20# Target architecture; may be changed as per 'make "ARCH=debug"'
    2121# This is where the object files get put.
    2222#
    2323
    24 ARCH=${TARGET_ARCH}
     24ARCH=o-optimize
    2525
    2626VARIANT=
     
    4444# Target variant names
    4545#
    46 TARGET_VARIANTS = debug profile
     46TARGET_VARIANTS = optimize debug profile
    4747
    4848#
    49 # Generate list of object directories: sun4, sun4-debug, sun4-profile
     49# Generate list of object directories: o-optimize, o-debug, o-profile
    5050#
    51 VARIANTS=${TARGET_ARCH} ${TARGET_VARIANTS:%=${TARGET_ARCH}-%}
     51VARIANTS=${TARGET_VARIANTS:%=o-%}
    5252
    5353#
Note: See TracChangeset for help on using the changeset viewer.