From d5e33315ada4871a12069aa5682753f157680a13 Mon Sep 17 00:00:00 2001 From: cvs2git Date: Sun, 7 Mar 2010 17:11:26 +0000 Subject: This commit was manufactured by cvs2svn to create tag 'R_20100422_p2'. Sprout from base 2009-04-22 22:06:58 UTC Till Straumann ' - importing updated version from SLAC as of 20090422' Cherrypick from master 2010-03-07 17:11:23 UTC Till Straumann '2010-03-07 Till Straumann ': bsd_eth_drivers/.cvsignore bsd_eth_drivers/ChangeLog bsd_eth_drivers/Makefile.am bsd_eth_drivers/if_bge/.cvsignore bsd_eth_drivers/if_bge/Makefile.am bsd_eth_drivers/if_bge/if_bge.c bsd_eth_drivers/if_bge/if_bgereg.h bsd_eth_drivers/if_em/.cvsignore bsd_eth_drivers/if_em/Makefile.am bsd_eth_drivers/if_em/e1000_manage.c bsd_eth_drivers/if_em/e1000_manage.h bsd_eth_drivers/if_em/e1000_osdep.h bsd_eth_drivers/if_em/if_em.c bsd_eth_drivers/if_fxp/.cvsignore bsd_eth_drivers/if_fxp/Makefile.am bsd_eth_drivers/if_fxp/if_fxp.c bsd_eth_drivers/if_fxp/if_fxpvar.h bsd_eth_drivers/if_le/.cvsignore bsd_eth_drivers/if_pcn/.cvsignore bsd_eth_drivers/if_pcn/if_pcn.c bsd_eth_drivers/if_re/.cvsignore bsd_eth_drivers/if_re/Makefile.am bsd_eth_drivers/if_re/if_re.c bsd_eth_drivers/if_re/if_rl.c bsd_eth_drivers/if_re/if_rlreg.h bsd_eth_drivers/libbsdport/.cvsignore bsd_eth_drivers/libbsdport/Makefile.am bsd_eth_drivers/libbsdport/alldrv.c bsd_eth_drivers/libbsdport/bus.h bsd_eth_drivers/libbsdport/callout.h bsd_eth_drivers/libbsdport/devicet.c bsd_eth_drivers/libbsdport/ifmedia.c bsd_eth_drivers/libbsdport/libbsdport.h bsd_eth_drivers/libbsdport/libbsdport_api.h bsd_eth_drivers/libbsdport/libbsdport_post.h bsd_eth_drivers/libbsdport/miistuff.c bsd_eth_drivers/libbsdport/misc.c bsd_eth_drivers/libbsdport/mutex.h bsd_eth_drivers/libbsdport/rtems_callout.c bsd_eth_drivers/libbsdport/sysbus.c bsd_eth_drivers/libbsdport/taskqueue.h bsd_eth_drivers/links.am Cherrypick from freebsd_orig 2009-04-23 04:52:05 UTC Till Straumann ' - importing original 'releng_7_1' version of FXP driver from FreeBSD.': bsd_eth_drivers/if_fxp/if_fxpreg.h bsd_eth_drivers/if_fxp/rcvbundl.h Delete: INSTALL Makefile.am bootstrap config.h.in configure.ac m4/acinclude.m4 m4/config-if-present.m4 m4/cvstag.m4 m4/multilib-fix.m4 m4/multilib-installdir.m4 m4/rtems-bsp-postlink.m4 m4/rtems-bsplist.m4 m4/rtems-check-libargs.m4 m4/rtems-checkprog.m4 m4/rtems-checktool.m4 m4/rtems-checktop.m4 m4/rtems-fixup-prefix.m4 m4/rtems-isml.m4 m4/rtems-ismultibsp.m4 m4/rtems-isrtems.m4 m4/rtems-makevars.m4 m4/rtems-multilib.m4 m4/rtems-options.m4 m4/rtems-setup-recurse.m4 m4/rtems-tools.m4 m4/rtems-trim-builddir.m4 m4/rtems-verscheck.m4 makefile.top.am makefile.top.in rtems-pre.am rtems.am ssrlApps.components.in --- m4/acinclude.m4 | 16 ---- m4/config-if-present.m4 | 23 ----- m4/cvstag.m4 | 41 --------- m4/multilib-fix.m4 | 78 ---------------- m4/multilib-installdir.m4 | 21 ----- m4/rtems-bsp-postlink.m4 | 32 ------- m4/rtems-bsplist.m4 | 41 --------- m4/rtems-check-libargs.m4 | 9 -- m4/rtems-checkprog.m4 | 9 -- m4/rtems-checktool.m4 | 11 --- m4/rtems-checktop.m4 | 23 ----- m4/rtems-fixup-prefix.m4 | 59 ------------ m4/rtems-isml.m4 | 11 --- m4/rtems-ismultibsp.m4 | 23 ----- m4/rtems-isrtems.m4 | 23 ----- m4/rtems-makevars.m4 | 142 ----------------------------- m4/rtems-multilib.m4 | 28 ------ m4/rtems-options.m4 | 41 --------- m4/rtems-setup-recurse.m4 | 224 ---------------------------------------------- m4/rtems-tools.m4 | 15 ---- m4/rtems-trim-builddir.m4 | 26 ------ m4/rtems-verscheck.m4 | 36 -------- 22 files changed, 932 deletions(-) delete mode 100644 m4/acinclude.m4 delete mode 100644 m4/config-if-present.m4 delete mode 100644 m4/cvstag.m4 delete mode 100644 m4/multilib-fix.m4 delete mode 100644 m4/multilib-installdir.m4 delete mode 100644 m4/rtems-bsp-postlink.m4 delete mode 100644 m4/rtems-bsplist.m4 delete mode 100644 m4/rtems-check-libargs.m4 delete mode 100644 m4/rtems-checkprog.m4 delete mode 100644 m4/rtems-checktool.m4 delete mode 100644 m4/rtems-checktop.m4 delete mode 100644 m4/rtems-fixup-prefix.m4 delete mode 100644 m4/rtems-isml.m4 delete mode 100644 m4/rtems-ismultibsp.m4 delete mode 100644 m4/rtems-isrtems.m4 delete mode 100644 m4/rtems-makevars.m4 delete mode 100644 m4/rtems-multilib.m4 delete mode 100644 m4/rtems-options.m4 delete mode 100644 m4/rtems-setup-recurse.m4 delete mode 100644 m4/rtems-tools.m4 delete mode 100644 m4/rtems-trim-builddir.m4 delete mode 100644 m4/rtems-verscheck.m4 (limited to 'm4') diff --git a/m4/acinclude.m4 b/m4/acinclude.m4 deleted file mode 100644 index 130276e..0000000 --- a/m4/acinclude.m4 +++ /dev/null @@ -1,16 +0,0 @@ -dnl m4_syscmd is executed when aclocal is run -m4_syscmd([cat - > makefile.top.am <<'EOF_' -AUTOMAKE_OPTIONS=foreign -SUBDIRS=@the_subdirs@ -# When making a distribution we only want to -# recurse into (any) one single BSP subdir. -DIST_SUBDIRS=@the_distsub@ - -# The dist-hook then removes this extra -# directory level again. -dist-hook: - if test "$(PACKAGE_VERSION)" = "untagged" ; then echo "Need tagged version to cut distribution"; exit 1; fi - cp -frl $(distdir)/$(DIST_SUBDIRS)/* $(distdir) - rm -fr $(distdir)/$(DIST_SUBDIRS) -EOF_ -]) diff --git a/m4/config-if-present.m4 b/m4/config-if-present.m4 deleted file mode 100644 index ed402ff..0000000 --- a/m4/config-if-present.m4 +++ /dev/null @@ -1,23 +0,0 @@ -dnl while we can get autoconf to properly handle nonexisting -dnl directories (e.g., because a sub-package only requires and -dnl distributes a subset of the directories under ssrlApps) -dnl via -dnl if [ -d somedir ] ; then AC_CONFIG_FILES([somedir/Makefile]) ; fi -dnl this doesn't work for automake -- automake doesn't understand -dnl the shell commands. -dnl -dnl The 'TILLAC_M4_IF_PRESENT' macro tests at 'autoconf/automake'-time -dnl if the argument file with '.am' appended exists and expands -dnl $2 if it does. Otherwise, $2 is suppressed. -dnl -dnl USAGE: -dnl -dnl TILLAC_M4_IR_PRESENT( -dnl [mysubdir/Makefile], -dnl [ pure binary - RTEMS_BSP_POSTLINK_CMDS='$(OBJCOPY) -Obinary -R .comment -S $(basename $[@])$(APPEXEEXT) $[@]' - ;; - motorola_powerpc) -# convert ELF -> special PREP bootloader - RTEMS_BSP_POSTLINK_CMDS=\ -'$(OBJCOPY) -O binary -R .comment -S $(basename $[@])$(APPEXEEXT) rtems ;'\ -'gzip -vf9 rtems ; '\ -'$(LD) -o $(basename $[@])$(DOWNEXT) $(RTEMS_BSP_INSTTOP)/lib/bootloader.o '\ -'--just-symbols=$(basename $[@])$(APPEXEEXT) '\ -'-b binary rtems.gz -T $(RTEMS_BSP_INSTTOP)/lib/ppcboot.lds '\ -'-Map $(basename $[@]).map && chmod 755 $(basename $[@])$(DOWNEXT) ; '\ -'rm -f rtems.gz' - ;; -# default: empty command - *) - ;; - esac - AC_MSG_NOTICE([RTEMS_BSP_POSTLINK_CMDS: "$RTEMS_BSP_POSTLINK_CMDS"]) - AM_CONDITIONAL([HAVE_BSP_POSTLINK_CMDS], [test ! "$RTEMS_BSP_POSTLINK_CMDS"xx = "xx" ])]dnl -) diff --git a/m4/rtems-bsplist.m4 b/m4/rtems-bsplist.m4 deleted file mode 100644 index 707bf3c..0000000 --- a/m4/rtems-bsplist.m4 +++ /dev/null @@ -1,41 +0,0 @@ -# Assemble a list of BSPs in 'enable_rtemsbsp' -# -# a) if 'enable_rtemsbsp' is not set when this macro is expanded -# then set it to a (whitespace separated) list of all -# BSPs found under ${with_rtems_top}/${host_cpu}-${host_os}/ -# b) if 'enable_rtemsbsp' is already set then remove all BSPs -# from it which are not installed under -# ${with_rtems_top}/${host_cpu}-${host_os}/ -# -# -> After expanding this macro 'enable_rtemsbsp' contains a list -# of all BSPs that are installed and -- if 'enable_rtemsbsp' was -# initially set -- which are mentioned in 'enable_rtembsp'. -# -# TILLAC_RTEMS_CHECK_BSPS -# -# NOTE: This macro *modifies* the 'enable_rtemsbsp' variable. -# -AC_DEFUN([TILLAC_RTEMS_CHECK_BSPS], - [AC_REQUIRE([TILLAC_RTEMS_OPTIONS]) - if test ! "${enable_rtemsbsp+set}" = "set" ; then - _tillac_rtems_bsplist="`ls $with_rtems_top/${host_cpu}-${host_os}/ | tr '\n\r' ' '`" - else - _tillac_rtems_bsplist=$enable_rtemsbsp - fi - enable_rtemsbsp= - AC_MSG_CHECKING([Looking for RTEMS BSPs $_tillac_rtems_bsplist]) - for _tillac_rtems_bspcand in $_tillac_rtems_bsplist ; do - if test -d $with_rtems_top/${host_cpu}-${host_os}/$_tillac_rtems_bspcand/lib/include ; then - if test "${enable_rtemsbsp}"xx = xx ; then - enable_rtemsbsp="$_tillac_rtems_bspcand" - else - enable_rtemsbsp="$_tillac_rtems_bspcand $enable_rtemsbsp" - fi - fi - done - if test "$enable_rtemsbsp"xx = "xx" ; then - AC_MSG_ERROR("No BSPs found") - else - AC_MSG_NOTICE([found \'$enable_rtemsbsp\']) - fi]dnl -) diff --git a/m4/rtems-check-libargs.m4 b/m4/rtems-check-libargs.m4 deleted file mode 100644 index 27e67e1..0000000 --- a/m4/rtems-check-libargs.m4 +++ /dev/null @@ -1,9 +0,0 @@ -# This macro can be provided as a 5th argument -# to AC_CHECK_LIB() so that linking an RTEMS -# application works. Without that, linking would -# fail because the application usually supplies -# rtems_bsdnet_config. -# In order to link, we create a dummy symbol. -AC_DEFUN([TILLAC_RTEMS_CHECK_LIB_ARGS], - [[-Wl,--defsym,rtems_bsdnet_config=0]]dnl -) diff --git a/m4/rtems-checkprog.m4 b/m4/rtems-checkprog.m4 deleted file mode 100644 index 700f5b9..0000000 --- a/m4/rtems-checkprog.m4 +++ /dev/null @@ -1,9 +0,0 @@ -## Check for a program, similar to AC_CHECK_PROG, but lets -## configure fail if the program is not found -#dnl RTEMS_CHECK_PROG(VARIABLE, PROG-TO-CHECK-FOR, VALUE-IF-FOUND [, VALUE-IF-NOT-FOUND [, PATH [, REJECT]]]) -AC_DEFUN([RTEMS_CHECK_PROG], -[ - AC_CHECK_PROG($1,$2,$3,$4,$5,$6) - AS_IF([test -z "${$1}"], - [AC_MSG_ERROR([program '$2' not found.])]) -]) diff --git a/m4/rtems-checktool.m4 b/m4/rtems-checktool.m4 deleted file mode 100644 index b5e4da1..0000000 --- a/m4/rtems-checktool.m4 +++ /dev/null @@ -1,11 +0,0 @@ -## Check for a cross tool, similar to AC_CHECK_TOOL, but do not fall back to -## the un-prefixed version of PROG-TO-CHECK-FOR. -## Also - if tool is not found then produce an error. -#dnl RTEMS_CHECK_TOOL(VARIABLE, PROG-TO-CHECK-FOR[, VALUE-IF-NOT-FOUND [, PATH]]) -AC_DEFUN([RTEMS_CHECK_TOOL], -[ - AS_IF([test "x$build_alias" != "x$host_alias"], - [rtems_tool_prefix=${ac_tool_prefix}]) - RTEMS_CHECK_PROG($1, ${rtems_tool_prefix}$2, ${rtems_tool_prefix}$2, $3, $4) - AC_SUBST($1) -]) diff --git a/m4/rtems-checktop.m4 b/m4/rtems-checktop.m4 deleted file mode 100644 index 6a8155b..0000000 --- a/m4/rtems-checktop.m4 +++ /dev/null @@ -1,23 +0,0 @@ -# Verify that the --with-rtems-top option has been given -# and that the directory it specifies has a subdirectory -# ${with_rtems_top}/${host_cpu}-${host_os} -# -# Throw an error if this test fails. -# -# TILLAC_RTEMS_CHECK_TOP -# -AC_DEFUN([TILLAC_RTEMS_CHECK_TOP], - [AC_REQUIRE([AC_CANONICAL_HOST]) - AC_REQUIRE([TILLAC_RTEMS_OPTIONS]) - if TILLAC_RTEMS_OS_IS_RTEMS ; then - if test ! "${with_rtems_top+set}" = "set" ; then - AC_MSG_ERROR([No RTEMS topdir given; use --with-rtems-top option]) - fi - AC_MSG_CHECKING([Checking RTEMS installation topdir]) - if test ! -d $with_rtems_top/${host_cpu}-${host_os}/ ; then - AC_MSG_ERROR([RTEMS topdir $with_rtems_top/${host_cpu}-${host_os}/ not found]) - fi - AC_MSG_RESULT([OK]) - fi - ]dnl -) diff --git a/m4/rtems-fixup-prefix.m4 b/m4/rtems-fixup-prefix.m4 deleted file mode 100644 index 859da2c..0000000 --- a/m4/rtems-fixup-prefix.m4 +++ /dev/null @@ -1,59 +0,0 @@ -# fixup the 'exec-prefix' and 'includedir' options: -# - if either is given explicitly by the user then do nothing -# - if user says --enable-std-rtems-installdirs then -# prefix -> ${rtems_top} -# exec-prefix -> ${prefix}// -# libdir -> ${exec-prefix}//lib -# includedir -> ${libdir}/include -# -# - if user says nothing then -# -# exec-prefix -> ${prefix}/target/ssrlApps/// -# includedir -> ${exec-prefix}/include -# -AC_DEFUN([TILLAC_RTEMS_FIXUP_PREFIXES], -[ -AC_REQUIRE([TILLAC_RTEMS_OPTIONS]) -if TILLAC_RTEMS_OS_IS_RTEMS ; then -if test "${enable_std_rtems_installdirs}" = "yes" ; then - prefix=${with_rtems_top} - exec_prefix='${prefix}/${host_cpu}-${host_os}/' - libdir='${exec_prefix}/'${enable_rtemsbsp}/lib - if test "$enable_multilib" = "yes" ; then - includedir='${exec_prefix}/include' - else - includedir='${libdir}/include' - fi - ac_configure_args="${ac_configure_args} --prefix='${prefix}'" - ac_configure_args="${ac_configure_args} --exec-prefix='${exec_prefix}'" - ac_configure_args="${ac_configure_args} --libdir='${libdir}'" - ac_configure_args="${ac_configure_args} --includedir='${includedir}'" -else -# should be correct also for multilibbed build (rtems_bsp empty) - if test "${exec_prefix}" = "NONE" ; then - exec_prefix='${prefix}/target/ssrlApps/${host_cpu}-${host_os}/'${enable_rtemsbsp}/ - ac_configure_args="${ac_configure_args} --exec-prefix='${exec_prefix}'" - fi - # Unfortunately we have no way to check if includedir was set by the user - # other than scanning the argument line :-( - tillac_rtems_includedir_set=no - for tillac_rtems_arg in ${ac_configure_args} ; do - case $tillac_rtems_arg in - -includedir | --includedir | --includedi | --included | --include \ - | --includ | --inclu | --incl | --inc \ - | -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ - | --includ=* | --inclu=* | --incl=* | --inc=*) - tillac_rtems_includedir_set=yes; - ;; - *) - ;; - esac - done - - if test "${tillac_rtems_includedir_set}" = "no" ; then - includedir='${exec_prefix}/include' - ac_configure_args="${ac_configure_args} --includedir='${includedir}'" - fi -fi -fi]dnl -) diff --git a/m4/rtems-isml.m4 b/m4/rtems-isml.m4 deleted file mode 100644 index 1a4f62e..0000000 --- a/m4/rtems-isml.m4 +++ /dev/null @@ -1,11 +0,0 @@ -# Find out if this is a multilibbed RTEMS installation -# -# Result is exit status, i.e., this macro can e.g., be used -# in a 'if MACRO ; then list; fi' statement. -# -# TILLAC_RTEMS_CPUKIT_MULTILIB -AC_DEFUN([TILLAC_RTEMS_CPUKIT_MULTILIB], - [AC_REQUIRE([AC_CANONICAL_HOST]) - AC_REQUIRE([TILLAC_RTEMS_OPTIONS]) - test -d ${with_rtems_top}/${host_cpu}-${host_os}/include]dnl -) diff --git a/m4/rtems-ismultibsp.m4 b/m4/rtems-ismultibsp.m4 deleted file mode 100644 index 63e8805..0000000 --- a/m4/rtems-ismultibsp.m4 +++ /dev/null @@ -1,23 +0,0 @@ -# -# Check if the 'enable_rtemsbsp' variable lists a single -# or multiple BSPs and set exit status accordingly: -# -# Result is exit status, i.e., this macro can e.g., be used -# in a 'if MACRO ; then list; fi' statement. -# -# true - if enable_rtembsp lists more than one BSP -# false - otherwise -# -# if TILLAC_RTEMS_CHECK_MULTI_BSPS ; then list ; fi -AC_DEFUN([TILLAC_RTEMS_CHECK_MULTI_BSPS], - [AC_REQUIRE([TILLAC_RTEMS_CHECK_BSPS]) - ( _tillac_rtems_multi_bsps=no - for _tillac_rtems_bspcand in $enable_rtemsbsp ; do - if test "$_tillac_rtems_multi_bsps" = "no" ; then - _tillac_rtems_multi_bsps=maybe - else - _tillac_rtems_multi_bsps=yes - fi - done - test "$_tillac_rtems_multi_bsps" = "yes")]dnl -) diff --git a/m4/rtems-isrtems.m4 b/m4/rtems-isrtems.m4 deleted file mode 100644 index 058be01..0000000 --- a/m4/rtems-isrtems.m4 +++ /dev/null @@ -1,23 +0,0 @@ -# Find out if host_os is *rtems*; -# -# Result is exit status, i.e., this macro can e.g., be used -# in a 'if MACRO ; then list; fi' statement. -# -# TILLAC_RTEMS_HOSTOS_IS_RTEMS -AC_DEFUN([TILLAC_RTEMS_HOSTOS_IS_RTEMS], - [AC_REQUIRE([AC_CANONICAL_HOST]) - case "${host_os}" in *rtems* ) : ;; *) false;; esac]dnl -) - - -# Find out if either '--with-rtems-top' was given or -# host_os is *rtems* (or both). -# -# Result is exit status, i.e., this macro can e.g., be used -# in a 'if MACRO ; then list; fi' statement. -# -# TILLAC_RTEMS_OS_IS_RTEMS -AC_DEFUN([TILLAC_RTEMS_OS_IS_RTEMS], - [AC_REQUIRE([AC_CANONICAL_HOST]) - test "${with_rtems_top+set}" = "set" || TILLAC_RTEMS_HOSTOS_IS_RTEMS]dnl -) diff --git a/m4/rtems-makevars.m4 b/m4/rtems-makevars.m4 deleted file mode 100644 index 2850dc6..0000000 --- a/m4/rtems-makevars.m4 +++ /dev/null @@ -1,142 +0,0 @@ -# This macro saves the BSP-specific variables (such as CC, CXX, CPP, ...) -# into intermediate variables from where they can be restored -# with TILLAC_RTEMS_RESET_MAKEVARS -# -# Note: this macro should not be used directly. It is expanded from -# TILLAC_RTEMS_SETUP -# -# TILLAC_RTEMS_SAVE_MAKEVARS -AC_DEFUN([TILLAC_RTEMS_SAVE_MAKEVARS], - [ - tillac_rtems_cc_orig="$CC" - tillac_rtems_cxx_orig="$CXX" - tillac_rtems_ccas_orig="$CCAS" - tillac_rtems_cpp_orig="$CPP" - tillac_rtems_ldflags_orig="$LDFLAGS" - tillac_rtems_bsp_family_orig="" - tillac_rtems_bsp_insttop_orig=""]dnl -) - -# This macro restores the BSP-specific variables (such as CC, CXX, CPP, ...) -# from intermediate variables that were set by TILLAC_RTEMS_SAVE_MAKEVARS -# -# Note: this macro should not be used directly. It is expanded from -# TILLAC_RTEMS_SETUP -# -# TILLAC_RTEMS_RESET_MAKEVARS -AC_DEFUN([TILLAC_RTEMS_RESET_MAKEVARS], - [ - RTEMS_TILL_MAKEVARS_SET=NO - CC="$tillac_rtems_cc_orig" - CXX="$tillac_rtems_cxx_orig" - CCAS="$tillac_rtems_ccas_orig" - CPP="$tillac_rtems_cpp_orig" - LDFLAGS="$tillac_rtems_ldflags_orig" - RTEMS_BSP_FAMILY="$tillac_rtems_family_orig" - RTEMS_BSP_INSTTOP="$tillac_rtems_insttop_orig"]dnl -) - -# Determine critical, BSP-specific build parameters from the -# RTEMS makefiles. These parameters are cflags, gccspecs, ... -# -# Note: this macro should not be used directly. It is expanded from -# TILLAC_RTEMS_SETUP -# -# TILLAC_RTEMS_MAKEVARS(HOST_SYSTEM, BSP) -AC_DEFUN([TILLAC_RTEMS_MAKEVARS], - [ - AC_MSG_CHECKING([Determining RTEMS Makefile parameters for BSP:]) -dnl DOWNEXT is set in leaf.cfg and we don't include that - if _tillac_rtems_result=`make -s -f - rtems_makevars < and -# -# The macro also, adds the paths listed in the --with-extra-incdirs and -# --with-extra-libdirs options to the cppflags and ldflags, respectively -# (adding -I, -L). If 'LIBSUBDIR' is given then it is appended to -# any of the directories listed in --with-extra-libdirs (if the LIBSUBDIR -# exists) there. -# -# Furthermore, if it is determined that RTEMS was configured for -# a multilibbed cpukit then -# i) -I${with_rtems_top}/${host_cpu}-${host_os}/include -# is added to the cppflags (if the directory exists) -# ii) -B${with_rtems_top}//lib is added to the -# gcc specs so that multilibs are found (workaround for -# a bug in the rtems 4.9.0 makefiles) -# -# Note: this macro should not be used directly. It is expanded from -# TILLAC_RTEMS_SETUP -# -# TILLAC_RTEMS_EXPORT_MAKEVARS([HOST_SYSTEM],[LIBSUBDIR]) -AC_DEFUN([TILLAC_RTEMS_EXPORT_MAKEVARS], - [ - AC_MSG_CHECKING([Checking if RTEMS CC & friends MAKEVARS are already set]) - if test ! "${RTEMS_TILL_MAKEVARS_SET}" = "YES"; then - AC_MSG_RESULT([No (probably a multilibbed build)]) - export RTEMS_TILL_MAKEVARS_SET=YES - # if this is a multilibbed cpukit we need to include - if test -d $with_rtems_top/${host_cpu}-${host_os}/include ; then - tillac_rtems_cppflags="$tillac_rtems_cppflags -I$with_rtems_top/${host_cpu}-${host_os}/include" - # and since the RTEMS (4.9) makefiles seem to be broken - # for multilibbed cpukits (fail to add -B ) we - # do it here - tillac_rtems_gccspecs="$tillac_rtems_gccspecs -B $with_rtems_top/$1/lib" - fi - if test "${with_extra_incdirs+set}" = "set" ; then - for tillac_extra_incs_val in ${with_extra_incdirs} ; do - tillac_rtems_cppflags="$tillac_rtems_cppflags -I$tillac_extra_incs_val" - done - fi - if test "${with_extra_libdirs+set}" = "set" ; then - for tillac_extra_libs_val in ${with_extra_libdirs} ; do - if test -d $tillac_extra_libs_val/$2 ; then - tillac_rtems_ldflags="$tillac_rtems_ldflags -L$tillac_extra_libs_val/$2" - else - tillac_rtems_ldflags="$tillac_rtems_ldflags -L$tillac_extra_libs_val" - fi - done - fi -#export forged CC & friends so that they are used by sub-configures, too - export CC="$CC $tillac_rtems_gccspecs $tillac_rtems_cpu_cflags $tillac_rtems_cppflags" - export CXX="$CXX $tillac_rtems_gccspecs $tillac_rtems_cpu_cflags $tillac_rtems_cppflags" - export CCAS="$CCAS $tillac_rtems_gccspecs $tillac_rtems_cpu_asflags -DASM" - export CPP="$CPP $tillac_rtems_gccspecs $tillac_rtems_cppflags" -# export CFLAGS="$CFLAGS $tillac_rtems_cpu_cflags" -# export CXXFLAGS="$CXXFLAGS $tillac_rtems_cpu_cflags" -# export CCASFLAGS="$CCASFLAGS $tillac_rtems_cpu_asflags -DASM" -# export CPPFLAGS="$CPPFLAGS $tillac_rtems_cppflags" - export LDFLAGS="$LDFLAGS $tillac_rtems_ldflags" - else - AC_MSG_RESULT([yes]) - fi]dnl -) diff --git a/m4/rtems-multilib.m4 b/m4/rtems-multilib.m4 deleted file mode 100644 index 25be9d4..0000000 --- a/m4/rtems-multilib.m4 +++ /dev/null @@ -1,28 +0,0 @@ -# -# Prepare for a multilibbed build -# - check for presence of 'config-ml.in' -# - expand AM_ENABLE_MULTILIB(MAKEFILE, REL-TO-TOP-SRCDIR) -# - expand TILLAM_MULTISUB_INSTALLDIR (workaround so that -# multilibs are installed into proper subdir. -# - make sure 'enable_multilib' is set to 'no' if it was initially -# unset; yet another little workaround... -# -# TILLAC_RTEMS_MULTILIB([MAKEFILE], [REL-TO-TOP-SRCDIR]) -AC_DEFUN([TILLAC_RTEMS_MULTILIB], - [if test -f ${srcdir}/config-ml.in || test -f $(srcdir)/../config-ml.in ; then - AM_ENABLE_MULTILIB([$1],[$2]) - # install multilibs into MULTISUBDIR - TILLAM_MULTISUB_INSTALLDIR -dnl AC_SUBST(libdir,[${libdir}'$(MULTISUBDIR)']) - # in order to properly build multilibs in sub-libraries it seems we - # must pass the --enable-multilibs arg to sub-configures or multilibs - # are not built there. - # To work around, we simply set the default to 'no' so the user must - # say --enable-multilib to get them. - if test ! "${enable_multilib+set}" = "set" ; then - multilib=no - fi - else - enable_multilib=no - fi]dnl -) diff --git a/m4/rtems-options.m4 b/m4/rtems-options.m4 deleted file mode 100644 index 4e2d484..0000000 --- a/m4/rtems-options.m4 +++ /dev/null @@ -1,41 +0,0 @@ -# Declare --enable-rtemsbsp --with-rtems-top options -# -# TILLAC_RTEMS_OPTIONS -AC_DEFUN([TILLAC_RTEMS_OPTIONS], - [AC_ARG_ENABLE(rtemsbsp, - AC_HELP_STRING([--enable-rtemsbsp="bsp1 bsp2 ..."], - [BSPs to include in build (ignore bsps not found in RTEMS installation)]dnl - ) - ) - AC_ARG_WITH(rtems-top, - AC_HELP_STRING([--with-rtems-top=], - [point to RTEMS installation]dnl - ) - ) - AC_ARG_WITH(extra-incdirs, - AC_HELP_STRING([--with-extra-incdirs=], - [point to directories with additional headers]dnl - ) - ) - AC_ARG_WITH(extra-libdirs, - AC_HELP_STRING([--with-extra-libdirs=], - [point to directories with additional libraries]dnl - ) - ) - AC_ARG_WITH(hostbindir, - AC_HELP_STRING([--with-hostbindir=], - [default is /host//bin], - ), - [AC_SUBST([hostbindir],[$with_hostbindir])], - [AC_SUBST([hostbindir],['$(prefix)/host/$(build_alias)/bin'])] - ) - AC_ARG_ENABLE([std-rtems-installdirs], - AC_HELP_STRING([--enable-std-rtems-installdirs], - [install directly into - the RTEMS installation directories; by default a location *outside* - of the standard location is used. If you don't use this option you - can also fine-tune the installation using the usual --prefix, - --exec-prefix, --libdir, --includedir etc. options]dnl - ) - )]dnl -) diff --git a/m4/rtems-setup-recurse.m4 b/m4/rtems-setup-recurse.m4 deleted file mode 100644 index e3f39ec..0000000 --- a/m4/rtems-setup-recurse.m4 +++ /dev/null @@ -1,224 +0,0 @@ -# This macro assembles a list of RTEMS CPUs and if the list -# contains more than one member then it creates a build subdirectory -# for each CPU architecture, 'chdirs' into the subdirectory and recursively -# configures for the CPU. -# -# Several options affect the behavior of this macro: -# -# --with-rtems-top -# --host -# --enable-rtemsbsp -# -# 1) if --with-rtems-top is NOT given (NOT RTEMS) OR if -# --host=-rtems was given (RTEMS CPU defined by user) -# THEN the macro does nothing. -# -# 2) ELSE (--with-rtems-top given but --host is NOT *rtems* -# i) assemble a list of all '-rtems*' subdirectories -# under ${with_rtems_top} -# -# ii) if --enable-rtemsbsp was given then remove CPU -# architectures not being required by any of the listed -# BSPS. -# -# iii) for each remaining CPU architecture create a subdirectory, -# chdir there and recursively call 'configure' again with -# the original arguments but --host=-rtems appended. -# -# Note: this macro should not be used directly. It is expanded from -# TILLAC_RTEMS_SETUP -# -# TILLAC_RTEMS_CONFIG_CPUS_RECURSIVE -AC_DEFUN([TILLAC_RTEMS_CONFIG_CPUS_RECURSIVE], - [if test ! "${with_rtems_top+set}" = "set" || TILLAC_RTEMS_HOSTOS_IS_RTEMS ; then : ; else - # with_rtems_top is set but host_os is not *rtems*, i.e., - # we have to figure out a list of CPUs/arches that are installed. - AC_MSG_CHECKING([for all installed CPUs/architectures]) - _tillac_rtems_cpulist="`(cd $with_rtems_top; ls -d *-rtems* | tr '\n\r' ' ')`" - AC_MSG_RESULT([Found: $_tillac_rtems_cpulist]) - # if 'enable-rtemsbsp' was given then filter away - # architectures that match none of the BSPs - if test "${enable_rtemsbsp+set}" = "set" ; then - # convert space separated list into ORed (|) pattern - _tillac_rtems_bspfilt=`echo "$enable_rtemsbsp" | sed -e 's/[[ \t]]\+/|/g'` - AC_MSG_NOTICE([Filtering CPU/architecture list against bsps: $_tillac_rtems_bspfilt]) - _tillac_rtems_cpuall="$_tillac_rtems_cpulist" - _tillac_rtems_cpulist="" - AC_MSG_CHECKING([CPU/architectures matching requested BSPs]) - for _tillac_rtems_cpucand in $_tillac_rtems_cpuall ; do - # look for directories which have a 'Makefile.inc' - for _tillac_rtems_bspcand in `(cd $with_rtems_top/$_tillac_rtems_cpucand ; ls */Makefile.inc | tr '\n\r' ' ')` ; do - AC_MSG_NOTICE([testing $_tillac_rtems_bspcand]) - # reduce to bsp name - _tillac_rtems_bspcand=`dirname $_tillac_rtems_bspcand` - if eval "case `echo $_tillac_rtems_bspcand` in $_tillac_rtems_bspfilt) : ;; *) false ;; esac" ; then - # only add candidate to list of cpus if not already there - if test -z "$_tillac_rtems_cpulist" ; then - _tillac_rtems_cpulist="$_tillac_rtems_cpucand" - else - _tillac_rtems_cpufilt=`echo "$_tillac_rtems_cpulist" | sed -e 's/[[ \t]]\+/|/g'` - if eval "case `echo $_tillac_rtems_cpucand` in $_tillac_rtems_cpufilt) false ;; *) : ;; esac" ; then - _tillac_rtems_cpulist="$_tillac_rtems_cpulist $_tillac_rtems_cpucand" - fi - fi - fi - done - done - AC_MSG_RESULT([found: $_tillac_rtems_cpulist]) - fi - if test "$_tillac_rtems_cpulist"xx = "xx" ; then - AC_MSG_ERROR([No RTEMS architectures found]) - fi - # Create directory and configure - for _tillac_rtems_cpucand in $_tillac_rtems_cpulist ; do - if test -d $_tillac_rtems_cpucand || mkdir $_tillac_rtems_cpucand ; then : ; else - AC_MSG_ERROR([Unable to create subdirectory $_tillac_rtems_cpucand]) - fi - TILLAC_RTEMS_TRIM_CONFIG_DIR(_tillac_rtems_config_dir) - # SUB-CONFIGURE - AC_MSG_NOTICE([Running $_tillac_rtems_config_dir/[$]0 "$ac_configure_args --host=$_tillac_rtems_cpucand" in "'$_tillac_rtems_cpucand'" subdir]) - eval \( cd $_tillac_rtems_cpucand \; $SHELL $_tillac_rtems_config_dir/"[$]0" $ac_configure_args --host=$_tillac_rtems_cpucand \) - done - AC_MSG_NOTICE([Creating cpu/arch level makefile]) - AC_SUBST(the_subdirs,[$_tillac_rtems_cpulist]) - AC_SUBST(the_distsub,['$(firstword '"$_tillac_rtems_cpulist"')']) - _tillac_rtems_recursing=yes - false - fi]dnl -) - -# This macro -# -# - removes --enable-rtemsbsp options from the current commandline -# - for each BSP listed in '${enable_rtemsbsp}' -# i) creates a BSP subdirectory in the build tree -# ii) chdirs into the subdirectory -# iii) figures out a few BSP-specific build settings -# (cflags, gcc specs, ...) -# iv) configures for the BSP passing the properties determined -# under iii) along to 'configure' on the commandline. -# Also, --enable-rtemsbsp= is appended to the -# configure commandline. -# -# Note: this macro should not be used directly. It is expanded from -# TILLAC_RTEMS_SETUP -# -# TILLAC_RTEMS_CONFIG_BSPS_RECURSIVE -AC_DEFUN([TILLAC_RTEMS_CONFIG_BSPS_RECURSIVE], - [if test ! "${RTEMS_TILL_MAKEVARS_SET}" = "YES"; then - # strip all --enable-rtemsbsp options from original - # commandline - AC_MSG_NOTICE([Stripping --enable-rtemsbsp option(s) from commandline]) - _tillac_rtems_config_args="" - eval for _tillac_rtems_arg in $ac_configure_args \; do case \$_tillac_rtems_arg in --enable-rtemsbsp\* \) \;\; \*\) _tillac_rtems_config_args=\"\$_tillac_rtems_config_args \'\$_tillac_rtems_arg\'\" \;\; esac done - AC_MSG_NOTICE([Commandline now: $_tillac_rtems_config_args]) - - AC_MSG_NOTICE([Creating BSP subdirectories and sub-configuring]) - TILLAC_RTEMS_SAVE_MAKEVARS - for _tillac_rtems_bsp in $enable_rtemsbsp ; do - if test ! -d $_tillac_rtems_bsp ; then - AC_MSG_CHECKING([Creating $_tillac_rtems_bsp]) - if mkdir $_tillac_rtems_bsp ; then - AC_MSG_RESULT([OK]) - else - AC_MSG_ERROR([Failed]) - fi - fi - TILLAC_RTEMS_TRIM_CONFIG_DIR(_tillac_rtems_config_dir) - TILLAC_RTEMS_RESET_MAKEVARS - TILLAC_RTEMS_MAKEVARS(${host_cpu}-${host_os},$_tillac_rtems_bsp) - tillac_rtems_cppflags="$tillac_rtems_cppflags -I$with_rtems_top/${host_cpu}-${host_os}/$_tillac_rtems_bsp/lib/include" - TILLAC_RTEMS_EXPORT_MAKEVARS(${host_cpu}-${host_os},$_tillac_rtems_bsp) - AC_MSG_NOTICE([Running $_tillac_rtems_config_dir/[$]0 $_tillac_rtems_config_args --enable-rtemsbsp=$_tillac_rtems_bsp in $_tillac_rtems_bsp subdir]) - eval \( cd $_tillac_rtems_bsp \; $SHELL $_tillac_rtems_config_dir/"[$]0" $_tillac_rtems_config_args --enable-rtemsbsp=$_tillac_rtems_bsp \) - done - TILLAC_RTEMS_RESET_MAKEVARS - AC_MSG_NOTICE([Creating toplevel makefile]) - AC_SUBST(the_subdirs,[$enable_rtemsbsp]) - AC_SUBST(the_distsub,['$(firstword '"$enable_rtemsbsp"')']) - fi]dnl -) - -# Grand Master Macro for RTEMS configuration. -# -# This sets up most things for a RTEMS configuration -# for multiple CPU-arches and BSPs. -# -# A package may add the optional (literal) argument -# 'domultilib'. In this case, multilib support is enabled -# and the user may configure with '--enable-multilib'. -# Note that the package must properly support multilibs! -# -# If the host system is not RTEMS (no with-rtems-top given) -# then this macro does *nothing*. -# -# TILLAC_RTEMS_SETUP([domultilib]) -AC_DEFUN([TILLAC_RTEMS_SETUP], - [AC_REQUIRE([TILLAC_RTEMS_OPTIONS])dnl - AM_CONDITIONAL(OS_IS_RTEMS,[TILLAC_RTEMS_OS_IS_RTEMS]) - if TILLAC_RTEMS_CONFIG_CPUS_RECURSIVE ; then - m4_if($1,domultilib, - [TILLAC_RTEMS_MULTILIB([Makefile],[.])], - [AC_REQUIRE([TILLAC_RTEMS_OPTIONS])dnl - if test "${enable_multilib}" = "yes" ; then - AC_MSG_ERROR(["multilibs not supported, sorry"]) - fi]dnl - ) - if TILLAC_RTEMS_OS_IS_RTEMS ; then - TILLAC_RTEMS_CHECK_TOP - AC_ARG_VAR([RTEMS_TILL_MAKEVARS_SET],[Internal use; do NOT set in environment nor on commandline]) - AC_ARG_VAR([DOWNEXT],[extension of downloadable binary (if applicable)]) - AC_ARG_VAR([APPEXEEXT], [extension of linked binary]) - AC_ARG_VAR([RTEMS_BSP_FAMILY],[Internal use; do NOT set in environment nor on commandline]) - AC_ARG_VAR([RTEMS_BSP_INSTTOP],[Internal use; do NOT set in environment nor on commandline]) - if test "$1" = "domultilib" && test "$enable_multilib" = "yes" ; then - if test "${enable_rtemsbsp+set}" = "set" ; then - AC_MSG_ERROR([Cannot --enable-rtemsbsp AND --enable-multilib; build either multilibs or for particular BSP(s)]) - fi - TILLAC_RTEMS_EXPORT_MAKEVARS(${host_cpu}-${host_os},) - else - TILLAC_RTEMS_CHECK_BSPS - fi - if test ! "${RTEMS_TILL_MAKEVARS_SET}" = "YES"; then - TILLAC_RTEMS_CONFIG_BSPS_RECURSIVE(makefile) - _tillac_rtems_recursing=yes - else - TILLAC_RTEMS_FIXUP_PREFIXES -dnl set those in the configure script so that 'configure' uses these settings when trying to compile stuff -dnl AC_SUBST(rtems_gccspecs, [$tillac_rtems_gccspecs]) -dnl AC_SUBST(rtems_cpu_cflags, [$tillac_rtems_cpu_cflags]) -dnl AC_SUBST(rtems_cpu_asflags,["$tillac_rtems_cpu_asflags -DASM"]) -dnl AC_SUBST(rtems_cppflags, [$tillac_rtems_cppflags]) - AC_SUBST(rtems_bsp, [$enable_rtemsbsp]) - AC_MSG_NOTICE([Setting DOWNEXT to .ralf]) - DOWNEXT=.ralf - AC_MSG_NOTICE([Setting APPEXEEXT to .exe]) - APPEXEEXT=.exe - TILLAC_RTEMS_VERSTEST - fi - fi - fi - if test "${_tillac_rtems_recursing}" = "yes" ; then - AC_CONFIG_FILES([makefile:makefile.top.in]) - AC_OUTPUT - exit 0 - false - fi]dnl -) - -dnl m4_syscmd is executed when aclocal is run -m4_syscmd([cat - > makefile.top.am <<'EOF_' -AUTOMAKE_OPTIONS=foreign -SUBDIRS=@the_subdirs@ -# When making a distribution we only want to -# recurse into (any) one single BSP subdir. -DIST_SUBDIRS=@the_distsub@ - -# The dist-hook then removes this extra -# directory level again. -dist-hook: - if test "$(PACKAGE_VERSION)" = "untagged" ; then echo "Need tagged version to cut distribution"; exit 1; fi - cp -frl $(distdir)/$(DIST_SUBDIRS)/* $(distdir) - rm -fr $(distdir)/$(DIST_SUBDIRS) -EOF_ -]) diff --git a/m4/rtems-tools.m4 b/m4/rtems-tools.m4 deleted file mode 100644 index aa4a411..0000000 --- a/m4/rtems-tools.m4 +++ /dev/null @@ -1,15 +0,0 @@ -# Check for critical programs we need for building -AC_DEFUN([TILLAC_RTEMS_CHECK_TOOLS], - [AC_PROG_CC - AM_PROG_AS - AC_PROG_CXX - AC_SUBST([GCC]) - AC_PROG_CPP - AC_CHECK_PROGS([HOSTCC], gcc cc) - RTEMS_CHECK_TOOL([AR],ar) - RTEMS_CHECK_TOOL([LD],ld) - RTEMS_CHECK_TOOL([OBJCOPY],objcopy) - RTEMS_CHECK_TOOL([RANLIB],ranlib) - AC_PROG_INSTALL - AC_CHECK_PROG([INSTALL_IF_CHANGE],[install-if-change],[install-if-change],[${INSTALL}])]dnl -) diff --git a/m4/rtems-trim-builddir.m4 b/m4/rtems-trim-builddir.m4 deleted file mode 100644 index ffd94d6..0000000 --- a/m4/rtems-trim-builddir.m4 +++ /dev/null @@ -1,26 +0,0 @@ -# Takes one argument -# -# TILLAC_RTEMS_TRIM_CONFIG_DIR(dirvar) -# -# If 'srcdir' is a absolute path (a string -# starting with '/' then set 'dirvar' to the -# empty string; otherwise (srcdir is a relative path) -# set 'dirvar' to '../'. -# -# This macro can be used to find 'srcdir' should -# configure decide to step into a subdirectory inside -# a build tree. -# -AC_DEFUN([TILLAC_RTEMS_TRIM_CONFIG_DIR], - [AC_MSG_NOTICE([Trimming source directory]) - # leave absolute path alone, relative path needs - # to step one level up - case $srcdir in - /* ) - $1= - ;; - *) - $1=../ - ;; - esac]dnl -) diff --git a/m4/rtems-verscheck.m4 b/m4/rtems-verscheck.m4 deleted file mode 100644 index c678f9c..0000000 --- a/m4/rtems-verscheck.m4 +++ /dev/null @@ -1,36 +0,0 @@ -# Emit two macros -# -# 'RTEMS_VERSION_LATER_THAN(major,minor,revision)' -# -# and -# -# 'RTEMS_VERSION_ATLEAST(major,minor,revision)' -# -# in config.h so applications can test for a particular -# RTEMS version and conditionally deal with API changes -# and other stuff. -# Note that sometimes (mostly during x.y.99 pre-release -# phases) such changes happen w/o an associated change in -# revision number ;-(. -# -#dnl TILLAC_RTEMS_VERSTEST -AC_DEFUN([TILLAC_RTEMS_VERSTEST], - [AH_VERBATIM([RTEMS_VERSION_TEST], - [ -#ifndef RTEMS_VERSION_LATER_THAN -#define RTEMS_VERSION_LATER_THAN(ma,mi,re) \ - ( __RTEMS_MAJOR__ > (ma) \ - || (__RTEMS_MAJOR__ == (ma) && __RTEMS_MINOR__ > (mi)) \ - || (__RTEMS_MAJOR__ == (ma) && __RTEMS_MINOR__ == (mi) && __RTEMS_REVISION__ > (re)) \ - ) -#endif -#ifndef RTEMS_VERSION_ATLEAST -#define RTEMS_VERSION_ATLEAST(ma,mi,re) \ - ( __RTEMS_MAJOR__ > (ma) \ - || (__RTEMS_MAJOR__ == (ma) && __RTEMS_MINOR__ > (mi)) \ - || (__RTEMS_MAJOR__ == (ma) && __RTEMS_MINOR__ == (mi) && __RTEMS_REVISION__ >= (re)) \ - ) -#endif - ]dnl - )]dnl -) -- cgit v1.2.3