Changeset 3da33bf8 in rtems


Ignore:
Timestamp:
Nov 20, 2003, 7:02:53 AM (18 years ago)
Author:
Ralf Corsepius <ralf.corsepius@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
2ea1779
Parents:
61f41e2
Message:

2003-11-20 Ralf Corsepius <corsepiu@…>

  • acinclude.m4: New.
  • configure.ac: Don't use AUTOHEADER to generate cpuopts.h. Add local autoheader config.h.
  • aclocal/canonical-target-name.m4: Require AC_CANONICAL_HOST.
  • aclocal/enable-inlines.m4: Remove USE_MACROS (Unused).
Location:
cpukit
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed
  • cpukit/ChangeLog

    r61f41e2 r3da33bf8  
     12003-11-20      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        * acinclude.m4: New.
     4        * configure.ac: Don't use AUTOHEADER to generate cpuopts.h.
     5        Add local autoheader config.h.
     6        * aclocal/canonical-target-name.m4: Require AC_CANONICAL_HOST.
     7        * aclocal/enable-inlines.m4: Remove USE_MACROS (Unused).
     8
    192003-10-21      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
    210
  • cpukit/aclocal/canonical-target-name.m4

    r61f41e2 r3da33bf8  
    1010
    1111AC_DEFUN([RTEMS_CANONICAL_TARGET_CPU],
    12 [
    13 AC_CANONICAL_HOST
     12[AC_REQUIRE([AC_CANONICAL_HOST])
    1413AC_MSG_CHECKING(rtems target cpu)
    1514case "${host}" in
  • cpukit/aclocal/enable-inlines.m4

    r61f41e2 r3da33bf8  
    1111AC_SUBST(RTEMS_USE_MACROS)dnl
    1212
    13 if test x"${RTEMS_USE_MACROS}" = x"yes";
    14 then
    15   AC_DEFINE_UNQUOTED(USE_MACROS,1,[if using macros])
    16 else
     13AS_IF([test x"${RTEMS_USE_MACROS}" = x"yes"],[],[
    1714  AC_DEFINE_UNQUOTED(USE_INLINES,1,[if using inlines])
    18 fi
     15])
    1916
    2017
  • cpukit/configure.ac

    r61f41e2 r3da33bf8  
    8080# HACK: We should use a feature-based configuration.
    8181AS_IF([test x"${RTEMS_CPU}" = x"unix"],[
    82   AC_DEFINE_UNQUOTED([RTEMS_UNIX],[1],[to indicate RTEMS unix])
    8382# HACK: silently accept --enable-unixlib
    8483  test -n "${enable_unixlib}" || enable_unixlib="yes"
    8584])
    86 
    87 AS_IF([test x"${enable_unixlib}" = x"yes"],
    88   [AC_DEFINE_UNQUOTED([RTEMS_UNIXLIB],[1],
    89     [to indicate RTEMS using RTEMS's unixlib])]
    90 )
    9185
    9286# BSD-isms, used throughout the sources
     
    9791AC_CHECK_FUNCS([isascii fileno])
    9892
    99 AM_CONFIG_HEADER([score/include/rtems/score/cpuopts-tmp.h],[
    100 echo "/* target cpu dependent options file */"         >$tmp/config.h
    101 echo "/* automatically generated -- DO NOT EDIT!! */" >>$tmp/config.h
    102 echo                                                  >>$tmp/config.h
    103 echo "#ifndef __CPU_OPTIONS_h"                        >>$tmp/config.h
    104 echo "#define __CPU_OPTIONS_h"                        >>$tmp/config.h
    105 echo                                                  >>$tmp/config.h
    106 sed -e '/.*PACKAGE.*/d' score/include/rtems/score/cpuopts-tmp.h >> $tmp/config.h
    107 echo                                                  >>$tmp/config.h
    108 echo "#endif"                                         >>$tmp/config.h
    109 AS_IF([cmp -s score/include/rtems/score/cpuopts.h $tmp/config.h 2>/dev/null],
    110   [AC_MSG_NOTICE([score/include/rtems/score/cpuopts.h is unchanged])
    111    rm -f $tmp/config.h],
    112   [AC_MSG_NOTICE([creating score/include/rtems/score/cpuopts.h])
    113    rm -f score/include/rtems/score/cpuopts.h
    114    mv $tmp/config.h score/include/rtems/score/cpuopts.h])
     93cat << EOF > cpuopts.tmp
     94/* target cpu dependent options file */
     95/* automatically generated -- DO NOT EDIT!! */
     96#ifndef __CPU_OPTIONS_h
     97#define __CPU_OPTIONS_h
     98EOF
     99
     100RTEMS_CPUOPT([USE_INLINES],
     101  [! test x"${RTEMS_USE_MACROS}" = x"yes"],
     102  [1],
     103  [if using inlines])
     104
     105RTEMS_CPUOPT([RTEMS_ITRON_API],
     106  [test x"$rtems_cv_HAS_ITRON_API" = x"yes"],
     107  [1],
     108  [if itron api is supported])
     109
     110RTEMS_CPUOPT([RTEMS_MULTILIBS],
     111  [test x"$RTEMS_MULTILIBS" = x"yes"],
     112  [1],
     113  [using multilib'ed RTEMS])
     114
     115RTEMS_CPUOPT([RTEMS_MULTIPROCESSING],
     116  [test x"$HAS_MP" = "yes"],
     117  [1],
     118  [if multiprocessing is enabled])
     119
     120RTEMS_CPUOPT([RTEMS_NEWLIB],
     121  [test x"$RTEMS_USE_NEWLIB" = x"yes"],
     122  [1],
     123  [if using newlib])
     124
     125RTEMS_CPUOPT([RTEMS_POSIX_API],
     126  [test x"$HAS_POSIX_API" = x"yes"],
     127  [1],
     128  [if posix api is supported])
     129
     130RTEMS_CPUOPT([RTEMS_UNIX],
     131  [test x"$RTEMS_CPU" = x"unix"],
     132  [1],
     133  [to indicate RTEMS unix])
     134
     135RTEMS_CPUOPT([RTEMS_UNIXLIB],
     136  [test x"${enable_unixlib}" = x"yes"],
     137  [1],
     138  [to indicate RTEMS using RTEMS's unixlib])
     139
     140RTEMS_CPUOPT([RTEMS_VERSION],
     141  [true],
     142  [\"]_RTEMS_VERSION[\"],
     143  [RTEMS version string])
     144
     145echo >> cpuopts.tmp
     146echo "#endif" >> cpuopts.tmp
     147
     148AS_MKDIR_P(score/include/rtems/score)
     149AS_IF([test -f score/include/rtems/score/cpuopts.h],
     150[
     151  AS_IF([cmp -s score/include/rtems/score/cpuopts.h cpuopts.tmp 2>/dev/null],
     152  [
     153    AC_MSG_NOTICE([score/include/rtems/score/cpuopts.h is unchanged])
     154    rm -f cpuopts.tmp
     155  ],[
     156    AC_MSG_NOTICE([creating score/include/rtems/score/cpuopts.h])
     157    rm -f score/include/rtems/score/cpuopts.h
     158    mv cpuopts.tmp score/include/rtems/score/cpuopts.h
     159  ])
     160],[
     161    AC_MSG_NOTICE([creating score/include/rtems/score/cpuopts.h])
     162    rm -f score/include/rtems/score/cpuopts.h
     163    mv cpuopts.tmp score/include/rtems/score/cpuopts.h
    115164])
    116165
    117166AC_ENABLE_MULTILIB([Makefile],[..])
    118 
    119 ## HACK: Add a define to cpuopts.h to indicate using multilibs
    120 ## Can be applied to produce compiler errors if using
    121 ## multilib-incompatible settings somewhere else (eg. bspopts.h).
    122 AS_IF([test x"${enable_multilib}" = x"yes"],[
    123   AC_DEFINE_UNQUOTED([RTEMS_MULTILIBS],[1],[using multilib'ed RTEMS])
    124 ])
    125167
    126168# libmisc/shell/* wants to assign file descriptors to stdio file descriptors.
     
    231273AM_CONDITIONAL([LIBSHELL],[test x"$HAVE_ASSIGNABLE_STDIO" = x"yes"])
    232274AM_CONDITIONAL([LIBSERDBG],[test x"$rtems_cv_cc_attribute_weak" = x"yes"])
     275
     276AC_CONFIG_HEADER(config.h)
    233277
    234278# Explicitly list all Makefiles here
Note: See TracChangeset for help on using the changeset viewer.