![[RTEMS Logo]](/images/logo.png){kind=logo}
Changeset a0ea6f1 in rtems
- Timestamp:
- 01/06/02 20:12:13 (22 years ago)
- Branches:
- 4.10, 4.11, 4.8, 4.9, 5, master
- Children:
- c274328b
- Parents:
- d049568
- Files:
-
- 7 edited
-
ChangeLog (modified) (1 diff)
-
aclocal/check-newlib.m4 (modified) (1 diff)
-
aclocal/config-subdirs.m4 (modified) (2 diffs)
-
aclocal/subdirs.m4 (modified) (11 diffs)
-
aclocal/sysv-ipc.m4 (modified) (5 diffs)
-
aclocal/target.m4 (modified) (1 diff)
-
automake/compile.am (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
ChangeLog
rd049568 ra0ea6f1 1 2002-02-05 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2 3 * aclocal/check-newlib.m4: Apply AS_IF. 4 * aclocal/config-subdirs.m4: Remove _RTEMS_PUSH_BUILDDIR, 5 _RTEMS_POP_BUILDDIR, _RTEMS_GIVEN_INSTALL, _RTEMS_SUB_SRCDIR. 6 * aclocal/subdirs.m4: Fix comments, apply AS_IF. 7 * aclocal/sysv-ipc.m4: Reflect autoconf-2.5x canonicalization 8 changes. 9 * aclocal/target.m4: Add _RTEMS_PUSH_BUILDDIR, _RTEMS_POP_BUILDDIR, 10 _RTEMS_GIVEN_INSTALL, _RTEMS_SUB_SRCDIR. 11 * automake/compile.am: Remove librtemsall from LINK_FILES. 12 1 13 2001-12-20 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2 14 -
aclocal/check-newlib.m4
rd049568 ra0ea6f1 15 15 16 16 dnl some versions of newlib provide rtems_provides_crt0() 17 if test -z "$rtems_cv_use_newlib"; then18 AC_TRY_LINK(17 AS_IF([test -z "$rtems_cv_use_newlib"], 18 [AC_TRY_LINK( 19 19 [extern void rtems_provides_crt0() ;], 20 20 [rtems_provides_crt0()], 21 21 rtems_cv_use_newlib="yes", 22 rtems_cv_use_newlib="no") 23 fi22 rtems_cv_use_newlib="no")] 23 ) 24 24 ]) 25 RTEMS_USE_NEWLIB="$rtems_cv_use_newlib"26 AC_SUBST(RTEMS_USE_NEWLIB)25 RTEMS_USE_NEWLIB="$rtems_cv_use_newlib" 26 AC_SUBST(RTEMS_USE_NEWLIB) 27 27 28 if test x"${RTEMS_USE_NEWLIB}" = x"yes"; 29 then 30 AC_DEFINE_UNQUOTED(RTEMS_NEWLIB,1,[if using newlib]) 31 AC_DEFINE_UNQUOTED(MALLOC_PROVIDED,1,[if malloc is provided]) 32 fi 28 AS_IF([test x"${RTEMS_USE_NEWLIB}" = x"yes"], 29 [ AC_DEFINE_UNQUOTED(RTEMS_NEWLIB,1,[if using newlib])] 30 ) 33 31 ]) -
aclocal/config-subdirs.m4
rd049568 ra0ea6f1 8 8 dnl configure.in. 9 9 dnl 10 11 dnl12 dnl _RTEMS_PUSH_BUILDDIR(SUBDIR)13 dnl14 AC_DEFUN(_RTEMS_PUSH_BUILDDIR,15 [16 # _RTEMS_PUSH_BUILDDIR17 echo configuring in $118 case "$srcdir" in19 .) ;;20 *) AS_MKDIR_P([$1])21 ;;22 esac23 24 ac_popdir=`pwd`25 cd $126 ])27 28 dnl29 dnl _RTEMS_POP_BUILDDIR30 dnl31 AC_DEFUN(_RTEMS_POP_BUILDDIR,32 [33 cd $ac_popdir34 ])35 36 dnl37 dnl _RTEMS_GIVEN_INSTALL38 dnl39 AC_DEFUN(_RTEMS_GIVEN_INSTALL,40 [41 ifdef([AC_PROVIDE_AC_PROG_INSTALL],[42 case "$ac_given_INSTALL" in43 [[\\/]]* | ?:[[\\/]]*) INSTALL="$ac_given_INSTALL" ;;44 *) INSTALL="$ac_dots$ac_given_INSTALL" ;;45 esac46 ])dnl47 ])48 10 49 11 dnl … … 71 33 esac 72 34 ]) 73 74 dnl75 dnl _RTEMS_SUB_SRCDIR(AC_CONFIG_DIR[,TARGET_SUBDIR])76 dnl77 AC_DEFUN(_RTEMS_SUB_SRCDIR,[78 # _RTEMS_SUB_SRCDIR79 _RTEMS_ADJUST_SRCDIR(ac_sub_srcdir,$1,$2)80 81 # Check for configure82 if test -f $ac_sub_srcdir/configure; then83 ac_sub_configure=$ac_sub_srcdir/configure84 else85 AC_MSG_WARN([no configuration information is in $1])86 ac_sub_configure=87 fi88 ]) -
aclocal/subdirs.m4
rd049568 ra0ea6f1 1 ## All tools belong in one of the 3 categories, and are assigned above.1 ## All directories belong in one of 3 categories. 2 2 ## ${HOST_CONFIGDIRS_LIST} is directories we build using the host tools. 3 3 ## ${TARGET_CONFIGDIRS_LIST} is directories we build using the target tools. … … 31 31 _RTEMS_TARGET_CONFIG_PREPARE 32 32 33 if test $build = $host; 34 then 35 if test $host = $target; 36 then 37 dnl b=h, h=t, t=b 33 AS_IF([test $build = $host], 34 [ 35 AS_IF([test $host = $target], 36 [dnl b=h, h=t, t=b 38 37 BUILD_SUBDIRS="${build_configdirs}" 39 38 build_configdirs="${build_configdirs}" … … 41 40 host_configdirs="" 42 41 TARGET_SUBDIRS="" 43 target_configdirs="" 44 else 45 dnl b=h, h!=t, t!=b 42 target_configdirs=""], 43 [dnl b=h, h!=t, t!=b 46 44 BUILD_SUBDIRS="${build_configdirs}" 47 45 build_configdirs="${build_configdirs}" … … 51 49 sed -e "s%\([[^ ]][[^ ]]*\)%$target_alias/\1%g"` 52 50 target_configdirs="${target_configdirs}" 53 fi 54 else 55 if test $host = $target; 56 then 57 dnl b!=h, h=t, b!=t 51 ]) 52 ],[ 53 AS_IF([test $host = $target], 54 [ dnl b!=h, h=t, b!=t 58 55 BUILD_SUBDIRS="${build_configdirs}" 59 56 build_configdirs="${build_configdirs}" … … 62 59 host_configdirs="${host_configdirs}" 63 60 TARGET_SUBDIRS="" 64 target_configdirs="" 65 else 66 if test $build = $target; 67 then 68 dnl b!=h, h!=t, b=t 61 target_configdirs=""], 62 [ 63 AS_IF([test $build = $target], 64 [dnl b!=h, h!=t, b=t 69 65 BUILD_SUBDIRS="${build_configdirs}" 70 66 build_configdirs="${build_configdirs}" … … 73 69 host_configdirs="${host_configdirs}" 74 70 TARGET_SUBDIRS="" 75 target_configdirs="" 76 else 77 dnl b!=h, h!=t, b!=t 71 target_configdirs=""], 72 [dnl b!=h, h!=t, b!=t 78 73 BUILD_SUBDIRS="${build_configdirs}" 79 74 build_configdirs="${build_configdirs}" … … 84 79 sed -e "s%\([[^ ]][[^ ]]*\)%$target_alias/\1%g"` 85 80 target_configdirs="${target_configdirs}" 86 fi87 fi88 fi 81 ]) 82 ]) 83 ]) 89 84 90 85 AC_SUBST(HOST_SUBDIRS) … … 126 121 ac_builddir=. 127 122 128 if test $dstdir != .; then 129 123 AS_IF([test $dstdir != .], 124 [ # Strip off leading ./ 130 125 ac_builddir_suffix=/`echo $dstdir | sed 's,^\.[[\\/]],,'` 131 126 ac_srcdir_suffix=/`echo $1 | sed 's,^\.[[\\/]],,'` 132 127 # A "../" for each directory in $ac_dir_suffix. 133 128 ac_top_builddir=`echo "$ac_builddir_suffix" | sed 's,/[[^\\/]]*,../,g'` 134 else 129 ],[ 135 130 ac_dir_suffix= ac_top_builddir= 136 fi 131 ]) 137 132 138 133 case $srcdir in … … 261 256 262 257 ## PUBLIC: RTEMS_BUILD_CONFIG_SUBDIRS(build_subdir) 263 # tools to be built for the build environment258 # subdirs to be built for the build environment 264 259 AC_DEFUN([RTEMS_BUILD_CONFIG_SUBDIRS],[ 265 260 m4_append([_RTEMS_BUILD_CONFIGDIRS_LIST],[ $1]) … … 291 286 ]) 292 287 293 ## PUBLIC: RTEMS_HOST_CONFIG_SUBDIR (host_subdir)294 # libraries to be build for the host environment288 ## PUBLIC: RTEMS_HOST_CONFIG_SUBDIRS(host_subdir) 289 # subdirs to be build for the host environment 295 290 AC_DEFUN([RTEMS_HOST_CONFIG_SUBDIRS],[ 296 291 m4_append([_RTEMS_HOST_CONFIGDIRS_LIST],[ $1])dnl … … 342 337 ]) 343 338 344 ## PUBLIC: RTEMS_TARGET (target_subdir)345 # tools to be build for the target environment339 ## PUBLIC: RTEMS_TARGET_CONFIG_SUBDIRS(target_subdir) 340 # subdirs to be build for the target environment 346 341 AC_DEFUN([RTEMS_TARGET_CONFIG_SUBDIRS],[ 347 342 m4_append([_RTEMS_TARGET_CONFIGDIRS_LIST],[ $1]) -
aclocal/sysv-ipc.m4
rd049568 ra0ea6f1 19 19 AC_DEFUN(RTEMS_UNION_SEMUN, 20 20 [ 21 AC_CACHE_CHECK([whether $ RTEMS_HOSTdefines union semun],21 AC_CACHE_CHECK([whether $host defines union semun], 22 22 rtems_cv_HAS_UNION_SEMUN, 23 23 [AC_TRY_COMPILE([ … … 36 36 AC_DEFUN(RTEMS_SYSV_SEM, 37 37 [AC_REQUIRE([AC_PROG_CC]) 38 AC_REQUIRE([RTEMS_CANONICAL_HOST])39 AC_CACHE_CHECK(whether $ RTEMS_HOSTsupports System V semaphores,38 # AC_REQUIRE([RTEMS_CANONICAL_HOST]) 39 AC_CACHE_CHECK(whether $host supports System V semaphores, 40 40 rtems_cv_sysv_sem, 41 41 [ … … 70 70 AC_DEFUN(RTEMS_SYSV_SHM, 71 71 [AC_REQUIRE([AC_PROG_CC]) 72 AC_REQUIRE([RTEMS_CANONICAL_HOST])73 AC_CACHE_CHECK(whether $ RTEMS_HOSTsupports System V shared memory,72 # AC_REQUIRE([RTEMS_CANONICAL_HOST]) 73 AC_CACHE_CHECK(whether $host supports System V shared memory, 74 74 rtems_cv_sysv_shm, 75 75 [ … … 93 93 AC_DEFUN(RTEMS_SYSV_MSG, 94 94 [AC_REQUIRE([AC_PROG_CC]) 95 AC_REQUIRE([RTEMS_CANONICAL_HOST])96 AC_CACHE_CHECK(whether $ RTEMS_HOSTsupports System V messages,95 # AC_REQUIRE([RTEMS_CANONICAL_HOST]) 96 AC_CACHE_CHECK(whether $host supports System V messages, 97 97 rtems_cv_sysv_msg, 98 98 [ … … 115 115 116 116 AC_DEFUN(RTEMS_CHECK_SYSV_UNIX, 117 [ AC_REQUIRE([RTEMS_CANONICAL_HOST])117 [# AC_REQUIRE([RTEMS_CANONICAL_HOST]) 118 118 if test "$RTEMS_CPU" = "unix" ; then 119 119 RTEMS_UNION_SEMUN -
aclocal/target.m4
rd049568 ra0ea6f1 89 89 ## FIXME: This is obsolete. Only kept for backward compatibility 90 90 AU_DEFUN([RTEMS_OUTPUT_BUILD_SUBDIRS],[]) 91 92 93 dnl 94 dnl Misc utility macros for subdir handling to work around missing abilities 95 dnl in autoconf, automake and structural issues with RTEMS 96 dnl 97 dnl Contains parts derived from autoconf-2.13 AC_OUTPUT_SUBDIRS and Cygnus' 98 dnl configure.in. 99 dnl 100 101 dnl 102 dnl _RTEMS_PUSH_BUILDDIR(SUBDIR) 103 dnl 104 AC_DEFUN(_RTEMS_PUSH_BUILDDIR, 105 [ 106 # _RTEMS_PUSH_BUILDDIR 107 echo configuring in $1 108 case "$srcdir" in 109 .) ;; 110 *) AS_MKDIR_P([$1]) 111 ;; 112 esac 113 114 ac_popdir=`pwd` 115 cd $1 116 ]) 117 118 dnl 119 dnl _RTEMS_POP_BUILDDIR 120 dnl 121 AC_DEFUN(_RTEMS_POP_BUILDDIR, 122 [ 123 cd $ac_popdir 124 ]) 125 126 dnl 127 dnl _RTEMS_GIVEN_INSTALL 128 dnl 129 AC_DEFUN(_RTEMS_GIVEN_INSTALL, 130 [ 131 ifdef([AC_PROVIDE_AC_PROG_INSTALL],[ 132 case "$ac_given_INSTALL" in 133 [[\\/]]* | ?:[[\\/]]*) INSTALL="$ac_given_INSTALL" ;; 134 *) INSTALL="$ac_dots$ac_given_INSTALL" ;; 135 esac 136 ])dnl 137 ]) 138 139 dnl 140 dnl _RTEMS_SUB_SRCDIR(AC_CONFIG_DIR[,TARGET_SUBDIR]) 141 dnl 142 AC_DEFUN(_RTEMS_SUB_SRCDIR,[ 143 # _RTEMS_SUB_SRCDIR 144 _RTEMS_ADJUST_SRCDIR(ac_sub_srcdir,$1,$2) 145 146 # Check for configure 147 if test -f $ac_sub_srcdir/configure; then 148 ac_sub_configure=$ac_sub_srcdir/configure 149 else 150 AC_MSG_WARN([no configuration information is in $1]) 151 ac_sub_configure= 152 fi 153 ]) -
automake/compile.am
rd049568 ra0ea6f1 60 60 61 61 ### FIXME: False if using multilibbed RTEMS 62 LINK_LIBS_RTEMS = $(PROJECT_RELEASE)/lib/librtemsall$(LIBSUFFIX_VA) 62 LINK_LIBS_RTEMS = $(PROJECT_RELEASE)/lib/librtemsbsp$(LIBSUFFIX_VA) \ 63 $(PROJECT_RELEASE)/lib/librtemscpu$(LIBSUFFIX_VA) \ 63 64 64 65 LINK_LIBS_GCC272 = $(LINK_LIBS_RTEMS) $(LIBC_LIBC) $(LIBC_LIBGCC) … … 200 201 $(OBJS) \ 201 202 $(MANAGERS_NOT_WANTED:%=$(PROJECT_RELEASE)/lib/no-%$(LIB_VARIANT).rel) \ 202 $(PROJECT_RELEASE)/lib/librtemsall$(LIBSUFFIX_VA) 203 $(PROJECT_RELEASE)/lib/librtemsbsp$(LIBSUFFIX_VA) \ 204 $(PROJECT_RELEASE)/lib/librtemscpu$(LIBSUFFIX_VA) \ 203 205 204 206 if RTEMS_USE_GCC
Note: See TracChangeset
for help on using the changeset viewer.
