Changeset ea3f559 in rtems


Ignore:
Timestamp:
Jan 5, 2005, 5:52:33 PM (16 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
c58ba41
Parents:
635c2fe
Message:

2005-01-05 Ralf Corsepius <ralf.corsepius@…>

  • configure.ac: Pass CFLAGS to cpukit configure.
  • aclocal/rtems-flags.m4: Remove (Unused).
  • aclocal/prog-ccas.m4: Remove $(GCCSPECS).
  • aclocal/env-rtemsbsp.m4: Comment out CFLAGS_OPTIMIZE_V, CFLAGS_DEBUG_V, CPU_CFLAGS.
  • aclocal/prog-cc.m4: Don't invoke _RTEMS_FLAGS to set up RTEMS_CFLAGS.
  • automake/compile.am: AM_CFLAGS = RTEMS_CFLAGS. Add AM_CXXFLAGS. Remove CPPFLAGS, CFLAGS, CPU_CFLAGS, CFLAGS_OPTIMIZE, ASFLAGS. Cleanup comments.
Location:
c/src
Files:
1 deleted
6 edited

Legend:

Unmodified
Added
Removed
  • c/src/ChangeLog

    r635c2fe rea3f559  
     12005-01-05      Ralf Corsepius <ralf.corsepius@rtems.org>
     2
     3        * configure.ac: Pass CFLAGS to cpukit configure.
     4        * aclocal/rtems-flags.m4: Remove (Unused).
     5        * aclocal/prog-ccas.m4: Remove $(GCCSPECS).
     6        * aclocal/env-rtemsbsp.m4:
     7        Comment out CFLAGS_OPTIMIZE_V, CFLAGS_DEBUG_V, CPU_CFLAGS.
     8        * aclocal/prog-cc.m4: Don't invoke _RTEMS_FLAGS to set up
     9        RTEMS_CFLAGS.
     10        * automake/compile.am: AM_CFLAGS = RTEMS_CFLAGS. Add AM_CXXFLAGS.
     11        Remove CPPFLAGS, CFLAGS, CPU_CFLAGS, CFLAGS_OPTIMIZE, ASFLAGS.
     12        Cleanup comments.
     13
    1142005-01-01      Ralf Corsepius <ralf.corsepius@rtems.org>
    215
  • c/src/aclocal/env-rtemsbsp.m4

    r635c2fe rea3f559  
    99AC_BEFORE([$0], [RTEMS_CHECK_CUSTOM_BSP])dnl
    1010
    11 AC_ARG_VAR([CPU_CFLAGS],[CFLAGS specifying CPU-dependent features])
    12 AC_ARG_VAR([CFLAGS_OPTIMIZE_V],[CFLAGS for building the OPTIMIZE variant])
    13 AC_ARG_VAR([CFLAGS_DEBUG_V],[CFLAGS for building the DEBUG variant])
     11# AC_ARG_VAR([CPU_CFLAGS],[CFLAGS specifying CPU-dependent features])
     12# AC_ARG_VAR([CFLAGS_OPTIMIZE_V],[CFLAGS for building the OPTIMIZE variant])
     13# AC_ARG_VAR([CFLAGS_DEBUG_V],[CFLAGS for building the DEBUG variant])
    1414AC_ARG_VAR([RTEMS_BSP_FAMILY],[RTEMS's BSP directory])
    1515AC_ARG_VAR([RTEMS_CPU_MODEL],[RTEMS's cpu model])
  • c/src/aclocal/prog-cc.m4

    r635c2fe rea3f559  
    1111AC_BEFORE([$0], [RTEMS_CANONICALIZE_TOOLS])dnl
    1212
    13 _RTEMS_FLAGS([CFLAGS],
    14   ["\$(CPU_CFLAGS) \$(RTEMS_CFLAGS_\$(VARIANT_V)_V) \$(CFLAGS_\$(VARIANT_V)_V) -g"])
     13CFLAGS=${CFLAGS-${CPU_CFLAGS} ${CFLAGS_OPTIMIZE_V}}
    1514
    1615RTEMS_CHECK_TOOL(CC,gcc)
     
    4039m4_if([$1],,[],[RTEMS_CFLAGS="$RTEMS_CFLAGS $1"])
    4140fi
     41AC_SUBST(RTEMS_CFLAGS)
    4242
    4343AS_IF([test x"$rtems_cv_gcc_isystem" = x"yes"],[
  • c/src/aclocal/prog-ccas.m4

    r635c2fe rea3f559  
    44[
    55AC_REQUIRE([RTEMS_PROG_CC])
    6 AC_SUBST(CCAS,["$CC \$(GCCSPECS)"])
     6AC_SUBST(CCAS,["$CC"])
    77AC_SUBST(CCASFLAGS,["-DASM \$(CFLAGS) \$(INCLUDES)"])
    88])
  • c/src/automake/compile.am

    r635c2fe rea3f559  
    33##
    44
    5 ## -------------------------------------------------------------------------
    6 ## NOTE: This file is rather immature and has to be considered to be
    7 ## almost experimental.
    8 ##
    9 ## Expect frequent changes -- It deserves to be cleaned up :(
    10 ## -------------------------------------------------------------------------
    11 
    12 ## The section below is based on make/compilers/gcc-target-default.cfg
    13 ## used in former versions of RTEMS.
    14 
    15 ##
    16 ## Set up the flags for the toolchains:
    17 ##
    18 ## We are considering 3 different building schemes here:
    19 ## * Using gcc's being able to accept -specs (aka gcc-2.8 building scheme)
    20 ## * Using gcc's not being able to accept -specs (aka gcc-2.7.2 building
    21 ##   scheme)
    22 ## * Using third party toolchains (aka non-gcc building scheme)
    23 ##
    24 ## Automake conditionals in use:
    255## RTEMS_USE_GCC     .. if we are using GCC
    26 
    27 ## NOTES:
    28 ## * The gcc-2.8 building scheme is the nominal building scheme and
    29 ##   is actively supported.
    30 ## * The non-gcc building scheme requires manually setting up environment
    31 ##   variables and is hardly tested at all
    32 
    33 ## CFLAGS_OPTIMIZE_V, CFLAGS_DEBUG_V are the values we
    34 ## would want the corresponding macros to be set to.
    35 ##
    36 ## CFLAGS_OPTIMIZE, CFLAGS_DEBUG are set by the
    37 ## 'VARIANT=<OPTIMIZE|DEBUG>' targets to their _V values.
    386
    397if RTEMS_USE_GCC
     
    4210endif # RTEMS_USE_GCC
    4311
    44 CPPFLAGS = @CPPFLAGS@ $(CPU_DEFINES) $(DEFINES)
    45 CFLAGS   = @RTEMS_CFLAGS@
    46 ## FIXME: This should be correct, but is not supported, yet
    47 # CXXFLAGS = @RTEMS_CXXFLAGS@
    48 ## Fall back to using RTEMS_CFLAGS for C++
    49 CXXFLAGS = @RTEMS_CFLAGS@
    50 ASFLAGS  = $(CPU_ASFLAGS) $(CPU_CFLAGS)
    51 
    5212depend:
    5313
    5414if RTEMS_USE_GCC
    55 ## gcc >= 2.8
    5615RTEMS_RELLDFLAGS = -qnolinkcmds -nostdlib -Wl,-r
    5716endif
    58 
    59 ## -------------------------------------------------------------------------
    60 ## These are supposed to be set in make/custom/<bsp>.cfg
    61 CPU_CFLAGS = @CPU_CFLAGS@
    62 CFLAGS_OPTIMIZE_V = @CFLAGS_OPTIMIZE_V@
    63 
    64 ## ------------------------------------------------------------------------
    65 ## Setup hard-coded flags
    66 if RTEMS_USE_GCC
    67 ## gcc >= gcc-2.8
    68 RTEMS_CFLAGS_OPTIMIZE_V =
    69 RTEMS_CFLAGS_DEBUG_V = -qrtems_debug -Wno-unused
    70 endif
    71 RTEMS_CFLAGS__V = $(RTEMS_CFLAGS_OPTIMIZE_V)
    7217
    7318## -------------------------------------------------------------------------
     
    7621CXX = @CXX@ $(GCCSPECS)
    7722CPP = @CPP@ $(GCCSPECS)
     23CCAS = @CCAS@ $(GCCSPECS)
    7824
    7925##
    8026AM_CPPFLAGS = $(RTEMS_CPPFLAGS)
    81 AM_CFLAGS =
    82 AM_CXXFLAGS =
     27AM_CFLAGS = $(RTEMS_CFLAGS)
     28AM_CXXFLAGS = $(RTEMS_CFLAGS)
    8329AM_CCASFLAGS = $(RTEMS_CPPFLAGS) $(RTEMS_CCASFLAGS)
  • c/src/configure.ac

    r635c2fe rea3f559  
    133133  ['--with-project-root=${with_project_root}../$RTEMS_BSP/' \
    134134   '--includedir=${exec_prefix}/${RTEMS_BSP}/lib/include' \
    135    '--libdir=${exec_prefix}/${RTEMS_BSP}/lib'],
     135   '--libdir=${exec_prefix}/${RTEMS_BSP}/lib' \
     136   'CFLAGS="${CFLAGS}"'],
    136137  [test x"$multilib" = xno])
    137138
Note: See TracChangeset for help on using the changeset viewer.