summaryrefslogtreecommitdiffstats
path: root/aclocal.m4
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>1998-02-17 14:12:01 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>1998-02-17 14:12:01 +0000
commite81ef51bf1826fe65cb75449ba2f6f1bc7899233 (patch)
treeaf203d61efc5df2ec52cdb210a909d454a23423c /aclocal.m4
parentaa8a8c726b7ab83024fae1d7d7c01c8eb464d694 (diff)
downloadrtems-e81ef51bf1826fe65cb75449ba2f6f1bc7899233.tar.bz2
Patch from Ralf Corsepius <corsepiu@faw.uni-ulm.de>:
Yep, I have a bunch of bug-fixes and additions pending (Yet another monster patch, ... I can hear you scream :-). 1) configure.in : one AC_CONFIG_HEADER(...) line too much. 2) configure.in: gcc28 support is enabled by default, i.e. if no --enable-gcc28 option is passed on the command line. I am not sure if this is intentional. IMO, AC_ARG_ENABLE for --enable-gcc28 should look like: AC_ARG_ENABLE(gcc28, \ [ --enable-gcc28 enable use of gcc 2.8.x features], \ [case "${enableval}" in yes) RTEMS_USE_GCC272=no ;; no) RTEMS_USE_GCC272=yes ;; *) AC_MSG_ERROR(bad value ${enableval} for gcc-28 option) ;; esac],[RTEMS_USE_GCC272=yes]) 3) At the end of c/src/exec/score/cpu/m68k/m68k.h > #ifdef __cplusplus > } > #endif > > #endif /* !ASM */ in my opinion these two statements should be swapped: > #endif /* !ASM */ > > #ifdef __cplusplus > } > #endif I didn't try to compile for m68k, but does't this give an error? Is it compensated somewhere else - or didn't I look carefully enough? 5) configure.in: --enable-cpp should probably be renamed to --enable-cxx, as gnu-programs use "cxx" to specify C++ specific configure options, while cpp is used for the preprocessor (e.g egcs uses --with-cxx-includedir, autoconf internally uses $CXX), 6) The macro files from aclocal/*.m4 contain the buggy sed-rules formerly contained in aclocal..m4, i.e. the sed/sort-bug fix to aclocal.m4 didn't make it to aclocal/*.m4. I think I should feel guilty for that - Obviously I submitted the contents of an old aclocal-directory last time. - Sorry. 7) For sh-rtems, we currently need to add additional managers to MANAGERS_REQUIRED (from inside of custom/*.cfg). Currently MANAGERS_REQUIRED is defined in make/compilers/*.cfg. This seems to prevent overriding MANAGERS_REQUIRED from custom/*.cfg files - Obviously the files are included in such a way that the settings from compilers/*cfg always override settings from custom/*.cfg files. Furthermore, I think, defining MANAGERS_* inside gcc-<target>.cfg files is not correct - MANAGERS are not gcc-variant-dependent, but depend on targets/bsps and therefore should be defined in a bsp/target dependent file, e.g. in custom/*.cfg or target.cfg.in. I think defining default settings for MANAGERS* in custom/default.cfg could be an appropriate location. But this requires all custom/*.cfg files to include default.cfg, which *-posix.cfg files don't seem to do. Therefore I would like propose to move MANAGERS* to target.cfg.in - they are included by all custom/*.cfg files. Perhaps we/you should use this opportunity to merge parts from custom/default.cfg into target.cfg.in. This ensures to have the setting included once per target makefile and will open the opportunity to have autoconf doing additional work on bsp-configurations. Peanuts sofar, ... but here it comes ... (:-) 8) I am preparing a major enhancement to autoconf support for gnutools/compilers. It is not yet finished, but usable and I'll therefore attach a preliminary version to this mail. Motivation: * Fix problems with --enable-gcc28, if target-cc is not gcc28 compatible * Fix -pipe problems * Fix problems with hard-coded paths in configuration files (esp. posix) * Fix consistency problems with explictly given gnutools and gcc's gnutools Currently included: * detection and checking of host and target compiler (gcc/g++) * checking if target gnutools are in path * checking if <target>-gcc -specs works (autodisabling gcc28 if not) * checking if <target>-gcc -pipe works Todo : * *posix.cfg files are not yet adapted => The hard-coded paths for these systems are still in use. * Check if the host compiler $CC is properly propagated to the Makefiles (I doubt it, but this should not matter) * Check if rtems' generic tools still work properly (It looks like, but who knows) * Integrate CXX support into default.cfg or gcc-target-default.cfg (It looks like C++ support is only used by posix BSPs) * Automatically handle RANLIB/MKLIB for targets * Plenty ... (:-) Open problems: * Untested for non-gcc compatible host and target compilers. This should be no problem if the tools are named follow gnutool's naming convention and are included in $PATH while running configure. * Intentionally using different tools than that gcc has been configured for, e.g. use a different assembler ? This should be still possible if XX_FOR_TARGET is hard-coded into custom/*.cfg. I don't see why anybody should want to do this, but who knows? I have tested this version on linux and solaris hosts, with gcc's directories mounted at weird non-standard mount points, using egcs (linux/sh-rtemscoff), gcc-2.7.2.2 using native tools (solaris), gcc-2.7.2.3 w/ gnutools (solaris/linux). I don't expect it to break anything, but of cause I can't promise it. It will break most/all *-posix.cfg configuration almost for certain, but not more as rtems' current *posix.cfg configurations already do (hard-coded configurations). I am not sure if this is ready to be included into the next snapshot or not. Perhaps you might try this on your systems and if it you don't notice serious bugs you might put it into the snapshot for public testing (I don't like this, but I don't see another possiblity to test generality). I enclose a patch for configure.in and some configuration files which comprizes fixes for all items mentioned except of #3 . Don't forget to run "aclocal -I aclocal; autoconf;" after applying the patch (:-).
Diffstat (limited to 'aclocal.m4')
-rw-r--r--aclocal.m4303
1 files changed, 273 insertions, 30 deletions
diff --git a/aclocal.m4 b/aclocal.m4
index ed512b9097..bd2ae60766 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,11 +1,6 @@
-dnl some macros for rtems host configuration checks
-dnl
-dnl Author: Ralf Corsepius (corsepiu@faw.uni-ulm.de), 97/11/29
-dnl
-dnl Last Modified: 98/01/10
-dnl
-dnl $Id$
-dnl
+dnl aclocal.m4 generated automatically by aclocal 1.2
+
+dnl $Id$
dnl macro to detect mkdir
AC_DEFUN(RTEMS_PATH_MKDIR,
@@ -44,10 +39,279 @@ rm -rf conftestdata
AC_MSG_RESULT($rtems_cv_prog_MKDIR_M)
])
+
+dnl $Id$
+
+dnl canonicalize target name
+dnl NOTE: Most rtems targets do not fullfil autoconf's
+dnl target naming conventions "processor-vendor-os"
+dnl Therefore autoconf's AC_CANONICAL_TARGET will fail for them
+dnl and we have to fix it for rtems ourselves
+
+AC_DEFUN(RTEMS_CANONICAL_TARGET_CPU,
+[AC_MSG_CHECKING(rtems target cpu)
+changequote(<<, >>)dnl
+target_cpu=`echo $target | sed 's%^\([^-]*\)-\(.*\)$%\1%'`
+changequote([, ])dnl
+AC_MSG_RESULT($target_cpu)
+])
+
+dnl
+dnl $Id$
+dnl
+dnl Check for target gcc
+dnl
+dnl Adaptation of autoconf-2.12's AC_PROG_CC to rtems
+dnl
+dnl 98/02/10 Ralf Corsepius (corsepiu@faw.uni-ulm.de)
+dnl
+
+AC_DEFUN(RTEMS_PROG_CC,
+[
+AC_BEFORE([$0], [AC_PROG_CPP])dnl
+AC_BEFORE([$0], [AC_PROG_CC])dnl
+AC_CHECK_PROG(CC, gcc, gcc)
+if test -z "$CC"; then
+ AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
+ test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
+fi
+
+RTEMS_PROG_CC_WORKS
+AC_PROG_CC_GNU
+
+if test $ac_cv_prog_gcc = yes; then
+ GCC=yes
+dnl Check whether -g works, even if CFLAGS is set, in case the package
+dnl plays around with CFLAGS (such as to build both debugging and
+dnl normal versions of a library), tasteless as that idea is.
+ ac_test_CFLAGS="${CFLAGS+set}"
+ ac_save_CFLAGS="$CFLAGS"
+ CFLAGS=
+ AC_PROG_CC_G
+ if test "$ac_test_CFLAGS" = set; then
+ CFLAGS="$ac_save_CFLAGS"
+ elif test $ac_cv_prog_cc_g = yes; then
+ CFLAGS="-g -O2"
+ else
+ CFLAGS="-O2"
+ fi
+else
+ GCC=
+ test "${CFLAGS+set}" = set || CFLAGS="-g"
+fi
+
+CC_FOR_TARGET=$CC
+rtems_cv_prog_gcc=$ac_cv_prog_gcc
+rtems_cv_prog_cc_g=$ac_cv_prog_cc_g
+
+dnl restore initial values
+unset CC
+unset ac_cv_prog_gcc
+unset ac_cv_prog_cc_g
+unset ac_cv_prog_CC
+])
+
+
+dnl Almost identical to AC_PROG_CC_WORKS
+dnl added malloc to program fragment, because rtems has its own malloc
+dnl which is not available while bootstrapping rtems
+
+AC_DEFUN(RTEMS_PROG_CC_WORKS,
+[AC_MSG_CHECKING([whether the target C compiler ($CC $CFLAGS $LDFLAGS) works])
+AC_LANG_SAVE
+AC_LANG_C
+AC_TRY_COMPILER(
+[void *malloc() { return 0; }
+ main(){return(0);}],
+rtems_cv_prog_cc_works, rtems_cv_prog_cc_cross)
+AC_LANG_RESTORE
+AC_MSG_RESULT($rtems_cv_prog_cc_works)
+if test $rtems_cv_prog_cc_works = no; then
+ AC_MSG_ERROR([installation or configuration problem: target C compiler cannot create executables.])
+fi
+AC_MSG_CHECKING([whether the target C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler])
+AC_MSG_RESULT($rtems_cv_prog_cc_cross)
+])
+
+dnl
+dnl $Id$
+dnl
+dnl Check whether the target compiler accepts -specs
+dnl
+dnl 98/02/11 Ralf Corsepius corsepiu@faw.uni-ulm.de
+dnl
+
+AC_DEFUN(RTEMS_GCC_SPECS,
+[AC_REQUIRE([RTEMS_PROG_CC])
+AC_CACHE_CHECK(whether $CC_FOR_TARGET accepts -specs,rtems_cv_gcc_specs,
+[touch confspec
+echo 'void f(){}' >conftest.c
+if test -z "`${CC_FOR_TARGET} -specs confspec -c conftest.c 2>&1`";then
+ rtems_cv_gcc_specs=yes
+else
+ rtems_cv_gcc_specs=no
+fi
+rm -f confspec conftest*
+])])
+
+dnl
+dnl $Id$
+dnl
+dnl Check whether the target compiler accepts -pipe
+dnl
+dnl 98/02/11 Ralf Corsepius corsepiu@faw.uni-ulm.de
+dnl
+
+AC_DEFUN(RTEMS_GCC_PIPE,
+[AC_REQUIRE([RTEMS_PROG_CC])
+AC_CACHE_CHECK(whether $CC_FOR_TARGET accepts --pipe,rtems_cv_gcc_pipe,
+[
+echo 'void f(){}' >conftest.c
+if test -z "`${CC_FOR_TARGET} --pipe -c conftest.c 2>&1`";then
+ rtems_cv_gcc_pipe=yes
+else
+ rtems_cv_gcc_pipe=no
+fi
+rm -f conftest*
+])])
+
+dnl
+dnl $Id$
+dnl
+dnl Check for target g++
+dnl
+dnl Adaptation of autoconf-2.12's AC_PROG_CXX to rtems
+dnl
+dnl 98/02/10 Ralf Corsepius (corsepiu@faw.uni-ulm.de)
+dnl
+
+AC_DEFUN(RTEMS_PROG_CXX,
+[
+AC_BEFORE([$0], [AC_PROG_CXXCPP])dnl
+AC_BEFORE([$0], [AC_PROG_CXX])dnl
+AC_CHECK_PROGS(CXX, $CCC c++ g++ gcc CC cxx cc++, gcc)
+
+RTEMS_PROG_CXX_WORKS
+AC_PROG_CXX_GNU
+
+if test $ac_cv_prog_gxx = yes; then
+ GXX=yes
+dnl Check whether -g works, even if CXXFLAGS is set, in case the package
+dnl plays around with CXXFLAGS (such as to build both debugging and
+dnl normal versions of a library), tasteless as that idea is.
+ ac_test_CXXFLAGS="${CXXFLAGS+set}"
+ ac_save_CXXFLAGS="$CXXFLAGS"
+ CXXFLAGS=
+ AC_PROG_CXX_G
+ if test "$ac_test_CXXFLAGS" = set; then
+ CXXFLAGS="$ac_save_CXXFLAGS"
+ elif test $ac_cv_prog_cxx_g = yes; then
+ CXXFLAGS="-g -O2"
+ else
+ CXXFLAGS="-O2"
+ fi
+else
+ GXX=
+ test "${CXXFLAGS+set}" = set || CXXFLAGS="-g"
+fi
+CXX_FOR_TARGET=$CXX
+
+dnl restore initial values
+unset CXX
+unset ac_cv_prog_gxx
+])
+
+
+dnl Almost identical to AC_PROG_CXX_WORKS
+dnl Additional handling of malloc
+dnl NOTE: using newlib with a native compiler is cross-compiling, indeed.
+AC_DEFUN(RTEMS_PROG_CXX_WORKS,
+[AC_MSG_CHECKING([whether the target C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works])
+AC_LANG_SAVE
+AC_LANG_CPLUSPLUS
+
+dnl this fails if rtems uses newlib, because rtems has its own malloc which
+dnl is not available at bootstrap
+AC_TRY_COMPILER(
+ [main(){return(0);}],
+ rtems_cv_prog_cxx_works, rtems_cv_prog_cxx_cross)
+if test "$rtems_cv_prog_cxx_works" = "no"; then
+ dnl now retry with our own version of malloc
+ AC_TRY_COMPILER(
+ [extern "C" void *malloc();
+ void *malloc() { return (0); }
+ main(){return(0);}],
+ rtems_cv_prog_cxx_works, rtems_cv_prog_cxx_cross)
+fi
+AC_LANG_RESTORE
+AC_MSG_RESULT($rtems_cv_prog_cxx_works)
+if test $rtems_cv_prog_cxx_works = no; then
+ AC_MSG_ERROR([installation or configuration problem: target C++ compiler cannot create executables.])
+fi
+AC_MSG_CHECKING([whether the target C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler])
+AC_MSG_RESULT($rtems_cv_prog_cxx_cross)
+])
+
+dnl $Id$
+dnl
+dnl Set target tools
+dnl
+dnl 98/02/12 Ralf Corsepius (corsepiu@faw.uni-ulm.de)
+dnl
+
+AC_DEFUN(RTEMS_CANONICALIZE_TOOLS,
+[AC_REQUIRE([RTEMS_PROG_CC])dnl
+if test "$rtems_cv_prog_gcc" = "yes" ; then
+ dnl We are using gcc, now ask it about its tools
+ dnl Necessary if gcc was configured to use the target's native tools
+ dnl or uses prefixes for gnutools (e.g. gas instead of as)
+ AR_FOR_TARGET=`$CC_FOR_TARGET --print-prog-name=ar`
+ AS_FOR_TARGET=`$CC_FOR_TARGET --print-prog-name=as`
+ LD_FOR_TARGET=`$CC_FOR_TARGET --print-prog-name=ld`
+ NM_FOR_TARGET=`$CC_FOR_TARGET --print-prog-name=nm`
+ RANLIB_FOR_TARGET=`$CC_FOR_TARGET --print-prog-name=ranlib`
+fi
+
+dnl check whether the tools exist
+dnl FIXME: What shall be done if they don't exist?
+
+dnl NOTE: CC_FOR_TARGET should always be valid at this point,
+dnl cf. RTEMS_PROG_CC
+AC_PATH_PROG(CC_FOR_TARGET,"$program_prefix"gcc,no)
+
+dnl FIXME: This may fail if the compiler has not been recognized as gcc
+dnl and uses tools with different names
+AC_PATH_PROG(AR_FOR_TARGET,"$program_prefix"ar,no)
+AC_PATH_PROG(AS_FOR_TARGET,"$program_prefix"as,no)
+AC_PATH_PROG(NM_FOR_TARGET,"$program_prefix"nm,no)
+AC_PATH_PROG(LD_FOR_TARGET,"$program_prefix"ld,no)
+
+dnl NOTE: This is doubtful, but should not disturb all current rtems'
+dnl targets (remark: solaris fakes ranlib!!)
+AC_PATH_PROG(RANLIB_FOR_TARGET,"$program_prefix"ranlib,no)
+
+dnl NOTE: These may not be available, if not using gnutools
+AC_PATH_PROG(OBJCOPY_FOR_TARGET,"$program_prefix"objcopy,no)
+AC_PATH_PROG(SIZE_FOR_TARGET,"$program_prefix"size,no)
+])
+
+dnl $Id$
+
+dnl RTEMS_CHECK_MAKEFILE(path)
+dnl Search for Makefile.in's within the directory starting
+dnl at path and append an entry for Makefile to global variable
+dnl "makefiles" (from configure.in) for each Makefile.in found
+dnl
+AC_DEFUN(RTEMS_CHECK_MAKEFILE,
+[RTEMS_CHECK_FILES_IN($1,Makefile,makefiles)
+])
+
+dnl $Id$
+
dnl RTEMS_CHECK_FILES_IN(path,file,var)
dnl path .. path relative to srcdir, where to start searching for files
dnl file .. name of the files to search for
-dnl var .. shell variable to append found files
+dnl var .. shell variable to append files found
AC_DEFUN(RTEMS_CHECK_FILES_IN,
[
AC_MSG_CHECKING(for $2.in in $1)
@@ -63,25 +327,4 @@ else
fi
])
-dnl RTEMS_CHECK_MAKEFILE(path)
-dnl Search for Makefile.in's within the directory starting
-dnl at path and append an entry for Makefile to global variable
-dnl "makefiles" (from configure.in) for each Makefile.in found
-dnl
-AC_DEFUN(RTEMS_CHECK_MAKEFILE,
-[RTEMS_CHECK_FILES_IN($1,Makefile,makefiles)
-])
-
-dnl canonicalize target name
-dnl NOTE: Most rtems targets do not fullfil autoconf's
-dnl target naming conventions "processor-vendor-os"
-dnl Therefore autoconf's AC_CANONICAL_TARGET will fail for them
-dnl and we have to fix it for rtems ourselves
-AC_DEFUN(RTEMS_CANONICAL_TARGET_CPU,
-[AC_MSG_CHECKING(rtems target cpu)
-changequote(<<, >>)dnl
-target_cpu=`echo $target | sed 's%^\([^-]*\)-\(.*\)$%\1%'`
-changequote([, ])dnl
-AC_MSG_RESULT($target_cpu)
-])