summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>1998-04-14 22:13:05 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>1998-04-14 22:13:05 +0000
commit2758c9f20bbd7360ed1e63fb0505abea46131ee4 (patch)
treefc0323617f78687f2abf9ff44413e63b1f8684c1
parent1504f71edff36c933940acd77accb52515ec0be3 (diff)
downloadrtems-2758c9f20bbd7360ed1e63fb0505abea46131ee4.tar.bz2
Ralf Corsepius suggested a way to get rid of UNIX compiler files and use gcc-target-default.cfg
-rw-r--r--configure152
-rw-r--r--configure.in10
-rw-r--r--make/custom/HPUX9-posix.cfg96
-rw-r--r--make/custom/Linux-posix.cfg117
-rw-r--r--make/custom/Solaris-posix.cfg83
5 files changed, 317 insertions, 141 deletions
diff --git a/configure b/configure
index 5577046146..839786f963 100644
--- a/configure
+++ b/configure
@@ -1287,8 +1287,11 @@ case "${target}" in
;;
i[3456]86-pc-linux*) # unix "simulator" port
target_cpu=unix
- RTEMS_HAS_POSIX_API=no
RTEMS_HOST=Linux
+ # override these settings
+ RTEMS_HAS_POSIX_API=no
+ RTEMS_USE_GCC272=yes
+ RTEMS_LIBC_DIR=/usr
;;
no_cpu-*rtems*)
target_cpu=no_cpu
@@ -1296,12 +1299,15 @@ case "${target}" in
;;
sparc-sun-solaris*) # unix "simulator" port
target_cpu=unix
- RTEMS_HAS_POSIX_API=no
RTEMS_HOST=Solaris
+ # override these settings
+ RTEMS_HAS_POSIX_API=no
+ RTEMS_USE_GCC272=yes
+ RTEMS_LIBC_DIR=/usr
;;
*)
echo $ac_n "checking rtems target cpu""... $ac_c" 1>&6
-echo "configure:1305: checking rtems target cpu" >&5
+echo "configure:1311: checking rtems target cpu" >&5
target_cpu=`echo $target | sed 's%^\([^-]*\)-\(.*\)$%\1%'`
echo "$ac_t""$target_cpu" 1>&6
@@ -1320,7 +1326,7 @@ fi
# Is this a supported CPU?
echo $ac_n "checking if cpu $target_cpu is supported""... $ac_c" 1>&6
-echo "configure:1324: checking if cpu $target_cpu is supported" >&5
+echo "configure:1330: checking if cpu $target_cpu is supported" >&5
if test -d "$srcdir/c/src/exec/score/cpu/$target_cpu"; then
echo "$ac_t""yes" 1>&6
makefiles="$makefiles c/src/exec/score/cpu/$target_cpu/Makefile"
@@ -1342,7 +1348,7 @@ CC="$program_prefix"gcc
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1346: checking for $ac_word" >&5
+echo "configure:1352: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1371,7 +1377,7 @@ if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1375: checking for $ac_word" >&5
+echo "configure:1381: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1419,7 +1425,7 @@ fi
fi
echo $ac_n "checking whether the target C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1423: checking whether the target C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1429: checking whether the target C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1429,11 +1435,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS
cross_compiling=$ac_cv_prog_cc_cross
cat > conftest.$ac_ext <<EOF
-#line 1433 "configure"
+#line 1439 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:1437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rtems_cv_prog_cc_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
@@ -1453,11 +1459,11 @@ if test $rtems_cv_prog_cc_works = no; then
{ echo "configure: error: installation or configuration problem: target C compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the target C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1457: checking whether the target C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1463: checking whether the target C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$rtems_cv_prog_cc_cross" 1>&6
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1461: checking whether we are using GNU C" >&5
+echo "configure:1467: checking whether we are using GNU C" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1466,7 +1472,7 @@ else
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1470: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1476: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
@@ -1481,7 +1487,7 @@ if test $ac_cv_prog_gcc = yes; then
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1485: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1491: checking whether ${CC-cc} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1521,7 +1527,7 @@ unset ac_cv_prog_CC
if test "$RTEMS_USE_GCC272" != "yes" ; then
echo $ac_n "checking whether $CC_FOR_TARGET accepts -specs""... $ac_c" 1>&6
-echo "configure:1525: checking whether $CC_FOR_TARGET accepts -specs" >&5
+echo "configure:1531: checking whether $CC_FOR_TARGET accepts -specs" >&5
if eval "test \"`echo '$''{'rtems_cv_gcc_specs'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1546,7 +1552,7 @@ fi
echo $ac_n "checking whether $CC_FOR_TARGET accepts --pipe""... $ac_c" 1>&6
-echo "configure:1550: checking whether $CC_FOR_TARGET accepts --pipe" >&5
+echo "configure:1556: checking whether $CC_FOR_TARGET accepts --pipe" >&5
if eval "test \"`echo '$''{'rtems_cv_gcc_pipe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1579,7 +1585,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1583: checking for $ac_word" >&5
+echo "configure:1589: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1610,7 +1616,7 @@ test -n "$CXX" || CXX="gcc"
echo $ac_n "checking whether the target C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1614: checking whether the target C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:1620: checking whether the target C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
ac_ext=C
# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1621,11 +1627,11 @@ cross_compiling=$ac_cv_prog_cxx_cross
cat > conftest.$ac_ext <<EOF
-#line 1625 "configure"
+#line 1631 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:1629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rtems_cv_prog_cxx_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
@@ -1641,11 +1647,11 @@ fi
rm -fr conftest*
if test "$rtems_cv_prog_cxx_works" = "no"; then
cat > conftest.$ac_ext <<EOF
-#line 1645 "configure"
+#line 1651 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:1649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rtems_cv_prog_cxx_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
@@ -1672,11 +1678,11 @@ if test $rtems_cv_prog_cxx_works = no; then
{ echo "configure: error: installation or configuration problem: target C++ compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the target C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1676: checking whether the target C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1682: checking whether the target C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$rtems_cv_prog_cxx_cross" 1>&6
echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-echo "configure:1680: checking whether we are using GNU C++" >&5
+echo "configure:1686: checking whether we are using GNU C++" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1685,7 +1691,7 @@ else
yes;
#endif
EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1689: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1695: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gxx=yes
else
ac_cv_prog_gxx=no
@@ -1700,7 +1706,7 @@ if test $ac_cv_prog_gxx = yes; then
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS=
echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:1704: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:1710: checking whether ${CXX-g++} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1734,7 +1740,7 @@ unset ac_cv_prog_gxx
# Extract the first word of ""$program_prefix"g++", so it can be a program name with args.
set dummy "$program_prefix"g++; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1738: checking for $ac_word" >&5
+echo "configure:1744: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_CXX_FOR_TARGET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1779,7 +1785,7 @@ fi
# Extract the first word of ""$program_prefix"gcc", so it can be a program name with args.
set dummy "$program_prefix"gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1783: checking for $ac_word" >&5
+echo "configure:1789: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_CC_FOR_TARGET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1812,7 +1818,7 @@ fi
# Extract the first word of ""$program_prefix"ar", so it can be a program name with args.
set dummy "$program_prefix"ar; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1816: checking for $ac_word" >&5
+echo "configure:1822: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_AR_FOR_TARGET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1844,7 +1850,7 @@ fi
# Extract the first word of ""$program_prefix"as", so it can be a program name with args.
set dummy "$program_prefix"as; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1848: checking for $ac_word" >&5
+echo "configure:1854: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_AS_FOR_TARGET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1876,7 +1882,7 @@ fi
# Extract the first word of ""$program_prefix"nm", so it can be a program name with args.
set dummy "$program_prefix"nm; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1880: checking for $ac_word" >&5
+echo "configure:1886: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_NM_FOR_TARGET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1908,7 +1914,7 @@ fi
# Extract the first word of ""$program_prefix"ld", so it can be a program name with args.
set dummy "$program_prefix"ld; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1912: checking for $ac_word" >&5
+echo "configure:1918: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_LD_FOR_TARGET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1941,7 +1947,7 @@ fi
# Extract the first word of ""$program_prefix"ranlib", so it can be a program name with args.
set dummy "$program_prefix"ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1945: checking for $ac_word" >&5
+echo "configure:1951: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_RANLIB_FOR_TARGET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -1974,7 +1980,7 @@ fi
# Extract the first word of ""$program_prefix"objcopy", so it can be a program name with args.
set dummy "$program_prefix"objcopy; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1978: checking for $ac_word" >&5
+echo "configure:1984: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_OBJCOPY_FOR_TARGET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2006,7 +2012,7 @@ fi
# Extract the first word of ""$program_prefix"size", so it can be a program name with args.
set dummy "$program_prefix"size; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2010: checking for $ac_word" >&5
+echo "configure:2016: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_path_SIZE_FOR_TARGET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2041,7 +2047,7 @@ test "$rtems_cv_gcc_pipe" = "yes" && CC_FOR_TARGET="$CC_FOR_TARGET --pipe"
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2045: checking for $ac_word" >&5
+echo "configure:2051: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2070,7 +2076,7 @@ if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2074: checking for $ac_word" >&5
+echo "configure:2080: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2118,7 +2124,7 @@ fi
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:2122: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:2128: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -2128,11 +2134,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS
cross_compiling=$ac_cv_prog_cc_cross
cat > conftest.$ac_ext <<EOF
-#line 2132 "configure"
+#line 2138 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-if { (eval echo configure:2136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
ac_cv_prog_cc_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
@@ -2152,12 +2158,12 @@ if test $ac_cv_prog_cc_works = no; then
{ echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:2156: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:2162: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:2161: checking whether we are using GNU C" >&5
+echo "configure:2167: checking whether we are using GNU C" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2166,7 +2172,7 @@ else
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2170: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2176: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
@@ -2181,7 +2187,7 @@ if test $ac_cv_prog_gcc = yes; then
ac_save_CFLAGS="$CFLAGS"
CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:2185: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:2191: checking whether ${CC-cc} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2212,12 +2218,12 @@ fi
for ac_func in strerror
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2216: checking for $ac_func" >&5
+echo "configure:2222: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2221 "configure"
+#line 2227 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -2240,7 +2246,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:2244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -2268,7 +2274,7 @@ done
# find all the Executive Makefiles
echo $ac_n "checking for Makefile.in in c/src/exec/score/tools/$target_cpu""... $ac_c" 1>&6
-echo "configure:2272: checking for Makefile.in in c/src/exec/score/tools/$target_cpu" >&5
+echo "configure:2278: checking for Makefile.in in c/src/exec/score/tools/$target_cpu" >&5
if test -d $srcdir/c/src/exec/score/tools/$target_cpu; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -2283,7 +2289,7 @@ fi
echo $ac_n "checking for Makefile.in in c/src/exec/rtems""... $ac_c" 1>&6
-echo "configure:2287: checking for Makefile.in in c/src/exec/rtems" >&5
+echo "configure:2293: checking for Makefile.in in c/src/exec/rtems" >&5
if test -d $srcdir/c/src/exec/rtems; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -2298,7 +2304,7 @@ fi
echo $ac_n "checking for Makefile.in in c/src/exec/sapi""... $ac_c" 1>&6
-echo "configure:2302: checking for Makefile.in in c/src/exec/sapi" >&5
+echo "configure:2308: checking for Makefile.in in c/src/exec/sapi" >&5
if test -d $srcdir/c/src/exec/sapi; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -2315,7 +2321,7 @@ fi
if test "$RTEMS_HAS_POSIX_API" = "yes"; then
echo $ac_n "checking for Makefile.in in c/src/exec/posix""... $ac_c" 1>&6
-echo "configure:2319: checking for Makefile.in in c/src/exec/posix" >&5
+echo "configure:2325: checking for Makefile.in in c/src/exec/posix" >&5
if test -d $srcdir/c/src/exec/posix; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -2337,7 +2343,7 @@ if test -d "$srcdir/c/src/lib/libbsp/$target_cpu"; then
if test -z "$rtems_bsp"; then
echo $ac_n "checking for bsps""... $ac_c" 1>&6
-echo "configure:2341: checking for bsps" >&5
+echo "configure:2347: checking for bsps" >&5
files=`ls $srcdir/c/src/lib/libbsp/$target_cpu`
for file in $files; do
case $file in
@@ -2384,7 +2390,7 @@ echo "configure:2341: checking for bsps" >&5
bspdirs="$bspdirs $bspdir"
echo $ac_n "checking for Makefile.in in c/src/lib/libbsp/$target_cpu/$bspdir""... $ac_c" 1>&6
-echo "configure:2388: checking for Makefile.in in c/src/lib/libbsp/$target_cpu/$bspdir" >&5
+echo "configure:2394: checking for Makefile.in in c/src/lib/libbsp/$target_cpu/$bspdir" >&5
if test -d $srcdir/c/src/lib/libbsp/$target_cpu/$bspdir; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -2407,7 +2413,7 @@ fi
# find all the CPU dependent library Makefiles
echo $ac_n "checking for Makefile.in in c/src/lib/libcpu/$target_cpu""... $ac_c" 1>&6
-echo "configure:2411: checking for Makefile.in in c/src/lib/libcpu/$target_cpu" >&5
+echo "configure:2417: checking for Makefile.in in c/src/lib/libcpu/$target_cpu" >&5
if test -d $srcdir/c/src/lib/libcpu/$target_cpu; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -2424,7 +2430,7 @@ fi
if test "$skip_startfiles" != "yes"; then
echo $ac_n "checking for Makefile.in in c/src/lib/start/$target_cpu""... $ac_c" 1>&6
-echo "configure:2428: checking for Makefile.in in c/src/lib/start/$target_cpu" >&5
+echo "configure:2434: checking for Makefile.in in c/src/lib/start/$target_cpu" >&5
if test -d $srcdir/c/src/lib/start/$target_cpu; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -2466,7 +2472,7 @@ fi
# If the tests are enabled, then find all the test suite Makefiles
echo $ac_n "checking if the test suites are enabled? ""... $ac_c" 1>&6
-echo "configure:2470: checking if the test suites are enabled? " >&5
+echo "configure:2476: checking if the test suites are enabled? " >&5
tests_enabled=yes
# Check whether --enable-tests or --disable-tests was given.
if test "${enable_tests+set}" = set; then
@@ -2485,7 +2491,7 @@ fi
echo $ac_n "checking for Makefile.in in c/src/tests/tools/$target_cpu""... $ac_c" 1>&6
-echo "configure:2489: checking for Makefile.in in c/src/tests/tools/$target_cpu" >&5
+echo "configure:2495: checking for Makefile.in in c/src/tests/tools/$target_cpu" >&5
if test -d $srcdir/c/src/tests/tools/$target_cpu; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -2502,7 +2508,7 @@ fi
if test "$tests_enabled" = "yes"; then
echo $ac_n "checking for Makefile.in in c/src/tests/libtests""... $ac_c" 1>&6
-echo "configure:2506: checking for Makefile.in in c/src/tests/libtests" >&5
+echo "configure:2512: checking for Makefile.in in c/src/tests/libtests" >&5
if test -d $srcdir/c/src/tests/libtests; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -2517,7 +2523,7 @@ fi
echo $ac_n "checking for Makefile.in in c/src/tests/sptests""... $ac_c" 1>&6
-echo "configure:2521: checking for Makefile.in in c/src/tests/sptests" >&5
+echo "configure:2527: checking for Makefile.in in c/src/tests/sptests" >&5
if test -d $srcdir/c/src/tests/sptests; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -2532,7 +2538,7 @@ fi
echo $ac_n "checking for Makefile.in in c/src/tests/tmtests""... $ac_c" 1>&6
-echo "configure:2536: checking for Makefile.in in c/src/tests/tmtests" >&5
+echo "configure:2542: checking for Makefile.in in c/src/tests/tmtests" >&5
if test -d $srcdir/c/src/tests/tmtests; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -2547,7 +2553,7 @@ fi
echo $ac_n "checking for Makefile.in in c/src/tests/mptests""... $ac_c" 1>&6
-echo "configure:2551: checking for Makefile.in in c/src/tests/mptests" >&5
+echo "configure:2557: checking for Makefile.in in c/src/tests/mptests" >&5
if test -d $srcdir/c/src/tests/mptests; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -2563,7 +2569,7 @@ fi
if test "$RTEMS_HAS_POSIX" = "yes"; then
echo $ac_n "checking for Makefile.in in c/src/tests/psxtests""... $ac_c" 1>&6
-echo "configure:2567: checking for Makefile.in in c/src/tests/psxtests" >&5
+echo "configure:2573: checking for Makefile.in in c/src/tests/psxtests" >&5
if test -d $srcdir/c/src/tests/psxtests; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -2581,7 +2587,7 @@ fi
# If the HWAPI is enabled, the find the HWAPI Makefiles
echo $ac_n "checking if the HWAPI is enabled? ""... $ac_c" 1>&6
-echo "configure:2585: checking if the HWAPI is enabled? " >&5
+echo "configure:2591: checking if the HWAPI is enabled? " >&5
# Check whether --enable-hwapi or --disable-hwapi was given.
if test "${enable_hwapi+set}" = set; then
enableval="$enable_hwapi"
@@ -2592,7 +2598,7 @@ if test "${enable_hwapi+set}" = set; then
makefiles="$makefiles c/src/lib/libhwapi/Makefile"
echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/analog""... $ac_c" 1>&6
-echo "configure:2596: checking for Makefile.in in c/src/lib/libhwapi/analog" >&5
+echo "configure:2602: checking for Makefile.in in c/src/lib/libhwapi/analog" >&5
if test -d $srcdir/c/src/lib/libhwapi/analog; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -2607,7 +2613,7 @@ fi
echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/discrete""... $ac_c" 1>&6
-echo "configure:2611: checking for Makefile.in in c/src/lib/libhwapi/discrete" >&5
+echo "configure:2617: checking for Makefile.in in c/src/lib/libhwapi/discrete" >&5
if test -d $srcdir/c/src/lib/libhwapi/discrete; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -2622,7 +2628,7 @@ fi
echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/drivers""... $ac_c" 1>&6
-echo "configure:2626: checking for Makefile.in in c/src/lib/libhwapi/drivers" >&5
+echo "configure:2632: checking for Makefile.in in c/src/lib/libhwapi/drivers" >&5
if test -d $srcdir/c/src/lib/libhwapi/drivers; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -2637,7 +2643,7 @@ fi
echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/non_volatile_memory""... $ac_c" 1>&6
-echo "configure:2641: checking for Makefile.in in c/src/lib/libhwapi/non_volatile_memory" >&5
+echo "configure:2647: checking for Makefile.in in c/src/lib/libhwapi/non_volatile_memory" >&5
if test -d $srcdir/c/src/lib/libhwapi/non_volatile_memory; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -2652,7 +2658,7 @@ fi
echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/serial""... $ac_c" 1>&6
-echo "configure:2656: checking for Makefile.in in c/src/lib/libhwapi/serial" >&5
+echo "configure:2662: checking for Makefile.in in c/src/lib/libhwapi/serial" >&5
if test -d $srcdir/c/src/lib/libhwapi/serial; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -2667,7 +2673,7 @@ fi
echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/support""... $ac_c" 1>&6
-echo "configure:2671: checking for Makefile.in in c/src/lib/libhwapi/support" >&5
+echo "configure:2677: checking for Makefile.in in c/src/lib/libhwapi/support" >&5
if test -d $srcdir/c/src/lib/libhwapi/support; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -2682,7 +2688,7 @@ fi
echo $ac_n "checking for Makefile.in in c/src/lib/libhwapi/wrapup""... $ac_c" 1>&6
-echo "configure:2686: checking for Makefile.in in c/src/lib/libhwapi/wrapup" >&5
+echo "configure:2692: checking for Makefile.in in c/src/lib/libhwapi/wrapup" >&5
if test -d $srcdir/c/src/lib/libhwapi/wrapup; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -2724,7 +2730,7 @@ fi
# pick up all the Makefiles in required parts of the tree
echo $ac_n "checking for Makefile.in in c/build-tools""... $ac_c" 1>&6
-echo "configure:2728: checking for Makefile.in in c/build-tools" >&5
+echo "configure:2734: checking for Makefile.in in c/build-tools" >&5
if test -d $srcdir/c/build-tools; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -2739,7 +2745,7 @@ fi
echo $ac_n "checking for Makefile.in in make""... $ac_c" 1>&6
-echo "configure:2743: checking for Makefile.in in make" >&5
+echo "configure:2749: checking for Makefile.in in make" >&5
if test -d $srcdir/make; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -2754,7 +2760,7 @@ fi
echo $ac_n "checking for Makefile.in in c/src/lib/libmisc""... $ac_c" 1>&6
-echo "configure:2758: checking for Makefile.in in c/src/lib/libmisc" >&5
+echo "configure:2764: checking for Makefile.in in c/src/lib/libmisc" >&5
if test -d $srcdir/c/src/lib/libmisc; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
@@ -2769,7 +2775,7 @@ fi
echo $ac_n "checking for Makefile.in in c/src/tests/samples""... $ac_c" 1>&6
-echo "configure:2773: checking for Makefile.in in c/src/tests/samples" >&5
+echo "configure:2779: checking for Makefile.in in c/src/tests/samples" >&5
if test -d $srcdir/c/src/tests/samples; then
rtems_av_save_dir=`pwd`;
cd $srcdir;
diff --git a/configure.in b/configure.in
index 12380d814d..4f31e92fcb 100644
--- a/configure.in
+++ b/configure.in
@@ -131,8 +131,11 @@ case "${target}" in
;;
i[[3456]]86-pc-linux*) # unix "simulator" port
target_cpu=unix
- RTEMS_HAS_POSIX_API=no
RTEMS_HOST=Linux
+ # override these settings
+ RTEMS_HAS_POSIX_API=no
+ RTEMS_USE_GCC272=yes
+ RTEMS_LIBC_DIR=/usr
;;
no_cpu-*rtems*)
target_cpu=no_cpu
@@ -140,8 +143,11 @@ case "${target}" in
;;
sparc-sun-solaris*) # unix "simulator" port
target_cpu=unix
- RTEMS_HAS_POSIX_API=no
RTEMS_HOST=Solaris
+ # override these settings
+ RTEMS_HAS_POSIX_API=no
+ RTEMS_USE_GCC272=yes
+ RTEMS_LIBC_DIR=/usr
;;
*)
RTEMS_CANONICAL_TARGET_CPU
diff --git a/make/custom/HPUX9-posix.cfg b/make/custom/HPUX9-posix.cfg
index 27c45280c9..415715ba9d 100644
--- a/make/custom/HPUX9-posix.cfg
+++ b/make/custom/HPUX9-posix.cfg
@@ -8,8 +8,6 @@
HOST_ARCH=o-$(RTEMS_HOST)
TARGET_ARCH=o-$(RTEMS_BSP)
-include $(RTEMS_ROOT)/make/main.cfg
-
RTEMS_CPU=unix
RTEMS_CPU_FAMILY=hppa1_1
RTEMS_CPU_MODEL=hppa7200
@@ -18,23 +16,19 @@ RTEMS_UNIX_FLAVOR=hpux
# This is the actual bsp directory used during the build process.
RTEMS_BSP_FAMILY=posix
+include $(RTEMS_ROOT)/make/custom/default.cfg
+
# use the macros instead of the inline functions
# The macros work better when mixed with other compilers.
INLINE=macros
INLINE_UPCASE=MACRO
-# HOST Compiler config file
-# You may also want to specify where the compiler resides here.
-CC_$(HOST_ARCH)_DIR=$(RTEMS_GNUTOOLS_HOST)
-CONFIG.$(HOST_ARCH).CC = $(RTEMS_ROOT)/make/compilers/gcc.cfg
-
## Target compiler config file, if any
CC_$(TARGET_ARCH)_DIR=$(CC_$(HOST_ARCH)_DIR)
-CONFIG.$(TARGET_ARCH).CC = $(RTEMS_ROOT)/make/compilers/gcc-hpux9.cfg
+CONFIG.$(TARGET_ARCH).CC = $(RTEMS_ROOT)/make/compilers/gcc-target-default.cfg
-# Use the LIBC support for CYGNUS newlib
-# RTEMS_LIBC_DIR must already be set (by module file)
-RTEMS_USE_NEWLIB=yes
+# RTEMS_LIBC_DIR must already be set (by configuration) DOES NOT MATTER
+LIBC_DEFINES=-DRTEMS_UNIXLIB -DRTEMS_UNIX -DMALLOC_PROVIDED -DRTEMS_DEBUG
# The following define the memory reserved in the executable for the
# RTEMS Workspace and the C Program Heap.
@@ -42,9 +36,6 @@ RTEMS_USE_NEWLIB=yes
LIBC_DEFINES += -DWORKSPACE_MB=2
LIBC_DEFINES += -DHEAPSPACE_MB=1
-# Uncomment the following line if want stack checking should be enabled
-#LIBC_DEFINES += -DSTACK_CHECKER_ON
-
# Define this to yes if this target supports multiprocessor environments.
HAS_MP=yes
@@ -55,4 +46,81 @@ HAS_KA9Q=no
# This target does NOT support the POSIX API.
HAS_POSIX_API=no
+HAS_POSIX_API=no
+
+# optimize flag: typically -0, could use -O4 or -fast
+# -O4 is ok for RTEMS
+CFLAGS_OPTIMIZE_V = -O2
+
+# This section makes the target dependent options file.
+
+# NDEBUG (C library)
+# if defined asserts do not generate code. This is commonly used
+# as a command line option.
+#
+# RTEMS_TEST_NO_PAUSE (RTEMS tests)
+# do not pause between screens of output in the rtems tests
+#
+# NO_TABLE_MOVE (SPARC PORT)
+# do not have a second trap table -- use the BSP's
+#
+# STACK_CHECKER_ON (RTEMS support code)
+# If defined, stack bounds checking is enabled.
+#
+# STACK_CHECKER_REPORT_USAGE (RTEMS support code)
+# If this and STACK_CHECKER_ON are defined, then a report on stack usage
+# per task is printed when the program exits.
+#
+# RTEMS_DEBUG (RTEMS)
+# If defined, debug checks in RTEMS and support library code are enabled.
+#
+# RTEMS_UNIX (unix)
+# Define this to indicate this is an RTEMS UNIX port.
+
+define make-target-options
+ echo "/* #define NDEBUG 1 */ " >>$@
+ echo "#define RTEMS_TEST_NO_PAUSE 1" >>$@
+ echo "/* #define STACK_CHECKER_ON 1 */" >>$@
+ echo "/* #define STACK_CHECKER_REPORT_USAGE 1 */" >>$@
+ echo "/* #define RTEMS_DEBUG 1 */" >>$@
+ echo "#define RTEMS_UNIX 1 " >>$@
+endef
+
+ifeq ($(RTEMS_USE_GCC272),yes)
+define make-exe
+ $(CC) -o $@ $(LINK_FILES) $(LD_LIBS) $(LIBC_LIBM) $(LIBC_LIBC)
+ $(NM) -ng $@ > $(basename $@).num
+ $(SIZE) $@
+endef
+else
+#
+# gcc28 not yet supported
+#
+endif
+
# Miscellaneous additions go here
+# Setting formerly contained in gcc-hpux9.cfg
+
+# Not applicable - let's override 'em
+LINKCMDS=
+START_FILE=
+START_BASE=
+
+# Here is the rule to actually build a $(ARCH)/foo.exe
+# It also builds $(ARCH)/foo.sr and $(ARCH)/foo.nm
+# Usage ref: src/tests/sptest/sp1/Makefile
+#
+# 'NODE' is set to 1 or 2 for multi cpu tests (ref: mptests/mp01/node1/Makefile)
+# If NODE is set as an environment variable, don't trust it, zero it out.
+# (NODE turns out to be a very common environment variable)
+ifeq (,$(NODE))
+NODE=0
+else
+ifeq "$(origin NODE)" "environment"
+NODE=0
+endif
+endif
+
+# Workaround for missing ranlib support in RTEMS
+MKLIB=$(AR) s $(@) ; echo library is complete:
+
diff --git a/make/custom/Linux-posix.cfg b/make/custom/Linux-posix.cfg
index c339d4e670..8327c170f0 100644
--- a/make/custom/Linux-posix.cfg
+++ b/make/custom/Linux-posix.cfg
@@ -4,12 +4,6 @@
# $Id$
#
-# Specify here the host and target "architectures"
-HOST_ARCH=o-$(RTEMS_HOST)
-TARGET_ARCH=o-linux1
-
-include $(RTEMS_ROOT)/make/main.cfg
-
RTEMS_CPU=unix
RTEMS_CPU_FAMILY=i386
RTEMS_CPU_MODEL=i486dx
@@ -18,45 +12,33 @@ RTEMS_UNIX_FLAVOR=linux
# This is the actual bsp directory used during the build process.
RTEMS_BSP_FAMILY=posix
-# use the inline functions instead of the macros
-# ref: src/exec/generic/Makefile
-# Need INLINE_UPCASE set to uppercase value of INLINE variable
-# ref: make/compilers/gcc-force386.cfg
-ifeq ($(RTEMS_USE_MACROS),yes)
-INLINE=macros
-INLINE_UPCASE=
-else
-INLINE=inline
-INLINE_UPCASE=INLINE
-endif
+# share the posix bsp
+TARGET_ARCH=o-linux1
+RTEMS_BSP=posix
-# HOST Compiler config file
-# You may also want to specify where the compiler resides here.
-CC_$(HOST_ARCH)_DIR=$(RTEMS_GNUTOOLS_HOST)
-CONFIG.$(HOST_ARCH).CC = $(RTEMS_ROOT)/make/compilers/gcc.cfg
+include $(RTEMS_ROOT)/make/custom/default.cfg
## Target compiler config file, if any
-CC_$(TARGET_ARCH)_DIR=$(CC_$(HOST_ARCH)_DIR)
-CONFIG.$(TARGET_ARCH).CC = $(RTEMS_ROOT)/make/compilers/gcc-linux1.cfg
+CONFIG.$(TARGET_ARCH).CC = $(RTEMS_ROOT)/make/compilers/gcc-target-default.cfg
# DO NOT Use the LIBC support for CYGNUS newlib
-# RTEMS_LIBC_DIR must already be set (by module file) DOES NOT MATTER
+RTEMS_USE_NEWLIB=no
+
+# RTEMS_LIBC_DIR must already be set (by configuration) DOES NOT MATTER
LIBC_DEFINES=-DRTEMS_UNIXLIB -DRTEMS_UNIX -DMALLOC_PROVIDED -DRTEMS_DEBUG
-LIBC_INCLUDE=/usr/include
-LIBC_LIBC=-lc
-LIBC_LIBM=-lm
-LIBC_EXTRA_LIBS=
# The following define the memory reserved in the executable for the
# RTEMS Workspace and the C Program Heap.
LIBC_DEFINES += -DWORKSPACE_MB=2
LIBC_DEFINES += -DHEAPSPACE_MB=1
+
# Define this to yes if C++ is included in the development environment
# This requires that at least the GNU C++ compiler and libg++ be installed.
ifeq ($(RTEMS_HAS_CPLUSPLUS),yes)
HAS_CPLUSPLUS=yes
-LIBCC_INCLUDE=/usr/include/g++
+# No need to set it, gcc knows about them
+# LIBCC_INCLUDE=/usr/include/g++
CPLUS_LD_LIBS=-lstdc++
CPLUS_LD_LIBS += $(PROJECT_RELEASE)/lib/librtems++$(LIBSUFFIX_VA)
else
@@ -73,4 +55,81 @@ HAS_KA9Q=no
# This target does NOT support the POSIX API.
HAS_POSIX_API=no
+# optimize flag: typically -0, could use -O4 or -fast
+# -O4 is ok for RTEMS
+CFLAGS_OPTIMIZE_V = -O2
+
+# This section makes the target dependent options file.
+
+# NDEBUG (C library)
+# if defined asserts do not generate code. This is commonly used
+# as a command line option.
+#
+# RTEMS_TEST_NO_PAUSE (RTEMS tests)
+# do not pause between screens of output in the rtems tests
+#
+# NO_TABLE_MOVE (SPARC PORT)
+# do not have a second trap table -- use the BSP's
+#
+# STACK_CHECKER_ON (RTEMS support code)
+# If defined, stack bounds checking is enabled.
+#
+# STACK_CHECKER_REPORT_USAGE (RTEMS support code)
+# If this and STACK_CHECKER_ON are defined, then a report on stack usage
+# per task is printed when the program exits.
+#
+# RTEMS_DEBUG (RTEMS)
+# If defined, debug checks in RTEMS and support library code are enabled.
+#
+# RTEMS_UNIX (unix)
+# Define this to indicate this is an RTEMS UNIX port.
+
+define make-target-options
+ echo "/* #define NDEBUG 1 */ " >>$@
+ echo "#define RTEMS_TEST_NO_PAUSE 1" >>$@
+ echo "/* #define STACK_CHECKER_ON 1 */" >>$@
+ echo "/* #define STACK_CHECKER_REPORT_USAGE 1 */" >>$@
+ echo "/* #define RTEMS_DEBUG 1 */" >>$@
+ echo "#define RTEMS_UNIX 1 " >>$@
+endef
+
+ifeq ($(RTEMS_USE_GCC272),yes)
+define make-exe
+ $(CC) -o $@ $(LINK_FILES) $(LD_LIBS) $(LIBC_LIBM) $(LIBC_LIBC)
+ $(NM) -ng $@ > $(basename $@).num
+ $(SIZE) $@
+endef
+else
+#
+# gcc28 not yet supported
+#
+endif
+
+
+# *****************************************************************
# Miscellaneous additions go here
+
+# Setting formerly contained in gcc-linux1.cfg
+
+# Not applicable - let's override 'em
+LINKCMDS=
+START_FILE=
+START_BASE=
+
+# Here is the rule to actually build a $(ARCH)/foo.exe
+# It also builds $(ARCH)/foo.sr and $(ARCH)/foo.nm
+# Usage ref: src/tests/sptest/sp1/Makefile
+#
+# 'NODE' is set to 1 or 2 for multi cpu tests (ref: mptests/mp01/node1/Makefile)
+# If NODE is set as an environment variable, don't trust it, zero it out.
+# (NODE turns out to be a very common environment variable)
+ifeq (,$(NODE))
+NODE=0
+else
+ifeq "$(origin NODE)" "environment"
+NODE=0
+endif
+endif
+
+# Workaround for missing ranlib support in RTEMS
+MKLIB=$(AR) s $(@) ; echo library is complete:
diff --git a/make/custom/Solaris-posix.cfg b/make/custom/Solaris-posix.cfg
index aeee569900..e1208c9302 100644
--- a/make/custom/Solaris-posix.cfg
+++ b/make/custom/Solaris-posix.cfg
@@ -4,12 +4,6 @@
# $Id$
#
-# Specify here the host and target "architectures"
-HOST_ARCH=o-$(RTEMS_HOST)
-TARGET_ARCH=o-$(RTEMS_BSP)
-
-include $(RTEMS_ROOT)/make/main.cfg
-
RTEMS_CPU=unix
RTEMS_CPU_FAMILY=sparc
RTEMS_CPU_MODEL=sparc_v8
@@ -18,31 +12,20 @@ RTEMS_UNIX_FLAVOR=solaris
# This is the actual bsp directory used during the build process.
RTEMS_BSP_FAMILY=posix
-# use the inline functions instead of the macros
-# ref: src/exec/generic/Makefile
-# Need INLINE_UPCASE set to uppercase value of INLINE variable
-# ref: make/compilers/gcc-force386.cfg
-ifeq (${RTEMS_USE_MACROS},yes)
-INLINE=macros
-INLINE_UPCASE=
-else
-INLINE=inline
-INLINE_UPCASE=INLINE
-endif
+# share the posix bsp
+TARGET_ARCH=o-solaris2
+RTEMS_BSP=posix
-# HOST Compiler config file
-# You may also want to specify where the compiler resides here.
-CC_$(HOST_ARCH)_DIR=$(RTEMS_GNUTOOLS_HOST)
-CONFIG.$(HOST_ARCH).CC = $(RTEMS_ROOT)/make/compilers/gcc.cfg
+include $(RTEMS_ROOT)/make/default.cfg
## Target compiler config file, if any
-CC_$(TARGET_ARCH)_DIR=$(CC_$(HOST_ARCH)_DIR)
-CONFIG.$(TARGET_ARCH).CC = $(RTEMS_ROOT)/make/compilers/gcc-solaris2.cfg
+CONFIG.$(TARGET_ARCH).CC = $(RTEMS_ROOT)/make/compilers/gcc-target-default.cfg
# Use the LIBC support for CYGNUS newlib
# RTEMS_LIBC_DIR must already be set (by module file)
RTEMS_USE_NEWLIB=no
+LIBC_DEFINES=-DRTEMS_UNIXLIB -DRTEMS_UNIX -DMALLOC_PROVIDED -DRTEMS_DEBUG
LIBC_LIBM=-lm
# Define this to yes if C++ is included in the development environment
@@ -67,4 +50,58 @@ HAS_KA9Q=no
# This target does NOT support the POSIX API.
HAS_POSIX_API=no
+# optimize flag: typically -0, could use -O4 or -fast
+# -O4 is ok for RTEMS
+CFLAGS_OPTIMIZE_V = -O2
+
+# This section makes the target dependent options file.
+
+# NDEBUG (C library)
+# if defined asserts do not generate code. This is commonly used
+# as a command line option.
+#
+# RTEMS_TEST_NO_PAUSE (RTEMS tests)
+# do not pause between screens of output in the rtems tests
+#
+# NO_TABLE_MOVE (SPARC PORT)
+# do not have a second trap table -- use the BSP's
+#
+# STACK_CHECKER_ON (RTEMS support code)
+# If defined, stack bounds checking is enabled.
+#
+# STACK_CHECKER_REPORT_USAGE (RTEMS support code)
+# If this and STACK_CHECKER_ON are defined, then a report on stack usage
+# per task is printed when the program exits.
+#
+# RTEMS_DEBUG (RTEMS)
+# If defined, debug checks in RTEMS and support library code are enabled.
+#
+# RTEMS_UNIX (unix)
+# Define this to indicate this is an RTEMS UNIX port.
+
+define make-target-options
+ echo "/* #define NDEBUG 1 */ " >>$@
+ echo "#define RTEMS_TEST_NO_PAUSE 1" >>$@
+ echo "/* #define STACK_CHECKER_ON 1 */" >>$@
+ echo "/* #define STACK_CHECKER_REPORT_USAGE 1 */" >>$@
+ echo "/* #define RTEMS_DEBUG 1 */" >>$@
+ echo "#define RTEMS_UNIX 1 " >>$@
+endef
+
+ifeq ($(RTEMS_USE_GCC272),yes)
+define make-exe
+ $(CC) -o $@ $(LINK_FILES) $(LD_LIBS) $(LIBC_LIBM) $(LIBC_LIBC)
+ $(NM) -ng $@ > $(basename $@).num
+ $(SIZE) $@
+endef
+else
+#
+# gcc28 not yet supported
+#
+endif
+
+
+# *****************************************************************
+
+
# Miscellaneous additions go here