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/rtems-makevars.m4 | 142 --------------------------------------------------- 1 file changed, 142 deletions(-) delete mode 100644 m4/rtems-makevars.m4 (limited to 'm4/rtems-makevars.m4') 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 -) -- cgit v1.2.3