Changeset 5261406 in rtems


Ignore:
Timestamp:
Jun 27, 2002, 12:18:24 PM (18 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
a25b63b
Parents:
272413c
Message:

2002-06-27 Ralf Corsepius <corsepiu@…>

  • aclocal/prog-ccas.m4: New.
  • aclocal/canonicalize-tools.m4: Remove AS, OBJCOPY, NM, SIZE, STRIP. RTEMS_GCC_PRINT
  • aclocal/check-multiprocessing.m4: Fix typo.
  • automake/compile.am: Remove CXX support. Replace AS by CCAS. Remove LINK_LIBS, LINK_OBJS, LINK_FILES.
Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed
  • c/src/exec/ChangeLog

    r272413c r5261406  
    55        RTEMS_GCC_PRINT
    66        * aclocal/check-multiprocessing.m4: Fix typo.
     7        * automake/compile.am: Remove CXX support.
     8        Replace AS by CCAS. Remove LINK_LIBS, LINK_OBJS, LINK_FILES.
    79
    8102002-06-27      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
  • c/src/exec/automake/compile.am

    r272413c r5261406  
    3737## 'VARIANT=<OPTIMIZE|DEBUG|PROFILE>' targets to their _V values.
    3838
    39 ## XCPPFLAGS, XCFLAGS, XCXXFLAGS, XASFLAGS
     39## XCPPFLAGS, XCFLAGS, XASFLAGS
    4040## are used to add flags from the shell
    4141## cf. make.info ("Implicit rules/variables" for details)
     
    5858   $(DEFINES) $(XCPPFLAGS) $(CPPFLAGS_GCC)
    5959CFLAGS   = $(CFLAGS_DEFAULT) $(CPU_CFLAGS) $(XCFLAGS)
    60 CXXFLAGS = $(CFLAGS_DEFAULT) $(CPU_CFLAGS) $(XCXXFLAGS)
    6160ASFLAGS  = $(CPU_ASFLAGS) $(CPU_CFLAGS) $(XASFLAGS)
    62 
    63 LINK_LIBS = $(LD_LIBS)
    6461
    6562## FIXME: This doesn't seem to be correct
     
    6764# some compilers do allow optimization with their "-g"
    6865CFLAGS_DEBUG_OPTIMIZE_V=-g
    69 CXXFLAGS_DEBUG_OPTIMIZE_V=-g
    7066LDFLAGS_DEBUG_V =
    7167
    7268# profile flag; use gprof(1)
    7369CFLAGS_PROFILE_V=-pg
    74 CXXFLAGS_PROFILE_V=-pg
    7570LDFLAGS_PROFILE_V =
    7671
     
    8378# ld flags for profiling, debugging
    8479LDFLAGS=$(LDFLAGS_PROFILE) $(LDFLAGS_DEBUG) $(LD_PATHS:%=-L %)
    85 
    86 #
    87 # Client compiler and support tools
    88 #
    8980
    9081#
     
    9889        $(AM_LDFLAGS) $(LDFLAGS) -o $@
    9990
    100 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    101         $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
    102 CXXLD = $(CXX)
    103 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
    104         $(AM_LDFLAGS) $(LDFLAGS) -o $@
    105 
    106 AS = $(CC)
    107 ASCOMPILE = $(AS) $(AM_ASFLAGS) $(ASFLAGS)
     91CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)
    10892
    10993${ARCH}/%.o: %.c
    11094        ${COMPILE} -o $@ -c $<
    11195
    112 ${ARCH}/%.o: %.cc
    113         ${CXXCOMPILE} -o $@ -c $<
    114 
    115 ${ARCH}/%.o: %.cpp
    116         ${CXXCOMPILE} -o $@ -c $<
    117 
    118 ${ARCH}/%.o: %.cxx
    119         ${CXXCOMPILE} -o $@ -c $<
    120 
    121 ${ARCH}/%.o: %.C
    122         ${CXXCOMPILE} -o $@ -c $<
    123 
    12496${ARCH}/%.o: %.S
    125         ${ASCOMPILE} -DASM -o $@ -c $<
     97        ${CCASCOMPILE} -o $@ -c $<
    12698
    12799# Make foo.rel from foo.o
     
    161133@ENDIF@
    162134
    163 
    164 # spell out all the LINK_FILE's, rather than using -lbsp, so
    165 #  that $(LINK_FILES) can be a dependency
    166 
    167 LINK_OBJS = \
    168     $(OBJS) \
    169     $(MANAGERS_NOT_WANTED:%=$(PROJECT_RELEASE)/lib/no-%$(LIB_VARIANT).rel)
    170 
    171 LINK_FILES =\
    172     $(START_FILE) \
    173     $(OBJS) \
    174     $(MANAGERS_NOT_WANTED:%=$(PROJECT_RELEASE)/lib/no-%$(LIB_VARIANT).rel)
    175 
    176135if RTEMS_USE_GCC
    177136## gcc >= 2.8
     
    240199
    241200CC = @CC@ $(GCCSPECS)
    242 CXX = @CXX@ $(GCCSPECS)
    243201CPP = @CPP@ $(GCCSPECS)
    244202
    245 LD = @LD@
    246 OBJCOPY = @OBJCOPY@
    247 NM = @NM@
    248 SIZE = @SIZE@
    249 STRIP = @STRIP@
    250 
    251 
    252203##
    253204AM_CPPFLAGS = $(RTEMS_CPPFLAGS)
    254205
    255206AM_CFLAGS = $(RTEMS_CFLAGS_$(VARIANT_V)_V) $(CFLAGS_$(VARIANT_V)_V)
    256 AM_CXXFLAGS = $(RTEMS_CFLAGS_$(VARIANT_V)_V) $(CFLAGS_$(VARIANT_V)_V)
     207
     208# AM_CFLAGS = $(RTEMS_BSP_CFLAGS) $(RTEMS_CFLAGS)
     209AM_CCASFLAGS = $(RTEMS_BSP_CFLAGS) $(RTEMS_CPPFLAGS) $(RTEMS_ASFLAGS)
  • cpukit/ChangeLog

    r272413c r5261406  
    55        RTEMS_GCC_PRINT
    66        * aclocal/check-multiprocessing.m4: Fix typo.
     7        * automake/compile.am: Remove CXX support.
     8        Replace AS by CCAS. Remove LINK_LIBS, LINK_OBJS, LINK_FILES.
    79
    8102002-06-27      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
  • cpukit/aclocal/canonicalize-tools.m4

    r272413c r5261406  
    55dnl
    66
    7 AC_DEFUN(RTEMS_GCC_PRINT,
    8 [
    9     $1=`$CC --print-prog-name=$2`
    10 ])
    11 
    127AC_DEFUN(RTEMS_CANONICALIZE_TOOLS,
    138[AC_REQUIRE([RTEMS_PROG_CC])dnl
     
    1510dnl FIXME: What shall be done if these tools are not available?
    1611  RTEMS_CHECK_TOOL(AR,ar,no)
    17   RTEMS_CHECK_TOOL(AS,as,no)
    1812  RTEMS_CHECK_TOOL(LD,ld,no)
    19   RTEMS_CHECK_TOOL(NM,nm,no)
    2013
    2114dnl special treatment of ranlib
    2215  RTEMS_CHECK_TOOL(RANLIB,ranlib,:)
    23 
    24 dnl NOTE: These may not be available if not using gnutools
    25   RTEMS_CHECK_TOOL(OBJCOPY,objcopy,no)
    26   RTEMS_CHECK_TOOL(SIZE,size,no)
    27   RTEMS_CHECK_TOOL(STRIP,strip,:)
    2816])
  • cpukit/automake/compile.am

    r272413c r5261406  
    3737## 'VARIANT=<OPTIMIZE|DEBUG|PROFILE>' targets to their _V values.
    3838
    39 ## XCPPFLAGS, XCFLAGS, XCXXFLAGS, XASFLAGS
     39## XCPPFLAGS, XCFLAGS, XASFLAGS
    4040## are used to add flags from the shell
    4141## cf. make.info ("Implicit rules/variables" for details)
     
    5858   $(DEFINES) $(XCPPFLAGS) $(CPPFLAGS_GCC)
    5959CFLAGS   = $(CFLAGS_DEFAULT) $(CPU_CFLAGS) $(XCFLAGS)
    60 CXXFLAGS = $(CFLAGS_DEFAULT) $(CPU_CFLAGS) $(XCXXFLAGS)
    6160ASFLAGS  = $(CPU_ASFLAGS) $(CPU_CFLAGS) $(XASFLAGS)
    62 
    63 LINK_LIBS = $(LD_LIBS)
    6461
    6562## FIXME: This doesn't seem to be correct
     
    6764# some compilers do allow optimization with their "-g"
    6865CFLAGS_DEBUG_OPTIMIZE_V=-g
    69 CXXFLAGS_DEBUG_OPTIMIZE_V=-g
    7066LDFLAGS_DEBUG_V =
    7167
    7268# profile flag; use gprof(1)
    7369CFLAGS_PROFILE_V=-pg
    74 CXXFLAGS_PROFILE_V=-pg
    7570LDFLAGS_PROFILE_V =
    7671
     
    8378# ld flags for profiling, debugging
    8479LDFLAGS=$(LDFLAGS_PROFILE) $(LDFLAGS_DEBUG) $(LD_PATHS:%=-L %)
    85 
    86 #
    87 # Client compiler and support tools
    88 #
    8980
    9081#
     
    9889        $(AM_LDFLAGS) $(LDFLAGS) -o $@
    9990
    100 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
    101         $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
    102 CXXLD = $(CXX)
    103 CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
    104         $(AM_LDFLAGS) $(LDFLAGS) -o $@
    105 
    106 AS = $(CC)
    107 ASCOMPILE = $(AS) $(AM_ASFLAGS) $(ASFLAGS)
     91CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)
    10892
    10993${ARCH}/%.o: %.c
    11094        ${COMPILE} -o $@ -c $<
    11195
    112 ${ARCH}/%.o: %.cc
    113         ${CXXCOMPILE} -o $@ -c $<
    114 
    115 ${ARCH}/%.o: %.cpp
    116         ${CXXCOMPILE} -o $@ -c $<
    117 
    118 ${ARCH}/%.o: %.cxx
    119         ${CXXCOMPILE} -o $@ -c $<
    120 
    121 ${ARCH}/%.o: %.C
    122         ${CXXCOMPILE} -o $@ -c $<
    123 
    12496${ARCH}/%.o: %.S
    125         ${ASCOMPILE} -DASM -o $@ -c $<
     97        ${CCASCOMPILE} -o $@ -c $<
    12698
    12799# Make foo.rel from foo.o
     
    161133@ENDIF@
    162134
    163 
    164 # spell out all the LINK_FILE's, rather than using -lbsp, so
    165 #  that $(LINK_FILES) can be a dependency
    166 
    167 LINK_OBJS = \
    168     $(OBJS) \
    169     $(MANAGERS_NOT_WANTED:%=$(PROJECT_RELEASE)/lib/no-%$(LIB_VARIANT).rel)
    170 
    171 LINK_FILES =\
    172     $(START_FILE) \
    173     $(OBJS) \
    174     $(MANAGERS_NOT_WANTED:%=$(PROJECT_RELEASE)/lib/no-%$(LIB_VARIANT).rel)
    175 
    176135if RTEMS_USE_GCC
    177136## gcc >= 2.8
     
    240199
    241200CC = @CC@ $(GCCSPECS)
    242 CXX = @CXX@ $(GCCSPECS)
    243201CPP = @CPP@ $(GCCSPECS)
    244202
    245 LD = @LD@
    246 OBJCOPY = @OBJCOPY@
    247 NM = @NM@
    248 SIZE = @SIZE@
    249 STRIP = @STRIP@
    250 
    251 
    252203##
    253204AM_CPPFLAGS = $(RTEMS_CPPFLAGS)
    254205
    255206AM_CFLAGS = $(RTEMS_CFLAGS_$(VARIANT_V)_V) $(CFLAGS_$(VARIANT_V)_V)
    256 AM_CXXFLAGS = $(RTEMS_CFLAGS_$(VARIANT_V)_V) $(CFLAGS_$(VARIANT_V)_V)
     207
     208# AM_CFLAGS = $(RTEMS_BSP_CFLAGS) $(RTEMS_CFLAGS)
     209AM_CCASFLAGS = $(RTEMS_BSP_CFLAGS) $(RTEMS_CPPFLAGS) $(RTEMS_ASFLAGS)
Note: See TracChangeset for help on using the changeset viewer.