diff options
66 files changed, 1736 insertions, 1018 deletions
diff --git a/newlib/ChangeLog b/newlib/ChangeLog index c39a03f1e..7007af8aa 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,77 @@ +2002-08-26 Jeff Johnston <jjohnstn@redhat.com> + + * Makefile.am(LIBC_OBJECTLISTS): Add STDIO64_OBJECTLIST. + * Makefile.in: Regenerated. + * acinclude.m4: Add support for --enable-newlib-elix-level option. + * aclocal.m4: Regenerated. + * configure: Ditto. + * configure.host: Add code to define _ELIX_LEVEL if + --enable-newlib-elix-level option is used. + * configure.in: + * libc/aclocal.m4: Regenerated. + * libc/configure: Ditto. + * libc/argz/Makefile.am: Add EL/IX level checking. + * libc/argz/Makefile.in: Regenerated. + * libc/argz/dummy.c: New file. + * libc/ctype/Makefile.am: Add EL/IX level checking. + * libc/ctype/Makefile.in: Regenerated. + * libc/locale/Makefile.am: Add EL/IX level checking. + * libc/locale/Makefile.in: Regenerated. + * libc/posix/Makefile.am: Add EL/IX level checking. + * libc/posix/Makefile.in: Regenerated. + * libc/posix/telldir.c: Add EL/IX level checking. + * libc/reent/Makefile.am: Ditto. + * libc/reent/fstat64r.c: Ditto. + * libc/reent/lseek64r.c: Ditto. + * libc/reent/open64r.c: Ditto. + * libc/reent/Makefile.in: Regenerated. + * libc/search/Makefile.am: Add EL/IX level checking. + * libc/search/Makefile.in: Regenerated. + * libc/stdio/Makefile.am: Add EL/IX level checking. + * libc/stdio/Makefile.in: Regenerated. + * libc/stdio64/Makefile.am: Add EL/IX level checking. + * libc/stdio64/Makefile.in: Regenerated. + * libc/stdio64/dummy.c: New file. + * libc/stdio64/fgetpos64.c: Fix so _LARGEFILE_64 macro is checked + after first include. + * libc/stdio64/fopen64.c: Ditto. + * libc/stdio64/freopen64.c: Ditto. + * libc/stdio64/fseeko64.c: Ditto. + * libc/stdio64/fsetpos64.c: Ditto. + * libc/stdio64/ftello64.c: Ditto. + * libc/stdio64/tmpfile64.c: Ditto. + * libc/stdlib/Makefile.am: Add EL/IX level checking. + * libc/stdlib/Makefile.in: Regenerated. + * libc/stdlib/mstats.c: Add EL/IX level checking. + * libc/string/Makefile.am: Ditto. + * libc/string/Makefile.in: Regenerated. + * libc/sys/linux/Makefile.am: Add EL/IX level checking. + * libc/sys/linux/Makefile.in: Regenerated. + * libc/sys/linux/aclocal.m4: Ditto. + * libc/sys/linux/configure: Ditto. + * libc/sys/linux/aio.c: Add EL/IX level checking. + * libc/sys/linux/ftok.c: Ditto. + * libc/sys/linux/getdate.c: Ditto. + * libc/sys/linux/ids.c: Ditto. + * libc/sys/linux/inode.c: Ditto. + * libc/sys/linux/io.c: Ditto. + * libc/sys/linux/process.c: Ditto. + * libc/sys/linux/resource.c: Ditto. + * libc/sys/linux/sched.c: Ditto. + * libc/sys/linux/sig.c: Ditto. + * libc/sys/linux/termios.c: Ditto. + * libc/sys/linux/wait.c: Ditto plus add __waitpid and + __libc___waitpid weak aliases. + * libc/sys/linux/machine/i386/syscall.h: Add new _base macros + that generate the code for a syscall, but do not create a + weak alias. + * libc/syscalls/Makefile.am: Add EL/IX level checking. + * libc/syscalls/Makefile.in: Regenerated. + * libc/time/tzset_r.c: Change to replace strdup with equivalent + functionality. + * libc/unix/Makefile.am: Add EL/IX level checking. + * libc/unix/Makefile.in: Regenerated. + 2002-08-26 Christopher Faylor <cgf@redhat.com> * libc/include/malloc.h: On cygwin, define malloc _r functions as diff --git a/newlib/Makefile.am b/newlib/Makefile.am index 6f3a217d1..8a82ec90a 100644 --- a/newlib/Makefile.am +++ b/newlib/Makefile.am @@ -103,6 +103,7 @@ LIBC_OBJECTLISTS = \ $(SIGNAL_OBJECTLIST) \ $(SYSCALL_OBJECTLIST) \ $(UNIX_OBJECTLIST) \ + $(STDIO64_OBJECTLIST) \ libc/argz/objectlist.awk.in \ libc/stdlib/objectlist.awk.in \ libc/time/objectlist.awk.in \ diff --git a/newlib/Makefile.in b/newlib/Makefile.in index a8ad97bf8..f1aafa8f6 100644 --- a/newlib/Makefile.in +++ b/newlib/Makefile.in @@ -94,6 +94,7 @@ PACKAGE = @PACKAGE@ POSIX_OBJECTLIST = @POSIX_OBJECTLIST@ RANLIB = @RANLIB@ SIGNAL_OBJECTLIST = @SIGNAL_OBJECTLIST@ +STDIO64_OBJECTLIST = @STDIO64_OBJECTLIST@ STRIP = @STRIP@ SYSCALL_OBJECTLIST = @SYSCALL_OBJECTLIST@ SYS_MACH_OBJECTLIST = @SYS_MACH_OBJECTLIST@ @@ -201,6 +202,7 @@ LIBC_OBJECTLISTS = \ $(SIGNAL_OBJECTLIST) \ $(SYSCALL_OBJECTLIST) \ $(UNIX_OBJECTLIST) \ + $(STDIO64_OBJECTLIST) \ libc/argz/objectlist.awk.in \ libc/stdlib/objectlist.awk.in \ libc/time/objectlist.awk.in \ diff --git a/newlib/acinclude.m4 b/newlib/acinclude.m4 index 64333b07f..e0cc06438 100644 --- a/newlib/acinclude.m4 +++ b/newlib/acinclude.m4 @@ -53,6 +53,18 @@ AC_ARG_ENABLE(newlib-multithread, *) AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;; esac], [newlib_multithread=yes])dnl +dnl Support --enable-newlib-elix-level +AC_ARG_ENABLE(newlib-elix-level, +[ --enable-newlib-elix-level supply desired elix library level (1-4)], +[case "${enableval}" in + 0) newlib_elix_level=0 ;; + 1) newlib_elix_level=1 ;; + 2) newlib_elix_level=2 ;; + 3) newlib_elix_level=3 ;; + 4) newlib_elix_level=4 ;; + *) AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;; + esac], [newlib_elix_level=0])dnl + dnl Support --disable-newlib-io-float AC_ARG_ENABLE(newlib-io-float, [ --disable-newlib-io-float disable printf/scanf family float support], @@ -152,6 +164,12 @@ AC_SUBST(NEWLIB_CFLAGS) LDFLAGS=${ldflags} AC_SUBST(LDFLAGS) +AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0) +AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1) +AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2) +AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3) +AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4) + AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes) # Hard-code OBJEXT. Normally it is set by AC_OBJEXT, but we diff --git a/newlib/aclocal.m4 b/newlib/aclocal.m4 index 5133f0bb5..eae4b2000 100644 --- a/newlib/aclocal.m4 +++ b/newlib/aclocal.m4 @@ -65,6 +65,18 @@ AC_ARG_ENABLE(newlib-multithread, *) AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;; esac], [newlib_multithread=yes])dnl +dnl Support --enable-newlib-elix-level +AC_ARG_ENABLE(newlib-elix-level, +[ --enable-newlib-elix-level supply desired elix library level (1-4)], +[case "${enableval}" in + 0) newlib_elix_level=0 ;; + 1) newlib_elix_level=1 ;; + 2) newlib_elix_level=2 ;; + 3) newlib_elix_level=3 ;; + 4) newlib_elix_level=4 ;; + *) AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;; + esac], [newlib_elix_level=0])dnl + dnl Support --disable-newlib-io-float AC_ARG_ENABLE(newlib-io-float, [ --disable-newlib-io-float disable printf/scanf family float support], @@ -164,6 +176,12 @@ AC_SUBST(NEWLIB_CFLAGS) LDFLAGS=${ldflags} AC_SUBST(LDFLAGS) +AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0) +AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1) +AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2) +AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3) +AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4) + AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes) # Hard-code OBJEXT. Normally it is set by AC_OBJEXT, but we diff --git a/newlib/configure b/newlib/configure index 968287ea0..93db89329 100755 --- a/newlib/configure +++ b/newlib/configure @@ -24,6 +24,8 @@ ac_help="$ac_help ac_help="$ac_help --enable-newlib-multithread enable support for multiple threads" ac_help="$ac_help + --enable-newlib-elix-level supply desired elix library level (1-4)" +ac_help="$ac_help --disable-newlib-io-float disable printf/scanf family float support" ac_help="$ac_help --enable-maintainer-mode enable make rules and dependencies not useful @@ -609,7 +611,7 @@ fi # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:613: checking for a BSD compatible install" >&5 +echo "configure:615: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -662,7 +664,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:666: checking whether build environment is sane" >&5 +echo "configure:668: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -719,7 +721,7 @@ test "$program_suffix" != NONE && test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:723: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:725: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -752,12 +754,12 @@ else fi echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:756: checking for Cygwin environment" >&5 +echo "configure:758: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 761 "configure" +#line 763 "configure" #include "confdefs.h" int main() { @@ -768,7 +770,7 @@ int main() { return __CYGWIN__; ; return 0; } EOF -if { (eval echo configure:772: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:774: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -785,19 +787,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6 CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:789: checking for mingw32 environment" >&5 +echo "configure:791: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 794 "configure" +#line 796 "configure" #include "confdefs.h" int main() { return __MINGW32__; ; return 0; } EOF -if { (eval echo configure:801: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:803: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -874,6 +876,21 @@ else newlib_multithread=yes fi +# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given. +if test "${enable_newlib_elix_level+set}" = set; then + enableval="$enable_newlib_elix_level" + case "${enableval}" in + 0) newlib_elix_level=0 ;; + 1) newlib_elix_level=1 ;; + 2) newlib_elix_level=2 ;; + 3) newlib_elix_level=3 ;; + 4) newlib_elix_level=4 ;; + *) { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;; + esac +else + newlib_elix_level=0 +fi + # Check whether --enable-newlib-io-float or --disable-newlib-io-float was given. if test "${enable_newlib_io_float+set}" = set; then enableval="$enable_newlib_io_float" @@ -929,7 +946,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:933: checking host system type" >&5 +echo "configure:950: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -950,7 +967,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:954: checking target system type" >&5 +echo "configure:971: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -968,7 +985,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:972: checking build system type" >&5 +echo "configure:989: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -1011,7 +1028,7 @@ EOF missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:1015: checking for working aclocal" >&5 +echo "configure:1032: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1024,7 +1041,7 @@ else fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:1028: checking for working autoconf" >&5 +echo "configure:1045: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1037,7 +1054,7 @@ else fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:1041: checking for working automake" >&5 +echo "configure:1058: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1050,7 +1067,7 @@ else fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:1054: checking for working autoheader" >&5 +echo "configure:1071: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1063,7 +1080,7 @@ else fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:1067: checking for working makeinfo" >&5 +echo "configure:1084: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1088,7 +1105,7 @@ fi # 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:1092: checking for $ac_word" >&5 +echo "configure:1109: 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 @@ -1118,7 +1135,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:1122: checking for $ac_word" >&5 +echo "configure:1139: 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 @@ -1167,7 +1184,7 @@ fi fi echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1171: checking whether we are using GNU C" >&5 +echo "configure:1188: 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 @@ -1176,7 +1193,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1180: \"$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:1197: \"$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 @@ -1191,7 +1208,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:1195: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1212: 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 @@ -1222,7 +1239,7 @@ fi # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1226: checking for $ac_word" >&5 +echo "configure:1243: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1254,7 +1271,7 @@ fi # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1258: checking for $ac_word" >&5 +echo "configure:1275: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1286,7 +1303,7 @@ fi # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1290: checking for $ac_word" >&5 +echo "configure:1307: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1318,7 +1335,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1322: checking for $ac_word" >&5 +echo "configure:1339: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1363,7 +1380,7 @@ fi # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1367: checking for a BSD compatible install" >&5 +echo "configure:1384: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1417,7 +1434,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1421: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1438: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1451,7 +1468,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1455: checking for executable suffix" >&5 +echo "configure:1472: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1461,7 +1478,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj | *.ilk | *.pdb) ;; @@ -1495,6 +1512,52 @@ LDFLAGS=${ldflags} +if test x${newlib_elix_level} = x0; then + ELIX_LEVEL_0_TRUE= + ELIX_LEVEL_0_FALSE='#' +else + ELIX_LEVEL_0_TRUE='#' + ELIX_LEVEL_0_FALSE= +fi + + +if test x${newlib_elix_level} = x1; then + ELIX_LEVEL_1_TRUE= + ELIX_LEVEL_1_FALSE='#' +else + ELIX_LEVEL_1_TRUE='#' + ELIX_LEVEL_1_FALSE= +fi + + +if test x${newlib_elix_level} = x2; then + ELIX_LEVEL_2_TRUE= + ELIX_LEVEL_2_FALSE='#' +else + ELIX_LEVEL_2_TRUE='#' + ELIX_LEVEL_2_FALSE= +fi + + +if test x${newlib_elix_level} = x3; then + ELIX_LEVEL_3_TRUE= + ELIX_LEVEL_3_FALSE='#' +else + ELIX_LEVEL_3_TRUE='#' + ELIX_LEVEL_3_FALSE= +fi + + +if test x${newlib_elix_level} = x4; then + ELIX_LEVEL_4_TRUE= + ELIX_LEVEL_4_FALSE='#' +else + ELIX_LEVEL_4_TRUE='#' + ELIX_LEVEL_4_FALSE= +fi + + + if test x${use_libtool} = xyes; then USE_LIBTOOL_TRUE= USE_LIBTOOL_FALSE='#' @@ -1590,7 +1653,7 @@ fi # 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:1594: checking for $ac_word" >&5 +echo "configure:1657: 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 @@ -1620,7 +1683,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:1624: checking for $ac_word" >&5 +echo "configure:1687: 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 @@ -1671,7 +1734,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1675: checking for $ac_word" >&5 +echo "configure:1738: 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 @@ -1703,7 +1766,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1707: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1770: 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. @@ -1714,12 +1777,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1718 "configure" +#line 1781 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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 @@ -1745,12 +1808,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:1749: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1812: 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:1754: checking whether we are using GNU C" >&5 +echo "configure:1817: 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 @@ -1759,7 +1822,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1763: \"$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:1826: \"$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 @@ -1778,7 +1841,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1782: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1845: 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 @@ -1821,7 +1884,7 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:1825: checking for ld used by GCC" >&5 +echo "configure:1888: checking for ld used by GCC" >&5 case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -1851,10 +1914,10 @@ echo "configure:1825: checking for ld used by GCC" >&5 esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:1855: checking for GNU ld" >&5 +echo "configure:1918: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1858: checking for non-GNU ld" >&5 +echo "configure:1921: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1889,7 +1952,7 @@ else fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:1893: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:1956: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1906,7 +1969,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6 -echo "configure:1910: checking for $LD option to reload object files" >&5 +echo "configure:1973: checking for $LD option to reload object files" >&5 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1918,7 +1981,7 @@ reload_flag=$lt_cv_ld_reload_flag test -n "$reload_flag" && reload_flag=" $reload_flag" echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:1922: checking for BSD-compatible nm" >&5 +echo "configure:1985: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1956,7 +2019,7 @@ NM="$lt_cv_path_NM" echo "$ac_t""$NM" 1>&6 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1960: checking whether ln -s works" >&5 +echo "configure:2023: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1977,7 +2040,7 @@ else fi echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6 -echo "configure:1981: checking how to recognise dependant libraries" >&5 +echo "configure:2044: checking how to recognise dependant libraries" >&5 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2150,13 +2213,13 @@ file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:2154: checking for object suffix" >&5 +echo "configure:2217: checking for object suffix" >&5 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:2160: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2223: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -2180,7 +2243,7 @@ case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6 -echo "configure:2184: checking for ${ac_tool_prefix}file" >&5 +echo "configure:2247: checking for ${ac_tool_prefix}file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2242,7 +2305,7 @@ fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then echo $ac_n "checking for file""... $ac_c" 1>&6 -echo "configure:2246: checking for file" >&5 +echo "configure:2309: checking for file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2313,7 +2376,7 @@ esac # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2317: checking for $ac_word" >&5 +echo "configure:2380: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2345,7 +2408,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2349: checking for $ac_word" >&5 +echo "configure:2412: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2380,7 +2443,7 @@ fi # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2384: checking for $ac_word" >&5 +echo "configure:2447: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2412,7 +2475,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2416: checking for $ac_word" >&5 +echo "configure:2479: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2479,8 +2542,8 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic" case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 2483 "configure"' > conftest.$ac_ext - if { (eval echo configure:2484: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 2546 "configure"' > conftest.$ac_ext + if { (eval echo configure:2547: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" @@ -2499,7 +2562,7 @@ case $host in ia64-*-hpux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo configure:2503: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:2566: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *ELF-32*) HPUX_IA64_MODE="32" @@ -2517,7 +2580,7 @@ ia64-*-hpux*) SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:2521: checking whether the C compiler needs -belf" >&5 +echo "configure:2584: checking whether the C compiler needs -belf" >&5 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2530,14 +2593,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <<EOF -#line 2534 "configure" +#line 2597 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_needs_belf=yes else @@ -2567,7 +2630,7 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6 # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. set dummy ${ac_tool_prefix}dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2571: checking for $ac_word" >&5 +echo "configure:2634: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2599,7 +2662,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "dlltool", so it can be a program name with args. set dummy dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2603: checking for $ac_word" >&5 +echo "configure:2666: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2634,7 +2697,7 @@ fi # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2638: checking for $ac_word" >&5 +echo "configure:2701: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2666,7 +2729,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "as", so it can be a program name with args. set dummy as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2670: checking for $ac_word" >&5 +echo "configure:2733: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2701,7 +2764,7 @@ fi # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2705: checking for $ac_word" >&5 +echo "configure:2768: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2733,7 +2796,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2737: checking for $ac_word" >&5 +echo "configure:2800: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2769,12 +2832,12 @@ fi # recent cygwin and mingw systems supply a stub DllMain which the user # can override, but on older systems we have to supply one echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6 -echo "configure:2773: checking if libtool should supply DllMain function" >&5 +echo "configure:2836: checking if libtool should supply DllMain function" >&5 if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2778 "configure" +#line 2841 "configure" #include "confdefs.h" int main() { @@ -2782,7 +2845,7 @@ extern int __attribute__((__stdcall__)) DllMain(void*, int, void*); DllMain (0, 0, 0); ; return 0; } EOF -if { (eval echo configure:2786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_need_dllmain=no else @@ -2803,19 +2866,19 @@ echo "$ac_t""$lt_cv_need_dllmain" 1>&6 SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -mdll" echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6 -echo "configure:2807: checking how to link DLLs" >&5 +echo "configure:2870: checking how to link DLLs" >&5 if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2812 "configure" +#line 2875 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_dll_switch=-mdll else @@ -2929,7 +2992,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:2933: checking for $ac_word" >&5 +echo "configure:2996: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3069,6 +3132,11 @@ if test -n "${unix_dir}"; then fi +if test -n "${stdio64_dir}"; then + STDIO64_OBJECTLIST=libc/${stdio64_dir}/objectlist.awk.in +fi + + # Put a plausible default for CC_FOR_BUILD in Makefile. if test -z "$CC_FOR_BUILD"; then CC_FOR_BUILD=gcc @@ -3264,6 +3332,16 @@ s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g s%@MAINT@%$MAINT%g s%@EXEEXT@%$EXEEXT%g s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g +s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g +s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g +s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g +s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g +s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g +s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g +s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g +s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g +s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g +s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g s%@OBJEXT@%$OBJEXT%g @@ -3296,6 +3374,7 @@ s%@POSIX_OBJECTLIST@%$POSIX_OBJECTLIST%g s%@SIGNAL_OBJECTLIST@%$SIGNAL_OBJECTLIST%g s%@SYSCALL_OBJECTLIST@%$SYSCALL_OBJECTLIST%g s%@UNIX_OBJECTLIST@%$UNIX_OBJECTLIST%g +s%@STDIO64_OBJECTLIST@%$STDIO64_OBJECTLIST%g s%@CC_FOR_BUILD@%$CC_FOR_BUILD%g CEOF diff --git a/newlib/configure.host b/newlib/configure.host index b6d223795..1e1ac19ee 100644 --- a/newlib/configure.host +++ b/newlib/configure.host @@ -245,6 +245,12 @@ if [ "${newlib_io_pos_args}" = "yes" ] ; then newlib_cflags="${newlib_cflags} -DWANT_IO_POS_ARGS" fi +# Specify EL/IX level + +if [ "${newlib_elix_level}" != "0" ] ; then + newlib_cflags="${newlib_cflags} -D_ELIX_LEVEL=${newlib_elix_level}" +fi + # Verify if shared newlib support is allowed and set appropriate variables # We don't want to use libtool for platforms that we are not going to # support shared libraries. This is because it adds executable tests which diff --git a/newlib/configure.in b/newlib/configure.in index b349237c3..050948aa3 100644 --- a/newlib/configure.in +++ b/newlib/configure.in @@ -117,6 +117,11 @@ if test -n "${unix_dir}"; then fi AC_SUBST(UNIX_OBJECTLIST) +if test -n "${stdio64_dir}"; then + STDIO64_OBJECTLIST=libc/${stdio64_dir}/objectlist.awk.in +fi +AC_SUBST(STDIO64_OBJECTLIST) + # Put a plausible default for CC_FOR_BUILD in Makefile. if test -z "$CC_FOR_BUILD"; then CC_FOR_BUILD=gcc diff --git a/newlib/libc/aclocal.m4 b/newlib/libc/aclocal.m4 index 5133f0bb5..eae4b2000 100644 --- a/newlib/libc/aclocal.m4 +++ b/newlib/libc/aclocal.m4 @@ -65,6 +65,18 @@ AC_ARG_ENABLE(newlib-multithread, *) AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;; esac], [newlib_multithread=yes])dnl +dnl Support --enable-newlib-elix-level +AC_ARG_ENABLE(newlib-elix-level, +[ --enable-newlib-elix-level supply desired elix library level (1-4)], +[case "${enableval}" in + 0) newlib_elix_level=0 ;; + 1) newlib_elix_level=1 ;; + 2) newlib_elix_level=2 ;; + 3) newlib_elix_level=3 ;; + 4) newlib_elix_level=4 ;; + *) AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;; + esac], [newlib_elix_level=0])dnl + dnl Support --disable-newlib-io-float AC_ARG_ENABLE(newlib-io-float, [ --disable-newlib-io-float disable printf/scanf family float support], @@ -164,6 +176,12 @@ AC_SUBST(NEWLIB_CFLAGS) LDFLAGS=${ldflags} AC_SUBST(LDFLAGS) +AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0) +AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1) +AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2) +AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3) +AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4) + AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes) # Hard-code OBJEXT. Normally it is set by AC_OBJEXT, but we diff --git a/newlib/libc/argz/Makefile.am b/newlib/libc/argz/Makefile.am index d0a290633..bbc82fc8e 100644 --- a/newlib/libc/argz/Makefile.am +++ b/newlib/libc/argz/Makefile.am @@ -4,36 +4,45 @@ AUTOMAKE_OPTIONS = cygnus INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) -LIB_SOURCES = \ - argz_add.c \ - argz_add_sep.c \ - argz_append.c \ - argz_count.c \ - argz_create.c \ - argz_create_sep.c \ - argz_delete.c \ - argz_extract.c \ - argz_insert.c \ - argz_next.c \ - argz_replace.c \ - argz_stringify.c \ - buf_findstr.c \ - envz_entry.c \ - envz_get.c \ - envz_add.c \ - envz_remove.c \ - envz_merge.c \ - envz_strip.c +## All functions in this directory are EL/IX level 2 and above +if ELIX_LEVEL_1 +LIB_OBJS = +else +LIB_OBJS = \ + argz_add.$(oext) \ + argz_add_sep.$(oext) \ + argz_append.$(oext) \ + argz_count.$(oext) \ + argz_create.$(oext) \ + argz_create_sep.$(oext) \ + argz_delete.$(oext) \ + argz_extract.$(oext) \ + argz_insert.$(oext) \ + argz_next.$(oext) \ + argz_replace.$(oext) \ + argz_stringify.$(oext) \ + buf_findstr.$(oext) \ + envz_entry.$(oext) \ + envz_get.$(oext) \ + envz_add.$(oext) \ + envz_remove.$(oext) \ + envz_merge.$(oext) \ + envz_strip.$(oext) +endif libargz_la_LDFLAGS = -Xcompiler -nostdlib if USE_LIBTOOL noinst_LTLIBRARIES = libargz.la -libargz_la_SOURCES = $(LIB_SOURCES) +libargz_la_SOURCES = dummy.c +libargz_la_LIBADD = $(LIB_OBJS) +libargz_la_DEPENDENCIES = $(LIB_OBJS) noinst_DATA = objectlist.awk.in else noinst_LIBRARIES = lib.a -lib_a_SOURCES = $(LIB_SOURCES) +lib_a_SOURCES = dummy.c +lib_a_LIBADD = $(LIB_OBJS) +lib_a_DEPENDENCIES = $(LIB_OBJS) noinst_DATA = endif # USE_LIBTOOL diff --git a/newlib/libc/argz/Makefile.in b/newlib/libc/argz/Makefile.in index 888cfca66..868a75482 100644 --- a/newlib/libc/argz/Makefile.in +++ b/newlib/libc/argz/Makefile.in @@ -109,37 +109,40 @@ sys_dir = @sys_dir@ AUTOMAKE_OPTIONS = cygnus INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) - -LIB_SOURCES = \ - argz_add.c \ - argz_add_sep.c \ - argz_append.c \ - argz_count.c \ - argz_create.c \ - argz_create_sep.c \ - argz_delete.c \ - argz_extract.c \ - argz_insert.c \ - argz_next.c \ - argz_replace.c \ - argz_stringify.c \ - buf_findstr.c \ - envz_entry.c \ - envz_get.c \ - envz_add.c \ - envz_remove.c \ - envz_merge.c \ - envz_strip.c - +@ELIX_LEVEL_1_TRUE@LIB_OBJS = +@ELIX_LEVEL_1_FALSE@LIB_OBJS = @ELIX_LEVEL_1_FALSE@\ +@ELIX_LEVEL_1_FALSE@ argz_add.$(oext) \ +@ELIX_LEVEL_1_FALSE@ argz_add_sep.$(oext) \ +@ELIX_LEVEL_1_FALSE@ argz_append.$(oext) \ +@ELIX_LEVEL_1_FALSE@ argz_count.$(oext) \ +@ELIX_LEVEL_1_FALSE@ argz_create.$(oext) \ +@ELIX_LEVEL_1_FALSE@ argz_create_sep.$(oext) \ +@ELIX_LEVEL_1_FALSE@ argz_delete.$(oext) \ +@ELIX_LEVEL_1_FALSE@ argz_extract.$(oext) \ +@ELIX_LEVEL_1_FALSE@ argz_insert.$(oext) \ +@ELIX_LEVEL_1_FALSE@ argz_next.$(oext) \ +@ELIX_LEVEL_1_FALSE@ argz_replace.$(oext) \ +@ELIX_LEVEL_1_FALSE@ argz_stringify.$(oext) \ +@ELIX_LEVEL_1_FALSE@ buf_findstr.$(oext) \ +@ELIX_LEVEL_1_FALSE@ envz_entry.$(oext) \ +@ELIX_LEVEL_1_FALSE@ envz_get.$(oext) \ +@ELIX_LEVEL_1_FALSE@ envz_add.$(oext) \ +@ELIX_LEVEL_1_FALSE@ envz_remove.$(oext) \ +@ELIX_LEVEL_1_FALSE@ envz_merge.$(oext) \ +@ELIX_LEVEL_1_FALSE@ envz_strip.$(oext) libargz_la_LDFLAGS = -Xcompiler -nostdlib @USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = @USE_LIBTOOL_TRUE@libargz.la -@USE_LIBTOOL_TRUE@libargz_la_SOURCES = @USE_LIBTOOL_TRUE@$(LIB_SOURCES) +@USE_LIBTOOL_TRUE@libargz_la_SOURCES = @USE_LIBTOOL_TRUE@dummy.c +@USE_LIBTOOL_TRUE@libargz_la_LIBADD = @USE_LIBTOOL_TRUE@$(LIB_OBJS) +@USE_LIBTOOL_TRUE@libargz_la_DEPENDENCIES = @USE_LIBTOOL_TRUE@$(LIB_OBJS) @USE_LIBTOOL_TRUE@noinst_DATA = @USE_LIBTOOL_TRUE@objectlist.awk.in @USE_LIBTOOL_FALSE@noinst_DATA = @USE_LIBTOOL_FALSE@noinst_LIBRARIES = @USE_LIBTOOL_FALSE@lib.a -@USE_LIBTOOL_FALSE@lib_a_SOURCES = @USE_LIBTOOL_FALSE@$(LIB_SOURCES) +@USE_LIBTOOL_FALSE@lib_a_SOURCES = @USE_LIBTOOL_FALSE@dummy.c +@USE_LIBTOOL_FALSE@lib_a_LIBADD = @USE_LIBTOOL_FALSE@$(LIB_OBJS) +@USE_LIBTOOL_FALSE@lib_a_DEPENDENCIES = @USE_LIBTOOL_FALSE@$(LIB_OBJS) SUFFIXES = .def @@ -158,27 +161,10 @@ LIBRARIES = $(noinst_LIBRARIES) DEFS = @DEFS@ -I. -I$(srcdir) CPPFLAGS = @CPPFLAGS@ LIBS = @LIBS@ -lib_a_LIBADD = -@USE_LIBTOOL_FALSE@lib_a_OBJECTS = argz_add.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@argz_add_sep.$(OBJEXT) argz_append.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@argz_count.$(OBJEXT) argz_create.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@argz_create_sep.$(OBJEXT) argz_delete.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@argz_extract.$(OBJEXT) argz_insert.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@argz_next.$(OBJEXT) argz_replace.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@argz_stringify.$(OBJEXT) buf_findstr.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@envz_entry.$(OBJEXT) envz_get.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@envz_add.$(OBJEXT) envz_remove.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@envz_merge.$(OBJEXT) envz_strip.$(OBJEXT) +@USE_LIBTOOL_FALSE@lib_a_OBJECTS = dummy.$(OBJEXT) LTLIBRARIES = $(noinst_LTLIBRARIES) -libargz_la_LIBADD = -@USE_LIBTOOL_TRUE@libargz_la_OBJECTS = argz_add.lo argz_add_sep.lo \ -@USE_LIBTOOL_TRUE@argz_append.lo argz_count.lo argz_create.lo \ -@USE_LIBTOOL_TRUE@argz_create_sep.lo argz_delete.lo argz_extract.lo \ -@USE_LIBTOOL_TRUE@argz_insert.lo argz_next.lo argz_replace.lo \ -@USE_LIBTOOL_TRUE@argz_stringify.lo buf_findstr.lo envz_entry.lo \ -@USE_LIBTOOL_TRUE@envz_get.lo envz_add.lo envz_remove.lo envz_merge.lo \ -@USE_LIBTOOL_TRUE@envz_strip.lo +@USE_LIBTOOL_TRUE@libargz_la_OBJECTS = dummy.lo CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) diff --git a/newlib/libc/argz/dummy.c b/newlib/libc/argz/dummy.c new file mode 100644 index 000000000..895395e51 --- /dev/null +++ b/newlib/libc/argz/dummy.c @@ -0,0 +1 @@ +/* empty stub to allow objectlist.awk.in to be created */ diff --git a/newlib/libc/configure b/newlib/libc/configure index 6de25e63f..a4d21ed7f 100755 --- a/newlib/libc/configure +++ b/newlib/libc/configure @@ -24,6 +24,8 @@ ac_help="$ac_help ac_help="$ac_help --enable-newlib-multithread enable support for multiple threads" ac_help="$ac_help + --enable-newlib-elix-level supply desired elix library level (1-4)" +ac_help="$ac_help --disable-newlib-io-float disable printf/scanf family float support" ac_help="$ac_help --enable-maintainer-mode enable make rules and dependencies not useful @@ -606,7 +608,7 @@ fi # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:610: checking for a BSD compatible install" >&5 +echo "configure:612: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -659,7 +661,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:663: checking whether build environment is sane" >&5 +echo "configure:665: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -716,7 +718,7 @@ test "$program_suffix" != NONE && test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:720: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:722: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -749,12 +751,12 @@ else fi echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:753: checking for Cygwin environment" >&5 +echo "configure:755: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 758 "configure" +#line 760 "configure" #include "confdefs.h" int main() { @@ -765,7 +767,7 @@ int main() { return __CYGWIN__; ; return 0; } EOF -if { (eval echo configure:769: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:771: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -782,19 +784,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6 CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:786: checking for mingw32 environment" >&5 +echo "configure:788: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 791 "configure" +#line 793 "configure" #include "confdefs.h" int main() { return __MINGW32__; ; return 0; } EOF -if { (eval echo configure:798: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:800: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -871,6 +873,21 @@ else newlib_multithread=yes fi +# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given. +if test "${enable_newlib_elix_level+set}" = set; then + enableval="$enable_newlib_elix_level" + case "${enableval}" in + 0) newlib_elix_level=0 ;; + 1) newlib_elix_level=1 ;; + 2) newlib_elix_level=2 ;; + 3) newlib_elix_level=3 ;; + 4) newlib_elix_level=4 ;; + *) { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;; + esac +else + newlib_elix_level=0 +fi + # Check whether --enable-newlib-io-float or --disable-newlib-io-float was given. if test "${enable_newlib_io_float+set}" = set; then enableval="$enable_newlib_io_float" @@ -926,7 +943,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:930: checking host system type" >&5 +echo "configure:947: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -947,7 +964,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:951: checking target system type" >&5 +echo "configure:968: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -965,7 +982,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:969: checking build system type" >&5 +echo "configure:986: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -1008,7 +1025,7 @@ EOF missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:1012: checking for working aclocal" >&5 +echo "configure:1029: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1021,7 +1038,7 @@ else fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:1025: checking for working autoconf" >&5 +echo "configure:1042: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1034,7 +1051,7 @@ else fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:1038: checking for working automake" >&5 +echo "configure:1055: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1047,7 +1064,7 @@ else fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:1051: checking for working autoheader" >&5 +echo "configure:1068: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1060,7 +1077,7 @@ else fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:1064: checking for working makeinfo" >&5 +echo "configure:1081: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1085,7 +1102,7 @@ fi # 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:1089: checking for $ac_word" >&5 +echo "configure:1106: 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 @@ -1115,7 +1132,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:1119: checking for $ac_word" >&5 +echo "configure:1136: 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 @@ -1164,7 +1181,7 @@ fi fi echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1168: checking whether we are using GNU C" >&5 +echo "configure:1185: 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 @@ -1173,7 +1190,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1177: \"$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:1194: \"$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 @@ -1188,7 +1205,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:1192: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1209: 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 @@ -1219,7 +1236,7 @@ fi # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1223: checking for $ac_word" >&5 +echo "configure:1240: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1251,7 +1268,7 @@ fi # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1255: checking for $ac_word" >&5 +echo "configure:1272: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1283,7 +1300,7 @@ fi # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1287: checking for $ac_word" >&5 +echo "configure:1304: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1315,7 +1332,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1319: checking for $ac_word" >&5 +echo "configure:1336: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1360,7 +1377,7 @@ fi # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1364: checking for a BSD compatible install" >&5 +echo "configure:1381: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1414,7 +1431,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1418: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1435: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1448,7 +1465,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1452: checking for executable suffix" >&5 +echo "configure:1469: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1458,7 +1475,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj | *.ilk | *.pdb) ;; @@ -1492,6 +1509,52 @@ LDFLAGS=${ldflags} +if test x${newlib_elix_level} = x0; then + ELIX_LEVEL_0_TRUE= + ELIX_LEVEL_0_FALSE='#' +else + ELIX_LEVEL_0_TRUE='#' + ELIX_LEVEL_0_FALSE= +fi + + +if test x${newlib_elix_level} = x1; then + ELIX_LEVEL_1_TRUE= + ELIX_LEVEL_1_FALSE='#' +else + ELIX_LEVEL_1_TRUE='#' + ELIX_LEVEL_1_FALSE= +fi + + +if test x${newlib_elix_level} = x2; then + ELIX_LEVEL_2_TRUE= + ELIX_LEVEL_2_FALSE='#' +else + ELIX_LEVEL_2_TRUE='#' + ELIX_LEVEL_2_FALSE= +fi + + +if test x${newlib_elix_level} = x3; then + ELIX_LEVEL_3_TRUE= + ELIX_LEVEL_3_FALSE='#' +else + ELIX_LEVEL_3_TRUE='#' + ELIX_LEVEL_3_FALSE= +fi + + +if test x${newlib_elix_level} = x4; then + ELIX_LEVEL_4_TRUE= + ELIX_LEVEL_4_FALSE='#' +else + ELIX_LEVEL_4_TRUE='#' + ELIX_LEVEL_4_FALSE= +fi + + + if test x${use_libtool} = xyes; then USE_LIBTOOL_TRUE= USE_LIBTOOL_FALSE='#' @@ -1588,7 +1651,7 @@ fi # 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:1592: checking for $ac_word" >&5 +echo "configure:1655: 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 @@ -1618,7 +1681,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:1622: checking for $ac_word" >&5 +echo "configure:1685: 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 @@ -1669,7 +1732,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1673: checking for $ac_word" >&5 +echo "configure:1736: 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 @@ -1701,7 +1764,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1705: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1768: 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. @@ -1712,12 +1775,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1716 "configure" +#line 1779 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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 @@ -1743,12 +1806,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:1747: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1810: 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:1752: checking whether we are using GNU C" >&5 +echo "configure:1815: 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 @@ -1757,7 +1820,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1761: \"$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:1824: \"$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 @@ -1776,7 +1839,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1780: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1843: 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 @@ -1819,7 +1882,7 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:1823: checking for ld used by GCC" >&5 +echo "configure:1886: checking for ld used by GCC" >&5 case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -1849,10 +1912,10 @@ echo "configure:1823: checking for ld used by GCC" >&5 esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:1853: checking for GNU ld" >&5 +echo "configure:1916: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1856: checking for non-GNU ld" >&5 +echo "configure:1919: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1887,7 +1950,7 @@ else fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:1891: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:1954: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1904,7 +1967,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6 -echo "configure:1908: checking for $LD option to reload object files" >&5 +echo "configure:1971: checking for $LD option to reload object files" >&5 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1916,7 +1979,7 @@ reload_flag=$lt_cv_ld_reload_flag test -n "$reload_flag" && reload_flag=" $reload_flag" echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:1920: checking for BSD-compatible nm" >&5 +echo "configure:1983: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1954,7 +2017,7 @@ NM="$lt_cv_path_NM" echo "$ac_t""$NM" 1>&6 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1958: checking whether ln -s works" >&5 +echo "configure:2021: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1975,7 +2038,7 @@ else fi echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6 -echo "configure:1979: checking how to recognise dependant libraries" >&5 +echo "configure:2042: checking how to recognise dependant libraries" >&5 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2148,13 +2211,13 @@ file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:2152: checking for object suffix" >&5 +echo "configure:2215: checking for object suffix" >&5 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:2158: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2221: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -2178,7 +2241,7 @@ case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6 -echo "configure:2182: checking for ${ac_tool_prefix}file" >&5 +echo "configure:2245: checking for ${ac_tool_prefix}file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2240,7 +2303,7 @@ fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then echo $ac_n "checking for file""... $ac_c" 1>&6 -echo "configure:2244: checking for file" >&5 +echo "configure:2307: checking for file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2311,7 +2374,7 @@ esac # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2315: checking for $ac_word" >&5 +echo "configure:2378: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2343,7 +2406,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2347: checking for $ac_word" >&5 +echo "configure:2410: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2378,7 +2441,7 @@ fi # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2382: checking for $ac_word" >&5 +echo "configure:2445: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2410,7 +2473,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2414: checking for $ac_word" >&5 +echo "configure:2477: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2477,8 +2540,8 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic" case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 2481 "configure"' > conftest.$ac_ext - if { (eval echo configure:2482: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 2544 "configure"' > conftest.$ac_ext + if { (eval echo configure:2545: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" @@ -2497,7 +2560,7 @@ case $host in ia64-*-hpux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo configure:2501: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:2564: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *ELF-32*) HPUX_IA64_MODE="32" @@ -2515,7 +2578,7 @@ ia64-*-hpux*) SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:2519: checking whether the C compiler needs -belf" >&5 +echo "configure:2582: checking whether the C compiler needs -belf" >&5 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2528,14 +2591,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <<EOF -#line 2532 "configure" +#line 2595 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_needs_belf=yes else @@ -2565,7 +2628,7 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6 # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. set dummy ${ac_tool_prefix}dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2569: checking for $ac_word" >&5 +echo "configure:2632: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2597,7 +2660,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "dlltool", so it can be a program name with args. set dummy dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2601: checking for $ac_word" >&5 +echo "configure:2664: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2632,7 +2695,7 @@ fi # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2636: checking for $ac_word" >&5 +echo "configure:2699: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2664,7 +2727,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "as", so it can be a program name with args. set dummy as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2668: checking for $ac_word" >&5 +echo "configure:2731: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2699,7 +2762,7 @@ fi # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2703: checking for $ac_word" >&5 +echo "configure:2766: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2731,7 +2794,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2735: checking for $ac_word" >&5 +echo "configure:2798: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2767,12 +2830,12 @@ fi # recent cygwin and mingw systems supply a stub DllMain which the user # can override, but on older systems we have to supply one echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6 -echo "configure:2771: checking if libtool should supply DllMain function" >&5 +echo "configure:2834: checking if libtool should supply DllMain function" >&5 if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2776 "configure" +#line 2839 "configure" #include "confdefs.h" int main() { @@ -2780,7 +2843,7 @@ extern int __attribute__((__stdcall__)) DllMain(void*, int, void*); DllMain (0, 0, 0); ; return 0; } EOF -if { (eval echo configure:2784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_need_dllmain=no else @@ -2801,19 +2864,19 @@ echo "$ac_t""$lt_cv_need_dllmain" 1>&6 SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -mdll" echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6 -echo "configure:2805: checking how to link DLLs" >&5 +echo "configure:2868: checking how to link DLLs" >&5 if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2810 "configure" +#line 2873 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_dll_switch=-mdll else @@ -3247,6 +3310,16 @@ s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g s%@MAINT@%$MAINT%g s%@EXEEXT@%$EXEEXT%g s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g +s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g +s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g +s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g +s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g +s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g +s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g +s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g +s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g +s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g +s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g s%@OBJEXT@%$OBJEXT%g diff --git a/newlib/libc/ctype/Makefile.am b/newlib/libc/ctype/Makefile.am index 216950c1b..1572aa698 100644 --- a/newlib/libc/ctype/Makefile.am +++ b/newlib/libc/ctype/Makefile.am @@ -4,12 +4,10 @@ AUTOMAKE_OPTIONS = cygnus INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) -LIB_SOURCES = \ +GENERAL_SOURCES = \ ctype_.c \ isalnum.c \ isalpha.c \ - isascii.c \ - isblank.c \ iscntrl.c \ isdigit.c \ islower.c \ @@ -18,21 +16,34 @@ LIB_SOURCES = \ ispunct.c \ isspace.c \ isxdigit.c \ - toascii.c \ tolower.c \ - toupper.c \ - _tolower.c \ - _toupper.c + toupper.c + +## The following handles EL/IX level 2 functions +if ELIX_LEVEL_1 +LIB_OBJS = +else +LIB_OBJS = \ + isascii.$(oext) \ + isblank.$(oext) \ + toascii.$(oext) \ + _tolower.$(oext) \ + _toupper.$(oext) +endif libctype_la_LDFLAGS = -Xcompiler -nostdlib if USE_LIBTOOL noinst_LTLIBRARIES = libctype.la -libctype_la_SOURCES = $(LIB_SOURCES) +libctype_la_SOURCES = $(GENERAL_SOURCES) +libctype_la_LIBADD = $(LIB_OBJS) +libctype_la_DEPENDENCIES = $(LIB_OBJS) noinst_DATA = objectlist.awk.in else noinst_LIBRARIES = lib.a -lib_a_SOURCES = $(LIB_SOURCES) +lib_a_SOURCES = $(GENERAL_SOURCES) +lib_a_LIBADD = $(LIB_OBJS) +lib_a_DEPENDENCIES = $(LIB_OBJS) noinst_DATA = endif # USE_LIBTOOL diff --git a/newlib/libc/ctype/Makefile.in b/newlib/libc/ctype/Makefile.in index 5878fae65..38358d788 100644 --- a/newlib/libc/ctype/Makefile.in +++ b/newlib/libc/ctype/Makefile.in @@ -110,12 +110,10 @@ AUTOMAKE_OPTIONS = cygnus INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) -LIB_SOURCES = \ +GENERAL_SOURCES = \ ctype_.c \ isalnum.c \ isalpha.c \ - isascii.c \ - isblank.c \ iscntrl.c \ isdigit.c \ islower.c \ @@ -124,21 +122,29 @@ LIB_SOURCES = \ ispunct.c \ isspace.c \ isxdigit.c \ - toascii.c \ tolower.c \ - toupper.c \ - _tolower.c \ - _toupper.c + toupper.c +@ELIX_LEVEL_1_TRUE@LIB_OBJS = +@ELIX_LEVEL_1_FALSE@LIB_OBJS = @ELIX_LEVEL_1_FALSE@\ +@ELIX_LEVEL_1_FALSE@ isascii.$(oext) \ +@ELIX_LEVEL_1_FALSE@ isblank.$(oext) \ +@ELIX_LEVEL_1_FALSE@ toascii.$(oext) \ +@ELIX_LEVEL_1_FALSE@ _tolower.$(oext) \ +@ELIX_LEVEL_1_FALSE@ _toupper.$(oext) libctype_la_LDFLAGS = -Xcompiler -nostdlib @USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = @USE_LIBTOOL_TRUE@libctype.la -@USE_LIBTOOL_TRUE@libctype_la_SOURCES = @USE_LIBTOOL_TRUE@$(LIB_SOURCES) +@USE_LIBTOOL_TRUE@libctype_la_SOURCES = @USE_LIBTOOL_TRUE@$(GENERAL_SOURCES) +@USE_LIBTOOL_TRUE@libctype_la_LIBADD = @USE_LIBTOOL_TRUE@$(LIB_OBJS) +@USE_LIBTOOL_TRUE@libctype_la_DEPENDENCIES = @USE_LIBTOOL_TRUE@$(LIB_OBJS) @USE_LIBTOOL_TRUE@noinst_DATA = @USE_LIBTOOL_TRUE@objectlist.awk.in @USE_LIBTOOL_FALSE@noinst_DATA = @USE_LIBTOOL_FALSE@noinst_LIBRARIES = @USE_LIBTOOL_FALSE@lib.a -@USE_LIBTOOL_FALSE@lib_a_SOURCES = @USE_LIBTOOL_FALSE@$(LIB_SOURCES) +@USE_LIBTOOL_FALSE@lib_a_SOURCES = @USE_LIBTOOL_FALSE@$(GENERAL_SOURCES) +@USE_LIBTOOL_FALSE@lib_a_LIBADD = @USE_LIBTOOL_FALSE@$(LIB_OBJS) +@USE_LIBTOOL_FALSE@lib_a_DEPENDENCIES = @USE_LIBTOOL_FALSE@$(LIB_OBJS) CHEWOUT_FILES = \ isalnum.def \ @@ -172,24 +178,19 @@ LIBRARIES = $(noinst_LIBRARIES) DEFS = @DEFS@ -I. -I$(srcdir) CPPFLAGS = @CPPFLAGS@ LIBS = @LIBS@ -lib_a_LIBADD = @USE_LIBTOOL_FALSE@lib_a_OBJECTS = ctype_.$(OBJEXT) isalnum.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@isalpha.$(OBJEXT) isascii.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@isblank.$(OBJEXT) iscntrl.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@isalpha.$(OBJEXT) iscntrl.$(OBJEXT) \ @USE_LIBTOOL_FALSE@isdigit.$(OBJEXT) islower.$(OBJEXT) \ @USE_LIBTOOL_FALSE@isupper.$(OBJEXT) isprint.$(OBJEXT) \ @USE_LIBTOOL_FALSE@ispunct.$(OBJEXT) isspace.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@isxdigit.$(OBJEXT) toascii.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@tolower.$(OBJEXT) toupper.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@_tolower.$(OBJEXT) _toupper.$(OBJEXT) +@USE_LIBTOOL_FALSE@isxdigit.$(OBJEXT) tolower.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@toupper.$(OBJEXT) LTLIBRARIES = $(noinst_LTLIBRARIES) -libctype_la_LIBADD = @USE_LIBTOOL_TRUE@libctype_la_OBJECTS = ctype_.lo isalnum.lo isalpha.lo \ -@USE_LIBTOOL_TRUE@isascii.lo isblank.lo iscntrl.lo isdigit.lo \ -@USE_LIBTOOL_TRUE@islower.lo isupper.lo isprint.lo ispunct.lo \ -@USE_LIBTOOL_TRUE@isspace.lo isxdigit.lo toascii.lo tolower.lo \ -@USE_LIBTOOL_TRUE@toupper.lo _tolower.lo _toupper.lo +@USE_LIBTOOL_TRUE@iscntrl.lo isdigit.lo islower.lo isupper.lo \ +@USE_LIBTOOL_TRUE@isprint.lo ispunct.lo isspace.lo isxdigit.lo \ +@USE_LIBTOOL_TRUE@tolower.lo toupper.lo CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) diff --git a/newlib/libc/locale/Makefile.am b/newlib/libc/locale/Makefile.am index 7b7098f3a..bffe9be9b 100644 --- a/newlib/libc/locale/Makefile.am +++ b/newlib/libc/locale/Makefile.am @@ -4,17 +4,35 @@ AUTOMAKE_OPTIONS = cygnus INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) -LIB_SOURCES = timelocal.h timelocal.c ldpart.h ldpart.c fix_grouping.c locale.c nl_langinfo.c lnumeric.h lnumeric.c lmonetary.h lmonetary.c lmessages.h lmessages.c +GENERAL_SOURCES = timelocal.h ldpart.h locale.c lnumeric.h lmonetary.h lmessages.h + +## The following interfaces are EL/IX level 2 +if ELIX_LEVEL_1 +LIB_OBJS = +else +LIB_OBJS = \ + fix_grouping.$(oext) \ + ldpart.$(oext) \ + lmessages.$(oext) \ + lnumeric.$(oext) \ + lmonetary.$(oext) \ + nl_langinfo.$(oext) \ + timelocal.$(oext) +endif liblocale_la_LDFLAGS = -Xcompiler -nostdlib if USE_LIBTOOL noinst_LTLIBRARIES = liblocale.la -liblocale_la_SOURCES = $(LIB_SOURCES) +liblocale_la_SOURCES = $(GENERAL_SOURCES) +liblocale_la_LIBADD = $(LIB_OBJS) +liblocale_la_DEPENDENCIES = $(LIB_OBJS) noinst_DATA = objectlist.awk.in else noinst_LIBRARIES = lib.a -lib_a_SOURCES = $(LIB_SOURCES) +lib_a_SOURCES = $(GENERAL_SOURCES) +lib_a_LIBADD = $(LIB_OBJS) +lib_a_DEPENDENCIES = $(LIB_OBJS) noinst_DATA = endif # USE_LIBTOOL diff --git a/newlib/libc/locale/Makefile.in b/newlib/libc/locale/Makefile.in index f314b7014..8d6d0f61d 100644 --- a/newlib/libc/locale/Makefile.in +++ b/newlib/libc/locale/Makefile.in @@ -110,16 +110,29 @@ AUTOMAKE_OPTIONS = cygnus INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) -LIB_SOURCES = timelocal.h timelocal.c ldpart.h ldpart.c fix_grouping.c locale.c nl_langinfo.c lnumeric.h lnumeric.c lmonetary.h lmonetary.c lmessages.h lmessages.c +GENERAL_SOURCES = timelocal.h ldpart.h locale.c lnumeric.h lmonetary.h lmessages.h +@ELIX_LEVEL_1_TRUE@LIB_OBJS = +@ELIX_LEVEL_1_FALSE@LIB_OBJS = @ELIX_LEVEL_1_FALSE@\ +@ELIX_LEVEL_1_FALSE@ fix_grouping.$(oext) \ +@ELIX_LEVEL_1_FALSE@ ldpart.$(oext) \ +@ELIX_LEVEL_1_FALSE@ lmessages.$(oext) \ +@ELIX_LEVEL_1_FALSE@ lnumeric.$(oext) \ +@ELIX_LEVEL_1_FALSE@ lmonetary.$(oext) \ +@ELIX_LEVEL_1_FALSE@ nl_langinfo.$(oext) \ +@ELIX_LEVEL_1_FALSE@ timelocal.$(oext) liblocale_la_LDFLAGS = -Xcompiler -nostdlib @USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = @USE_LIBTOOL_TRUE@liblocale.la -@USE_LIBTOOL_TRUE@liblocale_la_SOURCES = @USE_LIBTOOL_TRUE@$(LIB_SOURCES) +@USE_LIBTOOL_TRUE@liblocale_la_SOURCES = @USE_LIBTOOL_TRUE@$(GENERAL_SOURCES) +@USE_LIBTOOL_TRUE@liblocale_la_LIBADD = @USE_LIBTOOL_TRUE@$(LIB_OBJS) +@USE_LIBTOOL_TRUE@liblocale_la_DEPENDENCIES = @USE_LIBTOOL_TRUE@$(LIB_OBJS) @USE_LIBTOOL_TRUE@noinst_DATA = @USE_LIBTOOL_TRUE@objectlist.awk.in @USE_LIBTOOL_FALSE@noinst_DATA = @USE_LIBTOOL_FALSE@noinst_LIBRARIES = @USE_LIBTOOL_FALSE@lib.a -@USE_LIBTOOL_FALSE@lib_a_SOURCES = @USE_LIBTOOL_FALSE@$(LIB_SOURCES) +@USE_LIBTOOL_FALSE@lib_a_SOURCES = @USE_LIBTOOL_FALSE@$(GENERAL_SOURCES) +@USE_LIBTOOL_FALSE@lib_a_LIBADD = @USE_LIBTOOL_FALSE@$(LIB_OBJS) +@USE_LIBTOOL_FALSE@lib_a_DEPENDENCIES = @USE_LIBTOOL_FALSE@$(LIB_OBJS) CHEWOUT_FILES = locale.def @@ -138,17 +151,10 @@ LIBRARIES = $(noinst_LIBRARIES) DEFS = @DEFS@ -I. -I$(srcdir) CPPFLAGS = @CPPFLAGS@ LIBS = @LIBS@ -lib_a_LIBADD = -@USE_LIBTOOL_FALSE@lib_a_OBJECTS = timelocal.$(OBJEXT) ldpart.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@fix_grouping.$(OBJEXT) locale.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@nl_langinfo.$(OBJEXT) lnumeric.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@lmonetary.$(OBJEXT) lmessages.$(OBJEXT) +@USE_LIBTOOL_FALSE@lib_a_OBJECTS = locale.$(OBJEXT) LTLIBRARIES = $(noinst_LTLIBRARIES) -liblocale_la_LIBADD = -@USE_LIBTOOL_TRUE@liblocale_la_OBJECTS = timelocal.lo ldpart.lo \ -@USE_LIBTOOL_TRUE@fix_grouping.lo locale.lo nl_langinfo.lo lnumeric.lo \ -@USE_LIBTOOL_TRUE@lmonetary.lo lmessages.lo +@USE_LIBTOOL_TRUE@liblocale_la_OBJECTS = locale.lo CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) diff --git a/newlib/libc/posix/Makefile.am b/newlib/libc/posix/Makefile.am index a43bcc687..d39aed316 100644 --- a/newlib/libc/posix/Makefile.am +++ b/newlib/libc/posix/Makefile.am @@ -4,20 +4,48 @@ AUTOMAKE_OPTIONS = cygnus INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) -LIB_SOURCES = \ - closedir.c opendir.c readdir.c rewinddir.c scandir.c seekdir.c \ - telldir.c execl.c execle.c execlp.c execv.c execve.c execvp.c \ - popen.c creat.c isatty.c readdir_r.c +GENERAL_SOURCES = \ + closedir.c creat.c isatty.c \ + opendir.c readdir.c \ + readdir_r.c rewinddir.c telldir.c + +ELIX_2_OBJS = \ + scandir.$(oext) seekdir.$(oext) + +ELIX_3_OBJS = \ + execl.$(oext) execle.$(oext) execlp.$(oext) execv.$(oext) \ + execve.$(oext) execvp.$(oext) + +ELIX_4_OBJS = \ + popen.$(oext) + +if ELIX_LEVEL_1 +LIB_OBJS = +else +if ELIX_LEVEL_2 +LIB_OBJS = $(ELIX_2_OBJS) +else +if ELIX_LEVEL_3 +LIB_OBJS = $(ELIX_2_OBJS) $(ELIX_3_OBJS) +else +LIB_OBJS = $(ELIX_2_OBJS) $(ELIX_3_OBJS) $(ELIX_4_OBJS) +endif +endif +endif libposix_la_LDFLAGS = -Xcompiler -nostdlib if USE_LIBTOOL noinst_LTLIBRARIES = libposix.la -libposix_la_SOURCES = $(LIB_SOURCES) +libposix_la_SOURCES = $(GENERAL_SOURCES) +libposix_la_LIBADD = $(LIB_OBJS) +libposix_la_DEPENDENCIES = $(LIB_OBJS) noinst_DATA = objectlist.awk.in else noinst_LIBRARIES = lib.a -lib_a_SOURCES = $(LIB_SOURCES) +lib_a_SOURCES = $(GENERAL_SOURCES) +lib_a_LIBADD = $(LIB_OBJS) +lib_a_DEPENDENCIES = $(LIB_OBJS) noinst_DATA = endif # USE_LIBTOOL diff --git a/newlib/libc/posix/Makefile.in b/newlib/libc/posix/Makefile.in index c2f6359f9..71430dda5 100644 --- a/newlib/libc/posix/Makefile.in +++ b/newlib/libc/posix/Makefile.in @@ -110,20 +110,41 @@ AUTOMAKE_OPTIONS = cygnus INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) -LIB_SOURCES = \ - closedir.c opendir.c readdir.c rewinddir.c scandir.c seekdir.c \ - telldir.c execl.c execle.c execlp.c execv.c execve.c execvp.c \ - popen.c creat.c isatty.c readdir_r.c +GENERAL_SOURCES = \ + closedir.c creat.c isatty.c \ + opendir.c readdir.c \ + readdir_r.c rewinddir.c telldir.c +ELIX_2_OBJS = \ + scandir.$(oext) seekdir.$(oext) + + +ELIX_3_OBJS = \ + execl.$(oext) execle.$(oext) execlp.$(oext) execv.$(oext) \ + execve.$(oext) execvp.$(oext) + + +ELIX_4_OBJS = \ + popen.$(oext) + +@ELIX_LEVEL_1_TRUE@LIB_OBJS = +@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_TRUE@LIB_OBJS = @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_TRUE@$(ELIX_2_OBJS) +@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_TRUE@LIB_OBJS = @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_TRUE@$(ELIX_2_OBJS) $(ELIX_3_OBJS) +@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@LIB_OBJS = @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@$(ELIX_2_OBJS) $(ELIX_3_OBJS) $(ELIX_4_OBJS) + libposix_la_LDFLAGS = -Xcompiler -nostdlib @USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = @USE_LIBTOOL_TRUE@libposix.la -@USE_LIBTOOL_TRUE@libposix_la_SOURCES = @USE_LIBTOOL_TRUE@$(LIB_SOURCES) +@USE_LIBTOOL_TRUE@libposix_la_SOURCES = @USE_LIBTOOL_TRUE@$(GENERAL_SOURCES) +@USE_LIBTOOL_TRUE@libposix_la_LIBADD = @USE_LIBTOOL_TRUE@$(LIB_OBJS) +@USE_LIBTOOL_TRUE@libposix_la_DEPENDENCIES = @USE_LIBTOOL_TRUE@$(LIB_OBJS) @USE_LIBTOOL_TRUE@noinst_DATA = @USE_LIBTOOL_TRUE@objectlist.awk.in @USE_LIBTOOL_FALSE@noinst_DATA = @USE_LIBTOOL_FALSE@noinst_LIBRARIES = @USE_LIBTOOL_FALSE@lib.a -@USE_LIBTOOL_FALSE@lib_a_SOURCES = @USE_LIBTOOL_FALSE@$(LIB_SOURCES) +@USE_LIBTOOL_FALSE@lib_a_SOURCES = @USE_LIBTOOL_FALSE@$(GENERAL_SOURCES) +@USE_LIBTOOL_FALSE@lib_a_LIBADD = @USE_LIBTOOL_FALSE@$(LIB_OBJS) +@USE_LIBTOOL_FALSE@lib_a_DEPENDENCIES = @USE_LIBTOOL_FALSE@$(LIB_OBJS) CHEWOUT_FILES = @@ -142,22 +163,15 @@ LIBRARIES = $(noinst_LIBRARIES) DEFS = @DEFS@ -I. -I$(srcdir) CPPFLAGS = @CPPFLAGS@ LIBS = @LIBS@ -lib_a_LIBADD = -@USE_LIBTOOL_FALSE@lib_a_OBJECTS = closedir.$(OBJEXT) opendir.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@readdir.$(OBJEXT) rewinddir.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@scandir.$(OBJEXT) seekdir.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@telldir.$(OBJEXT) execl.$(OBJEXT) execle.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@execlp.$(OBJEXT) execv.$(OBJEXT) execve.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@execvp.$(OBJEXT) popen.$(OBJEXT) creat.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@isatty.$(OBJEXT) readdir_r.$(OBJEXT) +@USE_LIBTOOL_FALSE@lib_a_OBJECTS = closedir.$(OBJEXT) creat.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@isatty.$(OBJEXT) opendir.$(OBJEXT) readdir.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@readdir_r.$(OBJEXT) rewinddir.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@telldir.$(OBJEXT) LTLIBRARIES = $(noinst_LTLIBRARIES) -libposix_la_LIBADD = -@USE_LIBTOOL_TRUE@libposix_la_OBJECTS = closedir.lo opendir.lo \ -@USE_LIBTOOL_TRUE@readdir.lo rewinddir.lo scandir.lo seekdir.lo \ -@USE_LIBTOOL_TRUE@telldir.lo execl.lo execle.lo execlp.lo execv.lo \ -@USE_LIBTOOL_TRUE@execve.lo execvp.lo popen.lo creat.lo isatty.lo \ -@USE_LIBTOOL_TRUE@readdir_r.lo +@USE_LIBTOOL_TRUE@libposix_la_OBJECTS = closedir.lo creat.lo isatty.lo \ +@USE_LIBTOOL_TRUE@opendir.lo readdir.lo readdir_r.lo rewinddir.lo \ +@USE_LIBTOOL_TRUE@telldir.lo CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) diff --git a/newlib/libc/posix/telldir.c b/newlib/libc/posix/telldir.c index 6022bbe19..4e51114fd 100644 --- a/newlib/libc/posix/telldir.c +++ b/newlib/libc/posix/telldir.c @@ -74,6 +74,9 @@ __LOCK_INIT(static, dd_hash_lock); /* * return a pointer into a directory */ + +#ifndef _ELIX_LEVEL || _ELIX_LEVEL >= 2 + long telldir(dirp) DIR *dirp; @@ -102,6 +105,8 @@ telldir(dirp) return (index); } +#endif /* !_ELIX_LEVEL || _ELIX_LEVEL >= 2 */ + /* * seek to an entry in a directory. * Only values returned by "telldir" should be passed to seekdir. diff --git a/newlib/libc/reent/Makefile.am b/newlib/libc/reent/Makefile.am index 0504158d4..a94be9b5e 100644 --- a/newlib/libc/reent/Makefile.am +++ b/newlib/libc/reent/Makefile.am @@ -16,11 +16,23 @@ STDIO64_DEFS = \ open64r.def endif -LIB_SOURCES = \ +ELIX_2_OBJS = $(STDIO64_OBJECTS) +ELIX_3_OBJS = execr.$(oext) + +if ELIX_LEVEL_1 +LIB_OBJS = +else +if ELIX_LEVEL_2 +LIB_OBJS = $(ELIX_2_OBJS) +else +LIB_OBJS = $(ELIX_2_OBJS) $(ELIX_3_OBJS) +endif +endif + +GENERAL_SOURCES = \ closer.c \ reent.c \ impure.c \ - execr.c \ fstatr.c \ getreent.c \ linkr.c \ @@ -39,15 +51,15 @@ libreent_la_LDFLAGS = -Xcompiler -nostdlib if USE_LIBTOOL noinst_LTLIBRARIES = libreent.la -libreent_la_SOURCES = $(LIB_SOURCES) -libreent_la_LIBADD = $(STDIO64_OBJECTS) -libreent_la_DEPENDENCIES = $(STDIO64_OBJECTS) +libreent_la_SOURCES = $(GENERAL_SOURCES) +libreent_la_LIBADD = $(LIB_OBJS) +libreent_la_DEPENDENCIES = $(LIB_OBJS) noinst_DATA = objectlist.awk.in else noinst_LIBRARIES = lib.a -lib_a_SOURCES = $(LIB_SOURCES) -lib_a_LIBADD = $(STDIO64_OBJECTS) -lib_a_DEPENDENCIES = $(STDIO64_OBJECTS) +lib_a_SOURCES = $(GENERAL_SOURCES) +lib_a_LIBADD = $(LIB_OBJS) +lib_a_DEPENDENCIES = $(LIB_OBJS) noinst_DATA = endif # USE_LIBTOOL diff --git a/newlib/libc/reent/Makefile.in b/newlib/libc/reent/Makefile.in index 91d0bce7a..8333eafe5 100644 --- a/newlib/libc/reent/Makefile.in +++ b/newlib/libc/reent/Makefile.in @@ -120,11 +120,16 @@ INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) @HAVE_STDIO64_DIR_TRUE@ lseek64r.def \ @HAVE_STDIO64_DIR_TRUE@ open64r.def -LIB_SOURCES = \ +ELIX_2_OBJS = $(STDIO64_OBJECTS) +ELIX_3_OBJS = execr.$(oext) +@ELIX_LEVEL_1_TRUE@LIB_OBJS = +@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_TRUE@LIB_OBJS = @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_TRUE@$(ELIX_2_OBJS) +@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@LIB_OBJS = @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@$(ELIX_2_OBJS) $(ELIX_3_OBJS) + +GENERAL_SOURCES = \ closer.c \ reent.c \ impure.c \ - execr.c \ fstatr.c \ getreent.c \ linkr.c \ @@ -143,15 +148,15 @@ LIB_SOURCES = \ libreent_la_LDFLAGS = -Xcompiler -nostdlib @USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = @USE_LIBTOOL_TRUE@libreent.la -@USE_LIBTOOL_TRUE@libreent_la_SOURCES = @USE_LIBTOOL_TRUE@$(LIB_SOURCES) -@USE_LIBTOOL_TRUE@libreent_la_LIBADD = @USE_LIBTOOL_TRUE@$(STDIO64_OBJECTS) -@USE_LIBTOOL_TRUE@libreent_la_DEPENDENCIES = @USE_LIBTOOL_TRUE@$(STDIO64_OBJECTS) +@USE_LIBTOOL_TRUE@libreent_la_SOURCES = @USE_LIBTOOL_TRUE@$(GENERAL_SOURCES) +@USE_LIBTOOL_TRUE@libreent_la_LIBADD = @USE_LIBTOOL_TRUE@$(LIB_OBJS) +@USE_LIBTOOL_TRUE@libreent_la_DEPENDENCIES = @USE_LIBTOOL_TRUE@$(LIB_OBJS) @USE_LIBTOOL_TRUE@noinst_DATA = @USE_LIBTOOL_TRUE@objectlist.awk.in @USE_LIBTOOL_FALSE@noinst_DATA = @USE_LIBTOOL_FALSE@noinst_LIBRARIES = @USE_LIBTOOL_FALSE@lib.a -@USE_LIBTOOL_FALSE@lib_a_SOURCES = @USE_LIBTOOL_FALSE@$(LIB_SOURCES) -@USE_LIBTOOL_FALSE@lib_a_LIBADD = @USE_LIBTOOL_FALSE@$(STDIO64_OBJECTS) -@USE_LIBTOOL_FALSE@lib_a_DEPENDENCIES = @USE_LIBTOOL_FALSE@$(STDIO64_OBJECTS) +@USE_LIBTOOL_FALSE@lib_a_SOURCES = @USE_LIBTOOL_FALSE@$(GENERAL_SOURCES) +@USE_LIBTOOL_FALSE@lib_a_LIBADD = @USE_LIBTOOL_FALSE@$(LIB_OBJS) +@USE_LIBTOOL_FALSE@lib_a_DEPENDENCIES = @USE_LIBTOOL_FALSE@$(LIB_OBJS) CHEWOUT_FILES = \ closer.def \ @@ -187,17 +192,17 @@ DEFS = @DEFS@ -I. -I$(srcdir) CPPFLAGS = @CPPFLAGS@ LIBS = @LIBS@ @USE_LIBTOOL_FALSE@lib_a_OBJECTS = closer.$(OBJEXT) reent.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@impure.$(OBJEXT) execr.$(OBJEXT) fstatr.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@getreent.$(OBJEXT) linkr.$(OBJEXT) lseekr.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@openr.$(OBJEXT) readr.$(OBJEXT) signalr.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@signgam.$(OBJEXT) sbrkr.$(OBJEXT) statr.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@timer.$(OBJEXT) unlinkr.$(OBJEXT) writer.$(OBJEXT) +@USE_LIBTOOL_FALSE@impure.$(OBJEXT) fstatr.$(OBJEXT) getreent.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@linkr.$(OBJEXT) lseekr.$(OBJEXT) openr.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@readr.$(OBJEXT) signalr.$(OBJEXT) signgam.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@sbrkr.$(OBJEXT) statr.$(OBJEXT) timer.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@unlinkr.$(OBJEXT) writer.$(OBJEXT) LTLIBRARIES = $(noinst_LTLIBRARIES) @USE_LIBTOOL_TRUE@libreent_la_OBJECTS = closer.lo reent.lo impure.lo \ -@USE_LIBTOOL_TRUE@execr.lo fstatr.lo getreent.lo linkr.lo lseekr.lo \ -@USE_LIBTOOL_TRUE@openr.lo readr.lo signalr.lo signgam.lo sbrkr.lo \ -@USE_LIBTOOL_TRUE@statr.lo timer.lo unlinkr.lo writer.lo +@USE_LIBTOOL_TRUE@fstatr.lo getreent.lo linkr.lo lseekr.lo openr.lo \ +@USE_LIBTOOL_TRUE@readr.lo signalr.lo signgam.lo sbrkr.lo statr.lo \ +@USE_LIBTOOL_TRUE@timer.lo unlinkr.lo writer.lo CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) diff --git a/newlib/libc/reent/fstat64r.c b/newlib/libc/reent/fstat64r.c index c74cf58d4..c418778b7 100644 --- a/newlib/libc/reent/fstat64r.c +++ b/newlib/libc/reent/fstat64r.c @@ -1,5 +1,3 @@ -#ifdef __LARGE64_FILES - /* Reentrant versions of fstat system call. This implementation just calls the fstat system call. */ @@ -8,6 +6,8 @@ #include <sys/stat.h> #include <_syslist.h> +#ifdef __LARGE64_FILES + /* Some targets provides their own versions of these functions. Those targets should define REENTRANT_SYSCALLS_PROVIDED in TARGET_CFLAGS. */ diff --git a/newlib/libc/reent/lseek64r.c b/newlib/libc/reent/lseek64r.c index c760a5b5d..886734be8 100644 --- a/newlib/libc/reent/lseek64r.c +++ b/newlib/libc/reent/lseek64r.c @@ -1,5 +1,3 @@ -#ifdef __LARGE64_FILES - /* Reentrant versions of lseek system call. */ #include <reent.h> @@ -9,6 +7,8 @@ /* Some targets provides their own versions of this functions. Those targets should define REENTRANT_SYSCALLS_PROVIDED in TARGET_CFLAGS. */ +#ifdef __LARGE64_FILES + #ifdef _REENT_ONLY #ifndef REENTRANT_SYSCALLS_PROVIDED #define REENTRANT_SYSCALLS_PROVIDED diff --git a/newlib/libc/reent/open64r.c b/newlib/libc/reent/open64r.c index d5ec7bcc5..30310d301 100644 --- a/newlib/libc/reent/open64r.c +++ b/newlib/libc/reent/open64r.c @@ -1,5 +1,3 @@ -#ifdef __LARGE64_FILES - /* Reentrant versions of open system call. */ #include <reent.h> @@ -7,6 +5,8 @@ #include <fcntl.h> #include <_syslist.h> +#ifdef __LARGE64_FILES + /* Some targets provides their own versions of this functions. Those targets should define REENTRANT_SYSCALLS_PROVIDED in TARGET_CFLAGS. */ diff --git a/newlib/libc/search/Makefile.am b/newlib/libc/search/Makefile.am index 2f919dcf7..d170cfa3a 100644 --- a/newlib/libc/search/Makefile.am +++ b/newlib/libc/search/Makefile.am @@ -4,36 +4,47 @@ AUTOMAKE_OPTIONS = cygnus INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) -LIB_SOURCES = \ +GENERAL_SOURCES = \ bsearch.c \ db_local.h \ extern.h \ - hash.c \ hash.h \ - hash_bigkey.c \ - hash_buf.c \ - hash_func.c \ - hash_log2.c \ - hash_page.c \ - hcreate.c \ - hcreate_r.c \ page.h \ - qsort.c \ - tdelete.c \ - tdestroy.c \ - tfind.c \ - tsearch.c \ - twalk.c + qsort.c + +## Following are EL/IX level 2 interfaces +if ELIX_LEVEL_1 +LIB_OBJS = +else +LIB_OBJS = \ + hash.$(oext) \ + hash_bigkey.$(oext) \ + hash_buf.$(oext) \ + hash_func.$(oext) \ + hash_log2.$(oext) \ + hash_page.$(oext) \ + hcreate.$(oext) \ + hcreate_r.$(oext) \ + tdelete.$(oext) \ + tdestroy.$(oext) \ + tfind.$(oext) \ + tsearch.$(oext) \ + twalk.$(oext) +endif libsearch_la_LDFLAGS = -Xcompiler -nostdlib if USE_LIBTOOL noinst_LTLIBRARIES = libsearch.la -libsearch_la_SOURCES = $(LIB_SOURCES) +libsearch_la_SOURCES = $(GENERAL_SOURCES) +libsearch_la_LIBADD = $(LIB_OBJS) +libsearch_la_DEPENDENCIES = $(LIB_OBJS) noinst_DATA = objectlist.awk.in else noinst_LIBRARIES = lib.a -lib_a_SOURCES = $(LIB_SOURCES) +lib_a_SOURCES = $(GENERAL_SOURCES) +lib_a_LIBADD = $(LIB_OBJS) +lib_a_DEPENDENCIES = $(LIB_OBJS) noinst_DATA = endif # USE_LIBTOOL diff --git a/newlib/libc/search/Makefile.in b/newlib/libc/search/Makefile.in index 7a9247e19..2aa82fe1a 100644 --- a/newlib/libc/search/Makefile.in +++ b/newlib/libc/search/Makefile.in @@ -110,36 +110,42 @@ AUTOMAKE_OPTIONS = cygnus INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) -LIB_SOURCES = \ +GENERAL_SOURCES = \ bsearch.c \ db_local.h \ extern.h \ - hash.c \ hash.h \ - hash_bigkey.c \ - hash_buf.c \ - hash_func.c \ - hash_log2.c \ - hash_page.c \ - hcreate.c \ - hcreate_r.c \ page.h \ - qsort.c \ - tdelete.c \ - tdestroy.c \ - tfind.c \ - tsearch.c \ - twalk.c - + qsort.c + +@ELIX_LEVEL_1_TRUE@LIB_OBJS = +@ELIX_LEVEL_1_FALSE@LIB_OBJS = @ELIX_LEVEL_1_FALSE@\ +@ELIX_LEVEL_1_FALSE@ hash.$(oext) \ +@ELIX_LEVEL_1_FALSE@ hash_bigkey.$(oext) \ +@ELIX_LEVEL_1_FALSE@ hash_buf.$(oext) \ +@ELIX_LEVEL_1_FALSE@ hash_func.$(oext) \ +@ELIX_LEVEL_1_FALSE@ hash_log2.$(oext) \ +@ELIX_LEVEL_1_FALSE@ hash_page.$(oext) \ +@ELIX_LEVEL_1_FALSE@ hcreate.$(oext) \ +@ELIX_LEVEL_1_FALSE@ hcreate_r.$(oext) \ +@ELIX_LEVEL_1_FALSE@ tdelete.$(oext) \ +@ELIX_LEVEL_1_FALSE@ tdestroy.$(oext) \ +@ELIX_LEVEL_1_FALSE@ tfind.$(oext) \ +@ELIX_LEVEL_1_FALSE@ tsearch.$(oext) \ +@ELIX_LEVEL_1_FALSE@ twalk.$(oext) libsearch_la_LDFLAGS = -Xcompiler -nostdlib @USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = @USE_LIBTOOL_TRUE@libsearch.la -@USE_LIBTOOL_TRUE@libsearch_la_SOURCES = @USE_LIBTOOL_TRUE@$(LIB_SOURCES) +@USE_LIBTOOL_TRUE@libsearch_la_SOURCES = @USE_LIBTOOL_TRUE@$(GENERAL_SOURCES) +@USE_LIBTOOL_TRUE@libsearch_la_LIBADD = @USE_LIBTOOL_TRUE@$(LIB_OBJS) +@USE_LIBTOOL_TRUE@libsearch_la_DEPENDENCIES = @USE_LIBTOOL_TRUE@$(LIB_OBJS) @USE_LIBTOOL_TRUE@noinst_DATA = @USE_LIBTOOL_TRUE@objectlist.awk.in @USE_LIBTOOL_FALSE@noinst_DATA = @USE_LIBTOOL_FALSE@noinst_LIBRARIES = @USE_LIBTOOL_FALSE@lib.a -@USE_LIBTOOL_FALSE@lib_a_SOURCES = @USE_LIBTOOL_FALSE@$(LIB_SOURCES) +@USE_LIBTOOL_FALSE@lib_a_SOURCES = @USE_LIBTOOL_FALSE@$(GENERAL_SOURCES) +@USE_LIBTOOL_FALSE@lib_a_LIBADD = @USE_LIBTOOL_FALSE@$(LIB_OBJS) +@USE_LIBTOOL_FALSE@lib_a_DEPENDENCIES = @USE_LIBTOOL_FALSE@$(LIB_OBJS) SUFFIXES = .def @@ -158,21 +164,10 @@ LIBRARIES = $(noinst_LIBRARIES) DEFS = @DEFS@ -I. -I$(srcdir) CPPFLAGS = @CPPFLAGS@ LIBS = @LIBS@ -lib_a_LIBADD = -@USE_LIBTOOL_FALSE@lib_a_OBJECTS = bsearch.$(OBJEXT) hash.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@hash_bigkey.$(OBJEXT) hash_buf.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@hash_func.$(OBJEXT) hash_log2.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@hash_page.$(OBJEXT) hcreate.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@hcreate_r.$(OBJEXT) qsort.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@tdelete.$(OBJEXT) tdestroy.$(OBJEXT) tfind.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@tsearch.$(OBJEXT) twalk.$(OBJEXT) +@USE_LIBTOOL_FALSE@lib_a_OBJECTS = bsearch.$(OBJEXT) qsort.$(OBJEXT) LTLIBRARIES = $(noinst_LTLIBRARIES) -libsearch_la_LIBADD = -@USE_LIBTOOL_TRUE@libsearch_la_OBJECTS = bsearch.lo hash.lo \ -@USE_LIBTOOL_TRUE@hash_bigkey.lo hash_buf.lo hash_func.lo hash_log2.lo \ -@USE_LIBTOOL_TRUE@hash_page.lo hcreate.lo hcreate_r.lo qsort.lo \ -@USE_LIBTOOL_TRUE@tdelete.lo tdestroy.lo tfind.lo tsearch.lo twalk.lo +@USE_LIBTOOL_TRUE@libsearch_la_OBJECTS = bsearch.lo qsort.lo CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) diff --git a/newlib/libc/stdio/Makefile.am b/newlib/libc/stdio/Makefile.am index 77885e43e..ac388328e 100644 --- a/newlib/libc/stdio/Makefile.am +++ b/newlib/libc/stdio/Makefile.am @@ -4,11 +4,9 @@ AUTOMAKE_OPTIONS = cygnus INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) -LIB_SOURCES = \ - asprintf.c \ +GENERAL_SOURCES = \ clearerr.c \ fclose.c \ - fcloseall.c \ fdopen.c \ feof.c \ ferror.c \ @@ -28,10 +26,8 @@ LIB_SOURCES = \ freopen.c \ fscanf.c \ fseek.c \ - fseeko.c \ fsetpos.c \ ftell.c \ - ftello.c \ fvwrite.c \ fwalk.c \ fwrite.c \ @@ -42,10 +38,8 @@ LIB_SOURCES = \ getdelim.c \ getline.c \ gets.c \ - getw.c \ iprintf.c \ makebuf.c \ - mktemp.c \ perror.c \ printf.c \ putc.c \ @@ -53,7 +47,6 @@ LIB_SOURCES = \ putc_u.c \ putchar_u.c \ puts.c \ - putw.c \ refill.c \ remove.c \ rename.c \ @@ -72,7 +65,6 @@ LIB_SOURCES = \ tmpfile.c \ tmpnam.c \ ungetc.c \ - vasprintf.c \ vfscanf.c \ vprintf.c \ vscanf.c \ @@ -82,20 +74,36 @@ LIB_SOURCES = \ wbuf.c \ wsetup.c +## The following are EL/IX level 2 interfaces +if ELIX_LEVEL_1 +LIB_OBJS = +else +LIB_OBJS = \ + asprintf.$(oext) \ + fcloseall.$(oext) \ + fseeko.$(oext) \ + ftello.$(oext) \ + getw.$(oext) \ + mktemp.$(oext) \ + putw.$(oext) +endif + LIBADD_OBJS = vfiprintf.$(oext) vfprintf.$(oext) libstdio_la_LDFLAGS = -Xcompiler -nostdlib if USE_LIBTOOL noinst_LTLIBRARIES = libstdio.la -libstdio_la_SOURCES = $(LIB_SOURCES) -libstdio_la_LIBADD = $(LIBADD_OBJS) +libstdio_la_SOURCES = $(GENERAL_SOURCES) +libstdio_la_LIBADD = $(LIBADD_OBJS) $(LIB_OBJS) +libstdio_la_DEPENDENCIES = $(LIBADD_OBJS) $(LIB_OBJS) LIB_COMPILE = $(LTCOMPILE) noinst_DATA = objectlist.awk.in else noinst_LIBRARIES = lib.a -lib_a_SOURCES = $(LIB_SOURCES) -lib_a_LIBADD = $(LIBADD_OBJS) +lib_a_SOURCES = $(GENERAL_SOURCES) +lib_a_LIBADD = $(LIBADD_OBJS) $(LIB_OBJS) +lib_a_DEPENDENCIES = $(LIBADD_OBJS) $(LIB_OBJS) LIB_COMPILE = $(COMPILE) noinst_DATA = endif # USE_LIBTOOL diff --git a/newlib/libc/stdio/Makefile.in b/newlib/libc/stdio/Makefile.in index d9a09e327..cd498237f 100644 --- a/newlib/libc/stdio/Makefile.in +++ b/newlib/libc/stdio/Makefile.in @@ -110,11 +110,9 @@ AUTOMAKE_OPTIONS = cygnus INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) -LIB_SOURCES = \ - asprintf.c \ +GENERAL_SOURCES = \ clearerr.c \ fclose.c \ - fcloseall.c \ fdopen.c \ feof.c \ ferror.c \ @@ -134,10 +132,8 @@ LIB_SOURCES = \ freopen.c \ fscanf.c \ fseek.c \ - fseeko.c \ fsetpos.c \ ftell.c \ - ftello.c \ fvwrite.c \ fwalk.c \ fwrite.c \ @@ -148,10 +144,8 @@ LIB_SOURCES = \ getdelim.c \ getline.c \ gets.c \ - getw.c \ iprintf.c \ makebuf.c \ - mktemp.c \ perror.c \ printf.c \ putc.c \ @@ -159,7 +153,6 @@ LIB_SOURCES = \ putc_u.c \ putchar_u.c \ puts.c \ - putw.c \ refill.c \ remove.c \ rename.c \ @@ -178,7 +171,6 @@ LIB_SOURCES = \ tmpfile.c \ tmpnam.c \ ungetc.c \ - vasprintf.c \ vfscanf.c \ vprintf.c \ vscanf.c \ @@ -188,21 +180,32 @@ LIB_SOURCES = \ wbuf.c \ wsetup.c +@ELIX_LEVEL_1_TRUE@LIB_OBJS = +@ELIX_LEVEL_1_FALSE@LIB_OBJS = @ELIX_LEVEL_1_FALSE@\ +@ELIX_LEVEL_1_FALSE@ asprintf.$(oext) \ +@ELIX_LEVEL_1_FALSE@ fcloseall.$(oext) \ +@ELIX_LEVEL_1_FALSE@ fseeko.$(oext) \ +@ELIX_LEVEL_1_FALSE@ ftello.$(oext) \ +@ELIX_LEVEL_1_FALSE@ getw.$(oext) \ +@ELIX_LEVEL_1_FALSE@ mktemp.$(oext) \ +@ELIX_LEVEL_1_FALSE@ putw.$(oext) LIBADD_OBJS = vfiprintf.$(oext) vfprintf.$(oext) libstdio_la_LDFLAGS = -Xcompiler -nostdlib @USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = @USE_LIBTOOL_TRUE@libstdio.la -@USE_LIBTOOL_TRUE@libstdio_la_SOURCES = @USE_LIBTOOL_TRUE@$(LIB_SOURCES) -@USE_LIBTOOL_TRUE@libstdio_la_LIBADD = @USE_LIBTOOL_TRUE@$(LIBADD_OBJS) +@USE_LIBTOOL_TRUE@libstdio_la_SOURCES = @USE_LIBTOOL_TRUE@$(GENERAL_SOURCES) +@USE_LIBTOOL_TRUE@libstdio_la_LIBADD = @USE_LIBTOOL_TRUE@$(LIBADD_OBJS) $(LIB_OBJS) +@USE_LIBTOOL_TRUE@libstdio_la_DEPENDENCIES = @USE_LIBTOOL_TRUE@$(LIBADD_OBJS) $(LIB_OBJS) @USE_LIBTOOL_TRUE@LIB_COMPILE = @USE_LIBTOOL_TRUE@$(LTCOMPILE) @USE_LIBTOOL_FALSE@LIB_COMPILE = @USE_LIBTOOL_FALSE@$(COMPILE) @USE_LIBTOOL_TRUE@noinst_DATA = @USE_LIBTOOL_TRUE@objectlist.awk.in @USE_LIBTOOL_FALSE@noinst_DATA = @USE_LIBTOOL_FALSE@noinst_LIBRARIES = @USE_LIBTOOL_FALSE@lib.a -@USE_LIBTOOL_FALSE@lib_a_SOURCES = @USE_LIBTOOL_FALSE@$(LIB_SOURCES) -@USE_LIBTOOL_FALSE@lib_a_LIBADD = @USE_LIBTOOL_FALSE@$(LIBADD_OBJS) +@USE_LIBTOOL_FALSE@lib_a_SOURCES = @USE_LIBTOOL_FALSE@$(GENERAL_SOURCES) +@USE_LIBTOOL_FALSE@lib_a_LIBADD = @USE_LIBTOOL_FALSE@$(LIBADD_OBJS) $(LIB_OBJS) +@USE_LIBTOOL_FALSE@lib_a_DEPENDENCIES = @USE_LIBTOOL_FALSE@$(LIBADD_OBJS) $(LIB_OBJS) CHEWOUT_FILES = \ clearerr.def \ @@ -274,56 +277,46 @@ LIBRARIES = $(noinst_LIBRARIES) DEFS = @DEFS@ -I. -I$(srcdir) CPPFLAGS = @CPPFLAGS@ LIBS = @LIBS@ -@USE_LIBTOOL_FALSE@lib_a_DEPENDENCIES = vfiprintf.$(oext) \ -@USE_LIBTOOL_FALSE@vfprintf.$(oext) -@USE_LIBTOOL_FALSE@lib_a_OBJECTS = asprintf.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@clearerr.$(OBJEXT) fclose.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@fcloseall.$(OBJEXT) fdopen.$(OBJEXT) feof.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@ferror.$(OBJEXT) fflush.$(OBJEXT) fgetc.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@fgetpos.$(OBJEXT) fgets.$(OBJEXT) fileno.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@findfp.$(OBJEXT) fiprintf.$(OBJEXT) flags.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@fopen.$(OBJEXT) fprintf.$(OBJEXT) fputc.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@fputs.$(OBJEXT) fread.$(OBJEXT) freopen.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@fscanf.$(OBJEXT) fseek.$(OBJEXT) fseeko.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@fsetpos.$(OBJEXT) ftell.$(OBJEXT) ftello.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@lib_a_OBJECTS = clearerr.$(OBJEXT) fclose.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@fdopen.$(OBJEXT) feof.$(OBJEXT) ferror.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@fflush.$(OBJEXT) fgetc.$(OBJEXT) fgetpos.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@fgets.$(OBJEXT) fileno.$(OBJEXT) findfp.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@fiprintf.$(OBJEXT) flags.$(OBJEXT) fopen.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@fprintf.$(OBJEXT) fputc.$(OBJEXT) fputs.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@fread.$(OBJEXT) freopen.$(OBJEXT) fscanf.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@fseek.$(OBJEXT) fsetpos.$(OBJEXT) ftell.$(OBJEXT) \ @USE_LIBTOOL_FALSE@fvwrite.$(OBJEXT) fwalk.$(OBJEXT) fwrite.$(OBJEXT) \ @USE_LIBTOOL_FALSE@getc.$(OBJEXT) getchar.$(OBJEXT) getc_u.$(OBJEXT) \ @USE_LIBTOOL_FALSE@getchar_u.$(OBJEXT) getdelim.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@getline.$(OBJEXT) gets.$(OBJEXT) getw.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@iprintf.$(OBJEXT) makebuf.$(OBJEXT) mktemp.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@perror.$(OBJEXT) printf.$(OBJEXT) putc.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@putchar.$(OBJEXT) putc_u.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@putchar_u.$(OBJEXT) puts.$(OBJEXT) putw.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@refill.$(OBJEXT) remove.$(OBJEXT) rename.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@rewind.$(OBJEXT) rget.$(OBJEXT) scanf.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@setbuf.$(OBJEXT) setbuffer.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@setlinebuf.$(OBJEXT) setvbuf.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@siprintf.$(OBJEXT) snprintf.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@sprintf.$(OBJEXT) sscanf.$(OBJEXT) stdio.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@tmpfile.$(OBJEXT) tmpnam.$(OBJEXT) ungetc.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@vasprintf.$(OBJEXT) vfscanf.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@getline.$(OBJEXT) gets.$(OBJEXT) iprintf.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@makebuf.$(OBJEXT) perror.$(OBJEXT) printf.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@putc.$(OBJEXT) putchar.$(OBJEXT) putc_u.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@putchar_u.$(OBJEXT) puts.$(OBJEXT) refill.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@remove.$(OBJEXT) rename.$(OBJEXT) rewind.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@rget.$(OBJEXT) scanf.$(OBJEXT) setbuf.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@setbuffer.$(OBJEXT) setlinebuf.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@setvbuf.$(OBJEXT) siprintf.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@snprintf.$(OBJEXT) sprintf.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@sscanf.$(OBJEXT) stdio.$(OBJEXT) tmpfile.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@tmpnam.$(OBJEXT) ungetc.$(OBJEXT) vfscanf.$(OBJEXT) \ @USE_LIBTOOL_FALSE@vprintf.$(OBJEXT) vscanf.$(OBJEXT) \ @USE_LIBTOOL_FALSE@vsnprintf.$(OBJEXT) vsprintf.$(OBJEXT) \ @USE_LIBTOOL_FALSE@vsscanf.$(OBJEXT) wbuf.$(OBJEXT) wsetup.$(OBJEXT) LTLIBRARIES = $(noinst_LTLIBRARIES) -@USE_LIBTOOL_TRUE@libstdio_la_DEPENDENCIES = vfiprintf.$(oext) \ -@USE_LIBTOOL_TRUE@vfprintf.$(oext) -@USE_LIBTOOL_TRUE@libstdio_la_OBJECTS = asprintf.lo clearerr.lo \ -@USE_LIBTOOL_TRUE@fclose.lo fcloseall.lo fdopen.lo feof.lo ferror.lo \ -@USE_LIBTOOL_TRUE@fflush.lo fgetc.lo fgetpos.lo fgets.lo fileno.lo \ -@USE_LIBTOOL_TRUE@findfp.lo fiprintf.lo flags.lo fopen.lo fprintf.lo \ -@USE_LIBTOOL_TRUE@fputc.lo fputs.lo fread.lo freopen.lo fscanf.lo \ -@USE_LIBTOOL_TRUE@fseek.lo fseeko.lo fsetpos.lo ftell.lo ftello.lo \ +@USE_LIBTOOL_TRUE@libstdio_la_OBJECTS = clearerr.lo fclose.lo fdopen.lo \ +@USE_LIBTOOL_TRUE@feof.lo ferror.lo fflush.lo fgetc.lo fgetpos.lo \ +@USE_LIBTOOL_TRUE@fgets.lo fileno.lo findfp.lo fiprintf.lo flags.lo \ +@USE_LIBTOOL_TRUE@fopen.lo fprintf.lo fputc.lo fputs.lo fread.lo \ +@USE_LIBTOOL_TRUE@freopen.lo fscanf.lo fseek.lo fsetpos.lo ftell.lo \ @USE_LIBTOOL_TRUE@fvwrite.lo fwalk.lo fwrite.lo getc.lo getchar.lo \ @USE_LIBTOOL_TRUE@getc_u.lo getchar_u.lo getdelim.lo getline.lo gets.lo \ -@USE_LIBTOOL_TRUE@getw.lo iprintf.lo makebuf.lo mktemp.lo perror.lo \ -@USE_LIBTOOL_TRUE@printf.lo putc.lo putchar.lo putc_u.lo putchar_u.lo \ -@USE_LIBTOOL_TRUE@puts.lo putw.lo refill.lo remove.lo rename.lo \ -@USE_LIBTOOL_TRUE@rewind.lo rget.lo scanf.lo setbuf.lo setbuffer.lo \ -@USE_LIBTOOL_TRUE@setlinebuf.lo setvbuf.lo siprintf.lo snprintf.lo \ -@USE_LIBTOOL_TRUE@sprintf.lo sscanf.lo stdio.lo tmpfile.lo tmpnam.lo \ -@USE_LIBTOOL_TRUE@ungetc.lo vasprintf.lo vfscanf.lo vprintf.lo \ +@USE_LIBTOOL_TRUE@iprintf.lo makebuf.lo perror.lo printf.lo putc.lo \ +@USE_LIBTOOL_TRUE@putchar.lo putc_u.lo putchar_u.lo puts.lo refill.lo \ +@USE_LIBTOOL_TRUE@remove.lo rename.lo rewind.lo rget.lo scanf.lo \ +@USE_LIBTOOL_TRUE@setbuf.lo setbuffer.lo setlinebuf.lo setvbuf.lo \ +@USE_LIBTOOL_TRUE@siprintf.lo snprintf.lo sprintf.lo sscanf.lo stdio.lo \ +@USE_LIBTOOL_TRUE@tmpfile.lo tmpnam.lo ungetc.lo vfscanf.lo vprintf.lo \ @USE_LIBTOOL_TRUE@vscanf.lo vsnprintf.lo vsprintf.lo vsscanf.lo wbuf.lo \ @USE_LIBTOOL_TRUE@wsetup.lo CFLAGS = @CFLAGS@ diff --git a/newlib/libc/stdio64/Makefile.am b/newlib/libc/stdio64/Makefile.am index 2ae728d73..422d64909 100644 --- a/newlib/libc/stdio64/Makefile.am +++ b/newlib/libc/stdio64/Makefile.am @@ -4,26 +4,38 @@ AUTOMAKE_OPTIONS = cygnus INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) -LIB_SOURCES = \ - fgetpos64.c \ - fopen64.c \ - freopen64.c \ - fseeko64.c \ - fsetpos64.c \ - ftello64.c \ - stdio64.c \ - tmpfile64.c +# need a dummy object so objectlist.awk.in will build every time +GENERAL_SOURCES = dummy.c local64.h + +## All interfaces are EL/IX level 2 +if ELIX_LEVEL_1 +LIB_OBJS = +else +LIB_OBJS = \ + fgetpos64.$(oext) \ + fopen64.$(oext) \ + freopen64.$(oext) \ + fseeko64.$(oext) \ + fsetpos64.$(oext) \ + ftello64.$(oext) \ + stdio64.$(oext) \ + tmpfile64.$(oext) +endif libstdio64_la_LDFLAGS = -Xcompiler -nostdlib if USE_LIBTOOL noinst_LTLIBRARIES = libstdio64.la -libstdio64_la_SOURCES = $(LIB_SOURCES) +libstdio64_la_SOURCES = $(GENERAL_SOURCES) +libstdio64_la_LIBADD = $(LIB_OBJS) +libstdio64_la_DEPENDENCIES = $(LIB_OBJS) LIB_COMPILE = $(LTCOMPILE) noinst_DATA = objectlist.awk.in else noinst_LIBRARIES = lib.a -lib_a_SOURCES = $(LIB_SOURCES) +lib_a_SOURCES = $(GENERAL_SOURCES) +lib_a_LIBADD = $(LIB_OBJS) +lib_a_DEPENDENCIES = $(LIB_OBJS) LIB_COMPILE = $(COMPILE) noinst_DATA = endif # USE_LIBTOOL diff --git a/newlib/libc/stdio64/Makefile.in b/newlib/libc/stdio64/Makefile.in index d403afae0..09b0bf580 100644 --- a/newlib/libc/stdio64/Makefile.in +++ b/newlib/libc/stdio64/Makefile.in @@ -110,27 +110,33 @@ AUTOMAKE_OPTIONS = cygnus INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) -LIB_SOURCES = \ - fgetpos64.c \ - fopen64.c \ - freopen64.c \ - fseeko64.c \ - fsetpos64.c \ - ftello64.c \ - stdio64.c \ - tmpfile64.c - +# need a dummy object so objectlist.awk.in will build every time +GENERAL_SOURCES = dummy.c local64.h +@ELIX_LEVEL_1_TRUE@LIB_OBJS = +@ELIX_LEVEL_1_FALSE@LIB_OBJS = @ELIX_LEVEL_1_FALSE@\ +@ELIX_LEVEL_1_FALSE@ fgetpos64.$(oext) \ +@ELIX_LEVEL_1_FALSE@ fopen64.$(oext) \ +@ELIX_LEVEL_1_FALSE@ freopen64.$(oext) \ +@ELIX_LEVEL_1_FALSE@ fseeko64.$(oext) \ +@ELIX_LEVEL_1_FALSE@ fsetpos64.$(oext) \ +@ELIX_LEVEL_1_FALSE@ ftello64.$(oext) \ +@ELIX_LEVEL_1_FALSE@ stdio64.$(oext) \ +@ELIX_LEVEL_1_FALSE@ tmpfile64.$(oext) libstdio64_la_LDFLAGS = -Xcompiler -nostdlib @USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = @USE_LIBTOOL_TRUE@libstdio64.la -@USE_LIBTOOL_TRUE@libstdio64_la_SOURCES = @USE_LIBTOOL_TRUE@$(LIB_SOURCES) +@USE_LIBTOOL_TRUE@libstdio64_la_SOURCES = @USE_LIBTOOL_TRUE@$(GENERAL_SOURCES) +@USE_LIBTOOL_TRUE@libstdio64_la_LIBADD = @USE_LIBTOOL_TRUE@$(LIB_OBJS) +@USE_LIBTOOL_TRUE@libstdio64_la_DEPENDENCIES = @USE_LIBTOOL_TRUE@$(LIB_OBJS) @USE_LIBTOOL_TRUE@LIB_COMPILE = @USE_LIBTOOL_TRUE@$(LTCOMPILE) @USE_LIBTOOL_FALSE@LIB_COMPILE = @USE_LIBTOOL_FALSE@$(COMPILE) @USE_LIBTOOL_TRUE@noinst_DATA = @USE_LIBTOOL_TRUE@objectlist.awk.in @USE_LIBTOOL_FALSE@noinst_DATA = @USE_LIBTOOL_FALSE@noinst_LIBRARIES = @USE_LIBTOOL_FALSE@lib.a -@USE_LIBTOOL_FALSE@lib_a_SOURCES = @USE_LIBTOOL_FALSE@$(LIB_SOURCES) +@USE_LIBTOOL_FALSE@lib_a_SOURCES = @USE_LIBTOOL_FALSE@$(GENERAL_SOURCES) +@USE_LIBTOOL_FALSE@lib_a_LIBADD = @USE_LIBTOOL_FALSE@$(LIB_OBJS) +@USE_LIBTOOL_FALSE@lib_a_DEPENDENCIES = @USE_LIBTOOL_FALSE@$(LIB_OBJS) AM_CFLAGS = -I $(srcdir)/../stdio @@ -159,18 +165,10 @@ LIBRARIES = $(noinst_LIBRARIES) DEFS = @DEFS@ -I. -I$(srcdir) CPPFLAGS = @CPPFLAGS@ LIBS = @LIBS@ -lib_a_LIBADD = -@USE_LIBTOOL_FALSE@lib_a_OBJECTS = fgetpos64.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@fopen64.$(OBJEXT) freopen64.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@fseeko64.$(OBJEXT) fsetpos64.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@ftello64.$(OBJEXT) stdio64.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@tmpfile64.$(OBJEXT) +@USE_LIBTOOL_FALSE@lib_a_OBJECTS = dummy.$(OBJEXT) LTLIBRARIES = $(noinst_LTLIBRARIES) -libstdio64_la_LIBADD = -@USE_LIBTOOL_TRUE@libstdio64_la_OBJECTS = fgetpos64.lo fopen64.lo \ -@USE_LIBTOOL_TRUE@freopen64.lo fseeko64.lo fsetpos64.lo ftello64.lo \ -@USE_LIBTOOL_TRUE@stdio64.lo tmpfile64.lo +@USE_LIBTOOL_TRUE@libstdio64_la_OBJECTS = dummy.lo CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) diff --git a/newlib/libc/stdio64/dummy.c b/newlib/libc/stdio64/dummy.c new file mode 100644 index 000000000..90d0120ed --- /dev/null +++ b/newlib/libc/stdio64/dummy.c @@ -0,0 +1 @@ +/* empty stub so there's at least one file to put in objectlist.awk.in */ diff --git a/newlib/libc/stdio64/fgetpos64.c b/newlib/libc/stdio64/fgetpos64.c index 055d53655..3a0f0d910 100644 --- a/newlib/libc/stdio64/fgetpos64.c +++ b/newlib/libc/stdio64/fgetpos64.c @@ -1,5 +1,3 @@ -#ifdef __LARGE64_FILES - /* FUNCTION <<fgetpos64>>---record position in a large stream or file @@ -46,6 +44,8 @@ No supporting OS subroutines are required. #include <stdio.h> +#ifdef __LARGE64_FILES + int _DEFUN (fgetpos64, (fp, pos), FILE * fp _AND diff --git a/newlib/libc/stdio64/fopen64.c b/newlib/libc/stdio64/fopen64.c index 58ea1459c..1eb89874e 100644 --- a/newlib/libc/stdio64/fopen64.c +++ b/newlib/libc/stdio64/fopen64.c @@ -1,5 +1,3 @@ -#ifdef __LARGE64_FILES - /* * Copyright (c) 1990 The Regents of the University of California. * All rights reserved. @@ -73,6 +71,8 @@ static char sccsid[] = "%W% (Berkeley) %G%"; #include <fcntl.h> #endif +#ifdef __LARGE64_FILES + FILE * _DEFUN (_fopen64_r, (ptr, file, mode), struct _reent *ptr _AND diff --git a/newlib/libc/stdio64/freopen64.c b/newlib/libc/stdio64/freopen64.c index 53b8e3ee8..1828b0656 100644 --- a/newlib/libc/stdio64/freopen64.c +++ b/newlib/libc/stdio64/freopen64.c @@ -1,5 +1,3 @@ -#ifdef __LARGE64_FILES - /* * Copyright (c) 1990 The Regents of the University of California. * All rights reserved. @@ -68,6 +66,8 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>, * Re-direct an existing, open (probably) file to some other file. */ +#ifdef __LARGE64_FILES + FILE * _DEFUN (freopen64, (file, mode, fp), _CONST char *file _AND @@ -160,7 +160,7 @@ _DEFUN (freopen64, (file, mode, fp), fp->_flags |= __SCLE; #endif - fp->flags |= __SL64; + fp->_flags |= __SL64; _funlockfile(fp); return fp; diff --git a/newlib/libc/stdio64/fseeko64.c b/newlib/libc/stdio64/fseeko64.c index 2c312cfbe..3623ba7f9 100644 --- a/newlib/libc/stdio64/fseeko64.c +++ b/newlib/libc/stdio64/fseeko64.c @@ -1,5 +1,3 @@ -#ifdef __LARGE64_FILES - /* * Copyright (c) 1990 The Regents of the University of California. * All rights reserved. @@ -77,17 +75,20 @@ Supporting OS subroutines required: <<close>>, <<fstat64>>, <<isatty>>, #include <fcntl.h> #include <stdlib.h> #include <errno.h> +#include <sys/types.h> #include <sys/stat.h> #include "local64.h" #define POS_ERR (-(_fpos64_t)1) +#ifdef __LARGE64_FILES + /* * Seek the given file to the given offset. * `Whence' must be one of the three SEEK_* macros. */ -int +_off64_t fseeko64 (fp, offset, whence) register FILE *fp; _off64_t offset; diff --git a/newlib/libc/stdio64/fsetpos64.c b/newlib/libc/stdio64/fsetpos64.c index 0cc552d47..f0ec64ebf 100644 --- a/newlib/libc/stdio64/fsetpos64.c +++ b/newlib/libc/stdio64/fsetpos64.c @@ -1,5 +1,3 @@ -#ifdef __LARGE64_FILES - /* FUNCTION <<fsetpos64>>---restore position of a large stream or file @@ -42,6 +40,8 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<isatty>>, #include <stdio.h> +#ifdef __LARGE64_FILES + int _DEFUN (fsetpos64, (iop, pos), FILE * iop _AND diff --git a/newlib/libc/stdio64/ftello64.c b/newlib/libc/stdio64/ftello64.c index c6b888cf4..1ca5b0452 100644 --- a/newlib/libc/stdio64/ftello64.c +++ b/newlib/libc/stdio64/ftello64.c @@ -1,5 +1,3 @@ -#ifdef __LARGE64_FILES - /* * Copyright (c) 1990 The Regents of the University of California. * All rights reserved. @@ -77,6 +75,8 @@ static char sccsid[] = "%W% (Berkeley) %G%"; #include "local64.h" +#ifdef __LARGE64_FILES + _off64_t _DEFUN (ftello64, (fp), register FILE * fp) diff --git a/newlib/libc/stdio64/tmpfile64.c b/newlib/libc/stdio64/tmpfile64.c index c26a6204b..1f97c071c 100644 --- a/newlib/libc/stdio64/tmpfile64.c +++ b/newlib/libc/stdio64/tmpfile64.c @@ -1,5 +1,3 @@ -#ifdef __LARGE64_FILES - /* FUNCTION <<tmpfile64>>---create a large temporary file @@ -52,6 +50,8 @@ Supporting OS subroutines required: <<close>>, <<fstat>>, <<getpid>>, #include <stdio.h> #include <errno.h> +#ifdef __LARGE64_FILES + FILE * _DEFUN (_tmpfile64_r, (ptr), struct _reent *ptr) diff --git a/newlib/libc/stdlib/Makefile.am b/newlib/libc/stdlib/Makefile.am index baf3de9fd..cdd7987a0 100644 --- a/newlib/libc/stdlib/Makefile.am +++ b/newlib/libc/stdlib/Makefile.am @@ -4,12 +4,11 @@ AUTOMAKE_OPTIONS = cygnus INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) -LIB_SOURCES = \ +GENERAL_SOURCES = \ __adjust.c \ __exp10.c \ __ten_mu.c \ _Exit.c \ - a64l.c \ abort.c \ abs.c \ assert.c \ @@ -20,28 +19,17 @@ LIB_SOURCES = \ atol.c \ calloc.c \ div.c \ - drand48.c \ dtoa.c \ dtoastub.c \ - ecvtbuf.c \ - efgcvt.c \ environ.c \ envlock.c \ eprintf.c \ - erand48.c \ exit.c \ getenv.c \ getenv_r.c \ - getopt.c \ - getsubopt.c \ - jrand48.c \ - l64a.c \ labs.c \ - lcong48.c \ ldiv.c \ ldtoa.c \ - lrand48.c \ - malign.c \ malloc.c \ mblen.c \ mblen_r.c \ @@ -51,60 +39,100 @@ LIB_SOURCES = \ mbtowc_r.c \ mlock.c \ mprec.c \ - mrand48.c \ - msize.c \ mstats.c \ - mtrim.c \ - nrand48.c \ - on_exit.c \ - putenv.c \ - putenv_r.c \ rand.c \ - rand48.c \ rand_r.c \ realloc.c \ - seed48.c \ - setenv.c \ - setenv_r.c \ - srand48.c \ strtod.c \ strtol.c \ - strtoll.c \ - strtoll_r.c \ strtoul.c \ - strtoull.c \ - strtoull_r.c \ - system.c \ - valloc.c \ wcstombs.c \ wcstombs_r.c \ wctomb.c \ - wctomb_r.c \ - btowc.c \ - mbrlen.c \ - mbrtowc.c \ - mbsinit.c \ - mbsrtowcs.c \ - wcrtomb.c \ - wcsrtombs.c \ - wctob.c + wctomb_r.c + +EXTENDED_SOURCES = \ + drand48.c \ + ecvtbuf.c \ + efgcvt.c \ + erand48.c \ + jrand48.c \ + lcong48.c \ + lrand48.c \ + mrand48.c \ + msize.c \ + mtrim.c \ + nrand48.c \ + rand48.c \ + seed48.c \ + srand48.c \ + strtoll.c \ + strtoll_r.c \ + strtoull.c \ + strtoull_r.c + +ELIX_2_OBJS = \ + a64l.$(oext) \ + btowc.$(oext) \ + getopt.$(oext) \ + getsubopt.$(oext) \ + l64a.$(oext) \ + malign.$(oext) \ + malignr.$(oext) \ + malloptr.$(oext) \ + mbrlen.$(oext) \ + mbrtowc.$(oext) \ + mbsinit.$(oext) \ + mbsrtowcs.$(oext) \ + on_exit.$(oext) \ + pvallocr.$(oext) \ + valloc.$(oext) \ + vallocr.$(oext) \ + wcrtomb.$(oext) \ + wcsrtombs.$(oext) \ + wctob.$(oext) + +ELIX_3_OBJS = \ + putenv.$(oext) \ + putenv_r.$(oext) \ + setenv.$(oext) \ + setenv_r.$(oext) + +ELIX_4_OBJS = \ + system.$(oext) + +if ELIX_LEVEL_1 +LIB_OBJS = +else +if ELIX_LEVEL_2 +LIB_OBJS = $(ELIX_2_OBJS) +else +if ELIX_LEVEL_3 +LIB_OBJS = $(ELIX_2_OBJS) $(ELIX_3_OBJS) +else +LIB_OBJS = $(ELIX_2_OBJS) $(ELIX_3_OBJS) $(ELIX_4_OBJS) +endif +endif +endif # Because of how libtool moves objects around, mallocr must be built last. -LIBADD_OBJS = freer.$(oext) reallocr.$(oext) callocr.$(oext) cfreer.$(oext) malignr.$(oext) \ - vallocr.$(oext) pvallocr.$(oext) mallinfor.$(oext) mallstatsr.$(oext) msizer.$(oext) malloptr.$(oext) mallocr.$(oext) +LIBADD_OBJS = freer.$(oext) reallocr.$(oext) callocr.$(oext) cfreer.$(oext) \ + mallinfor.$(oext) msizer.$(oext) mallocr.$(oext) libstdlib_la_LDFLAGS = -Xcompiler -nostdlib if USE_LIBTOOL noinst_LTLIBRARIES = libstdlib.la -libstdlib_la_SOURCES = $(LIB_SOURCES) -libstdlib_la_LIBADD = $(LIBADD_OBJS) +libstdlib_la_SOURCES = $(GENERAL_SOURCES) $(EXTENDED_SOURCES) +libstdlib_la_LIBADD = $(LIB_OBJS) $(LIBADD_OBJS) +libstdlib_la_DEPENDENCIES = $(LIB_OBJS) $(LIBADD_OBJS) LIB_COMPILE = $(LTCOMPILE) noinst_DATA = objectlist.awk.in else noinst_LIBRARIES = lib.a -lib_a_SOURCES = $(LIB_SOURCES) -lib_a_LIBADD = $(LIBADD_OBJS) +lib_a_SOURCES = $(GENERAL_SOURCES) $(EXTENDED_SOURCES) +lib_a_LIBADD = $(LIBADD_OBJS) $(LIB_OBJS) +lib_a_DEPENDENCIES = $(LIBADD_OBJS) $(LIB_OBJS) LIB_COMPILE = $(COMPILE) noinst_DATA = endif # USE_LIBTOOL diff --git a/newlib/libc/stdlib/Makefile.in b/newlib/libc/stdlib/Makefile.in index 6f7cd98b9..6f72debaf 100644 --- a/newlib/libc/stdlib/Makefile.in +++ b/newlib/libc/stdlib/Makefile.in @@ -110,12 +110,11 @@ AUTOMAKE_OPTIONS = cygnus INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) -LIB_SOURCES = \ +GENERAL_SOURCES = \ __adjust.c \ __exp10.c \ __ten_mu.c \ _Exit.c \ - a64l.c \ abort.c \ abs.c \ assert.c \ @@ -126,28 +125,17 @@ LIB_SOURCES = \ atol.c \ calloc.c \ div.c \ - drand48.c \ dtoa.c \ dtoastub.c \ - ecvtbuf.c \ - efgcvt.c \ environ.c \ envlock.c \ eprintf.c \ - erand48.c \ exit.c \ getenv.c \ getenv_r.c \ - getopt.c \ - getsubopt.c \ - jrand48.c \ - l64a.c \ labs.c \ - lcong48.c \ ldiv.c \ ldtoa.c \ - lrand48.c \ - malign.c \ malloc.c \ mblen.c \ mblen_r.c \ @@ -157,62 +145,96 @@ LIB_SOURCES = \ mbtowc_r.c \ mlock.c \ mprec.c \ - mrand48.c \ - msize.c \ mstats.c \ - mtrim.c \ - nrand48.c \ - on_exit.c \ - putenv.c \ - putenv_r.c \ rand.c \ - rand48.c \ rand_r.c \ realloc.c \ - seed48.c \ - setenv.c \ - setenv_r.c \ - srand48.c \ strtod.c \ strtol.c \ - strtoll.c \ - strtoll_r.c \ strtoul.c \ - strtoull.c \ - strtoull_r.c \ - system.c \ - valloc.c \ wcstombs.c \ wcstombs_r.c \ wctomb.c \ - wctomb_r.c \ - btowc.c \ - mbrlen.c \ - mbrtowc.c \ - mbsinit.c \ - mbsrtowcs.c \ - wcrtomb.c \ - wcsrtombs.c \ - wctob.c + wctomb_r.c + +EXTENDED_SOURCES = \ + drand48.c \ + ecvtbuf.c \ + efgcvt.c \ + erand48.c \ + jrand48.c \ + lcong48.c \ + lrand48.c \ + mrand48.c \ + msize.c \ + mtrim.c \ + nrand48.c \ + rand48.c \ + seed48.c \ + srand48.c \ + strtoll.c \ + strtoll_r.c \ + strtoull.c \ + strtoull_r.c + + +ELIX_2_OBJS = \ + a64l.$(oext) \ + btowc.$(oext) \ + getopt.$(oext) \ + getsubopt.$(oext) \ + l64a.$(oext) \ + malign.$(oext) \ + malignr.$(oext) \ + malloptr.$(oext) \ + mbrlen.$(oext) \ + mbrtowc.$(oext) \ + mbsinit.$(oext) \ + mbsrtowcs.$(oext) \ + on_exit.$(oext) \ + pvallocr.$(oext) \ + valloc.$(oext) \ + vallocr.$(oext) \ + wcrtomb.$(oext) \ + wcsrtombs.$(oext) \ + wctob.$(oext) + + +ELIX_3_OBJS = \ + putenv.$(oext) \ + putenv_r.$(oext) \ + setenv.$(oext) \ + setenv_r.$(oext) + + +ELIX_4_OBJS = \ + system.$(oext) + +@ELIX_LEVEL_1_TRUE@LIB_OBJS = +@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_TRUE@LIB_OBJS = @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_TRUE@$(ELIX_2_OBJS) +@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_TRUE@LIB_OBJS = @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_TRUE@$(ELIX_2_OBJS) $(ELIX_3_OBJS) +@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@LIB_OBJS = @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@$(ELIX_2_OBJS) $(ELIX_3_OBJS) $(ELIX_4_OBJS) # Because of how libtool moves objects around, mallocr must be built last. -LIBADD_OBJS = freer.$(oext) reallocr.$(oext) callocr.$(oext) cfreer.$(oext) malignr.$(oext) \ - vallocr.$(oext) pvallocr.$(oext) mallinfor.$(oext) mallstatsr.$(oext) msizer.$(oext) malloptr.$(oext) mallocr.$(oext) +LIBADD_OBJS = freer.$(oext) reallocr.$(oext) callocr.$(oext) cfreer.$(oext) \ + mallinfor.$(oext) msizer.$(oext) mallocr.$(oext) libstdlib_la_LDFLAGS = -Xcompiler -nostdlib @USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = @USE_LIBTOOL_TRUE@libstdlib.la -@USE_LIBTOOL_TRUE@libstdlib_la_SOURCES = @USE_LIBTOOL_TRUE@$(LIB_SOURCES) -@USE_LIBTOOL_TRUE@libstdlib_la_LIBADD = @USE_LIBTOOL_TRUE@$(LIBADD_OBJS) +@USE_LIBTOOL_TRUE@libstdlib_la_SOURCES = @USE_LIBTOOL_TRUE@$(GENERAL_SOURCES) $(EXTENDED_SOURCES) +@USE_LIBTOOL_TRUE@libstdlib_la_LIBADD = @USE_LIBTOOL_TRUE@$(LIB_OBJS) $(LIBADD_OBJS) +@USE_LIBTOOL_TRUE@libstdlib_la_DEPENDENCIES = @USE_LIBTOOL_TRUE@$(LIB_OBJS) $(LIBADD_OBJS) @USE_LIBTOOL_TRUE@LIB_COMPILE = @USE_LIBTOOL_TRUE@$(LTCOMPILE) @USE_LIBTOOL_FALSE@LIB_COMPILE = @USE_LIBTOOL_FALSE@$(COMPILE) @USE_LIBTOOL_TRUE@noinst_DATA = @USE_LIBTOOL_TRUE@objectlist.awk.in @USE_LIBTOOL_FALSE@noinst_DATA = @USE_LIBTOOL_FALSE@noinst_LIBRARIES = @USE_LIBTOOL_FALSE@lib.a -@USE_LIBTOOL_FALSE@lib_a_SOURCES = @USE_LIBTOOL_FALSE@$(LIB_SOURCES) -@USE_LIBTOOL_FALSE@lib_a_LIBADD = @USE_LIBTOOL_FALSE@$(LIBADD_OBJS) +@USE_LIBTOOL_FALSE@lib_a_SOURCES = @USE_LIBTOOL_FALSE@$(GENERAL_SOURCES) $(EXTENDED_SOURCES) +@USE_LIBTOOL_FALSE@lib_a_LIBADD = @USE_LIBTOOL_FALSE@$(LIBADD_OBJS) $(LIB_OBJS) +@USE_LIBTOOL_FALSE@lib_a_DEPENDENCIES = @USE_LIBTOOL_FALSE@$(LIBADD_OBJS) $(LIB_OBJS) MALLOC_COMPILE = $(LIB_COMPILE) -DINTERNAL_NEWLIB @@ -269,68 +291,46 @@ LIBRARIES = $(noinst_LIBRARIES) DEFS = @DEFS@ -I. -I$(srcdir) CPPFLAGS = @CPPFLAGS@ LIBS = @LIBS@ -@USE_LIBTOOL_FALSE@lib_a_DEPENDENCIES = freer.$(oext) reallocr.$(oext) \ -@USE_LIBTOOL_FALSE@callocr.$(oext) cfreer.$(oext) malignr.$(oext) \ -@USE_LIBTOOL_FALSE@vallocr.$(oext) pvallocr.$(oext) mallinfor.$(oext) \ -@USE_LIBTOOL_FALSE@mallstatsr.$(oext) msizer.$(oext) malloptr.$(oext) \ -@USE_LIBTOOL_FALSE@mallocr.$(oext) @USE_LIBTOOL_FALSE@lib_a_OBJECTS = __adjust.$(OBJEXT) __exp10.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@__ten_mu.$(OBJEXT) _Exit.$(OBJEXT) a64l.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@abort.$(OBJEXT) abs.$(OBJEXT) assert.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@atexit.$(OBJEXT) atof.$(OBJEXT) atoff.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@atoi.$(OBJEXT) atol.$(OBJEXT) calloc.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@div.$(OBJEXT) drand48.$(OBJEXT) dtoa.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@dtoastub.$(OBJEXT) ecvtbuf.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@efgcvt.$(OBJEXT) environ.$(OBJEXT) envlock.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@eprintf.$(OBJEXT) erand48.$(OBJEXT) exit.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@getenv.$(OBJEXT) getenv_r.$(OBJEXT) getopt.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@getsubopt.$(OBJEXT) jrand48.$(OBJEXT) l64a.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@labs.$(OBJEXT) lcong48.$(OBJEXT) ldiv.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@ldtoa.$(OBJEXT) lrand48.$(OBJEXT) malign.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@malloc.$(OBJEXT) mblen.$(OBJEXT) mblen_r.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@mbstowcs.$(OBJEXT) mbstowcs_r.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@mbtowc.$(OBJEXT) mbtowc_r.$(OBJEXT) mlock.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@mprec.$(OBJEXT) mrand48.$(OBJEXT) msize.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@mstats.$(OBJEXT) mtrim.$(OBJEXT) nrand48.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@on_exit.$(OBJEXT) putenv.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@putenv_r.$(OBJEXT) rand.$(OBJEXT) rand48.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@rand_r.$(OBJEXT) realloc.$(OBJEXT) seed48.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@setenv.$(OBJEXT) setenv_r.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@srand48.$(OBJEXT) strtod.$(OBJEXT) strtol.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@strtoll.$(OBJEXT) strtoll_r.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@strtoul.$(OBJEXT) strtoull.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@strtoull_r.$(OBJEXT) system.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@valloc.$(OBJEXT) wcstombs.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@__ten_mu.$(OBJEXT) _Exit.$(OBJEXT) abort.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@abs.$(OBJEXT) assert.$(OBJEXT) atexit.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@atof.$(OBJEXT) atoff.$(OBJEXT) atoi.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@atol.$(OBJEXT) calloc.$(OBJEXT) div.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@dtoa.$(OBJEXT) dtoastub.$(OBJEXT) environ.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@envlock.$(OBJEXT) eprintf.$(OBJEXT) exit.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@getenv.$(OBJEXT) getenv_r.$(OBJEXT) labs.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@ldiv.$(OBJEXT) ldtoa.$(OBJEXT) malloc.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@mblen.$(OBJEXT) mblen_r.$(OBJEXT) mbstowcs.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@mbstowcs_r.$(OBJEXT) mbtowc.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@mbtowc_r.$(OBJEXT) mlock.$(OBJEXT) mprec.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@mstats.$(OBJEXT) rand.$(OBJEXT) rand_r.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@realloc.$(OBJEXT) strtod.$(OBJEXT) strtol.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@strtoul.$(OBJEXT) wcstombs.$(OBJEXT) \ @USE_LIBTOOL_FALSE@wcstombs_r.$(OBJEXT) wctomb.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@wctomb_r.$(OBJEXT) btowc.$(OBJEXT) mbrlen.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@mbrtowc.$(OBJEXT) mbsinit.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@mbsrtowcs.$(OBJEXT) wcrtomb.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@wcsrtombs.$(OBJEXT) wctob.$(OBJEXT) +@USE_LIBTOOL_FALSE@wctomb_r.$(OBJEXT) drand48.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@ecvtbuf.$(OBJEXT) efgcvt.$(OBJEXT) erand48.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@jrand48.$(OBJEXT) lcong48.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@lrand48.$(OBJEXT) mrand48.$(OBJEXT) msize.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@mtrim.$(OBJEXT) nrand48.$(OBJEXT) rand48.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@seed48.$(OBJEXT) srand48.$(OBJEXT) strtoll.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@strtoll_r.$(OBJEXT) strtoull.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@strtoull_r.$(OBJEXT) LTLIBRARIES = $(noinst_LTLIBRARIES) -@USE_LIBTOOL_TRUE@libstdlib_la_DEPENDENCIES = freer.$(oext) \ -@USE_LIBTOOL_TRUE@reallocr.$(oext) callocr.$(oext) cfreer.$(oext) \ -@USE_LIBTOOL_TRUE@malignr.$(oext) vallocr.$(oext) pvallocr.$(oext) \ -@USE_LIBTOOL_TRUE@mallinfor.$(oext) mallstatsr.$(oext) msizer.$(oext) \ -@USE_LIBTOOL_TRUE@malloptr.$(oext) mallocr.$(oext) @USE_LIBTOOL_TRUE@libstdlib_la_OBJECTS = __adjust.lo __exp10.lo \ -@USE_LIBTOOL_TRUE@__ten_mu.lo _Exit.lo a64l.lo abort.lo abs.lo \ -@USE_LIBTOOL_TRUE@assert.lo atexit.lo atof.lo atoff.lo atoi.lo atol.lo \ -@USE_LIBTOOL_TRUE@calloc.lo div.lo drand48.lo dtoa.lo dtoastub.lo \ -@USE_LIBTOOL_TRUE@ecvtbuf.lo efgcvt.lo environ.lo envlock.lo eprintf.lo \ -@USE_LIBTOOL_TRUE@erand48.lo exit.lo getenv.lo getenv_r.lo getopt.lo \ -@USE_LIBTOOL_TRUE@getsubopt.lo jrand48.lo l64a.lo labs.lo lcong48.lo \ -@USE_LIBTOOL_TRUE@ldiv.lo ldtoa.lo lrand48.lo malign.lo malloc.lo \ -@USE_LIBTOOL_TRUE@mblen.lo mblen_r.lo mbstowcs.lo mbstowcs_r.lo \ -@USE_LIBTOOL_TRUE@mbtowc.lo mbtowc_r.lo mlock.lo mprec.lo mrand48.lo \ -@USE_LIBTOOL_TRUE@msize.lo mstats.lo mtrim.lo nrand48.lo on_exit.lo \ -@USE_LIBTOOL_TRUE@putenv.lo putenv_r.lo rand.lo rand48.lo rand_r.lo \ -@USE_LIBTOOL_TRUE@realloc.lo seed48.lo setenv.lo setenv_r.lo srand48.lo \ -@USE_LIBTOOL_TRUE@strtod.lo strtol.lo strtoll.lo strtoll_r.lo \ -@USE_LIBTOOL_TRUE@strtoul.lo strtoull.lo strtoull_r.lo system.lo \ -@USE_LIBTOOL_TRUE@valloc.lo wcstombs.lo wcstombs_r.lo wctomb.lo \ -@USE_LIBTOOL_TRUE@wctomb_r.lo btowc.lo mbrlen.lo mbrtowc.lo mbsinit.lo \ -@USE_LIBTOOL_TRUE@mbsrtowcs.lo wcrtomb.lo wcsrtombs.lo wctob.lo +@USE_LIBTOOL_TRUE@__ten_mu.lo _Exit.lo abort.lo abs.lo assert.lo \ +@USE_LIBTOOL_TRUE@atexit.lo atof.lo atoff.lo atoi.lo atol.lo calloc.lo \ +@USE_LIBTOOL_TRUE@div.lo dtoa.lo dtoastub.lo environ.lo envlock.lo \ +@USE_LIBTOOL_TRUE@eprintf.lo exit.lo getenv.lo getenv_r.lo labs.lo \ +@USE_LIBTOOL_TRUE@ldiv.lo ldtoa.lo malloc.lo mblen.lo mblen_r.lo \ +@USE_LIBTOOL_TRUE@mbstowcs.lo mbstowcs_r.lo mbtowc.lo mbtowc_r.lo \ +@USE_LIBTOOL_TRUE@mlock.lo mprec.lo mstats.lo rand.lo rand_r.lo \ +@USE_LIBTOOL_TRUE@realloc.lo strtod.lo strtol.lo strtoul.lo wcstombs.lo \ +@USE_LIBTOOL_TRUE@wcstombs_r.lo wctomb.lo wctomb_r.lo drand48.lo \ +@USE_LIBTOOL_TRUE@ecvtbuf.lo efgcvt.lo erand48.lo jrand48.lo lcong48.lo \ +@USE_LIBTOOL_TRUE@lrand48.lo mrand48.lo msize.lo mtrim.lo nrand48.lo \ +@USE_LIBTOOL_TRUE@rand48.lo seed48.lo srand48.lo strtoll.lo \ +@USE_LIBTOOL_TRUE@strtoll_r.lo strtoull.lo strtoull_r.lo CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) diff --git a/newlib/libc/stdlib/mstats.c b/newlib/libc/stdlib/mstats.c index a2ae95929..8a587b0b5 100644 --- a/newlib/libc/stdlib/mstats.c +++ b/newlib/libc/stdlib/mstats.c @@ -110,6 +110,7 @@ _DEFUN_VOID (mallinfo) return _mallinfo_r (_REENT); } +#ifndef _ELIX_LEVEL || _ELIX_LEVEL >= 2 void _DEFUN_VOID (malloc_stats) { @@ -124,8 +125,12 @@ _DEFUN (mallopt, (p, v), return _mallopt_r (_REENT, p, v); } +#endif /* !_ELIX_LEVEL || _ELIX_LEVEL >= 2 */ + #endif +#ifndef _ELIX_LEVEL || _ELIX_LEVEL >= 2 + /* mstats is now compatibility code. It used to be real, for a previous version of the malloc routines. It now just calls malloc_stats. */ @@ -149,4 +154,7 @@ _DEFUN (mstats, (s), } #endif + +#endif /* !_ELIX_LEVEL || _ELIX_LEVEL >= 2 */ + #endif /* ! defined (MALLOC_PROVIDED) */ diff --git a/newlib/libc/string/Makefile.am b/newlib/libc/string/Makefile.am index 525534e07..1e4f4c525 100644 --- a/newlib/libc/string/Makefile.am +++ b/newlib/libc/string/Makefile.am @@ -4,23 +4,20 @@ AUTOMAKE_OPTIONS = cygnus INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) -LIB_SOURCES = \ - bcmp.c \ +GENERAL_SOURCES = \ bcopy.c \ bzero.c \ index.c \ - memccpy.c \ memchr.c \ memcmp.c \ memcpy.c \ memmove.c \ - mempcpy.c \ memset.c \ rindex.c \ + strcasecmp.c \ strcat.c \ strchr.c \ strcmp.c \ - strcasecmp.c \ strcoll.c \ strcpy.c \ strcspn.c \ @@ -32,12 +29,10 @@ LIB_SOURCES = \ strlcpy.c \ strlen.c \ strlwr.c \ + strncasecmp.c \ strncat.c \ strncmp.c \ - strncasecmp.c \ strncpy.c \ - strndup.c \ - strndup_r.c \ strnlen.c \ strpbrk.c \ strrchr.c \ @@ -51,15 +46,30 @@ LIB_SOURCES = \ swab.c \ u_strerr.c +if ELIX_LEVEL_1 +LIB_OBJS = +else +LIB_OBJS = \ + bcmp.$(oext) \ + memccpy.$(oext) \ + mempcpy.$(oext) \ + strndup.$(oext) \ + strndup_r.$(oext) +endif + libstring_la_LDFLAGS = -Xcompiler -nostdlib if USE_LIBTOOL noinst_LTLIBRARIES = libstring.la -libstring_la_SOURCES = $(LIB_SOURCES) +libstring_la_SOURCES = $(GENERAL_SOURCES) +libstring_la_LIBADD = $(LIB_OBJS) +libstring_la_DEPENDENCIES = $(LIB_OBJS) noinst_DATA = objectlist.awk.in else noinst_LIBRARIES = lib.a -lib_a_SOURCES = $(LIB_SOURCES) +lib_a_SOURCES = $(GENERAL_SOURCES) +lib_a_LIBADD = $(LIB_OBJS) +lib_a_DEPENDENCIES = $(LIB_OBJS) noinst_DATA = endif # USE_LIBTOOL diff --git a/newlib/libc/string/Makefile.in b/newlib/libc/string/Makefile.in index f93e20d46..9ecc45cad 100644 --- a/newlib/libc/string/Makefile.in +++ b/newlib/libc/string/Makefile.in @@ -110,23 +110,20 @@ AUTOMAKE_OPTIONS = cygnus INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) -LIB_SOURCES = \ - bcmp.c \ +GENERAL_SOURCES = \ bcopy.c \ bzero.c \ index.c \ - memccpy.c \ memchr.c \ memcmp.c \ memcpy.c \ memmove.c \ - mempcpy.c \ memset.c \ rindex.c \ + strcasecmp.c \ strcat.c \ strchr.c \ strcmp.c \ - strcasecmp.c \ strcoll.c \ strcpy.c \ strcspn.c \ @@ -138,12 +135,10 @@ LIB_SOURCES = \ strlcpy.c \ strlen.c \ strlwr.c \ + strncasecmp.c \ strncat.c \ strncmp.c \ - strncasecmp.c \ strncpy.c \ - strndup.c \ - strndup_r.c \ strnlen.c \ strpbrk.c \ strrchr.c \ @@ -157,15 +152,26 @@ LIB_SOURCES = \ swab.c \ u_strerr.c +@ELIX_LEVEL_1_TRUE@LIB_OBJS = +@ELIX_LEVEL_1_FALSE@LIB_OBJS = @ELIX_LEVEL_1_FALSE@\ +@ELIX_LEVEL_1_FALSE@ bcmp.$(oext) \ +@ELIX_LEVEL_1_FALSE@ memccpy.$(oext) \ +@ELIX_LEVEL_1_FALSE@ mempcpy.$(oext) \ +@ELIX_LEVEL_1_FALSE@ strndup.$(oext) \ +@ELIX_LEVEL_1_FALSE@ strndup_r.$(oext) libstring_la_LDFLAGS = -Xcompiler -nostdlib @USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = @USE_LIBTOOL_TRUE@libstring.la -@USE_LIBTOOL_TRUE@libstring_la_SOURCES = @USE_LIBTOOL_TRUE@$(LIB_SOURCES) +@USE_LIBTOOL_TRUE@libstring_la_SOURCES = @USE_LIBTOOL_TRUE@$(GENERAL_SOURCES) +@USE_LIBTOOL_TRUE@libstring_la_LIBADD = @USE_LIBTOOL_TRUE@$(LIB_OBJS) +@USE_LIBTOOL_TRUE@libstring_la_DEPENDENCIES = @USE_LIBTOOL_TRUE@$(LIB_OBJS) @USE_LIBTOOL_TRUE@noinst_DATA = @USE_LIBTOOL_TRUE@objectlist.awk.in @USE_LIBTOOL_FALSE@noinst_DATA = @USE_LIBTOOL_FALSE@noinst_LIBRARIES = @USE_LIBTOOL_FALSE@lib.a -@USE_LIBTOOL_FALSE@lib_a_SOURCES = @USE_LIBTOOL_FALSE@$(LIB_SOURCES) +@USE_LIBTOOL_FALSE@lib_a_SOURCES = @USE_LIBTOOL_FALSE@$(GENERAL_SOURCES) +@USE_LIBTOOL_FALSE@lib_a_LIBADD = @USE_LIBTOOL_FALSE@$(LIB_OBJS) +@USE_LIBTOOL_FALSE@lib_a_DEPENDENCIES = @USE_LIBTOOL_FALSE@$(LIB_OBJS) CHEWOUT_FILES = \ bcmp.def memcpy.def strcmp.def strncat.def strstr.def \ @@ -193,39 +199,33 @@ LIBRARIES = $(noinst_LIBRARIES) DEFS = @DEFS@ -I. -I$(srcdir) CPPFLAGS = @CPPFLAGS@ LIBS = @LIBS@ -lib_a_LIBADD = -@USE_LIBTOOL_FALSE@lib_a_OBJECTS = bcmp.$(OBJEXT) bcopy.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@bzero.$(OBJEXT) index.$(OBJEXT) memccpy.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@memchr.$(OBJEXT) memcmp.$(OBJEXT) memcpy.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@memmove.$(OBJEXT) mempcpy.$(OBJEXT) memset.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@rindex.$(OBJEXT) strcat.$(OBJEXT) strchr.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@strcmp.$(OBJEXT) strcasecmp.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@lib_a_OBJECTS = bcopy.$(OBJEXT) bzero.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@index.$(OBJEXT) memchr.$(OBJEXT) memcmp.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@memcpy.$(OBJEXT) memmove.$(OBJEXT) memset.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@rindex.$(OBJEXT) strcasecmp.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@strcat.$(OBJEXT) strchr.$(OBJEXT) strcmp.$(OBJEXT) \ @USE_LIBTOOL_FALSE@strcoll.$(OBJEXT) strcpy.$(OBJEXT) strcspn.$(OBJEXT) \ @USE_LIBTOOL_FALSE@strdup.$(OBJEXT) strdup_r.$(OBJEXT) \ @USE_LIBTOOL_FALSE@strerror.$(OBJEXT) strerror_r.$(OBJEXT) \ @USE_LIBTOOL_FALSE@strlcat.$(OBJEXT) strlcpy.$(OBJEXT) strlen.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@strlwr.$(OBJEXT) strncat.$(OBJEXT) strncmp.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@strncasecmp.$(OBJEXT) strncpy.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@strndup.$(OBJEXT) strndup_r.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@strnlen.$(OBJEXT) strpbrk.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@strrchr.$(OBJEXT) strsep.$(OBJEXT) strspn.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@strtok.$(OBJEXT) strtok_r.$(OBJEXT) strupr.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@strxfrm.$(OBJEXT) strstr.$(OBJEXT) swab.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@u_strerr.$(OBJEXT) +@USE_LIBTOOL_FALSE@strlwr.$(OBJEXT) strncasecmp.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@strncat.$(OBJEXT) strncmp.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@strncpy.$(OBJEXT) strnlen.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@strpbrk.$(OBJEXT) strrchr.$(OBJEXT) strsep.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@strspn.$(OBJEXT) strtok.$(OBJEXT) strtok_r.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@strupr.$(OBJEXT) strxfrm.$(OBJEXT) strstr.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@swab.$(OBJEXT) u_strerr.$(OBJEXT) LTLIBRARIES = $(noinst_LTLIBRARIES) -libstring_la_LIBADD = -@USE_LIBTOOL_TRUE@libstring_la_OBJECTS = bcmp.lo bcopy.lo bzero.lo \ -@USE_LIBTOOL_TRUE@index.lo memccpy.lo memchr.lo memcmp.lo memcpy.lo \ -@USE_LIBTOOL_TRUE@memmove.lo mempcpy.lo memset.lo rindex.lo strcat.lo \ -@USE_LIBTOOL_TRUE@strchr.lo strcmp.lo strcasecmp.lo strcoll.lo \ -@USE_LIBTOOL_TRUE@strcpy.lo strcspn.lo strdup.lo strdup_r.lo \ +@USE_LIBTOOL_TRUE@libstring_la_OBJECTS = bcopy.lo bzero.lo index.lo \ +@USE_LIBTOOL_TRUE@memchr.lo memcmp.lo memcpy.lo memmove.lo memset.lo \ +@USE_LIBTOOL_TRUE@rindex.lo strcasecmp.lo strcat.lo strchr.lo strcmp.lo \ +@USE_LIBTOOL_TRUE@strcoll.lo strcpy.lo strcspn.lo strdup.lo strdup_r.lo \ @USE_LIBTOOL_TRUE@strerror.lo strerror_r.lo strlcat.lo strlcpy.lo \ -@USE_LIBTOOL_TRUE@strlen.lo strlwr.lo strncat.lo strncmp.lo \ -@USE_LIBTOOL_TRUE@strncasecmp.lo strncpy.lo strndup.lo strndup_r.lo \ -@USE_LIBTOOL_TRUE@strnlen.lo strpbrk.lo strrchr.lo strsep.lo strspn.lo \ -@USE_LIBTOOL_TRUE@strtok.lo strtok_r.lo strupr.lo strxfrm.lo strstr.lo \ -@USE_LIBTOOL_TRUE@swab.lo u_strerr.lo +@USE_LIBTOOL_TRUE@strlen.lo strlwr.lo strncasecmp.lo strncat.lo \ +@USE_LIBTOOL_TRUE@strncmp.lo strncpy.lo strnlen.lo strpbrk.lo \ +@USE_LIBTOOL_TRUE@strrchr.lo strsep.lo strspn.lo strtok.lo strtok_r.lo \ +@USE_LIBTOOL_TRUE@strupr.lo strxfrm.lo strstr.lo swab.lo u_strerr.lo CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) diff --git a/newlib/libc/sys/linux/Makefile.am b/newlib/libc/sys/linux/Makefile.am index 55845d45a..00d189b71 100644 --- a/newlib/libc/sys/linux/Makefile.am +++ b/newlib/libc/sys/linux/Makefile.am @@ -11,9 +11,8 @@ SUBLIBS = \ cmath/libcmath.la \ $(LINUX_MACH_LIB) -LIB_SOURCES = \ +GENERAL_SOURCES = \ aio.c \ - aio64.c \ brk.c \ calloc.c \ callocr.c \ @@ -22,42 +21,24 @@ LIB_SOURCES = \ clock_getres.c \ clock_gettime.c \ clock_settime.c \ - confstr.c \ - ctermid.c \ - fclean.c \ flockfile.c \ - fpathconf.c \ free.c \ freer.c \ - fstab.c \ - fstatvfs.c \ - fstatvfs64.c \ ftok.c \ - ftw.c \ - ftw64.c \ funlockfile.c \ getdate.c \ getdate_err.c \ gethostname.c \ - getoptlong.c \ getreent.c \ - getrlimit64.c \ - getwd.c \ ids.c \ inode.c \ io.c \ - io64.c \ ipc.c \ linux.c \ - malign.c \ - malignr.c \ mallinfor.c \ mallocr.c \ - malloptr.c \ mallstatsr.c \ mmap.c \ - mntent.c \ - mntent_r.c \ mq_close.c \ mq_getattr.c \ mq_notify.c \ @@ -72,29 +53,21 @@ LIB_SOURCES = \ mtrim.c \ mtrimr.c \ ntp_gettime.c \ - pathconf.c \ pread.c \ - pread64.c \ process.c \ prof-freq.c \ profile.c \ psignal.c \ - pvallocr.c \ pwrite.c \ - pwrite64.c \ raise.c \ - readdir64.c \ realloc.c \ reallocr.c \ - realpath.c \ rename.c \ resource.c \ - scandir64.c \ sched.c \ select.c \ seteuid.c \ sethostname.c \ - setrlimit64.c \ shm_open.c \ shm_unlink.c \ sig.c \ @@ -106,26 +79,74 @@ LIB_SOURCES = \ sigwait.c \ socket.c \ sleep.c \ - stack.c \ - statvfs.c \ - statvfs64.c \ strsignal.c \ strverscmp.c \ sysconf.c \ sysctl.c \ systat.c \ - system.c \ tcdrain.c \ tcsendbrk.c \ termios.c \ time.c \ - ttyname_r.c \ usleep.c \ - utimes.c \ - vallocr.c \ - versionsort.c \ - versionsort64.c \ - wait.c + versionsort.c + +ELIX_2_OBJS = \ + aio64.$(oext) \ + confstr.$(oext) \ + ctermid.$(oext) \ + fclean.$(oext) \ + fpathconf.$(oext) \ + fstab.$(oext) \ + fstatvfs.$(oext) \ + fstatvfs64.$(oext) \ + ftw.$(oext) \ + ftw64.$(oext) \ + getoptlong.$(oext) \ + getrlimit64.$(oext) \ + getwd.$(oext) \ + io64.$(oext) \ + malign.$(oext) \ + malignr.$(oext) \ + malloptr.$(oext) \ + mcheck.$(oext) \ + mntent.$(oext) \ + mntent_r.$(oext) \ + pathconf.$(oext) \ + pread64.$(oext) \ + pvallocr.$(oext) \ + pwrite64.$(oext) \ + readdir64.$(oext) \ + realpath.$(oext) \ + scandir64.$(oext) \ + setrlimit64.$(oext) \ + statvfs.$(oext) \ + statvfs64.$(oext) \ + ttyname_r.$(oext) \ + utimes.$(oext) \ + vallocr.$(oext) \ + versionsort64.$(oext) + +ELIX_3_OBJS = \ + system.$(oext) \ + wait.$(oext) + +ELIX_4_OBJS = \ + stack.$(oext) + +if ELIX_LEVEL_1 +LIB_OBJS = +else +if ELIX_LEVEL_2 +LIB_OBJS = $(ELIX_2_OBJS) +else +if ELIX_LEVEL_3 +LIB_OBJS = $(ELIX_2_OBJS) $(ELIX_3_OBJS) +else +LIB_OBJS = $(ELIX_2_OBJS) $(ELIX_3_OBJS) $(ELIX_4_OBJS) +endif +endif +endif # This will handle both /usr/src/linux-2.4/include/asm/signal.h (in Red Hat Linux 7.1) # and also /usr/src/linux/include/asm/signal.h in older versions of Red Hat Linux @@ -135,25 +156,24 @@ liblinux_la_LDFLAGS = -Xcompiler -nostdlib ADD_OBJS = \ malloc.$(oext) \ - mcheck.$(oext) \ $(LINUX_MACH_LIB) if USE_LIBTOOL noinst_LTLIBRARIES = liblinux.la -liblinux_la_SOURCES = $(LIB_SOURCES) -liblinux_la_LIBADD = $(ADD_OBJS) -liblinux_la_DEPENDENCIES = $(ADD_OBJS) +liblinux_la_SOURCES = $(GENERAL_SOURCES) +liblinux_la_LIBADD = $(ADD_OBJS) $(LIB_OBJS) +liblinux_la_DEPENDENCIES = $(ADD_OBJS) $(LIB_OBJS) LIBC_COMPILE = $(LTCOMPILE) noinst_DATA = objectlist.awk.in else noinst_LIBRARIES = lib.a -lib_a_SOURCES = $(LIB_SOURCES) -lib_a_LIBADD = $(ADD_OBJS) -lib_a_DEPENDENCIES = $(ADD_OBJS) +lib_a_SOURCES = $(GENERAL_SOURCES) +lib_a_LIBADD = $(ADD_OBJS) $(LIB_OBJS) +lib_a_DEPENDENCIES = $(ADD_OBJS) $(LIB_OBJS) LIBC_COMPILE = $(COMPILE) noinst_DATA = -lib.a: $(ADD_OBJS) $(lib_a_OBJECTS) +lib.a: $(ADD_OBJS) $(LIB_OBJS) $(lib_a_OBJECTS) rm -f $@ rm -rf tmp mkdir tmp diff --git a/newlib/libc/sys/linux/Makefile.in b/newlib/libc/sys/linux/Makefile.in index 33eb7049c..689edd782 100644 --- a/newlib/libc/sys/linux/Makefile.in +++ b/newlib/libc/sys/linux/Makefile.in @@ -107,9 +107,8 @@ SUBLIBS = \ $(LINUX_MACH_LIB) -LIB_SOURCES = \ +GENERAL_SOURCES = \ aio.c \ - aio64.c \ brk.c \ calloc.c \ callocr.c \ @@ -118,42 +117,24 @@ LIB_SOURCES = \ clock_getres.c \ clock_gettime.c \ clock_settime.c \ - confstr.c \ - ctermid.c \ - fclean.c \ flockfile.c \ - fpathconf.c \ free.c \ freer.c \ - fstab.c \ - fstatvfs.c \ - fstatvfs64.c \ ftok.c \ - ftw.c \ - ftw64.c \ funlockfile.c \ getdate.c \ getdate_err.c \ gethostname.c \ - getoptlong.c \ getreent.c \ - getrlimit64.c \ - getwd.c \ ids.c \ inode.c \ io.c \ - io64.c \ ipc.c \ linux.c \ - malign.c \ - malignr.c \ mallinfor.c \ mallocr.c \ - malloptr.c \ mallstatsr.c \ mmap.c \ - mntent.c \ - mntent_r.c \ mq_close.c \ mq_getattr.c \ mq_notify.c \ @@ -168,29 +149,21 @@ LIB_SOURCES = \ mtrim.c \ mtrimr.c \ ntp_gettime.c \ - pathconf.c \ pread.c \ - pread64.c \ process.c \ prof-freq.c \ profile.c \ psignal.c \ - pvallocr.c \ pwrite.c \ - pwrite64.c \ raise.c \ - readdir64.c \ realloc.c \ reallocr.c \ - realpath.c \ rename.c \ resource.c \ - scandir64.c \ sched.c \ select.c \ seteuid.c \ sethostname.c \ - setrlimit64.c \ shm_open.c \ shm_unlink.c \ sig.c \ @@ -202,27 +175,68 @@ LIB_SOURCES = \ sigwait.c \ socket.c \ sleep.c \ - stack.c \ - statvfs.c \ - statvfs64.c \ strsignal.c \ strverscmp.c \ sysconf.c \ sysctl.c \ systat.c \ - system.c \ tcdrain.c \ tcsendbrk.c \ termios.c \ time.c \ - ttyname_r.c \ usleep.c \ - utimes.c \ - vallocr.c \ - versionsort.c \ - versionsort64.c \ - wait.c - + versionsort.c + + +ELIX_2_OBJS = \ + aio64.$(oext) \ + confstr.$(oext) \ + ctermid.$(oext) \ + fclean.$(oext) \ + fpathconf.$(oext) \ + fstab.$(oext) \ + fstatvfs.$(oext) \ + fstatvfs64.$(oext) \ + ftw.$(oext) \ + ftw64.$(oext) \ + getoptlong.$(oext) \ + getrlimit64.$(oext) \ + getwd.$(oext) \ + io64.$(oext) \ + malign.$(oext) \ + malignr.$(oext) \ + malloptr.$(oext) \ + mcheck.$(oext) \ + mntent.$(oext) \ + mntent_r.$(oext) \ + pathconf.$(oext) \ + pread64.$(oext) \ + pvallocr.$(oext) \ + pwrite64.$(oext) \ + readdir64.$(oext) \ + realpath.$(oext) \ + scandir64.$(oext) \ + setrlimit64.$(oext) \ + statvfs.$(oext) \ + statvfs64.$(oext) \ + ttyname_r.$(oext) \ + utimes.$(oext) \ + vallocr.$(oext) \ + versionsort64.$(oext) + + +ELIX_3_OBJS = \ + system.$(oext) \ + wait.$(oext) + + +ELIX_4_OBJS = \ + stack.$(oext) + +@ELIX_LEVEL_1_TRUE@LIB_OBJS = +@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_TRUE@LIB_OBJS = @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_TRUE@$(ELIX_2_OBJS) +@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_TRUE@LIB_OBJS = @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_TRUE@$(ELIX_2_OBJS) $(ELIX_3_OBJS) +@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@LIB_OBJS = @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@$(ELIX_2_OBJS) $(ELIX_3_OBJS) $(ELIX_4_OBJS) # This will handle both /usr/src/linux-2.4/include/asm/signal.h (in Red Hat Linux 7.1) # and also /usr/src/linux/include/asm/signal.h in older versions of Red Hat Linux @@ -232,22 +246,21 @@ liblinux_la_LDFLAGS = -Xcompiler -nostdlib ADD_OBJS = \ malloc.$(oext) \ - mcheck.$(oext) \ $(LINUX_MACH_LIB) @USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = @USE_LIBTOOL_TRUE@liblinux.la -@USE_LIBTOOL_TRUE@liblinux_la_SOURCES = @USE_LIBTOOL_TRUE@$(LIB_SOURCES) -@USE_LIBTOOL_TRUE@liblinux_la_LIBADD = @USE_LIBTOOL_TRUE@$(ADD_OBJS) -@USE_LIBTOOL_TRUE@liblinux_la_DEPENDENCIES = @USE_LIBTOOL_TRUE@$(ADD_OBJS) +@USE_LIBTOOL_TRUE@liblinux_la_SOURCES = @USE_LIBTOOL_TRUE@$(GENERAL_SOURCES) +@USE_LIBTOOL_TRUE@liblinux_la_LIBADD = @USE_LIBTOOL_TRUE@$(ADD_OBJS) $(LIB_OBJS) +@USE_LIBTOOL_TRUE@liblinux_la_DEPENDENCIES = @USE_LIBTOOL_TRUE@$(ADD_OBJS) $(LIB_OBJS) @USE_LIBTOOL_TRUE@LIBC_COMPILE = @USE_LIBTOOL_TRUE@$(LTCOMPILE) @USE_LIBTOOL_FALSE@LIBC_COMPILE = @USE_LIBTOOL_FALSE@$(COMPILE) @USE_LIBTOOL_TRUE@noinst_DATA = @USE_LIBTOOL_TRUE@objectlist.awk.in @USE_LIBTOOL_FALSE@noinst_DATA = @USE_LIBTOOL_FALSE@noinst_LIBRARIES = @USE_LIBTOOL_FALSE@lib.a -@USE_LIBTOOL_FALSE@lib_a_SOURCES = @USE_LIBTOOL_FALSE@$(LIB_SOURCES) -@USE_LIBTOOL_FALSE@lib_a_LIBADD = @USE_LIBTOOL_FALSE@$(ADD_OBJS) -@USE_LIBTOOL_FALSE@lib_a_DEPENDENCIES = @USE_LIBTOOL_FALSE@$(ADD_OBJS) +@USE_LIBTOOL_FALSE@lib_a_SOURCES = @USE_LIBTOOL_FALSE@$(GENERAL_SOURCES) +@USE_LIBTOOL_FALSE@lib_a_LIBADD = @USE_LIBTOOL_FALSE@$(ADD_OBJS) $(LIB_OBJS) +@USE_LIBTOOL_FALSE@lib_a_DEPENDENCIES = @USE_LIBTOOL_FALSE@$(ADD_OBJS) $(LIB_OBJS) AM_CFLAGS = -I $(srcdir)/../../stdio ACLOCAL_AMFLAGS = -I ../../.. @@ -261,84 +274,60 @@ LIBRARIES = $(noinst_LIBRARIES) DEFS = @DEFS@ -I. -I$(srcdir) CPPFLAGS = @CPPFLAGS@ LIBS = @LIBS@ -@USE_LIBTOOL_FALSE@lib_a_OBJECTS = aio.$(OBJEXT) aio64.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@brk.$(OBJEXT) calloc.$(OBJEXT) callocr.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@cfreer.$(OBJEXT) cfspeed.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@clock_getres.$(OBJEXT) clock_gettime.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@clock_settime.$(OBJEXT) confstr.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@ctermid.$(OBJEXT) fclean.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@flockfile.$(OBJEXT) fpathconf.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@free.$(OBJEXT) freer.$(OBJEXT) fstab.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@fstatvfs.$(OBJEXT) fstatvfs64.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@ftok.$(OBJEXT) ftw.$(OBJEXT) ftw64.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@funlockfile.$(OBJEXT) getdate.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@getdate_err.$(OBJEXT) gethostname.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@getoptlong.$(OBJEXT) getreent.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@getrlimit64.$(OBJEXT) getwd.$(OBJEXT) ids.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@inode.$(OBJEXT) io.$(OBJEXT) io64.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@ipc.$(OBJEXT) linux.$(OBJEXT) malign.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@malignr.$(OBJEXT) mallinfor.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@mallocr.$(OBJEXT) malloptr.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@mallstatsr.$(OBJEXT) mmap.$(OBJEXT) mntent.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@mntent_r.$(OBJEXT) mq_close.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@lib_a_OBJECTS = aio.$(OBJEXT) brk.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@calloc.$(OBJEXT) callocr.$(OBJEXT) cfreer.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@cfspeed.$(OBJEXT) clock_getres.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@clock_gettime.$(OBJEXT) clock_settime.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@flockfile.$(OBJEXT) free.$(OBJEXT) freer.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@ftok.$(OBJEXT) funlockfile.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@getdate.$(OBJEXT) getdate_err.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@gethostname.$(OBJEXT) getreent.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@ids.$(OBJEXT) inode.$(OBJEXT) io.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@ipc.$(OBJEXT) linux.$(OBJEXT) mallinfor.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@mallocr.$(OBJEXT) mallstatsr.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@mmap.$(OBJEXT) mq_close.$(OBJEXT) \ @USE_LIBTOOL_FALSE@mq_getattr.$(OBJEXT) mq_notify.$(OBJEXT) \ @USE_LIBTOOL_FALSE@mq_open.$(OBJEXT) mq_receive.$(OBJEXT) \ @USE_LIBTOOL_FALSE@mq_send.$(OBJEXT) mq_setattr.$(OBJEXT) \ @USE_LIBTOOL_FALSE@mq_unlink.$(OBJEXT) msize.$(OBJEXT) msizer.$(OBJEXT) \ @USE_LIBTOOL_FALSE@mstats.$(OBJEXT) mtrim.$(OBJEXT) mtrimr.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@ntp_gettime.$(OBJEXT) pathconf.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@pread.$(OBJEXT) pread64.$(OBJEXT) process.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@prof-freq.$(OBJEXT) profile.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@psignal.$(OBJEXT) pvallocr.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@pwrite.$(OBJEXT) pwrite64.$(OBJEXT) raise.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@readdir64.$(OBJEXT) realloc.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@reallocr.$(OBJEXT) realpath.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@rename.$(OBJEXT) resource.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@scandir64.$(OBJEXT) sched.$(OBJEXT) select.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@seteuid.$(OBJEXT) sethostname.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@setrlimit64.$(OBJEXT) shm_open.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@ntp_gettime.$(OBJEXT) pread.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@process.$(OBJEXT) prof-freq.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@profile.$(OBJEXT) psignal.$(OBJEXT) pwrite.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@raise.$(OBJEXT) realloc.$(OBJEXT) reallocr.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@rename.$(OBJEXT) resource.$(OBJEXT) sched.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@select.$(OBJEXT) seteuid.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@sethostname.$(OBJEXT) shm_open.$(OBJEXT) \ @USE_LIBTOOL_FALSE@shm_unlink.$(OBJEXT) sig.$(OBJEXT) \ @USE_LIBTOOL_FALSE@sigaction.$(OBJEXT) sigqueue.$(OBJEXT) \ @USE_LIBTOOL_FALSE@signal.$(OBJEXT) siglongjmp.$(OBJEXT) \ @USE_LIBTOOL_FALSE@sigset.$(OBJEXT) sigwait.$(OBJEXT) socket.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@sleep.$(OBJEXT) stack.$(OBJEXT) statvfs.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@statvfs64.$(OBJEXT) strsignal.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@sleep.$(OBJEXT) strsignal.$(OBJEXT) \ @USE_LIBTOOL_FALSE@strverscmp.$(OBJEXT) sysconf.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@sysctl.$(OBJEXT) systat.$(OBJEXT) system.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@tcdrain.$(OBJEXT) tcsendbrk.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@termios.$(OBJEXT) time.$(OBJEXT) ttyname_r.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@usleep.$(OBJEXT) utimes.$(OBJEXT) vallocr.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@versionsort.$(OBJEXT) versionsort64.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@wait.$(OBJEXT) +@USE_LIBTOOL_FALSE@sysctl.$(OBJEXT) systat.$(OBJEXT) tcdrain.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@tcsendbrk.$(OBJEXT) termios.$(OBJEXT) time.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@usleep.$(OBJEXT) versionsort.$(OBJEXT) LTLIBRARIES = $(noinst_LTLIBRARIES) -@USE_LIBTOOL_TRUE@liblinux_la_OBJECTS = aio.lo aio64.lo brk.lo \ -@USE_LIBTOOL_TRUE@calloc.lo callocr.lo cfreer.lo cfspeed.lo \ -@USE_LIBTOOL_TRUE@clock_getres.lo clock_gettime.lo clock_settime.lo \ -@USE_LIBTOOL_TRUE@confstr.lo ctermid.lo fclean.lo flockfile.lo \ -@USE_LIBTOOL_TRUE@fpathconf.lo free.lo freer.lo fstab.lo fstatvfs.lo \ -@USE_LIBTOOL_TRUE@fstatvfs64.lo ftok.lo ftw.lo ftw64.lo funlockfile.lo \ -@USE_LIBTOOL_TRUE@getdate.lo getdate_err.lo gethostname.lo \ -@USE_LIBTOOL_TRUE@getoptlong.lo getreent.lo getrlimit64.lo getwd.lo \ -@USE_LIBTOOL_TRUE@ids.lo inode.lo io.lo io64.lo ipc.lo linux.lo \ -@USE_LIBTOOL_TRUE@malign.lo malignr.lo mallinfor.lo mallocr.lo \ -@USE_LIBTOOL_TRUE@malloptr.lo mallstatsr.lo mmap.lo mntent.lo \ -@USE_LIBTOOL_TRUE@mntent_r.lo mq_close.lo mq_getattr.lo mq_notify.lo \ -@USE_LIBTOOL_TRUE@mq_open.lo mq_receive.lo mq_send.lo mq_setattr.lo \ -@USE_LIBTOOL_TRUE@mq_unlink.lo msize.lo msizer.lo mstats.lo mtrim.lo \ -@USE_LIBTOOL_TRUE@mtrimr.lo ntp_gettime.lo pathconf.lo pread.lo \ -@USE_LIBTOOL_TRUE@pread64.lo process.lo prof-freq.lo profile.lo \ -@USE_LIBTOOL_TRUE@psignal.lo pvallocr.lo pwrite.lo pwrite64.lo raise.lo \ -@USE_LIBTOOL_TRUE@readdir64.lo realloc.lo reallocr.lo realpath.lo \ -@USE_LIBTOOL_TRUE@rename.lo resource.lo scandir64.lo sched.lo select.lo \ -@USE_LIBTOOL_TRUE@seteuid.lo sethostname.lo setrlimit64.lo shm_open.lo \ -@USE_LIBTOOL_TRUE@shm_unlink.lo sig.lo sigaction.lo sigqueue.lo \ -@USE_LIBTOOL_TRUE@signal.lo siglongjmp.lo sigset.lo sigwait.lo \ -@USE_LIBTOOL_TRUE@socket.lo sleep.lo stack.lo statvfs.lo statvfs64.lo \ -@USE_LIBTOOL_TRUE@strsignal.lo strverscmp.lo sysconf.lo sysctl.lo \ -@USE_LIBTOOL_TRUE@systat.lo system.lo tcdrain.lo tcsendbrk.lo \ -@USE_LIBTOOL_TRUE@termios.lo time.lo ttyname_r.lo usleep.lo utimes.lo \ -@USE_LIBTOOL_TRUE@vallocr.lo versionsort.lo versionsort64.lo wait.lo +@USE_LIBTOOL_TRUE@liblinux_la_OBJECTS = aio.lo brk.lo calloc.lo \ +@USE_LIBTOOL_TRUE@callocr.lo cfreer.lo cfspeed.lo clock_getres.lo \ +@USE_LIBTOOL_TRUE@clock_gettime.lo clock_settime.lo flockfile.lo \ +@USE_LIBTOOL_TRUE@free.lo freer.lo ftok.lo funlockfile.lo getdate.lo \ +@USE_LIBTOOL_TRUE@getdate_err.lo gethostname.lo getreent.lo ids.lo \ +@USE_LIBTOOL_TRUE@inode.lo io.lo ipc.lo linux.lo mallinfor.lo \ +@USE_LIBTOOL_TRUE@mallocr.lo mallstatsr.lo mmap.lo mq_close.lo \ +@USE_LIBTOOL_TRUE@mq_getattr.lo mq_notify.lo mq_open.lo mq_receive.lo \ +@USE_LIBTOOL_TRUE@mq_send.lo mq_setattr.lo mq_unlink.lo msize.lo \ +@USE_LIBTOOL_TRUE@msizer.lo mstats.lo mtrim.lo mtrimr.lo ntp_gettime.lo \ +@USE_LIBTOOL_TRUE@pread.lo process.lo prof-freq.lo profile.lo \ +@USE_LIBTOOL_TRUE@psignal.lo pwrite.lo raise.lo realloc.lo reallocr.lo \ +@USE_LIBTOOL_TRUE@rename.lo resource.lo sched.lo select.lo seteuid.lo \ +@USE_LIBTOOL_TRUE@sethostname.lo shm_open.lo shm_unlink.lo sig.lo \ +@USE_LIBTOOL_TRUE@sigaction.lo sigqueue.lo signal.lo siglongjmp.lo \ +@USE_LIBTOOL_TRUE@sigset.lo sigwait.lo socket.lo sleep.lo strsignal.lo \ +@USE_LIBTOOL_TRUE@strverscmp.lo sysconf.lo sysctl.lo systat.lo \ +@USE_LIBTOOL_TRUE@tcdrain.lo tcsendbrk.lo termios.lo time.lo usleep.lo \ +@USE_LIBTOOL_TRUE@versionsort.lo CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -678,7 +667,7 @@ clean-generic maintainer-clean-generic clean mostlyclean distclean \ maintainer-clean -@USE_LIBTOOL_FALSE@lib.a: $(ADD_OBJS) $(lib_a_OBJECTS) +@USE_LIBTOOL_FALSE@lib.a: $(ADD_OBJS) $(LIB_OBJS) $(lib_a_OBJECTS) @USE_LIBTOOL_FALSE@ rm -f $@ @USE_LIBTOOL_FALSE@ rm -rf tmp @USE_LIBTOOL_FALSE@ mkdir tmp diff --git a/newlib/libc/sys/linux/aclocal.m4 b/newlib/libc/sys/linux/aclocal.m4 index 5133f0bb5..eae4b2000 100644 --- a/newlib/libc/sys/linux/aclocal.m4 +++ b/newlib/libc/sys/linux/aclocal.m4 @@ -65,6 +65,18 @@ AC_ARG_ENABLE(newlib-multithread, *) AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;; esac], [newlib_multithread=yes])dnl +dnl Support --enable-newlib-elix-level +AC_ARG_ENABLE(newlib-elix-level, +[ --enable-newlib-elix-level supply desired elix library level (1-4)], +[case "${enableval}" in + 0) newlib_elix_level=0 ;; + 1) newlib_elix_level=1 ;; + 2) newlib_elix_level=2 ;; + 3) newlib_elix_level=3 ;; + 4) newlib_elix_level=4 ;; + *) AC_MSG_ERROR(bad value ${enableval} for newlib-elix-level option) ;; + esac], [newlib_elix_level=0])dnl + dnl Support --disable-newlib-io-float AC_ARG_ENABLE(newlib-io-float, [ --disable-newlib-io-float disable printf/scanf family float support], @@ -164,6 +176,12 @@ AC_SUBST(NEWLIB_CFLAGS) LDFLAGS=${ldflags} AC_SUBST(LDFLAGS) +AM_CONDITIONAL(ELIX_LEVEL_0, test x[$]{newlib_elix_level} = x0) +AM_CONDITIONAL(ELIX_LEVEL_1, test x[$]{newlib_elix_level} = x1) +AM_CONDITIONAL(ELIX_LEVEL_2, test x[$]{newlib_elix_level} = x2) +AM_CONDITIONAL(ELIX_LEVEL_3, test x[$]{newlib_elix_level} = x3) +AM_CONDITIONAL(ELIX_LEVEL_4, test x[$]{newlib_elix_level} = x4) + AM_CONDITIONAL(USE_LIBTOOL, test x[$]{use_libtool} = xyes) # Hard-code OBJEXT. Normally it is set by AC_OBJEXT, but we diff --git a/newlib/libc/sys/linux/aio.c b/newlib/libc/sys/linux/aio.c index 04e3d7070..de988ebfc 100644 --- a/newlib/libc/sys/linux/aio.c +++ b/newlib/libc/sys/linux/aio.c @@ -66,8 +66,10 @@ lio_listio (int mode, struct aiocb * const list[], int nent, return -1; } +#if !defined(_ELIX_LEVEL) || _ELIX_LEVEL >= 4 void aio_init (const struct aioinit *INIT) { errno = ENOSYS; } +#endif diff --git a/newlib/libc/sys/linux/configure b/newlib/libc/sys/linux/configure index 7b7ebed61..942f07426 100755 --- a/newlib/libc/sys/linux/configure +++ b/newlib/libc/sys/linux/configure @@ -22,6 +22,8 @@ ac_help="$ac_help ac_help="$ac_help --enable-newlib-multithread enable support for multiple threads" ac_help="$ac_help + --enable-newlib-elix-level supply desired elix library level (1-4)" +ac_help="$ac_help --disable-newlib-io-float disable printf/scanf family float support" ac_help="$ac_help --enable-maintainer-mode enable make rules and dependencies not useful @@ -592,7 +594,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:596: checking for a BSD compatible install" >&5 +echo "configure:598: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -645,7 +647,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:649: checking whether build environment is sane" >&5 +echo "configure:651: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -702,7 +704,7 @@ test "$program_suffix" != NONE && test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:706: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:708: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -735,12 +737,12 @@ else fi echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:739: checking for Cygwin environment" >&5 +echo "configure:741: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 744 "configure" +#line 746 "configure" #include "confdefs.h" int main() { @@ -751,7 +753,7 @@ int main() { return __CYGWIN__; ; return 0; } EOF -if { (eval echo configure:755: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:757: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -768,19 +770,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6 CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:772: checking for mingw32 environment" >&5 +echo "configure:774: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 777 "configure" +#line 779 "configure" #include "confdefs.h" int main() { return __MINGW32__; ; return 0; } EOF -if { (eval echo configure:784: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:786: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -857,6 +859,21 @@ else newlib_multithread=yes fi +# Check whether --enable-newlib-elix-level or --disable-newlib-elix-level was given. +if test "${enable_newlib_elix_level+set}" = set; then + enableval="$enable_newlib_elix_level" + case "${enableval}" in + 0) newlib_elix_level=0 ;; + 1) newlib_elix_level=1 ;; + 2) newlib_elix_level=2 ;; + 3) newlib_elix_level=3 ;; + 4) newlib_elix_level=4 ;; + *) { echo "configure: error: bad value ${enableval} for newlib-elix-level option" 1>&2; exit 1; } ;; + esac +else + newlib_elix_level=0 +fi + # Check whether --enable-newlib-io-float or --disable-newlib-io-float was given. if test "${enable_newlib_io_float+set}" = set; then enableval="$enable_newlib_io_float" @@ -912,7 +929,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:916: checking host system type" >&5 +echo "configure:933: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -933,7 +950,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:937: checking target system type" >&5 +echo "configure:954: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -951,7 +968,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:955: checking build system type" >&5 +echo "configure:972: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -994,7 +1011,7 @@ EOF missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:998: checking for working aclocal" >&5 +echo "configure:1015: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1007,7 +1024,7 @@ else fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:1011: checking for working autoconf" >&5 +echo "configure:1028: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1020,7 +1037,7 @@ else fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:1024: checking for working automake" >&5 +echo "configure:1041: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1033,7 +1050,7 @@ else fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:1037: checking for working autoheader" >&5 +echo "configure:1054: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1046,7 +1063,7 @@ else fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:1050: checking for working makeinfo" >&5 +echo "configure:1067: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1071,7 +1088,7 @@ fi # 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:1075: checking for $ac_word" >&5 +echo "configure:1092: 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 @@ -1101,7 +1118,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:1105: checking for $ac_word" >&5 +echo "configure:1122: 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 @@ -1150,7 +1167,7 @@ fi fi echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1154: checking whether we are using GNU C" >&5 +echo "configure:1171: 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 @@ -1159,7 +1176,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1163: \"$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:1180: \"$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 @@ -1174,7 +1191,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:1178: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1195: 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 @@ -1205,7 +1222,7 @@ fi # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1209: checking for $ac_word" >&5 +echo "configure:1226: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1237,7 +1254,7 @@ fi # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1241: checking for $ac_word" >&5 +echo "configure:1258: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1269,7 +1286,7 @@ fi # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1273: checking for $ac_word" >&5 +echo "configure:1290: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1301,7 +1318,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1305: checking for $ac_word" >&5 +echo "configure:1322: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1346,7 +1363,7 @@ fi # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1350: checking for a BSD compatible install" >&5 +echo "configure:1367: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1400,7 +1417,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1404: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1421: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1434,7 +1451,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1438: checking for executable suffix" >&5 +echo "configure:1455: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1444,7 +1461,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj | *.ilk | *.pdb) ;; @@ -1478,6 +1495,52 @@ LDFLAGS=${ldflags} +if test x${newlib_elix_level} = x0; then + ELIX_LEVEL_0_TRUE= + ELIX_LEVEL_0_FALSE='#' +else + ELIX_LEVEL_0_TRUE='#' + ELIX_LEVEL_0_FALSE= +fi + + +if test x${newlib_elix_level} = x1; then + ELIX_LEVEL_1_TRUE= + ELIX_LEVEL_1_FALSE='#' +else + ELIX_LEVEL_1_TRUE='#' + ELIX_LEVEL_1_FALSE= +fi + + +if test x${newlib_elix_level} = x2; then + ELIX_LEVEL_2_TRUE= + ELIX_LEVEL_2_FALSE='#' +else + ELIX_LEVEL_2_TRUE='#' + ELIX_LEVEL_2_FALSE= +fi + + +if test x${newlib_elix_level} = x3; then + ELIX_LEVEL_3_TRUE= + ELIX_LEVEL_3_FALSE='#' +else + ELIX_LEVEL_3_TRUE='#' + ELIX_LEVEL_3_FALSE= +fi + + +if test x${newlib_elix_level} = x4; then + ELIX_LEVEL_4_TRUE= + ELIX_LEVEL_4_FALSE='#' +else + ELIX_LEVEL_4_TRUE='#' + ELIX_LEVEL_4_FALSE= +fi + + + if test x${use_libtool} = xyes; then USE_LIBTOOL_TRUE= USE_LIBTOOL_FALSE='#' @@ -1574,7 +1637,7 @@ fi # 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:1578: checking for $ac_word" >&5 +echo "configure:1641: 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 @@ -1604,7 +1667,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:1608: checking for $ac_word" >&5 +echo "configure:1671: 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 @@ -1655,7 +1718,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1659: checking for $ac_word" >&5 +echo "configure:1722: 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 @@ -1687,7 +1750,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1691: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1754: 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. @@ -1698,12 +1761,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1702 "configure" +#line 1765 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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 @@ -1729,12 +1792,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:1733: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1796: 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:1738: checking whether we are using GNU C" >&5 +echo "configure:1801: 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 @@ -1743,7 +1806,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1747: \"$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:1810: \"$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 @@ -1762,7 +1825,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1766: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1829: 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 @@ -1805,7 +1868,7 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:1809: checking for ld used by GCC" >&5 +echo "configure:1872: checking for ld used by GCC" >&5 case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -1835,10 +1898,10 @@ echo "configure:1809: checking for ld used by GCC" >&5 esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:1839: checking for GNU ld" >&5 +echo "configure:1902: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1842: checking for non-GNU ld" >&5 +echo "configure:1905: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1873,7 +1936,7 @@ else fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:1877: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:1940: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1890,7 +1953,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6 -echo "configure:1894: checking for $LD option to reload object files" >&5 +echo "configure:1957: checking for $LD option to reload object files" >&5 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1902,7 +1965,7 @@ reload_flag=$lt_cv_ld_reload_flag test -n "$reload_flag" && reload_flag=" $reload_flag" echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:1906: checking for BSD-compatible nm" >&5 +echo "configure:1969: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1940,7 +2003,7 @@ NM="$lt_cv_path_NM" echo "$ac_t""$NM" 1>&6 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1944: checking whether ln -s works" >&5 +echo "configure:2007: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1961,7 +2024,7 @@ else fi echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6 -echo "configure:1965: checking how to recognise dependant libraries" >&5 +echo "configure:2028: checking how to recognise dependant libraries" >&5 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2134,13 +2197,13 @@ file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:2138: checking for object suffix" >&5 +echo "configure:2201: checking for object suffix" >&5 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:2144: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2207: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -2164,7 +2227,7 @@ case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6 -echo "configure:2168: checking for ${ac_tool_prefix}file" >&5 +echo "configure:2231: checking for ${ac_tool_prefix}file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2226,7 +2289,7 @@ fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then echo $ac_n "checking for file""... $ac_c" 1>&6 -echo "configure:2230: checking for file" >&5 +echo "configure:2293: checking for file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2297,7 +2360,7 @@ esac # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2301: checking for $ac_word" >&5 +echo "configure:2364: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2329,7 +2392,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2333: checking for $ac_word" >&5 +echo "configure:2396: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2364,7 +2427,7 @@ fi # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2368: checking for $ac_word" >&5 +echo "configure:2431: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2396,7 +2459,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2400: checking for $ac_word" >&5 +echo "configure:2463: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2463,8 +2526,8 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic" case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 2467 "configure"' > conftest.$ac_ext - if { (eval echo configure:2468: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 2530 "configure"' > conftest.$ac_ext + if { (eval echo configure:2531: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" @@ -2483,7 +2546,7 @@ case $host in ia64-*-hpux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo configure:2487: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:2550: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *ELF-32*) HPUX_IA64_MODE="32" @@ -2501,7 +2564,7 @@ ia64-*-hpux*) SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:2505: checking whether the C compiler needs -belf" >&5 +echo "configure:2568: checking whether the C compiler needs -belf" >&5 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2514,14 +2577,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <<EOF -#line 2518 "configure" +#line 2581 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_needs_belf=yes else @@ -2551,7 +2614,7 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6 # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. set dummy ${ac_tool_prefix}dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2555: checking for $ac_word" >&5 +echo "configure:2618: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2583,7 +2646,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "dlltool", so it can be a program name with args. set dummy dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2587: checking for $ac_word" >&5 +echo "configure:2650: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2618,7 +2681,7 @@ fi # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2622: checking for $ac_word" >&5 +echo "configure:2685: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2650,7 +2713,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "as", so it can be a program name with args. set dummy as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2654: checking for $ac_word" >&5 +echo "configure:2717: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2685,7 +2748,7 @@ fi # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2689: checking for $ac_word" >&5 +echo "configure:2752: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2717,7 +2780,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2721: checking for $ac_word" >&5 +echo "configure:2784: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2753,12 +2816,12 @@ fi # recent cygwin and mingw systems supply a stub DllMain which the user # can override, but on older systems we have to supply one echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6 -echo "configure:2757: checking if libtool should supply DllMain function" >&5 +echo "configure:2820: checking if libtool should supply DllMain function" >&5 if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2762 "configure" +#line 2825 "configure" #include "confdefs.h" int main() { @@ -2766,7 +2829,7 @@ extern int __attribute__((__stdcall__)) DllMain(void*, int, void*); DllMain (0, 0, 0); ; return 0; } EOF -if { (eval echo configure:2770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_need_dllmain=no else @@ -2787,19 +2850,19 @@ echo "$ac_t""$lt_cv_need_dllmain" 1>&6 SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -mdll" echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6 -echo "configure:2791: checking how to link DLLs" >&5 +echo "configure:2854: checking how to link DLLs" >&5 if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2796 "configure" +#line 2859 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_dll_switch=-mdll else @@ -2913,7 +2976,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:2917: checking for $ac_word" >&5 +echo "configure:2980: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3139,6 +3202,16 @@ s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g s%@MAINT@%$MAINT%g s%@EXEEXT@%$EXEEXT%g s%@NEWLIB_CFLAGS@%$NEWLIB_CFLAGS%g +s%@ELIX_LEVEL_0_TRUE@%$ELIX_LEVEL_0_TRUE%g +s%@ELIX_LEVEL_0_FALSE@%$ELIX_LEVEL_0_FALSE%g +s%@ELIX_LEVEL_1_TRUE@%$ELIX_LEVEL_1_TRUE%g +s%@ELIX_LEVEL_1_FALSE@%$ELIX_LEVEL_1_FALSE%g +s%@ELIX_LEVEL_2_TRUE@%$ELIX_LEVEL_2_TRUE%g +s%@ELIX_LEVEL_2_FALSE@%$ELIX_LEVEL_2_FALSE%g +s%@ELIX_LEVEL_3_TRUE@%$ELIX_LEVEL_3_TRUE%g +s%@ELIX_LEVEL_3_FALSE@%$ELIX_LEVEL_3_FALSE%g +s%@ELIX_LEVEL_4_TRUE@%$ELIX_LEVEL_4_TRUE%g +s%@ELIX_LEVEL_4_FALSE@%$ELIX_LEVEL_4_FALSE%g s%@USE_LIBTOOL_TRUE@%$USE_LIBTOOL_TRUE%g s%@USE_LIBTOOL_FALSE@%$USE_LIBTOOL_FALSE%g s%@OBJEXT@%$OBJEXT%g diff --git a/newlib/libc/sys/linux/ftok.c b/newlib/libc/sys/linux/ftok.c index 497754bdb..2f4b684b5 100644 --- a/newlib/libc/sys/linux/ftok.c +++ b/newlib/libc/sys/linux/ftok.c @@ -23,15 +23,21 @@ #include <sys/ipc.h> #include <sys/stat.h> +#if !defined(_ELIX_LEVEL) || _ELIX_LEVEL >= 2 +#define STAT stat64 +#else +#define STAT stat +#endif + key_t ftok (pathname, proj_id) const char *pathname; int proj_id; { - struct stat64 st; + struct STAT st; key_t key; - if (stat64 (pathname, &st) < 0) + if (STAT (pathname, &st) < 0) return (key_t) -1; key = ((st.st_ino & 0xffff) | ((st.st_dev & 0xff) << 16) diff --git a/newlib/libc/sys/linux/getdate.c b/newlib/libc/sys/linux/getdate.c index 9137a2e5b..5c056c750 100644 --- a/newlib/libc/sys/linux/getdate.c +++ b/newlib/libc/sys/linux/getdate.c @@ -86,6 +86,12 @@ PORTABILITY #include <unistd.h> #include <sys/stat.h> +#if !defined(_ELIX_LEVEL) || _ELIX_LEVEL >= 2 +# define STAT stat64 +#else +# define STAT stat +#endif + #define TM_YEAR_BASE 1900 extern ssize_t __getline (char **, size_t *, FILE *); @@ -171,14 +177,14 @@ getdate_r (const char *string, struct tm *tp) char *result = NULL; time_t timer; struct tm tm; - struct stat64 st; + struct STAT st; int mday_ok = 0; datemsk = getenv ("DATEMSK"); if (datemsk == NULL || *datemsk == '\0') return 1; - if (stat64 (datemsk, &st) < 0) + if (STAT (datemsk, &st) < 0) return 3; if (!S_ISREG (st.st_mode)) diff --git a/newlib/libc/sys/linux/ids.c b/newlib/libc/sys/linux/ids.c index 332ebe2c9..f3a95b123 100644 --- a/newlib/libc/sys/linux/ids.c +++ b/newlib/libc/sys/linux/ids.c @@ -8,16 +8,19 @@ #include <machine/syscall.h> -_syscall1(int,setuid,uid_t,uid) _syscall1(int,setfsuid,uid_t,uid) _syscall0(uid_t,getuid) -_syscall1(int,setgid,gid_t,gid) _syscall1(int,setfsgid,gid_t,gid) _syscall0(gid_t,getgid) _syscall0(uid_t,geteuid) _syscall0(gid_t,getegid) _syscall3(int,setresuid,uid_t,ruid,uid_t,euid,uid_t,suid) -_syscall2(int,getgroups,int,size,gid_t *,list) _syscall3(int,syslog,int,type,char *,bufp,int,len) +#if !defined(_ELIX_LEVEL) || _ELIX_LEVEL > 3 +_syscall2(int,getgroups,int,size,gid_t *,list) +_syscall1(int,setgid,gid_t,gid) +_syscall1(int,setuid,uid_t,uid) +#endif + weak_alias(__libc_getuid,__getuid); diff --git a/newlib/libc/sys/linux/inode.c b/newlib/libc/sys/linux/inode.c index 280d55876..ed468c19b 100644 --- a/newlib/libc/sys/linux/inode.c +++ b/newlib/libc/sys/linux/inode.c @@ -14,7 +14,6 @@ #define _LIBC 1 #include <sys/lock.h> -__LOCK_INIT(static, umask_lock); #define __NR___umask __NR_umask @@ -22,25 +21,33 @@ _syscall2(int,link,const char *,oldpath,const char *,newpath) _syscall1(int,unlink,const char *,pathname) _syscall1(int,chdir,const char *,path) _syscall1(int,fchdir,int,fd) -_syscall3(int,mknod,const char *,pathname,mode_t,mode,dev_t,dev) -_syscall2(int,chmod,const char *,path,mode_t,mode) -_syscall2(int,fchmod,int,filedes,mode_t,mode) -_syscall3(int,chown,const char *,path,uid_t,owner,gid_t,group) -_syscall2(int,utime,const char *,filename,const struct utimbuf *,buf) _syscall2(int,access,const char *,filename,int,mode) _syscall2(int,mkdir,const char *,pathname,mode_t,mode) _syscall1(int,rmdir,const char *,pathname) -_syscall1(int,pipe,int *,filedes) _syscall1(int,chroot,const char *,path) -_syscall2(int,symlink,const char *,oldpath,const char *,newpath) -_syscall3(int,readlink,const char *,path,char *,buf,size_t,bufsiz) _syscall2(int,stat,const char *,file_name,struct stat *,buf) _syscall2(int,statfs,const char *,file_name,struct statfs *,buf) -_syscall2(int,lstat,const char *,file_name,struct stat *,buf) _syscall2(int,fstat,int,filedes,struct stat *,buf) _syscall2(int,fstatfs,int,filedes,struct statfs *,buf) _syscall3(int,getdents,int,fd,struct dirent *,dirp,unsigned int,count) -_syscall1(mode_t,__umask,mode_t,mask) + +#if !defined(_ELIX_LEVEL) || _ELIX_LEVEL >= 2 +_syscall2(int,chmod,const char *,path,mode_t,mode) +_syscall3(int,chown,const char *,path,uid_t,owner,gid_t,group) +_syscall2(int,fchmod,int,filedes,mode_t,mode) +_syscall2(int,lstat,const char *,file_name,struct stat *,buf) +_syscall3(int,readlink,const char *,path,char *,buf,size_t,bufsiz) +_syscall2(int,symlink,const char *,oldpath,const char *,newpath) +_syscall2(int,utime,const char *,filename,const struct utimbuf *,buf) +#endif + +#if !defined(_ELIX_LEVEL) || _ELIX_LEVEL >= 3 +_syscall1(int,pipe,int *,filedes) +#endif + +#if !defined(_ELIX_LEVEL) || _ELIX_LEVEL >= 4 +_syscall3(int,mknod,const char *,pathname,mode_t,mode,dev_t,dev) +#endif weak_alias(__libc_statfs,__statfs) weak_alias(__libc_fstatfs,__fstatfs) @@ -53,6 +60,12 @@ fchown (int fd, uid_t owner, gid_t group) return __libc_fchown32 (fd, owner, group); } +#if !defined(_ELIX_LEVEL) || _ELIX_LEVEL >= 2 + +__LOCK_INIT(static, umask_lock); + +_syscall1(mode_t,__umask,mode_t,mask) + mode_t umask (mode_t mask) { @@ -81,3 +94,4 @@ getumask (void) return mask; } +#endif /* !_ELIX_LEVEL || _ELIX_LEVEL >= 2 */ diff --git a/newlib/libc/sys/linux/io.c b/newlib/libc/sys/linux/io.c index c33461f14..d6731144a 100644 --- a/newlib/libc/sys/linux/io.c +++ b/newlib/libc/sys/linux/io.c @@ -21,9 +21,7 @@ #define __NR___mknod __NR_mknod _syscall3(ssize_t,read,int,fd,void *,buf,size_t,count) -_syscall3(ssize_t,readv,int,fd,const struct iovec *,vec,int,count) _syscall3(ssize_t,write,int,fd,const void *,buf,size_t,count) -_syscall3(ssize_t,writev,int,fd,const struct iovec *,buf,int,count) _syscall3(int,open,const char *,file,int,flag,mode_t,mode) _syscall1(int,close,int,fd) _syscall3(off_t,lseek,int,fd,off_t,offset,int,count) @@ -32,14 +30,20 @@ _syscall1(int,dup,int,fd) _syscall2(int,dup2,int,oldfd,int,newfd) _syscall3(int,fcntl,int,fd,int,cmd,long,arg) _syscall1(int,fdatasync,int,fd) -_syscall2(int,ftruncate,int,fd,off_t,len) -_syscall2(int,truncate,const char *,path,off_t,len) _syscall1(int,fsync,int,fd) _syscall3(int,poll,struct pollfd *,fds,nfds_t,nfds,int,timeout) -static _syscall2(long,__flock,unsigned int,fd,unsigned int,cmd) +#if !defined(_ELIX_LEVEL) || _ELIX_LEVEL >= 2 +_syscall3(ssize_t,readv,int,fd,const struct iovec *,vec,int,count) +_syscall3(ssize_t,writev,int,fd,const struct iovec *,buf,int,count) +#endif + +#if !defined(_ELIX_LEVEL) || _ELIX_LEVEL >= 4 +_syscall2(int,ftruncate,int,fd,off_t,len) +_syscall2(int,truncate,const char *,path,off_t,len) +#endif + static _syscall3(int,__ioctl,int,fd,int,request,void *,arg) -static _syscall3(int,__mknod,const char *,path,mode_t,mode,dev_t *,dev) int ioctl(int fd,int request,...) { @@ -52,16 +56,23 @@ int ioctl(int fd,int request,...) return res; } +static _syscall2(long,__flock,unsigned int,fd,unsigned int,cmd) + int flock(int fd,int operation) { return __flock(fd,operation); } +#if !defined(_ELIX_LEVEL) || _ELIX_LEVEL >= 3 + +static _syscall3(int,__mknod,const char *,path,mode_t,mode,dev_t *,dev) + int mkfifo(const char *path, mode_t mode) { dev_t dev = 0; return __mknod(path, mode | S_IFIFO, &dev); } +#endif weak_alias(__libc_close,__close); weak_alias(__libc_fcntl,__fcntl); diff --git a/newlib/libc/sys/linux/machine/i386/syscall.h b/newlib/libc/sys/linux/machine/i386/syscall.h index b165f0442..380f1bcdf 100644 --- a/newlib/libc/sys/linux/machine/i386/syscall.h +++ b/newlib/libc/sys/linux/machine/i386/syscall.h @@ -68,58 +68,78 @@ __asm__ volatile ("push %%ebx; lea 8(%%ebp),%%ebx; int $0x80; pop %%ebx" \ : "=a" (ret) \ : "0" (__NR_##name)); -#undef _syscall0 -#define _syscall0(type,name) \ +#undef _syscall0_base +#define _syscall0_base(type,name) \ type __libc_##name (void) \ { \ long __res; \ __inline_syscall0(name,__res) \ __syscall_return(type,__res); \ -} \ +} + +#undef _syscall0 +#define _syscall0(type,name) \ +_syscall0_base(type,name) \ weak_alias(__libc_##name,name); -#undef _syscall1 -#define _syscall1(type,name,type1,arg1) \ +#undef _syscall1_base +#define _syscall1_base(type,name,type1,arg1) \ type __libc_##name (type1 arg1) \ { \ long __res; \ __inline_syscall1(name,__res,arg1) \ __syscall_return(type,__res); \ -} \ +} + +#undef _syscall1 +#define _syscall1(type,name,type1,arg1) \ +_syscall1_base(type,name,type1,arg1) \ weak_alias(__libc_##name,name); -#undef _syscall2 -#define _syscall2(type,name,type1,arg1,type2,arg2) \ +#undef _syscall2_base +#define _syscall2_base(type,name,type1,arg1,type2,arg2) \ type __libc_##name (type1 arg1,type2 arg2) \ { \ long __res; \ __inline_syscall2(name,__res,arg1,arg2) \ __syscall_return(type,__res); \ -} \ +} + +#undef _syscall2 +#define _syscall2(type,name,type1,arg1,type2,arg2) \ +_syscall2_base(type,name,type1,arg1,type2,arg2) \ weak_alias(__libc_##name,name); -#undef _syscall3 -#define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3) \ +#undef _syscall3_base +#define _syscall3_base(type,name,type1,arg1,type2,arg2,type3,arg3) \ type __libc_##name (type1 arg1,type2 arg2,type3 arg3) \ { \ long __res; \ __inline_syscall3(name,__res,arg1,arg2,arg3) \ __syscall_return(type,__res); \ -} \ +} + +#undef _syscall3 +#define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3) \ +_syscall3_base(type,name,type1,arg1,type2,arg2,type3,arg3) \ weak_alias(__libc_##name,name); -#undef _syscall4 -#define _syscall4(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \ +#undef _syscall4_base +#define _syscall4_base(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \ type __libc_##name (type1 arg1, type2 arg2, type3 arg3, type4 arg4) \ { \ long __res; \ __inline_syscall4(name,__res,arg1,arg2,arg3,arg4) \ __syscall_return(type,__res); \ -} \ +} + +#undef _syscall4 +#define _syscall4(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \ +_syscall4_base(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \ weak_alias(__libc_##name,name); -#undef _syscall5 -#define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \ +#undef _syscall5_base +#define _syscall5_base(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \ type5,arg5) \ type __libc_##name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \ { \ @@ -127,17 +147,27 @@ long __res; \ __inline_syscall5(name,__res,arg1,arg2,arg3,arg4,arg5) \ __syscall_return(type,__res); \ } \ + +#undef _syscall5 +#define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \ + type5,arg5) \ +_syscall5_base(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5) \ weak_alias(__libc_##name,name); -#undef _syscall6 -#define _syscall6(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \ +#undef _syscall6_base +#define _syscall6_base(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \ type5,arg5,type6,arg6) \ type __libc_##name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5,type6 arg6) \ { \ long __res; \ __inline_syscall6(name,__res,arg1,arg2,arg3,arg4,arg5,arg6) \ __syscall_return(type,__res); \ -} \ +} + +#undef _syscall6 +#define _syscall6(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \ + type5,arg5,type6,arg6) \ +_syscall6_base(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5,type6,arg6) \ weak_alias(__libc_##name,name); #endif /* __PIC__ && __i386__ */ diff --git a/newlib/libc/sys/linux/process.c b/newlib/libc/sys/linux/process.c index 52336f3ac..160b80137 100644 --- a/newlib/libc/sys/linux/process.c +++ b/newlib/libc/sys/linux/process.c @@ -11,16 +11,21 @@ #define __NR__exit __NR_exit #define __NR__execve __NR_execve -_syscall0(int,fork) -_syscall3(int,_execve,const char *,file,char * const *,argv,char * const *,envp) _syscall0(int,getpid) -_syscall2(int,setpgid,pid_t,pid,pid_t,pgid) _syscall0(pid_t,getppid) -_syscall0(pid_t,getpgrp) -_syscall0(pid_t,setsid) weak_alias(__libc_getpid,__getpid); +#if !defined(_ELIX_LEVEL) || _ELIX_LEVEL >= 3 +_syscall3(int,_execve,const char *,file,char * const *,argv,char * const *,envp) +_syscall0(int,fork) +#endif /* _ELIX_LEVEL >= 3 */ + +#if !defined(_ELIX_LEVEL) || _ELIX_LEVEL >= 4 +_syscall0(pid_t,getpgrp) +_syscall2(int,setpgid,pid_t,pid,pid_t,pgid) +_syscall0(pid_t,setsid) + /* Here we implement vfork in terms of fork, since * Linux's vfork system call is not reliable. */ @@ -42,7 +47,10 @@ pid_t vfork(void) return pid; } } +#endif /* !_ELIX_LEVEL || _ELIX_LEVEL >= 4 */ + +/* Although _exit is listed as level 3, we use it from level 1 interfaces */ /* FIXME: get rid of noreturn warning */ #define return for (;;) diff --git a/newlib/libc/sys/linux/resource.c b/newlib/libc/sys/linux/resource.c index 66f9c0578..54a049da9 100644 --- a/newlib/libc/sys/linux/resource.c +++ b/newlib/libc/sys/linux/resource.c @@ -7,7 +7,11 @@ _syscall2(int,getrusage,int,who,struct rusage *,r_usage) _syscall2(int,getrlimit,int,resource,struct rlimit *,rlp) -_syscall2(int,setrlimit,int,resource,const struct rlimit *,rlp) weak_alias(__libc_getrlimit,__getrlimit) + +#if !defined(_ELIX_LEVEL) || _ELIX_LEVEL >= 2 +_syscall2(int,setrlimit,int,resource,const struct rlimit *,rlp) weak_alias(__libc_setrlimit,__setrlimit) +#endif + diff --git a/newlib/libc/sys/linux/sched.c b/newlib/libc/sys/linux/sched.c index b0df1a9e6..031b1b553 100644 --- a/newlib/libc/sys/linux/sched.c +++ b/newlib/libc/sys/linux/sched.c @@ -6,17 +6,21 @@ #include <sched.h> #include <machine/syscall.h> -_syscall2(int,sched_getparam,pid_t,pid,struct sched_param *,sched); _syscall1(int,sched_get_priority_max,int,policy); _syscall1(int,sched_get_priority_min,int,policy); -_syscall1(int,sched_getscheduler,pid_t,pid); _syscall2(int,sched_rr_get_interval,pid_t,pid,struct timespec *,interval); -_syscall2(int,sched_setparam,pid_t,pid,const struct sched_param *,sched); -_syscall3(int,sched_setscheduler,pid_t,pid,int,policy,const struct sched_param *,sched); _syscall0(int,sched_yield); -weak_alias(__libc_sched_getparam,__sched_getparam); -weak_alias(__libc_sched_getscheduler,__sched_getscheduler); weak_alias(__libc_sched_get_priority_max,__sched_get_priority_max); weak_alias(__libc_sched_get_priority_min,__sched_get_priority_min); + +#if !defined(_ELIX_LEVEL) || _ELIX_LEVEL >= 3 +_syscall2(int,sched_getparam,pid_t,pid,struct sched_param *,sched); +_syscall1(int,sched_getscheduler,pid_t,pid); +_syscall2(int,sched_setparam,pid_t,pid,const struct sched_param *,sched); +_syscall3(int,sched_setscheduler,pid_t,pid,int,policy,const struct sched_param *,sched); +weak_alias(__libc_sched_getparam,__sched_getparam); +weak_alias(__libc_sched_getscheduler,__sched_getscheduler); weak_alias(__libc_sched_setscheduler,__sched_setscheduler); +#endif /* !_ELIX_LEVEL || _ELIX_LEVEL >= 3 */ + diff --git a/newlib/libc/sys/linux/sig.c b/newlib/libc/sys/linux/sig.c index d083b1744..6e22873ee 100644 --- a/newlib/libc/sys/linux/sig.c +++ b/newlib/libc/sys/linux/sig.c @@ -21,8 +21,6 @@ _syscall2(__sighandler_t,signal,int,signum,__sighandler_t,handler) _syscall0(int,pause) _syscall1(unsigned int,alarm,unsigned int,seconds) -static _syscall0(int,__sgetmask) -static _syscall1(int,__ssetmask,int,newmask) static _syscall2(int,__rt_sigpending,sigset_t *,set,size_t,size) static _syscall4(int,__rt_sigprocmask,int,how,const sigset_t *,set,sigset_t *,oldset,size_t,size) static _syscall2(int,__rt_sigsuspend,const sigset_t *,mask,size_t,size) @@ -34,21 +32,11 @@ int __sigsuspend (const sigset_t *mask) } weak_alias(__sigsuspend,sigsuspend) -int sigsetmask(int newmask) /* BSD */ -{ - return __ssetmask(newmask); -} - int sigmask(int signum) /* BSD */ { return 1 << signum; } -int sigblock(int mask) /* BSD */ -{ - return __ssetmask(mask | __sgetmask()); -} - int __libc_raise(int sig) { return kill(getpid(),sig); @@ -78,6 +66,22 @@ int sigwaitinfo(const sigset_t *set, siginfo_t *info) return __rt_sigtimedwait(set, info, NULL, NSIG/8); } +#if !defined(_ELIX_LEVEL) || _ELIX_LEVEL >= 4 + +static _syscall1(int,__ssetmask,int,newmask) +static _syscall0(int,__sgetmask) + +int sigblock(int mask) /* BSD */ +{ + return __ssetmask(mask | __sgetmask()); +} + +int sigsetmask(int newmask) /* BSD */ +{ + return __ssetmask(newmask); +} +#endif + const char *const sys_siglist[] = { #include "siglist.inc" }; diff --git a/newlib/libc/sys/linux/termios.c b/newlib/libc/sys/linux/termios.c index bc0ac550a..ac155201d 100644 --- a/newlib/libc/sys/linux/termios.c +++ b/newlib/libc/sys/linux/termios.c @@ -38,7 +38,7 @@ tcsetattr(int fd,int optional_actions,const struct termios *termios_p) return ioctl(fd,cmd,termios_p); } - +#if !defined(_ELIX_LEVEL) || _ELIX_LEVEL >= 4 pid_t tcgetpgrp(int fd) { @@ -56,6 +56,7 @@ tcsetpgrp(int fd, pid_t pid) int p = (int)pid; return ioctl(fd,TIOCSPGRP,&p); } +#endif /* !_ELIX_LEVEL || _ELIX_LEVEL >= 4 */ int tcflow (int fd, int action) diff --git a/newlib/libc/sys/linux/wait.c b/newlib/libc/sys/linux/wait.c index bc2716342..31d1cc765 100644 --- a/newlib/libc/sys/linux/wait.c +++ b/newlib/libc/sys/linux/wait.c @@ -22,5 +22,6 @@ pid_t __libc_wait(int *status) return __libc_waitpid(-1,status,0); } +weak_alias(__libc_waitpid,__libc___waitpid); weak_alias(__libc_wait,__wait); weak_alias(__libc_wait,wait); diff --git a/newlib/libc/syscalls/Makefile.am b/newlib/libc/syscalls/Makefile.am index 71a5eaeb4..e9e5742e2 100644 --- a/newlib/libc/syscalls/Makefile.am +++ b/newlib/libc/syscalls/Makefile.am @@ -4,11 +4,9 @@ AUTOMAKE_OPTIONS = cygnus INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) -LIB_SOURCES = \ +GENERAL_SOURCES = \ sysclose.c \ - sysexecve.c \ sysfcntl.c \ - sysfork.c \ sysfstat.c \ sysgetpid.c \ sysgettod.c \ @@ -21,18 +19,36 @@ LIB_SOURCES = \ sysstat.c \ systimes.c \ sysunlink.c \ - syswait.c \ syswrite.c + +## Weed out EL/IX level 3 interfaces if necessary +if ELIX_LEVEL_1 +LIB_OBJS = +else +if ELIX_LEVEL_2 +LIB_OBJS = +else +LIB_OBJS = \ + sysexecve.$(oext) \ + sysfork.$(oext) \ + syswait.$(oext) +endif +endif + libsyscalls_la_LDFLAGS = -Xcompiler -nostdlib if USE_LIBTOOL noinst_LTLIBRARIES = libsyscalls.la -libsyscalls_la_SOURCES = $(LIB_SOURCES) +libsyscalls_la_SOURCES = $(GENERAL_SOURCES) +libsyscalls_la_LIBADD = $(LIB_OBJS) +libsyscalls_la_DEPENDENCIES = $(LIB_OBJS) noinst_DATA = objectlist.awk.in else noinst_LIBRARIES = lib.a -lib_a_SOURCES = $(LIB_SOURCES) +lib_a_SOURCES = $(GENERAL_SOURCES) +lib_a_LIBADD = $(LIB_OBJS) +lib_a_DEPENDENCIES = $(LIB_OBJS) noinst_DATA = endif diff --git a/newlib/libc/syscalls/Makefile.in b/newlib/libc/syscalls/Makefile.in index 68f389257..ab02c69f3 100644 --- a/newlib/libc/syscalls/Makefile.in +++ b/newlib/libc/syscalls/Makefile.in @@ -110,11 +110,9 @@ AUTOMAKE_OPTIONS = cygnus INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) -LIB_SOURCES = \ +GENERAL_SOURCES = \ sysclose.c \ - sysexecve.c \ sysfcntl.c \ - sysfork.c \ sysfstat.c \ sysgetpid.c \ sysgettod.c \ @@ -127,18 +125,27 @@ LIB_SOURCES = \ sysstat.c \ systimes.c \ sysunlink.c \ - syswait.c \ syswrite.c +@ELIX_LEVEL_1_TRUE@LIB_OBJS = +@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_TRUE@LIB_OBJS = +@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@LIB_OBJS = @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@\ +@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@ sysexecve.$(oext) \ +@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@ sysfork.$(oext) \ +@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@ syswait.$(oext) libsyscalls_la_LDFLAGS = -Xcompiler -nostdlib @USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = @USE_LIBTOOL_TRUE@libsyscalls.la -@USE_LIBTOOL_TRUE@libsyscalls_la_SOURCES = @USE_LIBTOOL_TRUE@$(LIB_SOURCES) +@USE_LIBTOOL_TRUE@libsyscalls_la_SOURCES = @USE_LIBTOOL_TRUE@$(GENERAL_SOURCES) +@USE_LIBTOOL_TRUE@libsyscalls_la_LIBADD = @USE_LIBTOOL_TRUE@$(LIB_OBJS) +@USE_LIBTOOL_TRUE@libsyscalls_la_DEPENDENCIES = @USE_LIBTOOL_TRUE@$(LIB_OBJS) @USE_LIBTOOL_TRUE@noinst_DATA = @USE_LIBTOOL_TRUE@objectlist.awk.in @USE_LIBTOOL_FALSE@noinst_DATA = @USE_LIBTOOL_FALSE@noinst_LIBRARIES = @USE_LIBTOOL_FALSE@lib.a -@USE_LIBTOOL_FALSE@lib_a_SOURCES = @USE_LIBTOOL_FALSE@$(LIB_SOURCES) +@USE_LIBTOOL_FALSE@lib_a_SOURCES = @USE_LIBTOOL_FALSE@$(GENERAL_SOURCES) +@USE_LIBTOOL_FALSE@lib_a_LIBADD = @USE_LIBTOOL_FALSE@$(LIB_OBJS) +@USE_LIBTOOL_FALSE@lib_a_DEPENDENCIES = @USE_LIBTOOL_FALSE@$(LIB_OBJS) CHEWOUT_FILES = @@ -157,25 +164,21 @@ LIBRARIES = $(noinst_LIBRARIES) DEFS = @DEFS@ -I. -I$(srcdir) CPPFLAGS = @CPPFLAGS@ LIBS = @LIBS@ -lib_a_LIBADD = @USE_LIBTOOL_FALSE@lib_a_OBJECTS = sysclose.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@sysexecve.$(OBJEXT) sysfcntl.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@sysfork.$(OBJEXT) sysfstat.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@sysfcntl.$(OBJEXT) sysfstat.$(OBJEXT) \ @USE_LIBTOOL_FALSE@sysgetpid.$(OBJEXT) sysgettod.$(OBJEXT) \ @USE_LIBTOOL_FALSE@syskill.$(OBJEXT) syslink.$(OBJEXT) \ @USE_LIBTOOL_FALSE@syslseek.$(OBJEXT) sysopen.$(OBJEXT) \ @USE_LIBTOOL_FALSE@sysread.$(OBJEXT) syssbrk.$(OBJEXT) \ @USE_LIBTOOL_FALSE@sysstat.$(OBJEXT) systimes.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@sysunlink.$(OBJEXT) syswait.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@syswrite.$(OBJEXT) +@USE_LIBTOOL_FALSE@sysunlink.$(OBJEXT) syswrite.$(OBJEXT) LTLIBRARIES = $(noinst_LTLIBRARIES) -libsyscalls_la_LIBADD = -@USE_LIBTOOL_TRUE@libsyscalls_la_OBJECTS = sysclose.lo sysexecve.lo \ -@USE_LIBTOOL_TRUE@sysfcntl.lo sysfork.lo sysfstat.lo sysgetpid.lo \ -@USE_LIBTOOL_TRUE@sysgettod.lo syskill.lo syslink.lo syslseek.lo \ -@USE_LIBTOOL_TRUE@sysopen.lo sysread.lo syssbrk.lo sysstat.lo \ -@USE_LIBTOOL_TRUE@systimes.lo sysunlink.lo syswait.lo syswrite.lo +@USE_LIBTOOL_TRUE@libsyscalls_la_OBJECTS = sysclose.lo sysfcntl.lo \ +@USE_LIBTOOL_TRUE@sysfstat.lo sysgetpid.lo sysgettod.lo syskill.lo \ +@USE_LIBTOOL_TRUE@syslink.lo syslseek.lo sysopen.lo sysread.lo \ +@USE_LIBTOOL_TRUE@syssbrk.lo sysstat.lo systimes.lo sysunlink.lo \ +@USE_LIBTOOL_TRUE@syswrite.lo CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) diff --git a/newlib/libc/time/tzset_r.c b/newlib/libc/time/tzset_r.c index a083e5b80..9469028a4 100644 --- a/newlib/libc/time/tzset_r.c +++ b/newlib/libc/time/tzset_r.c @@ -51,7 +51,9 @@ _DEFUN (_tzset_r, (reent_ptr), } free(prev_tzenv); - prev_tzenv = _strdup_r (reent_ptr, tzenv); + prev_tzenv = _malloc_r (reent_ptr, strlen(tzenv) + 1); + if (prev_tzenv != NULL) + strcpy (prev_tzenv, tzenv); /* ignore implementation-specific format specifier */ if (*tzenv == ':') diff --git a/newlib/libc/unix/Makefile.am b/newlib/libc/unix/Makefile.am index 83fd26254..24d1bfb5c 100644 --- a/newlib/libc/unix/Makefile.am +++ b/newlib/libc/unix/Makefile.am @@ -4,19 +4,51 @@ AUTOMAKE_OPTIONS = cygnus INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) -LIB_SOURCES = \ - getcwd.c getlogin.c getpass.c getpwent.c getut.c \ - pread.c pwrite.c sigset.c ttyname.c +GENERAL_SOURCES = \ + getcwd.c \ + pread.c \ + pwrite.c \ + sigset.c + +## Distinguish different EL/IX level interfaces +ELIX_2_OBJS = \ + ttyname.$(oext) + +ELIX_4_OBJS = \ + getlogin.$(oext) \ + getpass.$(oext) \ + getpwent.$(oext) \ + getut.$(oext) + +if ELIX_LEVEL_1 +LIB_OBJS = +else +if ELIX_LEVEL_2 +LIB_OBJS = $(ELIX_2_OBJS) +else +if ELIX_LEVEL_3 +LIB_OBJS = $(ELIX_2_OBJS) +else +if ELIX_LEVEL_4 +LIB_OBJS = $(ELIX_2_OBJS) $(ELIX_4_OBJS) +endif +endif +endif +endif libunix_la_LDFLAGS = -Xcompiler -nostdlib if USE_LIBTOOL noinst_LTLIBRARIES = libunix.la -libunix_la_SOURCES = $(LIB_SOURCES) +libunix_la_SOURCES = $(GENERAL_SOURCES) +libunix_la_LIBADD = $(LIB_OBJS) +libunix_la_DEPENDENCIES = $(LIB_OBJS) noinst_DATA = objectlist.awk.in else noinst_LIBRARIES = lib.a -lib_a_SOURCES = $(LIB_SOURCES) +lib_a_SOURCES = $(GENERAL_SOURCES) +lib_a_LIBADD = $(LIB_OBJS) +lib_a_DEPENDENCIES = $(LIB_OBJS) noinst_DATA = endif # USE_LIBTOOL diff --git a/newlib/libc/unix/Makefile.in b/newlib/libc/unix/Makefile.in index 60a069d55..56e5c1b58 100644 --- a/newlib/libc/unix/Makefile.in +++ b/newlib/libc/unix/Makefile.in @@ -110,19 +110,40 @@ AUTOMAKE_OPTIONS = cygnus INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) -LIB_SOURCES = \ - getcwd.c getlogin.c getpass.c getpwent.c getut.c \ - pread.c pwrite.c sigset.c ttyname.c +GENERAL_SOURCES = \ + getcwd.c \ + pread.c \ + pwrite.c \ + sigset.c +ELIX_2_OBJS = \ + ttyname.$(oext) + + +ELIX_4_OBJS = \ + getlogin.$(oext) \ + getpass.$(oext) \ + getpwent.$(oext) \ + getut.$(oext) + +@ELIX_LEVEL_1_TRUE@LIB_OBJS = +@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_TRUE@LIB_OBJS = @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_TRUE@$(ELIX_2_OBJS) +@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_TRUE@LIB_OBJS = @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_TRUE@$(ELIX_2_OBJS) +@ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@@ELIX_LEVEL_4_TRUE@LIB_OBJS = @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_FALSE@@ELIX_LEVEL_3_FALSE@@ELIX_LEVEL_4_TRUE@$(ELIX_2_OBJS) $(ELIX_4_OBJS) + libunix_la_LDFLAGS = -Xcompiler -nostdlib @USE_LIBTOOL_TRUE@noinst_LTLIBRARIES = @USE_LIBTOOL_TRUE@libunix.la -@USE_LIBTOOL_TRUE@libunix_la_SOURCES = @USE_LIBTOOL_TRUE@$(LIB_SOURCES) +@USE_LIBTOOL_TRUE@libunix_la_SOURCES = @USE_LIBTOOL_TRUE@$(GENERAL_SOURCES) +@USE_LIBTOOL_TRUE@libunix_la_LIBADD = @USE_LIBTOOL_TRUE@$(LIB_OBJS) +@USE_LIBTOOL_TRUE@libunix_la_DEPENDENCIES = @USE_LIBTOOL_TRUE@$(LIB_OBJS) @USE_LIBTOOL_TRUE@noinst_DATA = @USE_LIBTOOL_TRUE@objectlist.awk.in @USE_LIBTOOL_FALSE@noinst_DATA = @USE_LIBTOOL_FALSE@noinst_LIBRARIES = @USE_LIBTOOL_FALSE@lib.a -@USE_LIBTOOL_FALSE@lib_a_SOURCES = @USE_LIBTOOL_FALSE@$(LIB_SOURCES) +@USE_LIBTOOL_FALSE@lib_a_SOURCES = @USE_LIBTOOL_FALSE@$(GENERAL_SOURCES) +@USE_LIBTOOL_FALSE@lib_a_LIBADD = @USE_LIBTOOL_FALSE@$(LIB_OBJS) +@USE_LIBTOOL_FALSE@lib_a_DEPENDENCIES = @USE_LIBTOOL_FALSE@$(LIB_OBJS) CHEWOUT_FILES = @@ -141,17 +162,12 @@ LIBRARIES = $(noinst_LIBRARIES) DEFS = @DEFS@ -I. -I$(srcdir) CPPFLAGS = @CPPFLAGS@ LIBS = @LIBS@ -lib_a_LIBADD = -@USE_LIBTOOL_FALSE@lib_a_OBJECTS = getcwd.$(OBJEXT) getlogin.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@getpass.$(OBJEXT) getpwent.$(OBJEXT) getut.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@pread.$(OBJEXT) pwrite.$(OBJEXT) sigset.$(OBJEXT) \ -@USE_LIBTOOL_FALSE@ttyname.$(OBJEXT) +@USE_LIBTOOL_FALSE@lib_a_OBJECTS = getcwd.$(OBJEXT) pread.$(OBJEXT) \ +@USE_LIBTOOL_FALSE@pwrite.$(OBJEXT) sigset.$(OBJEXT) LTLIBRARIES = $(noinst_LTLIBRARIES) -libunix_la_LIBADD = -@USE_LIBTOOL_TRUE@libunix_la_OBJECTS = getcwd.lo getlogin.lo getpass.lo \ -@USE_LIBTOOL_TRUE@getpwent.lo getut.lo pread.lo pwrite.lo sigset.lo \ -@USE_LIBTOOL_TRUE@ttyname.lo +@USE_LIBTOOL_TRUE@libunix_la_OBJECTS = getcwd.lo pread.lo pwrite.lo \ +@USE_LIBTOOL_TRUE@sigset.lo CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) |