Changeset 560aae24 in rtems


Ignore:
Timestamp:
01/29/01 15:27:25 (21 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
ed3ec25
Parents:
37222c7e
Message:

2001-01-26 Ralf Corsepius <corsepiu@…>

  • aclocal/enable-rtemsbsp.m4: Split out RTEMS_ENV_RTEMSBSP, RTEMS_ENV_RTEMSCPU.
  • aclocal/env-rtemsbsp.m4: New file for RTEMS_ENV_RTEMSBSP, add special treatment for GCC_SPECS.
  • aclocal/env-rtemscpu.m4: New file for RTEMS_ENV_RTEMSCPU, add special treatment for GCC_SPECS.
  • aclocal/bsp-enable-arg.m4: New file, introduce RTEMS_BSP_ARG_ENABLE.
  • aclocal/prog-cc.m4: Add AC_PROG_CPP, use build_os in GCCSED hack.
  • automake/compile.am: New treatment of CPP, GCCSPECS, use .. instead of $(shell ..) for LIBC_LIB*.
Files:
3 added
4 edited

Legend:

Unmodified
Added
Removed

  • ChangeLog

    r37222c7e r560aae24  
     12001-01-26      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        * aclocal/enable-rtemsbsp.m4: Split out RTEMS_ENV_RTEMSBSP,
     4        RTEMS_ENV_RTEMSCPU.
     5        * aclocal/env-rtemsbsp.m4: New file for RTEMS_ENV_RTEMSBSP, add
     6        special treatment for GCC_SPECS.
     7        * aclocal/env-rtemscpu.m4: New file for RTEMS_ENV_RTEMSCPU, add
     8        special treatment for GCC_SPECS.
     9        * aclocal/bsp-enable-arg.m4: New file, introduce RTEMS_BSP_ARG_ENABLE.
     10        * aclocal/prog-cc.m4: Add AC_PROG_CPP, use build_os in GCCSED hack.
     11        * automake/compile.am: New treatment of CPP, GCCSPECS, use `..`
     12        instead of $(shell ..) for LIBC_LIB*.
     13
    1142001-01-22      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    215

  • aclocal/enable-rtemsbsp.m4

    r37222c7e r560aae24  
    1414esac],[$1=""])
    1515])
    16 
    17 dnl Pass a single BSP via an environment variable
    18 dnl used by per BSP configure scripts
    19 AC_DEFUN(RTEMS_ENV_RTEMSBSP,
    20 [dnl
    21 AC_BEFORE([$0], [RTEMS_ENABLE_RTEMSBSP])dnl
    22 AC_BEFORE([$0], [RTEMS_PROJECT_ROOT])dnl
    23 AC_BEFORE([$0], [RTEMS_CHECK_CUSTOM_BSP])dnl
    24 
    25 AC_MSG_CHECKING([for RTEMS_BSP])
    26 AC_CACHE_VAL(rtems_cv_RTEMS_BSP,
    27 [dnl
    28   test -n "${RTEMS_BSP}" && rtems_cv_RTEMS_BSP="$RTEMS_BSP";
    29 ])dnl
    30 if test -z "$rtems_cv_RTEMS_BSP"; then
    31   AC_MSG_ERROR([Missing RTEMS_BSP])
    32 fi
    33 RTEMS_BSP="$rtems_cv_RTEMS_BSP"
    34 AC_MSG_RESULT(${RTEMS_BSP})
    35 AC_SUBST(RTEMS_BSP)
    36 
    37 RTEMS_ENABLE_BARE
    38 AC_SUBST(BARE_CPU_MODEL)
    39 AC_SUBST(BARE_CPU_CFLAGS)
    40 
    41 RTEMS_ROOT=$PROJECT_ROOT/c/$RTEMS_BSP
    42 AC_SUBST(RTEMS_ROOT)
    43 AM_CONDITIONAL(RTEMS_CONFIG_PER_BSP, test x = x);
    44 ])
    45 
    46 AC_DEFUN(RTEMS_ENV_RTEMSCPU,
    47 [AC_REQUIRE([RTEMS_ENABLE_MULTILIB])
    48 
    49 if test x"$multilib" = x"no"; then
    50   RTEMS_ENV_RTEMSBSP
    51   RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
    52 else
    53   rtems_cv_RTEMS_BSP="multilib"
    54   RTEMS_BSP="$rtems_cv_RTEMS_BSP"
    55   AC_SUBST(RTEMS_BSP)
    56   RTEMS_ROOT=$PROJECT_ROOT/c
    57   AC_SUBST(RTEMS_ROOT)
    58 fi
    59 ])

  • aclocal/prog-cc.m4

    r37222c7e r560aae24  
    1717  AC_MSG_ERROR([no acceptable cc found in \$PATH])
    1818AC_PROG_CC
     19AC_PROG_CPP
    1920
    2021AM_CONDITIONAL(RTEMS_USE_GCC,test x"$GCC" = x"yes")
    … …  
    4445
    4546dnl FIXME: HACK for egcs/cygwin mixing '\\' and '/' in gcc -print-*
    46 case $host_os in
     47case $build_os in
    4748*cygwin*)     GCCSED="| sed 's%\\\\%/%g'" ;;
    4849*) ;;

  • automake/compile.am

    r37222c7e r560aae24  
    5555
    5656# default location of Standard C Library
    57 LIBC_LIBC = $(shell $(CC) $(CPU_CFLAGS) -print-file-name=libc.a $(GCCSED))
    58 LIBC_LIBM = $(shell $(CC) $(CPU_CFLAGS) -print-file-name=libm.a $(GCCSED))
    59 LIBC_LIBGCC = $(shell $(CC) $(CPU_CFLAGS) -print-libgcc-file-name $(GCCSED))
     57LIBC_LIBC = `$(CC) $(CPU_CFLAGS) -print-file-name=libc.a $(GCCSED)`
     58LIBC_LIBM = `$(CC) $(CPU_CFLAGS) -print-file-name=libm.a $(GCCSED)`
     59LIBC_LIBGCC = `$(CC) $(CPU_CFLAGS) -print-libgcc-file-name $(GCCSED)`
    6060
    6161### FIXME: False if using multilibbed RTEMS
    … …  
    6363
    6464LINK_LIBS_GCC272 = $(LINK_LIBS_RTEMS) $(LIBC_LIBC) $(LIBC_LIBGCC)
     65GCCSPECS =
    6566else
    6667## gcc >= 2.8.x
    67 if RTEMS_CONFIG_PER_BSP
    68 BSP_SPECS = -specs bsp_specs -qrtems
    69 endif
    70 
    71 GCCSPECS = -B$(PROJECT_RELEASE)/lib/ $(BSP_SPECS)
     68GCCSPECS = $(GCC_SPECS) $(RTEMS_BSP_SPECS)
    7269endif
    7370else
    … …  
    111108# Client compiler and support tools
    112109#
    113 
    114 ## HACK: specific to gcc
    115 ## FIXME: Do we call the correct CPP, why aren't
    116 ## CPPFLAGS and CFLAGS part of this call?
    117 # CPP command to write file to standard output
    118 CPP=$(CC) -E -ansi -w -Wp,-$$
    119110
    120111ARFLAGS=ruv
    … …  
    279270CC = @CC@ $(GCCSPECS)
    280271CXX = @CXX@ $(GCCSPECS)
     272CPP = @CPP@ $(GCCSPECS)
     273
    281274LD = @LD@
    282275OBJCOPY = @OBJCOPY@
Note: See TracChangeset for help on using the changeset viewer.