diff options
Diffstat (limited to 'newlib/libc/sys')
146 files changed, 1365 insertions, 15171 deletions
diff --git a/newlib/libc/sys/a29khif/aclocal.m4 b/newlib/libc/sys/a29khif/aclocal.m4 index 55d5e67ce..0a1490998 100644 --- a/newlib/libc/sys/a29khif/aclocal.m4 +++ b/newlib/libc/sys/a29khif/aclocal.m4 @@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(newlib, 1.14.0) +AM_INIT_AUTOMAKE(newlib, 1.13.0) # FIXME: We temporarily define our own version of AC_PROG_CC. This is # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS. We @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/sys/a29khif/configure b/newlib/libc/sys/a29khif/configure index cd8d26300..8315f6139 100755 --- a/newlib/libc/sys/a29khif/configure +++ b/newlib/libc/sys/a29khif/configure @@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" && PACKAGE=newlib -VERSION=1.14.0 +VERSION=1.13.0 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: 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" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/sys/aclocal.m4 b/newlib/libc/sys/aclocal.m4 index 35519acf9..c0a206827 100644 --- a/newlib/libc/sys/aclocal.m4 +++ b/newlib/libc/sys/aclocal.m4 @@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(newlib, 1.14.0) +AM_INIT_AUTOMAKE(newlib, 1.13.0) # FIXME: We temporarily define our own version of AC_PROG_CC. This is # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS. We @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13. */ -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/sys/arc/aclocal.m4 b/newlib/libc/sys/arc/aclocal.m4 index 55d5e67ce..0a1490998 100644 --- a/newlib/libc/sys/arc/aclocal.m4 +++ b/newlib/libc/sys/arc/aclocal.m4 @@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(newlib, 1.14.0) +AM_INIT_AUTOMAKE(newlib, 1.13.0) # FIXME: We temporarily define our own version of AC_PROG_CC. This is # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS. We @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/sys/arc/configure b/newlib/libc/sys/arc/configure index 39982f1bf..46148becd 100755 --- a/newlib/libc/sys/arc/configure +++ b/newlib/libc/sys/arc/configure @@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" && PACKAGE=newlib -VERSION=1.14.0 +VERSION=1.13.0 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: 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" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/sys/arm/Makefile.am b/newlib/libc/sys/arm/Makefile.am index 7749d4aff..76504f9d9 100644 --- a/newlib/libc/sys/arm/Makefile.am +++ b/newlib/libc/sys/arm/Makefile.am @@ -7,18 +7,16 @@ INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) noinst_LIBRARIES = lib.a if MAY_SUPPLY_SYSCALLS -extra_objs = libcfunc.o trap.o syscalls.o +extra_objs = syscalls.o else extra_objs = endif -lib_a_SOURCES = aeabi_atexit.c +lib_a_SOURCES = libcfunc.c trap.S lib_a_LIBADD = $(extra_objs) lib_a_DEPENDENCIES = $(extra_objs) -if MAY_SUPPLY_SYSCALLS all: crt0.o -endif ACLOCAL_AMFLAGS = -I ../../.. CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host diff --git a/newlib/libc/sys/arm/Makefile.in b/newlib/libc/sys/arm/Makefile.in index 323db9c9b..942f909b2 100644 --- a/newlib/libc/sys/arm/Makefile.in +++ b/newlib/libc/sys/arm/Makefile.in @@ -88,10 +88,10 @@ AUTOMAKE_OPTIONS = cygnus INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) noinst_LIBRARIES = lib.a -@MAY_SUPPLY_SYSCALLS_TRUE@extra_objs = libcfunc.o trap.o syscalls.o +@MAY_SUPPLY_SYSCALLS_TRUE@extra_objs = syscalls.o @MAY_SUPPLY_SYSCALLS_FALSE@extra_objs = -lib_a_SOURCES = aeabi_atexit.c +lib_a_SOURCES = libcfunc.c trap.S lib_a_LIBADD = $(extra_objs) lib_a_DEPENDENCIES = $(extra_objs) @@ -106,7 +106,7 @@ LIBRARIES = $(noinst_LIBRARIES) DEFS = @DEFS@ -I. -I$(srcdir) CPPFLAGS = @CPPFLAGS@ LIBS = @LIBS@ -lib_a_OBJECTS = aeabi_atexit.o +lib_a_OBJECTS = libcfunc.o trap.o CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) @@ -325,7 +325,7 @@ mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean -@MAY_SUPPLY_SYSCALLS_TRUE@all: crt0.o +all: crt0.o # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/newlib/libc/sys/arm/aclocal.m4 b/newlib/libc/sys/arm/aclocal.m4 index 55d5e67ce..0a1490998 100644 --- a/newlib/libc/sys/arm/aclocal.m4 +++ b/newlib/libc/sys/arm/aclocal.m4 @@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(newlib, 1.14.0) +AM_INIT_AUTOMAKE(newlib, 1.13.0) # FIXME: We temporarily define our own version of AC_PROG_CC. This is # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS. We @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/sys/arm/aeabi_atexit.c b/newlib/libc/sys/arm/aeabi_atexit.c deleted file mode 100644 index 4b600e250..000000000 --- a/newlib/libc/sys/arm/aeabi_atexit.c +++ /dev/null @@ -1,10 +0,0 @@ -#include <stdlib.h> - -/* Register a function to be called by exit or when a shared library - is unloaded. This routine is like __cxa_atexit, but uses the - calling sequence required by the ARM EABI. */ -int -__aeabi_atexit (void *arg, void (*func) (void *), void *d) -{ - return __cxa_atexit (func, arg, d); -} diff --git a/newlib/libc/sys/arm/configure b/newlib/libc/sys/arm/configure index 1f40c98f3..106d8eabf 100755 --- a/newlib/libc/sys/arm/configure +++ b/newlib/libc/sys/arm/configure @@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" && PACKAGE=newlib -VERSION=1.14.0 +VERSION=1.13.0 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: 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" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/sys/arm/crt0.S b/newlib/libc/sys/arm/crt0.S index c750ca819..00a037a0d 100644 --- a/newlib/libc/sys/arm/crt0.S +++ b/newlib/libc/sys/arm/crt0.S @@ -18,26 +18,15 @@ /* .text is used instead of .section .text so it works with arm-aout too. */ .text -#if defined(__thumb2__) - .syntax unified - .thumb -.macro FUNC_START name - .global \name - .thumb_func -\name: -.endm -#else .code 32 -.macro FUNC_START name - .global \name -\name: -.endm -#endif .align 0 - FUNC_START _mainCRTStartup - FUNC_START _start - FUNC_START start + .global _mainCRTStartup + .global _start + .global start +start: +_start: +_mainCRTStartup: #if defined(__ELF__) && !defined(__USING_SJLJ_EXCEPTIONS__) /* Annotation for EABI unwinding tables. */ .fnstart @@ -56,12 +45,7 @@ /* Issue Angel SWI to read stack info */ mov r0, #AngelSWI_Reason_HeapInfo adr r1, .LC0 /* point at ptr to 4 words to receive data */ -#if defined(__thumb2__) - bkpt AngelSWI -#else - /* We are always in ARM mode for startup */ - AngelSWIAsm AngelSWI_ARM -#endif + swi AngelSWI_ARM /* We are always in ARM mode for startup */ ldr r0, .LC0 /* point at values read */ ldr sp, [r0, #8] ldr sl, [r0, #12] @@ -91,8 +75,8 @@ sub a3, a3, a1 /* Third arg: length of block */ -#if defined(__thumb__) && !defined(__thumb2__) - /* Enter Thumb mode.... */ +#ifdef __thumb__ /* Enter Thumb mode.... */ + add a4, pc, #1 /* Get the address of the Thumb block */ bx a4 /* Go there and start Thumb decoding */ @@ -116,7 +100,7 @@ __change_mode: #else mov r0, #AngelSWI_Reason_GetCmdLine adr r1, .LC30 /* Space for command line */ - AngelSWIAsm AngelSWI + swi AngelSWI ldr r1, .LC30 #endif /* Parse string at r1 */ @@ -202,11 +186,6 @@ __change_mode: add r3, #4 b .LC15 .LC14: - /* Ensure doubleword stack alignment. */ - mov r4, sp - mov r5, #7 - bic r4, r5 - mov sp, r4 #else add r2, sp, r0, LSL #2 /* End of args */ mov r3, sp /* Start of args */ @@ -216,8 +195,6 @@ __change_mode: strhi r5, [r2, #-4]! strhi r4, [r3], #4 bhi .LC13 - /* Ensure doubleword stack alignment. */ - bic sp, sp, #7 #endif #endif @@ -238,7 +215,7 @@ __change_mode: bl FUNCTION (exit) /* Should not return. */ -#if defined(__thumb__) && !defined(__thumb2__) +#ifdef __thumb__ /* Come out of Thumb mode. This code should be redundant. */ mov a4, pc diff --git a/newlib/libc/sys/arm/libcfunc.c b/newlib/libc/sys/arm/libcfunc.c index 3bf0a56f4..ddc611f34 100644 --- a/newlib/libc/sys/arm/libcfunc.c +++ b/newlib/libc/sys/arm/libcfunc.c @@ -13,7 +13,7 @@ static inline int do_AngelSWI (int reason, void * arg) { int value; - asm volatile ("mov r0, %1; mov r1, %2; " AngelSWIInsn " %a3; mov %0, r0" + asm volatile ("mov r0, %1; mov r1, %2; swi %a3; mov %0, r0" : "=r" (value) /* Outputs */ : "r" (reason), "r" (arg), "i" (AngelSWI) /* Inputs */ : "r0", "r1", "lr" diff --git a/newlib/libc/sys/arm/swi.h b/newlib/libc/sys/arm/swi.h index f5c910313..15c3866a1 100644 --- a/newlib/libc/sys/arm/swi.h +++ b/newlib/libc/sys/arm/swi.h @@ -33,14 +33,6 @@ #else #define AngelSWI AngelSWI_ARM #endif -/* For Thumb-2 code use the BKPT instruction instead of SWI. */ -#ifdef __thumb2__ -#define AngelSWIInsn "bkpt" -#define AngelSWIAsm bkpt -#else -#define AngelSWIInsn "swi" -#define AngelSWIAsm swi -#endif /* The reason codes: */ #define AngelSWI_Reason_Open 0x01 diff --git a/newlib/libc/sys/arm/syscalls.c b/newlib/libc/sys/arm/syscalls.c index 529309930..e89022806 100644 --- a/newlib/libc/sys/arm/syscalls.c +++ b/newlib/libc/sys/arm/syscalls.c @@ -98,7 +98,7 @@ static inline int do_AngelSWI (int reason, void * arg) { int value; - asm volatile ("mov r0, %1; mov r1, %2; " AngelSWIInsn " %a3; mov %0, r0" + asm volatile ("mov r0, %1; mov r1, %2; swi %a3; mov %0, r0" : "=r" (value) /* Outputs */ : "r" (reason), "r" (arg), "i" (AngelSWI) /* Inputs */ : "r0", "r1", "r2", "r3", "ip", "lr", "memory", "cc" diff --git a/newlib/libc/sys/arm/trap.S b/newlib/libc/sys/arm/trap.S index 21b6937f9..328fabca5 100644 --- a/newlib/libc/sys/arm/trap.S +++ b/newlib/libc/sys/arm/trap.S @@ -1,5 +1,4 @@ /* Run-time exception support */ -#if !defined(__thumb2__) #include "swi.h" /* .text is used instead of .section .text so it works with arm-aout too. */ @@ -92,4 +91,3 @@ __rt_stkovf_split_big: @ We now know how much extra stack the function requires. @ Terminate the program for the moment: swi SWI_Exit -#endif diff --git a/newlib/libc/sys/configure b/newlib/libc/sys/configure index 04436d960..9f389dbb2 100755 --- a/newlib/libc/sys/configure +++ b/newlib/libc/sys/configure @@ -1009,7 +1009,7 @@ test "$host_alias" != "$target_alias" && PACKAGE=newlib -VERSION=1.14.0 +VERSION=1.13.0 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -1431,11 +1431,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13. */ -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1439: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1436: 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" @@ -1469,7 +1466,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1473: checking for executable suffix" >&5 +echo "configure:1470: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1479,7 +1476,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -1654,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:1658: 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 @@ -1684,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:1688: 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 @@ -1735,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:1739: 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 @@ -1767,7 +1764,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1771: 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. @@ -1778,12 +1775,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1782 "configure" +#line 1779 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1787: \"$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 @@ -1809,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:1813: 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:1818: 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 @@ -1823,7 +1820,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1827: \"$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 @@ -1842,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:1846: 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 @@ -1885,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:1889: 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 @@ -1915,10 +1912,10 @@ echo "configure:1889: 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:1919: 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:1922: 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 @@ -1953,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:1957: 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 @@ -1970,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:1974: 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 @@ -1982,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:1986: 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 @@ -2020,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:2024: 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 @@ -2041,7 +2038,7 @@ else fi echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6 -echo "configure:2045: 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 @@ -2214,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:2218: 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:2224: \"$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) ;; @@ -2244,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:2248: 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 @@ -2306,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:2310: 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 @@ -2377,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:2381: 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 @@ -2409,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:2413: 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 @@ -2444,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:2448: 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 @@ -2476,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:2480: 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 @@ -2543,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 2547 "configure"' > conftest.$ac_ext - if { (eval echo configure:2548: \"$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" @@ -2563,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:2567: \"$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" @@ -2581,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:2585: 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 @@ -2594,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 2598 "configure" +#line 2595 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2605: \"$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 @@ -2631,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:2635: 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 @@ -2663,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:2667: 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 @@ -2698,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:2702: 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 @@ -2730,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:2734: 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 @@ -2765,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:2769: 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 @@ -2797,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:2801: 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 @@ -2833,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:2837: 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 2842 "configure" +#line 2839 "configure" #include "confdefs.h" int main() { @@ -2846,7 +2843,7 @@ extern int __attribute__((__stdcall__)) DllMain(void*, int, void*); DllMain (0, 0, 0); ; return 0; } EOF -if { (eval echo configure:2850: \"$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 @@ -2867,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:2871: 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 2876 "configure" +#line 2873 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2883: \"$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 @@ -2996,7 +2993,7 @@ if test -n "${sys_dir}"; then fi CRT0= -if test "x${have_crt0}" = "xyes"; then +if test -n "${sys_dir}"; then CRT0=crt0.o fi diff --git a/newlib/libc/sys/configure.in b/newlib/libc/sys/configure.in index 895bdb2a2..4a53612e0 100644 --- a/newlib/libc/sys/configure.in +++ b/newlib/libc/sys/configure.in @@ -22,7 +22,7 @@ if test -n "${sys_dir}"; then fi CRT0= -if test "x${have_crt0}" = "xyes"; then +if test -n "${sys_dir}"; then CRT0=crt0.o fi AC_SUBST(CRT0) diff --git a/newlib/libc/sys/d10v/aclocal.m4 b/newlib/libc/sys/d10v/aclocal.m4 index 55d5e67ce..0a1490998 100644 --- a/newlib/libc/sys/d10v/aclocal.m4 +++ b/newlib/libc/sys/d10v/aclocal.m4 @@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(newlib, 1.14.0) +AM_INIT_AUTOMAKE(newlib, 1.13.0) # FIXME: We temporarily define our own version of AC_PROG_CC. This is # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS. We @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/sys/d10v/configure b/newlib/libc/sys/d10v/configure index 091e11fe7..cf9254bff 100755 --- a/newlib/libc/sys/d10v/configure +++ b/newlib/libc/sys/d10v/configure @@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" && PACKAGE=newlib -VERSION=1.14.0 +VERSION=1.13.0 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: 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" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/sys/decstation/aclocal.m4 b/newlib/libc/sys/decstation/aclocal.m4 index 55d5e67ce..0a1490998 100644 --- a/newlib/libc/sys/decstation/aclocal.m4 +++ b/newlib/libc/sys/decstation/aclocal.m4 @@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(newlib, 1.14.0) +AM_INIT_AUTOMAKE(newlib, 1.13.0) # FIXME: We temporarily define our own version of AC_PROG_CC. This is # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS. We @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/sys/decstation/configure b/newlib/libc/sys/decstation/configure index 58f3ec9b0..10e5797c8 100755 --- a/newlib/libc/sys/decstation/configure +++ b/newlib/libc/sys/decstation/configure @@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" && PACKAGE=newlib -VERSION=1.14.0 +VERSION=1.13.0 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: 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" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/sys/h8300hms/aclocal.m4 b/newlib/libc/sys/h8300hms/aclocal.m4 index 55d5e67ce..0a1490998 100644 --- a/newlib/libc/sys/h8300hms/aclocal.m4 +++ b/newlib/libc/sys/h8300hms/aclocal.m4 @@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(newlib, 1.14.0) +AM_INIT_AUTOMAKE(newlib, 1.13.0) # FIXME: We temporarily define our own version of AC_PROG_CC. This is # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS. We @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/sys/h8300hms/configure b/newlib/libc/sys/h8300hms/configure index 1efee2bcc..c3fe7f351 100755 --- a/newlib/libc/sys/h8300hms/configure +++ b/newlib/libc/sys/h8300hms/configure @@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" && PACKAGE=newlib -VERSION=1.14.0 +VERSION=1.13.0 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: 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" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/sys/h8500hms/aclocal.m4 b/newlib/libc/sys/h8500hms/aclocal.m4 index 55d5e67ce..0a1490998 100644 --- a/newlib/libc/sys/h8500hms/aclocal.m4 +++ b/newlib/libc/sys/h8500hms/aclocal.m4 @@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(newlib, 1.14.0) +AM_INIT_AUTOMAKE(newlib, 1.13.0) # FIXME: We temporarily define our own version of AC_PROG_CC. This is # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS. We @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/sys/h8500hms/configure b/newlib/libc/sys/h8500hms/configure index 639276001..d3f9dfcb6 100755 --- a/newlib/libc/sys/h8500hms/configure +++ b/newlib/libc/sys/h8500hms/configure @@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" && PACKAGE=newlib -VERSION=1.14.0 +VERSION=1.13.0 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: 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" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/sys/linux/Makefile.am b/newlib/libc/sys/linux/Makefile.am index de11547a3..56842cebb 100644 --- a/newlib/libc/sys/linux/Makefile.am +++ b/newlib/libc/sys/linux/Makefile.am @@ -146,7 +146,8 @@ ELIX_3_OBJS = \ ELIX_4_OBJS = \ getlogin.$(oext) \ - getpwent.$(oext) \ + getpwnam.$(oext) \ + getpwuid.$(oext) \ stack.$(oext) if ELIX_LEVEL_1 diff --git a/newlib/libc/sys/linux/Makefile.in b/newlib/libc/sys/linux/Makefile.in index ead358265..3f110fab2 100644 --- a/newlib/libc/sys/linux/Makefile.in +++ b/newlib/libc/sys/linux/Makefile.in @@ -118,7 +118,7 @@ ELIX_2_OBJS = aio64.$(oext) confstr.$(oext) ctermid.$(oext) fclean.$(oext) ELIX_3_OBJS = system.$(oext) wait.$(oext) -ELIX_4_OBJS = getlogin.$(oext) getpwent.$(oext) stack.$(oext) +ELIX_4_OBJS = getlogin.$(oext) getpwnam.$(oext) getpwuid.$(oext) stack.$(oext) @ELIX_LEVEL_1_TRUE@LIB_OBJS = @ELIX_LEVEL_1_FALSE@@ELIX_LEVEL_2_TRUE@LIB_OBJS = $(ELIX_2_OBJS) diff --git a/newlib/libc/sys/linux/aclocal.m4 b/newlib/libc/sys/linux/aclocal.m4 index 35519acf9..c0a206827 100644 --- a/newlib/libc/sys/linux/aclocal.m4 +++ b/newlib/libc/sys/linux/aclocal.m4 @@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(newlib, 1.14.0) +AM_INIT_AUTOMAKE(newlib, 1.13.0) # FIXME: We temporarily define our own version of AC_PROG_CC. This is # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS. We @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13. */ -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/sys/linux/aio.c b/newlib/libc/sys/linux/aio.c index 9a2e4ce57..de988ebfc 100644 --- a/newlib/libc/sys/linux/aio.c +++ b/newlib/libc/sys/linux/aio.c @@ -4,8 +4,6 @@ /* Currently asynchronous I/O is not implemented. */ -#define _GNU_SOURCE 1 - #include <sys/types.h> #include <aio.h> #include <errno.h> diff --git a/newlib/libc/sys/linux/argp/argp-fs-xinl.c b/newlib/libc/sys/linux/argp/argp-fs-xinl.c index 9b836d138..b61a303e8 100644 --- a/newlib/libc/sys/linux/argp/argp-fs-xinl.c +++ b/newlib/libc/sys/linux/argp/argp-fs-xinl.c @@ -24,7 +24,7 @@ #define ARGP_FS_EI #undef __OPTIMIZE__ -#define __OPTIMIZE__ 1 +#define __OPTIMIZE__ #include "argp-fmtstream.h" /* Add weak aliases. */ diff --git a/newlib/libc/sys/linux/argp/argp-xinl.c b/newlib/libc/sys/linux/argp/argp-xinl.c index 644836d30..0d64b1efb 100644 --- a/newlib/libc/sys/linux/argp/argp-xinl.c +++ b/newlib/libc/sys/linux/argp/argp-xinl.c @@ -29,7 +29,7 @@ #endif #define ARGP_EI #undef __OPTIMIZE__ -#define __OPTIMIZE__ 1 +#define __OPTIMIZE__ #include <argp.h> /* Add weak aliases. */ diff --git a/newlib/libc/sys/linux/bits/initspin.h b/newlib/libc/sys/linux/bits/initspin.h deleted file mode 100644 index a19ec077e..000000000 --- a/newlib/libc/sys/linux/bits/initspin.h +++ /dev/null @@ -1,28 +0,0 @@ -/* Generic definitions for spinlock initializers. - Copyright (C) 2000, 2001 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -/* Initial value of a spinlock. Most platforms should use zero, - unless they only implement a "test and clear" operation instead of - the usual "test and set". */ -#define __LT_SPINLOCK_INIT 0 - -/* Macros for lock initializers, using the above definition. */ -#define __LOCK_INITIALIZER { 0, __LT_SPINLOCK_INIT } -#define __ALT_LOCK_INITIALIZER { 0, __LT_SPINLOCK_INIT } -#define __ATOMIC_INITIALIZER { 0, __LT_SPINLOCK_INIT } diff --git a/newlib/libc/sys/linux/bits/libc-lock.h b/newlib/libc/sys/linux/bits/libc-lock.h deleted file mode 100644 index 2b170444b..000000000 --- a/newlib/libc/sys/linux/bits/libc-lock.h +++ /dev/null @@ -1,380 +0,0 @@ -/* libc-internal interface for mutex locks. LinuxThreads version. - Copyright (C) 1996,1997,1998,1999,2000,2001,2002,2003 - Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -#ifndef _BITS_LIBC_LOCK_H -#define _BITS_LIBC_LOCK_H 1 - -#include <pthread.h> - -#if defined _LIBC && !defined NOT_IN_libc -#include <linuxthreads/internals.h> -#endif - -/* Mutex type. */ -#if defined(_LIBC) || defined(_IO_MTSAFE_IO) -typedef pthread_mutex_t __libc_lock_t; -typedef struct { pthread_mutex_t mutex; } __libc_lock_recursive_t; -# ifdef __USE_UNIX98 -typedef pthread_rwlock_t __libc_rwlock_t; -# else -typedef struct __libc_rwlock_opaque__ __libc_rwlock_t; -# endif -typedef __libc_lock_recursive_t __rtld_lock_recursive_t; -#else -typedef struct __libc_lock_opaque__ __libc_lock_t; -typedef struct __libc_lock_recursive_opaque__ __libc_lock_recursive_t; -typedef struct __libc_rwlock_opaque__ __libc_rwlock_t; -#endif - -/* Type for key to thread-specific data. */ -typedef pthread_key_t __libc_key_t; - -/* Define a lock variable NAME with storage class CLASS. The lock must be - initialized with __libc_lock_init before it can be used (or define it - with __libc_lock_define_initialized, below). Use `extern' for CLASS to - declare a lock defined in another module. In public structure - definitions you must use a pointer to the lock structure (i.e., NAME - begins with a `*'), because its storage size will not be known outside - of libc. */ -#define __libc_lock_define(CLASS,NAME) \ - CLASS __libc_lock_t NAME; -#define __libc_rwlock_define(CLASS,NAME) \ - CLASS __libc_rwlock_t NAME; -#define __libc_lock_define_recursive(CLASS,NAME) \ - CLASS __libc_lock_recursive_t NAME; -#define __rtld_lock_define_recursive(CLASS,NAME) \ - CLASS __rtld_lock_recursive_t NAME; - -/* Define an initialized lock variable NAME with storage class CLASS. - - For the C library we take a deeper look at the initializer. For - this implementation all fields are initialized to zero. Therefore - we don't initialize the variable which allows putting it into the - BSS section. (Except on PA-RISC and other odd architectures, where - initialized locks must be set to one due to the lack of normal - atomic operations.) */ - -#if __LT_SPINLOCK_INIT == 0 -# define __libc_lock_define_initialized(CLASS,NAME) \ - CLASS __libc_lock_t NAME; -#else -# define __libc_lock_define_initialized(CLASS,NAME) \ - CLASS __libc_lock_t NAME = PTHREAD_MUTEX_INITIALIZER; -#endif - -#define __libc_rwlock_define_initialized(CLASS,NAME) \ - CLASS __libc_rwlock_t NAME = PTHREAD_RWLOCK_INITIALIZER; - -/* Define an initialized recursive lock variable NAME with storage - class CLASS. */ -#define __libc_lock_define_initialized_recursive(CLASS,NAME) \ - CLASS __libc_lock_recursive_t NAME = _LIBC_LOCK_RECURSIVE_INITIALIZER; -#define _LIBC_LOCK_RECURSIVE_INITIALIZER \ - {PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP} - -#define __rtld_lock_define_initialized_recursive(CLASS,NAME) \ - CLASS __rtld_lock_recursive_t NAME = _RTLD_LOCK_RECURSIVE_INITIALIZER; -#define _RTLD_LOCK_RECURSIVE_INITIALIZER \ - {PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP} - -#if defined _LIBC && defined IS_IN_libpthread -# define __libc_maybe_call(FUNC, ARGS, ELSE) FUNC ARGS -#else -# if defined __PIC__ || (defined _LIBC && defined SHARED) -# define __libc_maybe_call(FUNC, ARGS, ELSE) \ - (__extension__ ({ __typeof (FUNC) *_fn = (FUNC); \ - _fn != NULL ? (*_fn) ARGS : ELSE; })) -# else -# define __libc_maybe_call(FUNC, ARGS, ELSE) \ - (FUNC != NULL ? FUNC ARGS : ELSE) -# endif -#endif -#if defined _LIBC && !defined NOT_IN_libc && defined SHARED -# define __libc_maybe_call2(FUNC, ARGS, ELSE) \ - ({__builtin_expect (__libc_pthread_functions.ptr_##FUNC != NULL, 0) \ - ? __libc_pthread_functions.ptr_##FUNC ARGS : ELSE; }) -#else -# define __libc_maybe_call2(FUNC, ARGS, ELSE) __libc_maybe_call (__##FUNC, ARGS, ELSE) -#endif - -/* Initialize the named lock variable, leaving it in a consistent, unlocked - state. */ -#if defined _LIBC && !defined NOT_IN_libc && defined SHARED -#define __libc_lock_init(NAME) \ - ({ \ - (NAME).__m_count = 0; \ - (NAME).__m_owner = NULL; \ - (NAME).__m_kind = PTHREAD_MUTEX_TIMED_NP; \ - (NAME).__m_lock.__status = 0; \ - (NAME).__m_lock.__spinlock = __LT_SPINLOCK_INIT; \ - 0; }) -#else -#define __libc_lock_init(NAME) \ - (__libc_maybe_call2 (pthread_mutex_init, (&(NAME), NULL), 0)) -#endif -#define __libc_rwlock_init(NAME) \ - (__libc_maybe_call (__pthread_rwlock_init, (&(NAME), NULL), 0)); - -/* Same as last but this time we initialize a recursive mutex. */ -#if defined _LIBC && !defined NOT_IN_libc && defined SHARED -#define __libc_lock_init_recursive(NAME) \ - ({ \ - (NAME).mutex.__m_count = 0; \ - (NAME).mutex.__m_owner = NULL; \ - (NAME).mutex.__m_kind = PTHREAD_MUTEX_RECURSIVE_NP; \ - (NAME).mutex.__m_lock.__status = 0; \ - (NAME).mutex.__m_lock.__spinlock = __LT_SPINLOCK_INIT; \ - 0; }) -#else -#define __libc_lock_init_recursive(NAME) \ - do { \ - if (__pthread_mutex_init != NULL) \ - { \ - pthread_mutexattr_t __attr; \ - __pthread_mutexattr_init (&__attr); \ - __pthread_mutexattr_settype (&__attr, PTHREAD_MUTEX_RECURSIVE_NP); \ - __pthread_mutex_init (&(NAME).mutex, &__attr); \ - __pthread_mutexattr_destroy (&__attr); \ - } \ - } while (0); -#endif -#define __rtld_lock_init_recursive(NAME) \ - __libc_lock_init_recursive (NAME) - -/* Finalize the named lock variable, which must be locked. It cannot be - used again until __libc_lock_init is called again on it. This must be - called on a lock variable before the containing storage is reused. */ -#define __libc_lock_fini(NAME) \ - (__libc_maybe_call2 (pthread_mutex_destroy, (&(NAME)), 0)); -#define __libc_rwlock_fini(NAME) \ - (__libc_maybe_call (__pthread_rwlock_destroy, (&(NAME)), 0)); - -/* Finalize recursive named lock. */ -#define __libc_lock_fini_recursive(NAME) __libc_lock_fini ((NAME).mutex) -#define __rtld_lock_fini_recursive(NAME) __libc_lock_fini_recursive (NAME) - -/* Lock the named lock variable. */ -#define __libc_lock_lock(NAME) \ - (__libc_maybe_call2 (pthread_mutex_lock, (&(NAME)), 0)); -#define __libc_rwlock_rdlock(NAME) \ - (__libc_maybe_call (__pthread_rwlock_rdlock, (&(NAME)), 0)); -#define __libc_rwlock_wrlock(NAME) \ - (__libc_maybe_call (__pthread_rwlock_wrlock, (&(NAME)), 0)); - -/* Lock the recursive named lock variable. */ -#define __libc_lock_lock_recursive(NAME) __libc_lock_lock ((NAME).mutex) - -/* Try to lock the named lock variable. */ -#define __libc_lock_trylock(NAME) \ - (__libc_maybe_call2 (pthread_mutex_trylock, (&(NAME)), 0)) -#define __libc_rwlock_tryrdlock(NAME) \ - (__libc_maybe_call (__pthread_rwlock_tryrdlock, (&(NAME)), 0)) -#define __libc_rwlock_trywrlock(NAME) \ - (__libc_maybe_call (__pthread_rwlock_trywrlock, (&(NAME)), 0)) - -/* Try to lock the recursive named lock variable. */ -#define __libc_lock_trylock_recursive(NAME) __libc_lock_trylock ((NAME).mutex) -#define __rtld_lock_trylock_recursive(NAME) \ - __libc_lock_trylock_recursive (NAME) - -/* Unlock the named lock variable. */ -#define __libc_lock_unlock(NAME) \ - (__libc_maybe_call2 (pthread_mutex_unlock, (&(NAME)), 0)); -#define __libc_rwlock_unlock(NAME) \ - (__libc_maybe_call (__pthread_rwlock_unlock, (&(NAME)), 0)); - -/* Unlock the recursive named lock variable. */ -#define __libc_lock_unlock_recursive(NAME) __libc_lock_unlock ((NAME).mutex) - -#if defined _LIBC && defined SHARED -# define __rtld_lock_default_lock_recursive(lock) \ - ++((pthread_mutex_t *)(lock))->__m_count; - -# define __rtld_lock_default_unlock_recursive(lock) \ - --((pthread_mutex_t *)(lock))->__m_count; - -# define __rtld_lock_lock_recursive(NAME) \ - GL(dl_rtld_lock_recursive) (&(NAME).mutex) - -# define __rtld_lock_unlock_recursive(NAME) \ - GL(dl_rtld_unlock_recursive) (&(NAME).mutex) -#else -#define __rtld_lock_lock_recursive(NAME) __libc_lock_lock_recursive (NAME) -#define __rtld_lock_unlock_recursive(NAME) __libc_lock_unlock_recursive (NAME) -#endif - -/* Define once control variable. */ -#if PTHREAD_ONCE_INIT == 0 -/* Special case for static variables where we can avoid the initialization - if it is zero. */ -# define __libc_once_define(CLASS, NAME) \ - CLASS pthread_once_t NAME -#else -# define __libc_once_define(CLASS, NAME) \ - CLASS pthread_once_t NAME = PTHREAD_ONCE_INIT -#endif - -/* Call handler iff the first call. */ -#define __libc_once(ONCE_CONTROL, INIT_FUNCTION) \ - do { \ - if (__pthread_once != NULL) \ - __pthread_once (&(ONCE_CONTROL), (INIT_FUNCTION)); \ - else if ((ONCE_CONTROL) == PTHREAD_ONCE_INIT) { \ - INIT_FUNCTION (); \ - (ONCE_CONTROL) = 2; \ - } \ - } while (0) - - -/* Start critical region with cleanup. */ -#define __libc_cleanup_region_start(DOIT, FCT, ARG) \ - { struct _pthread_cleanup_buffer _buffer; \ - int _avail = (DOIT) && _pthread_cleanup_push_defer != NULL; \ - if (_avail) { \ - _pthread_cleanup_push_defer (&_buffer, (FCT), (ARG)); \ - } - -/* End critical region with cleanup. */ -#define __libc_cleanup_region_end(DOIT) \ - if (_avail) { \ - _pthread_cleanup_pop_restore (&_buffer, (DOIT)); \ - } \ - } - -/* Sometimes we have to exit the block in the middle. */ -#define __libc_cleanup_end(DOIT) \ - if (_avail) { \ - _pthread_cleanup_pop_restore (&_buffer, (DOIT)); \ - } - -#define __libc_cleanup_push(fct, arg) \ - { struct _pthread_cleanup_buffer _buffer; \ - __libc_maybe_call (_pthread_cleanup_push, (&_buffer, (fct), (arg)), 0) - -#define __libc_cleanup_pop(execute) \ - __libc_maybe_call (_pthread_cleanup_pop, (&_buffer, execute), 0); \ - } - -/* Create thread-specific key. */ -#define __libc_key_create(KEY, DESTRUCTOR) \ - (__libc_maybe_call (__pthread_key_create, (KEY, DESTRUCTOR), 1)) - -/* Get thread-specific data. */ -#define __libc_getspecific(KEY) \ - (__libc_maybe_call (__pthread_getspecific, (KEY), NULL)) - -/* Set thread-specific data. */ -#define __libc_setspecific(KEY, VALUE) \ - (__libc_maybe_call (__pthread_setspecific, (KEY, VALUE), 0)) - - -/* Register handlers to execute before and after `fork'. */ -#define __libc_atfork(PREPARE, PARENT, CHILD) \ - (__libc_maybe_call (__pthread_atfork, (PREPARE, PARENT, CHILD), 0)) - -/* Functions that are used by this file and are internal to the GNU C - library. */ - -extern int __pthread_mutex_init (pthread_mutex_t *__mutex, - __const pthread_mutexattr_t *__mutex_attr); - -extern int __pthread_mutex_destroy (pthread_mutex_t *__mutex); - -extern int __pthread_mutex_trylock (pthread_mutex_t *__mutex); - -extern int __pthread_mutex_lock (pthread_mutex_t *__mutex); - -extern int __pthread_mutex_unlock (pthread_mutex_t *__mutex); - -extern int __pthread_mutexattr_init (pthread_mutexattr_t *__attr); - -extern int __pthread_mutexattr_destroy (pthread_mutexattr_t *__attr); - -extern int __pthread_mutexattr_settype (pthread_mutexattr_t *__attr, - int __kind); - -#ifdef __USE_UNIX98 -extern int __pthread_rwlock_init (pthread_rwlock_t *__rwlock, - __const pthread_rwlockattr_t *__attr); - -extern int __pthread_rwlock_destroy (pthread_rwlock_t *__rwlock); - -extern int __pthread_rwlock_rdlock (pthread_rwlock_t *__rwlock); - -extern int __pthread_rwlock_tryrdlock (pthread_rwlock_t *__rwlock); - -extern int __pthread_rwlock_wrlock (pthread_rwlock_t *__rwlock); - -extern int __pthread_rwlock_trywrlock (pthread_rwlock_t *__rwlock); - -extern int __pthread_rwlock_unlock (pthread_rwlock_t *__rwlock); -#endif - -extern int __pthread_key_create (pthread_key_t *__key, - void (*__destr_function) (void *)); - -extern int __pthread_setspecific (pthread_key_t __key, - __const void *__pointer); - -extern void *__pthread_getspecific (pthread_key_t __key); - -extern int __pthread_once (pthread_once_t *__once_control, - void (*__init_routine) (void)); - -extern int __pthread_atfork (void (*__prepare) (void), - void (*__parent) (void), - void (*__child) (void)); - - - -/* Make the pthread functions weak so that we can elide them from - single-threaded processes. */ -#ifndef __NO_WEAK_PTHREAD_ALIASES -# pragma weak __pthread_mutex_init -# pragma weak __pthread_mutex_destroy -# pragma weak __pthread_mutex_lock -# pragma weak __pthread_mutex_trylock -# pragma weak __pthread_mutex_unlock -# pragma weak __pthread_mutexattr_init -# pragma weak __pthread_mutexattr_destroy -# pragma weak __pthread_mutexattr_settype -# pragma weak __pthread_rwlock_destroy -# pragma weak __pthread_rwlock_rdlock -# pragma weak __pthread_rwlock_tryrdlock -# pragma weak __pthread_rwlock_wrlock -# pragma weak __pthread_rwlock_trywrlock -# pragma weak __pthread_rwlock_unlock -# pragma weak __pthread_key_create -# pragma weak __pthread_setspecific -# pragma weak __pthread_getspecific -# pragma weak __pthread_once -# pragma weak __pthread_initialize -# pragma weak __pthread_atfork -# pragma weak _pthread_cleanup_push_defer -# pragma weak _pthread_cleanup_pop_restore -# pragma weak _pthread_cleanup_push -# pragma weak _pthread_cleanup_pop -#endif - -/* We need portable names for some functions. E.g., when they are - used as argument to __libc_cleanup_region_start. */ -#define __libc_mutex_unlock __pthread_mutex_unlock - -#endif /* bits/libc-lock.h */ diff --git a/newlib/libc/sys/linux/bits/pthreadtypes.h b/newlib/libc/sys/linux/bits/pthreadtypes.h deleted file mode 100644 index d1daef07a..000000000 --- a/newlib/libc/sys/linux/bits/pthreadtypes.h +++ /dev/null @@ -1,152 +0,0 @@ -/* Linuxthreads - a simple clone()-based implementation of Posix */ -/* threads for Linux. */ -/* Copyright (C) 1996 Xavier Leroy (Xavier.Leroy@inria.fr) */ -/* */ -/* This program is free software; you can redistribute it and/or */ -/* modify it under the terms of the GNU Library General Public License */ -/* as published by the Free Software Foundation; either version 2 */ -/* of the License, or (at your option) any later version. */ -/* */ -/* This program is distributed in the hope that it will be useful, */ -/* but WITHOUT ANY WARRANTY; without even the implied warranty of */ -/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */ -/* GNU Library General Public License for more details. */ - -#if !defined _BITS_TYPES_H && !defined _PTHREAD_H -# error "Never include <bits/pthreadtypes.h> directly; use <sys/types.h> instead." -#endif - -#ifndef _BITS_PTHREADTYPES_H -#define _BITS_PTHREADTYPES_H 1 - -#define __need_schedparam -#include <bits/sched.h> - -/* Fast locks (not abstract because mutexes and conditions aren't abstract). */ -struct _pthread_fastlock -{ - long int __status; /* "Free" or "taken" or head of waiting list */ - int __spinlock; /* Used by compare_and_swap emulation. Also, - adaptive SMP lock stores spin count here. */ -}; - -#ifndef _PTHREAD_DESCR_DEFINED -/* Thread descriptors */ -typedef struct _pthread_descr_struct *_pthread_descr; -# define _PTHREAD_DESCR_DEFINED -#endif - - -/* Attributes for threads. */ -typedef struct __pthread_attr_s -{ - int __detachstate; - int __schedpolicy; - struct __sched_param __schedparam; - int __inheritsched; - int __scope; - size_t __guardsize; - int __stackaddr_set; - void *__stackaddr; - size_t __stacksize; -} pthread_attr_t; - - -/* Conditions (not abstract because of PTHREAD_COND_INITIALIZER */ - -#ifdef __GLIBC_HAVE_LONG_LONG -__extension__ typedef long long __pthread_cond_align_t; -#else -typedef long __pthread_cond_align_t; -#endif - -typedef struct -{ - struct _pthread_fastlock __c_lock; /* Protect against concurrent access */ - _pthread_descr __c_waiting; /* Threads waiting on this condition */ - char __padding[48 - sizeof (struct _pthread_fastlock) - - sizeof (_pthread_descr) - sizeof (__pthread_cond_align_t)]; - __pthread_cond_align_t __align; -} pthread_cond_t; - - -/* Attribute for conditionally variables. */ -typedef struct -{ - int __dummy; -} pthread_condattr_t; - -/* Keys for thread-specific data */ -typedef unsigned int pthread_key_t; - - -/* Mutexes (not abstract because of PTHREAD_MUTEX_INITIALIZER). */ -/* (The layout is unnatural to maintain binary compatibility - with earlier releases of LinuxThreads.) */ -typedef struct -{ - int __m_reserved; /* Reserved for future use */ - int __m_count; /* Depth of recursive locking */ - _pthread_descr __m_owner; /* Owner thread (if recursive or errcheck) */ - int __m_kind; /* Mutex kind: fast, recursive or errcheck */ - struct _pthread_fastlock __m_lock; /* Underlying fast lock */ -} pthread_mutex_t; - - -/* Attribute for mutex. */ -typedef struct -{ - int __mutexkind; -} pthread_mutexattr_t; - - -/* Once-only execution */ -typedef int pthread_once_t; - - -#if defined __USE_UNIX98 || defined __USE_XOPEN2K -/* Read-write locks. */ -typedef struct _pthread_rwlock_t -{ - struct _pthread_fastlock __rw_lock; /* Lock to guarantee mutual exclusion */ - int __rw_readers; /* Number of readers */ - _pthread_descr __rw_writer; /* Identity of writer, or NULL if none */ - _pthread_descr __rw_read_waiting; /* Threads waiting for reading */ - _pthread_descr __rw_write_waiting; /* Threads waiting for writing */ - int __rw_kind; /* Reader/Writer preference selection */ - int __rw_pshared; /* Shared between processes or not */ -} pthread_rwlock_t; - - -/* Attribute for read-write locks. */ -typedef struct -{ - int __lockkind; - int __pshared; -} pthread_rwlockattr_t; -#endif - -#ifdef __USE_XOPEN2K -/* POSIX spinlock data type. */ -typedef volatile int pthread_spinlock_t; - -/* POSIX barrier. */ -typedef struct { - struct _pthread_fastlock __ba_lock; /* Lock to guarantee mutual exclusion */ - int __ba_required; /* Threads needed for completion */ - int __ba_present; /* Threads waiting */ - _pthread_descr __ba_waiting; /* Queue of waiting threads */ -} pthread_barrier_t; - -/* barrier attribute */ -typedef struct { - int __pshared; -} pthread_barrierattr_t; - -#endif - - -/* Thread identifiers */ -typedef unsigned long int pthread_t; - -#endif /* bits/pthreadtypes.h */ diff --git a/newlib/libc/sys/linux/bits/typesizes.h b/newlib/libc/sys/linux/bits/typesizes.h deleted file mode 100644 index 45264ac9c..000000000 --- a/newlib/libc/sys/linux/bits/typesizes.h +++ /dev/null @@ -1,66 +0,0 @@ -/* bits/typesizes.h -- underlying types for *_t. Generic version. - Copyright (C) 2002, 2003 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ - -#ifndef _BITS_TYPES_H -# error "Never include <bits/typesizes.h> directly; use <sys/types.h> instead." -#endif - -#ifndef _BITS_TYPESIZES_H -#define _BITS_TYPESIZES_H 1 - -/* See <bits/types.h> for the meaning of these macros. This file exists so - that <bits/types.h> need not vary across different GNU platforms. */ - -#define __DEV_T_TYPE __UQUAD_TYPE -#define __UID_T_TYPE __U32_TYPE -#define __GID_T_TYPE __U32_TYPE -#define __INO_T_TYPE __ULONGWORD_TYPE -#define __INO64_T_TYPE __UQUAD_TYPE -#define __MODE_T_TYPE __U32_TYPE -#define __NLINK_T_TYPE __UWORD_TYPE -#define __OFF_T_TYPE __SLONGWORD_TYPE -#define __OFF64_T_TYPE __SQUAD_TYPE -#define __PID_T_TYPE __S32_TYPE -#define __RLIM_T_TYPE __ULONGWORD_TYPE -#define __RLIM64_T_TYPE __UQUAD_TYPE -#define __BLKCNT_T_TYPE __SLONGWORD_TYPE -#define __BLKCNT64_T_TYPE __SQUAD_TYPE -#define __FSBLKCNT_T_TYPE __ULONGWORD_TYPE -#define __FSBLKCNT64_T_TYPE __UQUAD_TYPE -#define __FSFILCNT_T_TYPE __ULONGWORD_TYPE -#define __FSFILCNT64_T_TYPE __UQUAD_TYPE -#define __ID_T_TYPE __U32_TYPE -#define __CLOCK_T_TYPE __SLONGWORD_TYPE -#define __TIME_T_TYPE __SLONGWORD_TYPE -#define __USECONDS_T_TYPE __U32_TYPE -#define __SUSECONDS_T_TYPE __SLONGWORD_TYPE -#define __DADDR_T_TYPE __S32_TYPE -#define __SWBLK_T_TYPE __SLONGWORD_TYPE -#define __KEY_T_TYPE __S32_TYPE -#define __CLOCKID_T_TYPE __S32_TYPE -#define __TIMER_T_TYPE __S32_TYPE -#define __BLKSIZE_T_TYPE __SLONGWORD_TYPE -#define __FSID_T_TYPE struct { int __val[2]; } -#define __SSIZE_T_TYPE __SWORD_TYPE - -/* Number of descriptors that can fit in an `fd_set'. */ -#define __FD_SETSIZE 1024 - - -#endif /* bits/typesizes.h */ diff --git a/newlib/libc/sys/linux/configure b/newlib/libc/sys/linux/configure index 202a986e1..88451ffb1 100755 --- a/newlib/libc/sys/linux/configure +++ b/newlib/libc/sys/linux/configure @@ -1009,7 +1009,7 @@ test "$host_alias" != "$target_alias" && PACKAGE=newlib -VERSION=1.14.0 +VERSION=1.13.0 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -1431,11 +1431,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13. */ -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1439: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1436: 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" @@ -1469,7 +1466,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1473: checking for executable suffix" >&5 +echo "configure:1470: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1479,7 +1476,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -1655,7 +1652,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:1659: checking for $ac_word" >&5 +echo "configure:1656: 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 @@ -1685,7 +1682,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:1689: checking for $ac_word" >&5 +echo "configure:1686: 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 @@ -1736,7 +1733,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:1740: checking for $ac_word" >&5 +echo "configure:1737: 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 @@ -1768,7 +1765,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1772: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1769: 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. @@ -1779,12 +1776,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1783 "configure" +#line 1780 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1785: \"$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 @@ -1810,12 +1807,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:1814: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1811: 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:1819: checking whether we are using GNU C" >&5 +echo "configure:1816: 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 @@ -1824,7 +1821,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1828: \"$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:1825: \"$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 @@ -1843,7 +1840,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:1847: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1844: 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 @@ -1886,7 +1883,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:1890: checking for ld used by GCC" >&5 +echo "configure:1887: checking for ld used by GCC" >&5 case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -1916,10 +1913,10 @@ echo "configure:1890: 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:1920: checking for GNU ld" >&5 +echo "configure:1917: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1923: checking for non-GNU ld" >&5 +echo "configure:1920: 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 @@ -1954,7 +1951,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:1958: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:1955: 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 @@ -1971,7 +1968,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:1975: checking for $LD option to reload object files" >&5 +echo "configure:1972: 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 @@ -1983,7 +1980,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:1987: checking for BSD-compatible nm" >&5 +echo "configure:1984: 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 @@ -2021,7 +2018,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:2025: checking whether ln -s works" >&5 +echo "configure:2022: 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 @@ -2042,7 +2039,7 @@ else fi echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6 -echo "configure:2046: checking how to recognise dependant libraries" >&5 +echo "configure:2043: 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 @@ -2215,13 +2212,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:2219: checking for object suffix" >&5 +echo "configure:2216: 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:2225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2222: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -2245,7 +2242,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:2249: checking for ${ac_tool_prefix}file" >&5 +echo "configure:2246: 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 @@ -2307,7 +2304,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:2311: checking for file" >&5 +echo "configure:2308: 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 @@ -2378,7 +2375,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:2382: checking for $ac_word" >&5 +echo "configure:2379: 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 @@ -2410,7 +2407,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:2414: checking for $ac_word" >&5 +echo "configure:2411: 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 @@ -2445,7 +2442,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:2449: checking for $ac_word" >&5 +echo "configure:2446: 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,7 +2474,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:2481: checking for $ac_word" >&5 +echo "configure:2478: 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 @@ -2544,8 +2541,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 2548 "configure"' > conftest.$ac_ext - if { (eval echo configure:2549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 2545 "configure"' > conftest.$ac_ext + if { (eval echo configure:2546: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" @@ -2564,7 +2561,7 @@ case $host in ia64-*-hpux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo configure:2568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:2565: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *ELF-32*) HPUX_IA64_MODE="32" @@ -2582,7 +2579,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:2586: checking whether the C compiler needs -belf" >&5 +echo "configure:2583: 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 @@ -2595,14 +2592,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 2599 "configure" +#line 2596 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2603: \"$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 @@ -2632,7 +2629,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:2636: checking for $ac_word" >&5 +echo "configure:2633: 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 @@ -2664,7 +2661,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:2668: checking for $ac_word" >&5 +echo "configure:2665: 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 @@ -2699,7 +2696,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:2703: checking for $ac_word" >&5 +echo "configure:2700: 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 @@ -2731,7 +2728,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:2735: checking for $ac_word" >&5 +echo "configure:2732: 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 @@ -2766,7 +2763,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:2770: checking for $ac_word" >&5 +echo "configure:2767: 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 @@ -2798,7 +2795,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:2802: checking for $ac_word" >&5 +echo "configure:2799: 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 @@ -2834,12 +2831,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:2838: checking if libtool should supply DllMain function" >&5 +echo "configure:2835: 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 2843 "configure" +#line 2840 "configure" #include "confdefs.h" int main() { @@ -2847,7 +2844,7 @@ extern int __attribute__((__stdcall__)) DllMain(void*, int, void*); DllMain (0, 0, 0); ; return 0; } EOF -if { (eval echo configure:2851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_need_dllmain=no else @@ -2868,19 +2865,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:2872: checking how to link DLLs" >&5 +echo "configure:2869: 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 2877 "configure" +#line 2874 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2881: \"$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 @@ -2994,7 +2991,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:2998: checking for $ac_word" >&5 +echo "configure:2995: 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 diff --git a/newlib/libc/sys/linux/dl/dl-cache.c b/newlib/libc/sys/linux/dl/dl-cache.c index 9511da13f..a71e5e876 100644 --- a/newlib/libc/sys/linux/dl/dl-cache.c +++ b/newlib/libc/sys/linux/dl/dl-cache.c @@ -208,7 +208,7 @@ _dl_load_cache_lookup (const char *name) /* This file ends in static libraries where we don't have a hwcap. */ unsigned long int *hwcap; uint64_t platform; - #pragma weak _dl_hwcap + weak_extern (_dl_hwcap); /* This is where the strings start. */ cache_data = (const char *) cache_new; diff --git a/newlib/libc/sys/linux/dl/dl-load.c b/newlib/libc/sys/linux/dl/dl-load.c index 4e32d604b..65b72c729 100644 --- a/newlib/libc/sys/linux/dl/dl-load.c +++ b/newlib/libc/sys/linux/dl/dl-load.c @@ -1095,7 +1095,7 @@ _dl_map_object_from_fd (const char *name, int fd, struct filebuf *fbp, } else /* Adjust the PT_PHDR value by the runtime load address. */ - l->l_phdr = (ElfW(Addr)) l->l_phdr + l->l_addr; + (ElfW(Addr)) l->l_phdr += l->l_addr; } /* We are done mapping in the file. We no longer need the descriptor. */ @@ -1115,7 +1115,7 @@ _dl_map_object_from_fd (const char *name, int fd, struct filebuf *fbp, } } else - l->l_ld = (ElfW(Addr)) l->l_ld + l->l_addr; + (ElfW(Addr)) l->l_ld += l->l_addr; l->l_entry += l->l_addr; diff --git a/newlib/libc/sys/linux/dl/dl-local.h b/newlib/libc/sys/linux/dl/dl-local.h deleted file mode 100644 index 3629ab94c..000000000 --- a/newlib/libc/sys/linux/dl/dl-local.h +++ /dev/null @@ -1,65 +0,0 @@ -#ifndef _LOCAL_H -#include <dlfcn.h> - -#define internal_function - -/* Internally used flag. */ -#define __RTLD_DLOPEN 0x80000000 -#define __RTLD_SPROF 0x40000000 - -/* Now define the internal interfaces. */ -extern void *__dlvsym (void *__handle, __const char *__name, - __const char *__version); - -extern void *__libc_dlopen (__const char *__name); -extern void *__libc_dlsym (void *__map, __const char *__name); -extern int __libc_dlclose (void *__map); - -/* Locate shared object containing the given address. */ -extern int _dl_addr (const void *address, Dl_info *info) - internal_function; - -/* Open the shared object NAME, relocate it, and run its initializer if it - hasn't already been run. MODE is as for `dlopen' (see <dlfcn.h>). If - the object is already opened, returns its existing map. */ -extern void *_dl_open (const char *name, int mode, const void *caller) - internal_function; - -/* Close an object previously opened by _dl_open. */ -extern void _dl_close (void *map) - internal_function; - -/* Look up NAME in shared object HANDLE (which may be RTLD_DEFAULT or - RTLD_NEXT). WHO is the calling function, for RTLD_NEXT. Returns - the symbol value, which may be NULL. */ -extern void *_dl_sym (void *handle, const char *name, void *who) - internal_function; - -/* Look up version VERSION of symbol NAME in shared object HANDLE - (which may be RTLD_DEFAULT or RTLD_NEXT). WHO is the calling - function, for RTLD_NEXT. Returns the symbol value, which may be - NULL. */ -extern void *_dl_vsym (void *handle, const char *name, const char *version, - void *who) - internal_function; - -/* Call OPERATE, catching errors from `dl_signal_error'. If there is no - error, *ERRSTRING is set to null. If there is an error, *ERRSTRING is - set to a string constructed from the strings passed to _dl_signal_error, - and the error code passed is the return value and *OBJNAME is set to - the object name which experienced the problems. ERRSTRING if nonzero - points to a malloc'ed string which the caller has to free after use. - ARGS is passed as argument to OPERATE. */ -extern int _dl_catch_error (const char **objname, const char **errstring, - void (*operate) (void *), - void *args) - internal_function; - -/* Helper function for <dlfcn.h> functions. Runs the OPERATE function via - _dl_catch_error. Returns zero for success, nonzero for failure; and - arranges for `dlerror' to return the error details. - ARGS is passed as argument to OPERATE. */ -extern int _dlerror_run (void (*operate) (void *), void *args) - internal_function; - -#endif diff --git a/newlib/libc/sys/linux/dl/dl-open.c b/newlib/libc/sys/linux/dl/dl-open.c index 4e068d435..195361427 100644 --- a/newlib/libc/sys/linux/dl/dl-open.c +++ b/newlib/libc/sys/linux/dl/dl-open.c @@ -36,8 +36,8 @@ extern ElfW(Addr) _dl_sysdep_start (void **start_argptr, void (*dl_main) (const ElfW(Phdr) *phdr, ElfW(Word) phnum, - ElfW(Addr) *user_entry)) - weak_function; + ElfW(Addr) *user_entry)); +weak_extern (BP_SYM (_dl_sysdep_start)) /* This function is used to unload the cache file if necessary. */ extern void _dl_unload_cache (void); diff --git a/newlib/libc/sys/linux/dl/dl-reloc.c b/newlib/libc/sys/linux/dl/dl-reloc.c index 0bffa4e76..94163143e 100644 --- a/newlib/libc/sys/linux/dl/dl-reloc.c +++ b/newlib/libc/sys/linux/dl/dl-reloc.c @@ -105,47 +105,50 @@ _dl_relocate_object (struct link_map *l, struct r_scope_elem *scope[], { /* Do the actual relocation of the object's GOT and other data. */ + /* String table object symbols. */ + const char *strtab = (const void *) D_PTR (l, l_info[DT_STRTAB]); + /* This macro is used as a callback from the ELF_DYNAMIC_RELOCATE code. */ -#define RESOLVE_MAP(ref, version, r_type, scope) \ +#define RESOLVE_MAP(ref, version, r_type) \ (ELFW(ST_BIND) ((*ref)->st_info) != STB_LOCAL \ - ? ((__builtin_expect ((*ref) == map->l_lookup_cache.sym, 0) \ - && elf_machine_type_class (r_type) == map->l_lookup_cache.type_class)\ + ? ((__builtin_expect ((*ref) == l->l_lookup_cache.sym, 0) \ + && elf_machine_type_class (r_type) == l->l_lookup_cache.type_class) \ ? (++_dl_num_cache_relocations, \ - (*ref) = map->l_lookup_cache.ret, \ - map->l_lookup_cache.value) \ + (*ref) = l->l_lookup_cache.ret, \ + l->l_lookup_cache.value) \ : ({ lookup_t _lr; \ int _tc = elf_machine_type_class (r_type); \ - map->l_lookup_cache.type_class = _tc; \ - map->l_lookup_cache.sym = (*ref); \ + l->l_lookup_cache.type_class = _tc; \ + l->l_lookup_cache.sym = (*ref); \ _lr = ((version) != NULL && (version)->hash != 0 \ ? _dl_lookup_versioned_symbol (strtab + (*ref)->st_name, \ - map, (ref), scope, \ + l, (ref), scope, \ (version), _tc, 0) \ - : _dl_lookup_symbol (strtab + (*ref)->st_name, map, (ref),\ + : _dl_lookup_symbol (strtab + (*ref)->st_name, l, (ref), \ scope, _tc, 0)); \ - map->l_lookup_cache.ret = (*ref); \ - map->l_lookup_cache.value = _lr; })) \ - : map) -#define RESOLVE(ref, version, r_type, scope) \ + l->l_lookup_cache.ret = (*ref); \ + l->l_lookup_cache.value = _lr; })) \ + : l) +#define RESOLVE(ref, version, r_type) \ (ELFW(ST_BIND) ((*ref)->st_info) != STB_LOCAL \ - ? ((__builtin_expect ((*ref) == map->l_lookup_cache.sym, 0) \ - && elf_machine_type_class (r_type) == map->l_lookup_cache.type_class)\ + ? ((__builtin_expect ((*ref) == l->l_lookup_cache.sym, 0) \ + && elf_machine_type_class (r_type) == l->l_lookup_cache.type_class) \ ? (++_dl_num_cache_relocations, \ - (*ref) = map->l_lookup_cache.ret, \ - map->l_lookup_cache.value) \ + (*ref) = l->l_lookup_cache.ret, \ + l->l_lookup_cache.value) \ : ({ lookup_t _lr; \ int _tc = elf_machine_type_class (r_type); \ - map->l_lookup_cache.type_class = _tc; \ - map->l_lookup_cache.sym = (*ref); \ + l->l_lookup_cache.type_class = _tc; \ + l->l_lookup_cache.sym = (*ref); \ _lr = ((version) != NULL && (version)->hash != 0 \ ? _dl_lookup_versioned_symbol (strtab + (*ref)->st_name, \ - map, (ref), scope, \ + l, (ref), scope, \ (version), _tc, 0) \ - : _dl_lookup_symbol (strtab + (*ref)->st_name, map, (ref),\ + : _dl_lookup_symbol (strtab + (*ref)->st_name, l, (ref), \ scope, _tc, 0)); \ - map->l_lookup_cache.ret = (*ref); \ - map->l_lookup_cache.value = _lr; })) \ - : map->l_addr) + l->l_lookup_cache.ret = (*ref); \ + l->l_lookup_cache.value = _lr; })) \ + : l->l_addr) #include "dynamic-link.h" @@ -194,7 +197,6 @@ _dl_relocate_object (struct link_map *l, struct r_scope_elem *scope[], } } -#include <machine/dl-machine.h> void internal_function diff --git a/newlib/libc/sys/linux/dl/dl-runtime.c b/newlib/libc/sys/linux/dl/dl-runtime.c index 4fb81cfaf..403091d2e 100644 --- a/newlib/libc/sys/linux/dl/dl-runtime.c +++ b/newlib/libc/sys/linux/dl/dl-runtime.c @@ -46,7 +46,7 @@ function. */ #ifndef ELF_MACHINE_NO_PLT -static ElfW(Addr) __attribute__ ((regparm (2), used)) +static ElfW(Addr) __attribute__ ((regparm (2), unused)) fixup ( # ifdef ELF_MACHINE_RUNTIME_FIXUP_ARGS ELF_MACHINE_RUNTIME_FIXUP_ARGS, @@ -130,7 +130,7 @@ fixup ( #if !defined PROF && !defined ELF_MACHINE_NO_PLT && !__BOUNDED_POINTERS__ -static ElfW(Addr) __attribute__ ((regparm (3), used)) +static ElfW(Addr) __attribute__ ((regparm (3), unused)) profile_fixup ( #ifdef ELF_MACHINE_RUNTIME_FIXUP_ARGS ELF_MACHINE_RUNTIME_FIXUP_ARGS, diff --git a/newlib/libc/sys/linux/dl/dlfcn.h b/newlib/libc/sys/linux/dl/dlfcn.h new file mode 100644 index 000000000..67ba73d5d --- /dev/null +++ b/newlib/libc/sys/linux/dl/dlfcn.h @@ -0,0 +1,84 @@ +/* User functions for run-time dynamic loading. + Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#ifndef _DLFCN_H +#define _DLFCN_H 1 + +#include <features.h> + +/* Collect various system dependent definitions and declarations. */ +#include <sys/dlfcn.h> + + +/* If the first argument of `dlsym' or `dlvsym' is set to RTLD_NEXT + the run-time address of the symbol called NAME in the next shared + object is returned. The "next" relation is defined by the order + the shared objects were loaded. */ +# define RTLD_NEXT ((void *) -1l) + +/* If the first argument to `dlsym' or `dlvsym' is set to RTLD_DEFAULT + the run-time address of the symbol called NAME in the global scope + is returned. */ +# define RTLD_DEFAULT ((void *) 0) + + +__BEGIN_DECLS + +/* Open the shared object FILE and map it in; return a handle that can be + passed to `dlsym' to get symbol values from it. */ +extern void *dlopen (__const char *__file, int __mode) __THROW; + +/* Unmap and close a shared object opened by `dlopen'. + The handle cannot be used again after calling `dlclose'. */ +extern int dlclose (void *__handle) __THROW; + +/* Find the run-time address in the shared object HANDLE refers to + of the symbol called NAME. */ +extern void *dlsym (void *__restrict __handle, + __const char *__restrict __name) __THROW; + +/* Find the run-time address in the shared object HANDLE refers to + of the symbol called NAME with VERSION. */ +extern void *dlvsym (void *__restrict __handle, + __const char *__restrict __name, + __const char *__restrict __version) __THROW; + +/* When any of the above functions fails, call this function + to return a string describing the error. Each call resets + the error string so that a following call returns null. */ +extern char *dlerror (void) __THROW; + + +/* Structure containing information about object searched using + `dladdr'. */ +typedef struct +{ + __const char *dli_fname; /* File name of defining object. */ + void *dli_fbase; /* Load address of that object. */ + __const char *dli_sname; /* Name of nearest symbol. */ + void *dli_saddr; /* Exact value of nearest symbol. */ +} Dl_info; + +/* Fill in *INFO with the following information about ADDRESS. + Returns 0 iff no shared object's segments contain that address. */ +extern int dladdr (__const void *__address, Dl_info *__info) __THROW; + +__END_DECLS + +#endif /* dlfcn.h */ diff --git a/newlib/libc/sys/linux/dl/do-rel.h b/newlib/libc/sys/linux/dl/do-rel.h index 03b9e807b..46202d704 100644 --- a/newlib/libc/sys/linux/dl/do-rel.h +++ b/newlib/libc/sys/linux/dl/do-rel.h @@ -44,8 +44,7 @@ static inline void elf_dynamic_do_rel (struct link_map *map, ElfW(Addr) reladdr, ElfW(Addr) relsize, - int lazy, - struct r_scope_elem *scope[]) + int lazy) { const ElfW(Rel) *r = (const void *) reladdr; const ElfW(Rel) *end = (const void *) (reladdr + relsize); @@ -78,7 +77,7 @@ elf_dynamic_do_rel (struct link_map *map, RTLD_BOOTSTRAP) because rtld.c contains the common defn for _dl_rtld_map, which is incompatible with a weak decl in the same file. */ - #pragma weak _dl_rtld_map + weak_extern (_dl_rtld_map); if (map != &_dl_rtld_map) /* Already done in rtld itself. */ # ifndef DO_RELA /* Rela platforms get the offset from r_addend and this must @@ -102,14 +101,13 @@ elf_dynamic_do_rel (struct link_map *map, ElfW(Half) ndx = version[ELFW(R_SYM) (r->r_info)]; elf_machine_rel (map, r, &symtab[ELFW(R_SYM) (r->r_info)], &map->l_versions[ndx], - (void *) (l_addr + r->r_offset), - scope); + (void *) (l_addr + r->r_offset)); } } else for (; r < end; ++r) elf_machine_rel (map, r, &symtab[ELFW(R_SYM) (r->r_info)], NULL, - (void *) (l_addr + r->r_offset), scope); + (void *) (l_addr + r->r_offset)); } } diff --git a/newlib/libc/sys/linux/dl/dynamic-link.h b/newlib/libc/sys/linux/dl/dynamic-link.h index c1709f7c6..a63fded89 100644 --- a/newlib/libc/sys/linux/dl/dynamic-link.h +++ b/newlib/libc/sys/linux/dl/dynamic-link.h @@ -17,9 +17,6 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#ifndef __DYNAMIC_LINK_H__ -#define __DYNAMIC_LINK_H__ - #include <elf.h> #include <machine/dl-machine.h> #include <assert.h> @@ -36,7 +33,7 @@ extern int _dl_verbose __attribute__ ((unused)); /* Read the dynamic section at DYN and fill in INFO with indices DT_*. */ -static void __attribute__ ((unused)) +static inline void __attribute__ ((unused)) elf_get_dynamic_info (struct link_map *l) { ElfW(Dyn) *dyn = l->l_ld; @@ -124,17 +121,6 @@ elf_get_dynamic_info (struct link_map *l) info[DT_RPATH] = NULL; } -# if ! ELF_MACHINE_NO_REL -# include "do-rel.h" -# endif - -# if ! ELF_MACHINE_NO_RELA -# define DO_RELA -# include "do-rel.h" -# endif - -#endif /* __DYNAMIC_LINK_H__ */ - #ifdef RESOLVE /* Get the definitions of `elf_dynamic_do_rel' and `elf_dynamic_do_rela'. @@ -178,8 +164,7 @@ elf_get_dynamic_info (struct link_map *l) elf_dynamic_do_##reloc ((map), \ ranges[ranges_index].start, \ ranges[ranges_index].size, \ - ranges[ranges_index].lazy, \ - scope); \ + ranges[ranges_index].lazy); \ } while (0) # else # define _ELF_DYNAMIC_DO_RELOC(RELOC, reloc, map, do_lazy, test_rel) \ @@ -219,8 +204,7 @@ elf_get_dynamic_info (struct link_map *l) elf_dynamic_do_##reloc ((map), \ ranges[ranges_index].start, \ ranges[ranges_index].size, \ - ranges[ranges_index].lazy, \ - scope); \ + ranges[ranges_index].lazy); \ } while (0) # endif @@ -231,6 +215,7 @@ elf_get_dynamic_info (struct link_map *l) # endif # if ! ELF_MACHINE_NO_REL +# include "do-rel.h" # define ELF_DYNAMIC_DO_REL(map, lazy) \ _ELF_DYNAMIC_DO_RELOC (REL, rel, map, lazy, _ELF_CHECK_REL) # else @@ -238,6 +223,8 @@ elf_get_dynamic_info (struct link_map *l) # endif # if ! ELF_MACHINE_NO_RELA +# define DO_RELA +# include "do-rel.h" # define ELF_DYNAMIC_DO_RELA(map, lazy) \ _ELF_DYNAMIC_DO_RELOC (RELA, rela, map, lazy, _ELF_CHECK_REL) # else diff --git a/newlib/libc/sys/linux/dl/ldsodefs.h b/newlib/libc/sys/linux/dl/ldsodefs.h index e6f57ddcf..f24e1136b 100644 --- a/newlib/libc/sys/linux/dl/ldsodefs.h +++ b/newlib/libc/sys/linux/dl/ldsodefs.h @@ -28,12 +28,11 @@ #include <string.h> #include <elf.h> +#include <dlfcn.h> #include <link.h> #include <dl-lookupcfg.h> #include <bits/libc-lock.h> -#include "dl-local.h" - __BEGIN_DECLS /* We use this macro to refer to ELF types independent of the native wordsize. diff --git a/newlib/libc/sys/linux/getpwent.c b/newlib/libc/sys/linux/getpwent.c deleted file mode 100644 index 9479021e3..000000000 --- a/newlib/libc/sys/linux/getpwent.c +++ /dev/null @@ -1,30 +0,0 @@ -/* FIXME: dummy stub for now. */ -#include <errno.h> -#include <pwd.h> - -struct passwd * -_DEFUN (getpwnam, (name), - _CONST char *name) -{ - errno = ENOSYS; - return NULL; -} - -/* FIXME: dummy stub for now. */ -struct passwd * -_DEFUN (getpwuid, (uid), - uid_t uid) -{ - errno = ENOSYS; - return NULL; -} - -/* FIXME: dummy stub for now. */ -struct passwd * -_DEFUN (getpwent, (uid), - uid_t uid) -{ - errno = ENOSYS; - return NULL; -} - diff --git a/newlib/libc/sys/linux/getpwnam.c b/newlib/libc/sys/linux/getpwnam.c new file mode 100644 index 000000000..c90562c5a --- /dev/null +++ b/newlib/libc/sys/linux/getpwnam.c @@ -0,0 +1,12 @@ +/* FIXME: dummy stub for now. */ +#include <errno.h> +#include <pwd.h> + +struct passwd * +_DEFUN (getpwnam, (name), + _CONST char *name) +{ + errno = ENOSYS; + return NULL; +} + diff --git a/newlib/libc/sys/linux/getpwuid.c b/newlib/libc/sys/linux/getpwuid.c new file mode 100644 index 000000000..4e9fcb220 --- /dev/null +++ b/newlib/libc/sys/linux/getpwuid.c @@ -0,0 +1,12 @@ +/* FIXME: dummy stub for now. */ +#include <errno.h> +#include <pwd.h> + +struct passwd * +_DEFUN (getpwuid, (uid), + uid_t uid) +{ + errno = ENOSYS; + return NULL; +} + diff --git a/newlib/libc/sys/linux/iconv/gconv_open.c b/newlib/libc/sys/linux/iconv/gconv_open.c index 1b2fbb51a..5c10d601e 100644 --- a/newlib/libc/sys/linux/iconv/gconv_open.c +++ b/newlib/libc/sys/linux/iconv/gconv_open.c @@ -172,10 +172,7 @@ __gconv_open (const char *toset, const char *fromset, __gconv_t *handle, lastp = runp; else /* This means we haven't found the module. Remove it. */ - if (lastp == NULL) - trans = runp->next; - else - lastp->next = runp->next; + (lastp == NULL ? trans : lastp->next) = runp->next; } /* Allocate room for handle. */ diff --git a/newlib/libc/sys/linux/iconv/gconv_simple.c b/newlib/libc/sys/linux/iconv/gconv_simple.c index edc091f7c..a4a99ea81 100644 --- a/newlib/libc/sys/linux/iconv/gconv_simple.c +++ b/newlib/libc/sys/linux/iconv/gconv_simple.c @@ -75,10 +75,7 @@ internal_ucs4_loop (struct __gconv_step *step, size_t cnt; for (cnt = 0; cnt < n_convert; ++cnt, inptr += 4) - { - *((uint32_t *) outptr) = bswap_32 (*(const uint32_t *) inptr); - outptr = (unsigned char *)((uint32_t *) outptr + 1); - } + *((uint32_t *) outptr)++ = bswap_32 (*(const uint32_t *) inptr); *inptrp = inptr; *outptrp = outptr; @@ -183,13 +180,8 @@ internal_ucs4_loop_single (struct __gconv_step *step, *outptrp += 4; #elif __BYTE_ORDER == __BIG_ENDIAN - { - uint32_t **p = (uint32_t **)outptrp; - uint32_t *q = *p; - /* XXX unaligned */ - *q = state->__value.__wch; - outptrp = (unsigned char *)(p + 1); - } + /* XXX unaligned */ + *(*((uint32_t **) outptrp)++) = state->__value.__wch; #else # error "This endianess is not supported." #endif @@ -252,7 +244,7 @@ ucs4_internal_loop (struct __gconv_step *step, if (flags & __GCONV_IGNORE_ERRORS) { /* Just ignore this character. */ - *irreversible = *irreversible + 1; + ++*irreversible; continue; } @@ -261,8 +253,7 @@ ucs4_internal_loop (struct __gconv_step *step, return __GCONV_ILLEGAL_INPUT; } - *((uint32_t *) outptr) = inval; - outptr = (unsigned char *) ((uint32_t *) outptr + 1); + *((uint32_t *) outptr)++ = inval; } *inptrp = inptr; @@ -310,7 +301,7 @@ ucs4_internal_loop_unaligned (struct __gconv_step *step, if (flags & __GCONV_IGNORE_ERRORS) { /* Just ignore this character. */ - *irreversible = *irreversible + 1; + ++*irreversible; continue; } @@ -545,13 +536,8 @@ internal_ucs4le_loop_single (struct __gconv_step *step, *outptrp += 4; #else - { /* XXX unaligned */ - uint32_t **p = (uint32_t **)outptrp; - uint32_t *q = *p; - *q = state->__value.__wch; - outptrp = (unsigned char **)(p + 1); - } + *(*((uint32_t **) outptrp)++) = state->__value.__wch; #endif /* Clear the state buffer. */ @@ -618,8 +604,7 @@ ucs4le_internal_loop (struct __gconv_step *step, return __GCONV_ILLEGAL_INPUT; } - *((uint32_t *) outptr) = inval; - outptr = (unsigned char *)((uint32_t *) outptr + 1); + *((uint32_t *) outptr)++ = inval; } *inptrp = inptr; @@ -796,16 +781,12 @@ ucs4le_internal_loop_single (struct __gconv_step *step, break; \ } \ \ - *irreversible = *irreversible + 1; \ + ++*irreversible; \ ++inptr; \ } \ else \ - { \ - /* It's an one byte sequence. */ \ - *((uint32_t *) outptr) = *inptr; \ - ++inptr; \ - outptr = (unsigned char *)((uint32_t *) outptr + 1); \ - } \ + /* It's an one byte sequence. */ \ + *((uint32_t *) outptr)++ = *inptr++; \ } #define LOOP_NEED_FLAGS #include <iconv/loop.c> @@ -834,11 +815,8 @@ ucs4le_internal_loop_single (struct __gconv_step *step, STANDARD_ERR_HANDLER (4); \ } \ else \ - { \ - /* It's an one byte sequence. */ \ - *outptr++ = *((const uint32_t *) inptr); \ - inptr = ((const uint32_t *) inptr + 1); \ - } \ + /* It's an one byte sequence. */ \ + *outptr++ = *((const uint32_t *) inptr)++; \ } #define LOOP_NEED_FLAGS #include <iconv/loop.c> @@ -1015,7 +993,7 @@ ucs4le_internal_loop_single (struct __gconv_step *step, { \ /* Ignore it. */ \ inptr += i; \ - *irreversible = *irreversible + 1; \ + ++*irreversible; \ continue; \ } \ \ @@ -1045,7 +1023,7 @@ ucs4le_internal_loop_single (struct __gconv_step *step, if (ignore_errors_p ()) \ { \ inptr += i; \ - *irreversible = *irreversible + 1; \ + ++*irreversible; \ continue; \ } \ \ @@ -1057,8 +1035,7 @@ ucs4le_internal_loop_single (struct __gconv_step *step, } \ \ /* Now adjust the pointers and store the result. */ \ - *((uint32_t *) outptr) = ch; \ - outptr = (unsigned char *)((uint32_t *) outptr + 1); \ + *((uint32_t *) outptr)++ = ch; \ } #define LOOP_NEED_FLAGS @@ -1197,12 +1174,11 @@ ucs4le_internal_loop_single (struct __gconv_step *step, break; \ } \ inptr += 2; \ - *irreversible = *irreversible + 1; \ + ++*irreversible; \ continue; \ } \ \ - *((uint32_t *) outptr) = u1; \ - outptr = (unsigned char *)((uint32_t *) outptr + 1); \ + *((uint32_t *) outptr)++ = u1; \ inptr += 2; \ } #define LOOP_NEED_FLAGS @@ -1247,13 +1223,12 @@ ucs4le_internal_loop_single (struct __gconv_step *step, break; \ } \ inptr += 4; \ - *irreversible = *irreversible + 1; \ + ++*irreversible; \ continue; \ } \ else \ { \ - *((uint16_t *) outptr) = val; \ - outptr = (unsigned char *)((uint16_t *) outptr + 1); \ + *((uint16_t *) outptr)++ = val; \ inptr += 4; \ } \ } @@ -1290,12 +1265,11 @@ ucs4le_internal_loop_single (struct __gconv_step *step, break; \ } \ inptr += 2; \ - *irreversible = *irreversible + 1; \ + ++*irreversible; \ continue; \ } \ \ - *((uint32_t *) outptr) = u1; \ - outptr = (unsigned char *)((uint32_t *) outptr + 1); \ + *((uint32_t *) outptr)++ = u1; \ inptr += 2; \ } #define LOOP_NEED_FLAGS @@ -1339,13 +1313,12 @@ ucs4le_internal_loop_single (struct __gconv_step *step, break; \ } \ inptr += 4; \ - *irreversible = *irreversible + 1; \ + ++*irreversible; \ continue; \ } \ else \ { \ - *((uint16_t *) outptr) = bswap_16 (val); \ - outptr = (unsigned char *)((uint16_t *) outptr + 1); \ + *((uint16_t *) outptr)++ = bswap_16 (val); \ inptr += 4; \ } \ } diff --git a/newlib/libc/sys/linux/include/dlfcn.h b/newlib/libc/sys/linux/include/dlfcn.h index 67ba73d5d..75d7526b0 100644 --- a/newlib/libc/sys/linux/include/dlfcn.h +++ b/newlib/libc/sys/linux/include/dlfcn.h @@ -1,84 +1,65 @@ -/* User functions for run-time dynamic loading. - Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ - -#ifndef _DLFCN_H -#define _DLFCN_H 1 - -#include <features.h> - -/* Collect various system dependent definitions and declarations. */ -#include <sys/dlfcn.h> - - -/* If the first argument of `dlsym' or `dlvsym' is set to RTLD_NEXT - the run-time address of the symbol called NAME in the next shared - object is returned. The "next" relation is defined by the order - the shared objects were loaded. */ -# define RTLD_NEXT ((void *) -1l) - -/* If the first argument to `dlsym' or `dlvsym' is set to RTLD_DEFAULT - the run-time address of the symbol called NAME in the global scope - is returned. */ -# define RTLD_DEFAULT ((void *) 0) - - -__BEGIN_DECLS - -/* Open the shared object FILE and map it in; return a handle that can be - passed to `dlsym' to get symbol values from it. */ -extern void *dlopen (__const char *__file, int __mode) __THROW; - -/* Unmap and close a shared object opened by `dlopen'. - The handle cannot be used again after calling `dlclose'. */ -extern int dlclose (void *__handle) __THROW; - -/* Find the run-time address in the shared object HANDLE refers to - of the symbol called NAME. */ -extern void *dlsym (void *__restrict __handle, - __const char *__restrict __name) __THROW; - -/* Find the run-time address in the shared object HANDLE refers to - of the symbol called NAME with VERSION. */ -extern void *dlvsym (void *__restrict __handle, - __const char *__restrict __name, - __const char *__restrict __version) __THROW; - -/* When any of the above functions fails, call this function - to return a string describing the error. Each call resets - the error string so that a following call returns null. */ -extern char *dlerror (void) __THROW; - - -/* Structure containing information about object searched using - `dladdr'. */ -typedef struct -{ - __const char *dli_fname; /* File name of defining object. */ - void *dli_fbase; /* Load address of that object. */ - __const char *dli_sname; /* Name of nearest symbol. */ - void *dli_saddr; /* Exact value of nearest symbol. */ -} Dl_info; - -/* Fill in *INFO with the following information about ADDRESS. - Returns 0 iff no shared object's segments contain that address. */ -extern int dladdr (__const void *__address, Dl_info *__info) __THROW; - -__END_DECLS - -#endif /* dlfcn.h */ +#ifndef _DLFCN_H +#include <dl/dlfcn.h> + +#define internal_function + +/* Internally used flag. */ +#define __RTLD_DLOPEN 0x80000000 +#define __RTLD_SPROF 0x40000000 + +/* Now define the internal interfaces. */ +extern void *__dlvsym (void *__handle, __const char *__name, + __const char *__version); + +extern void *__libc_dlopen (__const char *__name); +extern void *__libc_dlsym (void *__map, __const char *__name); +extern int __libc_dlclose (void *__map); + +/* Locate shared object containing the given address. */ +extern int _dl_addr (const void *address, Dl_info *info) + internal_function; + +/* Open the shared object NAME, relocate it, and run its initializer if it + hasn't already been run. MODE is as for `dlopen' (see <dlfcn.h>). If + the object is already opened, returns its existing map. */ +extern void *_dl_open (const char *name, int mode, const void *caller) + internal_function; + +/* Close an object previously opened by _dl_open. */ +extern void _dl_close (void *map) + internal_function; + +/* Look up NAME in shared object HANDLE (which may be RTLD_DEFAULT or + RTLD_NEXT). WHO is the calling function, for RTLD_NEXT. Returns + the symbol value, which may be NULL. */ +extern void *_dl_sym (void *handle, const char *name, void *who) + internal_function; + +/* Look up version VERSION of symbol NAME in shared object HANDLE + (which may be RTLD_DEFAULT or RTLD_NEXT). WHO is the calling + function, for RTLD_NEXT. Returns the symbol value, which may be + NULL. */ +extern void *_dl_vsym (void *handle, const char *name, const char *version, + void *who) + internal_function; + +/* Call OPERATE, catching errors from `dl_signal_error'. If there is no + error, *ERRSTRING is set to null. If there is an error, *ERRSTRING is + set to a string constructed from the strings passed to _dl_signal_error, + and the error code passed is the return value and *OBJNAME is set to + the object name which experienced the problems. ERRSTRING if nonzero + points to a malloc'ed string which the caller has to free after use. + ARGS is passed as argument to OPERATE. */ +extern int _dl_catch_error (const char **objname, const char **errstring, + void (*operate) (void *), + void *args) + internal_function; + +/* Helper function for <dlfcn.h> functions. Runs the OPERATE function via + _dl_catch_error. Returns zero for success, nonzero for failure; and + arranges for `dlerror' to return the error details. + ARGS is passed as argument to OPERATE. */ +extern int _dlerror_run (void (*operate) (void *), void *args) + internal_function; + +#endif diff --git a/newlib/libc/sys/linux/include/getopt.h b/newlib/libc/sys/linux/include/getopt.h index 3fdf4645c..994f86001 100644 --- a/newlib/libc/sys/linux/include/getopt.h +++ b/newlib/libc/sys/linux/include/getopt.h @@ -8,11 +8,8 @@ #include <unistd.h> -enum { NO_ARG, REQUIRED_ARG, OPTIONAL_ARG }; -/* Define glibc names as well for compatibility. */ -#define no_argument NO_ARG -#define required_argument REQUIRED_ARG -#define optional_argument OPTIONAL_ARG + +enum { no_argument, required_argument, optional_argument }; struct option { const char *name; diff --git a/newlib/libc/sys/linux/include/ltdl.h b/newlib/libc/sys/linux/include/ltdl.h deleted file mode 100644 index 2bbfa302c..000000000 --- a/newlib/libc/sys/linux/include/ltdl.h +++ /dev/null @@ -1,361 +0,0 @@ -/* ltdl.h -- generic dlopen functions - Copyright (C) 1998-2000 Free Software Foundation, Inc. - Originally by Thomas Tanner <tanner@ffii.org> - This file is part of GNU Libtool. - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 2 of the License, or (at your option) any later version. - -As a special exception to the GNU Lesser General Public License, -if you distribute this file as part of a program or library that -is built using GNU libtool, you may include it under the same -distribution terms that you use for the rest of that program. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free -Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -02111-1307 USA -*/ - -/* Only include this header file once. */ -#ifndef LTDL_H -#define LTDL_H 1 - -#include <sys/types.h> /* for size_t declaration */ - - -/* --- MACROS FOR PORTABILITY --- */ - - -/* Saves on those hard to debug '\0' typos.... */ -#define LT_EOS_CHAR '\0' - -/* LTDL_BEGIN_C_DECLS should be used at the beginning of your declarations, - so that C++ compilers don't mangle their names. Use LTDL_END_C_DECLS at - the end of C declarations. */ -#ifdef __cplusplus -# define LT_BEGIN_C_DECLS extern "C" { -# define LT_END_C_DECLS } -#else -# define LT_BEGIN_C_DECLS /* empty */ -# define LT_END_C_DECLS /* empty */ -#endif - -LT_BEGIN_C_DECLS - - -/* LT_PARAMS is a macro used to wrap function prototypes, so that compilers - that don't understand ANSI C prototypes still work, and ANSI C - compilers can issue warnings about type mismatches. */ -#if defined (__STDC__) || defined (_AIX) || (defined (__mips) && defined (_SYSTYPE_SVR4)) || defined(WIN32) || defined(__cplusplus) -# define LT_PARAMS(protos) protos -# define lt_ptr void* -#else -# define LT_PARAMS(protos) () -# define lt_ptr char* -#endif - -/* LT_STMT_START/END are used to create macros which expand to a - a single compound statement in a portable way. */ -#if defined (__GNUC__) && !defined (__STRICT_ANSI__) && !defined (__cplusplus) -# define LT_STMT_START (void)( -# define LT_STMT_END ) -#else -# if (defined (sun) || defined (__sun__)) -# define LT_STMT_START if (1) -# define LT_STMT_END else (void)0 -# else -# define LT_STMT_START do -# define LT_STMT_END while (0) -# endif -#endif - -/* LT_CONC creates a new concatenated symbol for the compiler - in a portable way. */ -#if defined(__STDC__) || defined(__cplusplus) -# define LT_CONC(s,t) s##t -#else -# define LT_CONC(s,t) s/**/t -#endif - -/* LT_STRLEN can be used safely on NULL pointers. */ -#define LT_STRLEN(s) (((s) && (s)[0]) ? strlen (s) : 0) - - - -/* --- WINDOWS SUPPORT --- */ - - -/* Canonicalise Windows and Cygwin recognition macros. */ -#ifdef __CYGWIN32__ -# ifndef __CYGWIN__ -# define __CYGWIN__ __CYGWIN32__ -# endif -#endif -#if defined(_WIN32) || defined(WIN32) -# ifndef __WINDOWS__ -# ifdef _WIN32 -# define __WINDOWS__ _WIN32 -# else -# ifdef WIN32 -# define __WINDOWS__ WIN32 -# endif -# endif -# endif -#endif - -#ifdef __WINDOWS__ -# ifndef __CYGWIN__ -/* LT_DIRSEP_CHAR is accepted *in addition* to '/' as a directory - separator when it is set. */ -# define LT_DIRSEP_CHAR '\\' -# define LT_PATHSEP_CHAR ';' -# endif -#endif -#ifndef LT_PATHSEP_CHAR -# define LT_PATHSEP_CHAR ':' -#endif - -/* DLL building support on win32 hosts; mostly to workaround their - ridiculous implementation of data symbol exporting. */ -#ifndef LT_SCOPE -# ifdef __WINDOWS__ -# ifdef DLL_EXPORT /* defined by libtool (if required) */ -# define LT_SCOPE __declspec(dllexport) -# endif -# ifdef LIBLTDL_DLL_IMPORT /* define if linking with this dll */ -# define LT_SCOPE extern __declspec(dllimport) -# endif -# endif -# ifndef LT_SCOPE /* static linking or !__WINDOWS__ */ -# define LT_SCOPE extern -# endif -#endif - - - - -/* --- DYNAMIC MODULE LOADING API --- */ - - -typedef struct lt_dlhandle_struct *lt_dlhandle; /* A loaded module. */ - -/* Initialisation and finalisation functions for libltdl. */ -extern int lt_dlinit LT_PARAMS((void)); -extern int lt_dlexit LT_PARAMS((void)); - -/* Module search path manipulation. */ -extern int lt_dladdsearchdir LT_PARAMS((const char *search_dir)); -extern int lt_dlinsertsearchdir LT_PARAMS((const char *before, - const char *search_dir)); -extern int lt_dlsetsearchpath LT_PARAMS((const char *search_path)); -extern const char *lt_dlgetsearchpath LT_PARAMS((void)); -extern int lt_dlforeachfile LT_PARAMS(( - const char *search_path, - int (*func) (const char *filename, lt_ptr data), - lt_ptr data)); - -/* Portable libltdl versions of the system dlopen() API. */ -extern lt_dlhandle lt_dlopen LT_PARAMS((const char *filename)); -extern lt_dlhandle lt_dlopenext LT_PARAMS((const char *filename)); -extern lt_ptr lt_dlsym LT_PARAMS((lt_dlhandle handle, - const char *name)); -extern const char *lt_dlerror LT_PARAMS((void)); -extern int lt_dlclose LT_PARAMS((lt_dlhandle handle)); - -/* Module residency management. */ -extern int lt_dlmakeresident LT_PARAMS((lt_dlhandle handle)); -extern int lt_dlisresident LT_PARAMS((lt_dlhandle handle)); - - - - -/* --- MUTEX LOCKING --- */ - - -typedef void lt_dlmutex_lock LT_PARAMS((void)); -typedef void lt_dlmutex_unlock LT_PARAMS((void)); -typedef void lt_dlmutex_seterror LT_PARAMS((const char *errmsg)); -typedef const char *lt_dlmutex_geterror LT_PARAMS((void)); - -extern int lt_dlmutex_register LT_PARAMS((lt_dlmutex_lock *lock, - lt_dlmutex_unlock *unlock, - lt_dlmutex_seterror *seterror, - lt_dlmutex_geterror *geterror)); - - - - -/* --- MEMORY HANDLING --- */ - - -/* By default, the realloc function pointer is set to our internal - realloc implementation which iself uses lt_dlmalloc and lt_dlfree. - libltdl relies on a featureful realloc, but if you are sure yours - has the right semantics then you can assign it directly. Generally, - it is safe to assign just a malloc() and a free() function. */ -LT_SCOPE lt_ptr (*lt_dlmalloc) LT_PARAMS((size_t size)); -LT_SCOPE lt_ptr (*lt_dlrealloc) LT_PARAMS((lt_ptr ptr, size_t size)); -LT_SCOPE void (*lt_dlfree) LT_PARAMS((lt_ptr ptr)); - - - - -/* --- PRELOADED MODULE SUPPORT --- */ - - -/* A preopened symbol. Arrays of this type comprise the exported - symbols for a dlpreopened module. */ -typedef struct { - const char *name; - lt_ptr address; -} lt_dlsymlist; - -extern int lt_dlpreload LT_PARAMS((const lt_dlsymlist *preloaded)); -extern int lt_dlpreload_default - LT_PARAMS((const lt_dlsymlist *preloaded)); - -#define LTDL_SET_PRELOADED_SYMBOLS() LT_STMT_START{ \ - extern const lt_dlsymlist lt_preloaded_symbols[]; \ - lt_dlpreload_default(lt_preloaded_symbols); \ - }LT_STMT_END - - - - -/* --- MODULE INFORMATION --- */ - - -/* Read only information pertaining to a loaded module. */ -typedef struct { - char *filename; /* file name */ - char *name; /* module name */ - int ref_count; /* number of times lt_dlopened minus - number of times lt_dlclosed. */ -} lt_dlinfo; - -extern const lt_dlinfo *lt_dlgetinfo LT_PARAMS((lt_dlhandle handle)); -extern lt_dlhandle lt_dlhandle_next LT_PARAMS((lt_dlhandle place)); -extern int lt_dlforeach LT_PARAMS(( - int (*func) (lt_dlhandle handle, lt_ptr data), - lt_ptr data)); - -/* Associating user data with loaded modules. */ -typedef unsigned lt_dlcaller_id; - -extern lt_dlcaller_id lt_dlcaller_register LT_PARAMS((void)); -extern lt_ptr lt_dlcaller_set_data LT_PARAMS((lt_dlcaller_id key, - lt_dlhandle handle, - lt_ptr data)); -extern lt_ptr lt_dlcaller_get_data LT_PARAMS((lt_dlcaller_id key, - lt_dlhandle handle)); - - - -/* --- USER MODULE LOADER API --- */ - - -typedef struct lt_dlloader lt_dlloader; -typedef lt_ptr lt_user_data; -typedef lt_ptr lt_module; - -/* Function pointer types for creating user defined module loaders. */ -typedef lt_module lt_module_open LT_PARAMS((lt_user_data loader_data, - const char *filename)); -typedef int lt_module_close LT_PARAMS((lt_user_data loader_data, - lt_module handle)); -typedef lt_ptr lt_find_sym LT_PARAMS((lt_user_data loader_data, - lt_module handle, - const char *symbol)); -typedef int lt_dlloader_exit LT_PARAMS((lt_user_data loader_data)); - -struct lt_user_dlloader { - const char *sym_prefix; - lt_module_open *module_open; - lt_module_close *module_close; - lt_find_sym *find_sym; - lt_dlloader_exit *dlloader_exit; - lt_user_data dlloader_data; -}; - -extern lt_dlloader *lt_dlloader_next LT_PARAMS((lt_dlloader *place)); -extern lt_dlloader *lt_dlloader_find LT_PARAMS(( - const char *loader_name)); -extern const char *lt_dlloader_name LT_PARAMS((lt_dlloader *place)); -extern lt_user_data *lt_dlloader_data LT_PARAMS((lt_dlloader *place)); -extern int lt_dlloader_add LT_PARAMS((lt_dlloader *place, - const struct lt_user_dlloader *dlloader, - const char *loader_name)); -extern int lt_dlloader_remove LT_PARAMS(( - const char *loader_name)); - - - -/* --- ERROR MESSAGE HANDLING --- */ - - -/* Defining error strings alongside their symbolic names in a macro in - this way allows us to expand the macro in different contexts with - confidence that the enumeration of symbolic names will map correctly - onto the table of error strings. */ -#define lt_dlerror_table \ - LT_ERROR(UNKNOWN, "unknown error") \ - LT_ERROR(DLOPEN_NOT_SUPPORTED, "dlopen support not available") \ - LT_ERROR(INVALID_LOADER, "invalid loader") \ - LT_ERROR(INIT_LOADER, "loader initialization failed") \ - LT_ERROR(REMOVE_LOADER, "loader removal failed") \ - LT_ERROR(FILE_NOT_FOUND, "file not found") \ - LT_ERROR(DEPLIB_NOT_FOUND, "dependency library not found") \ - LT_ERROR(NO_SYMBOLS, "no symbols defined") \ - LT_ERROR(CANNOT_OPEN, "can't open the module") \ - LT_ERROR(CANNOT_CLOSE, "can't close the module") \ - LT_ERROR(SYMBOL_NOT_FOUND, "symbol not found") \ - LT_ERROR(NO_MEMORY, "not enough memory") \ - LT_ERROR(INVALID_HANDLE, "invalid module handle") \ - LT_ERROR(BUFFER_OVERFLOW, "internal buffer overflow") \ - LT_ERROR(INVALID_ERRORCODE, "invalid errorcode") \ - LT_ERROR(SHUTDOWN, "library already shutdown") \ - LT_ERROR(CLOSE_RESIDENT_MODULE, "can't close resident module") \ - LT_ERROR(INVALID_MUTEX_ARGS, "invalid mutex handler registration") \ - LT_ERROR(INVALID_POSITION, "invalid search path insert position") - -/* Enumerate the symbolic error names. */ -enum { -#define LT_ERROR(name, diagnostic) LT_CONC(LT_ERROR_, name), - lt_dlerror_table -#undef LT_ERROR - - LT_ERROR_MAX -}; - -/* These functions are only useful from inside custom module loaders. */ -extern int lt_dladderror LT_PARAMS((const char *diagnostic)); -extern int lt_dlseterror LT_PARAMS((int errorcode)); - - - - -/* --- SOURCE COMPATIBILITY WITH OLD LIBLTDL --- */ - - -#ifdef LT_NON_POSIX_NAMESPACE -# define lt_ptr_t lt_ptr -# define lt_module_t lt_module -# define lt_module_open_t lt_module_open -# define lt_module_close_t lt_module_close -# define lt_find_sym_t lt_find_sym -# define lt_dlloader_exit_t lt_dlloader_exit -# define lt_dlloader_t lt_dlloader -# define lt_dlloader_data_t lt_user_data -#endif - -LT_END_C_DECLS - -#endif /* !LTDL_H */ diff --git a/newlib/libc/sys/linux/include/stdint.h b/newlib/libc/sys/linux/include/stdint.h index d1197f66c..5c89acd22 100644 --- a/newlib/libc/sys/linux/include/stdint.h +++ b/newlib/libc/sys/linux/include/stdint.h @@ -1,265 +1,18 @@ -/* - * Copyright (c) 2004, 2005 by - * Ralf Corsepius, Ulm/Germany. All rights reserved. - * - * Permission to use, copy, modify, and distribute this software - * is freely granted, provided that this notice is preserved. - */ - -/* - * @todo - Add fast<N>_t types. - * @todo - Add support for wint_t types. - */ - -#ifndef _STDINT_H -#define _STDINT_H - -#include <sys/types.h> - -#ifdef __cplusplus -extern "C" { -#endif - -#if defined(__GNUC__) && (__GNUC__ >= 3 ) \ - && defined(__GNUC_MINOR__) && (__GNUC_MINOR__ > 2 ) -#define __STDINT_EXP(x) __##x##__ -#else -#define __STDINT_EXP(x) x -#include <limits.h> -#endif - -#if __STDINT_EXP(SCHAR_MAX) == 0x7f -#define __int8_t_defined 1 -#endif - -#if __int8_t_defined -typedef signed char int_least8_t; -typedef unsigned char uint_least8_t; -#define __int_least8_t_defined 1 -#endif - -#if __STDINT_EXP(SHRT_MAX) == 0x7fff -#define __int16_t_defined 1 -#elif __STDINT_EXP(INT_MAX) == 0x7fff -#define __int16_t_defined 1 -#elif __STDINT_EXP(SCHAR_MAX) == 0x7fff -#define __int16_t_defined 1 -#endif - -#if __int16_t_defined -typedef int16_t int_least16_t; -typedef uint16_t uint_least16_t; -#define __int_least16_t_defined 1 - -#ifndef __int_least8_t_defined -typedef int16_t int_least8_t; -typedef uint16_t uint_least8_t; -#define __int_least8_t_defined 1 -#endif -#endif - -#if __STDINT_EXP(INT_MAX) == 0x7fffffffL -#define __int32_t_defined 1 -#elif __STDINT_EXP(LONG_MAX) == 0x7fffffffL -#define __int32_t_defined 1 -#define __have_long32 1 -#elif __STDINT_EXP(SHRT_MAX) == 0x7fffffffL -#define __int32_t_defined 1 -#elif __STDINT_EXP(SCHAR_MAX) == 0x7fffffffL -#define __int32_t_defined 1 -#endif - -#if __int32_t_defined -typedef int32_t int_least32_t; -typedef uint32_t uint_least32_t; -#define __int_least32_t_defined 1 - -#ifndef __int_least8_t_defined -typedef int32_t int_least8_t; -typedef uint32_t uint_least8_t; -#define __int_least8_t_defined 1 -#endif - -#ifndef __int_least16_t_defined -typedef int32_t int_least16_t; -typedef uint32_t uint_least16_t; -#define __int_least16_t_defined 1 -#endif -#endif - -#if __STDINT_EXP(LONG_MAX) > 0x7fffffff -#define __int64_t_defined 1 -#define __have_long64 1 -#elif defined(__LONG_LONG_MAX__) && (__LONG_LONG_MAX__ > 0x7fffffff) -#define __int64_t_defined 1 -#define __have_longlong64 1 -#elif defined(LLONG_MAX) && (LLONG_MAX > 0x7fffffff) -#define __int64_t_defined 1 -#define __have_longlong64 1 -#elif __STDINT_EXP(INT_MAX) > 0x7fffffff -#define __int64_t_defined 1 -#endif - -#if __int64_t_defined -typedef int64_t int_least64_t; -typedef uint64_t uint_least64_t; -#define __int_least64_t_defined 1 - -#ifndef __int_least8_t_defined -typedef int64_t int_least8_t; -typedef uint64_t uint_least8_t; -#define __int_least8_t_defined 1 -#endif - -#ifndef __int_least16_t_defined -typedef int64_t int_least16_t; -typedef uint64_t uint_least16_t; -#define __int_least16_t_defined 1 -#endif +/* libc/sys/linux/include/stdint.h - Standard integer types */ -#ifndef __int_least32_t_defined -typedef int64_t int_least32_t; -typedef uint64_t uint_least32_t; -#define __int_least32_t_defined 1 -#endif -#endif - -/* Greatest-width integer types */ -/* Modern GCCs provide __INTMAX_TYPE__ */ -#if defined(__INTMAX_TYPE__) - typedef __INTMAX_TYPE__ intmax_t; -#elif __have_longlong64 - typedef signed long long intmax_t; -#else - typedef signed long intmax_t; -#endif - -/* Modern GCCs provide __UINTMAX_TYPE__ */ -#if defined(__UINTMAX_TYPE__) - typedef __UINTMAX_TYPE__ uintmax_t; -#elif __have_longlong64 - typedef unsigned long long uintmax_t; -#else - typedef unsigned long uintmax_t; -#endif - -/* Limits of Specified-Width Integer Types */ +/* Written 2000 by Werner Almesberger */ -#if __int8_t_defined -#define INT8_MIN -128 -#define INT8_MAX 127 -#define UINT8_MAX 255 -#endif -#if __int_least8_t_defined -#define INT_LEAST8_MIN -128 -#define INT_LEAST8_MAX 127 -#define UINT_LEAST8_MAX 255 -#else -#error required type int_least8_t missing -#endif - -#if __int16_t_defined -#define INT16_MIN -32768 -#define INT16_MAX 32767 -#define UINT16_MAX 65535 -#endif - -#if __int_least16_t_defined -#define INT_LEAST16_MIN -32768 -#define INT_LEAST16_MAX 32767 -#define UINT_LEAST16_MAX 65535 -#else -#error required type int_least16_t missing -#endif - -#if __int32_t_defined -#define INT32_MIN (-2147483647-1) -#define INT32_MAX 2147483647 -#define UINT32_MAX 4294967295U -#endif - -#if __int_least32_t_defined -#define INT_LEAST32_MIN (-2147483647-1) -#define INT_LEAST32_MAX 2147483647 -#define UINT_LEAST32_MAX 4294967295U -#else -#error required type int_least32_t missing -#endif - -#if __int64_t_defined -#ifdef __have_long64 -#define INT64_MIN (-9223372036854775807L-1L) -#define INT64_MAX 9223372036854775807L -#define UINT64_MAX 18446744073709551615U -#elif defined(__have_longlong64) -#define INT64_MIN (-9223372036854775807LL-1LL) -#define INT64_MAX 9223372036854775807LL -#define UINT64_MAX 18446744073709551615ULL -#endif -#endif +#ifndef _NEWLIB_STDINT_H +#define _NEWLIB_STDINT_H -#if __int_least64_t_defined -#ifdef __have_long64 -#define INT_LEAST64_MIN (-9223372036854775807L-1L) -#define INT_LEAST64_MAX 9223372036854775807L -#define UINT_LEAST64_MAX 18446744073709551615U -#elif defined(__have_longlong64) -#define INT_LEAST64_MIN (-9223372036854775807LL-1LL) -#define INT_LEAST64_MAX 9223372036854775807LL -#define UINT_LEAST64_MAX 18446744073709551615ULL -#endif -#endif - -/* This must match size_t in stddef.h, currently long unsigned int */ -#define SIZE_MIN (-__STDINT_EXP(LONG_MAX) - 1L) -#define SIZE_MAX __STDINT_EXP(LONG_MAX) - -/* This must match sig_atomic_t in <signal.h> (currently int) */ -#define SIG_ATOMIC_MIN (-__STDINT_EXP(INT_MAX) - 1) -#define SIG_ATOMIC_MAX __STDINT_EXP(INT_MAX) - -/* This must match ptrdiff_t in <stddef.h> (currently long int) */ -#define PTRDIFF_MIN (-__STDINT_EXP(LONG_MAX) - 1L) -#define PTRDIFF_MAX __STDINT_EXP(LONG_MAX) - -/** Macros for minimum-width integer constant expressions */ -#define INT8_C(x) x -#define UINT8_C(x) x##U - -#define INT16_C(x) x -#define UINT16_C(x) x##U - -#if __have_long32 -#define INT32_C(x) x##L -#define UINT32_C(x) x##UL -#else -#define INT32_C(x) x -#define UINT32_C(x) x##U -#endif - -#if __int64_t_defined -#if __have_longlong64 -#define INT64_C(x) x##LL -#define UINT64_C(x) x##ULL -#else -#define INT64_C(x) x##L -#define UINT64_C(x) x##UL -#endif -#endif - -/** Macros for greatest-width integer constant expression */ -#if __have_longlong64 -#define INTMAX_C(x) x##LL -#define UINTMAX_C(x) x##ULL -#else -#define INTMAX_C(x) x##L -#define UINTMAX_C(x) x##UL -#endif +/* + * FIXME: linux/types.h defines various types that rightfully belong into + * stdint.h. So we have no choice but to include linux/types.h directly, even + * if this causes name space pollution. Note: we have to go via sys/types.h + * in order to resolve some other compatibility issues. + */ +#include <sys/types.h> -#ifdef __cplusplus -} #endif - -#endif /* _STDINT_H */ diff --git a/newlib/libc/sys/linux/include/unistd.h b/newlib/libc/sys/linux/include/unistd.h index 55ecc3a4e..e2f562a3a 100644 --- a/newlib/libc/sys/linux/include/unistd.h +++ b/newlib/libc/sys/linux/include/unistd.h @@ -15,4 +15,6 @@ extern char *optarg; extern int optind, opterr, optopt; +int readlink(const char *path, char *buf, size_t bufsiz); + #endif diff --git a/newlib/libc/sys/linux/inode.c b/newlib/libc/sys/linux/inode.c index 837dae396..ed468c19b 100644 --- a/newlib/libc/sys/linux/inode.c +++ b/newlib/libc/sys/linux/inode.c @@ -35,7 +35,6 @@ _syscall3(int,getdents,int,fd,struct dirent *,dirp,unsigned int,count) _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) -_syscall3(int,lchown,const char *,path,uid_t,owner,gid_t,group) _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) diff --git a/newlib/libc/sys/linux/linuxthreads/aclocal.m4 b/newlib/libc/sys/linux/linuxthreads/aclocal.m4 index 35519acf9..c0a206827 100644 --- a/newlib/libc/sys/linux/linuxthreads/aclocal.m4 +++ b/newlib/libc/sys/linux/linuxthreads/aclocal.m4 @@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(newlib, 1.14.0) +AM_INIT_AUTOMAKE(newlib, 1.13.0) # FIXME: We temporarily define our own version of AC_PROG_CC. This is # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS. We @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13. */ -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/sys/linux/linuxthreads/bits/libc-lock.h b/newlib/libc/sys/linux/linuxthreads/bits/libc-lock.h index 84f91d569..2c1d16277 100644 --- a/newlib/libc/sys/linux/linuxthreads/bits/libc-lock.h +++ b/newlib/libc/sys/linux/linuxthreads/bits/libc-lock.h @@ -265,6 +265,36 @@ extern int __pthread_atfork (void (*__prepare) (void), /* Make the pthread functions weak so that we can elide them from single-threaded processes. */ #ifndef __NO_WEAK_PTHREAD_ALIASES +# ifdef weak_extern +# if _LIBC +# include <bp-sym.h> +# else +# define BP_SYM (sym) sym +# endif +weak_extern (BP_SYM (__pthread_mutex_init)) +weak_extern (BP_SYM (__pthread_mutex_destroy)) +weak_extern (BP_SYM (__pthread_mutex_lock)) +weak_extern (BP_SYM (__pthread_mutex_trylock)) +weak_extern (BP_SYM (__pthread_mutex_unlock)) +weak_extern (BP_SYM (__pthread_mutexattr_init)) +weak_extern (BP_SYM (__pthread_mutexattr_destroy)) +weak_extern (BP_SYM (__pthread_mutexattr_settype)) +weak_extern (BP_SYM (__pthread_rwlock_init)) +weak_extern (BP_SYM (__pthread_rwlock_destroy)) +weak_extern (BP_SYM (__pthread_rwlock_rdlock)) +weak_extern (BP_SYM (__pthread_rwlock_tryrdlock)) +weak_extern (BP_SYM (__pthread_rwlock_wrlock)) +weak_extern (BP_SYM (__pthread_rwlock_trywrlock)) +weak_extern (BP_SYM (__pthread_rwlock_unlock)) +weak_extern (BP_SYM (__pthread_key_create)) +weak_extern (BP_SYM (__pthread_setspecific)) +weak_extern (BP_SYM (__pthread_getspecific)) +weak_extern (BP_SYM (__pthread_once)) +weak_extern (__pthread_initialize) +weak_extern (__pthread_atfork) +weak_extern (BP_SYM (_pthread_cleanup_push_defer)) +weak_extern (BP_SYM (_pthread_cleanup_pop_restore)) +# else # pragma weak __pthread_mutex_init # pragma weak __pthread_mutex_destroy # pragma weak __pthread_mutex_lock @@ -287,6 +317,7 @@ extern int __pthread_atfork (void (*__prepare) (void), # pragma weak __pthread_atfork # pragma weak _pthread_cleanup_push_defer # pragma weak _pthread_cleanup_pop_restore +# endif #endif /* We need portable names for some functions. E.g., when they are diff --git a/newlib/libc/sys/linux/linuxthreads/config.h b/newlib/libc/sys/linux/linuxthreads/config.h index 05fb5ec96..99b0528a6 100644 --- a/newlib/libc/sys/linux/linuxthreads/config.h +++ b/newlib/libc/sys/linux/linuxthreads/config.h @@ -11,3 +11,4 @@ while (__result == -1L && errno == EINTR); \ __result; })) +#define UINT32_C(c) c ## U diff --git a/newlib/libc/sys/linux/linuxthreads/configure b/newlib/libc/sys/linux/linuxthreads/configure index 65714818c..ded146b65 100755 --- a/newlib/libc/sys/linux/linuxthreads/configure +++ b/newlib/libc/sys/linux/linuxthreads/configure @@ -1009,7 +1009,7 @@ test "$host_alias" != "$target_alias" && PACKAGE=newlib -VERSION=1.14.0 +VERSION=1.13.0 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -1431,11 +1431,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13. */ -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1439: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1436: 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" @@ -1469,7 +1466,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1473: checking for executable suffix" >&5 +echo "configure:1470: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1479,7 +1476,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -1655,7 +1652,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:1659: checking for $ac_word" >&5 +echo "configure:1656: 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 @@ -1685,7 +1682,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:1689: checking for $ac_word" >&5 +echo "configure:1686: 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 @@ -1736,7 +1733,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:1740: checking for $ac_word" >&5 +echo "configure:1737: 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 @@ -1768,7 +1765,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1772: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1769: 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. @@ -1779,12 +1776,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1783 "configure" +#line 1780 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1785: \"$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 @@ -1810,12 +1807,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:1814: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1811: 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:1819: checking whether we are using GNU C" >&5 +echo "configure:1816: 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 @@ -1824,7 +1821,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1828: \"$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:1825: \"$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 @@ -1843,7 +1840,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:1847: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1844: 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 @@ -1886,7 +1883,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:1890: checking for ld used by GCC" >&5 +echo "configure:1887: checking for ld used by GCC" >&5 case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -1916,10 +1913,10 @@ echo "configure:1890: 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:1920: checking for GNU ld" >&5 +echo "configure:1917: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1923: checking for non-GNU ld" >&5 +echo "configure:1920: 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 @@ -1954,7 +1951,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:1958: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:1955: 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 @@ -1971,7 +1968,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:1975: checking for $LD option to reload object files" >&5 +echo "configure:1972: 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 @@ -1983,7 +1980,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:1987: checking for BSD-compatible nm" >&5 +echo "configure:1984: 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 @@ -2021,7 +2018,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:2025: checking whether ln -s works" >&5 +echo "configure:2022: 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 @@ -2042,7 +2039,7 @@ else fi echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6 -echo "configure:2046: checking how to recognise dependant libraries" >&5 +echo "configure:2043: 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 @@ -2215,13 +2212,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:2219: checking for object suffix" >&5 +echo "configure:2216: 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:2225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2222: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -2245,7 +2242,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:2249: checking for ${ac_tool_prefix}file" >&5 +echo "configure:2246: 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 @@ -2307,7 +2304,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:2311: checking for file" >&5 +echo "configure:2308: 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 @@ -2378,7 +2375,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:2382: checking for $ac_word" >&5 +echo "configure:2379: 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 @@ -2410,7 +2407,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:2414: checking for $ac_word" >&5 +echo "configure:2411: 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 @@ -2445,7 +2442,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:2449: checking for $ac_word" >&5 +echo "configure:2446: 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,7 +2474,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:2481: checking for $ac_word" >&5 +echo "configure:2478: 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 @@ -2544,8 +2541,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 2548 "configure"' > conftest.$ac_ext - if { (eval echo configure:2549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 2545 "configure"' > conftest.$ac_ext + if { (eval echo configure:2546: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" @@ -2564,7 +2561,7 @@ case $host in ia64-*-hpux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo configure:2568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:2565: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *ELF-32*) HPUX_IA64_MODE="32" @@ -2582,7 +2579,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:2586: checking whether the C compiler needs -belf" >&5 +echo "configure:2583: 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 @@ -2595,14 +2592,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 2599 "configure" +#line 2596 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2603: \"$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 @@ -2632,7 +2629,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:2636: checking for $ac_word" >&5 +echo "configure:2633: 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 @@ -2664,7 +2661,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:2668: checking for $ac_word" >&5 +echo "configure:2665: 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 @@ -2699,7 +2696,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:2703: checking for $ac_word" >&5 +echo "configure:2700: 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 @@ -2731,7 +2728,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:2735: checking for $ac_word" >&5 +echo "configure:2732: 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 @@ -2766,7 +2763,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:2770: checking for $ac_word" >&5 +echo "configure:2767: 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 @@ -2798,7 +2795,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:2802: checking for $ac_word" >&5 +echo "configure:2799: 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 @@ -2834,12 +2831,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:2838: checking if libtool should supply DllMain function" >&5 +echo "configure:2835: 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 2843 "configure" +#line 2840 "configure" #include "confdefs.h" int main() { @@ -2847,7 +2844,7 @@ extern int __attribute__((__stdcall__)) DllMain(void*, int, void*); DllMain (0, 0, 0); ; return 0; } EOF -if { (eval echo configure:2851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_need_dllmain=no else @@ -2868,19 +2865,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:2872: checking how to link DLLs" >&5 +echo "configure:2869: 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 2877 "configure" +#line 2874 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2881: \"$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 @@ -2994,7 +2991,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:2998: checking for $ac_word" >&5 +echo "configure:2995: 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 diff --git a/newlib/libc/sys/linux/linuxthreads/machine/aclocal.m4 b/newlib/libc/sys/linux/linuxthreads/machine/aclocal.m4 index 35519acf9..c0a206827 100644 --- a/newlib/libc/sys/linux/linuxthreads/machine/aclocal.m4 +++ b/newlib/libc/sys/linux/linuxthreads/machine/aclocal.m4 @@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(newlib, 1.14.0) +AM_INIT_AUTOMAKE(newlib, 1.13.0) # FIXME: We temporarily define our own version of AC_PROG_CC. This is # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS. We @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13. */ -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/sys/linux/linuxthreads/machine/configure b/newlib/libc/sys/linux/linuxthreads/machine/configure index 32cb952b1..0076e3cf3 100755 --- a/newlib/libc/sys/linux/linuxthreads/machine/configure +++ b/newlib/libc/sys/linux/linuxthreads/machine/configure @@ -1009,7 +1009,7 @@ test "$host_alias" != "$target_alias" && PACKAGE=newlib -VERSION=1.14.0 +VERSION=1.13.0 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -1431,11 +1431,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13. */ -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1439: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1436: 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" @@ -1469,7 +1466,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1473: checking for executable suffix" >&5 +echo "configure:1470: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1479,7 +1476,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -1654,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:1658: 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 @@ -1684,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:1688: 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 @@ -1735,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:1739: 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 @@ -1767,7 +1764,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1771: 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. @@ -1778,12 +1775,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1782 "configure" +#line 1779 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1787: \"$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 @@ -1809,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:1813: 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:1818: 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 @@ -1823,7 +1820,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1827: \"$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 @@ -1842,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:1846: 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 @@ -1885,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:1889: 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 @@ -1915,10 +1912,10 @@ echo "configure:1889: 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:1919: 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:1922: 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 @@ -1953,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:1957: 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 @@ -1970,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:1974: 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 @@ -1982,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:1986: 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 @@ -2020,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:2024: 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 @@ -2041,7 +2038,7 @@ else fi echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6 -echo "configure:2045: 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 @@ -2214,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:2218: 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:2224: \"$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) ;; @@ -2244,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:2248: 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 @@ -2306,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:2310: 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 @@ -2377,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:2381: 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 @@ -2409,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:2413: 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 @@ -2444,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:2448: 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 @@ -2476,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:2480: 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 @@ -2543,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 2547 "configure"' > conftest.$ac_ext - if { (eval echo configure:2548: \"$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" @@ -2563,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:2567: \"$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" @@ -2581,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:2585: 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 @@ -2594,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 2598 "configure" +#line 2595 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2605: \"$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 @@ -2631,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:2635: 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 @@ -2663,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:2667: 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 @@ -2698,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:2702: 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 @@ -2730,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:2734: 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 @@ -2765,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:2769: 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 @@ -2797,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:2801: 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 @@ -2833,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:2837: 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 2842 "configure" +#line 2839 "configure" #include "confdefs.h" int main() { @@ -2846,7 +2843,7 @@ extern int __attribute__((__stdcall__)) DllMain(void*, int, void*); DllMain (0, 0, 0); ; return 0; } EOF -if { (eval echo configure:2850: \"$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 @@ -2867,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:2871: 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 2876 "configure" +#line 2873 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2883: \"$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 diff --git a/newlib/libc/sys/linux/linuxthreads/machine/i386/aclocal.m4 b/newlib/libc/sys/linux/linuxthreads/machine/i386/aclocal.m4 index 35519acf9..c0a206827 100644 --- a/newlib/libc/sys/linux/linuxthreads/machine/i386/aclocal.m4 +++ b/newlib/libc/sys/linux/linuxthreads/machine/i386/aclocal.m4 @@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(newlib, 1.14.0) +AM_INIT_AUTOMAKE(newlib, 1.13.0) # FIXME: We temporarily define our own version of AC_PROG_CC. This is # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS. We @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13. */ -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/sys/linux/linuxthreads/machine/i386/configure b/newlib/libc/sys/linux/linuxthreads/machine/i386/configure index dfd1c9e65..4a9c4be10 100755 --- a/newlib/libc/sys/linux/linuxthreads/machine/i386/configure +++ b/newlib/libc/sys/linux/linuxthreads/machine/i386/configure @@ -1009,7 +1009,7 @@ test "$host_alias" != "$target_alias" && PACKAGE=newlib -VERSION=1.14.0 +VERSION=1.13.0 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -1431,11 +1431,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13. */ -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1439: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1436: 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" @@ -1469,7 +1466,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1473: checking for executable suffix" >&5 +echo "configure:1470: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1479,7 +1476,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -1655,7 +1652,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:1659: checking for $ac_word" >&5 +echo "configure:1656: 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 @@ -1685,7 +1682,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:1689: checking for $ac_word" >&5 +echo "configure:1686: 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 @@ -1736,7 +1733,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:1740: checking for $ac_word" >&5 +echo "configure:1737: 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 @@ -1768,7 +1765,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1772: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1769: 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. @@ -1779,12 +1776,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1783 "configure" +#line 1780 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1785: \"$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 @@ -1810,12 +1807,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:1814: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1811: 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:1819: checking whether we are using GNU C" >&5 +echo "configure:1816: 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 @@ -1824,7 +1821,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1828: \"$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:1825: \"$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 @@ -1843,7 +1840,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:1847: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1844: 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 @@ -1886,7 +1883,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:1890: checking for ld used by GCC" >&5 +echo "configure:1887: checking for ld used by GCC" >&5 case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -1916,10 +1913,10 @@ echo "configure:1890: 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:1920: checking for GNU ld" >&5 +echo "configure:1917: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1923: checking for non-GNU ld" >&5 +echo "configure:1920: 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 @@ -1954,7 +1951,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:1958: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:1955: 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 @@ -1971,7 +1968,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:1975: checking for $LD option to reload object files" >&5 +echo "configure:1972: 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 @@ -1983,7 +1980,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:1987: checking for BSD-compatible nm" >&5 +echo "configure:1984: 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 @@ -2021,7 +2018,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:2025: checking whether ln -s works" >&5 +echo "configure:2022: 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 @@ -2042,7 +2039,7 @@ else fi echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6 -echo "configure:2046: checking how to recognise dependant libraries" >&5 +echo "configure:2043: 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 @@ -2215,13 +2212,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:2219: checking for object suffix" >&5 +echo "configure:2216: 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:2225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2222: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -2245,7 +2242,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:2249: checking for ${ac_tool_prefix}file" >&5 +echo "configure:2246: 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 @@ -2307,7 +2304,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:2311: checking for file" >&5 +echo "configure:2308: 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 @@ -2378,7 +2375,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:2382: checking for $ac_word" >&5 +echo "configure:2379: 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 @@ -2410,7 +2407,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:2414: checking for $ac_word" >&5 +echo "configure:2411: 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 @@ -2445,7 +2442,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:2449: checking for $ac_word" >&5 +echo "configure:2446: 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,7 +2474,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:2481: checking for $ac_word" >&5 +echo "configure:2478: 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 @@ -2544,8 +2541,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 2548 "configure"' > conftest.$ac_ext - if { (eval echo configure:2549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 2545 "configure"' > conftest.$ac_ext + if { (eval echo configure:2546: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" @@ -2564,7 +2561,7 @@ case $host in ia64-*-hpux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo configure:2568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:2565: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *ELF-32*) HPUX_IA64_MODE="32" @@ -2582,7 +2579,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:2586: checking whether the C compiler needs -belf" >&5 +echo "configure:2583: 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 @@ -2595,14 +2592,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 2599 "configure" +#line 2596 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2603: \"$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 @@ -2632,7 +2629,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:2636: checking for $ac_word" >&5 +echo "configure:2633: 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 @@ -2664,7 +2661,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:2668: checking for $ac_word" >&5 +echo "configure:2665: 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 @@ -2699,7 +2696,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:2703: checking for $ac_word" >&5 +echo "configure:2700: 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 @@ -2731,7 +2728,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:2735: checking for $ac_word" >&5 +echo "configure:2732: 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 @@ -2766,7 +2763,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:2770: checking for $ac_word" >&5 +echo "configure:2767: 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 @@ -2798,7 +2795,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:2802: checking for $ac_word" >&5 +echo "configure:2799: 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 @@ -2834,12 +2831,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:2838: checking if libtool should supply DllMain function" >&5 +echo "configure:2835: 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 2843 "configure" +#line 2840 "configure" #include "confdefs.h" int main() { @@ -2847,7 +2844,7 @@ extern int __attribute__((__stdcall__)) DllMain(void*, int, void*); DllMain (0, 0, 0); ; return 0; } EOF -if { (eval echo configure:2851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_need_dllmain=no else @@ -2868,19 +2865,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:2872: checking how to link DLLs" >&5 +echo "configure:2869: 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 2877 "configure" +#line 2874 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2881: \"$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 @@ -2994,7 +2991,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:2998: checking for $ac_word" >&5 +echo "configure:2995: 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 diff --git a/newlib/libc/sys/linux/machine/aclocal.m4 b/newlib/libc/sys/linux/machine/aclocal.m4 index 35519acf9..c0a206827 100644 --- a/newlib/libc/sys/linux/machine/aclocal.m4 +++ b/newlib/libc/sys/linux/machine/aclocal.m4 @@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(newlib, 1.14.0) +AM_INIT_AUTOMAKE(newlib, 1.13.0) # FIXME: We temporarily define our own version of AC_PROG_CC. This is # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS. We @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13. */ -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/sys/linux/machine/configure b/newlib/libc/sys/linux/machine/configure index 3c3167990..fe2d0bdb9 100755 --- a/newlib/libc/sys/linux/machine/configure +++ b/newlib/libc/sys/linux/machine/configure @@ -1009,7 +1009,7 @@ test "$host_alias" != "$target_alias" && PACKAGE=newlib -VERSION=1.14.0 +VERSION=1.13.0 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -1431,11 +1431,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13. */ -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1439: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1436: 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" @@ -1469,7 +1466,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1473: checking for executable suffix" >&5 +echo "configure:1470: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1479,7 +1476,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -1654,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:1658: 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 @@ -1684,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:1688: 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 @@ -1735,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:1739: 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 @@ -1767,7 +1764,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1771: 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. @@ -1778,12 +1775,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1782 "configure" +#line 1779 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1787: \"$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 @@ -1809,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:1813: 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:1818: 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 @@ -1823,7 +1820,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1827: \"$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 @@ -1842,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:1846: 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 @@ -1885,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:1889: 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 @@ -1915,10 +1912,10 @@ echo "configure:1889: 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:1919: 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:1922: 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 @@ -1953,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:1957: 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 @@ -1970,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:1974: 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 @@ -1982,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:1986: 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 @@ -2020,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:2024: 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 @@ -2041,7 +2038,7 @@ else fi echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6 -echo "configure:2045: 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 @@ -2214,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:2218: 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:2224: \"$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) ;; @@ -2244,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:2248: 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 @@ -2306,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:2310: 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 @@ -2377,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:2381: 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 @@ -2409,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:2413: 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 @@ -2444,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:2448: 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 @@ -2476,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:2480: 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 @@ -2543,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 2547 "configure"' > conftest.$ac_ext - if { (eval echo configure:2548: \"$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" @@ -2563,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:2567: \"$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" @@ -2581,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:2585: 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 @@ -2594,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 2598 "configure" +#line 2595 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2605: \"$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 @@ -2631,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:2635: 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 @@ -2663,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:2667: 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 @@ -2698,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:2702: 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 @@ -2730,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:2734: 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 @@ -2765,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:2769: 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 @@ -2797,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:2801: 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 @@ -2833,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:2837: 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 2842 "configure" +#line 2839 "configure" #include "confdefs.h" int main() { @@ -2846,7 +2843,7 @@ extern int __attribute__((__stdcall__)) DllMain(void*, int, void*); DllMain (0, 0, 0); ; return 0; } EOF -if { (eval echo configure:2850: \"$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 @@ -2867,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:2871: 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 2876 "configure" +#line 2873 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2883: \"$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 diff --git a/newlib/libc/sys/linux/machine/i386/aclocal.m4 b/newlib/libc/sys/linux/machine/i386/aclocal.m4 index 35519acf9..c0a206827 100644 --- a/newlib/libc/sys/linux/machine/i386/aclocal.m4 +++ b/newlib/libc/sys/linux/machine/i386/aclocal.m4 @@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(newlib, 1.14.0) +AM_INIT_AUTOMAKE(newlib, 1.13.0) # FIXME: We temporarily define our own version of AC_PROG_CC. This is # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS. We @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13. */ -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/sys/linux/machine/i386/configure b/newlib/libc/sys/linux/machine/i386/configure index f957f6692..bad36c30f 100755 --- a/newlib/libc/sys/linux/machine/i386/configure +++ b/newlib/libc/sys/linux/machine/i386/configure @@ -1009,7 +1009,7 @@ test "$host_alias" != "$target_alias" && PACKAGE=newlib -VERSION=1.14.0 +VERSION=1.13.0 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -1431,11 +1431,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13. */ -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1439: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1436: 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" @@ -1469,7 +1466,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1473: checking for executable suffix" >&5 +echo "configure:1470: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1479,7 +1476,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; @@ -1655,7 +1652,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:1659: checking for $ac_word" >&5 +echo "configure:1656: 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 @@ -1685,7 +1682,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:1689: checking for $ac_word" >&5 +echo "configure:1686: 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 @@ -1736,7 +1733,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:1740: checking for $ac_word" >&5 +echo "configure:1737: 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 @@ -1768,7 +1765,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1772: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1769: 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. @@ -1779,12 +1776,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1783 "configure" +#line 1780 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1785: \"$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 @@ -1810,12 +1807,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:1814: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1811: 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:1819: checking whether we are using GNU C" >&5 +echo "configure:1816: 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 @@ -1824,7 +1821,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1828: \"$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:1825: \"$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 @@ -1843,7 +1840,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:1847: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1844: 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 @@ -1886,7 +1883,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:1890: checking for ld used by GCC" >&5 +echo "configure:1887: checking for ld used by GCC" >&5 case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -1916,10 +1913,10 @@ echo "configure:1890: 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:1920: checking for GNU ld" >&5 +echo "configure:1917: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1923: checking for non-GNU ld" >&5 +echo "configure:1920: 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 @@ -1954,7 +1951,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:1958: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:1955: 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 @@ -1971,7 +1968,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:1975: checking for $LD option to reload object files" >&5 +echo "configure:1972: 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 @@ -1983,7 +1980,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:1987: checking for BSD-compatible nm" >&5 +echo "configure:1984: 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 @@ -2021,7 +2018,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:2025: checking whether ln -s works" >&5 +echo "configure:2022: 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 @@ -2042,7 +2039,7 @@ else fi echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6 -echo "configure:2046: checking how to recognise dependant libraries" >&5 +echo "configure:2043: 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 @@ -2215,13 +2212,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:2219: checking for object suffix" >&5 +echo "configure:2216: 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:2225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2222: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -2245,7 +2242,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:2249: checking for ${ac_tool_prefix}file" >&5 +echo "configure:2246: 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 @@ -2307,7 +2304,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:2311: checking for file" >&5 +echo "configure:2308: 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 @@ -2378,7 +2375,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:2382: checking for $ac_word" >&5 +echo "configure:2379: 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 @@ -2410,7 +2407,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:2414: checking for $ac_word" >&5 +echo "configure:2411: 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 @@ -2445,7 +2442,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:2449: checking for $ac_word" >&5 +echo "configure:2446: 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,7 +2474,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:2481: checking for $ac_word" >&5 +echo "configure:2478: 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 @@ -2544,8 +2541,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 2548 "configure"' > conftest.$ac_ext - if { (eval echo configure:2549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 2545 "configure"' > conftest.$ac_ext + if { (eval echo configure:2546: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" @@ -2564,7 +2561,7 @@ case $host in ia64-*-hpux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo configure:2568: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:2565: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *ELF-32*) HPUX_IA64_MODE="32" @@ -2582,7 +2579,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:2586: checking whether the C compiler needs -belf" >&5 +echo "configure:2583: 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 @@ -2595,14 +2592,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 2599 "configure" +#line 2596 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2603: \"$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 @@ -2632,7 +2629,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:2636: checking for $ac_word" >&5 +echo "configure:2633: 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 @@ -2664,7 +2661,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:2668: checking for $ac_word" >&5 +echo "configure:2665: 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 @@ -2699,7 +2696,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:2703: checking for $ac_word" >&5 +echo "configure:2700: 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 @@ -2731,7 +2728,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:2735: checking for $ac_word" >&5 +echo "configure:2732: 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 @@ -2766,7 +2763,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:2770: checking for $ac_word" >&5 +echo "configure:2767: 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 @@ -2798,7 +2795,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:2802: checking for $ac_word" >&5 +echo "configure:2799: 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 @@ -2834,12 +2831,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:2838: checking if libtool should supply DllMain function" >&5 +echo "configure:2835: 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 2843 "configure" +#line 2840 "configure" #include "confdefs.h" int main() { @@ -2847,7 +2844,7 @@ extern int __attribute__((__stdcall__)) DllMain(void*, int, void*); DllMain (0, 0, 0); ; return 0; } EOF -if { (eval echo configure:2851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_need_dllmain=no else @@ -2868,19 +2865,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:2872: checking how to link DLLs" >&5 +echo "configure:2869: 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 2877 "configure" +#line 2874 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2881: \"$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 @@ -2994,7 +2991,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:2998: checking for $ac_word" >&5 +echo "configure:2995: 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 diff --git a/newlib/libc/sys/linux/machine/i386/dl-machine.h b/newlib/libc/sys/linux/machine/i386/dl-machine.h index 80757e89a..032713e5b 100644 --- a/newlib/libc/sys/linux/machine/i386/dl-machine.h +++ b/newlib/libc/sys/linux/machine/i386/dl-machine.h @@ -292,20 +292,6 @@ elf_machine_plt_value (struct link_map *map, const Elf32_Rel *reloc, return value; } -static inline void __attribute__ ((unused)) -elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc, - const Elf32_Sym *sym, const struct r_found_version *version, - Elf32_Addr *const reloc_addr, - struct r_scope_elem *scope[]); - -static inline void __attribute__ ((unused)) -elf_machine_rel_relative (Elf32_Addr l_addr, const Elf32_Rel *reloc, - Elf32_Addr *const reloc_addr); - -static inline void -elf_machine_lazy_rel (struct link_map *map, - Elf32_Addr l_addr, const Elf32_Rel *reloc); - #endif /* !dl_machine_h */ #ifdef RESOLVE @@ -313,11 +299,10 @@ elf_machine_lazy_rel (struct link_map *map, /* Perform the relocation specified by RELOC and SYM (which is fully resolved). MAP is the object containing the reloc. */ -static inline void __attribute__ ((unused)) +static inline void elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc, const Elf32_Sym *sym, const struct r_found_version *version, - Elf32_Addr *const reloc_addr, - struct r_scope_elem *scope[]) + Elf32_Addr *const reloc_addr) { const unsigned int r_type = ELF32_R_TYPE (reloc->r_info); @@ -331,7 +316,7 @@ elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc, (i.e. #ifdef RTLD_BOOTSTRAP) because rtld.c contains the common defn for _dl_rtld_map, which is incompatible with a weak decl in the same file. */ - #pragma weak _dl_rtld_map + weak_extern (_dl_rtld_map); if (map != &_dl_rtld_map) /* Already done in rtld itself. */ # endif *reloc_addr += map->l_addr; @@ -346,9 +331,7 @@ elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc, #ifndef RTLD_BOOTSTRAP const Elf32_Sym *const refsym = sym; #endif - /* String table object symbols. */ - const char *strtab = (const void *) D_PTR (map, l_info[DT_STRTAB]); - Elf32_Addr value = RESOLVE (&sym, version, r_type, scope); + Elf32_Addr value = RESOLVE (&sym, version, r_type); if (sym) value += sym->st_value; @@ -396,7 +379,7 @@ elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc, } } -static inline void __attribute__ ((unused)) +static inline void elf_machine_rel_relative (Elf32_Addr l_addr, const Elf32_Rel *reloc, Elf32_Addr *const reloc_addr) { diff --git a/newlib/libc/sys/linux/machine/i386/weakalias.h b/newlib/libc/sys/linux/machine/i386/weakalias.h index 2813bfe26..7b0b18a48 100644 --- a/newlib/libc/sys/linux/machine/i386/weakalias.h +++ b/newlib/libc/sys/linux/machine/i386/weakalias.h @@ -1,10 +1,8 @@ #define weak_alias(name, aliasname) \ extern __typeof (name) aliasname __attribute__ ((weak, alias (#name))); -#if 0 #define weak_extern(symbol) _weak_extern (symbol) #define _weak_extern(symbol) asm (".weak " #symbol); -#endif #define weak_function __attribute__ ((weak)) diff --git a/newlib/libc/sys/linux/net/gethostbydns.c b/newlib/libc/sys/linux/net/gethostbydns.c index 9c80539f2..9db8bf4ad 100644 --- a/newlib/libc/sys/linux/net/gethostbydns.c +++ b/newlib/libc/sys/linux/net/gethostbydns.c @@ -94,7 +94,7 @@ u_int32_t _getlong(const u_char *src); u_int16_t _getshort(const u_char *src); #ifdef DEBUG -static void dbgprintf(char *, int); +static void dprintf(char *, int); #endif #if PACKETSZ > 1024 @@ -118,7 +118,7 @@ int _dns_ttl_; #ifdef DEBUG static void -dbgprintf(msg, num) +dprintf(msg, num) char *msg; int num; { @@ -130,7 +130,7 @@ dbgprintf(msg, num) } } #else -# define dbgprintf(msg, num) /*nada*/ +# define dprintf(msg, num) /*nada*/ #endif #define BOUNDED_INCR(x) \ @@ -397,13 +397,13 @@ gethostanswer(answer, anslen, qname, qtype, host, hostbuf, hostbuflen, herr) bp += sizeof(align) - ((u_long)bp % sizeof(align)); if (bp + n >= &hostbuf[hostbuflen]) { - dbgprintf("size (%d) too big\n", n); + dprintf("size (%d) too big\n", n); had_error++; continue; } if (hap >= &host->__host_addrs[MAXADDRS-1]) { if (!toobig++) - dbgprintf("Too many addresses (%d)\n", + dprintf("Too many addresses (%d)\n", MAXADDRS); cp += n; continue; @@ -418,7 +418,7 @@ gethostanswer(answer, anslen, qname, qtype, host, hostbuf, hostbuflen, herr) } break; default: - dbgprintf("Impossible condition (type=%d)\n", type); + dprintf("Impossible condition (type=%d)\n", type); *herr = NO_RECOVERY; return (NULL); /* BIND has abort() here, too risky on bad data */ @@ -606,7 +606,7 @@ _dns_gethostbyname(void *rval, void *cb_data, va_list ap) } if ((n = res_search(name, C_IN, type, buf.buf, sizeof(buf))) < 0) { - dbgprintf("res_search failed (%d)\n", n); + dprintf("res_search failed (%d)\n", n); return NS_UNAVAIL; } *(struct hostent **)rval = gethostanswer(&buf, n, name, type, resultbuf, hostbuf, buflen, herr); @@ -697,11 +697,11 @@ _dns_gethostbyaddr(void *rval, void *cb_data, va_list ap) } n = res_query(qbuf, C_IN, T_PTR, (u_char *)buf.buf, sizeof buf.buf); if (n < 0) { - dbgprintf("res_query failed (%d)\n", n); + dprintf("res_query failed (%d)\n", n); return NS_UNAVAIL; } if (n > sizeof buf.buf) { - dbgprintf("static buffer is too small (%d)\n", n); + dprintf("static buffer is too small (%d)\n", n); return NS_UNAVAIL; } if (!(hp = gethostanswer(&buf, n, qbuf, T_PTR, resultbuf, hostbuf, buflen, herr))) diff --git a/newlib/libc/sys/linux/net/ns_ntoa.c b/newlib/libc/sys/linux/net/ns_ntoa.c index b6a6c4c22..018076064 100644 --- a/newlib/libc/sys/linux/net/ns_ntoa.c +++ b/newlib/libc/sys/linux/net/ns_ntoa.c @@ -43,8 +43,6 @@ static char sccsid[] = "@(#)ns_ntoa.c 8.1 (Berkeley) 6/4/93"; #include <netns/ns.h> #include <stdio.h> -static char *spectHex(char *p0); - char * ns_ntoa(addr) struct ns_addr addr; @@ -56,6 +54,7 @@ ns_ntoa(addr) char *cp2; u_char *up = addr.x_host.c_host; u_char *uplim = up + 6; + static char *spectHex(); net.net_e = addr.x_net; sprintf(obuf, "%lx", (u_long)ntohl(net.long_e)); diff --git a/newlib/libc/sys/linux/shared.ld b/newlib/libc/sys/linux/shared.ld index 33bf4f8fe..0e696572b 100644 --- a/newlib/libc/sys/linux/shared.ld +++ b/newlib/libc/sys/linux/shared.ld @@ -13,7 +13,3 @@ VERS_1.12 { VERS_1.13 { global: *; }; - -VERS_1.14 { - global: *; -}; diff --git a/newlib/libc/sys/linux/sys/cdefs.h b/newlib/libc/sys/linux/sys/cdefs.h index f6ea0c73e..459785bcb 100644 --- a/newlib/libc/sys/linux/sys/cdefs.h +++ b/newlib/libc/sys/linux/sys/cdefs.h @@ -227,12 +227,4 @@ # endif #endif -/* The nonull function attribute allows to mark pointer parameters which - must not be NULL. */ -#if __GNUC_PREREQ (3,3) -# define __nonnull(params) __attribute__ ((__nonnull__ params)) -#else -# define __nonnull(params) -#endif - #endif /* sys/cdefs.h */ diff --git a/newlib/libc/sys/linux/sys/dirent.h b/newlib/libc/sys/linux/sys/dirent.h index 4bbae4229..083158eb3 100644 --- a/newlib/libc/sys/linux/sys/dirent.h +++ b/newlib/libc/sys/linux/sys/dirent.h @@ -41,7 +41,6 @@ int closedir(DIR *); /* internal prototype */ void _seekdir(DIR *dir,off_t offset); -DIR *_opendir(const char *); #ifndef _POSIX_SOURCE long telldir (DIR *); diff --git a/newlib/libc/sys/linux/sys/lock.h b/newlib/libc/sys/linux/sys/lock.h index d934031e2..167392e10 100644 --- a/newlib/libc/sys/linux/sys/lock.h +++ b/newlib/libc/sys/linux/sys/lock.h @@ -1,6 +1,7 @@ #ifndef __SYS_LOCK_H__ #define __SYS_LOCK_H__ +#include <machine/weakalias.h> #include <features.h> #define _LIBC 1 diff --git a/newlib/libc/sys/linux/sys/stat.h b/newlib/libc/sys/linux/sys/stat.h index 99da598ba..b7a7f53e6 100644 --- a/newlib/libc/sys/linux/sys/stat.h +++ b/newlib/libc/sys/linux/sys/stat.h @@ -24,10 +24,10 @@ int _EXFUN(stat,( const char *__path, struct stat *__sbuf )); mode_t _EXFUN(umask,( mode_t __mask )); #ifndef _POSIX_SOURCE -int _EXFUN(fstat64,( int __fd, struct stat64 *__sbuf )); -int _EXFUN(lstat,( const char *file_name, struct stat64 *buf)); -int _EXFUN(lstat64,( const char *file_name, struct stat64 *buf)); -int _EXFUN(stat64,( const char *__path, struct stat64 *__sbuf )); +int _EXFUN(fstat64,( int __fd, struct stat *__sbuf )); +int _EXFUN(lstat,( const char *file_name, struct stat *buf)); +int _EXFUN(lstat64,( const char *file_name, struct stat *buf)); +int _EXFUN(stat64,( const char *__path, struct stat *__sbuf )); #endif /* _POSIX_SOURCE */ #endif /* _SYS_STAT_H */ diff --git a/newlib/libc/sys/linux/sys/types.h b/newlib/libc/sys/linux/sys/types.h index ba191f072..47f49087a 100644 --- a/newlib/libc/sys/linux/sys/types.h +++ b/newlib/libc/sys/linux/sys/types.h @@ -50,8 +50,8 @@ * libc/include/sys/types.h. Repeat those here and * skip the kernel's definitions. */ -#include <sys/config.h> #include <features.h> +#include <sys/config.h> #include <machine/types.h> #include <sys/_types.h> @@ -166,7 +166,6 @@ typedef __uint8_t u_int8_t; typedef __uint16_t u_int16_t; typedef __uint32_t u_int32_t; typedef __uint64_t u_int64_t; -typedef __int8_t int8_t; typedef __int16_t int16_t; typedef __int32_t int32_t; typedef __int64_t int64_t; diff --git a/newlib/libc/sys/linux/sys/unistd.h b/newlib/libc/sys/linux/sys/unistd.h index 502fb473a..e720d6b72 100644 --- a/newlib/libc/sys/linux/sys/unistd.h +++ b/newlib/libc/sys/linux/sys/unistd.h @@ -72,7 +72,6 @@ int _EXFUN(pipe, (int __fildes[2] )); ssize_t _EXFUN(pread, (int __fd, void *__buf, size_t __nbytes, off_t __offset)); ssize_t _EXFUN(pwrite, (int __fd, const void *__buf, size_t __nbytes, off_t __offset)); _READ_WRITE_RETURN_TYPE _EXFUN(read, (int __fd, void *__buf, size_t __nbyte )); -int _EXFUN(readlink, (const char *path, char *buf, size_t bufsiz)); int _EXFUN(rmdir, (const char *__path )); void * _EXFUN(sbrk, (ptrdiff_t __incr)); int _EXFUN(setegid, (gid_t __gid )); @@ -84,7 +83,6 @@ pid_t _EXFUN(setsid, (void )); int _EXFUN(setuid, (uid_t __uid )); unsigned _EXFUN(sleep, (unsigned int __seconds )); void _EXFUN(swab, (const void *, void *, ssize_t)); -int _EXFUN(symlink, (const char *oldpath, const char *newpath)); long _EXFUN(sysconf, (int __name )); pid_t _EXFUN(tcgetpgrp, (int __fildes )); int _EXFUN(tcsetpgrp, (int __fildes, pid_t __pgrp_id )); diff --git a/newlib/libc/sys/m88kbug/aclocal.m4 b/newlib/libc/sys/m88kbug/aclocal.m4 index 55d5e67ce..0a1490998 100644 --- a/newlib/libc/sys/m88kbug/aclocal.m4 +++ b/newlib/libc/sys/m88kbug/aclocal.m4 @@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(newlib, 1.14.0) +AM_INIT_AUTOMAKE(newlib, 1.13.0) # FIXME: We temporarily define our own version of AC_PROG_CC. This is # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS. We @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/sys/m88kbug/configure b/newlib/libc/sys/m88kbug/configure index abdfc90ff..89a8b1c97 100755 --- a/newlib/libc/sys/m88kbug/configure +++ b/newlib/libc/sys/m88kbug/configure @@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" && PACKAGE=newlib -VERSION=1.14.0 +VERSION=1.13.0 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: 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" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/sys/mmixware/aclocal.m4 b/newlib/libc/sys/mmixware/aclocal.m4 index 55d5e67ce..0a1490998 100644 --- a/newlib/libc/sys/mmixware/aclocal.m4 +++ b/newlib/libc/sys/mmixware/aclocal.m4 @@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(newlib, 1.14.0) +AM_INIT_AUTOMAKE(newlib, 1.13.0) # FIXME: We temporarily define our own version of AC_PROG_CC. This is # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS. We @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/sys/mmixware/configure b/newlib/libc/sys/mmixware/configure index c97c3f425..d5e1fc3ee 100755 --- a/newlib/libc/sys/mmixware/configure +++ b/newlib/libc/sys/mmixware/configure @@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" && PACKAGE=newlib -VERSION=1.14.0 +VERSION=1.13.0 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: 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" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/sys/netware/aclocal.m4 b/newlib/libc/sys/netware/aclocal.m4 index 55d5e67ce..0a1490998 100644 --- a/newlib/libc/sys/netware/aclocal.m4 +++ b/newlib/libc/sys/netware/aclocal.m4 @@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(newlib, 1.14.0) +AM_INIT_AUTOMAKE(newlib, 1.13.0) # FIXME: We temporarily define our own version of AC_PROG_CC. This is # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS. We @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/sys/netware/configure b/newlib/libc/sys/netware/configure index 8f0ed4de7..e3668a287 100755 --- a/newlib/libc/sys/netware/configure +++ b/newlib/libc/sys/netware/configure @@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" && PACKAGE=newlib -VERSION=1.14.0 +VERSION=1.13.0 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: 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" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/sys/rdos/Makefile.am b/newlib/libc/sys/rdos/Makefile.am deleted file mode 100644 index 825ef56c0..000000000 --- a/newlib/libc/sys/rdos/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -## Process this file with automake to generate Makefile.in - -AUTOMAKE_OPTIONS = cygnus - -INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) - -noinst_LIBRARIES = lib.a - -lib_a_SOURCES = chown.c close.c execve.c fork.c fstat.c getenv.c \ - getpid.c gettod.c isatty.c kill.c link.c lseek.c open.c rdoshelp.c \ - rdos.S read.c readlink.c sbrk.c stat.c symlink.c times.c unlink.c \ - wait.c write.c - -all: crt0.o - -ACLOCAL_AMFLAGS = -I ../../.. -CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host diff --git a/newlib/libc/sys/rdos/Makefile.in b/newlib/libc/sys/rdos/Makefile.in deleted file mode 100644 index 5fb59e5e2..000000000 --- a/newlib/libc/sys/rdos/Makefile.in +++ /dev/null @@ -1,376 +0,0 @@ -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am - -# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - -SHELL = @SHELL@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include - -DESTDIR = - -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ - -top_builddir = . - -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -transform = @program_transform_name@ - -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_alias = @build_alias@ -build_triplet = @build@ -host_alias = @host_alias@ -host_triplet = @host@ -target_alias = @target_alias@ -target_triplet = @target@ -AR = @AR@ -AS = @AS@ -CC = @CC@ -CPP = @CPP@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -DLLTOOL = @DLLTOOL@ -EXEEXT = @EXEEXT@ -GCJ = @GCJ@ -GCJFLAGS = @GCJFLAGS@ -LDFLAGS = @LDFLAGS@ -LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -NEWLIB_CFLAGS = @NEWLIB_CFLAGS@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -RANLIB = @RANLIB@ -STRIP = @STRIP@ -VERSION = @VERSION@ -aext = @aext@ -libm_machine_dir = @libm_machine_dir@ -machine_dir = @machine_dir@ -newlib_basedir = @newlib_basedir@ -oext = @oext@ -sys_dir = @sys_dir@ - -AUTOMAKE_OPTIONS = cygnus - -INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) - -noinst_LIBRARIES = lib.a - -lib_a_SOURCES = chown.c close.c execve.c fork.c fstat.c getenv.c getpid.c gettod.c isatty.c kill.c link.c lseek.c open.c rdoshelp.c rdos.S read.c readlink.c sbrk.c stat.c symlink.c times.c unlink.c wait.c write.c - - -ACLOCAL_AMFLAGS = -I ../../.. -CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/../../../../mkinstalldirs -CONFIG_CLEAN_FILES = -LIBRARIES = $(noinst_LIBRARIES) - - -DEFS = @DEFS@ -I. -I$(srcdir) -CPPFLAGS = @CPPFLAGS@ -LIBS = @LIBS@ -lib_a_LIBADD = -lib_a_OBJECTS = chown.$(OBJEXT) close.$(OBJEXT) execve.$(OBJEXT) \ -fork.$(OBJEXT) fstat.$(OBJEXT) getenv.$(OBJEXT) getpid.$(OBJEXT) \ -gettod.$(OBJEXT) isatty.$(OBJEXT) kill.$(OBJEXT) link.$(OBJEXT) \ -lseek.$(OBJEXT) open.$(OBJEXT) rdoshelp.$(OBJEXT) rdos.$(OBJEXT) \ -read.$(OBJEXT) readlink.$(OBJEXT) sbrk.$(OBJEXT) stat.$(OBJEXT) \ -symlink.$(OBJEXT) times.$(OBJEXT) unlink.$(OBJEXT) wait.$(OBJEXT) \ -write.$(OBJEXT) -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) -CCLD = $(CC) -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -DIST_COMMON = Makefile.am Makefile.in aclocal.m4 configure configure.in - - -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = tar -GZIP_ENV = --best -SOURCES = $(lib_a_SOURCES) -OBJECTS = $(lib_a_OBJECTS) - -all: all-redirect -.SUFFIXES: -.SUFFIXES: .S .c .lo .o .obj .s -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status - -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in \ - ../../../acinclude.m4 ../../../aclocal.m4 \ - ../../../libtool.m4 - cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) - -config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - $(SHELL) ./config.status --recheck -$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) - cd $(srcdir) && $(AUTOCONF) - -mostlyclean-noinstLIBRARIES: - -clean-noinstLIBRARIES: - -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) - -distclean-noinstLIBRARIES: - -maintainer-clean-noinstLIBRARIES: - -.c.o: - $(COMPILE) -c $< - -# FIXME: We should only use cygpath when building on Windows, -# and only if it is available. -.c.obj: - $(COMPILE) -c `cygpath -w $<` - -.s.o: - $(COMPILE) -c $< - -.S.o: - $(COMPILE) -c $< - -mostlyclean-compile: - -rm -f *.o core *.core - -rm -f *.$(OBJEXT) - -clean-compile: - -distclean-compile: - -rm -f *.tab.c - -maintainer-clean-compile: - -.c.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -.s.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -.S.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -maintainer-clean-libtool: - -lib.a: $(lib_a_OBJECTS) $(lib_a_DEPENDENCIES) - -rm -f lib.a - $(AR) cru lib.a $(lib_a_OBJECTS) $(lib_a_LIBADD) - $(RANLIB) lib.a - -tags: TAGS - -ID: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $$unique $(LISP) - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) - -mostlyclean-tags: - -clean-tags: - -distclean-tags: - -rm -f TAGS ID - -maintainer-clean-tags: - -distdir = $(PACKAGE)-$(VERSION) -top_distdir = $(distdir) - -# This target untars the dist file and tries a VPATH configuration. Then -# it guarantees that the distribution is self-contained by making another -# tarfile. -distcheck: dist - -rm -rf $(distdir) - GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz - mkdir $(distdir)/=build - mkdir $(distdir)/=inst - dc_install_base=`cd $(distdir)/=inst && pwd`; \ - cd $(distdir)/=build \ - && ../configure --srcdir=.. --prefix=$$dc_install_base \ - && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ - && $(MAKE) $(AM_MAKEFLAGS) check \ - && $(MAKE) $(AM_MAKEFLAGS) install \ - && $(MAKE) $(AM_MAKEFLAGS) installcheck \ - && $(MAKE) $(AM_MAKEFLAGS) dist - -rm -rf $(distdir) - @banner="$(distdir).tar.gz is ready for distribution"; \ - dashes=`echo "$$banner" | sed s/./=/g`; \ - echo "$$dashes"; \ - echo "$$banner"; \ - echo "$$dashes" -dist: distdir - -chmod -R a+r $(distdir) - GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) - -rm -rf $(distdir) -dist-all: distdir - -chmod -R a+r $(distdir) - GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) - -rm -rf $(distdir) -distdir: $(DISTFILES) - -rm -rf $(distdir) - mkdir $(distdir) - -chmod 777 $(distdir) - @for file in $(DISTFILES); do \ - if test -f $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ - else \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ - fi; \ - done -info-am: -info: info-am -dvi-am: -dvi: dvi-am -check-am: -check: check-am -installcheck-am: -installcheck: installcheck-am -install-info-am: -install-info: install-info-am -install-exec-am: -install-exec: install-exec-am - -install-data-am: -install-data: install-data-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-am -uninstall-am: -uninstall: uninstall-am -all-am: Makefile $(LIBRARIES) -all-redirect: all-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: - - -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -maintainer-clean-generic: -mostlyclean-am: mostlyclean-noinstLIBRARIES mostlyclean-compile \ - mostlyclean-libtool mostlyclean-tags \ - mostlyclean-generic - -mostlyclean: mostlyclean-am - -clean-am: clean-noinstLIBRARIES clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean-am - -clean: clean-am - -distclean-am: distclean-noinstLIBRARIES distclean-compile \ - distclean-libtool distclean-tags distclean-generic \ - clean-am - -rm -f libtool - -distclean: distclean-am - -rm -f config.status - -maintainer-clean-am: maintainer-clean-noinstLIBRARIES \ - maintainer-clean-compile maintainer-clean-libtool \ - maintainer-clean-tags maintainer-clean-generic \ - distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - -maintainer-clean: maintainer-clean-am - -rm -f config.status - -.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \ -clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \ -mostlyclean-compile distclean-compile clean-compile \ -maintainer-clean-compile mostlyclean-libtool distclean-libtool \ -clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ -dvi-am dvi check check-am installcheck-am installcheck install-info-am \ -install-info install-exec-am install-exec install-data-am install-data \ -install-am install uninstall-am uninstall all-redirect all-am all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean - - -all: crt0.o - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/newlib/libc/sys/rdos/aclocal.m4 b/newlib/libc/sys/rdos/aclocal.m4 deleted file mode 100644 index e6cbb29c0..000000000 --- a/newlib/libc/sys/rdos/aclocal.m4 +++ /dev/null @@ -1,1226 +0,0 @@ -dnl aclocal.m4 generated automatically by aclocal 1.4-p6 - -dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl This program is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without -dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A -dnl PARTICULAR PURPOSE. - -dnl This provides configure definitions used by all the newlib -dnl configure.in files. - -dnl Basic newlib configury. This calls basic introductory stuff, -dnl including AM_INIT_AUTOMAKE and AC_CANONICAL_HOST. It also runs -dnl configure.host. The only argument is the relative path to the top -dnl newlib directory. - -AC_DEFUN(NEWLIB_CONFIGURE, -[ -dnl Default to --enable-multilib -AC_ARG_ENABLE(multilib, -[ --enable-multilib build many library versions (default)], -[case "${enableval}" in - yes) multilib=yes ;; - no) multilib=no ;; - *) AC_MSG_ERROR(bad value ${enableval} for multilib option) ;; - esac], [multilib=yes])dnl - -dnl Support --enable-target-optspace -AC_ARG_ENABLE(target-optspace, -[ --enable-target-optspace optimize for space], -[case "${enableval}" in - yes) target_optspace=yes ;; - no) target_optspace=no ;; - *) AC_MSG_ERROR(bad value ${enableval} for target-optspace option) ;; - esac], [target_optspace=])dnl - -dnl Support --enable-malloc-debugging - currently only supported for Cygwin -AC_ARG_ENABLE(malloc-debugging, -[ --enable-malloc-debugging indicate malloc debugging requested], -[case "${enableval}" in - yes) malloc_debugging=yes ;; - no) malloc_debugging=no ;; - *) AC_MSG_ERROR(bad value ${enableval} for malloc-debugging option) ;; - esac], [malloc_debugging=])dnl - -dnl Support --enable-newlib-multithread -AC_ARG_ENABLE(newlib-multithread, -[ --enable-newlib-multithread enable support for multiple threads], -[case "${enableval}" in - yes) newlib_multithread=yes ;; - no) newlib_multithread=no ;; - *) AC_MSG_ERROR(bad value ${enableval} for newlib-multithread option) ;; - esac], [newlib_multithread=yes])dnl - -dnl Support --enable-newlib-iconv -AC_ARG_ENABLE(newlib-iconv, -[ --enable-newlib-iconv enable iconv library support], -[if test "${newlib_iconv+set}" != set; then - case "${enableval}" in - yes) newlib_iconv=yes ;; - no) newlib_iconv=no ;; - *) AC_MSG_ERROR(bad value ${enableval} for newlib-iconv option) ;; - esac - fi], [newlib_iconv=${newlib_iconv}])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], -[case "${enableval}" in - yes) newlib_io_float=yes ;; - no) newlib_io_float=no ;; - *) AC_MSG_ERROR(bad value ${enableval} for newlib-io-float option) ;; - esac], [newlib_io_float=yes])dnl - -dnl Support --disable-newlib-supplied-syscalls -AC_ARG_ENABLE(newlib-supplied-syscalls, -[ --disable-newlib-supplied-syscalls disable newlib from supplying syscalls], -[case "${enableval}" in - yes) newlib_may_supply_syscalls=yes ;; - no) newlib_may_supply_syscalls=no ;; - *) AC_MSG_ERROR(bad value ${enableval} for newlib-supplied-syscalls option) ;; - esac], [newlib_may_supply_syscalls=yes])dnl - -AM_CONDITIONAL(MAY_SUPPLY_SYSCALLS, test x[$]{newlib_may_supply_syscalls} = xyes) - -dnl We may get other options which we don't document: -dnl --with-target-subdir, --with-multisrctop, --with-multisubdir - -test -z "[$]{with_target_subdir}" && with_target_subdir=. - -if test "[$]{srcdir}" = "."; then - if test "[$]{with_target_subdir}" != "."; then - newlib_basedir="[$]{srcdir}/[$]{with_multisrctop}../$1" - else - newlib_basedir="[$]{srcdir}/[$]{with_multisrctop}$1" - fi -else - newlib_basedir="[$]{srcdir}/$1" -fi -AC_SUBST(newlib_basedir) - -AC_CANONICAL_SYSTEM - -AM_INIT_AUTOMAKE(newlib, 1.14.0, nodefine) - -# FIXME: We temporarily define our own version of AC_PROG_CC. This is -# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS. We -# are probably using a cross compiler, which will not be able to fully -# link an executable. This should really be fixed in autoconf -# itself. - -AC_DEFUN(LIB_AC_PROG_CC, -[AC_BEFORE([$0], [AC_PROG_CPP])dnl -AC_CHECK_PROG(CC, gcc, gcc) -if test -z "$CC"; then - AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc) - test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH]) -fi - -AC_PROG_CC_GNU - -if test $ac_cv_prog_gcc = yes; then - GCC=yes -dnl Check whether -g works, even if CFLAGS is set, in case the package -dnl plays around with CFLAGS (such as to build both debugging and -dnl normal versions of a library), tasteless as that idea is. - ac_test_CFLAGS="${CFLAGS+set}" - ac_save_CFLAGS="$CFLAGS" - CFLAGS= - AC_PROG_CC_G - if test "$ac_test_CFLAGS" = set; then - CFLAGS="$ac_save_CFLAGS" - elif test $ac_cv_prog_cc_g = yes; then - CFLAGS="-g -O2" - else - CFLAGS="-O2" - fi -else - GCC= - test "${CFLAGS+set}" = set || CFLAGS="-g" -fi -]) - -LIB_AC_PROG_CC - -AC_CHECK_TOOL(AS, as) -AC_CHECK_TOOL(AR, ar) -AC_CHECK_TOOL(RANLIB, ranlib, :) - -AC_PROG_INSTALL - -# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13. */ -ac_given_INSTALL=$INSTALL - -AM_MAINTAINER_MODE - -# We need AC_EXEEXT to keep automake happy in cygnus mode. However, -# at least currently, we never actually build a program, so we never -# need to use $(EXEEXT). Moreover, the test for EXEEXT normally -# fails, because we are probably configuring with a cross compiler -# which can't create executables. So we include AC_EXEEXT to keep -# automake happy, but we don't execute it, since we don't care about -# the result. -if false; then - AC_EXEEXT -fi - -. [$]{newlib_basedir}/configure.host - -newlib_cflags="[$]{newlib_cflags} -fno-builtin" - -NEWLIB_CFLAGS=${newlib_cflags} -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 -# use oext, which is set in configure.host based on the target platform. -OBJEXT=${oext} - -AC_SUBST(OBJEXT) -AC_SUBST(oext) -AC_SUBST(aext) - -AC_SUBST(libm_machine_dir) -AC_SUBST(machine_dir) -AC_SUBST(sys_dir) -]) - -# Do all the work for Automake. This macro actually does too much -- -# some checks are only needed if your package does certain things. -# But this isn't really a big deal. - -# serial 1 - -dnl Usage: -dnl AM_INIT_AUTOMAKE(package,version, [no-define]) - -AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl -AC_REQUIRE([AC_PROG_INSTALL]) -PACKAGE=[$1] -AC_SUBST(PACKAGE) -VERSION=[$2] -AC_SUBST(VERSION) -dnl test to see if srcdir already configured -if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) -fi -ifelse([$3],, -AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) -AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])) -AC_REQUIRE([AM_SANITY_CHECK]) -AC_REQUIRE([AC_ARG_PROGRAM]) -dnl FIXME This is truly gross. -missing_dir=`cd $ac_aux_dir && pwd` -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir) -AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir) -AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir) -AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir) -AC_REQUIRE([AC_PROG_MAKE_SET])]) - -# Copyright 2002 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - -# AM_AUTOMAKE_VERSION(VERSION) -# ---------------------------- -# Automake X.Y traces this macro to ensure aclocal.m4 has been -# generated from the m4 files accompanying Automake X.Y. -AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"]) - -# AM_SET_CURRENT_AUTOMAKE_VERSION -# ------------------------------- -# Call AM_AUTOMAKE_VERSION so it can be traced. -# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. -AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.4-p6])]) - -# -# Check to make sure that the build environment is sane. -# - -AC_DEFUN([AM_SANITY_CHECK], -[AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftestfile -# Do `set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null` - if test "[$]*" = "X"; then - # -L didn't work. - set X `ls -t $srcdir/configure conftestfile` - fi - if test "[$]*" != "X $srcdir/configure conftestfile" \ - && test "[$]*" != "X conftestfile $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi - - test "[$]2" = conftestfile - ) -then - # Ok. - : -else - AC_MSG_ERROR([newly created file is older than distributed files! -Check your system clock]) -fi -rm -f conftest* -AC_MSG_RESULT(yes)]) - -dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY) -dnl The program must properly implement --version. -AC_DEFUN([AM_MISSING_PROG], -[AC_MSG_CHECKING(for working $2) -# 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. -if ($2 --version) < /dev/null > /dev/null 2>&1; then - $1=$2 - AC_MSG_RESULT(found) -else - $1="$3/missing $2" - AC_MSG_RESULT(missing) -fi -AC_SUBST($1)]) - -# Define a conditional. - -AC_DEFUN([AM_CONDITIONAL], -[AC_SUBST($1_TRUE) -AC_SUBST($1_FALSE) -if $2; then - $1_TRUE= - $1_FALSE='#' -else - $1_TRUE='#' - $1_FALSE= -fi]) - -# Add --enable-maintainer-mode option to configure. -# From Jim Meyering - -# serial 1 - -AC_DEFUN([AM_MAINTAINER_MODE], -[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) - dnl maintainer-mode is disabled by default - AC_ARG_ENABLE(maintainer-mode, -[ --enable-maintainer-mode enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer], - USE_MAINTAINER_MODE=$enableval, - USE_MAINTAINER_MODE=no) - AC_MSG_RESULT($USE_MAINTAINER_MODE) - AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes) - MAINT=$MAINTAINER_MODE_TRUE - AC_SUBST(MAINT)dnl -] -) - - -# serial 46 AC_PROG_LIBTOOL -AC_DEFUN([AC_PROG_LIBTOOL], -[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl -dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX -dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. - AC_PROVIDE_IFELSE([AC_PROG_CXX], - [AC_LIBTOOL_CXX], - [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX -])]) - -dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. -dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run -dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. - AC_PROVIDE_IFELSE([AC_PROG_GCJ], - [AC_LIBTOOL_GCJ], - [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], - [AC_LIBTOOL_GCJ], - [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ], - [AC_LIBTOOL_GCJ], - [ifdef([AC_PROG_GCJ], - [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ -])]) - ifdef([A][M_PROG_GCJ], - [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ -])]) - ifdef([LT_AC_PROG_GCJ], - [define([LT_AC_PROG_GCJ], defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ -])])])])])]) - -AC_DEFUN([_AC_PROG_LIBTOOL], -[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl -AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl -AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl - -# Save cache, so that ltconfig can load it -AC_CACHE_SAVE - -# Actually configure libtool. ac_aux_dir is where install-sh is found. -AR="$AR" LTCC="$CC" CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \ -MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \ -LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \ -AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \ -objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \ -deplibs_check_method="$deplibs_check_method" file_magic_cmd="$file_magic_cmd" \ -${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \ -$libtool_flags --no-verify --build="$build" $ac_aux_dir/ltmain.sh $host \ -|| AC_MSG_ERROR([libtool configure failed]) - -# Reload cache, that may have been modified by ltconfig -AC_CACHE_LOAD - -# This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh $ac_aux_dir/ltcf-c.sh" - -# Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool' -AC_SUBST(LIBTOOL)dnl - -# Redirect the config.log output again, so that the ltconfig log is not -# clobbered by the next message. -exec 5>>./config.log -]) - -AC_DEFUN([AC_LIBTOOL_SETUP], -[AC_PREREQ(2.13)dnl -AC_REQUIRE([AC_ENABLE_SHARED])dnl -AC_REQUIRE([AC_ENABLE_STATIC])dnl -AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_PROG_LD])dnl -AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl -AC_REQUIRE([AC_PROG_NM])dnl -AC_REQUIRE([AC_PROG_LN_S])dnl -AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl -# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! -AC_REQUIRE([AC_OBJEXT])dnl -AC_REQUIRE([AC_EXEEXT])dnl -dnl - -# Only perform the check for file, if the check method requires it -case $deplibs_check_method in -file_magic*) - if test "$file_magic_cmd" = '$MAGIC_CMD'; then - AC_PATH_MAGIC - fi - ;; -esac - -AC_CHECK_TOOL(RANLIB, ranlib, :) -AC_CHECK_TOOL(STRIP, strip, :) - -# Check for any special flags to pass to ltconfig. -libtool_flags="--cache-file=$cache_file" -test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared" -test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static" -test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install" -test "$GCC" = yes && libtool_flags="$libtool_flags --with-gcc" -test "$lt_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld" -ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN], -[libtool_flags="$libtool_flags --enable-dlopen"]) -ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL], -[libtool_flags="$libtool_flags --enable-win32-dll"]) -AC_ARG_ENABLE(libtool-lock, - [ --disable-libtool-lock avoid locking (might break parallel builds)]) -test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock" -test x"$silent" = xyes && libtool_flags="$libtool_flags --silent" - -AC_ARG_WITH(pic, - [ --with-pic try to use only PIC/non-PIC objects [default=use both]], - pic_mode="$withval", pic_mode=default) -test x"$pic_mode" = xyes && libtool_flags="$libtool_flags --prefer-pic" -test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic" - -# Some flags need to be propagated to the compiler or linker for good -# libtool support. -case $host in -*-*-irix6*) - # Find out which ABI we are using. - echo '[#]line __oline__ "configure"' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -32" - ;; - *N32*) - LD="${LD-ld} -n32" - ;; - *64-bit*) - LD="${LD-ld} -64" - ;; - esac - fi - rm -rf conftest* - ;; - -ia64-*-hpux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case "`/usr/bin/file conftest.o`" in - *ELF-32*) - HPUX_IA64_MODE="32" - ;; - *ELF-64*) - HPUX_IA64_MODE="64" - ;; - esac - fi - rm -rf conftest* - ;; - -*-*-sco3.2v5*) - # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -belf" - AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, - [AC_LANG_SAVE - AC_LANG_C - AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) - AC_LANG_RESTORE]) - if test x"$lt_cv_cc_needs_belf" != x"yes"; then - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" - fi - ;; - -ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL], -[*-*-cygwin* | *-*-mingw* | *-*-pw32*) - AC_CHECK_TOOL(DLLTOOL, dlltool, false) - AC_CHECK_TOOL(AS, as, false) - AC_CHECK_TOOL(OBJDUMP, objdump, false) - - # recent cygwin and mingw systems supply a stub DllMain which the user - # can override, but on older systems we have to supply one - AC_CACHE_CHECK([if libtool should supply DllMain function], lt_cv_need_dllmain, - [AC_TRY_LINK([], - [extern int __attribute__((__stdcall__)) DllMain(void*, int, void*); - DllMain (0, 0, 0);], - [lt_cv_need_dllmain=no],[lt_cv_need_dllmain=yes])]) - - case $host/$CC in - *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*) - # old mingw systems require "-dll" to link a DLL, while more recent ones - # require "-mdll" - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -mdll" - AC_CACHE_CHECK([how to link DLLs], lt_cv_cc_dll_switch, - [AC_TRY_LINK([], [], [lt_cv_cc_dll_switch=-mdll],[lt_cv_cc_dll_switch=-dll])]) - CFLAGS="$SAVE_CFLAGS" ;; - *-*-cygwin* | *-*-pw32*) - # cygwin systems need to pass --dll to the linker, and not link - # crt.o which will require a WinMain@16 definition. - lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;; - esac - ;; - ]) -esac -]) - -# AC_LIBTOOL_DLOPEN - enable checks for dlopen support -AC_DEFUN([AC_LIBTOOL_DLOPEN], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])]) - -# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's -AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])]) - -# AC_ENABLE_SHARED - implement the --enable-shared flag -# Usage: AC_ENABLE_SHARED[(DEFAULT)] -# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to -# `yes'. -AC_DEFUN([AC_ENABLE_SHARED], -[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl -AC_ARG_ENABLE(shared, -changequote(<<, >>)dnl -<< --enable-shared[=PKGS] build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT], -changequote([, ])dnl -[p=${PACKAGE-default} -case $enableval in -yes) enable_shared=yes ;; -no) enable_shared=no ;; -*) - enable_shared=no - # Look at the argument we got. We use all the common list separators. - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," - for pkg in $enableval; do - if test "X$pkg" = "X$p"; then - enable_shared=yes - fi - done - IFS="$ac_save_ifs" - ;; -esac], -enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl -]) - -# AC_DISABLE_SHARED - set the default shared flag to --disable-shared -AC_DEFUN([AC_DISABLE_SHARED], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -AC_ENABLE_SHARED(no)]) - -# AC_ENABLE_STATIC - implement the --enable-static flag -# Usage: AC_ENABLE_STATIC[(DEFAULT)] -# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to -# `yes'. -AC_DEFUN([AC_ENABLE_STATIC], -[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl -AC_ARG_ENABLE(static, -changequote(<<, >>)dnl -<< --enable-static[=PKGS] build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT], -changequote([, ])dnl -[p=${PACKAGE-default} -case $enableval in -yes) enable_static=yes ;; -no) enable_static=no ;; -*) - enable_static=no - # Look at the argument we got. We use all the common list separators. - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," - for pkg in $enableval; do - if test "X$pkg" = "X$p"; then - enable_static=yes - fi - done - IFS="$ac_save_ifs" - ;; -esac], -enable_static=AC_ENABLE_STATIC_DEFAULT)dnl -]) - -# AC_DISABLE_STATIC - set the default static flag to --disable-static -AC_DEFUN([AC_DISABLE_STATIC], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -AC_ENABLE_STATIC(no)]) - - -# AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag -# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)] -# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to -# `yes'. -AC_DEFUN([AC_ENABLE_FAST_INSTALL], -[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl -AC_ARG_ENABLE(fast-install, -changequote(<<, >>)dnl -<< --enable-fast-install[=PKGS] optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT], -changequote([, ])dnl -[p=${PACKAGE-default} -case $enableval in -yes) enable_fast_install=yes ;; -no) enable_fast_install=no ;; -*) - enable_fast_install=no - # Look at the argument we got. We use all the common list separators. - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," - for pkg in $enableval; do - if test "X$pkg" = "X$p"; then - enable_fast_install=yes - fi - done - IFS="$ac_save_ifs" - ;; -esac], -enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl -]) - -# AC_DISABLE_FAST_INSTALL - set the default to --disable-fast-install -AC_DEFUN([AC_DISABLE_FAST_INSTALL], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -AC_ENABLE_FAST_INSTALL(no)]) - -# AC_LIBTOOL_PICMODE - implement the --with-pic flag -# Usage: AC_LIBTOOL_PICMODE[(MODE)] -# Where MODE is either `yes' or `no'. If omitted, it defaults to -# `both'. -AC_DEFUN([AC_LIBTOOL_PICMODE], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -pic_mode=ifelse($#,1,$1,default)]) - - -# AC_PATH_TOOL_PREFIX - find a file program which can recognise shared library -AC_DEFUN([AC_PATH_TOOL_PREFIX], -[AC_MSG_CHECKING([for $1]) -AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, -[case $MAGIC_CMD in - /*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. - ;; - ?:/*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path. - ;; - *) - ac_save_MAGIC_CMD="$MAGIC_CMD" - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -dnl $ac_dummy forces splitting on constant user-supplied paths. -dnl POSIX.2 word splitting is done only on the output of word expansions, -dnl not every word. This closes a longstanding sh security hole. - ac_dummy="ifelse([$2], , $PATH, [$2])" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$1; then - lt_cv_path_MAGIC_CMD="$ac_dir/$1" - if test -n "$file_magic_test_file"; then - case $deplibs_check_method in - "file_magic "*) - file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - egrep "$file_magic_regex" > /dev/null; then - : - else - cat <<EOF 1>&2 - -*** Warning: the command libtool uses to detect shared libraries, -*** $file_magic_cmd, produces output that libtool cannot recognize. -*** The result is that libtool may fail to recognize shared libraries -*** as such. This will affect the creation of libtool libraries that -*** depend on shared libraries, but programs linked with such libtool -*** libraries will work regardless of this problem. Nevertheless, you -*** may want to report the problem to your system manager and/or to -*** bug-libtool@gnu.org - -EOF - fi ;; - esac - fi - break - fi - done - IFS="$ac_save_ifs" - MAGIC_CMD="$ac_save_MAGIC_CMD" - ;; -esac]) -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -if test -n "$MAGIC_CMD"; then - AC_MSG_RESULT($MAGIC_CMD) -else - AC_MSG_RESULT(no) -fi -]) - - -# AC_PATH_MAGIC - find a file program which can recognise a shared library -AC_DEFUN([AC_PATH_MAGIC], -[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl -AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin:$PATH) -if test -z "$lt_cv_path_MAGIC_CMD"; then - if test -n "$ac_tool_prefix"; then - AC_PATH_TOOL_PREFIX(file, /usr/bin:$PATH) - else - MAGIC_CMD=: - fi -fi -]) - - -# AC_PROG_LD - find the path to the GNU or non-GNU linker -AC_DEFUN([AC_PROG_LD], -[AC_ARG_WITH(gnu-ld, -[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]], -test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - AC_MSG_CHECKING([for ld used by GCC]) - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [[\\/]* | [A-Za-z]:[\\/]*)] - re_direlt=['/[^/][^/]*/\.\./'] - # Canonicalize the path of ld - ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do - ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - AC_MSG_CHECKING([for GNU ld]) -else - AC_MSG_CHECKING([for non-GNU ld]) -fi -AC_CACHE_VAL(lt_cv_path_LD, -[if test -z "$LD"; then - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some GNU ld's only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then - test "$with_gnu_ld" != no && break - else - test "$with_gnu_ld" != yes && break - fi - fi - done - IFS="$ac_save_ifs" -else - lt_cv_path_LD="$LD" # Let the user override the test with a path. -fi]) -LD="$lt_cv_path_LD" -if test -n "$LD"; then - AC_MSG_RESULT($LD) -else - AC_MSG_RESULT(no) -fi -test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) -AC_PROG_LD_GNU -]) - -AC_DEFUN([AC_PROG_LD_GNU], -[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld, -[# I'd rather use --version here, but apparently some GNU ld's only accept -v. -if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then - lt_cv_prog_gnu_ld=yes -else - lt_cv_prog_gnu_ld=no -fi]) -with_gnu_ld=$lt_cv_prog_gnu_ld -]) - -# AC_PROG_LD_RELOAD_FLAG - find reload flag for linker -# -- PORTME Some linkers may need a different reload flag. -AC_DEFUN([AC_PROG_LD_RELOAD_FLAG], -[AC_CACHE_CHECK([for $LD option to reload object files], lt_cv_ld_reload_flag, -[lt_cv_ld_reload_flag='-r']) -reload_flag=$lt_cv_ld_reload_flag -test -n "$reload_flag" && reload_flag=" $reload_flag" -]) - -# AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies -# -- PORTME fill in with the dynamic library characteristics -AC_DEFUN([AC_DEPLIBS_CHECK_METHOD], -[AC_CACHE_CHECK([how to recognise dependant libraries], -lt_cv_deplibs_check_method, -[lt_cv_file_magic_cmd='$MAGIC_CMD' -lt_cv_file_magic_test_file= -lt_cv_deplibs_check_method='unknown' -# Need to set the preceding variable on all platforms that support -# interlibrary dependencies. -# 'none' -- dependencies not supported. -# `unknown' -- same as none, but documents that we really don't know. -# 'pass_all' -- all dependencies passed with no checks. -# 'test_compile' -- check by making test program. -# 'file_magic [regex]' -- check by looking for files in library path -# which responds to the $file_magic_cmd with a given egrep regex. -# If you have `file' or equivalent on your system and you're not sure -# whether `pass_all' will *always* work, you probably want this one. - -case $host_os in -aix*) - lt_cv_deplibs_check_method=pass_all - ;; - -beos*) - lt_cv_deplibs_check_method=pass_all - ;; - -bsdi4*) - lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'] - lt_cv_file_magic_cmd='/usr/bin/file -L' - lt_cv_file_magic_test_file=/shlib/libc.so - ;; - -cygwin* | mingw* |pw32*) - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' - lt_cv_file_magic_cmd='$OBJDUMP -f' - ;; - -darwin* | rhapsody*) - lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library' - lt_cv_file_magic_cmd='/usr/bin/file -L' - case "$host_os" in - rhapsody* | darwin1.[012]) - lt_cv_file_magic_test_file='/System/Library/Frameworks/System.framework/System' - ;; - *) # Darwin 1.3 on - lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib' - ;; - esac - ;; - -freebsd* ) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - case $host_cpu in - i*86 ) - # Not sure whether the presence of OpenBSD here was a mistake. - # Let's accept both of them until this is cleared up. - lt_cv_deplibs_check_method=['file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'] - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` - ;; - esac - else - lt_cv_deplibs_check_method=pass_all - fi - ;; - -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - -hpux10.20*|hpux11*) - case $host_cpu in - hppa*) - [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'] - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=/usr/lib/libc.sl - ;; - ia64*) - [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'] - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so - ;; - esac - ;; - -irix5* | irix6*) - case $host_os in - irix5*) - # this will be overridden with pass_all, but let us keep it just in case - lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1" - ;; - *) - case $LD in - *-32|*"-32 ") libmagic=32-bit;; - *-n32|*"-n32 ") libmagic=N32;; - *-64|*"-64 ") libmagic=64-bit;; - *) libmagic=never-match;; - esac - # this will be overridden with pass_all, but let us keep it just in case - lt_cv_deplibs_check_method=["file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"] - ;; - esac - lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*` - lt_cv_deplibs_check_method=pass_all - ;; - -# This must be Linux ELF. -linux-gnu*) - case $host_cpu in - alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* ) - lt_cv_deplibs_check_method=pass_all ;; - *) - # glibc up to 2.1.1 does not perform some relocations on ARM - lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'] ;; - esac - lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` - ;; - -netbsd*) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'] - else - [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$'] - fi - ;; - -newsos6) - [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'] - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=/usr/lib/libnls.so - ;; - -osf3* | osf4* | osf5*) - # this will be overridden with pass_all, but let us keep it just in case - lt_cv_deplibs_check_method='file_magic COFF format alpha shared library' - lt_cv_file_magic_test_file=/shlib/libc.so - lt_cv_deplibs_check_method=pass_all - ;; - -sco3.2v5*) - lt_cv_deplibs_check_method=pass_all - ;; - -solaris*) - lt_cv_deplibs_check_method=pass_all - lt_cv_file_magic_test_file=/lib/libc.so - ;; - -[sysv5uw[78]* | sysv4*uw2*)] - lt_cv_deplibs_check_method=pass_all - ;; - -sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - case $host_vendor in - ncr) - lt_cv_deplibs_check_method=pass_all - ;; - motorola) - lt_cv_deplibs_check_method=['file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'] - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` - ;; - esac - ;; -esac -]) -file_magic_cmd=$lt_cv_file_magic_cmd -deplibs_check_method=$lt_cv_deplibs_check_method -]) - - -# AC_PROG_NM - find the path to a BSD-compatible name lister -AC_DEFUN([AC_PROG_NM], -[AC_MSG_CHECKING([for BSD-compatible nm]) -AC_CACHE_VAL(lt_cv_path_NM, -[if test -n "$NM"; then - # Let the user override the test. - lt_cv_path_NM="$NM" -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" - for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do - test -z "$ac_dir" && ac_dir=. - tmp_nm=$ac_dir/${ac_tool_prefix}nm - if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then - # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: - # nm: unknown option "B" ignored - # Tru64's nm complains that /dev/null is an invalid object file - if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then - lt_cv_path_NM="$tmp_nm -B" - break - elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then - lt_cv_path_NM="$tmp_nm -p" - break - else - lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but - continue # so that we can try to find one that supports BSD flags - fi - fi - done - IFS="$ac_save_ifs" - test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm -fi]) -NM="$lt_cv_path_NM" -AC_MSG_RESULT([$NM]) -]) - -# AC_CHECK_LIBM - check for math library -AC_DEFUN([AC_CHECK_LIBM], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -LIBM= -case $host in -*-*-beos* | *-*-cygwin* | *-*-pw32*) - # These system don't have libm - ;; -*-ncr-sysv4.3*) - AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") - AC_CHECK_LIB(m, main, LIBM="$LIBM -lm") - ;; -*) - AC_CHECK_LIB(m, main, LIBM="-lm") - ;; -esac -]) - -# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for -# the libltdl convenience library and INCLTDL to the include flags for -# the libltdl header and adds --enable-ltdl-convenience to the -# configure arguments. Note that LIBLTDL and INCLTDL are not -# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If DIR is not -# provided, it is assumed to be `libltdl'. LIBLTDL will be prefixed -# with '${top_builddir}/' and INCLTDL will be prefixed with -# '${top_srcdir}/' (note the single quotes!). If your package is not -# flat and you're not using automake, define top_builddir and -# top_srcdir appropriately in the Makefiles. -AC_DEFUN([AC_LIBLTDL_CONVENIENCE], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl - case $enable_ltdl_convenience in - no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; - "") enable_ltdl_convenience=yes - ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; - esac - LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la - INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) -]) - -# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for -# the libltdl installable library and INCLTDL to the include flags for -# the libltdl header and adds --enable-ltdl-install to the configure -# arguments. Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is -# AC_CONFIG_SUBDIRS called. If DIR is not provided and an installed -# libltdl is not found, it is assumed to be `libltdl'. LIBLTDL will -# be prefixed with '${top_builddir}/' and INCLTDL will be prefixed -# with '${top_srcdir}/' (note the single quotes!). If your package is -# not flat and you're not using automake, define top_builddir and -# top_srcdir appropriately in the Makefiles. -# In the future, this macro may have to be called after AC_PROG_LIBTOOL. -AC_DEFUN([AC_LIBLTDL_INSTALLABLE], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl - AC_CHECK_LIB(ltdl, main, - [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no], - [if test x"$enable_ltdl_install" = xno; then - AC_MSG_WARN([libltdl not installed, but installation disabled]) - else - enable_ltdl_install=yes - fi - ]) - if test x"$enable_ltdl_install" = x"yes"; then - ac_configure_args="$ac_configure_args --enable-ltdl-install" - LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la - INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) - else - ac_configure_args="$ac_configure_args --enable-ltdl-install=no" - LIBLTDL="-lltdl" - INCLTDL= - fi -]) - -# If this macro is not defined by Autoconf, define it here. -ifdef([AC_PROVIDE_IFELSE], - [], - [define([AC_PROVIDE_IFELSE], - [ifdef([AC_PROVIDE_$1], - [$2], [$3])])]) - -# AC_LIBTOOL_CXX - enable support for C++ libraries -AC_DEFUN([AC_LIBTOOL_CXX], [AC_REQUIRE([_AC_LIBTOOL_CXX])]) - -AC_DEFUN([_AC_LIBTOOL_CXX], -[AC_REQUIRE([AC_PROG_CXX]) -AC_REQUIRE([AC_PROG_CXXCPP]) -LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-cxx.sh" -lt_save_CC="$CC" -lt_save_CFLAGS="$CFLAGS" -dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC -dnl is set to the C++ compiler. -AR="$AR" LTCC="$CC" CC="$CXX" CXX="$CXX" CFLAGS="$CXXFLAGS" CPPFLAGS="$CPPFLAGS" \ -MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \ -LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \ -AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \ -objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \ -deplibs_check_method="$deplibs_check_method" \ -file_magic_cmd="$file_magic_cmd" \ -${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \ ---build="$build" --add-tag=CXX $ac_aux_dir/ltcf-cxx.sh $host \ -|| AC_MSG_ERROR([libtool tag configuration failed]) -CC="$lt_save_CC" -CFLAGS="$lt_save_CFLAGS" - -# Redirect the config.log output again, so that the ltconfig log is not -# clobbered by the next message. -exec 5>>./config.log -]) - -# AC_LIBTOOL_GCJ - enable support for GCJ libraries -AC_DEFUN([AC_LIBTOOL_GCJ],[AC_REQUIRE([_AC_LIBTOOL_GCJ])]) - -AC_DEFUN([_AC_LIBTOOL_GCJ], -[AC_REQUIRE([AC_PROG_LIBTOOL]) -AC_PROVIDE_IFELSE([AC_PROG_GCJ],[], - [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[], - [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[], - [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])], - [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])], - [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])]) -LIBTOOL_DEPS=$LIBTOOL_DEPS" $ac_aux_dir/ltcf-gcj.sh" -lt_save_CC="$CC" -lt_save_CFLAGS="$CFLAGS" -dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC -dnl is set to the C++ compiler. -AR="$AR" LTCC="$CC" CC="$GCJ" CFLAGS="$GCJFLAGS" CPPFLAGS="$CPPFLAGS" \ -MAGIC_CMD="$MAGIC_CMD" LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \ -LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \ -AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \ -objext="$OBJEXT" exeext="$EXEEXT" reload_flag="$reload_flag" \ -deplibs_check_method="$deplibs_check_method" \ -file_magic_cmd="$file_magic_cmd" \ -${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig -o libtool $libtool_flags \ ---build="$build" --add-tag=GCJ $ac_aux_dir/ltcf-gcj.sh $host \ -|| AC_MSG_ERROR([libtool tag configuration failed]) -CC="$lt_save_CC" -CFLAGS="$lt_save_CFLAGS" - -# Redirect the config.log output again, so that the ltconfig log is not -# clobbered by the next message. -exec 5>>./config.log -]) - -dnl old names -AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL]) -AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) -AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) -AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) -AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) -AC_DEFUN([AM_PROG_LD], [AC_PROG_LD]) -AC_DEFUN([AM_PROG_NM], [AC_PROG_NM]) - -dnl This is just to silence aclocal about the macro not being used -ifelse([AC_DISABLE_FAST_INSTALL])dnl - -AC_DEFUN([LT_AC_PROG_GCJ], -[AC_CHECK_TOOL(GCJ, gcj, no) - test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" - AC_SUBST(GCJFLAGS) -]) - diff --git a/newlib/libc/sys/rdos/chown.c b/newlib/libc/sys/rdos/chown.c deleted file mode 100755 index 48f33f563..000000000 --- a/newlib/libc/sys/rdos/chown.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "config.h"
-#include <_ansi.h>
-#include <_syslist.h>
-#include <errno.h>
-#include <sys/types.h>
-
-int chown(const char *path, uid_t owner, gid_t group)
-{
- errno = ENOSYS;
- return -1;
-}
diff --git a/newlib/libc/sys/rdos/close.c b/newlib/libc/sys/rdos/close.c deleted file mode 100644 index 7f95e24f3..000000000 --- a/newlib/libc/sys/rdos/close.c +++ /dev/null @@ -1,36 +0,0 @@ -/*#######################################################################
-# RDOS operating system
-# Copyright (C) 1988-2006, Leif Ekblad
-#
-# This library is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published
-# by the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-# The author of this program may be contacted at leif@rdos.net
-#
-# close.c
-# close function implementation
-#
-##########################################################################*/
-
-#include "config.h"
-#include <_ansi.h>
-#include <_syslist.h>
-#include <errno.h>
-#include "rdos.h"
-
-int close(int fildes)
-{
- RdosCloseFile(fildes);
- return 0;
-}
diff --git a/newlib/libc/sys/rdos/config.h b/newlib/libc/sys/rdos/config.h deleted file mode 100644 index 431e26805..000000000 --- a/newlib/libc/sys/rdos/config.h +++ /dev/null @@ -1 +0,0 @@ -/* Place holder for future configuration information. */ diff --git a/newlib/libc/sys/rdos/configure b/newlib/libc/sys/rdos/configure deleted file mode 100755 index e937dd685..000000000 --- a/newlib/libc/sys/rdos/configure +++ /dev/null @@ -1,1876 +0,0 @@ -#! /bin/sh - -# Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.13 -# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. -# -# This configure script is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. - -# Defaults: -ac_help= -ac_default_prefix=/usr/local -# Any additions from configure.in: -ac_help="$ac_help - --enable-multilib build many library versions (default)" -ac_help="$ac_help - --enable-target-optspace optimize for space" -ac_help="$ac_help - --enable-malloc-debugging indicate malloc debugging requested" -ac_help="$ac_help - --enable-newlib-multithread enable support for multiple threads" -ac_help="$ac_help - --enable-newlib-iconv enable iconv library support" -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 - --disable-newlib-supplied-syscalls disable newlib from supplying syscalls" -ac_help="$ac_help - --enable-maintainer-mode enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer" - -# Initialize some variables set by options. -# The variables have the same names as the options, with -# dashes changed to underlines. -build=NONE -cache_file=./config.cache -exec_prefix=NONE -host=NONE -no_create= -nonopt=NONE -no_recursion= -prefix=NONE -program_prefix=NONE -program_suffix=NONE -program_transform_name=s,x,x, -silent= -site= -srcdir= -target=NONE -verbose= -x_includes=NONE -x_libraries=NONE -bindir='${exec_prefix}/bin' -sbindir='${exec_prefix}/sbin' -libexecdir='${exec_prefix}/libexec' -datadir='${prefix}/share' -sysconfdir='${prefix}/etc' -sharedstatedir='${prefix}/com' -localstatedir='${prefix}/var' -libdir='${exec_prefix}/lib' -includedir='${prefix}/include' -oldincludedir='/usr/include' -infodir='${prefix}/info' -mandir='${prefix}/man' - -# Initialize some other variables. -subdirs= -MFLAGS= MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} -# Maximum number of lines to put in a shell here document. -ac_max_here_lines=12 - -ac_prev= -for ac_option -do - - # If the previous option needs an argument, assign it. - if test -n "$ac_prev"; then - eval "$ac_prev=\$ac_option" - ac_prev= - continue - fi - - case "$ac_option" in - -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;; - *) ac_optarg= ;; - esac - - # Accept the important Cygnus configure options, so we can diagnose typos. - - case "$ac_option" in - - -bindir | --bindir | --bindi | --bind | --bin | --bi) - ac_prev=bindir ;; - -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) - bindir="$ac_optarg" ;; - - -build | --build | --buil | --bui | --bu) - ac_prev=build ;; - -build=* | --build=* | --buil=* | --bui=* | --bu=*) - build="$ac_optarg" ;; - - -cache-file | --cache-file | --cache-fil | --cache-fi \ - | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) - ac_prev=cache_file ;; - -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ - | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) - cache_file="$ac_optarg" ;; - - -datadir | --datadir | --datadi | --datad | --data | --dat | --da) - ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ - | --da=*) - datadir="$ac_optarg" ;; - - -disable-* | --disable-*) - ac_feature=`echo $ac_option|sed -e 's/-*disable-//'` - # Reject names that are not valid shell variable names. - if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then - { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } - fi - ac_feature=`echo $ac_feature| sed 's/-/_/g'` - eval "enable_${ac_feature}=no" ;; - - -enable-* | --enable-*) - ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'` - # Reject names that are not valid shell variable names. - if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then - { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } - fi - ac_feature=`echo $ac_feature| sed 's/-/_/g'` - case "$ac_option" in - *=*) ;; - *) ac_optarg=yes ;; - esac - eval "enable_${ac_feature}='$ac_optarg'" ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ - | --exec | --exe | --ex) - ac_prev=exec_prefix ;; - -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ - | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ - | --exec=* | --exe=* | --ex=*) - exec_prefix="$ac_optarg" ;; - - -gas | --gas | --ga | --g) - # Obsolete; use --with-gas. - with_gas=yes ;; - - -help | --help | --hel | --he) - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. - cat << EOF -Usage: configure [options] [host] -Options: [defaults in brackets after descriptions] -Configuration: - --cache-file=FILE cache test results in FILE - --help print this message - --no-create do not create output files - --quiet, --silent do not print \`checking...' messages - --version print the version of autoconf that created configure -Directory and file names: - --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [same as prefix] - --bindir=DIR user executables in DIR [EPREFIX/bin] - --sbindir=DIR system admin executables in DIR [EPREFIX/sbin] - --libexecdir=DIR program executables in DIR [EPREFIX/libexec] - --datadir=DIR read-only architecture-independent data in DIR - [PREFIX/share] - --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data in DIR - [PREFIX/com] - --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var] - --libdir=DIR object code libraries in DIR [EPREFIX/lib] - --includedir=DIR C header files in DIR [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include] - --infodir=DIR info documentation in DIR [PREFIX/info] - --mandir=DIR man documentation in DIR [PREFIX/man] - --srcdir=DIR find the sources in DIR [configure dir or ..] - --program-prefix=PREFIX prepend PREFIX to installed program names - --program-suffix=SUFFIX append SUFFIX to installed program names - --program-transform-name=PROGRAM - run sed PROGRAM on installed program names -EOF - cat << EOF -Host type: - --build=BUILD configure for building on BUILD [BUILD=HOST] - --host=HOST configure for HOST [guessed] - --target=TARGET configure for TARGET [TARGET=HOST] -Features and packages: - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --x-includes=DIR X include files are in DIR - --x-libraries=DIR X library files are in DIR -EOF - if test -n "$ac_help"; then - echo "--enable and --with options recognized:$ac_help" - fi - exit 0 ;; - - -host | --host | --hos | --ho) - ac_prev=host ;; - -host=* | --host=* | --hos=* | --ho=*) - host="$ac_optarg" ;; - - -includedir | --includedir | --includedi | --included | --include \ - | --includ | --inclu | --incl | --inc) - ac_prev=includedir ;; - -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ - | --includ=* | --inclu=* | --incl=* | --inc=*) - includedir="$ac_optarg" ;; - - -infodir | --infodir | --infodi | --infod | --info | --inf) - ac_prev=infodir ;; - -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) - infodir="$ac_optarg" ;; - - -libdir | --libdir | --libdi | --libd) - ac_prev=libdir ;; - -libdir=* | --libdir=* | --libdi=* | --libd=*) - libdir="$ac_optarg" ;; - - -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ - | --libexe | --libex | --libe) - ac_prev=libexecdir ;; - -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ - | --libexe=* | --libex=* | --libe=*) - libexecdir="$ac_optarg" ;; - - -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst \ - | --locals | --local | --loca | --loc | --lo) - ac_prev=localstatedir ;; - -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* \ - | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) - localstatedir="$ac_optarg" ;; - - -mandir | --mandir | --mandi | --mand | --man | --ma | --m) - ac_prev=mandir ;; - -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) - mandir="$ac_optarg" ;; - - -nfp | --nfp | --nf) - # Obsolete; use --without-fp. - with_fp=no ;; - - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) - no_create=yes ;; - - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) - no_recursion=yes ;; - - -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ - | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ - | --oldin | --oldi | --old | --ol | --o) - ac_prev=oldincludedir ;; - -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ - | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ - | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) - oldincludedir="$ac_optarg" ;; - - -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) - ac_prev=prefix ;; - -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) - prefix="$ac_optarg" ;; - - -program-prefix | --program-prefix | --program-prefi | --program-pref \ - | --program-pre | --program-pr | --program-p) - ac_prev=program_prefix ;; - -program-prefix=* | --program-prefix=* | --program-prefi=* \ - | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) - program_prefix="$ac_optarg" ;; - - -program-suffix | --program-suffix | --program-suffi | --program-suff \ - | --program-suf | --program-su | --program-s) - ac_prev=program_suffix ;; - -program-suffix=* | --program-suffix=* | --program-suffi=* \ - | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) - program_suffix="$ac_optarg" ;; - - -program-transform-name | --program-transform-name \ - | --program-transform-nam | --program-transform-na \ - | --program-transform-n | --program-transform- \ - | --program-transform | --program-transfor \ - | --program-transfo | --program-transf \ - | --program-trans | --program-tran \ - | --progr-tra | --program-tr | --program-t) - ac_prev=program_transform_name ;; - -program-transform-name=* | --program-transform-name=* \ - | --program-transform-nam=* | --program-transform-na=* \ - | --program-transform-n=* | --program-transform-=* \ - | --program-transform=* | --program-transfor=* \ - | --program-transfo=* | --program-transf=* \ - | --program-trans=* | --program-tran=* \ - | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name="$ac_optarg" ;; - - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; - - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) - ac_prev=sbindir ;; - -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ - | --sbi=* | --sb=*) - sbindir="$ac_optarg" ;; - - -sharedstatedir | --sharedstatedir | --sharedstatedi \ - | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ - | --sharedst | --shareds | --shared | --share | --shar \ - | --sha | --sh) - ac_prev=sharedstatedir ;; - -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ - | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ - | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ - | --sha=* | --sh=*) - sharedstatedir="$ac_optarg" ;; - - -site | --site | --sit) - ac_prev=site ;; - -site=* | --site=* | --sit=*) - site="$ac_optarg" ;; - - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) - ac_prev=srcdir ;; - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - srcdir="$ac_optarg" ;; - - -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ - | --syscon | --sysco | --sysc | --sys | --sy) - ac_prev=sysconfdir ;; - -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ - | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) - sysconfdir="$ac_optarg" ;; - - -target | --target | --targe | --targ | --tar | --ta | --t) - ac_prev=target ;; - -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) - target="$ac_optarg" ;; - - -v | -verbose | --verbose | --verbos | --verbo | --verb) - verbose=yes ;; - - -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.13" - exit 0 ;; - - -with-* | --with-*) - ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'` - # Reject names that are not valid shell variable names. - if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then - { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } - fi - ac_package=`echo $ac_package| sed 's/-/_/g'` - case "$ac_option" in - *=*) ;; - *) ac_optarg=yes ;; - esac - eval "with_${ac_package}='$ac_optarg'" ;; - - -without-* | --without-*) - ac_package=`echo $ac_option|sed -e 's/-*without-//'` - # Reject names that are not valid shell variable names. - if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then - { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } - fi - ac_package=`echo $ac_package| sed 's/-/_/g'` - eval "with_${ac_package}=no" ;; - - --x) - # Obsolete; use --with-x. - with_x=yes ;; - - -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ - | --x-incl | --x-inc | --x-in | --x-i) - ac_prev=x_includes ;; - -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ - | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) - x_includes="$ac_optarg" ;; - - -x-libraries | --x-libraries | --x-librarie | --x-librari \ - | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) - ac_prev=x_libraries ;; - -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries="$ac_optarg" ;; - - -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; } - ;; - - *) - if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then - echo "configure: warning: $ac_option: invalid host type" 1>&2 - fi - if test "x$nonopt" != xNONE; then - { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } - fi - nonopt="$ac_option" - ;; - - esac -done - -if test -n "$ac_prev"; then - { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; } -fi - -trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 - -# File descriptor usage: -# 0 standard input -# 1 file creation -# 2 errors and warnings -# 3 some systems may open it to /dev/tty -# 4 used on the Kubota Titan -# 6 checking for... messages and results -# 5 compiler messages saved in config.log -if test "$silent" = yes; then - exec 6>/dev/null -else - exec 6>&1 -fi -exec 5>./config.log - -echo "\ -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. -" 1>&5 - -# Strip out --no-create and --no-recursion so they do not pile up. -# Also quote any args containing shell metacharacters. -ac_configure_args= -for ac_arg -do - case "$ac_arg" in - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) ;; - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*) - ac_configure_args="$ac_configure_args '$ac_arg'" ;; - *) ac_configure_args="$ac_configure_args $ac_arg" ;; - esac -done - -# NLS nuisances. -# Only set these to C if already set. These must not be set unconditionally -# because not all systems understand e.g. LANG=C (notably SCO). -# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! -# Non-C LC_CTYPE values break the ctype check. -if test "${LANG+set}" = set; then LANG=C; export LANG; fi -if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi -if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi -if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi - -# confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -rf conftest* confdefs.h -# AIX cpp loses on an empty file, so make sure it contains at least a newline. -echo > confdefs.h - -# A filename unique to this package, relative to the directory that -# configure is in, which we can look for to find out if srcdir is correct. -ac_unique_file=close.c - -# Find the source files, if location was not specified. -if test -z "$srcdir"; then - ac_srcdir_defaulted=yes - # Try the directory containing this script, then its parent. - ac_prog=$0 - ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'` - test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. - srcdir=$ac_confdir - if test ! -r $srcdir/$ac_unique_file; then - srcdir=.. - fi -else - ac_srcdir_defaulted=no -fi -if test ! -r $srcdir/$ac_unique_file; then - if test "$ac_srcdir_defaulted" = yes; then - { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; } - else - { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; } - fi -fi -srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` - -# Prefer explicitly selected file to automatically selected ones. -if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" - else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" - fi -fi -for ac_site_file in $CONFIG_SITE; do - if test -r "$ac_site_file"; then - echo "loading site script $ac_site_file" - . "$ac_site_file" - fi -done - -if test -r "$cache_file"; then - echo "loading cache $cache_file" - . $cache_file -else - echo "creating cache $cache_file" - > $cache_file -fi - -ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross - -ac_exeext= -ac_objext=o -if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then - # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. - if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then - ac_n= ac_c=' -' ac_t=' ' - else - ac_n=-n ac_c= ac_t= - fi -else - ac_n= ac_c='\c' ac_t= -fi - - - -ac_aux_dir= -for ac_dir in ../../../.. $srcdir/../../../..; do - if test -f $ac_dir/install-sh; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f $ac_dir/install.sh; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - fi -done -if test -z "$ac_aux_dir"; then - { echo "configure: error: can not find install-sh or install.sh in ../../../.. $srcdir/../../../.." 1>&2; exit 1; } -fi -ac_config_guess=$ac_aux_dir/config.guess -ac_config_sub=$ac_aux_dir/config.sub -ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. - - -am__api_version="1.4" -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# 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:578: 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 -else - IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" - for ac_dir in $PATH; do - # Account for people who put trailing slashes in PATH elements. - case "$ac_dir/" in - /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - if test -f $ac_dir/$ac_prog; then - if test $ac_prog = install && - grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - else - ac_cv_path_install="$ac_dir/$ac_prog -c" - break 2 - fi - fi - done - ;; - esac - done - IFS="$ac_save_IFS" - -fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL="$ac_cv_path_install" - else - # As a last resort, use the slow shell script. We don't cache a - # path for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the path is relative. - INSTALL="$ac_install_sh" - fi -fi -echo "$ac_t""$INSTALL" 1>&6 - -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - -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:631: checking whether build environment is sane" >&5 -# Just in case -sleep 1 -echo timestamp > conftestfile -# Do `set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null` - if test "$*" = "X"; then - # -L didn't work. - set X `ls -t $srcdir/configure conftestfile` - fi - if test "$*" != "X $srcdir/configure conftestfile" \ - && test "$*" != "X conftestfile $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - { echo "configure: error: ls -t appears to fail. Make sure there is not a broken -alias in your environment" 1>&2; exit 1; } - fi - - test "$2" = conftestfile - ) -then - # Ok. - : -else - { echo "configure: error: newly created file is older than distributed files! -Check your system clock" 1>&2; exit 1; } -fi -rm -f conftest* -echo "$ac_t""yes" 1>&6 -if test "$program_transform_name" = s,x,x,; then - program_transform_name= -else - # Double any \ or $. echo might interpret backslashes. - cat <<\EOF_SED > conftestsed -s,\\,\\\\,g; s,\$,$$,g -EOF_SED - program_transform_name="`echo $program_transform_name|sed -f conftestsed`" - rm -f conftestsed -fi -test "$program_prefix" != NONE && - program_transform_name="s,^,${program_prefix},; $program_transform_name" -# Use a double $ so make ignores it. -test "$program_suffix" != NONE && - program_transform_name="s,\$\$,${program_suffix},; $program_transform_name" - -# sed with no file args requires a program. -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:688: 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 -else - cat > conftestmake <<\EOF -all: - @echo 'ac_maketemp="${MAKE}"' -EOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. -eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=` -if test -n "$ac_maketemp"; then - eval ac_cv_prog_make_${ac_make}_set=yes -else - eval ac_cv_prog_make_${ac_make}_set=no -fi -rm -f conftestmake -fi -if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$ac_t""yes" 1>&6 - SET_MAKE= -else - echo "$ac_t""no" 1>&6 - SET_MAKE="MAKE=${MAKE-make}" -fi - -if test $host != $build; then - ac_tool_prefix=${host_alias}- -else - ac_tool_prefix= -fi - -echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:721: 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 726 "configure" -#include "confdefs.h" - -int main() { - -#ifndef __CYGWIN__ -#define __CYGWIN__ __CYGWIN32__ -#endif -return __CYGWIN__; -; return 0; } -EOF -if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_cygwin=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_cygwin=no -fi -rm -f conftest* -rm -f conftest* -fi - -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:754: 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 759 "configure" -#include "confdefs.h" - -int main() { -return __MINGW32__; -; return 0; } -EOF -if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_mingw32=yes -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_mingw32=no -fi -rm -f conftest* -rm -f conftest* -fi - -echo "$ac_t""$ac_cv_mingw32" 1>&6 -MINGW32= -test "$ac_cv_mingw32" = yes && MINGW32=yes - -# Check whether --enable-multilib or --disable-multilib was given. -if test "${enable_multilib+set}" = set; then - enableval="$enable_multilib" - case "${enableval}" in - yes) multilib=yes ;; - no) multilib=no ;; - *) { echo "configure: error: bad value ${enableval} for multilib option" 1>&2; exit 1; } ;; - esac -else - multilib=yes -fi - -# Check whether --enable-target-optspace or --disable-target-optspace was given. -if test "${enable_target_optspace+set}" = set; then - enableval="$enable_target_optspace" - case "${enableval}" in - yes) target_optspace=yes ;; - no) target_optspace=no ;; - *) { echo "configure: error: bad value ${enableval} for target-optspace option" 1>&2; exit 1; } ;; - esac -else - target_optspace= -fi - -# Check whether --enable-malloc-debugging or --disable-malloc-debugging was given. -if test "${enable_malloc_debugging+set}" = set; then - enableval="$enable_malloc_debugging" - case "${enableval}" in - yes) malloc_debugging=yes ;; - no) malloc_debugging=no ;; - *) { echo "configure: error: bad value ${enableval} for malloc-debugging option" 1>&2; exit 1; } ;; - esac -else - malloc_debugging= -fi - -# Check whether --enable-newlib-multithread or --disable-newlib-multithread was given. -if test "${enable_newlib_multithread+set}" = set; then - enableval="$enable_newlib_multithread" - case "${enableval}" in - yes) newlib_multithread=yes ;; - no) newlib_multithread=no ;; - *) { echo "configure: error: bad value ${enableval} for newlib-multithread option" 1>&2; exit 1; } ;; - esac -else - newlib_multithread=yes -fi - -# Check whether --enable-newlib-iconv or --disable-newlib-iconv was given. -if test "${enable_newlib_iconv+set}" = set; then - enableval="$enable_newlib_iconv" - if test "${newlib_iconv+set}" != set; then - case "${enableval}" in - yes) newlib_iconv=yes ;; - no) newlib_iconv=no ;; - *) { echo "configure: error: bad value ${enableval} for newlib-iconv option" 1>&2; exit 1; } ;; - esac - fi -else - newlib_iconv=${newlib_iconv} -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" - case "${enableval}" in - yes) newlib_io_float=yes ;; - no) newlib_io_float=no ;; - *) { echo "configure: error: bad value ${enableval} for newlib-io-float option" 1>&2; exit 1; } ;; - esac -else - newlib_io_float=yes -fi - -# Check whether --enable-newlib-supplied-syscalls or --disable-newlib-supplied-syscalls was given. -if test "${enable_newlib_supplied_syscalls+set}" = set; then - enableval="$enable_newlib_supplied_syscalls" - case "${enableval}" in - yes) newlib_may_supply_syscalls=yes ;; - no) newlib_may_supply_syscalls=no ;; - *) { echo "configure: error: bad value ${enableval} for newlib-supplied-syscalls option" 1>&2; exit 1; } ;; - esac -else - newlib_may_supply_syscalls=yes -fi - - - -if test x${newlib_may_supply_syscalls} = xyes; then - MAY_SUPPLY_SYSCALLS_TRUE= - MAY_SUPPLY_SYSCALLS_FALSE='#' -else - MAY_SUPPLY_SYSCALLS_TRUE='#' - MAY_SUPPLY_SYSCALLS_FALSE= -fi - - -test -z "${with_target_subdir}" && with_target_subdir=. - -if test "${srcdir}" = "."; then - if test "${with_target_subdir}" != "."; then - newlib_basedir="${srcdir}/${with_multisrctop}../../../.." - else - newlib_basedir="${srcdir}/${with_multisrctop}../../.." - fi -else - newlib_basedir="${srcdir}/../../.." -fi - - - -# Do some error checking and defaulting for the host and target type. -# The inputs are: -# configure --host=HOST --target=TARGET --build=BUILD NONOPT -# -# The rules are: -# 1. You are not allowed to specify --host, --target, and nonopt at the -# same time. -# 2. Host defaults to nonopt. -# 3. If nonopt is not specified, then host defaults to the current host, -# as determined by config.guess. -# 4. Target and build default to nonopt. -# 5. If nonopt is not specified, then target and build default to host. - -# The aliases save the names the user supplied, while $host etc. -# will get canonicalized. -case $host---$target---$nonopt in -NONE---*---* | *---NONE---* | *---*---NONE) ;; -*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;; -esac - - -# Make sure we can run config.sub. -if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : -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:936: checking host system type" >&5 - -host_alias=$host -case "$host_alias" in -NONE) - case $nonopt in - NONE) - if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then : - else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } - fi ;; - *) host_alias=$nonopt ;; - esac ;; -esac - -host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias` -host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -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:957: checking target system type" >&5 - -target_alias=$target -case "$target_alias" in -NONE) - case $nonopt in - NONE) target_alias=$host_alias ;; - *) target_alias=$nonopt ;; - esac ;; -esac - -target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias` -target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -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:975: checking build system type" >&5 - -build_alias=$build -case "$build_alias" in -NONE) - case $nonopt in - NONE) build_alias=$host_alias ;; - *) build_alias=$nonopt ;; - esac ;; -esac - -build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias` -build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -echo "$ac_t""$build" 1>&6 - -test "$host_alias" != "$target_alias" && - test "$program_prefix$program_suffix$program_transform_name" = \ - NONENONEs,x,x, && - program_prefix=${target_alias}- - - - -PACKAGE=newlib - -VERSION=1.14.0 - -if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then - { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } -fi - - - -missing_dir=`cd $ac_aux_dir && pwd` -echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6 -echo "configure:1011: checking for working aclocal-${am__api_version}" >&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. -if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then - ACLOCAL=aclocal-${am__api_version} - echo "$ac_t""found" 1>&6 -else - ACLOCAL="$missing_dir/missing aclocal-${am__api_version}" - echo "$ac_t""missing" 1>&6 -fi - -echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:1024: 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. -if (autoconf --version) < /dev/null > /dev/null 2>&1; then - AUTOCONF=autoconf - echo "$ac_t""found" 1>&6 -else - AUTOCONF="$missing_dir/missing autoconf" - echo "$ac_t""missing" 1>&6 -fi - -echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6 -echo "configure:1037: checking for working automake-${am__api_version}" >&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. -if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then - AUTOMAKE=automake-${am__api_version} - echo "$ac_t""found" 1>&6 -else - AUTOMAKE="$missing_dir/missing automake-${am__api_version}" - echo "$ac_t""missing" 1>&6 -fi - -echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:1050: 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. -if (autoheader --version) < /dev/null > /dev/null 2>&1; then - AUTOHEADER=autoheader - echo "$ac_t""found" 1>&6 -else - AUTOHEADER="$missing_dir/missing autoheader" - echo "$ac_t""missing" 1>&6 -fi - -echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:1063: 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. -if (makeinfo --version) < /dev/null > /dev/null 2>&1; then - MAKEINFO=makeinfo - echo "$ac_t""found" 1>&6 -else - MAKEINFO="$missing_dir/missing makeinfo" - echo "$ac_t""missing" 1>&6 -fi - - - -# FIXME: We temporarily define our own version of AC_PROG_CC. This is -# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS. We -# are probably using a cross compiler, which will not be able to fully -# link an executable. This should really be fixed in autoconf -# itself. - - - -# 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:1088: 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 - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_CC="gcc" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -CC="$ac_cv_prog_CC" -if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -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:1118: 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 - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_prog_rejected=no - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" - break - fi - done - IFS="$ac_save_ifs" -if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $ac_cv_prog_CC - shift - if test $# -gt 0; then - # We chose a different compiler from the bogus one. - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift - set dummy "$ac_dir/$ac_word" "$@" - shift - ac_cv_prog_CC="$@" - fi -fi -fi -fi -CC="$ac_cv_prog_CC" -if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - - test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } -fi - -echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1167: 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 - cat > conftest.c <<EOF -#ifdef __GNUC__ - yes; -#endif -EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1176: \"$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 -fi -fi - -echo "$ac_t""$ac_cv_prog_gcc" 1>&6 - -if test $ac_cv_prog_gcc = yes; then - GCC=yes - 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:1191: 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 - echo 'void f(){}' > conftest.c -if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then - ac_cv_prog_cc_g=yes -else - ac_cv_prog_cc_g=no -fi -rm -f conftest* - -fi - -echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 - if test "$ac_test_CFLAGS" = set; then - CFLAGS="$ac_save_CFLAGS" - elif test $ac_cv_prog_cc_g = yes; then - CFLAGS="-g -O2" - else - CFLAGS="-O2" - fi -else - GCC= - test "${CFLAGS+set}" = set || CFLAGS="-g" -fi - - -# 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:1222: 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 - if test -n "$AS"; then - ac_cv_prog_AS="$AS" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_AS="${ac_tool_prefix}as" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_prog_AS" && ac_cv_prog_AS="as" -fi -fi -AS="$ac_cv_prog_AS" -if test -n "$AS"; then - echo "$ac_t""$AS" 1>&6 -else - echo "$ac_t""no" 1>&6 -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:1254: 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 - if test -n "$AR"; then - ac_cv_prog_AR="$AR" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_AR="${ac_tool_prefix}ar" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar" -fi -fi -AR="$ac_cv_prog_AR" -if test -n "$AR"; then - echo "$ac_t""$AR" 1>&6 -else - echo "$ac_t""no" 1>&6 -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:1286: 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 - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -RANLIB="$ac_cv_prog_RANLIB" -if test -n "$RANLIB"; then - echo "$ac_t""$RANLIB" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - - -if test -z "$ac_cv_prog_RANLIB"; then -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:1318: 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 - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_RANLIB="ranlib" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":" -fi -fi -RANLIB="$ac_cv_prog_RANLIB" -if test -n "$RANLIB"; then - echo "$ac_t""$RANLIB" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -else - RANLIB=":" -fi -fi - - -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# 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:1363: 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 -else - IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" - for ac_dir in $PATH; do - # Account for people who put trailing slashes in PATH elements. - case "$ac_dir/" in - /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - if test -f $ac_dir/$ac_prog; then - if test $ac_prog = install && - grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - else - ac_cv_path_install="$ac_dir/$ac_prog -c" - break 2 - fi - fi - done - ;; - esac - done - IFS="$ac_save_IFS" - -fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL="$ac_cv_path_install" - else - # As a last resort, use the slow shell script. We don't cache a - # path for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the path is relative. - INSTALL="$ac_install_sh" - fi -fi -echo "$ac_t""$INSTALL" 1>&6 - -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' - -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - - -# Hack to ensure that INSTALL won't be set to "../" with autoconf 2.13. */ -ac_given_INSTALL=$INSTALL - -echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1420: 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" - USE_MAINTAINER_MODE=$enableval -else - USE_MAINTAINER_MODE=no -fi - - echo "$ac_t""$USE_MAINTAINER_MODE" 1>&6 - - -if test $USE_MAINTAINER_MODE = yes; then - MAINTAINER_MODE_TRUE= - MAINTAINER_MODE_FALSE='#' -else - MAINTAINER_MODE_TRUE='#' - MAINTAINER_MODE_FALSE= -fi - MAINT=$MAINTAINER_MODE_TRUE - - - -# We need AC_EXEEXT to keep automake happy in cygnus mode. However, -# at least currently, we never actually build a program, so we never -# need to use $(EXEEXT). Moreover, the test for EXEEXT normally -# fails, because we are probably configuring with a cross compiler -# which can't create executables. So we include AC_EXEEXT to keep -# automake happy, but we don't execute it, since we don't care about -# the result. -if false; then - - -echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1454: checking for executable suffix" >&5 -if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test "$CYGWIN" = yes || test "$MINGW32" = yes; then - ac_cv_exeext=.exe -else - rm -f conftest* - echo 'int main () { return 0; }' > conftest.$ac_ext - ac_cv_exeext= - if { (eval echo configure:1464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then - for file in conftest.*; do - case $file in - *.$ac_ext | *.c | *.o | *.obj) ;; - *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; - esac - done - else - { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; } - fi - rm -f conftest* - test x"${ac_cv_exeext}" = x && ac_cv_exeext=no -fi -fi - -EXEEXT="" -test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext} -echo "$ac_t""${ac_cv_exeext}" 1>&6 -ac_exeext=$EXEEXT - -fi - -. ${newlib_basedir}/configure.host - -newlib_cflags="${newlib_cflags} -fno-builtin" - -NEWLIB_CFLAGS=${newlib_cflags} - - -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='#' -else - USE_LIBTOOL_TRUE='#' - USE_LIBTOOL_FALSE= -fi - -# Hard-code OBJEXT. Normally it is set by AC_OBJEXT, but we -# use oext, which is set in configure.host based on the target platform. -OBJEXT=${oext} - - - - - - - - - - -trap '' 1 2 15 -cat > confcache <<\EOF -# This file is a shell script that caches the results of configure -# tests run on this system so they can be shared between configure -# scripts and configure runs. It is not useful on other systems. -# If it contains results you don't want to keep, you may remove or edit it. -# -# By default, configure uses ./config.cache as the cache file, -# creating it if it does not exist already. You can give configure -# the --cache-file=FILE option to use a different cache file; that is -# what configure does when it calls configure scripts in -# subdirectories, so they share the cache. -# Giving --cache-file=/dev/null disables caching, for debugging configure. -# config.status only pays attention to the cache file if you give it the -# --recheck option to rerun configure. -# -EOF -# The following way of writing the cache mishandles newlines in values, -# but we know of no workaround that is simple, portable, and efficient. -# So, don't put newlines in cache variables' values. -# Ultrix sh set writes to stderr and can't be redirected directly, -# and sets the high bit in the cache file unless we assign to the vars. -(set) 2>&1 | - case `(ac_space=' '; set | grep ac_space) 2>&1` in - *ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote substitution - # turns \\\\ into \\, and sed turns \\ into \). - sed -n \ - -e "s/'/'\\\\''/g" \ - -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" - ;; - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' - ;; - esac >> confcache -if cmp -s $cache_file confcache; then - : -else - if test -w $cache_file; then - echo "updating cache $cache_file" - cat confcache > $cache_file - else - echo "not updating unwritable cache $cache_file" - fi -fi -rm -f confcache - -trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 - -test "x$prefix" = xNONE && prefix=$ac_default_prefix -# Let make expand exec_prefix. -test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - -# Any assignment to VPATH causes Sun make to only execute -# the first set of double-colon rules, so remove it if not needed. -# If there is a colon in the path, we need to keep it. -if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d' -fi - -trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 - -# Transform confdefs.h into DEFS. -# Protect against shell expansion while executing Makefile rules. -# Protect against Makefile macro expansion. -cat > conftest.defs <<\EOF -s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g -s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g -s%\[%\\&%g -s%\]%\\&%g -s%\$%$$%g -EOF -DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` -rm -f conftest.defs - - -# Without the "./", some shells look in PATH for config.status. -: ${CONFIG_STATUS=./config.status} - -echo creating $CONFIG_STATUS -rm -f $CONFIG_STATUS -cat > $CONFIG_STATUS <<EOF -#! /bin/sh -# Generated automatically by configure. -# Run this file to recreate the current configuration. -# This directory was configured as follows, -# on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -# -# $0 $ac_configure_args -# -# Compiler output produced by configure, useful for debugging -# configure, is in ./config.log if it exists. - -ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]" -for ac_option -do - case "\$ac_option" in - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" - exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; - -version | --version | --versio | --versi | --vers | --ver | --ve | --v) - echo "$CONFIG_STATUS generated by autoconf version 2.13" - exit 0 ;; - -help | --help | --hel | --he | --h) - echo "\$ac_cs_usage"; exit 0 ;; - *) echo "\$ac_cs_usage"; exit 1 ;; - esac -done - -ac_given_srcdir=$srcdir -ac_given_INSTALL="$INSTALL" - -trap 'rm -fr `echo "Makefile" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 -EOF -cat >> $CONFIG_STATUS <<EOF - -# Protect against being on the right side of a sed subst in config.status. -sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g; - s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF -$ac_vpsub -$extrasub -s%@SHELL@%$SHELL%g -s%@CFLAGS@%$CFLAGS%g -s%@CPPFLAGS@%$CPPFLAGS%g -s%@CXXFLAGS@%$CXXFLAGS%g -s%@FFLAGS@%$FFLAGS%g -s%@DEFS@%$DEFS%g -s%@LDFLAGS@%$LDFLAGS%g -s%@LIBS@%$LIBS%g -s%@exec_prefix@%$exec_prefix%g -s%@prefix@%$prefix%g -s%@program_transform_name@%$program_transform_name%g -s%@bindir@%$bindir%g -s%@sbindir@%$sbindir%g -s%@libexecdir@%$libexecdir%g -s%@datadir@%$datadir%g -s%@sysconfdir@%$sysconfdir%g -s%@sharedstatedir@%$sharedstatedir%g -s%@localstatedir@%$localstatedir%g -s%@libdir@%$libdir%g -s%@includedir@%$includedir%g -s%@oldincludedir@%$oldincludedir%g -s%@infodir@%$infodir%g -s%@mandir@%$mandir%g -s%@MAY_SUPPLY_SYSCALLS_TRUE@%$MAY_SUPPLY_SYSCALLS_TRUE%g -s%@MAY_SUPPLY_SYSCALLS_FALSE@%$MAY_SUPPLY_SYSCALLS_FALSE%g -s%@newlib_basedir@%$newlib_basedir%g -s%@host@%$host%g -s%@host_alias@%$host_alias%g -s%@host_cpu@%$host_cpu%g -s%@host_vendor@%$host_vendor%g -s%@host_os@%$host_os%g -s%@target@%$target%g -s%@target_alias@%$target_alias%g -s%@target_cpu@%$target_cpu%g -s%@target_vendor@%$target_vendor%g -s%@target_os@%$target_os%g -s%@build@%$build%g -s%@build_alias@%$build_alias%g -s%@build_cpu@%$build_cpu%g -s%@build_vendor@%$build_vendor%g -s%@build_os@%$build_os%g -s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g -s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g -s%@INSTALL_DATA@%$INSTALL_DATA%g -s%@PACKAGE@%$PACKAGE%g -s%@VERSION@%$VERSION%g -s%@ACLOCAL@%$ACLOCAL%g -s%@AUTOCONF@%$AUTOCONF%g -s%@AUTOMAKE@%$AUTOMAKE%g -s%@AUTOHEADER@%$AUTOHEADER%g -s%@MAKEINFO@%$MAKEINFO%g -s%@SET_MAKE@%$SET_MAKE%g -s%@CC@%$CC%g -s%@AS@%$AS%g -s%@AR@%$AR%g -s%@RANLIB@%$RANLIB%g -s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g -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 -s%@oext@%$oext%g -s%@aext@%$aext%g -s%@libm_machine_dir@%$libm_machine_dir%g -s%@machine_dir@%$machine_dir%g -s%@sys_dir@%$sys_dir%g - -CEOF -EOF - -cat >> $CONFIG_STATUS <<\EOF - -# Split the substitutions into bite-sized pieces for seds with -# small command number limits, like on Digital OSF/1 and HP-UX. -ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script. -ac_file=1 # Number of current file. -ac_beg=1 # First line for current file. -ac_end=$ac_max_sed_cmds # Line after last line for current file. -ac_more_lines=: -ac_sed_cmds="" -while $ac_more_lines; do - if test $ac_beg -gt 1; then - sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file - else - sed "${ac_end}q" conftest.subs > conftest.s$ac_file - fi - if test ! -s conftest.s$ac_file; then - ac_more_lines=false - rm -f conftest.s$ac_file - else - if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f conftest.s$ac_file" - else - ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file" - fi - ac_file=`expr $ac_file + 1` - ac_beg=$ac_end - ac_end=`expr $ac_end + $ac_max_sed_cmds` - fi -done -if test -z "$ac_sed_cmds"; then - ac_sed_cmds=cat -fi -EOF - -cat >> $CONFIG_STATUS <<EOF - -CONFIG_FILES=\${CONFIG_FILES-"Makefile"} -EOF -cat >> $CONFIG_STATUS <<\EOF -for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case "$ac_file" in - *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` - ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; - *) ac_file_in="${ac_file}.in" ;; - esac - - # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories. - - # Remove last slash and all that follows it. Not all systems have dirname. - ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` - if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - # The file is in a subdirectory. - test ! -d "$ac_dir" && mkdir "$ac_dir" - ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`" - # A "../" for each directory in $ac_dir_suffix. - ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'` - else - ac_dir_suffix= ac_dots= - fi - - case "$ac_given_srcdir" in - .) srcdir=. - if test -z "$ac_dots"; then top_srcdir=. - else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; - /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; - *) # Relative path. - srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" - top_srcdir="$ac_dots$ac_given_srcdir" ;; - esac - - case "$ac_given_INSTALL" in - [/$]*) INSTALL="$ac_given_INSTALL" ;; - *) INSTALL="$ac_dots$ac_given_INSTALL" ;; - esac - - echo creating "$ac_file" - rm -f "$ac_file" - configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure." - case "$ac_file" in - *Makefile*) ac_comsub="1i\\ -# $configure_input" ;; - *) ac_comsub= ;; - esac - - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` - sed -e "$ac_comsub -s%@configure_input@%$configure_input%g -s%@srcdir@%$srcdir%g -s%@top_srcdir@%$top_srcdir%g -s%@INSTALL@%$INSTALL%g -" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file -fi; done -rm -f conftest.s* - -EOF -cat >> $CONFIG_STATUS <<EOF - -EOF -cat >> $CONFIG_STATUS <<\EOF - -exit 0 -EOF -chmod +x $CONFIG_STATUS -rm -fr confdefs* $ac_clean_files -test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 - diff --git a/newlib/libc/sys/rdos/configure.in b/newlib/libc/sys/rdos/configure.in deleted file mode 100644 index 6a78d9997..000000000 --- a/newlib/libc/sys/rdos/configure.in +++ /dev/null @@ -1,12 +0,0 @@ -dnl This is the newlib/libc/sys/rdos configure.in file. -dnl Process this file with autoconf to produce a configure script. - -AC_PREREQ(2.5) -AC_INIT(close.c) - -dnl Can't be done in NEWLIB_CONFIGURE because that confuses automake. -AC_CONFIG_AUX_DIR(../../../..) - -NEWLIB_CONFIGURE(../../..) - -AC_OUTPUT(Makefile) diff --git a/newlib/libc/sys/rdos/crt0.S b/newlib/libc/sys/rdos/crt0.S deleted file mode 100644 index efc3b1633..000000000 --- a/newlib/libc/sys/rdos/crt0.S +++ /dev/null @@ -1,406 +0,0 @@ -/*####################################################################### -# RDOS operating system -# Copyright (C) 1988-2006, Leif Ekblad -# -# This library is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published -# by the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# The author of this program may be contacted at leif@rdos.net -# -# crt0.S -# GCC startupcode for RDOS -# -##########################################################################*/ - -#include "user.def" - - KEY_ENTRIES = 256 - - .macro UserGate nr - .byte 0x9A - .long \nr - .word 2 - .endm - - .data - .align 8 - -_key_section: - .word 0 - -_key_ref_arr: - .long 0 - -_key_dtor_arr: - .long 0 - - .text - .align 4 - -/*########################################################################## -# -# Name : _start -# -# Purpose....: GCC startup-code -# -##########################################################################*/ - - .global _start - -_start: - call get_impure_data_size - movl %eax,%ecx - UserGate allocate_app_mem_nr - - xorl %eax,%eax - .byte 0x64 - movl %edx,(%eax) - movl %edx,%edi - rep - stosb - pushl %edx - - movl $(4 * KEY_ENTRIES),%eax - movl %eax,%ecx - UserGate allocate_app_mem_nr - movl $4,%eax - .byte 0x64 - movl %edx,(%eax) - movl %edx,%edi - xorl %eax,%eax - rep - stosb - - movl $(4 * KEY_ENTRIES),%eax - movl %eax,%ecx - UserGate allocate_app_mem_nr - movl %edx,_key_ref_arr - movl %edx,%edi - xorl %eax,%eax - rep - stosb - - movl $(4 * KEY_ENTRIES),%eax - movl %eax,%ecx - UserGate allocate_app_mem_nr - movl %edx,_key_dtor_arr - movl %edx,%edi - xorl %eax,%eax - rep - stosb - - UserGate create_user_section_nr - movw %bx,_key_section - - call __init_rdos - add $4, %esp - - movl $0x1000,%eax - UserGate allocate_app_mem_nr - - pushl %edx - UserGate get_cmd_line_nr - - xorl %ecx,%ecx - xorb %ah,%ah - -arg_loop: - movl %edi,(%edx) - addl $4,%edx - movb (%edi),%al - orb %al,%al - je arg_done - -arg_scan: - movb (%edi),%al - orb %al,%al - je next_arg - - cmpb $0x22,%al - jne arg_no_quote - - xorb $1,%ah - jmp arg_scan_next - -arg_no_quote: - orb %ah,%ah - jnz arg_scan_next - - cmpb $0x20,%al - je next_arg - - cmpb $0x8,%al - je next_arg - -arg_scan_next: - incl %edi - jmp arg_scan - -next_arg: - incl %ecx - -to_next_arg: - orb %al,%al - je arg_done - - xorb %al,%al - movb %al,(%edi) - incl %edi - movb (%edi),%al - cmpb $0x20,%al - je to_next_arg - - cmpb $0x8,%al - je to_next_arg - - jmp arg_loop - -arg_done: - int $3 - pushl %ecx - call main - add $8, %esp - - pushl %eax - call exit - -/*########################################################################## -# -# Name : _exit -# -# Purpose....: GCC exit-code -# -##########################################################################*/ - - .global _exit - -_exit: - pushl %ebp - movl %esp,%ebp - movl 8(%ebp),%eax - UserGate unload_exe_nr - -/*########################################################################## -# -# Name : __getreent -# -# Purpose....: ? -# -##########################################################################*/ - - .global __getreent - -__getreent: - xorl %eax,%eax - .byte 0x64 - movl (%eax),%eax - ret - -/*########################################################################## -# -# Name : __rdos_thread_key_create -# -# Purpose....: Emulate GCC pthread_key_create -# -# Parameters.: dtor -# -# Returns....: Key index -# -##########################################################################*/ - - .global __rdos_thread_key_create - -__rdos_thread_key_create: - int $3 - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - - mov _key_section,%bx - UserGate enter_user_section_nr - - movl _key_ref_arr,%ebx - movl KEY_ENTRIES,%ecx - -rtkc_scan_loop: - movl (%ebx), %eax - orl %eax, %eax - jz rtkc_entry_found - - add $4, %ebx - loop rtkc_scan_loop - - movl $-1, %eax - jmp rtkc_leave - -rtkc_entry_found: - movb $255,3(%ebx) - subl _key_ref_arr,%ebx - addl _key_dtor_arr,%ebx - movl 8(%ebp),%eax - movl %eax,(%ebx) - subl _key_dtor_arr,%ebx - movl %ebx,%eax - -rtkc_leave: - mov _key_section, %bx - UserGate leave_user_section_nr - - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : __rdos_thread_key_delete -# -# Purpose....: Emulate GCC pthread_key_delete -# -# Parameters.: index -# -# Returns....: result -# -##########################################################################*/ - - .global __rdos_thread_key_delete - -__rdos_thread_key_delete: - int $3 - pushl %ebp - movl %esp,%ebp - pushl %ebx - - mov _key_section,%bx - UserGate enter_user_section_nr - - movl 8(%ebp),%ebx - testb $3,%bl - jnz rtkd_fail - - cmpl $(4 * KEY_ENTRIES),%ebx - jae rtkd_fail - - addl _key_ref_arr,%ebx - movb $0,3(%ebx) - mov (%ebx),%eax - orl %eax,%eax - jz rtkd_ok - - subl _key_ref_arr,%ebx - movl $0,(%ebx) - jmp rtkd_ok - -rtkd_fail: - movl $1,%eax - jmp rtkd_leave - -rtkd_ok: - xorl %eax,%eax - -rtkd_leave: - mov _key_section, %bx - UserGate leave_user_section_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : __rdos_thread_getspecific -# -# Purpose....: Emulate GCC pthread_getspecific -# -# Parameters.: index -# -# Returns....: value -# -##########################################################################*/ - - .global __rdos_thread_getspecific - -__rdos_thread_getspecific: - int $3 - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movl 8(%ebp),%ebx - testb $3,%bl - jnz rtg_fail - - cmpl $(4 * KEY_ENTRIES),%ebx - jae rtg_fail - - movl $4,%eax - .byte 0x64 - movl (%eax),%eax - addl %eax,%ebx - movl (%ebx),%eax - jmp rtg_done - -rtg_fail: - xorl %eax,%eax - -rtg_done: - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : __rdos_thread_setspecific -# -# Purpose....: Emulate GCC pthread_setspecific -# -# Parameters.: index -# value -# -##########################################################################*/ - - .global __rdos_thread_setspecific - -__rdos_thread_setspecific: - int $3 - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - - movl 8(%ebp),%ebx - testb $3,%bl - jnz rts_fail - - cmpl $(4 * KEY_ENTRIES),%ebx - jae rts_fail - - movl $4,%eax - .byte 0x64 - movl (%eax),%eax - addl %eax,%ebx - - movl 12(%ebp),%eax - movl %eax,(%ebx) - xorl %eax,%eax - jmp rts_done - -rts_fail: - movl $1,%eax - -rts_done: - popl %ebx - leave - ret diff --git a/newlib/libc/sys/rdos/execve.c b/newlib/libc/sys/rdos/execve.c deleted file mode 100644 index ac7eeb25c..000000000 --- a/newlib/libc/sys/rdos/execve.c +++ /dev/null @@ -1,10 +0,0 @@ -#include "config.h"
-#include <_ansi.h>
-#include <_syslist.h>
-#include <errno.h>
-
-int execve( char *name, char **argv, char **env)
-{
- errno = ENOSYS;
- return -1;
-}
diff --git a/newlib/libc/sys/rdos/fork.c b/newlib/libc/sys/rdos/fork.c deleted file mode 100755 index fc335bb41..000000000 --- a/newlib/libc/sys/rdos/fork.c +++ /dev/null @@ -1,10 +0,0 @@ -#include "config.h"
-#include <_ansi.h>
-#include <_syslist.h>
-#include <errno.h>
-
-int fork()
-{
- errno = ENOSYS;
- return -1;
-}
diff --git a/newlib/libc/sys/rdos/fstat.c b/newlib/libc/sys/rdos/fstat.c deleted file mode 100755 index c18dd78ed..000000000 --- a/newlib/libc/sys/rdos/fstat.c +++ /dev/null @@ -1,45 +0,0 @@ -/*#######################################################################
-# RDOS operating system
-# Copyright (C) 1988-2006, Leif Ekblad
-#
-# This library is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published
-# by the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-# The author of this program may be contacted at leif@rdos.net
-#
-# fstat.c
-# fstat function implementation
-#
-##########################################################################*/
-
-#include "config.h"
-#include <_ansi.h>
-#include <_syslist.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
-
-int fstat(int fd, struct stat *st)
-{
- if (fd < 3)
- {
- st->st_mode = S_IFCHR;
- st->st_blksize = 0;
- return 0;
- }
- else
- {
- return -1;
- }
-}
diff --git a/newlib/libc/sys/rdos/getenv.c b/newlib/libc/sys/rdos/getenv.c deleted file mode 100644 index 933ea4d76..000000000 --- a/newlib/libc/sys/rdos/getenv.c +++ /dev/null @@ -1,83 +0,0 @@ -/*####################################################################### -# RDOS operating system -# Copyright (C) 1988-2006, Leif Ekblad -# -# This library is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published -# by the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# The author of this program may be contacted at leif@rdos.net -# -# getenv.c -# getenv function implementation -# -##########################################################################*/ - -/* -FUNCTION -<<getenv>>---look up environment variable - -INDEX - getenv -INDEX - environ - -ANSI_SYNOPSIS - #include <stdlib.h> - char *getenv(const char *<[name]>); - -TRAD_SYNOPSIS - #include <stdlib.h> - char *getenv(<[name]>) - char *<[name]>; - -DESCRIPTION -<<getenv>> searches the list of environment variable names and values -(using the global pointer ``<<char **environ>>'') for a variable whose -name matches the string at <[name]>. If a variable name matches, -<<getenv>> returns a pointer to the associated value. - -RETURNS -A pointer to the (string) value of the environment variable, or -<<NULL>> if there is no such environment variable. - -PORTABILITY -<<getenv>> is ANSI, but the rules for properly forming names of environment -variables vary from one system to another. - -This function is not thread-safe, but does it need to be?? -There is an reentrant class that should be used if reentrance is required - -*/ - -#include <stdlib.h> -#include <stddef.h> -#include <string.h> -#include <rdos.h> - -static char envbuf[256]; - -char *getenv(const char *name) -{ - int handle; - char *ptr = 0; - - handle = RdosOpenSysEnv(); - if (handle) - { - if (RdosFindEnvVar(handle, name, envbuf)) - ptr = envbuf; - } - RdosCloseEnv(handle); - return ptr; -} diff --git a/newlib/libc/sys/rdos/getpid.c b/newlib/libc/sys/rdos/getpid.c deleted file mode 100644 index d84d673e6..000000000 --- a/newlib/libc/sys/rdos/getpid.c +++ /dev/null @@ -1,10 +0,0 @@ -#include "config.h"
-#include <_ansi.h>
-#include <_syslist.h>
-#include <errno.h>
-
-int getpid()
-{
- errno = ENOSYS;
- return -1;
-}
diff --git a/newlib/libc/sys/rdos/gettod.c b/newlib/libc/sys/rdos/gettod.c deleted file mode 100644 index b1801502d..000000000 --- a/newlib/libc/sys/rdos/gettod.c +++ /dev/null @@ -1,15 +0,0 @@ -#include "config.h"
-#include <_ansi.h>
-#include <_syslist.h>
-#include <sys/time.h>
-#include <sys/times.h>
-#include <errno.h>
-
-struct timeval;
-struct timezone;
-
-int gettimeofday(struct timeval *ptimeval, struct timezone *ptimezone)
-{
- errno = ENOSYS;
- return -1;
-}
diff --git a/newlib/libc/sys/rdos/isatty.c b/newlib/libc/sys/rdos/isatty.c deleted file mode 100644 index 9862a87f8..000000000 --- a/newlib/libc/sys/rdos/isatty.c +++ /dev/null @@ -1,9 +0,0 @@ -#include "config.h"
-#include <_ansi.h>
-#include <_syslist.h>
-#include <errno.h>
-
-int isatty(int file)
-{
- return 0;
-}
diff --git a/newlib/libc/sys/rdos/kill.c b/newlib/libc/sys/rdos/kill.c deleted file mode 100644 index 4f77906de..000000000 --- a/newlib/libc/sys/rdos/kill.c +++ /dev/null @@ -1,10 +0,0 @@ -#include "config.h"
-#include <_ansi.h>
-#include <_syslist.h>
-#include <errno.h>
-
-int kill(int pid, int sig)
-{
- errno = ENOSYS;
- return -1;
-}
diff --git a/newlib/libc/sys/rdos/link.c b/newlib/libc/sys/rdos/link.c deleted file mode 100644 index 23c0b2bee..000000000 --- a/newlib/libc/sys/rdos/link.c +++ /dev/null @@ -1,10 +0,0 @@ -#include "config.h"
-#include <_ansi.h>
-#include <_syslist.h>
-#include <errno.h>
-
-int link(char *existing, char *new)
-{
- errno = ENOSYS;
- return -1;
-}
diff --git a/newlib/libc/sys/rdos/lseek.c b/newlib/libc/sys/rdos/lseek.c deleted file mode 100755 index b1cdb2178..000000000 --- a/newlib/libc/sys/rdos/lseek.c +++ /dev/null @@ -1,59 +0,0 @@ -/*#######################################################################
-# RDOS operating system
-# Copyright (C) 1988-2006, Leif Ekblad
-#
-# This library is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published
-# by the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-# The author of this program may be contacted at leif@rdos.net
-#
-# lseek.c
-# lseek function implementation
-#
-##########################################################################*/
-
-#include "config.h"
-#include <_ansi.h>
-#include <_syslist.h>
-#include <unistd.h>
-#include <errno.h>
-#include <rdos.h>
-
-off_t lseek(int file, off_t pos, int whence)
-{
- off_t temp;
-
- switch (whence)
- {
- case SEEK_CUR:
- temp = RdosGetFilePos(file);
- temp += pos;
- RdosSetFilePos(file, temp);
- return temp;
-
- case SEEK_SET:
- RdosSetFilePos(file, pos);
- return pos;
-
- case SEEK_END:
- temp = RdosGetFilePos(file);
- temp += pos;
- RdosSetFilePos(file, temp);
- return temp;
-
- default:
- errno = EINVAL;
- return - 1;
- }
-}
diff --git a/newlib/libc/sys/rdos/open.c b/newlib/libc/sys/rdos/open.c deleted file mode 100755 index e98910648..000000000 --- a/newlib/libc/sys/rdos/open.c +++ /dev/null @@ -1,59 +0,0 @@ -/*#######################################################################
-# RDOS operating system
-# Copyright (C) 1988-2006, Leif Ekblad
-#
-# This library is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published
-# by the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-# The author of this program may be contacted at leif@rdos.net
-#
-# open.c
-# open function implementation
-#
-##########################################################################*/
-
-#include "config.h"
-#include <_ansi.h>
-#include <_syslist.h>
-#include <fcntl.h>
-#include <errno.h>
-#include "rdos.h"
-#include <stdarg.h>
-
-int open(const char *file, int flags, ...)
-{
- int handle;
- int pos;
-
- if (flags & O_CREAT)
- handle = RdosCreateFile(file, flags);
- else
- handle = RdosOpenFile(file, flags);
-
- if (handle >= 0)
- {
- if (flags & O_APPEND)
- {
- pos = RdosGetFileSize(handle);
- RdosSetFilePos(handle, pos);
- }
-
- if (flags & O_TRUNC)
- RdosSetFileSize(handle, 0);
-
- return handle;
- }
- else
- return -1;
-}
diff --git a/newlib/libc/sys/rdos/rdos.S b/newlib/libc/sys/rdos/rdos.S deleted file mode 100644 index d99be7345..000000000 --- a/newlib/libc/sys/rdos/rdos.S +++ /dev/null @@ -1,7528 +0,0 @@ -/*####################################################################### -# RDOS operating system -# Copyright (C) 1988-2006, Leif Ekblad -# -# This library is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published -# by the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# The author of this program may be contacted at leif@rdos.net -# -# rdos.S -# GCC based interface to RDOS kernel -# -##########################################################################*/ - -#include "user.def" - - .macro UserGate nr - .byte 0x9A - .long \nr - .word 2 - .endm - -/*########################################################################## -# -# Name : RdosSwapShort -# -# Purpose....: Byte reverse a short int -# -# Returns....: Result -# -##########################################################################*/ - - .global RdosSwapShort - -RdosSwapShort: - pushl %ebp - movl %esp,%ebp - movw 8(%ebp),%ax - xchgb %ah,%al - leave - ret - - -/*########################################################################## -# -# Name : RdosSwapLong -# -# Purpose....: Byte reverse a long int -# -# Returns....: Result -# -##########################################################################*/ - - .global RdosSwapLong - -RdosSwapLong: - pushl %ebp - movl %esp,%ebp - movl 8(%ebp),%eax - xchgb %ah,%al - roll $16,%eax - xchgb %ah,%al - leave - ret - - -/*########################################################################## -# -# Name : LocalToNetworkLong -# -# Purpose....: Convert a local long to network format -# -# Returns....: Network format -# -##########################################################################*/ - - .global LocalToNetworkLong - -LocalToNetworkLong: - pushl %ebp - movl %esp,%ebp - movl 8(%ebp),%eax - xchgb %ah,%al - roll $16,%eax - xchgb %ah,%al - leave - ret - -/*########################################################################## -# -# Name : NetworkToLocalLong -# -# Purpose....: Convert a network long to local format -# -# Returns....: Local format -# -##########################################################################*/ - - .global NetworkToLocalLong - -NetworkToLocalLong: - pushl %ebp - movl %esp,%ebp - movl 8(%ebp),%eax - xchgb %ah,%al - roll $16,%eax - xchgb %ah,%al - leave - ret - -/*########################################################################## -# -# Name : RdosGetThreadHandle -# -# Purpose....: Get current thread handle -# -# Returns....: Thread ID -# -##########################################################################*/ - - .global RdosGetThreadHandle - -RdosGetThreadHandle: - pushl %ebp - movl %esp,%ebp - UserGate get_thread_nr - movzx %ax,%eax - leave - ret - -/*########################################################################## -# -# Name : RdosGetThreadState -# -# Purpose....: Get thread state -# -# Parameters.: Thread # -# State buffer -# -##########################################################################*/ - - .global RdosGetThreadState - -RdosGetThreadState: - pushl %ebp - movl %esp,%ebp - push %edi - - movl 8(%ebp),%eax - movl 12(%ebp),%edx - UserGate get_thread_state_nr - jc rgtsFail - - movl $1,%eax - jmp rgtsDone - -rgtsFail: - xorl %eax,%eax - -rgtsDone: - popl %edi - leave - ret - -/*########################################################################## -# -# Name : RdosSuspendThread -# -# Purpose....: Suspend thread -# -# Parameters.: Thread # -# -##########################################################################*/ - - .global RdosSuspendThread - -RdosSuspendThread: - pushl %ebp - movl %esp,%ebp - - movl 8(%ebp),%eax - UserGate suspend_thread_nr - jc rsfFail - - movl $1,%eax - jmp rsfDone - -rsfFail: - xorl %eax,%eax - -rsfDone: - leave - ret - - -/*########################################################################## -# -# Name : RdosExec -# -# Purpose....: Execute a program -# -# Parameters.: Program -# Commandline -# -##########################################################################*/ - - .global RdosExec - -RdosExec: - pushl %ebp - movl %esp,%ebp - pushl %esi - pushl %edi - - movl 8(%ebp),%esi - movl 12(%ebp),%edi - - UserGate load_exe_nr - UserGate get_exit_code_nr - - popl %edi - popl %esi - leave - ret - -/*########################################################################## -# -# Name : RdosSpawn -# -# Purpose....: Create new process and run a program -# -# Parameters.: Program -# Commandline -# StartDir -# -##########################################################################*/ - - .global RdosSpawn - -RdosSpawn: - pushl %ebp - movl %esp,%ebp - pushl %fs - pushl %ebx - pushl %edx - pushl %esi - pushl %edi - - movw %ds,%dx - movw %dx,%fs - xorl %edx,%edx - movl 8(%ebp),%esi - movl 12(%ebp),%edi - movl 16(%ebp),%ebx - UserGate spawn_exe_nr - jc rsFail - - movzx %dx,%eax - jmp rsDone - -rsFail: - xorl %eax,%eax - -rsDone: - popl %edi - popl %esi - popl %edx - popl %ebx - popw %fs - leave - ret - -/*########################################################################## -# -# Name : RdosCpuReset -# -# Purpose....: Cpu reset -# -##########################################################################*/ - - .global RdosCpuReset - -RdosCpuReset: - pushl %ebp - movl %esp,%ebp - UserGate cpu_reset_nr - leave - ret - -/*########################################################################## -# -# Name : RdosGetVersion -# -# Purpose....: Get RDOS version -# -# Parameters.: &major -# &minor -# &release -# -##########################################################################*/ - - .global RdosGetVersion - -RdosGetVersion: - pushl %ebp - movl %esp,%ebp - pushl %eax - pushl %ecx - pushl %edx - pushl %edi - - UserGate get_version_nr - - movzx %dx,%edx - movl 8(%ebp),%edi - movl %edx,(%edi) - - movzx %ax,%eax - movl 12(%ebp),%edi - movl %eax,(%edi) - - movzx %cx,%eax - movl 16(%ebp),%edi - movl %eax,(%edi) - - popl %edi - popl %edx - popl %ecx - popl %eax - leave - ret - -/*########################################################################## -# -# Name : RdosAllocateMem -# -# Purpose....: Allocate memory -# -# Parameters.: Bytes to allocate -# -# Returns....: Memory pointer -# -##########################################################################*/ - - .global RdosAllocateMem - -RdosAllocateMem: - pushl %ebp - movl %esp,%ebp - pushl %edx - - movl 8(%ebp),%eax - UserGate allocate_app_mem_nr - movl %edx,%eax - - popl %edx - leave - ret - -/*########################################################################## -# -# Name : RdosFreeMem -# -# Purpose....: Free memory -# -# Parameters.: Memory pointer -# -##########################################################################*/ - - .global RdosFreeMem - -RdosFreeMem: - pushl %ebp - movl %esp,%ebp - pushl %edx - - movl 8(%ebp),%edx - UserGate free_app_mem_nr - - popl %edx - leave - ret - -/*########################################################################## -# -# Name : RdosAppDebug -# -# Purpose....: App debug -# -##########################################################################*/ - - .global RdosAppDebug - -RdosAppDebug: - pushl %ebp - movl %esp,%ebp - UserGate app_debug_nr - leave - ret - -/*########################################################################## -# -# Name : RdosWaitMilli -# -# Purpose....: Wait a number of milliseconds -# -# Parameters.: Milliseconds to wait -# -##########################################################################*/ - - .global RdosWaitMilli - -RdosWaitMilli: - pushl %ebp - movl %esp,%ebp - pushl %eax - - movl 8(%ebp),%eax - UserGate wait_milli_nr - - popl %eax - leave - ret - -/*########################################################################## -# -# Name : RdosCreateSection -# -# Purpose....: Create section -# -# Returns....: Section handle -# -##########################################################################*/ - - .global RdosCreateSection - -RdosCreateSection: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - UserGate create_user_section_nr - movzx %bx,%eax - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosDeleteSection -# -# Purpose....: Delete section -# -# Parameters.: Section handle -# -##########################################################################*/ - - .global RdosDeleteSection - -RdosDeleteSection: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate delete_user_section_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosEnterSection -# -# Purpose....: Enter section -# -# Parameters.: Section handle -# -##########################################################################*/ - - .global RdosEnterSection - -RdosEnterSection: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate enter_user_section_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosLeaveSection -# -# Purpose....: Leave section -# -# Parameters.: Section handle -# -##########################################################################*/ - - .global RdosLeaveSection - -RdosLeaveSection: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate leave_user_section_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosCreateWait -# -# Purpose....: Create wait object -# -# Returns....: Wait handle -# -##########################################################################*/ - - .global RdosCreateWait - -RdosCreateWait: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - UserGate create_wait_nr - movzx %bx,%eax - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosCloseWait -# -# Purpose....: Close wait -# -# Parameters.: Wait handle -# -##########################################################################*/ - - .global RdosCloseWait - -RdosCloseWait: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate close_wait_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosCheckWait -# -# Purpose....: Check wait state -# -# Parameters.: Wait handle -# -# Returns....: Signalled ID or 0 -# -##########################################################################*/ - - .global RdosCheckWait - -RdosCheckWait: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - - movw 8(%ebp),%bx - UserGate is_wait_idle_nr - movl %ecx,%eax - - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosWaitForever -# -# Purpose....: Wait forever -# -# Parameters.: Wait handle -# -# Returns....: Signalled ID or 0 -# -##########################################################################*/ - - .global RdosWaitForever - -RdosWaitForever: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - - movw 8(%ebp),%bx - UserGate wait_no_timeout_nr - jc rwfFail - - movl %ecx,%eax - jmp rwfDone - -rwfFail: - xorl %eax,%eax - -rwfDone: - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosWaitTimeout -# -# Purpose....: Wait with timeout -# -# Parameters.: Wait handle -# Timeout in ms -# -# Returns....: Signalled ID or 0 -# -##########################################################################*/ - - .global RdosWaitTimeout - -RdosWaitTimeout: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - pushl %edx - - movl 12(%ebp),%eax - movl $1193,%edx - mull %edx - pushl %edx - pushl %eax - UserGate get_system_time_nr - popl %ebx - addl %ebx,%eax - popl %ebx - adcl %ebx,%edx - movw 8(%ebp),%bx - UserGate wait_timeout_nr - jc rwtFail - - movl %ecx,%eax - jmp rwtDone - -rwtFail: - xorl %eax,%eax - -rwtDone: - popl %edx - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosStopWait -# -# Purpose....: Stop wait -# -# Parameters.: Wait handle -# -##########################################################################*/ - - .global RdosStopWait - -RdosStopWait: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate stop_wait_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosRemoveWait -# -# Purpose....: Remove wait object from wait handle -# -# Parameters.: Wait handle -# ID -# -##########################################################################*/ - - .global RdosRemoveWait - -RdosRemoveWait: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - - movw 8(%ebp),%bx - movl 12(%ebp),%ecx - UserGate remove_wait_nr - - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosCreateSignal -# -# Purpose....: Create signal object -# -# Returns....: Signal handle -# -##########################################################################*/ - - .global RdosCreateSignal - -RdosCreateSignal: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - UserGate create_signal_nr - movzx %bx,%eax - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosResetSignal -# -# Purpose....: Reset signal -# -# Parameters.: Signal handle -# -##########################################################################*/ - - .global RdosResetSignal - -RdosResetSignal: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate reset_signal_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosIsSignalled -# -# Purpose....: Check if signalled -# -# Parameters.: Signal handle -# -# Returns....: TRUE if signalled -# -##########################################################################*/ - - .global RdosIsSignalled - -RdosIsSignalled: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate is_signalled_nr - jc risdFree - - movl $1,%eax - jmp risdDone - -risdFree: - xorl %eax,%eax - -risdDone: - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosSetSignal -# -# Purpose....: Set signal -# -# Parameters.: Signal handle -# -##########################################################################*/ - - .global RdosSetSignal - -RdosSetSignal: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate set_signal_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosFreeSignal -# -# Purpose....: Free signal handle -# -# Parameters.: Signal handle -# -##########################################################################*/ - - .global RdosFreeSignal - -RdosFreeSignal: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate free_signal_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosAddWaitForSignal -# -# Purpose....: Add signal object to wait handle -# -# Parameters.: Wait handle -# Signal handle -# ID -# -##########################################################################*/ - - .global RdosAddWaitForSignal - -RdosAddWaitForSignal: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - - movw 8(%ebp),%bx - movw 12(%ebp),%ax - movl 16(%ebp),%ecx - UserGate add_wait_for_signal_nr - - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosAddWaitForKeyboard -# -# Purpose....: Add keyboard to wait handle -# -# Parameters.: Wait handle -# ID -# -##########################################################################*/ - - .global RdosAddWaitForKeyboard - -RdosAddWaitForKeyboard: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - - movw 8(%ebp),%bx - movl 12(%ebp),%ecx - UserGate add_wait_for_keyboard_nr - - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosAddWaitForMouse -# -# Purpose....: Add mouse to wait handle -# -# Parameters.: Wait handle -# ID -# -##########################################################################*/ - - .global RdosAddWaitForMouse - -RdosAddWaitForMouse: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - - movw 8(%ebp),%bx - movl 12(%ebp),%ecx - UserGate add_wait_for_mouse_nr - - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosAddWaitForCom -# -# Purpose....: Add com object to wait handle -# -# Parameters.: Wait handle -# Com handle -# ID -# -##########################################################################*/ - - .global RdosAddWaitForCom - -RdosAddWaitForCom: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - - movw 8(%ebp),%bx - movw 12(%ebp),%ax - movl 16(%ebp),%ecx - UserGate add_wait_for_com_nr - - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosAddWaitForAdc -# -# Purpose....: Add ADC object to wait handle -# -# Parameters.: Wait handle -# Adc handle -# ID -# -##########################################################################*/ - - .global RdosAddWaitForAdc - -RdosAddWaitForAdc: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - - movw 8(%ebp),%bx - movw 12(%ebp),%ax - movl 16(%ebp),%ecx - UserGate add_wait_for_adc_nr - - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosSetTextMode -# -# Purpose....: Set text mode -# -##########################################################################*/ - - .global RdosSetTextMode - -RdosSetTextMode: - pushl %ebp - movl %esp,%ebp - - movw $3,%ax - UserGate set_video_mode_nr - - leave - ret - -/*########################################################################## -# -# Name : RdosSetVideoMode -# -# Purpose....: Set video mode -# -# Parameters.: &xres -# &yres -# &linesize -# &LFB -# -# Returns....: Bitmap handle -# -##########################################################################*/ - - .global RdosSetVideoMode - -RdosSetVideoMode: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - pushl %edx - pushl %esi - pushl %edi - - movl 8(%ebp),%edi - movw (%edi),%ax - - movl 12(%ebp),%edi - movw (%edi),%cx - - movl 16(%ebp),%edi - movw (%edi),%dx - - UserGate get_video_mode_nr - jc set_video_fail - - UserGate set_video_mode_nr - jc set_video_fail - - pushl %edi - movl 8(%ebp),%edi - movzx %ax,%eax - movl %eax,(%edi) - - movl 12(%ebp),%edi - movzx %cx,%ecx - movl %ecx,(%edi) - - movl 16(%ebp),%edi - movzx %dx,%edx - movl %edx,(%edi) - - movl 20(%ebp),%edi - movzx %si,%esi - movl %esi,(%edi) - popl %edi - - movl 24(%ebp),%eax - movl %edi,(%eax) - - movzx %bx,%eax - jmp set_video_done - -set_video_fail: - xorl %eax,%eax - movl 8(%ebp),%edi - movl %eax,(%edi) - movl 12(%ebp),%edi - movl %eax,(%edi) - movl 16(%ebp),%edi - movl %eax,(%edi) - movl 20(%ebp),%edi - movl %eax,(%edi) - movl 24(%ebp),%edi - movl %eax,(%edi) - -set_video_done: - popl %edi - popl %esi - popl %edx - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosSetClipRect -# -# Purpose....: Set clip rectangle -# -# Parameters.: Bitmap handle -# xmin, xmax, ymin, ymax -# -##########################################################################*/ - - .global RdosSetClipRect - -RdosSetClipRect: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - pushl %edx - pushl %esi - pushl %edi - - movw 8(%ebp),%bx - movw 12(%ebp),%cx - movw 16(%ebp),%dx - movw 20(%ebp),%si - movw 24(%ebp),%di - UserGate set_clip_rect_nr - - popl %edi - popl %esi - popl %edx - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosClearClipRect -# -# Purpose....: Clear clip rectangle -# -# Parameters.: Bitmap handle -# -##########################################################################*/ - - .global RdosClearClipRect - -RdosClearClipRect: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate clear_clip_rect_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosSetDrawColor -# -# Purpose....: Set draw color -# -# Parameters.: Bitmap handle -# Color -# -##########################################################################*/ - - .global RdosSetDrawColor - -RdosSetDrawColor: - pushl %ebp - movl %esp,%ebp - pushl %eax - pushl %ebx - - movw 8(%ebp),%bx - movl 12(%ebp),%eax - UserGate set_drawcolor_nr - - popl %ebx - popl %eax - leave - ret - -/*########################################################################## -# -# Name : RdosSetLGOP -# -# Purpose....: Set draw color -# -# Parameters.: Bitmap handle -# LGOP -# -##########################################################################*/ - - .global RdosSetLGOP - -RdosSetLGOP: - pushl %ebp - movl %esp,%ebp - pushl %eax - pushl %ebx - - movw 8(%ebp),%bx - movw 12(%ebp),%ax - UserGate set_lgop_nr - - popl %ebx - popl %eax - leave - ret - -/*########################################################################## -# -# Name : RdosSetHollowStyle -# -# Purpose....: Set hollow fill style -# -# Parameters.: Bitmap handle -# -##########################################################################*/ - - .global RdosSetHollowStyle - -RdosSetHollowStyle: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate set_hollow_style_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosSetFilledStyle -# -# Purpose....: Set filled fill style -# -# Parameters.: Bitmap handle -# -##########################################################################*/ - - .global RdosSetFilledStyle - -RdosSetFilledStyle: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate set_filled_style_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosOpenFont -# -# Purpose....: Open a font -# -# Parameters.: height -# -# Returns....: Font handle -# -##########################################################################*/ - - .global RdosOpenFont - -RdosOpenFont: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%ax - UserGate open_font_nr - movzx %bx,%eax - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosCloseFont -# -# Purpose....: Close font handle -# -# Parameters.: Font handle -# -##########################################################################*/ - - .global RdosCloseFont - -RdosCloseFont: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate close_font_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosGetStringMetrics -# -# Purpose....: Get string metrics for text using font -# -# Parameters.: Font handle -# String -# &width -# &height -# -##########################################################################*/ - - .global RdosGetStringMetrics - -RdosGetStringMetrics: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - pushl %edx - pushl %edi - - movw 8(%ebp),%bx - movl 12(%ebp),%edi - UserGate get_string_metrics_nr - - movl 16(%ebp),%edi - movzx %cx,%ecx - movl %ecx,(%edi) - - movl 20(%ebp),%edi - movzx %dx,%edx - movl %edx,(%edi) - - popl %edi - popl %edx - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosSetFont -# -# Purpose....: Set font -# -# Parameters.: Bitmap handle -# Font handle -# -##########################################################################*/ - - .global RdosSetFont - -RdosSetFont: - pushl %ebp - movl %esp,%ebp - pushl %eax - pushl %ebx - - movw 8(%ebp),%bx - movw 12(%ebp),%ax - UserGate set_font_nr - - popl %ebx - popl %eax - leave - ret - -/*########################################################################## -# -# Name : RdosGetPixel -# -# Purpose....: Get pixel -# -# Parameters.: Bitmap handle -# x, y -# -##########################################################################*/ - - .global RdosGetPixel - -RdosGetPixel: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - pushl %edx - - movw 8(%ebp),%bx - movw 12(%ebp),%cx - movw 16(%ebp),%dx - UserGate get_pixel_nr - - popl %edx - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosSetPixel -# -# Purpose....: Set pixel -# -# Parameters.: Bitmap handle -# x, y -# -##########################################################################*/ - - .global RdosSetPixel - -RdosSetPixel: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - pushl %edx - - movw 8(%ebp),%bx - movw 12(%ebp),%cx - movw 16(%ebp),%dx - UserGate set_pixel_nr - - popl %edx - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosBlit -# -# Purpose....: Blit -# -# Parameters.: SrcHandle -# DestHandle -# width, height -# SrcX, SrcY -# DestX, DestY -# -##########################################################################*/ - - .global RdosBlit - -RdosBlit: - pushl %ebp - movl %esp,%ebp - pushl %eax - pushl %ebx - pushl %ecx - pushl %edx - pushl %esi - pushl %edi -; - movw 8(%ebp),%ax - movw 12(%ebp),%bx - movw 16(%ebp),%cx - movw 20(%ebp),%dx - movw 28(%ebp),%si - shll $16,%esi - movw 24(%ebp),%si - movw 36(%ebp),%di - shll $16,%edi - movw 32(%ebp),%di - UserGate blit_nr - - popl %edi - popl %esi - popl %edx - popl %ecx - popl %ebx - popl %eax - leave - ret - -/*########################################################################## -# -# Name : RdosDrawMask -# -# Purpose....: Draw mask -# -# Parameters.: Bitmap handle -# mask -# RowSize -# width, height -# SrcX, SrcY -# DestX, DestY -# -##########################################################################*/ - - .global RdosDrawMask - -RdosDrawMask: - pushl %ebp - movl %esp,%ebp - pushl %eax - pushl %ebx - pushl %ecx - pushl %edx - pushl %esi - pushl %edi -; - movw 8(%ebp),%bx - movl 12(%ebp),%edi - movw 16(%ebp),%ax - movw 24(%ebp),%si - shll $16,%esi - movw 20(%ebp),%si - movw 32(%ebp),%cx - shll $16,%ecx - movw 28(%ebp),%cx - movw 40(%ebp),%dx - shll $16,%edx - movw 36(%ebp),%dx - UserGate draw_mask_nr - - popl %edi - popl %esi - popl %edx - popl %ecx - popl %ebx - popl %eax - leave - ret - -/*########################################################################## -# -# Name : RdosDrawLine -# -# Purpose....: Draw a line -# -# Parameters.: Bitmap handle -# x1, y1 -# x2, y2 -# -##########################################################################*/ - - .global RdosDrawLine - -RdosDrawLine: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - pushl %edx - pushl %esi - pushl %edi -; - movw 8(%ebp),%bx - movw 12(%ebp),%cx - movw 16(%ebp),%dx - movw 20(%ebp),%si - movw 24(%ebp),%di - UserGate draw_line_nr - - popl %edi - popl %esi - popl %edx - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosDrawString -# -# Purpose....: Draw a string -# -# Parameters.: Bitmap handle -# x, y -# string -# -##########################################################################*/ - - .global RdosDrawString - -RdosDrawString: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - pushl %edx - pushl %edi -; - movw 8(%ebp),%bx - movw 12(%ebp),%cx - movw 16(%ebp),%dx - movl 20(%ebp),%edi - UserGate draw_string_nr - - popl %edi - popl %edx - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosDrawRect -# -# Purpose....: Draw a rect -# -# Parameters.: Bitmap handle -# x, y -# width, height -# -##########################################################################*/ - - .global RdosDrawRect - -RdosDrawRect: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - pushl %edx - pushl %esi - pushl %edi - - movw 8(%ebp),%bx - movw 12(%ebp),%cx - movw 16(%ebp),%dx - movw 20(%ebp),%si - movw 24(%ebp),%di - UserGate draw_rect_nr - - popl %edi - popl %esi - popl %edx - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosDrawEllipse -# -# Purpose....: Draw an ellipse -# -# Parameters.: Bitmap handle -# x, y -# width, height -# -##########################################################################*/ - - .global RdosDrawEllipse - -RdosDrawEllipse: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - pushl %edx - pushl %esi - pushl %edi - - movw 8(%ebp),%bx - movw 12(%ebp),%cx - movw 16(%ebp),%dx - movw 20(%ebp),%si - movw 24(%ebp),%di - UserGate draw_ellipse_nr - - popl %edi - popl %esi - popl %edx - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosCreateBitmap -# -# Purpose....: Create a bitmap -# -# Parameters.: BitsPerPixel -# width, height -# -# Returns....: Bitmap handle -# -##########################################################################*/ - - .global RdosCreateBitmap - -RdosCreateBitmap: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - pushl %edx - - movw 8(%ebp),%ax - movw 12(%ebp),%cx - movw 16(%ebp),%dx - UserGate create_bitmap_nr - movzx %bx,%eax -; - popl %edx - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosDuplicateBitmapHandle -# -# Purpose....: Duplicate bitmap handle for use in another thread / object -# -# Parameters.: Bitmap handle -# -# Returns....: Bitmap handle -# -##########################################################################*/ - - .global RdosDuplicateBitmapHandle - -RdosDuplicateBitmapHandle: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate dup_bitmap_handle_nr - movzx %bx,%eax - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosCloseBitmap -# -# Purpose....: Close bitmap handle -# -# Parameters.: Bitmap handle -# -##########################################################################*/ - - .global RdosCloseBitmap - -RdosCloseBitmap: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate close_bitmap_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosCreateStringBitmap -# -# Purpose....: Create bitmap from string & font -# -# Parameters.: Font -# string -# -# Returns....: Bitmap handle -# -##########################################################################*/ - - .global RdosCreateStringBitmap - -RdosCreateStringBitmap: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %edi - - movw 8(%ebp),%bx - movl 12(%ebp),%edi - UserGate create_string_bitmap_nr - movzx %bx,%eax -; - popl %edi - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosGetBitmapInfo -# -# Purpose....: Get info about bitmap -# -# Parameters.: Bitmap handle -# &BitsPerPixel -# &width, &height -# &linesize -# &LFB -# -##########################################################################*/ - - .global RdosGetBitmapInfo - -RdosGetBitmapInfo: - pushl %ebp - movl %esp,%ebp - pushl %eax - pushl %ebx - pushl %ecx - pushl %edx - pushl %esi - pushl %edi - - movw 8(%ebp),%bx - UserGate get_bitmap_info_nr - jc gbiFail - - pushl %edi - movl 12(%ebp),%edi - movzx %al,%eax - movl %eax,(%edi) - - movl 16(%ebp),%edi - movzx %cx,%ecx - movl %ecx,(%edi) - - movl 20(%ebp),%edi - movzx %dx,%edx - movl %edx,(%edi) - - movl 24(%ebp),%edi - movzx %si,%esi - movl %esi,(%edi) - popl %edi - - movl 28(%ebp),%eax - movl %edi,(%eax) - jmp gbiDone - -gbiFail: - xorl %eax,%eax - movl 12(%ebp),%edi - movl %eax,(%edi) - - movl 16(%ebp),%edi - movl %eax,(%edi) - - movl 20(%ebp),%edi - movl %eax,(%edi) - - movl 24(%ebp),%edi - movl %eax,(%edi) - - movl 28(%ebp),%edi - movl %eax,(%edi) - -gbiDone: - popl %edi - popl %esi - popl %edx - popl %ecx - popl %ebx - popl %eax - leave - ret - -/*########################################################################## -# -# Name : RdosCreateSprite -# -# Purpose....: Create a sprite -# -# Parameters.: dest -# bitmap -# mask -# LGOP -# -# Returns....: Sprite handle -# -##########################################################################*/ - - .global RdosCreateSprite - -RdosCreateSprite: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - pushl %edx - - movw 8(%ebp),%bx - movw 12(%ebp),%cx - movw 16(%ebp),%dx - movw 20(%ebp),%ax - UserGate create_sprite_nr - movzx %bx,%eax - - popl %edx - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosCloseSprite -# -# Purpose....: Close sprite handle -# -# Parameters.: Sprite handle -# -##########################################################################*/ - - .global RdosCloseSprite - -RdosCloseSprite: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate close_sprite_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosShowSprite -# -# Purpose....: Show sprite -# -# Parameters.: Sprite handle -# -##########################################################################*/ - - .global RdosShowSprite - -RdosShowSprite: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate show_sprite_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosHideSprite -# -# Purpose....: Hide sprite -# -# Parameters.: Sprite handle -# -##########################################################################*/ - - .global RdosHideSprite - -RdosHideSprite: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate hide_sprite_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosMoveSprite -# -# Purpose....: Move sprite -# -# Parameters.: Sprite handle -# x, y -# -##########################################################################*/ - - .global RdosMoveSprite - -RdosMoveSprite: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - pushl %edx - - movw 8(%ebp),%bx - movw 12(%ebp),%cx - movw 16(%ebp),%dx - UserGate move_sprite_nr - - popl %edx - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosSetForeColor -# -# Purpose....: Set text-mode fore color -# -# Parameters.: palette index -# -##########################################################################*/ - - .global RdosSetForeColor - -RdosSetForeColor: - pushl %ebp - movl %esp,%ebp - pushl %eax - - movb 8(%ebp),%al - UserGate set_forecolor_nr - - popl %eax - leave - ret - -/*########################################################################## -# -# Name : RdosSetBackColor -# -# Purpose....: Set text-mode back color -# -# Parameters.: palette index -# -##########################################################################*/ - - .global RdosSetBackColor - -RdosSetBackColor: - pushl %ebp - movl %esp,%ebp - pushl %eax - - movb 8(%ebp),%al - UserGate set_backcolor_nr - - popl %eax - leave - ret - -/*########################################################################## -# -# Name : RdosGetSysTime -# -# Purpose....: Get system time -# -# Parameters.: &year, &month, &day -# &hour, &min, &sec, &ms -# -##########################################################################*/ - - .global RdosGetSysTime - -RdosGetSysTime: - pushl %ebp - movl %esp,%ebp - pushal - - UserGate get_system_time_nr - pushl %eax - UserGate binary_to_time_nr - pushl %edx - - movl 8(%ebp),%esi - movzx %dx,%edx - movl %edx,(%esi) - - movl 12(%ebp),%esi - movzx %ch,%edx - movl %edx,(%esi) - - movl 16(%ebp),%esi - movzx %cl,%edx - movl %edx,(%esi) - - movl 20(%ebp),%esi - movzx %bh,%edx - movl %edx,(%esi) - - movl 24(%ebp),%esi - movzx %bl,%edx - movl %edx,(%esi) - - movl 28(%ebp),%esi - movzx %ah,%edx - movl %edx,(%esi) - - popl %edx - UserGate time_to_binary_nr - movl %eax,%ebx - popl %eax - subl %ebx,%eax - xorl %edx,%edx - movl $1192,%ebx - divl %ebx - - movl 32(%ebp),%esi - movzx %ax,%eax - movl %eax,(%esi) - - popal - leave - ret - -/*########################################################################## -# -# Name : RdosGetTime -# -# Purpose....: Get time -# -# Parameters.: &year, &month, &day -# &hour, &min, &sec, &ms -# -##########################################################################*/ - - .global RdosGetTime - -RdosGetTime: - pushl %ebp - movl %esp,%ebp - pushal - - UserGate get_time_nr - pushl %eax - UserGate binary_to_time_nr - pushl %edx - - movl 8(%ebp),%esi - movzx %dx,%edx - movl %edx,(%esi) - - movl 12(%ebp),%esi - movzx %ch,%edx - movl %edx,(%esi) - - movl 16(%ebp),%esi - movzx %cl,%edx - movl %edx,(%esi) - - movl 20(%ebp),%esi - movzx %bh,%edx - movl %edx,(%esi) - - movl 24(%ebp),%esi - movzx %bl,%edx - movl %edx,(%esi) - - movl 28(%ebp),%esi - movzx %ah,%edx - movl %edx,(%esi) - - popl %edx - UserGate time_to_binary_nr - movl %eax,%ebx - popl %eax - subl %ebx,%eax - xorl %edx,%edx - movl $1192,%ebx - divl %ebx - - movl 32(%ebp),%esi - movzx %ax,%eax - movl %eax,(%esi) - - popal - leave - ret - -/*########################################################################## -# -# Name : RdosSetTime -# -# Purpose....: Set time -# -# Parameters.: year, month, day -# hour, min, sec, ms -# -##########################################################################*/ - - .global RdosSetTime - -RdosSetTime: - pushl %ebp - movl %esp,%ebp - pushal - - movw 8(%ebp),%dx - movb 12(%ebp),%ch - movb 16(%ebp),%cl - movb 20(%ebp),%bh - movb 24(%ebp),%bl - movb 28(%ebp),%ah - UserGate time_to_binary_nr - - movl %edx,%edi - movl %eax,%esi - - movl 32(%ebp),%eax - movl $1192,%edx - mull %edx - addl %eax,%esi - adcl $0,%edi - - UserGate get_system_time_nr - subl %eax,%esi - sbbl %edx,%edi - movl %esi,%eax - movl %edi,%edx - UserGate update_time_nr - - popal - leave - ret - -/*########################################################################## -# -# Name : RdosTicsToRecord -# -# Purpose....: Convert tics to record format -# -# Parameters.: MSB, LSB -# &year, &month, &day -# &hour, &min, &sec, &ms -# -##########################################################################*/ - - .global RdosTicsToRecord - -RdosTicsToRecord: - pushl %ebp - movl %esp,%ebp - pushal - - movl 8(%ebp),%edx - movl 12(%ebp),%eax - addl $596,%eax - adcl $0,%edx - UserGate binary_to_time_nr - pushl %edx - - movl 16(%ebp),%esi - movzx %dx,%edx - movl %edx,(%esi) - - movl 20(%ebp),%esi - movzx %ch,%edx - movl %edx,(%esi) - - movl 24(%ebp),%esi - movzx %cl,%edx - movl %edx,(%esi) - - movl 28(%ebp),%esi - movzx %bh,%edx - movl %edx,(%esi) - - movl 32(%ebp),%esi - movzx %bl,%edx - movl %edx,(%esi) - - movl 36(%ebp),%esi - movzx %ah,%edx - movl %edx,(%esi) - - popl %edx - UserGate time_to_binary_nr - movl %eax,%ebx - movl 12(%ebp),%eax - subl %edx,%eax - xorl %edx,%edx - movl $1192,%ebx - divl %ebx - - movl 40(%ebp),%esi - cmpw %ax,1000 - jne rttrSaveMs - - decw %ax - -rttrSaveMs: - movzx %ax,%eax - movl %eax,(%esi) - - popal - leave - ret - -/*########################################################################## -# -# Name : RdosRecordToTics -# -# Purpose....: Convert from record format to tics -# -# Parameters.: &MSB, &LSB -# year, month, day -# hour, min, sec, ms -# -##########################################################################*/ - - .global RdosRecordToTics - -RdosRecordToTics: - pushl %ebp - movl %esp,%ebp - pushal - - movl 40(%ebp),%eax - movl $1192,%edx - mull %edx - pushl %eax - movw 16(%ebp),%dx - movb 20(%ebp),%ch - movb 24(%ebp),%cl - movb 28(%ebp),%bh - movb 32(%ebp),%bl - movb 36(%ebp),%ah - UserGate time_to_binary_nr - popl %ebx - addl %ebx,%eax - adcl $0,%edx - - movl 8(%ebp),%esi - movl %edx,(%esi) - - movl 12(%ebp),%esi - movl %eax,(%esi) - - popal - leave - ret - -/*########################################################################## -# -# Name : RdosDecodeMsbTics -# -# Purpose....: Decode MSB tics -# -# Parameters.: MSB -# &day, &hour -# -##########################################################################*/ - - .global RdosDecodeMsbTics - -RdosDecodeMsbTics: - pushl %ebp - movl %esp,%ebp - pushal - - movl 8(%ebp),%eax - xorl %edx,%edx - movl $24,%ecx - divl %ecx - - movl 12(%ebp),%ebx - movl %eax,(%ebx) - - movl 16(%ebp),%ebx - movl %edx,(%ebx) - - popal - leave - ret - -/*########################################################################## -# -# Name : RdosDecodeLsbTics -# -# Purpose....: Decode LSB tics -# -# Parameters.: LSB -# &min, &sec, &ms, &us -# -##########################################################################*/ - - .global RdosDecodeLsbTics - -RdosDecodeLsbTics: - pushl %ebp - movl %esp,%ebp - pushal - - movl 8(%ebp),%eax - movl $60,%edx - mull %edx - movl 12(%ebp),%ebx - movl %edx,(%ebx) - - movl $60,%edx - mull %edx - movl 16(%ebp),%ebx - movl %edx,(%ebx) - - movl $1000,%edx - mull %edx - movl 20(%ebp),%ebx - movl %edx,(%ebx) - - movl $1000,%edx - mull %edx - movl 24(%ebp),%ebx - movl %edx,(%ebx) - - popal - leave - ret - -/*########################################################################## -# -# Name : RdosDayOfWeek -# -# Purpose....: Get day of week -# -# Parameters.: year, month, day -# -# Returns....: day of week -# -##########################################################################*/ - - .global RdosDayOfWeek - -RdosDayOfWeek: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - pushl %edx - - movl 8(%ebp),%edx - movb 12(%ebp),%ch - movb 16(%ebp),%cl - xorw %bx,%bx - xorb %ah,%ah - UserGate adjust_time_nr - pushw %dx - movl $365,%eax - imulw %dx - pushw %dx - pushw %ax - popl %ebx - popw %dx - UserGate passed_days_nr - decw %dx - shrw $2,%dx - incw %dx - addw %dx,%ax - addl %ebx,%eax - xorl %edx,%edx - addl $5,%eax - movl $7,%ebx - divl %ebx - movzx %dl,%eax - - popl %edx - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosGetTics -# -# Purpose....: Get system tics -# -# Parameters.: &MSB, &LSB -# -##########################################################################*/ - - .global RdosGetTics - -RdosGetTics: - pushl %ebp - movl %esp,%ebp - pushl %edx - pushl %esi - - UserGate get_time_nr - movl 8(%ebp),%esi - movl %edx,(%esi) - movl 12(%ebp),%esi - movl %eax,(%esi) - - popl %esi - popl %edx - leave - ret - -/*########################################################################## -# -# Name : RdosAddTics -# -# Purpose....: Add tics to binary time -# -# Parameters.: &MSB, &LSB -# tics -# -##########################################################################*/ - - .global RdosAddTics - -RdosAddTics: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movl 16(%ebp),%eax - movl 12(%ebp),%ebx - addl %eax,(%ebx) - movl 8(%ebp),%ebx - adcl $0,(%ebx) - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosAddMilli -# -# Purpose....: Add milliseconds to binary time -# -# Parameters.: &MSB, &LSB -# milli -# -##########################################################################*/ - - .global RdosAddMilli - -RdosAddMilli: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movl 16(%ebp),%eax - movl $1193,%edx - mull %edx - movl 12(%ebp),%ebx - addl %eax,(%ebx) - movl 8(%ebp),%ebx - adcl %edx,(%ebx) - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosAddSec -# -# Purpose....: Add milliseconds to binary time -# -# Parameters.: &MSB, &LSB -# sec -# -##########################################################################*/ - - .global RdosAddSec - -RdosAddSec: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movl 16(%ebp),%eax - movl $1193000,%edx - mull %edx - movl 12(%ebp),%ebx - addl %eax,(%ebx) - movl 8(%ebp),%ebx - adcl %edx,(%ebx) - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosAddMin -# -# Purpose....: Add minutes to binary time -# -# Parameters.: &MSB, &LSB -# min -# -##########################################################################*/ - - .global RdosAddMin - -RdosAddMin: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movl 16(%ebp),%eax - movl $71582760,%edx - mull %edx - movl 12(%ebp),%ebx - addl %eax,(%ebx) - movl 8(%ebp),%ebx - adcl %edx,(%ebx) - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosAddHour -# -# Purpose....: Add hour to binary time -# -# Parameters.: &MSB, &LSB -# hour -# -##########################################################################*/ - - .global RdosAddHour - -RdosAddHour: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movl 16(%ebp),%eax - movl 8(%ebp),%ebx - adc %eax,(%ebx) - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosAddDay -# -# Purpose....: Add days to binary time -# -# Parameters.: &MSB, &LSB -# days -# -##########################################################################*/ - - .global RdosAddDay - -RdosAddDay: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movl 16(%ebp),%eax - movl $24,%edx - mull %edx - movl 8(%ebp),%ebx - adc %eax,(%ebx) - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosSyncTime -# -# Purpose....: Synchronize time with NTP -# -# Parameters.: IP -# -##########################################################################*/ - - .global RdosSyncTime - -RdosSyncTime: - pushl %ebp - movl %esp,%ebp - pushal - - movl 8(%ebp),%edx - UserGate sync_time_nr - jc RdosSyncTimeFail - - movl $1,%eax - jmp RdosSyncTimeDone - -RdosSyncTimeFail: - xorl %eax,%eax - -RdosSyncTimeDone: - popal - leave - ret - -/*########################################################################## -# -# Name : RdosOpenCom -# -# Purpose....: Open com-port -# -# Parameters.: ID -# baudrate -# parity -# data bits -# stop bits -# SendBufferSize -# RecBufferSize -# -# Returns...: Com handle -# -##########################################################################*/ - - .global RdosOpenCom - -RdosOpenCom: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - pushl %edx - pushl %esi - pushl %edi - - movb 8(%ebp),%al - movb 20(%ebp),%ah - movb 24(%ebp),%bl - movb 16(%ebp),%bh - movl 12(%ebp),%ecx - movw 28(%ebp),%si - movw 32(%ebp),%di - UserGate open_com_nr - movzx %bx,%eax - - popl %edi - popl %esi - popl %edx - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosCloseCom -# -# Purpose....: Close com-port -# -# Parameters.: Com handle -# -##########################################################################*/ - - .global RdosCloseCom - -RdosCloseCom: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate close_com_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosFlushCom -# -# Purpose....: Flush com-port -# -# Parameters.: Com handle -# -##########################################################################*/ - - .global RdosFlushCom - -RdosFlushCom: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate flush_com_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosReadCom -# -# Purpose....: Read com-port -# -# Parameters.: Com handle -# -# Returns....: Character -# -##########################################################################*/ - - .global RdosReadCom - -RdosReadCom: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate read_com_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosWriteCom -# -# Purpose....: Write com-port -# -# Parameters.: Com handle -# char -# -# Returns....: 0 for success -# -##########################################################################*/ - - .global RdosWriteCom - -RdosWriteCom: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - movb 12(%ebp),%al - UserGate write_com_nr - movzx %al,%eax - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosWaitForSendCompletedCom -# -# Purpose....: Wait until send buffer is empty -# -# Parameters.: Com handle -# -##########################################################################*/ - - .global RdosWaitForSendCompletedCom - -RdosWaitForSendCompletedCom: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate wait_for_send_completed_com_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosEnableCts -# -# Purpose....: Enable CTS signal -# -# Parameters.: Com handle -# -##########################################################################*/ - - .global RdosEnableCts - -RdosEnableCts: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate enable_cts_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosDisableCts -# -# Purpose....: Disable CTS signal -# -# Parameters.: Com handle -# -##########################################################################*/ - - .global RdosDisableCts - -RdosDisableCts: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate disable_cts_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosEnableAutoRts -# -# Purpose....: Enable auto RTS signal generation for RS485 -# -# Parameters.: Com handle -# -##########################################################################*/ - - .global RdosEnableAutoRts - -RdosEnableAutoRts: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate enable_auto_rts_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosDisableAutoRts -# -# Purpose....: Disable auto RTS signal generation for RS485 -# -# Parameters.: Com handle -# -##########################################################################*/ - - .global RdosDisableAutoRts - -RdosDisableAutoRts: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate disable_auto_rts_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosSetDtr -# -# Purpose....: Set DTR active -# -# Parameters.: Com handle -# -##########################################################################*/ - - .global RdosSetDtr - -RdosSetDtr: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate set_dtr_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosResetDtr -# -# Purpose....: Set DTR inactive -# -# Parameters.: Com handle -# -##########################################################################*/ - - .global RdosResetDtr - -RdosResetDtr: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate reset_dtr_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosSetRts -# -# Purpose....: Set RTS active -# -# Parameters.: Com handle -# -##########################################################################*/ - - .global RdosSetRts - -RdosSetRts: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate set_rts_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosResetRts -# -# Purpose....: Set RTS inactive -# -# Parameters.: Com handle -# -##########################################################################*/ - - .global RdosResetRts - -RdosResetRts: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate reset_rts_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosGetReceiveBufferSpace -# -# Purpose....: Get receive buffer free space -# -# Parameters.: Com handle -# -# Returns....: Free bytes -# -##########################################################################*/ - - .global RdosGetReceiveBufferSpace - -RdosGetReceiveBufferSpace: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate get_com_receive_space_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosGetSendBufferSpace -# -# Purpose....: Get send buffer free space -# -# Parameters.: Com handle -# -# Returns....: Free bytes -# -##########################################################################*/ - - .global RdosGetSendBufferSpace - -RdosGetSendBufferSpace: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate get_com_send_space_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosOpenFile -# -# Purpose....: Open file -# -# Parameters.: Filename -# Access -# -# Returns...: File handle -# -##########################################################################*/ - - .global RdosOpenFile - -RdosOpenFile: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - pushl %edi - - movl 8(%ebp),%edi - movb 12(%ebp),%cl - UserGate open_file_nr - jc OpenFileFailed - - movzx %bx,%eax - jmp OpenFileDone - -OpenFileFailed: - xorl %eax,%eax - -OpenFileDone: - popl %edi - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosCreateFile -# -# Purpose....: Create file -# -# Parameters.: Filename -# Attribute -# -# Returns...: File handle -# -##########################################################################*/ - - .global RdosCreateFile - -RdosCreateFile: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - pushl %edi - - movl 8(%ebp),%edi - movw 12(%ebp),%cx - UserGate create_file_nr - jc CreateFileFailed - - movzx %bx,%eax - jmp CreateFileDone - -CreateFileFailed: - xorl %eax,%eax - -CreateFileDone: - popl %edi - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosCloseFile -# -# Purpose....: Close file -# -# Parameters.: File handle -# -##########################################################################*/ - - .global RdosCloseFile - -RdosCloseFile: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate close_file_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosIsDevice -# -# Purpose....: Check if file is device -# -# Parameters.: TRUE if device -# -##########################################################################*/ - - .global RdosIsDevice - -RdosIsDevice: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate get_ioctl_data_nr - testw $0x8000,%dx - jz ridFail - - movl $1,%eax - jmp ridDone - -ridFail: - xorl %eax,%eax - -ridDone: - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosDuplFile -# -# Purpose....: Duplicate file handle -# -# Parameters.: File handle -# -# Returns....: File handle -# -##########################################################################*/ - - .global RdosDuplFile - -RdosDuplFile: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate dupl_file_nr - jc DuplFileFailed - - movzx %bx,%eax - jmp DuplFileDone - -DuplFileFailed: - xorl %eax,%eax - -DuplFileDone: - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosGetFileSize -# -# Purpose....: Get file size -# -# Parameters.: File handle -# -# Returns....: Size -# -##########################################################################*/ - - .global RdosGetFileSize - -RdosGetFileSize: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate get_file_size_nr - jnc GetFileSizeDone - -GetFileSizeFail: - xorl %eax,%eax - -GetFileSizeDone: - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosSetFileSize -# -# Purpose....: Set file size -# -# Parameters.: File handle -# Size -# -##########################################################################*/ - - .global RdosSetFileSize - -RdosSetFileSize: - pushl %ebp - movl %esp,%ebp - pushl %eax - pushl %ebx - - movw 8(%ebp),%bx - movl 12(%ebp),%eax - UserGate set_file_size_nr - - popl %ebx - popl %eax - leave - ret - -/*########################################################################## -# -# Name : RdosGetFilePos -# -# Purpose....: Get file position -# -# Parameters.: File handle -# -# Returns....: Position -# -##########################################################################*/ - - .global RdosGetFilePos - -RdosGetFilePos: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate get_file_pos_nr - jnc GetFilePosDone - -GetFilePosFail: - xorl %eax,%eax - -GetFilePosDone: - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosSetFilePos -# -# Purpose....: Set file position -# -# Parameters.: File handle -# Position -# -##########################################################################*/ - - .global RdosSetFilePos - -RdosSetFilePos: - pushl %ebp - movl %esp,%ebp - pushl %eax - pushl %ebx - - movw 8(%ebp),%bx - movl 12(%ebp),%eax - UserGate set_file_pos_nr - - popl %ebx - popl %eax - leave - ret - -/*########################################################################## -# -# Name : RdosGetFileTime -# -# Purpose....: Get file time & date -# -# Parameters.: File handle -# &MSB, &LSB -# -##########################################################################*/ - - .global RdosGetFileTime - -RdosGetFileTime: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %edi - - movw 8(%ebp),%bx - UserGate get_file_time_nr - jc GetFileTimeDone - - movl 12(%ebp),%edi - movl %edx,(%edi) - - movl 16(%ebp),%edi - movl %eax,(%edi) - -GetFileTimeDone: - popl %edi - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosSetFileTime -# -# Purpose....: Set file time & date -# -# Parameters.: File handle -# MSB, LSB -# -##########################################################################*/ - - .global RdosSetFileTime - -RdosSetFileTime: - pushl %ebp - movl %esp,%ebp - pushl %eax - pushl %ebx - pushl %edx - - movw 8(%ebp),%bx - movl 12(%ebp),%edx - movl 16(%ebp),%eax - UserGate set_file_time_nr - - popl %edx - popl %ebx - popl %eax - leave - ret - -/*########################################################################## -# -# Name : RdosReadFile -# -# Purpose....: Read from file -# -# Parameters.: File handle -# buffer -# count -# -# Returns....: Read count -# -##########################################################################*/ - - .global RdosReadFile - -RdosReadFile: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - pushl %edi - - movw 8(%ebp),%bx - movl 12(%ebp),%edi - movl 16(%ebp),%ecx - UserGate read_file_nr - - popl %edi - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosWriteFile -# -# Purpose....: Write to file -# -# Parameters.: File handle -# buffer -# count -# -# Returns....: Written count -# -##########################################################################*/ - - .global RdosWriteFile - -RdosWriteFile: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - pushl %edi - - movw 8(%ebp),%bx - movl 12(%ebp),%edi - movl 16(%ebp),%ecx - UserGate write_file_nr - - popl %edi - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosCreateMapping -# -# Purpose....: Create file mapping -# -# Parameters.: Size -# -# Returns...: Filemap handle -# -##########################################################################*/ - - .global RdosCreateMapping - -RdosCreateMapping: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movl 8(%ebp),%eax - UserGate create_mapping_nr - movzx %bx,%eax - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosCreateNamedMapping -# -# Purpose....: Create named file mapping -# -# Parameters.: Name -# Size -# -# Returns...: Filemap handle -# -##########################################################################*/ - - .global RdosCreateNamedMapping - -RdosCreateNamedMapping: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %edi - - movl 8(%ebp),%edi - movl 12(%ebp),%eax - UserGate create_named_mapping_nr - movzx %bx,%eax - - popl %edi - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosCreateNamedFileMapping -# -# Purpose....: Create file named file mapping -# -# Parameters.: Name -# Size -# File handle -# -# Returns...: Filemap handle -# -##########################################################################*/ - - .global RdosCreateNamedFileMapping - -RdosCreateNamedFileMapping: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %edi - - movl 8(%ebp),%edi - movl 12(%ebp),%eax - movw 16(%ebp),%bx - UserGate create_named_file_mapping_nr - movzx %bx,%eax - - popl %edi - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosOpenNamedMapping -# -# Purpose....: Open named file mapping -# -# Parameters.: Name -# -# Returns...: Filemap handle -# -##########################################################################*/ - - .global RdosOpenNamedMapping - -RdosOpenNamedMapping: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %edi - - movl 8(%ebp),%edi - UserGate open_named_mapping_nr - movzx %bx,%eax - - popl %edi - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosSyncMapping -# -# Purpose....: Sync file mapping -# -# Parameters.: Filemap handle -# -##########################################################################*/ - - .global RdosSyncMapping - -RdosSyncMapping: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate sync_mapping_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosCloseMapping -# -# Purpose....: Close file mapping -# -# Parameters.: Filemap handle -# -##########################################################################*/ - - .global RdosCloseMapping - -RdosCloseMapping: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate close_mapping_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosMapView -# -# Purpose....: Map view of file into memory -# -# Parameters.: Filemap handle -# Offset -# Address -# Size -# -##########################################################################*/ - - .global RdosMapView - -RdosMapView: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - pushl %edi - - movw 8(%ebp),%bx - movl 12(%ebp),%eax - movl 16(%ebp),%edi - movl 20(%ebp),%ecx - UserGate map_view_nr - - popl %edi - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosUnmapView -# -# Purpose....: Unmap view of file -# -# Parameters.: Filemap handle -# -##########################################################################*/ - - .global RdosUnmapView - -RdosUnmapView: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate unmap_view_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosSetCurDrive -# -# Purpose....: Set current drive -# -# Parameters.: Drive -# -##########################################################################*/ - - .global RdosSetCurDrive - -RdosSetCurDrive: - pushl %ebp - movl %esp,%ebp - - movb 8(%ebp),%al - UserGate set_cur_drive_nr - jc rscdrFail - - movl $1,%eax - jmp rscdrDone - -rscdrFail: - xorl %eax,%eax - -rscdrDone: - leave - ret - -/*########################################################################## -# -# Name : RdosGetCurDrive -# -# Purpose....: Get current drive -# -# Returns....: Drive -# -##########################################################################*/ - - .global RdosGetCurDrive - -RdosGetCurDrive: - pushl %ebp - movl %esp,%ebp - - xorl %eax,%eax - UserGate get_cur_drive_nr - movzx %al,%eax - - leave - ret - -/*########################################################################## -# -# Name : RdosSetCurDir -# -# Purpose....: Set current directory -# -# Parameters.: Pathname -# -##########################################################################*/ - - .global RdosSetCurDir - -RdosSetCurDir: - pushl %ebp - movl %esp,%ebp - pushl %edi - - movl 8(%ebp),%edi - UserGate set_cur_dir_nr - jc rscdFail - - movl $1,%eax - jmp rscdDone - -rscdFail: - xorl %eax,%eax - -rscdDone: - popl %edi - leave - ret - -/*########################################################################## -# -# Name : RdosGetCurDir -# -# Purpose....: Get current directory -# -# Parameters.: Drive -# Pathname -# -##########################################################################*/ - - .global RdosGetCurDir - -RdosGetCurDir: - pushl %ebp - movl %esp,%ebp - pushl %edi - - movb 8(%ebp),%al - movl 12(%ebp),%edi - UserGate get_cur_dir_nr - jc rgcdFail - - movl $1,%eax - jmp rgcdDone - -rgcdFail: - xorl %eax,%eax - -rgcdDone: - popl %edi - leave - ret - -/*########################################################################## -# -# Name : RdosMakeDir -# -# Purpose....: Create directory -# -# Parameters.: Pathname -# -##########################################################################*/ - - .global RdosMakeDir - -RdosMakeDir: - pushl %ebp - movl %esp,%ebp - pushl %edi - - movl 8(%ebp),%edi - UserGate make_dir_nr - jc mdFail - - movl $1,%eax - jmp mdDone - -mdFail: - xorl %eax,%eax - -mdDone: - popl %edi - leave - ret - -/*########################################################################## -# -# Name : RdosRemoveDir -# -# Purpose....: Remove directory -# -# Parameters.: Pathname -# -##########################################################################*/ - - .global RdosRemoveDir - -RdosRemoveDir: - pushl %ebp - movl %esp,%ebp - pushl %edi - - movl 8(%ebp),%edi - UserGate remove_dir_nr - jc rdFail - - movl $1,%eax - jmp rdDone - -rdFail: - xorl %eax,%eax - -rdDone: - popl %edi - leave - ret - -/*########################################################################## -# -# Name : RdosRenameFile -# -# Purpose....: Rename file -# -# Parameters.: ToName -# FromName -# -##########################################################################*/ - - .global RdosRenameFile - -RdosRenameFile: - pushl %ebp - movl %esp,%ebp - pushl %esi - pushl %edi - - movl 8(%ebp),%edi - movl 12(%ebp),%esi - UserGate rename_file_nr - jc rfFail - - mov $1,%eax - jmp rfDone - -rfFail: - xorl %eax,%eax - -rfDone: - popl %edi - popl %esi - leave - ret - -/*########################################################################## -# -# Name : RdosDeleteFile -# -# Purpose....: Delete file -# -# Parameters.: Pathname -# -##########################################################################*/ - - .global RdosDeleteFile - -RdosDeleteFile: - pushl %ebp - movl %esp,%ebp - pushl %edi - - movl 8(%ebp),%edi - UserGate delete_file_nr - jc dfFail - - mov $1,%eax - jmp dfDone - -dfFail: - xorl %eax,%eax - -dfDone: - popl %edi - leave - ret - -/*########################################################################## -# -# Name : RdosGetFileAttribute -# -# Purpose....: Get file attribute -# -# Parameters.: Pathname -# &Attrib -# -##########################################################################*/ - - .global RdosGetFileAttribute - -RdosGetFileAttribute: - pushl %ebp - movl %esp,%ebp - pushl %ecx - pushl %edi - - movl 8(%ebp),%edi - UserGate get_file_attribute_nr - jc gfaFail - - movl 12(%ebp),%edi - movzx %cx,%ecx - movl %ecx,(%edi) - movl $1,%eax - jmp gfaDone - -gfaFail: - xorl %eax,%eax - -gfaDone: - popl %edi - popl %ecx - leave - ret - -/*########################################################################## -# -# Name : RdosSetFileAttribute -# -# Purpose....: Set file attribute -# -# Parameters.: Pathname -# Attrib -# -##########################################################################*/ - - .global RdosSetFileAttribute - -RdosSetFileAttribute: - pushl %ebp - movl %esp,%ebp - pushl %ecx - pushl %edi - - movl 8(%ebp),%edi - movw 12(%ebp),%cx - UserGate set_file_attribute_nr - jc sfaFail - - movl $1,%eax - jmp sfaDone - -sfaFail: - xorl %eax,%eax - -sfaDone: - popl %edi - popl %ecx - leave - ret - -/*########################################################################## -# -# Name : RdosOpenDir -# -# Purpose....: Open directory -# -# Parameters.: Pathname -# -# Returns....: Dir handle -# -##########################################################################*/ - - .global RdosOpenDir - -RdosOpenDir: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %edi - - movl 8(%ebp),%edi - UserGate open_dir_nr - jc odFail - - movzx %bx,%eax - jmp odDone - -odFail: - xorl %eax,%eax - -odDone: - popl %edi - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosCloseDir -# -# Purpose....: Close directory -# -# Parameters.: Dir handle -# -##########################################################################*/ - - .global RdosCloseDir - -RdosCloseDir: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate close_dir_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosReadDir -# -# Purpose....: Read directory entry -# -# Parameters.: Dir handle -# Entry # -# MaxNameSize -# Name buffer -# &FileSize -# &Attribute -# &Msb time -# &Lsb time -# -##########################################################################*/ - - .global RdosReadDir - -RdosReadDir: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - pushl %edi - - movw 8(%ebp),%bx - movw 12(%ebp),%dx - movw 16(%ebp),%cx - movl 20(%ebp),%edi - UserGate read_dir_nr - jc rdiFail - - movl 24(%ebp),%edi - movl %ecx,(%edi) - - movl 28(%ebp),%edi - movzx %bx,%ebx - movl %ebx,(%edi) - - movl 32(%ebp),%edi - movl %edx,(%edi) - - movl 36(%ebp),%edi - movl %eax,(%edi) - - movl $1,%eax - jmp rdiDone - -rdiFail: - xorl %eax,%eax - -rdiDone: - popl %edi - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosSetFocus -# -# Purpose....: Set input focus -# -# Parameters.: Focus handle -# -##########################################################################*/ - - .global RdosSetFocus - -RdosSetFocus: - pushl %ebp - movl %esp,%ebp - - movl 8(%ebp),%eax - UserGate set_focus_nr - - leave - ret - -/*########################################################################## -# -# Name : RdosGetFocus -# -# Purpose....: Get input focus -# -# Returns....: Focus handle -# -##########################################################################*/ - - .global RdosGetFocus - -RdosGetFocus: - pushl %ebp - movl %esp,%ebp - - UserGate get_focus_nr - - leave - ret - -/*########################################################################## -# -# Name : RdosClearKeyboard -# -# Purpose....: Clear keyboard buffer -# -##########################################################################*/ - - .global RdosClearKeyboard - -RdosClearKeyboard: - pushl %ebp - movl %esp,%ebp - - UserGate flush_keyboard_nr - - leave - ret - -/*########################################################################## -# -# Name : RdosPollKeyboard -# -# Purpose....: Poll keyboard buffer -# -# Returns....: TRUE if non-empty -# -##########################################################################*/ - - .global RdosPollKeyboard - -RdosPollKeyboard: - pushl %ebp - movl %esp,%ebp - - UserGate poll_keyboard_nr - jc rpkEmpty - - mov $1,%eax - jmp rpkDone - -rpkEmpty: - xorl %eax,%eax - -rpkDone: - leave - ret - -/*########################################################################## -# -# Name : RdosReadKeyboard -# -# Purpose....: Read keyboard buffer -# -# Returns....: Scan code -# -##########################################################################*/ - - .global RdosReadKeyboard - -RdosReadKeyboard: - pushl %ebp - movl %esp,%ebp - - UserGate read_keyboard_nr - movzx %ax,%eax - - leave - ret - -/*########################################################################## -# -# Name : RdosGetKeyboardState -# -# Purpose....: Get keyboard buffer -# -# Returns....: Keyboard state -# -##########################################################################*/ - - .global RdosGetKeyboardState - -RdosGetKeyboardState: - pushl %ebp - movl %esp,%ebp - - UserGate get_keyboard_state_nr - movzx %ax,%eax - - leave - ret - -/*########################################################################## -# -# Name : RdosPutKeyboard -# -# Purpose....: Put scancode in keyboard buffer -# -##########################################################################*/ - - .global RdosPutKeyboard - -RdosPutKeyboard: - pushl %ebp - movl %esp,%ebp - pushl %edx - - movw 8(%ebp),%ax - movb 12(%ebp),%dl - movb 16(%ebp),%dh - UserGate put_keyboard_code_nr - - popl %edx - leave - ret - -/*########################################################################## -# -# Name : RdosPeekKeyEvent -# -# Purpose....: Peek keyboard event -# -##########################################################################*/ - - .global RdosPeekKeyEvent - -RdosPeekKeyEvent: - pushl %ebp - movl %esp,%ebp - pushl %ecx - pushl %edx - pushl %edi - - UserGate peek_key_event_nr - jc rpeFail - - movl 8(%ebp),%edi - movzx %ax,%eax - movl %eax,(%edi) - - movl 12(%ebp),%edi - movzx %cx,%eax - movl %eax,(%edi) - - movl 16(%ebp),%edi - movzx %dl,%eax - movl %eax,(%edi) - - movl 20(%ebp),%edi - movzx %dh,%eax - movl %eax,(%edi) - - movl $1,%eax - jmp rpeDone - -rpeFail: - xorl %eax,%eax - -rpeDone: - popl %edi - popl %edx - popl %ecx - leave - ret - -/*########################################################################## -# -# Name : RdosReadKeyEvent -# -# Purpose....: Read keyboard event -# -##########################################################################*/ - - .global RdosReadKeyEvent - -RdosReadKeyEvent: - pushl %ebp - movl %esp,%ebp - pushl %ecx - pushl %edx - pushl %edi - - UserGate read_key_event_nr - jc rkeFail - - movl 8(%ebp),%edi - movzx %ax,%eax - movl %eax,(%edi) - - movl 12(%ebp),%edi - movzx %cx,%eax - movl %eax,(%edi) - - movl 16(%ebp),%edi - movzx %dl,%eax - movl %eax,(%edi) - - movl 20(%ebp),%edi - movzx %dh,%eax - movl %eax,(%edi) - - movl $1,%eax - jmp rkeDone - -rkeFail: - xorl %eax,%eax - -rkeDone: - popl %edi - popl %edx - popl %ecx - leave - ret - -/*########################################################################## -# -# Name : RdosHideMouse -# -# Purpose....: Hide mouse cursor -# -##########################################################################*/ - - .global RdosHideMouse - -RdosHideMouse: - pushl %ebp - movl %esp,%ebp - - UserGate hide_mouse_nr - - leave - ret - -/*########################################################################## -# -# Name : RdosShowMouse -# -# Purpose....: Show mouse cursor -# -##########################################################################*/ - - .global RdosShowMouse - -RdosShowMouse: - pushl %ebp - movl %esp,%ebp - - UserGate show_mouse_nr - - leave - ret - -/*########################################################################## -# -# Name : RdosGetMousePosition -# -# Purpose....: Get mouse position -# -# Parameters.: &x, &y -# -##########################################################################*/ - - .global RdosGetMousePosition - -RdosGetMousePosition: - pushl %ebp - movl %esp,%ebp - pushl %ecx - pushl %edx - - UserGate get_mouse_position_nr - - movl 8(%ebp),%eax - movzx %cx,%ecx - movl %ecx,(%eax) - - movl 12(%ebp),%eax - movzx %dx,%edx - movl %edx,(%eax) - - popl %edx - popl %ecx - leave - ret - -/*########################################################################## -# -# Name : RdosSetMousePosition -# -# Purpose....: Set mouse position -# -# Parameters.: x, y -# -##########################################################################*/ - - .global RdosSetMousePosition - -RdosSetMousePosition: - pushl %ebp - movl %esp,%ebp - pushl %ecx - pushl %edx - - movw 8(%ebp),%cx - movw 12(%ebp),%dx - UserGate set_mouse_position_nr - - popl %edx - popl %ecx - leave - ret - -/*########################################################################## -# -# Name : RdosSetMouseWindow -# -# Purpose....: Set mouse window -# -# Parameters.: start x, start y -# end x, end y -# -##########################################################################*/ - - .global RdosSetMouseWindow - -RdosSetMouseWindow: - pushl %ebp - movl %esp,%ebp - pushl %eax - pushl %ebx - pushl %ecx - pushl %edx - - movw 8(%ebp),%ax - movw 12(%ebp),%bx - movw 16(%ebp),%cx - movw 20(%ebp),%dx - UserGate set_mouse_window_nr - - popl %edx - popl %ecx - popl %ebx - popl %eax - leave - ret - -/*########################################################################## -# -# Name : RdosSetMouseMickey -# -# Purpose....: Set mouse mickey -# -# Parameters.: x, y -# -##########################################################################*/ - - .global RdosSetMouseMickey - -RdosSetMouseMickey: - pushl %ebp - movl %esp,%ebp - pushl %ecx - pushl %edx - - movw 8(%ebp),%cx - movw 12(%ebp),%dx - UserGate set_mouse_mickey_nr - - popl %edx - popl %ecx - leave - ret - -/*########################################################################## -# -# Name : RdosGetCursorPosition -# -# Purpose....: Get cursor position -# -# Parameters.: &x, &y -# -##########################################################################*/ - - .global RdosGetCursorPosition - -RdosGetCursorPosition: - pushl %ebp - movl %esp,%ebp - pushl %ecx - pushl %edx - - UserGate get_cursor_position_nr - - movl 8(%ebp),%eax - movzx %cx,%ecx - movl %ecx,(%eax) - - movl 12(%ebp),%eax - movzx %dx,%edx - movl %edx,(%eax) - - popl %edx - popl %ecx - leave - ret - -/*########################################################################## -# -# Name : RdosSetCursorPosition -# -# Purpose....: Set cursor position -# -# Parameters.: x, y -# -##########################################################################*/ - - .global RdosSetCursorPosition - -RdosSetCursorPosition: - pushl %ebp - movl %esp,%ebp - pushl %ecx - pushl %edx - - movw 8(%ebp),%cx - movw 12(%ebp),%dx - UserGate set_cursor_position_nr - - popl %edx - popl %ecx - leave - ret - -/*########################################################################## -# -# Name : RdosGetLeftButton -# -# Purpose....: Check if left button is pressed -# -# Returns....: TRUE if pressed -# -##########################################################################*/ - - .global RdosGetLeftButton - -RdosGetLeftButton: - pushl %ebp - movl %esp,%ebp - - UserGate get_left_button_nr - jc get_left_rel - - mov $1,%eax - jmp get_left_done - -get_left_rel: - xorl %eax,%eax - -get_left_done: - leave - ret - -/*########################################################################## -# -# Name : RdosGetRightButton -# -# Purpose....: Check if right button is pressed -# -# Returns....: TRUE if pressed -# -##########################################################################*/ - - .global RdosGetRightButton - -RdosGetRightButton: - pushl %ebp - movl %esp,%ebp - - UserGate get_right_button_nr - jc get_right_rel - - mov $1,%eax - jmp get_right_done - -get_right_rel: - xorl %eax,%eax - -get_right_done: - leave - ret - -/*########################################################################## -# -# Name : RdosGetLeftButtonPressPosition -# -# Purpose....: Get left button press position -# -# Parameters.: &x, &y -# -##########################################################################*/ - - .global RdosGetLeftButtonPressPosition - -RdosGetLeftButtonPressPosition: - pushl %ebp - movl %esp,%ebp - - pushl %ecx - pushl %edx - - UserGate get_left_button_press_position_nr - - movl 8(%ebp),%eax - movzx %cx,%ecx - movl %ecx,(%eax) - - movl 12(%ebp),%eax - movzx %dx,%edx - movl %edx,(%eax) - - popl %edx - popl %ecx - leave - ret - -/*########################################################################## -# -# Name : RdosGetRightButtonPressPosition -# -# Purpose....: Get right button press position -# -# Parameters.: &x, &y -# -##########################################################################*/ - - .global RdosGetRightButtonPressPosition - -RdosGetRightButtonPressPosition: - pushl %ebp - movl %esp,%ebp - - pushl %ecx - pushl %edx - - UserGate get_right_button_press_position_nr - - movl 8(%ebp),%eax - movzx %cx,%ecx - movl %ecx,(%eax) - - movl 12(%ebp),%eax - movzx %dx,%edx - movl %edx,(%eax) - - popl %edx - popl %ecx - leave - ret - -/*########################################################################## -# -# Name : RdosGetLeftButtonReleasePosition -# -# Purpose....: Get left button release position -# -# Parameters.: &x, &y -# -##########################################################################*/ - - .global RdosGetLeftButtonReleasePosition - -RdosGetLeftButtonReleasePosition: - pushl %ebp - movl %esp,%ebp - - pushl %ecx - pushl %edx - - UserGate get_left_button_release_position_nr - - movl 8(%ebp),%eax - movzx %cx,%ecx - movl %ecx,(%eax) - - movl 12(%ebp),%eax - movzx %dx,%edx - movl %edx,(%eax) - - popl %edx - popl %ecx - leave - ret - -/*########################################################################## -# -# Name : RdosGetRightButtonReleasePosition -# -# Purpose....: Get right button release position -# -# Parameters.: &x, &y -# -##########################################################################*/ - - .global RdosGetRightButtonReleasePosition - -RdosGetRightButtonReleasePosition: - pushl %ebp - movl %esp,%ebp - - pushl %ecx - pushl %edx - - UserGate get_right_button_release_position_nr - - movl 8(%ebp),%eax - movzx %cx,%ecx - movl %ecx,(%eax) - - movl 12(%ebp),%eax - movzx %dx,%edx - movl %edx,(%eax) - - popl %edx - popl %ecx - leave - ret - -/*########################################################################## -# -# Name : RdosReadLine -# -# Purpose....: Read a line from keyboard -# -# Parameters.: Buffer -# Size -# -# Returns....: Read count -# -##########################################################################*/ - - .global RdosReadLine - -RdosReadLine: - pushl %ebp - movl %esp,%ebp - pushl %ecx - pushl %edi - - movl 8(%ebp),%edi - movl 12(%ebp),%ecx - UserGate read_con_nr - - popl %edi - popl %ecx - leave - ret - -/*########################################################################## -# -# Name : RdosWriteChar -# -# Purpose....: Write a character to screen -# -# Parameters.: Char -# -##########################################################################*/ - - .global RdosWriteChar - -RdosWriteChar: - pushl %ebp - movl %esp,%ebp - - movb 8(%ebp),%al - UserGate write_char_nr - - leave - ret - -/*########################################################################## -# -# Name : RdosWriteSizeString -# -# Purpose....: Write a fixed number of characters to screen -# -# Parameters.: String -# Count -# -##########################################################################*/ - - .global RdosWriteSizeString - -RdosWriteSizeString: - pushl %ebp - movl %esp,%ebp - pushl %ecx - pushl %edi - - movl 8(%ebp),%edi - movl 12(%ebp),%ecx - UserGate write_size_string_nr - - popl %edi - popl %ecx - leave - ret - -/*########################################################################## -# -# Name : RdosWriteString -# -# Purpose....: Write a string to screen -# -# Parameters.: String -# -##########################################################################*/ - - .global RdosWriteString - -RdosWriteString: - pushl %ebp - movl %esp,%ebp - pushl %edi - - movl 8(%ebp),%edi - UserGate write_asciiz_nr - - popl %edi - leave - ret - -/*########################################################################## -# -# Name : RdosNameToIp -# -# Purpose....: Convert host name to IP address -# -# Parameters.: Name -# -# Returns....: IP -# -##########################################################################*/ - - .global RdosNameToIp - -RdosNameToIp: - pushl %ebp - movl %esp,%ebp - pushl %edi - - movl 8(%ebp),%edi - UserGate name_to_ip_nr - jc rntiFail - - movl %edx,%eax - jmp rntiDone - -rntiFail: - xorl %eax,%eax - -rntiDone: - popl %edi - leave - ret - -/*########################################################################## -# -# Name : RdosGetIp -# -# Purpose....: Get my IP -# -# Returns....: IP -# -##########################################################################*/ - - .global RdosGetIp - -RdosGetIp: - pushl %ebp - movl %esp,%ebp - - UserGate get_ip_address_nr - movl %edx,%eax - - leave - ret - -/*########################################################################## -# -# Name : RdosIpToName -# -# Purpose....: Convert IP address to host name -# -# Parameters.: IP -# Name -# Size -# -##########################################################################*/ - - .global RdosIpToName - -RdosIpToName: - pushl %ebp - movl %esp,%ebp - pushl %ecx - pushl %edx - pushl %edi -; - movl 8(%ebp),%edx - movl 12(%ebp),%edi - movl 16(%ebp),%ecx - UserGate ip_to_name_nr - jnc ritnDone - -ritnFail: - xorl %eax,%eax - -ritnDone: - popl %edi - popl %edx - popl %ecx - leave - ret - -/*########################################################################## -# -# Name : RdosPing -# -# Purpose....: Ping node -# -# Parameters.: IP -# Timeout -# -##########################################################################*/ - - .global RdosPing - -RdosPing: - pushl %ebp - movl %esp,%ebp - pushl %edx -; - movl 8(%ebp),%edx - movl 12(%ebp),%eax - UserGate ping_nr - jc ping_failed - - movl $1,%eax - jmp ping_done - -ping_failed: - xorl %eax,%eax - -ping_done: - popl %edx - leave - ret - -/*########################################################################## -# -# Name : RdosOpenTcpConnection -# -# Purpose....: Open an active connection over TCP -# -# Parameters.: RemoteIp -# LocalPort -# RemotePort -# Timeout in ms -# BufferSize -# -# Returns....: Conn handle -# -##########################################################################*/ - - .global RdosOpenTcpConnection - -RdosOpenTcpConnection: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %esi - pushl %edi - - movl 8(%ebp),%edx - movw 12(%ebp),%si - movw 16(%ebp),%di - movl 20(%ebp),%eax - movl 24(%ebp),%ecx - UserGate open_tcp_connection_nr - mov $0,%eax - jc rotcDone - - movl %ebx,%eax - -rotcDone: - popl %edi - popl %esi - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosCreateTcpListen -# -# Purpose....: Create listen handle -# -# Parameters.: Port -# MaxConnections -# BufferSize -# -# Returns....: Listen handle -# -##########################################################################*/ - - .global RdosCreateTcpListen - -RdosCreateTcpListen: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %esi - - movw 8(%ebp),%si - movw 12(%ebp),%ax - movl 16(%ebp),%ecx - UserGate create_tcp_listen_nr - movzx %bx,%eax - jnc ctlDone - - xorl %eax,%eax - -ctlDone: - popl %esi - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosGetTcpListen -# -# Purpose....: Get connection from listen -# -# Parameters.: Listen handle -# -# Returns....: Conn handle -# -##########################################################################*/ - - .global RdosGetTcpListen - -RdosGetTcpListen: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate get_tcp_listen_nr - movzx %ax,%eax - jnc gtlDone - - xorl %eax,%eax - -gtlDone: - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosCloseTcpListen -# -# Purpose....: Close TCP listen -# -# Parameters.: Listen handle -# -##########################################################################*/ - - .global RdosCloseTcpListen - -RdosCloseTcpListen: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate close_tcp_listen_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosAddWaitForTcpListen -# -# Purpose....: Add wait object to tcp listen -# -# Parameters.: Wait handle -# Listen handle -# ID -# -##########################################################################*/ - - .global RdosAddWaitForTcpListen - -RdosAddWaitForTcpListen: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - - movw 8(%ebp),%bx - movw 12(%ebp),%ax - movl 16(%ebp),%ecx - UserGate add_wait_for_tcp_listen_nr - movl $1,%eax - jnc awftlDone - - xorl %eax,%eax - -awftlDone: - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosWaitForTcpConnection -# -# Purpose....: Wait for Tcp connection to be established -# -# Parameters.: Conn handle -# Timeout ms -# -##########################################################################*/ - - .global RdosWaitForTcpConnection - -RdosWaitForTcpConnection: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - movl 12(%ebp),%eax - UserGate wait_for_tcp_connection_nr - movl $1,%eax - jnc wftcDone - - xorl %eax,%eax - -wftcDone: - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosAddWaitForTcpConnection -# -# Purpose....: Add wait object to tcp connection -# -# Parameters.: Wait handle -# Conn handle -# ID -# -##########################################################################*/ - - .global RdosAddWaitForTcpConnection - -RdosAddWaitForTcpConnection: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - - movw 8(%ebp),%bx - movw 12(%ebp),%ax - movl 16(%ebp),%ecx - UserGate add_wait_for_tcp_connection_nr - movl $1,%eax - jnc awftcDone - - xorl %eax,%eax - -awftcDone: - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosCloseTcpConnection -# -# Purpose....: Close Tcp connection -# -# Parameters.: Conn handle -# -##########################################################################*/ - - .global RdosCloseTcpConnection - -RdosCloseTcpConnection: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate close_tcp_connection_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosDeleteTcpConnection -# -# Purpose....: Delete Tcp connection -# -# Parameters.: Conn handle -# -##########################################################################*/ - - .global RdosDeleteTcpConnection - -RdosDeleteTcpConnection: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate delete_tcp_connection_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosAbortTcpConnection -# -# Purpose....: Abort Tcp connection -# -# Parameters.: Conn handle -# -##########################################################################*/ - - .global RdosAbortTcpConnection - -RdosAbortTcpConnection: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate abort_tcp_connection_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosPushTcpConnection -# -# Purpose....: Push Tcp connection -# -# Parameters.: Conn handle -# -##########################################################################*/ - - .global RdosPushTcpConnection - -RdosPushTcpConnection: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate push_tcp_connection_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosPollTcpConnection -# -# Purpose....: Poll Tcp connection -# -# Parameters.: Conn handle -# -# Returns....: Available bytes in receive buffer -# -##########################################################################*/ - - .global RdosPollTcpConnection - -RdosPollTcpConnection: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate poll_tcp_connection_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosIsTcpConnectionClosed -# -# Purpose....: Check if connection is closed -# -# Parameters.: Conn handle -# -# Returns....: TRUE if closed -# -##########################################################################*/ - - .global RdosIsTcpConnectionClosed - -RdosIsTcpConnectionClosed: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate is_tcp_connection_closed_nr - jc rptcClosed - - xorl %eax,%eax - jmp rptcDone - -rptcClosed: - movl $1,%eax - -rptcDone: - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosGetRemoteTcpConnectionIp -# -# Purpose....: Get remote IP -# -# Parameters.: Conn handle -# -# Returns....: IP -# -##########################################################################*/ - - .global RdosGetRemoteTcpConnectionIp - -RdosGetRemoteTcpConnectionIp: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate get_remote_tcp_connection_ip_nr - jnc grtciDone - - movl $0xFFFFFFFF,%eax - -grtciDone: - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosGetRemoteTcpConnectionPort -# -# Purpose....: Get remote port -# -# Parameters.: Conn handle -# -# Returns....: Port -# -##########################################################################*/ - - .global RdosGetRemoteTcpConnectionPort - -RdosGetRemoteTcpConnectionPort: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate get_remote_tcp_connection_port_nr - jnc grtcpDone - - movl $0,%eax - -grtcpDone: - movzx %ax,%eax - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosGetLocalTcpConnectionPort -# -# Purpose....: Get local port -# -# Parameters.: Conn handle -# -# Returns....: Port -# -##########################################################################*/ - - .global RdosGetLocalTcpConnectionPort - -RdosGetLocalTcpConnectionPort: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movw 8(%ebp),%bx - UserGate get_local_tcp_connection_port_nr - jnc gltcpDone - - movl $0,%eax - -gltcpDone: - movzx %ax,%eax - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosReadTcpConnection -# -# Purpose....: Read data from connection -# -# Parameters.: Conn handle -# Buffer -# Size -# -# Returns....: Read bytes -# -##########################################################################*/ - - .global RdosReadTcpConnection - -RdosReadTcpConnection: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - pushl %edi - - movw 8(%ebp),%bx - movl 12(%ebp),%edi - movl 16(%ebp),%ecx - UserGate read_tcp_connection_nr - - popl %edi - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosWriteTcpConnection -# -# Purpose....: Write data fto connection -# -# Parameters.: Conn handle -# Buffer -# Size -# -# Returns....: Written bytes -# -##########################################################################*/ - - .global RdosWriteTcpConnection - -RdosWriteTcpConnection: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - pushl %edi - - movw 8(%ebp),%bx - movl 12(%ebp),%edi - movl 16(%ebp),%ecx - UserGate write_tcp_connection_nr - - popl %edi - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosGetLocalMailslot -# -# Purpose....: Get local mailslot from name -# -# Parameters.: Name -# -# Returns....: Mailslot handle -# -##########################################################################*/ - - .global RdosGetLocalMailslot - -RdosGetLocalMailslot: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %edi - - movl 8(%ebp),%edi - UserGate get_local_mailslot_nr - jc rglmFail - - movzx %bx,%eax - jmp rglmDone - -rglmFail: - xorl %eax,%eax - -rglmDone: - popl %edi - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosGetRemoteMailslot -# -# Purpose....: Get remote mailslot from name -# -# Parameters.: IP -# Name -# -# Returns....: Mailslot handle -# -##########################################################################*/ - - .global RdosGetRemoteMailslot - -RdosGetRemoteMailslot: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %edx - pushl %edi - - movl 8(%ebp),%edx - movl 12(%ebp),%edi - UserGate get_remote_mailslot_nr - jc rgrmFail - - movzx %bx,%eax - jmp rgrmDone - -rgrmFail: - xorl %eax,%eax - -rgrmDone: - popl %edi - popl %edx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosFreeMailslot -# -# Purpose....: Free mailslot -# -# Parameters.: Mailslot handle -# -##########################################################################*/ - - .global RdosFreeMailslot - -RdosFreeMailslot: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movl 8(%ebp),%ebx - UserGate free_mailslot_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosSendMailslot -# -# Purpose....: Send mailslot -# -# Parameters.: Mailslot handle -# Msg -# Size -# ReplyBuf -# MaxReplySize -# -# Returns....: Size of reply -# -##########################################################################*/ - - .global RdosSendMailslot - -RdosSendMailslot: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %esi - pushl %edi - - movw 8(%ebp),%bx - movl 12(%ebp),%esi - movl 16(%ebp),%ecx - movl 20(%ebp),%edi - movl 24(%ebp),%eax - UserGate send_mailslot_nr - jc smFail - - movl %ecx,%eax - jmp smDone - -smFail: - movl $0xFFFFFFFF,%eax - -smDone: - popl %edi - popl %esi - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosDefineMailslot -# -# Purpose....: Define mailslot -# -# Parameters.: Name -# Max msg size -# -##########################################################################*/ - - .global RdosDefineMailslot - -RdosDefineMailslot: - pushl %ebp - movl %esp,%ebp - pushl %ecx - pushl %edi - - movl 8(%ebp),%edi - movl 12(%ebp),%ecx - UserGate define_mailslot_nr - - popl %edi - popl %ecx - leave - ret - -/*########################################################################## -# -# Name : RdosReceiveMailslot -# -# Purpose....: Receive from mailslot -# -# Parameters.: Msg buffer -# -# Returns....: Msg size -# -##########################################################################*/ - - .global RdosReceiveMailslot - -RdosReceiveMailslot: - pushl %ebp - movl %esp,%ebp - pushl %ecx - pushl %edi - - movl 8(%ebp),%edi - UserGate receive_mailslot_nr - movl %ecx,%eax - - popl %edi - popl %ecx - leave - ret - -/*########################################################################## -# -# Name : RdosReplyMailslot -# -# Purpose....: Reply to mailslot -# -# Parameters.: Msg buffer -# Msg size -# -##########################################################################*/ - - .global RdosReplyMailslot - -RdosReplyMailslot: - pushl %ebp - movl %esp,%ebp - pushl %ecx - pushl %edi - - movl 8(%ebp),%edi - movl 12(%ebp),%ecx - UserGate reply_mailslot_nr - - popl %edi - popl %ecx - leave - ret - -/*########################################################################## -# -# Name : RdosGetIdeDisc -# -# Purpose....: Get IDE disc -# -# Parameters.: Unit # -# -# Returns....: Disc # -# -##########################################################################*/ - - .global RdosGetIdeDisc - -RdosGetIdeDisc: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movb 8(%ebp),%bl - UserGate get_ide_disc_nr - jc get_ide_disc_fail - - movzx %al,%eax - jmp get_ide_disc_done - -get_ide_disc_fail: - movl $0xFFFFFFFF,%eax - -get_ide_disc_done: - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosGetFloppyDisc -# -# Purpose....: Get floppy disc -# -# Parameters.: Unit # -# -# Returns....: Disc # -# -##########################################################################*/ - - .global RdosGetFloppyDisc - -RdosGetFloppyDisc: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movb 8(%ebp),%bl - UserGate get_floppy_disc_nr - jc get_floppy_disc_fail - - movzx %al,%eax - jmp get_floppy_disc_done - -get_floppy_disc_fail: - movl $0xFFFFFFFF,%eax - -get_floppy_disc_done: - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosGetDiscInfo -# -# Purpose....: Get disc info -# -# Parameters.: Disc # -# Bytes / sector -# Total sectors -# BIOS sectors / cyl -# BIOS heads -# -# Returns....: TRUE if ok -# -##########################################################################*/ - - .global RdosGetDiscInfo - -RdosGetDiscInfo: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - pushl %edx - pushl %esi - pushl %edi - - movb 8(%ebp),%al - UserGate get_disc_info_nr - jc get_disc_info_fail - - movl 12(%ebp),%ebx - movzx %cx,%ecx - movl %ecx,(%ebx) - - movl 16(%ebp),%ebx - movl %edx,(%ebx) - - movl 20(%ebp),%ebx - movzx %si,%esi - movl %esi,(%ebx) - - movl 24(%ebp),%ebx - movzx %di,%edi - movl %edi,(%ebx) - - movl $1,%eax - jmp get_disc_info_done - -get_disc_info_fail: - xorl %eax,%eax - -get_disc_info_done: - popl %edi - popl %esi - popl %edx - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosSetDiscInfo -# -# Purpose....: Set disc info -# -# Parameters.: Disc # -# Bytes / sector -# Total sectors -# BIOS sectors / cyl -# BIOS heads -# -# Returns....: TRUE if ok -# -##########################################################################*/ - - .global RdosSetDiscInfo - -RdosSetDiscInfo: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - pushl %edx - pushl %esi - pushl %edi - - movb 8(%ebp),%al - movl 12(%ebp),%ecx - movl 16(%ebp),%edx - movl 20(%ebp),%esi - movl 24(%ebp),%edi - UserGate set_disc_info_nr - jc set_disc_info_fail - - movl $1,%eax - jmp set_disc_info_done - -set_disc_info_fail: - xorl %eax,%eax - -set_disc_info_done: - popl %edi - popl %esi - popl %edx - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosReadDisc -# -# Purpose....: Read from disc -# -# Parameters.: Disc # -# Sector # -# Buffer -# Size -# -# Returns....: TRUE if ok -# -##########################################################################*/ - - .global RdosReadDisc - -RdosReadDisc: - pushl %ebp - movl %esp,%ebp - pushl %ecx - pushl %edx - pushl %edi - - movb 8(%ebp),%al - movl 12(%ebp),%edx - movl 16(%ebp),%edi - movl 20(%ebp),%ecx - UserGate read_disc_nr - jc read_disc_fail - - movl $1,%eax - jmp read_disc_done - -read_disc_fail: - xorl %eax,%eax - -read_disc_done: - popl %edi - popl %edx - popl %ecx - leave - ret - -/*########################################################################## -# -# Name : RdosWriteDisc -# -# Purpose....: Write to disc -# -# Parameters.: Disc # -# Sector # -# Buffer -# Size -# -# Returns....: TRUE if ok -# -##########################################################################*/ - - .global RdosWriteDisc - -RdosWriteDisc: - pushl %ebp - movl %esp,%ebp - pushl %ecx - pushl %edx - pushl %edi - - movb 8(%ebp),%al - movl 12(%ebp),%edx - movl 16(%ebp),%edi - movl 20(%ebp),%ecx - UserGate write_disc_nr - jc write_disc_fail - - movl $1,%eax - jmp write_disc_done - -write_disc_fail: - xorl %eax,%eax - -write_disc_done: - popl %edi - popl %edx - popl %ecx - leave - ret - -/*########################################################################## -# -# Name : RdosAllocateFixedDrive -# -# Purpose....: Allocate fixed drive -# -# Parameters.: Drive # -# -# Returns....: TRUE if ok -# -##########################################################################*/ - - .global RdosAllocateFixedDrive - -RdosAllocateFixedDrive: - pushl %ebp - movl %esp,%ebp - - movb 8(%ebp),%al - UserGate allocate_fixed_drive_nr - jc allocate_fixed_drive_fail - - movl $1,%eax - jmp allocate_fixed_drive_done - -allocate_fixed_drive_fail: - xorl %eax,%eax - -allocate_fixed_drive_done: - leave - ret - -/*########################################################################## -# -# Name : RdosAllocateStaticDrive -# -# Purpose....: Allocate static drive -# -# Returns....: Drive # -# -##########################################################################*/ - - .global RdosAllocateStaticDrive - -RdosAllocateStaticDrive: - pushl %ebp - movl %esp,%ebp - - UserGate allocate_static_drive_nr - jc allocate_static_drive_fail - - movzx %al,%eax - jmp allocate_static_drive_done - -allocate_static_drive_fail: - xorl %eax,%eax - -allocate_static_drive_done: - leave - ret - -/*########################################################################## -# -# Name : RdosAllocateDynamicDrive -# -# Purpose....: Allocate dynamic drive -# -# Returns....: Drive # -# -##########################################################################*/ - - .global RdosAllocateDynamicDrive - -RdosAllocateDynamicDrive: - pushl %ebp - movl %esp,%ebp - - UserGate allocate_dynamic_drive_nr - jc allocate_dynamic_drive_fail - - movzx %al,%eax - jmp allocate_dynamic_drive_done - -allocate_dynamic_drive_fail: - xorl %eax,%eax - -allocate_dynamic_drive_done: - leave - ret - -/*########################################################################## -# -# Name : RdosGetRdfsInfo -# -# Purpose....: Get rdfs info -# -# Parameters.: Crypt tab -# Key tab -# Extent size tab -# -##########################################################################*/ - - .global RdosGetRdfsInfo - -RdosGetRdfsInfo: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %esi - pushl %edi - - movl 8(%ebp),%esi - movl 12(%ebp),%edi - movl 16(%ebp),%ebx - UserGate get_rdfs_info_nr - - popl %edi - popl %esi - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosGetDriveInfo -# -# Purpose....: Get drive info -# -# Parameters.: Drive # -# Free units -# Bytes per unit -# Total units -# -# Returns....: TRUE if ok -# -##########################################################################*/ - - .global RdosGetDriveInfo - -RdosGetDriveInfo: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - pushl %edx - - movb 8(%ebp),%al - UserGate get_drive_info_nr - jc get_drive_info_fail - - movl 12(%ebp),%ebx - movl %eax,(%ebx) - - movl 16(%ebp),%ebx - movzx %cx,%ecx - movl %ecx,(%ebx) - - movl 20(%ebp),%ebx - movl %edx,(%ebx) - - movl $1,%eax - jmp get_drive_info_done - -get_drive_info_fail: - xorl %eax,%eax - -get_drive_info_done: - popl %edx - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosDemandLoadDrive -# -# Purpose....: Demand load drive -# -# Parameters.: Drive # -# -##########################################################################*/ - - .global RdosDemandLoadDrive - -RdosDemandLoadDrive: - pushl %ebp - movl %esp,%ebp - - movb 8(%ebp),%al - UserGate demand_load_drive_nr - - leave - ret - -/*########################################################################## -# -# Name : RdosGetDriveDiscParam -# -# Purpose....: Get drive disc parameters -# -# Parameters.: Drive # -# Disc # -# Start sector -# Total sectors -# -# Returns....: TRUE if ok -# -##########################################################################*/ - - .global RdosGetDriveDiscParam - -RdosGetDriveDiscParam: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - pushl %edx - - movb 8(%ebp),%al - UserGate get_drive_disc_param_nr - jc get_drive_disc_param_fail - - movl 12(%ebp),%ebx - movzx %al,%eax - movl %eax,(%ebx) - - movl 16(%ebp),%ebx - movl %edx,(%ebx) - - movl 20(%ebp),%ebx - movl %ecx,(%ebx) - - movl $1,%eax - jmp get_drive_disc_param_done - -get_drive_disc_param_fail: - xorl %eax,%eax - -get_drive_disc_param_done: - popl %edx - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosFormatDrive -# -# Purpose....: Format drive -# -# Parameters.: Disc # -# Start sector -# Sectors -# FS name -# -# Returns....: Drive # -# -##########################################################################*/ - - .global RdosFormatDrive - -RdosFormatDrive: - pushl %ebp - movl %esp,%ebp - pushl %ecx - pushl %edx - pushl %edi - - movb 8(%ebp),%al - movl 12(%ebp),%edx - movl 16(%ebp),%ecx - movl 20(%ebp),%edi - UserGate format_drive_nr - jc rfdFail - - movzx %al,%eax - jmp rfdDone - -rfdFail: - xorl %eax,%eax - -rfdDone: - popl %edi - popl %edx - popl %ecx - leave - ret - -/*########################################################################## -# -# Name : RdosGetExeName -# -# Purpose....: Get name of executable file -# -# Returns....: Exe pathname -# -##########################################################################*/ - - .global RdosGetExeName - -RdosGetExeName: - pushl %ebp - movl %esp,%ebp - pushl %edi - - UserGate get_exe_name_nr - jc rgenFail - - movl %edi,%eax - jmp rgenDone - -rgenFail: - xorl %eax,%eax - -rgenDone: - popl %edi - leave - ret - -/*########################################################################## -# -# Name : RdosOpenAdc -# -# Purpose....: Open handle to ADC channel -# -# Parameters.: Channel # -# -# Returns....: Adc handle -# -##########################################################################*/ - - .global RdosOpenAdc - -RdosOpenAdc: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movl 8(%ebp),%eax - UserGate open_adc_nr - movw %bx,%ax - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosCloseAdc -# -# Purpose....: Close ADC handle -# -# Parameters.: Adc handle -# -##########################################################################*/ - - .global RdosCloseAdc - -RdosCloseAdc: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movl 8(%ebp),%ebx - UserGate close_adc_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosDefineAdcTime -# -# Purpose....: Define time of next conversion -# -# Parameters.: Adc handle -# MSB time -# LSB time -# -##########################################################################*/ - - .global RdosDefineAdcTime - -RdosDefineAdcTime: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %edx - - movl 8(%ebp),%ebx - movl 12(%ebp),%edx - movl 16(%ebp),%eax - UserGate define_adc_time_nr - - popl %edx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosReadAdc -# -# Purpose....: Read ADC -# -# Parameters.: Adc handle -# -# Returns....: Value -# -##########################################################################*/ - - .global RdosReadAdc - -RdosReadAdc: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movl 8(%ebp),%ebx - UserGate read_adc_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosReadSerialLines -# -# Purpose....: Read serial lines -# -# Parameters.: Device -# &Value -# -# Returns....: TRUE if ok -# -##########################################################################*/ - - .global RdosReadSerialLines - -RdosReadSerialLines: - pushl %ebp - movl %esp,%ebp - pushl %edx - pushl %esi - - movb 8(%ebp),%dh - UserGate read_serial_lines_nr - jc rdsFail - - movzx %al,%eax - movl 12(%ebp),%esi - movl %eax,(%esi) - movl $1,%eax - jmp rdsDone - -rdsFail: - xorl %eax,%eax - -rdsDone: - popl %esi - popl %edx - leave - ret - -/*########################################################################## -# -# Name : RdosToggleSerialLine -# -# Purpose....: Toggle serial line -# -# Parameters.: Device -# Line -# -# Returns....: TRUE if ok -# -##########################################################################*/ - - .global RdosToggleSerialLine - -RdosToggleSerialLine: - pushl %ebp - movl %esp,%ebp - pushl %edx - - movb 8(%ebp),%dh - movb 12(%ebp),%dl - UserGate toggle_serial_line_nr - jc rtsFail - - movl $1,%eax - jmp rtsDone - -rtsFail: - xorl %eax,%eax - -rtsDone: - popl %edx - leave - ret - -/*########################################################################## -# -# Name : RdosReadSerialVal -# -# Purpose....: Read serial value -# -# Parameters.: Device -# Line -# &Val -# -# Returns....: TRUE if ok -# -##########################################################################*/ - - .global RdosReadSerialVal - -RdosReadSerialVal: - pushl %ebp - movl %esp,%ebp - pushl %edx - pushl %esi - - movb 8(%ebp),%dh - movb 12(%ebp),%dl - UserGate read_serial_val_nr - - pushfw - shll $8,%eax - movl 16(%ebp),%esi - movl %eax,(%esi) - popfw - jc rdvFail - - movl $1,%eax - jmp rdvDone - -rdvFail: - xorl %eax,%eax - -rdvDone: - popl %esi - popl %edx - leave - ret - -/*########################################################################## -# -# Name : RdosWriteSerialVal -# -# Purpose....: Write serial value -# -# Parameters.: Device -# Line -# Val -# -# Returns....: TRUE if ok -# -##########################################################################*/ - - .global RdosWriteSerialVal - -RdosWriteSerialVal: - pushl %ebp - movl %esp,%ebp - pushl %edx - - movb 8(%ebp),%dh - movb 12(%ebp),%dl - movl 16(%ebp),%eax - sarl $8,%eax - UserGate write_serial_val_nr - jc rwvFail - - movl $1,%eax - jmp rwvDone - -rwvFail: - xorl %eax,%eax - -rwvDone: - popl %edx - leave - ret - -/*########################################################################## -# -# Name : RdosReadSerialRaw -# -# Purpose....: Read serial raw value -# -# Parameters.: Device -# Line -# &Val -# -# Returns....: TRUE if ok -# -##########################################################################*/ - - .global RdosReadSerialRaw - -RdosReadSerialRaw: - pushl %ebp - movl %esp,%ebp - pushl %edx - pushl %esi - - movb 8(%ebp),%dh - movb 12(%ebp),%dl - UserGate read_serial_val_nr - - pushfw - movl 16(%ebp),%esi - movl %eax,(%esi) - popfw - jc rdrFail - - movl $1,%eax - jmp rdrDone - -rdrFail: - xorl %eax,%eax - -rdrDone: - popl %esi - popl %edx - leave - ret - -/*########################################################################## -# -# Name : RdosWriteSerialRaw -# -# Purpose....: Write serial raw value -# -# Parameters.: Device -# Line -# Val -# -# Returns....: TRUE if ok -# -##########################################################################*/ - - .global RdosWriteSerialRaw - -RdosWriteSerialRaw: - pushl %ebp - movl %esp,%ebp - pushl %edx - - movb 8(%ebp),%dh - movb 12(%ebp),%dl - movl 16(%ebp),%eax - UserGate write_serial_val_nr - jc rwrFail - - movl $1,%eax - jmp rwrDone - -rwrFail: - xorl %eax,%eax - -rwrDone: - popl %edx - leave - ret - -/*########################################################################## -# -# Name : RdosOpenSysEnv -# -# Purpose....: Open system environment -# -# Returns....: Env handle -# -##########################################################################*/ - - .global RdosOpenSysEnv - -RdosOpenSysEnv: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - UserGate open_sys_env_nr - jc oseFail - - movzx %bx,%eax - jmp oseDone - -oseFail: - xorl %eax,%eax - -oseDone: - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosOpenProcessEnv -# -# Purpose....: Open process environment -# -# Returns....: Env handle -# -##########################################################################*/ - - .global RdosOpenProcessEnv - -RdosOpenProcessEnv: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - UserGate open_proc_env_nr - jc opeFail - - movzx %bx,%eax - jmp opeDone - -opeFail: - xorl %eax,%eax - -opeDone: - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosCloseEnv -# -# Purpose....: Close environment -# -# Parameters.: Env handle -# -##########################################################################*/ - - .global RdosCloseEnv - -RdosCloseEnv: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movl 8(%ebp),%ebx - UserGate close_env_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosAddEnvVar -# -# Purpose....: Add environment variable -# -# Parameters.: Env handle -# var -# data -# -##########################################################################*/ - - .global RdosAddEnvVar - -RdosAddEnvVar: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %esi - pushl %edi - - movl 8(%ebp),%ebx - movl 12(%ebp),%esi - movl 16(%ebp),%edi - UserGate add_env_var_nr - - popl %edi - popl %esi - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosDeleteEnvVar -# -# Purpose....: Delete environment variable -# -# Parameters.: Env handle -# var -# -##########################################################################*/ - - .global RdosDeleteEnvVar - -RdosDeleteEnvVar: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %esi - - movl 8(%ebp),%ebx - movl 12(%ebp),%esi - UserGate delete_env_var_nr - - popl %esi - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosFindEnvVar -# -# Purpose....: Find environment variable -# -# Parameters.: Env handle -# var -# data -# -##########################################################################*/ - - .global RdosFindEnvVar - -RdosFindEnvVar: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %esi - pushl %edi - - movl 8(%ebp),%ebx - movl 12(%ebp),%esi - movl 16(%ebp),%edi - UserGate find_env_var_nr - jc fevFail - - movl $1,%eax - jmp fevDone - -fevFail: - xorl %eax,%eax - -fevDone: - popl %edi - popl %esi - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosGetEnvData -# -# Purpose....: Get raw environment data -# -# Parameters.: Env handle -# data -# -##########################################################################*/ - - .global RdosGetEnvData - -RdosGetEnvData: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %edi - - movl 8(%ebp),%ebx - movl 12(%ebp),%edi - UserGate get_env_data_nr - jnc gedDone - - xorw %ax,%ax - stosw - -gedDone: - popl %edi - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosSetEnvData -# -# Purpose....: Set raw environment data -# -# Parameters.: Env handle -# data -# -##########################################################################*/ - - .global RdosSetEnvData - -RdosSetEnvData: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %edi - - movl 8(%ebp),%ebx - movl 12(%ebp),%edi - UserGate set_env_data_nr - - popl %edi - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosOpenSysIni -# -# Purpose....: Open system ini-file -# -# Returns....: Ini handle -# -##########################################################################*/ - - .global RdosOpenSysIni - -RdosOpenSysIni: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - UserGate open_sys_ini_nr - jc osiFail - - movzx %bx,%eax - jmp osiDone - -osiFail: - xorl %eax,%eax - -osiDone: - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosCloseIni -# -# Purpose....: Close ini-file -# -# Parameters.: Ini handle -# -##########################################################################*/ - - .global RdosCloseIni - -RdosCloseIni: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movl 8(%ebp),%ebx - UserGate close_ini_nr - - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosGotoIniSection -# -# Purpose....: Goto ini section -# -# Parameters.: Ini handle -# SectionName -# -##########################################################################*/ - - .global RdosGotoIniSection - -RdosGotoIniSection: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %edi - - movl 8(%ebp),%ebx - movl 12(%ebp),%edi - UserGate goto_ini_section_nr - jc gisFail - - movl $1,%eax - jmp gisDone - -gisFail: - xorl %eax,%eax - -gisDone: - popl %edi - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosRemoveIniSection -# -# Purpose....: Remove current ini section -# -# Parameters.: Ini handle -# -##########################################################################*/ - - .global RdosRemoveIniSection - -RdosRemoveIniSection: - pushl %ebp - movl %esp,%ebp - pushl %ebx - - movl 8(%ebp),%ebx - UserGate remove_ini_section_nr - jc risFail - - movl $1,%eax - jmp risDone - -risFail: - xorl %eax,%eax - -risDone: - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosReadIni -# -# Purpose....: Read ini var in current section -# -# Parameters.: Ini handle -# VarName -# Data -# MaxSize -# -##########################################################################*/ - - .global RdosReadIni - -RdosReadIni: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %ecx - pushl %esi - pushl %edi - - movl 8(%ebp),%ebx - movl 12(%ebp),%esi - movl 16(%ebp),%edi - movl 20(%ebp),%ecx - UserGate read_ini_nr - jc riFail - - movl $1,%eax - jmp riDone - -riFail: - xorl %eax,%eax - -riDone: - popl %edi - popl %esi - popl %ecx - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosWriteIni -# -# Purpose....: Write ini var in current section -# -# Parameters.: Ini handle -# VarName -# Data -# -##########################################################################*/ - - .global RdosWriteIni - -RdosWriteIni: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %esi - pushl %edi - - movl 8(%ebp),%ebx - movl 12(%ebp),%esi - movl 16(%ebp),%edi - UserGate write_ini_nr - jc wiFail - - movl $1,%eax - jmp wiDone - -wiFail: - xorl %eax,%eax - -wiDone: - popl %edi - popl %esi - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosDeleteIni -# -# Purpose....: Delete ini var in current section -# -# Parameters.: Ini handle -# VarName -# -##########################################################################*/ - - .global RdosDeleteIni - -RdosDeleteIni: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %esi - - movl 8(%ebp),%ebx - movl 12(%ebp),%esi - UserGate delete_ini_nr - jc diFail - - movl $1,%eax - jmp diDone - -diFail: - xorl %eax,%eax - -diDone: - popl %esi - popl %ebx - leave - ret - -/*########################################################################## -# -# Name : RdosCreateFileDrive -# -# Purpose....: Create a new file-drive -# -# Parameters.: Drive -# Size -# FS name -# Filename -# -##########################################################################*/ - - .global RdosCreateFileDrive - -RdosCreateFileDrive: - pushl %ebp - movl %esp,%ebp - pushl %ecx - pushl %esi - pushl %edi - - movb 8(%ebp),%al - movl 12(%ebp),%ecx - movl 16(%ebp),%esi - movl 20(%ebp),%edi - UserGate create_file_drive_nr - jnc cfdOk - - xorl %eax,%eax - jmp cfdDone - -cfdOk: - movl $1,%eax - -cfdDone: - popl %edi - popl %esi - popl %ecx - leave - ret - -/*########################################################################## -# -# Name : RdosOpenFileDrive -# -# Purpose....: Open a new file-drive -# -# Parameters.: Drive -# Filename -# -##########################################################################*/ - - .global RdosOpenFileDrive - -RdosOpenFileDrive: - pushl %ebp - movl %esp,%ebp - pushl %edi - - movb 8(%ebp),%al - movl 12(%ebp),%edi - UserGate open_file_drive_nr - jnc ofdOk - - xorl %eax,%eax - jmp ofdDone - -ofdOk: - movl $1,%eax - -ofdDone: - popl %edi - leave - ret - -/*########################################################################## -# -# Name : RdosEnableStatusLed -# -# Purpose....: Enable status LED -# -##########################################################################*/ - - .global RdosEnableStatusLed - -RdosEnableStatusLed: - pushl %ebp - movl %esp,%ebp - UserGate enable_status_led_nr - leave - ret - -/*########################################################################## -# -# Name : RdosDisableStatusLed -# -# Purpose....: Disable status LED -# -##########################################################################*/ - - .global RdosDisableStatusLed - -RdosDisableStatusLed: - pushl %ebp - movl %esp,%ebp - UserGate disable_status_led_nr - leave - ret - -/*########################################################################## -# -# Name : RdosStartWatchdog -# -# Purpose....: Start watchdog -# -# Parameters.: Timeout, ms -# -##########################################################################*/ - - .global RdosStartWatchdog - -RdosStartWatchdog: - pushl %ebp - movl %esp,%ebp -; - movl 8(%ebp),%eax - UserGate start_watchdog_nr -; - leave - ret - -/*########################################################################## -# -# Name : RdosKickWatchdog -# -# Purpose....: Kick watchdog -# -##########################################################################*/ - - .global RdosKickWatchdog - -RdosKickWatchdog: - pushl %ebp - movl %esp,%ebp - UserGate kick_watchdog_nr - leave - ret - diff --git a/newlib/libc/sys/rdos/rdos.h b/newlib/libc/sys/rdos/rdos.h deleted file mode 100755 index 690500071..000000000 --- a/newlib/libc/sys/rdos/rdos.h +++ /dev/null @@ -1,344 +0,0 @@ -
-#ifndef _RDOS_H
-#define _RDOS_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-//#undef WIN32
-
-#define FILE_ATTRIBUTE_READONLY 0x1
-#define FILE_ATTRIBUTE_HIDDEN 0x2
-#define FILE_ATTRIBUTE_SYSTEM 0x4
-#define FILE_ATTRIBUTE_DIRECTORY 0x10
-#define FILE_ATTRIBUTE_ARCHIVE 0x20
-#define FILE_ATTRIBUTE_NORMAL 0x80
-
-#define LGOP_NULL 0
-#define LGOP_NONE 1
-#define LGOP_OR 2
-#define LGOP_AND 3
-#define LGOP_XOR 4
-#define LGOP_INVERT 5
-#define LGOP_INVERT_OR 6
-#define LGOP_INVERT_AND 7
-#define LGOP_INVERT_XOR 8
-#define LGOP_ADD 9
-#define LGOP_SUBTRACT 10
-#define LGOP_MULTIPLY 11
-
-#define getred(pgc) (((pgc)>>16)&0xFF)
-#define getgreen(pgc) (((pgc)>>8)&0xFF)
-#define getblue(pgc) ((pgc)&0xFF)
-#define mkcolor(r,g,b) (((r)<<16)|((g)<<8)|(b))
-
-typedef struct ThreadState
-{
- short int ID;
- char Name[32];
- unsigned long MsbTime;
- unsigned long LsbTime;
- char List[32];
- long Offset;
- short int Sel;
-} ThreadState;
-
-#ifdef __GNUC__
-#define __stdcall
-#else
-#if (sizeof(int) == 2)
-#define __stdcall
-#endif
-#endif
-
-short int __stdcall RdosSwapShort(short int val);
-long __stdcall RdosSwapLong(long val);
-
-void __stdcall RdosSetTextMode();
-int __stdcall RdosSetVideoMode(int *BitsPerPixel, int *xres, int *yres, int *linesize, void **buffer);
-void __stdcall RdosSetClipRect(int handle, int xmin, int ymin, int xmax, int ymax);
-void __stdcall RdosClearClipRect(int handle);
-void __stdcall RdosSetDrawColor(int handle, int color);
-void __stdcall RdosSetLGOP(int handle, int lgop);
-void __stdcall RdosSetHollowStyle(int handle);
-void __stdcall RdosSetFilledStyle(int handle);
-int __stdcall RdosOpenFont(int height);
-void __stdcall RdosCloseFont(int font);
-void __stdcall RdosGetStringMetrics(int font, const char *str, int *width, int *height);
-void __stdcall RdosSetFont(int handle, int font);
-int __stdcall RdosGetPixel(int handle, int x, int y);
-void __stdcall RdosSetPixel(int handle, int x, int y);
-void __stdcall RdosBlit(int SrcHandle, int DestHandle, int width, int height,
- int SrcX, int SrcY, int DestX, int DestY);
-void __stdcall RdosDrawMask(int handle, void *mask, int RowSize, int width, int height,
- int SrcX, int SrcY, int DestX, int DestY);
-void __stdcall RdosDrawLine(int handle, int x1, int y1, int x2, int y2);
-void __stdcall RdosDrawString(int handle, int x, int y, const char *str);
-void __stdcall RdosDrawRect(int handle, int x, int y, int width, int height);
-void __stdcall RdosDrawEllipse(int handle, int x, int y, int width, int height);
-int __stdcall RdosCreateBitmap(int BitsPerPixel, int width, int height);
-int __stdcall RdosDuplicateBitmapHandle(int handle);
-void __stdcall RdosCloseBitmap(int handle);
-int __stdcall RdosCreateStringBitmap(int font, const char *str);
-void __stdcall RdosGetBitmapInfo(int handle, int *BitPerPixel, int *width, int *height,
- int *linesize, void **buffer);
-
-int __stdcall RdosCreateSprite(int DestHandle, int BitmapHandle, int MaskHandle, int lgop);
-void __stdcall RdosCloseSprite(int handle);
-void __stdcall RdosShowSprite(int handle);
-void __stdcall RdosHideSprite(int handle);
-void __stdcall RdosMoveSprite(int handle, int x, int y);
-
-void __stdcall RdosSetForeColor(int color);
-void __stdcall RdosSetBackColor(int color);
-int __stdcall RdosGetMemSize(void *ptr);
-void *__stdcall RdosAllocateMem(int Size);
-void __stdcall RdosFreeMem(void *ptr);
-int __stdcall RdosAppDebug();
-
-int __stdcall RdosOpenCom(int ID, long BaudRate, char Parity, char DataBits, char StopBits, int SendBufSize, int RecBufSize);
-void __stdcall RdosCloseCom(int Handle);
-void __stdcall RdosFlushCom(int Handle);
-char __stdcall RdosReadCom(int Handle);
-int __stdcall RdosWriteCom(int Handle, char Val);
-void __stdcall RdosEnableCts(int Handle);
-void __stdcall RdosDisableCts(int Handle);
-void __stdcall RdosEnableAutoRts(int Handle);
-void __stdcall RdosDisableAutoRts(int Handle);
-void __stdcall RdosSetDtr(int Handle);
-void __stdcall RdosResetDtr(int Handle);
-void __stdcall RdosSetRts(int Handle);
-void __stdcall RdosResetRts(int Handle);
-int __stdcall RdosGetReceiveBufferSpace(int Handle);
-int __stdcall RdosGetSendBufferSpace(int Handle);
-void __stdcall RdosWaitForSendCompletedCom(int Handle);
-
-int __stdcall RdosOpenFile(const char *FileName, char Access);
-int __stdcall RdosCreateFile(const char *FileName, int Attrib);
-void __stdcall RdosCloseFile(int Handle);
-int __stdcall RdosIsDevice(int Handle);
-int __stdcall RdosDuplFile(int Handle);
-long __stdcall RdosGetFileSize(int Handle);
-void __stdcall RdosSetFileSize(int Handle, long Size);
-long __stdcall RdosGetFilePos(int Handle);
-void __stdcall RdosSetFilePos(int Handle, long Pos);
-int __stdcall RdosReadFile(int Handle, void *Buf, int Size);
-int __stdcall RdosWriteFile(int Handle, const void *Buf, int Size);
-void __stdcall RdosGetFileTime(int Handle, unsigned long *MsbTime, unsigned long *LsbTime);
-void __stdcall RdosSetFileTime(int Handle, unsigned long MsbTime, unsigned long LsbTime);
-
-int __stdcall RdosCreateMapping(int Size);
-int __stdcall RdosCreateNamedMapping(const char *Name, int Size);
-int __stdcall RdosCreateNamedFileMapping(const char *Name, int Size, int FileHandle);
-int __stdcall RdosOpenNamedMapping(const char *Name);
-void __stdcall RdosSyncMapping(int Handle);
-void __stdcall RdosCloseMapping(int Handle);
-void __stdcall RdosMapView(int Handle, int Offset, void *Base, int Size);
-void __stdcall RdosUnmapView(int Handle);
-
-int __stdcall RdosSetCurDrive(int Drive);
-int __stdcall RdosGetCurDrive();
-int __stdcall RdosSetCurDir(const char *PathName);
-int __stdcall RdosGetCurDir(int Drive, char *PathName);
-int __stdcall RdosMakeDir(const char *PathName);
-int __stdcall RdosRemoveDir(const char *PathName);
-int __stdcall RdosRenameFile(const char *ToName, const char *FromName);
-int __stdcall RdosDeleteFile(const char *PathName);
-int __stdcall RdosGetFileAttribute(const char *PathName, int *Attribute);
-int __stdcall RdosSetFileAttribute(const char *PathName, int Attribute);
-int __stdcall RdosOpenDir(const char *PathName);
-void __stdcall RdosCloseDir(int Handle);
-int __stdcall RdosReadDir(int Handle, int EntryNr, int MaxNameSize, char *PathName, long *FileSize, int *Attribute, unsigned long *MsbTime, unsigned long *LsbTime);
-
-int __stdcall RdosGetThreadState(int ThreadNr, ThreadState *State);
-int __stdcall RdosSuspendThread(int ThreadNr);
-
-void __stdcall RdosCpuReset();
-void __stdcall RdosGetVersion(int *Major, int *Minor, int *Release);
-void __stdcall RdosCreateThread(void (*Start)(void *Param), const char *Name, void *Param, int StackSize);
-void __stdcall RdosTerminateThread();
-int __stdcall RdosGetThreadHandle();
-int __stdcall RdosExec(const char *prog, const char *param);
-int __stdcall RdosSpawn(const char *prog, const char *param, const char *startdir);
-void __stdcall RdosWaitMilli(int ms);
-void __stdcall RdosGetTics(unsigned long *msb, unsigned long *lsb);
-void __stdcall RdosTicsToRecord(unsigned long msb, unsigned long lsb, int *year, int *month, int *day, int *hour, int *min, int *sec, int *milli);
-void __stdcall RdosRecordToTics(unsigned long *msb, unsigned long *lsb, int year, int month, int day, int hour, int min, int sec, int milli);
-int __stdcall RdosDayOfWeek(int year, int month, int day);
-void __stdcall RdosGetSysTime(int *year, int *month, int *day, int *hour, int *min, int *sec, int *milli);
-void __stdcall RdosGetTime(int *year, int *month, int *day, int *hour, int *min, int *sec, int *milli);
-void __stdcall RdosSetTime(int year, int month, int day, int hour, int min, int sec, int milli);
-void __stdcall RdosAddTics(unsigned long *msb, unsigned long *lsb, long tics);
-void __stdcall RdosAddMilli(unsigned long *msb, unsigned long *lsb, long ms);
-void __stdcall RdosAddSec(unsigned long *msb, unsigned long *lsb, long sec);
-void __stdcall RdosAddMin(unsigned long *msb, unsigned long *lsb, long min);
-void __stdcall RdosAddHour(unsigned long *msb, unsigned long *lsb, long hour);
-void __stdcall RdosAddDay(unsigned long *msb, unsigned long *lsb, long day);
-int __stdcall RdosSyncTime(long IP);
-
-void __stdcall RdosDecodeMsbTics(unsigned long msb, int *days, int *hours);
-void __stdcall RdosDecodeLsbTics(unsigned long lsb, int *min, int *sec, int *milli, int *micro);
-
-int __stdcall RdosCreateSection();
-void __stdcall RdosDeleteSection(int Handle);
-void __stdcall RdosEnterSection(int Handle);
-void __stdcall RdosLeaveSection(int Handle);
-
-int __stdcall RdosCreateWait();
-void __stdcall RdosCloseWait(int Handle);
-void * __stdcall RdosCheckWait(int Handle);
-void * __stdcall RdosWaitForever(int Handle);
-void * __stdcall RdosWaitTimeout(int Handle, int MillSec);
-void __stdcall RdosStopWait(int Handle);
-void __stdcall RdosRemoveWait(int Handle, void *ID);
-void __stdcall RdosAddWaitForKeyboard(int Handle, void *ID);
-void __stdcall RdosAddWaitForMouse(int Handle, void *ID);
-void __stdcall RdosAddWaitForCom(int Handle, int ComHandle, void *ID);
-void __stdcall RdosAddWaitForAdc(int Handle, int AdcHandle, void *ID);
-
-int __stdcall RdosCreateSignal();
-void __stdcall RdosResetSignal(int Handle);
-int __stdcall RdosIsSignalled(int Handle);
-void __stdcall RdosSetSignal(int Handle);
-void __stdcall RdosFreeSignal(int Handle);
-void __stdcall RdosAddWaitForSignal(int Handle, int SignalHandle, void *ID);
-
-long __stdcall RdosGetIp();
-int __stdcall RdosNameToIp(const char *HostName);
-int __stdcall RdosIpToName(int Ip, char *HostName, int MaxSize);
-
-int __stdcall RdosCreateTcpListen(int Port, int MaxConnections, int BufferSize);
-int __stdcall RdosGetTcpListen(int Handle);
-void __stdcall RdosCloseTcpListen(int Handle);
-void __stdcall RdosAddWaitForTcpListen(int Handle, int ConHandle, void *ID);
-
-int __stdcall RdosOpenTcpConnection(int RemoteIp, int LocalPort, int RemotePort, int Timeout, int BufferSize);
-int __stdcall RdosWaitForTcpConnection(int Handle, long Timeout);
-void __stdcall RdosAddWaitForTcpConnection(int Handle, int ConHandle, void *ID);
-void __stdcall RdosCloseTcpConnection(int Handle);
-void __stdcall RdosDeleteTcpConnection(int Handle);
-void __stdcall RdosAbortTcpConnection(int Handle);
-void __stdcall RdosPushTcpConnection(int Handle);
-int __stdcall RdosIsTcpConnectionClosed(int Handle);
-long __stdcall RdosGetRemoteTcpConnectionIP(int Handle);
-int __stdcall RdosGetRemoteTcpConnectionPort(int Handle);
-int __stdcall RdosGetLocalTcpConnectionPort(int Handle);
-int __stdcall RdosReadTcpConnection(int Handle, void *Buf, int Size);
-int __stdcall RdosWriteTcpConnection(int Handle, const void *Buf, int Size);
-int __stdcall RdosPollTcpConnection(int Handle);
-
-int __stdcall RdosGetLocalMailslot(const char *Name);
-int __stdcall RdosGetRemoteMailslot(long Ip, const char *Name);
-void __stdcall RdosFreeMailslot(int Handle);
-int __stdcall RdosSendMailslot(int Handle, const void *Msg, int Size, void *ReplyBuf, int MaxReplySize);
-
-void __stdcall RdosDefineMailslot(const char *Name, int MaxSize);
-int __stdcall RdosReceiveMailslot(void *Msg);
-void __stdcall RdosReplyMailslot(const void *Msg, int Size);
-
-void __stdcall RdosSetFocus(char FocusKey);
-char __stdcall RdosGetFocus();
-
-void __stdcall RdosClearKeyboard();
-int __stdcall RdosPollKeyboard();
-int __stdcall RdosReadKeyboard();
-int __stdcall RdosGetKeyboardState();
-int __stdcall RdosPutKeyboard(int KeyCode, int VirtualKey, int ScanCode);
-int __stdcall RdosPeekKeyEvent(int *ExtKey, int *KeyState, int *VirtualKey, int *ScanCode);
-int __stdcall RdosReadKeyEvent(int *ExtKey, int *KeyState, int *VirtualKey, int *ScanCode);
-
-void __stdcall RdosHideMouse();
-void __stdcall RdosShowMouse();
-void __stdcall RdosGetMousePosition(int *x, int *y);
-void __stdcall RdosSetMousePosition(int x, int y);
-void __stdcall RdosSetMouseWindow(int StartX, int StartY, int EndX, int EndY);
-void __stdcall RdosSetMouseMickey(int x, int y);
-int __stdcall RdosGetLeftButton();
-int __stdcall RdosGetRightButton();
-void __stdcall RdosGetLeftButtonPressPosition(int *x, int *y);
-void __stdcall RdosGetRightButtonPressPosition(int *x, int *y);
-void __stdcall RdosGetLeftButtonReleasePosition(int *x, int *y);
-void __stdcall RdosGetRightButtonReleasePosition(int *x, int *y);
-
-void __stdcall RdosGetCursorPosition(int *Row, int *Col);
-void __stdcall RdosSetCursorPosition(int Row, int Col);
-void __stdcall RdosWriteChar(char ch);
-void __stdcall RdosWriteSizeString(const char *Buf, int Size);
-void __stdcall RdosWriteString(const char *Buf);
-int __stdcall RdosReadLine(char *Buf, int MaxSize);
-
-int __stdcall RdosPing(long Node, long Timeout);
-
-int __stdcall RdosGetIdeDisc(int UnitNr);
-int __stdcall RdosGetFloppyDisc(int UnitNr);
-
-int __stdcall RdosSetDiscInfo(int DiscNr, int SectorSize, long Sectors, int BiosSectorsPerCyl, int BiosHeads);
-int __stdcall RdosGetDiscInfo(int DiscNr, int *SectorSize, long *Sectors, int *BiosSectorsPerCyl, int *BiosHeads);
-int __stdcall RdosReadDisc(int DiscNr, long Sector, char *Buf, int Size);
-int __stdcall RdosWriteDisc(int DiscNr, long Sector, const char *Buf, int Size);
-
-void __stdcall RdosGetRdfsInfo(void *CryptTab, void *KeyTab, void *ExtentSizeTab);
-void __stdcall RdosDemandLoadDrive(int DriveNr);
-int __stdcall RdosFormatDrive(int DiscNr, long StartSector, int Size, const char *FsName);
-
-int __stdcall RdosAllocateFixedDrive(int DriveNr);
-int __stdcall RdosAllocateStaticDrive();
-int __stdcall RdosAllocateDynamicDrive();
-
-int __stdcall RdosGetDriveInfo(int DriveNr, long *FreeUnits, int *BytesPerUnit, long *TotalUnits);
-int __stdcall RdosGetDriveDiscParam(int DriveNr, int *DiscNr, long *StartSector, long *TotalSectors);
-
-int __stdcall RdosCreateFileDrive(int Drive, long Size, const char *FsName, const char *FileName);
-int __stdcall RdosOpenFileDrive(int Drive, const char *FileName);
-
-int __stdcall RdosGetModuleHandle();
-const char * __stdcall RdosGetExeName();
-int __stdcall RdosLoadDll(const char *Name);
-void __stdcall RdosFreeDll(int handle);
-int __stdcall RdosReadResource(int handle, int ID, char *Buf, int Size);
-int __stdcall RdosReadBinaryResource(int handle, int ID, char *Buf, int Size);
-
-int __stdcall RdosOpenAdc(int channel);
-void __stdcall RdosCloseAdc(int handle);
-void __stdcall RdosDefineAdcTime(int handle, unsigned long msg, unsigned long lsb);
-long __stdcall RdosReadAdc(int handle);
-
-int __stdcall RdosReadSerialLines(int device, int *val);
-int __stdcall RdosToggleSerialLine(int device, int line);
-int __stdcall RdosReadSerialVal(int device, int line, int *val);
-int __stdcall RdosWriteSerialVal(int device, int line, int val);
-int __stdcall RdosReadSerialRaw(int device, int line, int *val);
-int __stdcall RdosWriteSerialRaw(int device, int line, int val);
-
-int __stdcall RdosOpenSysEnv();
-int __stdcall RdosOpenProcessEnv();
-void __stdcall RdosCloseEnv(int handle);
-void __stdcall RdosAddEnvVar(int handle, const char *var, const char *value);
-void __stdcall RdosDeleteEnvVar(int handle, const char *var);
-int __stdcall RdosFindEnvVar(int handle, const char *var, char *value);
-void __stdcall RdosGetEnvData(int handle, char *buf);
-void __stdcall RdosSetEnvData(int handle, const char *buf);
-
-int __stdcall RdosOpenSysIni();
-void __stdcall RdosCloseIni(int handle);
-int __stdcall RdosGotoIniSection(int handle, const char *name);
-int __stdcall RdosRemoveIniSection(int handle);
-int __stdcall RdosReadIni(int handle, const char *var, char *str, int maxsize);
-int __stdcall RdosWriteIni(int handle, const char *var, const char *str);
-int __stdcall RdosDeleteIni(int handle, const char *var);
-
-void __stdcall RdosEnableStatusLED();
-void __stdcall RdosDisableStatusLED();
-
-void __stdcall RdosStartWatchdog(int timeout);
-void __stdcall RdosKickWatchdog();
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
-
-
diff --git a/newlib/libc/sys/rdos/rdoshelp.c b/newlib/libc/sys/rdos/rdoshelp.c deleted file mode 100644 index 20d25353d..000000000 --- a/newlib/libc/sys/rdos/rdoshelp.c +++ /dev/null @@ -1,162 +0,0 @@ -/*####################################################################### -# RDOS operating system -# Copyright (C) 1988-2006, Leif Ekblad -# -# This library is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License as published -# by the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# The author of this program may be contacted at leif@rdos.net -# -# rdoshelp.c -# implementation of various structures and helpers -# -##########################################################################*/ - -#include <reent.h> -#include <rdos.h> -#include <stdio.h> - -char *__env[1] = { 0 }; -char **environ = __env; - -static int once_section; -static int key_section; - -/*########################################################################## -# -# Name : _get_impure_data_size -# -# Purpose....: Get size of _reent structure -# -# In params..: * -# Out params.: * -# Returns....: size -# -##########################################################################*/ -int get_impure_data_size() -{ - return sizeof(struct _reent); -} - -/*########################################################################## -# -# Name : __rdos_thread_once -# -# Purpose....: Emulate GCC pthread_once -# -# In params..: Handle initially 0 -# : function to initially call -# Out params.: * -# Returns....: result -# -##########################################################################*/ -int __rdos_thread_once (int *handle, void (*func) (void)) -{ - if (handle == 0 || func == 0) - return 0; - - RdosEnterSection(once_section); - if (*handle == 0) - (*func)(); - else - *handle = 1; - RdosLeaveSection(once_section); - return 0; -} - -/*########################################################################## -# -# Name : __rdos_thread_mutex_init -# -# Purpose....: Emulate GCC pthread_thread_mutex_init -# -# In params..: * -# Out params.: * -# Returns....: handle -# -##########################################################################*/ -int __rdos_thread_mutex_init (void) -{ - return RdosCreateSection(); -} - -/*########################################################################## -# -# Name : __rdos_thread_mutex_lock -# -# Purpose....: Emulate GCC pthread_thread_mutex_lock -# -# In params..: handle -# Out params.: * -# Returns....: * -# -##########################################################################*/ -int __rdos_thread_mutex_lock (int handle) -{ - RdosEnterSection(handle); - return 0; -} - -/*########################################################################## -# -# Name : __rdos_thread_mutex_trylock -# -# Purpose....: Emulate GCC pthread_thread_mutex_trylock -# Try is not yet implemented, and lock is used. -# -# In params..: handle -# Out params.: * -# Returns....: * -# -##########################################################################*/ -int __rdos_thread_mutex_trylock (int handle) -{ - RdosEnterSection(handle); - return 0; -} - -/*########################################################################## -# -# Name : __rdos_thread_mutex_unlock -# -# Purpose....: Emulate GCC pthread_thread_mutex_unlock -# -# In params..: handle -# Out params.: * -# Returns....: * -# -##########################################################################*/ -int __rdos_thread_mutex_unlock (int handle) -{ - RdosLeaveSection(handle); - return 0; -} - -/*########################################################################## -# -# Name : __init_rdos -# -# Purpose....: Init RDOS specific data -# -# In params..: reent structure -# Out params.: * -# Returns....: * -# -##########################################################################*/ -void __init_rdos(struct _reent *reent) -{ - once_section = RdosCreateSection(); - _REENT_INIT_PTR(reent); - __sinit(reent); -} diff --git a/newlib/libc/sys/rdos/read.c b/newlib/libc/sys/rdos/read.c deleted file mode 100644 index e9f3464f3..000000000 --- a/newlib/libc/sys/rdos/read.c +++ /dev/null @@ -1,35 +0,0 @@ -/*#######################################################################
-# RDOS operating system
-# Copyright (C) 1988-2006, Leif Ekblad
-#
-# This library is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published
-# by the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-# The author of this program may be contacted at leif@rdos.net
-#
-# read.c
-# read function implementation
-#
-##########################################################################*/
-
-#include "config.h"
-#include <_ansi.h>
-#include <_syslist.h>
-#include <errno.h>
-#include "rdos.h"
-
-int read(int file, char *ptr, int len)
-{
- return RdosReadFile(file, ptr, len);
-}
diff --git a/newlib/libc/sys/rdos/readlink.c b/newlib/libc/sys/rdos/readlink.c deleted file mode 100755 index ad4c69d1c..000000000 --- a/newlib/libc/sys/rdos/readlink.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "config.h"
-#include <_ansi.h>
-#include <_syslist.h>
-#include <errno.h>
-#include <sys/types.h>
-
-int readlink(const char *path, char *buf, size_t bufsize)
-{
- errno = ENOSYS;
- return -1;
-}
diff --git a/newlib/libc/sys/rdos/sbrk.c b/newlib/libc/sys/rdos/sbrk.c deleted file mode 100644 index fdcb5fba5..000000000 --- a/newlib/libc/sys/rdos/sbrk.c +++ /dev/null @@ -1,33 +0,0 @@ -/*#######################################################################
-# RDOS operating system
-# Copyright (C) 1988-2006, Leif Ekblad
-#
-# This library is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published
-# by the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-# The author of this program may be contacted at leif@rdos.net
-#
-# sbrk.c
-# sbrk function implementation
-#
-##########################################################################*/
-
-#include "config.h"
-#include <_syslist.h>
-#include "rdos.h"
-
-void *sbrk (int incr)
-{
- return RdosAllocateMem(incr);
-}
diff --git a/newlib/libc/sys/rdos/stat.c b/newlib/libc/sys/rdos/stat.c deleted file mode 100755 index f1683b63a..000000000 --- a/newlib/libc/sys/rdos/stat.c +++ /dev/null @@ -1,12 +0,0 @@ -#include "config.h"
-#include <_ansi.h>
-#include <_syslist.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
-
-int stat(const char *file, struct stat *st)
-{
- errno = ENOSYS;
- return -1;
-}
diff --git a/newlib/libc/sys/rdos/symlink.c b/newlib/libc/sys/rdos/symlink.c deleted file mode 100755 index 4d5fa1e6f..000000000 --- a/newlib/libc/sys/rdos/symlink.c +++ /dev/null @@ -1,10 +0,0 @@ -#include "config.h"
-#include <_ansi.h>
-#include <_syslist.h>
-#include <errno.h>
-
-int symlink(const char *path1, const char *path2)
-{
- errno = ENOSYS;
- return -1;
-}
diff --git a/newlib/libc/sys/rdos/times.c b/newlib/libc/sys/rdos/times.c deleted file mode 100644 index 47a540b23..000000000 --- a/newlib/libc/sys/rdos/times.c +++ /dev/null @@ -1,11 +0,0 @@ -#include "config.h"
-#include <_ansi.h>
-#include <_syslist.h>
-#include <sys/times.h>
-#include <errno.h>
-
-clock_t times(struct tms *buf)
-{
- errno = ENOSYS;
- return -1;
-}
diff --git a/newlib/libc/sys/rdos/unlink.c b/newlib/libc/sys/rdos/unlink.c deleted file mode 100644 index d6c3736b3..000000000 --- a/newlib/libc/sys/rdos/unlink.c +++ /dev/null @@ -1,10 +0,0 @@ -#include "config.h"
-#include <_ansi.h>
-#include <_syslist.h>
-#include <errno.h>
-
-int unlink(char *name)
-{
- errno = ENOSYS;
- return -1;
-}
diff --git a/newlib/libc/sys/rdos/user.def b/newlib/libc/sys/rdos/user.def deleted file mode 100644 index f5af3066e..000000000 --- a/newlib/libc/sys/rdos/user.def +++ /dev/null @@ -1,368 +0,0 @@ - -allocate_dos_mem_nr = 0 -allocate_local_mem_nr = 1 -free_mem_nr = 2 -available_local_linear_nr = 3 -used_local_linear_nr = 4 -available_vm_linear_nr = 5 -used_vm_linear_nr = 6 - -reserve_pe_mem_nr = 7 -set_flat_linear_valid_nr = 8 -set_flat_linear_invalid_nr = 9 -set_flat_linear_read_nr = 10 -set_flat_linear_readwrite_nr = 11 - -get_raw_switch_ads_nr = 12 -raw_switch_nr = 13 -get_exception_nr = 14 -set_exception_nr = 15 -get_pm_int_nr = 16 -set_pm_int_nr = 17 -get_vm_int_nr = 18 -set_vm_int_nr = 19 -dpmi_int_nr = 20 -dpmi_call_int_nr = 21 -dpmi_call_nr = 22 -allocate_vm_callback_nr = 23 -free_vm_callback_nr = 24 - -wait_milli_nr = 25 -wait_micro_nr = 26 -wait_until_nr = 27 -create_thread_nr = 28 -terminate_thread_nr = 29 -get_thread_nr = 30 -swap_nr = 31 - -create_user_section_nr = 32 -create_blocked_user_section_nr = 33 -delete_user_section_nr = 34 -enter_user_section_nr = 35 -leave_user_section_nr = 36 - -get_local_mailslot_nr = 37 -get_remote_mailslot_nr = 38 -free_mailslot_nr = 39 -send_mailslot_nr = 40 -define_mailslot_nr = 41 -receive_mailslot_nr = 42 -reply_mailslot_nr = 43 - -load_exe_nr = 44 -spawn_exe_nr = 45 -unload_exe_nr = 46 -get_exit_code_nr = 47 -get_exe_name_nr = 48 -get_cmd_line_nr = 49 -get_env_nr = 50 -load_dll_nr = 51 -free_dll_nr = 52 -get_dll_proc_nr = 53 -get_dll_resource_nr = 54 -get_dll_name_nr = 55 -get_dll_nr = 56 -allocate_app_mem_nr = 57 -free_app_mem_nr = 58 -get_psp_sel_nr = 59 - -get_debug_tss_nr = 60 -get_debug_thread_nr = 61 -debug_trace_nr = 62 -debug_pace_nr = 63 -debug_go_nr = 64 -debug_next_nr = 65 - -wait_for_pe_debug_nr = 68 -continue_pe_debug_nr = 69 -notify_pe_exception_nr = 70 -read_thread_mem_nr = 71 -write_thread_mem_nr = 72 -get_thread_tss_nr = 73 -set_thread_tss_nr = 74 - -get_cpu_time_nr = 75 -get_system_time_nr = 76 -get_time_nr = 77 -time_to_system_time_nr = 78 -system_time_to_time_nr = 79 -days_in_month_nr = 80 -adjust_time_nr = 81 -passed_days_nr = 82 -time_to_binary_nr = 83 -binary_to_time_nr = 84 -sync_time_nr = 85 - -set_focus_nr = 86 -enable_focus_nr = 87 - -get_dns_nr = 88 -get_ppp_dns_nr = 89 -open_tcp_connection_nr = 90 -wait_for_tcp_connection_nr = 92 -close_tcp_connection_nr = 93 -delete_tcp_connection_nr = 94 -is_tcp_connection_closed_nr = 95 -abort_tcp_connection_nr = 96 -read_tcp_connection_nr = 97 -write_tcp_connection_nr = 98 -push_tcp_connection_nr = 99 -get_ip_address_nr = 100 -name_to_ip_nr = 101 -ip_to_name_nr = 102 -ping_nr = 103 - -get_disc_info_nr = 104 -format_drive_nr = 105 -get_rdfs_info_nr = 106 -read_disc_nr = 107 -write_disc_nr = 108 -get_drive_info_nr = 109 - -set_cur_drive_nr = 110 -get_cur_drive_nr = 111 -set_cur_dir_nr = 112 -get_cur_dir_nr = 113 -make_dir_nr = 114 -remove_dir_nr = 115 -rename_file_nr = 116 -delete_file_nr = 117 -get_file_attribute_nr = 118 -set_file_attribute_nr = 119 -open_dir_nr = 120 -close_dir_nr = 121 -read_dir_nr = 122 - -open_file_nr = 123 -create_file_nr = 124 -close_file_nr = 125 -dupl_file_nr = 126 -get_ioctl_data_nr = 127 -get_file_size_nr = 128 -set_file_size_nr = 129 -get_file_pos_nr = 130 -set_file_pos_nr = 131 -get_file_time_nr = 132 -set_file_time_nr = 133 -read_file_nr = 134 -write_file_nr = 135 -read_con_nr = 136 - -create_mapping_nr = 137 -create_named_mapping_nr = 138 -create_file_mapping_nr = 139 -create_named_file_mapping_nr = 140 -open_named_mapping_nr = 141 -sync_mapping_nr = 142 -close_mapping_nr = 143 -map_view_nr = 144 -unmap_view_nr = 145 - -read_keyboard_nr = 146 -poll_keyboard_nr = 147 -flush_keyboard_nr = 148 -get_keyboard_state_nr = 151 - -show_mouse_nr = 152 -hide_mouse_nr = 153 -get_mouse_position_nr = 154 -set_mouse_position_nr = 155 -set_mouse_window_nr = 156 -set_mouse_mickey_nr = 157 -get_left_button_nr = 158 -get_right_button_nr = 159 -get_left_button_press_position_nr = 160 -get_right_button_press_position_nr = 161 -get_left_button_release_position_nr = 162 -get_right_button_release_position_nr = 163 -hook_mouse_nr = 164 -unhook_mouse_nr = 165 - -lock_cd_nr = 166 -unlock_cd_nr = 167 -eject_cd_nr = 168 -insert_cd_nr = 169 - -open_com_nr = 170 -close_com_nr = 171 -flush_com_nr = 172 -add_wait_for_com_nr = 174 -read_com_nr = 175 -write_com_nr = 176 -set_dtr_nr = 177 -reset_dtr_nr = 178 - -init_printer_nr = 179 -check_printer_nr = 180 -write_printer_nr = 181 - -set_cursor_position_nr = 182 -get_cursor_position_nr = 183 -write_char_nr = 184 -write_asciiz_nr = 185 -write_size_string_nr = 186 - -set_video_mode_nr = 187 -set_vga_mode_nr = 188 -set_forecolor_nr = 189 -set_backcolor_nr = 190 -get_string_metrics_nr = 193 -set_font_nr = 194 -get_video_mode_nr = 195 -draw_string_nr = 197 - -xms_handler_nr = 198 -ems_handler_nr = 199 - -test_nr = 200 - -resize_flat_linear_nr = 201 - -set_drawcolor_nr = 202 -set_lgop_nr = 203 -set_hollow_style_nr = 204 -set_filled_style_nr = 205 -get_pixel_nr = 206 -set_pixel_nr = 207 -draw_line_nr = 208 -draw_rect_nr = 209 -draw_ellipse_nr = 210 -create_bitmap_nr = 211 -close_bitmap_nr = 212 -blit_nr = 213 -open_font_nr = 215 -close_font_nr = 216 -create_string_bitmap_nr = 217 -get_bitmap_info_nr = 218 -draw_mask_nr = 219 - -create_sprite_nr = 220 -close_sprite_nr = 221 -show_sprite_nr = 222 -hide_sprite_nr = 223 -move_sprite_nr = 224 - -dup_bitmap_handle_nr = 225 -set_clip_rect_nr = 226 -clear_clip_rect_nr = 227 - -set_rts_nr = 228 -reset_rts_nr = 229 -get_com_receive_space_nr = 230 -get_com_send_space_nr = 231 - -get_char_attrib_nr = 232 - -create_wait_nr = 233 -close_wait_nr = 234 -is_wait_idle_nr = 235 -wait_no_timeout_nr = 236 -wait_timeout_nr = 237 -stop_wait_nr = 238 -add_wait_for_keyboard_nr = 239 - -peek_key_event_nr = 240 -read_key_event_nr = 241 - -add_wait_for_mouse_nr = 242 -remove_wait_nr = 243 - -add_wait_for_adc_nr = 244 -open_adc_nr = 245 -close_adc_nr = 246 -define_adc_time_nr = 247 -read_adc_nr = 248 - -free_v86_nr = 249 - -read_serial_lines_nr = 250 -toggle_serial_line_nr = 251 - -read_serial_val_nr = 252 -write_serial_val_nr = 253 - -create_file_drive_nr = 254 -open_file_drive_nr = 255 - -dos_ext_exec_nr = 256 - -open_sys_env_nr = 257 -open_proc_env_nr = 258 -close_env_nr = 259 -add_env_var_nr = 260 -delete_env_var_nr = 261 -find_env_var_nr = 262 -get_env_data_nr = 263 -set_env_data_nr = 264 - -open_sys_ini_nr = 265 -close_ini_nr = 266 -goto_ini_section_nr = 267 -remove_ini_section_nr = 268 -read_ini_nr = 269 -write_ini_nr = 270 -delete_ini_nr = 271 - -app_debug_nr = 272 -get_version_nr = 273 - -enable_status_led_nr = 274 -disable_status_led_nr = 275 - -start_watchdog_nr = 276 -kick_watchdog_nr = 277 - -erase_disc_sectors_nr = 278 - -cpu_reset_nr = 279 - -enable_cts_nr = 280 -disable_cts_nr = 281 - -wait_for_send_completed_com_nr = 282 - -add_wait_for_tcp_connection_nr = 283 - -get_remote_tcp_connection_ip_nr = 284 -get_remote_tcp_connection_port_nr = 285 -get_local_tcp_connection_port_nr = 286 - -enable_auto_rts_nr = 287 -disable_auto_rts_nr = 288 - -put_keyboard_code_nr = 289 - -poll_tcp_connection_nr = 290 - -create_signal_nr = 291 -free_signal_nr = 292 -add_wait_for_signal_nr = 293 -set_signal_nr = 294 -reset_signal_nr = 295 -is_signalled_nr = 296 - -get_drive_disc_param_nr = 297 - -get_ide_disc_nr = 298 -get_floppy_disc_nr = 299 -demand_load_drive_nr = 300 -set_disc_info_nr = 301 - -get_thread_state_nr = 302 -suspend_thread_nr = 303 -resume_thread_nr = 304 - -update_time_nr = 305 - -allocate_static_drive_nr = 306 -allocate_fixed_drive_nr = 307 -allocate_dynamic_drive_nr = 308 - -get_focus_nr = 309 - -add_wait_for_tcp_listen_nr = 310 -create_tcp_listen_nr = 311 -get_tcp_listen_nr = 312 -close_tcp_listen_nr = 313 - -usergate_entries = 340 diff --git a/newlib/libc/sys/rdos/wait.c b/newlib/libc/sys/rdos/wait.c deleted file mode 100644 index a7bc8aab5..000000000 --- a/newlib/libc/sys/rdos/wait.c +++ /dev/null @@ -1,10 +0,0 @@ -#include "config.h"
-#include <_ansi.h>
-#include <_syslist.h>
-#include <errno.h>
-
-int wait(int *status)
-{
- errno = ENOSYS;
- return -1;
-}
diff --git a/newlib/libc/sys/rdos/write.c b/newlib/libc/sys/rdos/write.c deleted file mode 100644 index d02faec29..000000000 --- a/newlib/libc/sys/rdos/write.c +++ /dev/null @@ -1,35 +0,0 @@ -/*#######################################################################
-# RDOS operating system
-# Copyright (C) 1988-2006, Leif Ekblad
-#
-# This library is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published
-# by the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-# The author of this program may be contacted at leif@rdos.net
-#
-# write.c
-# write function implementation
-#
-##########################################################################*/
-
-#include "config.h"
-#include <_ansi.h>
-#include <_syslist.h>
-#include <errno.h>
-#include "rdos.h"
-
-int write(int file, char *ptr, int len)
-{
- return RdosWriteFile(file, ptr, len);
-}
diff --git a/newlib/libc/sys/rtems/aclocal.m4 b/newlib/libc/sys/rtems/aclocal.m4 index 55d5e67ce..0a1490998 100644 --- a/newlib/libc/sys/rtems/aclocal.m4 +++ b/newlib/libc/sys/rtems/aclocal.m4 @@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(newlib, 1.14.0) +AM_INIT_AUTOMAKE(newlib, 1.13.0) # FIXME: We temporarily define our own version of AC_PROG_CC. This is # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS. We @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/sys/rtems/configure b/newlib/libc/sys/rtems/configure index b2d1fbd00..112cfebe8 100755 --- a/newlib/libc/sys/rtems/configure +++ b/newlib/libc/sys/rtems/configure @@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" && PACKAGE=newlib -VERSION=1.14.0 +VERSION=1.13.0 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: 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" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/sys/rtems/crt0.c b/newlib/libc/sys/rtems/crt0.c index 47332b752..e40a8fc03 100644 --- a/newlib/libc/sys/rtems/crt0.c +++ b/newlib/libc/sys/rtems/crt0.c @@ -21,27 +21,10 @@ void *realloc() { return 0; } void free() { ; } void abort() { ; } int raise() { return -1; } - -#if defined(__GNUC__) -/* - * stubs for libstdc++ rtems-threads support functions from gcc/gthr-rtems.h - */ -int rtems_gxx_once() { return -1; } -int rtems_gxx_key_create() { return -1; } -int rtems_gxx_key_delete() { return -1; } -void *rtems_gxx_getspecific() { return 0; } -int rtems_gxx_setspecific() { return -1; } - void rtems_gxx_mutex_init() { } int rtems_gxx_mutex_lock() { return -1; } -int rtems_gxx_mutex_trylock() { return -1; } int rtems_gxx_mutex_unlock() { return -1; } - -void rtems_gxx_recursive_mutex_init() { } -int rtems_gxx_recursive_mutex_lock() { return -1; } -int rtems_gxx_recursive_mutex_trylock() { return -1; } -int rtems_gxx_recursive_mutex_unlock() { return -1; } -#endif +int rtems_gxx_once() { return -1; } /* stubs for functions from reent.h */ int _close_r (struct _reent *r, int fd) { return -1; } diff --git a/newlib/libc/sys/rtems/include/inttypes.h b/newlib/libc/sys/rtems/include/inttypes.h new file mode 100644 index 000000000..5f4f918ed --- /dev/null +++ b/newlib/libc/sys/rtems/include/inttypes.h @@ -0,0 +1,288 @@ +/* + * Copyright (c) 2004, 2005 by + * Ralf Corsepius, Ulm/Germany. All rights reserved. + * + * Permission to use, copy, modify, and distribute this software + * is freely granted, provided that this notice is preserved. + */ + +/** + * @file inttypes.h + */ + +#ifndef _INTTYPES_H +#define _INTTYPES_H + +#include <stdint.h> + +#define __STRINGIFY(a) #a + +/* 8-bit types */ +#define __PRI8(x) __STRINGIFY(x) +#define __SCN8(x) __STRINGIFY(hh##x) + + +#define PRId8 __PRI8(d) +#define PRIi8 __PRI8(i) +#define PRIo8 __PRI8(o) +#define PRIu8 __PRI8(u) +#define PRIx8 __PRI8(x) +#define PRIX8 __PRI8(X) + +#define SCNd8 __SCN8(d) +#define SCNi8 __SCN8(i) +#define SCNo8 __SCN8(o) +#define SCNu8 __SCN8(u) +#define SCNx8 __SCN8(x) + + +#define PRIdLEAST8 __PRI8(d) +#define PRIiLEAST8 __PRI8(i) +#define PRIoLEAST8 __PRI8(o) +#define PRIuLEAST8 __PRI8(u) +#define PRIxLEAST8 __PRI8(x) +#define PRIXLEAST8 __PRI8(X) + +#define SCNdLEAST8 __SCN8(d) +#define SCNiLEAST8 __SCN8(i) +#define SCNoLEAST8 __SCN8(o) +#define SCNuLEAST8 __SCN8(u) +#define SCNxLEAST8 __SCN8(x) + + +#define PRIdFAST8 __PRI8(d) +#define PRIiFAST8 __PRI8(i) +#define PRIoFAST8 __PRI8(o) +#define PRIuFAST8 __PRI8(u) +#define PRIxFAST8 __PRI8(x) +#define PRIXFAST8 __PRI8(X) + +#define SCNdFAST8 __SCN8(d) +#define SCNiFAST8 __SCN8(i) +#define SCNoFAST8 __SCN8(o) +#define SCNuFAST8 __SCN8(u) +#define SCNxFAST8 __SCN8(x) + +/* 16-bit types */ +#define __PRI16(x) __STRINGIFY(x) +#define __SCN16(x) __STRINGIFY(h##x) + + +#define PRId16 __PRI16(d) +#define PRIi16 __PRI16(i) +#define PRIo16 __PRI16(o) +#define PRIu16 __PRI16(u) +#define PRIx16 __PRI16(x) +#define PRIX16 __PRI16(X) + +#define SCNd16 __SCN16(d) +#define SCNi16 __SCN16(i) +#define SCNo16 __SCN16(o) +#define SCNu16 __SCN16(u) +#define SCNx16 __SCN16(x) + + +#define PRIdLEAST16 __PRI16(d) +#define PRIiLEAST16 __PRI16(i) +#define PRIoLEAST16 __PRI16(o) +#define PRIuLEAST16 __PRI16(u) +#define PRIxLEAST16 __PRI16(x) +#define PRIXLEAST16 __PRI16(X) + +#define SCNdLEAST16 __SCN16(d) +#define SCNiLEAST16 __SCN16(i) +#define SCNoLEAST16 __SCN16(o) +#define SCNuLEAST16 __SCN16(u) +#define SCNxLEAST16 __SCN16(x) + + +#define PRIdFAST16 __PRI16(d) +#define PRIiFAST16 __PRI16(i) +#define PRIoFAST16 __PRI16(o) +#define PRIuFAST16 __PRI16(u) +#define PRIxFAST16 __PRI16(x) +#define PRIXFAST16 __PRI16(X) + +#define SCNdFAST16 __SCN16(d) +#define SCNiFAST16 __SCN16(i) +#define SCNoFAST16 __SCN16(o) +#define SCNuFAST16 __SCN16(u) +#define SCNxFAST16 __SCN16(x) + +/* 32-bit types */ +#if defined(__have_long32) +#define __PRI32(x) __STRINGIFY(l##x) +#define __SCN32(x) __STRINGIFY(l##x) +#else +#define __PRI32(x) __STRINGIFY(x) +#define __SCN32(x) __STRINGIFY(x) +#endif + +#define PRId32 __PRI32(d) +#define PRIi32 __PRI32(i) +#define PRIo32 __PRI32(o) +#define PRIu32 __PRI32(u) +#define PRIx32 __PRI32(x) +#define PRIX32 __PRI32(X) + +#define SCNd32 __SCN32(d) +#define SCNi32 __SCN32(i) +#define SCNo32 __SCN32(o) +#define SCNu32 __SCN32(u) +#define SCNx32 __SCN32(x) + + +#define PRIdLEAST32 __PRI32(d) +#define PRIiLEAST32 __PRI32(i) +#define PRIoLEAST32 __PRI32(o) +#define PRIuLEAST32 __PRI32(u) +#define PRIxLEAST32 __PRI32(x) +#define PRIXLEAST32 __PRI32(X) + +#define SCNdLEAST32 __SCN32(d) +#define SCNiLEAST32 __SCN32(i) +#define SCNoLEAST32 __SCN32(o) +#define SCNuLEAST32 __SCN32(u) +#define SCNxLEAST32 __SCN32(x) + + +#define PRIdFAST32 __PRI32(d) +#define PRIiFAST32 __PRI32(i) +#define PRIoFAST32 __PRI32(o) +#define PRIuFAST32 __PRI32(u) +#define PRIxFAST32 __PRI32(x) +#define PRIXFAST32 __PRI32(X) + +#define SCNdFAST32 __SCN32(d) +#define SCNiFAST32 __SCN32(i) +#define SCNoFAST32 __SCN32(o) +#define SCNuFAST32 __SCN32(u) +#define SCNxFAST32 __SCN32(x) + + +/* 64-bit types */ +#if defined(__have_longlong64) +#define __PRI64(x) __STRINGIFY(ll##x) +#define __SCN64(x) __STRINGIFY(ll##x) +#elif defined(__have_long64) +#define __PRI64(x) __STRINGIFY(l##x) +#define __SCN64(x) __STRINGIFY(l##x) +#else +#define __PRI64(x) __STRINGIFY(x) +#define __SCN64(x) __STRINGIFY(x) +#endif + +#define PRId64 __PRI64(d) +#define PRIi64 __PRI64(i) +#define PRIo64 __PRI64(o) +#define PRIu64 __PRI64(u) +#define PRIx64 __PRI64(x) +#define PRIX64 __PRI64(X) + +#define SCNd64 __SCN64(d) +#define SCNi64 __SCN64(i) +#define SCNo64 __SCN64(o) +#define SCNu64 __SCN64(u) +#define SCNx64 __SCN64(x) + +#if __int64_t_defined +#define PRIdLEAST64 __PRI64(d) +#define PRIiLEAST64 __PRI64(i) +#define PRIoLEAST64 __PRI64(o) +#define PRIuLEAST64 __PRI64(u) +#define PRIxLEAST64 __PRI64(x) +#define PRIXLEAST64 __PRI64(X) + +#define SCNdLEAST64 __SCN64(d) +#define SCNiLEAST64 __SCN64(i) +#define SCNoLEAST64 __SCN64(o) +#define SCNuLEAST64 __SCN64(u) +#define SCNxLEAST64 __SCN64(x) + + +#define PRIdFAST64 __PRI64(d) +#define PRIiFAST64 __PRI64(i) +#define PRIoFAST64 __PRI64(o) +#define PRIuFAST64 __PRI64(u) +#define PRIxFAST64 __PRI64(x) +#define PRIXFAST64 __PRI64(X) + +#define SCNdFAST64 __SCN64(d) +#define SCNiFAST64 __SCN64(i) +#define SCNoFAST64 __SCN64(o) +#define SCNuFAST64 __SCN64(u) +#define SCNxFAST64 __SCN64(x) +#endif + +/* max-bit types */ +#if defined(__have_longlong64) +#define __PRIMAX(x) __STRINGIFY(ll##x) +#define __SCNMAX(x) __STRINGIFY(ll##x) +#elif defined(__have_long64) +#define __PRIMAX(x) __STRINGIFY(l##x) +#define __SCNMAX(x) __STRINGIFY(l##x) +#else +#define __PRIMAX(x) __STRINGIFY(x) +#define __SCNMAX(x) __STRINGIFY(x) +#endif + +#define PRIdMAX __PRIMAX(d) +#define PRIiMAX __PRIMAX(i) +#define PRIoMAX __PRIMAX(o) +#define PRIuMAX __PRIMAX(u) +#define PRIxMAX __PRIMAX(x) +#define PRIXMAX __PRIMAX(X) + +#define SCNdMAX __SCNMAX(d) +#define SCNiMAX __SCNMAX(i) +#define SCNoMAX __SCNMAX(o) +#define SCNuMAX __SCNMAX(u) +#define SCNxMAX __SCNMAX(x) + +/* ptr types */ +#if defined(__have_longlong64) +#define __PRIPTR(x) __STRINGIFY(ll##x) +#define __SCNPTR(x) __STRINGIFY(ll##x) +#elif defined(__have_long64) +#define __PRIPTR(x) __STRINGIFY(l##x) +#define __SCNPTR(x) __STRINGIFY(l##x) +#else +#define __PRIPTR(x) __STRINGIFY(x) +#define __SCNPTR(x) __STRINGIFY(x) +#endif + +#define PRIdPTR __PRIPTR(d) +#define PRIiPTR __PRIPTR(i) +#define PRIoPTR __PRIPTR(o) +#define PRIuPTR __PRIPTR(u) +#define PRIxPTR __PRIPTR(x) +#define PRIXPTR __PRIPTR(X) + +#define SCNdPTR __SCNPTR(d) +#define SCNiPTR __SCNPTR(i) +#define SCNoPTR __SCNPTR(o) +#define SCNuPTR __SCNPTR(u) +#define SCNxPTR __SCNPTR(x) + + +typedef struct { + intmax_t quot; + intmax_t rem; +} imaxdiv_t; + +#ifdef __cplusplus +extern "C" { +#endif + +extern intmax_t imaxabs(intmax_t j); +extern imaxdiv_t imaxdiv(intmax_t numer, intmax_t denomer); +extern intmax_t strtoimax(const char *__restrict, char **__restrict, int); +extern uintmax_t strtoumax(const char *__restrict, char **__restrict, int); +extern intmax_t wcstoimax(const wchar_t *__restrict, wchar_t **__restrict, int); +extern uintmax_t wcstoumax(const wchar_t *__restrict, wchar_t **__restrict, int); + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/newlib/libc/sys/rtems/include/stdint.h b/newlib/libc/sys/rtems/include/stdint.h new file mode 100644 index 000000000..d108d05fd --- /dev/null +++ b/newlib/libc/sys/rtems/include/stdint.h @@ -0,0 +1,282 @@ +/* + * Copyright (c) 2004, 2005 by + * Ralf Corsepius, Ulm/Germany. All rights reserved. + * + * Permission to use, copy, modify, and distribute this software + * is freely granted, provided that this notice is preserved. + */ + +/* + * @todo - Add fast<N>_t types. + * @todo - Add support for wint_t types. + */ + +#ifndef _STDINT_H +#define _STDINT_H + +#ifdef __cplusplus +extern "C" { +#endif + +#if defined(__GNUC__) && (__GNUC__ >= 3 ) \ + && defined(__GNUC_MINOR__) && (__GNUC_MINOR__ > 2 ) +#define __EXP(x) __##x##__ +#else +#define __EXP(x) x +#include <limits.h> +#endif + +#if __EXP(SCHAR_MAX) == 0x7f +typedef signed char int8_t ; +typedef unsigned char uint8_t ; +#define __int8_t_defined 1 +#endif + +#if __int8_t_defined +typedef signed char int_least8_t; +typedef unsigned char uint_least8_t; +#define __int_least8_t_defined 1 +#endif + +#if __EXP(SHRT_MAX) == 0x7fff +typedef signed short int16_t; +typedef unsigned short uint16_t; +#define __int16_t_defined 1 +#elif __EXP(INT_MAX) == 0x7fff +typedef signed int int16_t; +typedef unsigned int uint16_t; +#define __int16_t_defined 1 +#elif __EXP(SCHAR_MAX) == 0x7fff +typedef signed char int16_t; +typedef unsigned char uint16_t; +#define __int16_t_defined 1 +#endif + +#if __int16_t_defined +typedef int16_t int_least16_t; +typedef uint16_t uint_least16_t; +#define __int_least16_t_defined 1 + +#ifndef __int_least8_t_defined +typedef int16_t int_least8_t; +typedef uint16_t uint_least8_t; +#define __int_least8_t_defined 1 +#endif +#endif + +#if __EXP(INT_MAX) == 0x7fffffffL +typedef signed int int32_t; +typedef unsigned int uint32_t; +#define __int32_t_defined 1 +#elif __EXP(LONG_MAX) == 0x7fffffffL +typedef signed long int32_t; +typedef unsigned long uint32_t; +#define __int32_t_defined 1 +#define __have_long32 1 +#elif __EXP(SHRT_MAX) == 0x7fffffffL +typedef signed short int32_t; +typedef unsigned short uint32_t; +#define __int32_t_defined 1 +#elif __EXP(SCHAR_MAX) == 0x7fffffffL +typedef signed char int32_t; +typedef unsigned char uint32_t; +#define __int32_t_defined 1 +#endif + +#if __int32_t_defined +typedef int32_t int_least32_t; +typedef uint32_t uint_least32_t; +#define __int_least32_t_defined 1 + +#ifndef __int_least8_t_defined +typedef int32_t int_least8_t; +typedef uint32_t uint_least8_t; +#define __int_least8_t_defined 1 +#endif + +#ifndef __int_least16_t_defined +typedef int32_t int_least16_t; +typedef uint32_t uint_least16_t; +#define __int_least16_t_defined 1 +#endif +#endif + +#if __EXP(LONG_MAX) > 0x7fffffff +typedef signed long int64_t; +typedef unsigned long uint64_t; +#define __int64_t_defined 1 +#define __have_long64 1 +#elif defined(__LONG_LONG_MAX__) && (__LONG_LONG_MAX__ > 0x7fffffff) +typedef signed long long int64_t; +typedef unsigned long long uint64_t; +#define __int64_t_defined 1 +#define __have_longlong64 1 +#elif defined(LLONG_MAX) && (LLONG_MAX > 0x7fffffff) +typedef signed long long int64_t; +typedef unsigned long long uint64_t; +#define __int64_t_defined 1 +#define __have_longlong64 1 +#elif __EXP(INT_MAX) > 0x7fffffff +typedef signed int int64_t; +typedef unsigned int uint64_t; +#define __int64_t_defined 1 +#endif + +#if __int64_t_defined +typedef int64_t int_least64_t; +typedef uint64_t uint_least64_t; +#define __int_least64_t_defined 1 + +#ifndef __int_least8_t_defined +typedef int64_t int_least8_t; +typedef uint64_t uint_least8_t; +#define __int_least8_t_defined 1 +#endif + +#ifndef __int_least16_t_defined +typedef int64_t int_least16_t; +typedef uint64_t uint_least16_t; +#define __int_least16_t_defined 1 +#endif + +#ifndef __int_least32_t_defined +typedef int64_t int_least32_t; +typedef uint64_t uint_least32_t; +#define __int_least32_t_defined 1 +#endif +#endif + +#if __have_longlong64 +typedef signed long long intmax_t; +typedef unsigned long long uintmax_t; +#else +typedef signed long intmax_t; +typedef unsigned long uintmax_t; +#endif + +/* + * GCC doesn't provide an propriate macro for [u]intptr_t + * For now, use __PTRDIFF_TYPE__ + */ +#if defined(__PTRDIFF_TYPE__) +typedef signed __PTRDIFF_TYPE__ intptr_t; +typedef unsigned __PTRDIFF_TYPE__ uintptr_t; +#else +/* + * Fallback to hardcoded values, + * should be valid on cpu's with 32bit int/32bit void* + */ +typedef signed long intptr_t; +typedef unsigned long uintptr_t; +#endif + +/* Limits of Specified-Width Integer Types */ + +#if __int8_t_defined +#define INT8_MIN -128 +#define INT8_MAX 127 +#define UINT8_MAX 255 +#endif + +#if __int_least8_t_defined +#define INTLEAST8_MIN -128 +#define INTLEAST8_MAX 127 +#define UINTLEAST8_MAX 255 +#else +#error required type int_least8_t missing +#endif + +#if __int16_t_defined +#define INT16_MIN -32768 +#define INT16_MAX 32767 +#define UINT16_MAX 65535 +#endif + +#if __int_least16_t_defined +#define INTLEAST16_MIN -32768 +#define INTLEAST16_MAX 32767 +#define UINTLEAST16_MAX 65535 +#else +#error required type int_least16_t missing +#endif + +#if __int32_t_defined +#define INT32_MIN -2147483648 +#define INT32_MAX 2147483647 +#define UINT32_MAX 4294967295 +#endif + +#if __int_least32_t_defined +#define INTLEAST32_MIN -2147483648 +#define INTLEAST32_MAX 2147483647 +#define UINTLEAST32_MAX 4294967295 +#else +#error required type int_least32_t missing +#endif + +#if __int64_t_defined +#define INT64_MIN -9223372036854775808 +#define INT64_MAX 9223372036854775807 +#define UINT64_MAX 18446744073709551615 +#endif + +#if __int_least64_t_defined +#define INTLEAST64_MIN -9223372036854775808 +#define INTLEAST64_MAX 9223372036854775807 +#define UINTLEAST64_MAX 18446744073709551615 +#endif + +/* This must match size_t in stddef.h, currently long unsigned int */ +#define SIZE_MIN (-__EXP(LONG_MAX) - 1L) +#define SIZE_MAX __EXP(LONG_MAX) + +/* This must match sig_atomic_t in <signal.h> (currently int) */ +#define SIG_ATOMIC_MIN (-__EXP(INT_MAX) - 1) +#define SIG_ATOMIC_MAX __EXP(INT_MAX) + +/* This must match ptrdiff_t in <stddef.h> (currently long int) */ +#define PTRDIFF_MIN (-__EXP(LONG_MAX) - 1L) +#define PTHDIFF_MAX __EXT(LONG_MAX) + +#undef __EXP + +/** Macros for minimum-width integer constant expressions */ +#define INT8_C(x) x +#define UINT8_C(x) x##U + +#define INT16_C(x) x +#define UINT16_C(x) x##U + +#if __have_long32 +#define INT32_C(x) x##L +#define UINT32_C(x) x##UL +#else +#define INT32_C(x) x +#define UINT32_C(x) x##U +#endif + +#if __int64_t_defined +#if __have_longlong64 +#define INT64_C(x) x##LL +#define UINT64_C(x) x##ULL +#else +#define INT64_C(x) x##L +#define UINT64_C(x) x##UL +#endif +#endif + +/** Macros for greatest-width integer constant expression */ +#if __have_longlong64 +#define INTMAX_C(x) x##LL +#define UINTMAX_C(x) x##ULL +#else +#define INTMAX_C(x) x##L +#define UINTMAX_C(x) x##UL +#endif + + +#ifdef __cplusplus +} +#endif + +#endif /* _STDINT_H */ diff --git a/newlib/libc/sys/sh/aclocal.m4 b/newlib/libc/sys/sh/aclocal.m4 index 55d5e67ce..0a1490998 100644 --- a/newlib/libc/sys/sh/aclocal.m4 +++ b/newlib/libc/sys/sh/aclocal.m4 @@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(newlib, 1.14.0) +AM_INIT_AUTOMAKE(newlib, 1.13.0) # FIXME: We temporarily define our own version of AC_PROG_CC. This is # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS. We @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/sys/sh/configure b/newlib/libc/sys/sh/configure index 091e11fe7..cf9254bff 100755 --- a/newlib/libc/sys/sh/configure +++ b/newlib/libc/sys/sh/configure @@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" && PACKAGE=newlib -VERSION=1.14.0 +VERSION=1.13.0 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: 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" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/sys/sparc64/aclocal.m4 b/newlib/libc/sys/sparc64/aclocal.m4 index 55d5e67ce..0a1490998 100644 --- a/newlib/libc/sys/sparc64/aclocal.m4 +++ b/newlib/libc/sys/sparc64/aclocal.m4 @@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(newlib, 1.14.0) +AM_INIT_AUTOMAKE(newlib, 1.13.0) # FIXME: We temporarily define our own version of AC_PROG_CC. This is # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS. We @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/sys/sparc64/configure b/newlib/libc/sys/sparc64/configure index ebf1e5b5f..024f19110 100755 --- a/newlib/libc/sys/sparc64/configure +++ b/newlib/libc/sys/sparc64/configure @@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" && PACKAGE=newlib -VERSION=1.14.0 +VERSION=1.13.0 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: 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" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/sys/sun4/aclocal.m4 b/newlib/libc/sys/sun4/aclocal.m4 index 55d5e67ce..0a1490998 100644 --- a/newlib/libc/sys/sun4/aclocal.m4 +++ b/newlib/libc/sys/sun4/aclocal.m4 @@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(newlib, 1.14.0) +AM_INIT_AUTOMAKE(newlib, 1.13.0) # FIXME: We temporarily define our own version of AC_PROG_CC. This is # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS. We @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/sys/sun4/configure b/newlib/libc/sys/sun4/configure index eede7cf12..182785c45 100755 --- a/newlib/libc/sys/sun4/configure +++ b/newlib/libc/sys/sun4/configure @@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" && PACKAGE=newlib -VERSION=1.14.0 +VERSION=1.13.0 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: 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" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/sys/sysmec/aclocal.m4 b/newlib/libc/sys/sysmec/aclocal.m4 index 55d5e67ce..0a1490998 100644 --- a/newlib/libc/sys/sysmec/aclocal.m4 +++ b/newlib/libc/sys/sysmec/aclocal.m4 @@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(newlib, 1.14.0) +AM_INIT_AUTOMAKE(newlib, 1.13.0) # FIXME: We temporarily define our own version of AC_PROG_CC. This is # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS. We @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/sys/sysmec/configure b/newlib/libc/sys/sysmec/configure index 1efee2bcc..c3fe7f351 100755 --- a/newlib/libc/sys/sysmec/configure +++ b/newlib/libc/sys/sysmec/configure @@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" && PACKAGE=newlib -VERSION=1.14.0 +VERSION=1.13.0 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: 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" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/sys/sysnec810/aclocal.m4 b/newlib/libc/sys/sysnec810/aclocal.m4 index 55d5e67ce..0a1490998 100644 --- a/newlib/libc/sys/sysnec810/aclocal.m4 +++ b/newlib/libc/sys/sysnec810/aclocal.m4 @@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(newlib, 1.14.0) +AM_INIT_AUTOMAKE(newlib, 1.13.0) # FIXME: We temporarily define our own version of AC_PROG_CC. This is # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS. We @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/sys/sysnec810/configure b/newlib/libc/sys/sysnec810/configure index 6c6f10aeb..8acbb73ae 100755 --- a/newlib/libc/sys/sysnec810/configure +++ b/newlib/libc/sys/sysnec810/configure @@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" && PACKAGE=newlib -VERSION=1.14.0 +VERSION=1.13.0 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: 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" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/sys/sysnecv850/aclocal.m4 b/newlib/libc/sys/sysnecv850/aclocal.m4 index 55d5e67ce..0a1490998 100644 --- a/newlib/libc/sys/sysnecv850/aclocal.m4 +++ b/newlib/libc/sys/sysnecv850/aclocal.m4 @@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(newlib, 1.14.0) +AM_INIT_AUTOMAKE(newlib, 1.13.0) # FIXME: We temporarily define our own version of AC_PROG_CC. This is # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS. We @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/sys/sysnecv850/configure b/newlib/libc/sys/sysnecv850/configure index 1efee2bcc..c3fe7f351 100755 --- a/newlib/libc/sys/sysnecv850/configure +++ b/newlib/libc/sys/sysnecv850/configure @@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" && PACKAGE=newlib -VERSION=1.14.0 +VERSION=1.13.0 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: 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" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/sys/sysvi386/aclocal.m4 b/newlib/libc/sys/sysvi386/aclocal.m4 index 55d5e67ce..0a1490998 100644 --- a/newlib/libc/sys/sysvi386/aclocal.m4 +++ b/newlib/libc/sys/sysvi386/aclocal.m4 @@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(newlib, 1.14.0) +AM_INIT_AUTOMAKE(newlib, 1.13.0) # FIXME: We temporarily define our own version of AC_PROG_CC. This is # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS. We @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/sys/sysvi386/configure b/newlib/libc/sys/sysvi386/configure index 0ae9cc4d1..9076487fe 100755 --- a/newlib/libc/sys/sysvi386/configure +++ b/newlib/libc/sys/sysvi386/configure @@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" && PACKAGE=newlib -VERSION=1.14.0 +VERSION=1.13.0 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: 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" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/sys/sysvnecv70/aclocal.m4 b/newlib/libc/sys/sysvnecv70/aclocal.m4 index 55d5e67ce..0a1490998 100644 --- a/newlib/libc/sys/sysvnecv70/aclocal.m4 +++ b/newlib/libc/sys/sysvnecv70/aclocal.m4 @@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(newlib, 1.14.0) +AM_INIT_AUTOMAKE(newlib, 1.13.0) # FIXME: We temporarily define our own version of AC_PROG_CC. This is # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS. We @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/sys/sysvnecv70/configure b/newlib/libc/sys/sysvnecv70/configure index 88386a9e3..7814031e1 100755 --- a/newlib/libc/sys/sysvnecv70/configure +++ b/newlib/libc/sys/sysvnecv70/configure @@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" && PACKAGE=newlib -VERSION=1.14.0 +VERSION=1.13.0 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: 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" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/sys/tic80/aclocal.m4 b/newlib/libc/sys/tic80/aclocal.m4 index 55d5e67ce..0a1490998 100644 --- a/newlib/libc/sys/tic80/aclocal.m4 +++ b/newlib/libc/sys/tic80/aclocal.m4 @@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(newlib, 1.14.0) +AM_INIT_AUTOMAKE(newlib, 1.13.0) # FIXME: We temporarily define our own version of AC_PROG_CC. This is # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS. We @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/sys/tic80/configure b/newlib/libc/sys/tic80/configure index c97c3f425..d5e1fc3ee 100755 --- a/newlib/libc/sys/tic80/configure +++ b/newlib/libc/sys/tic80/configure @@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" && PACKAGE=newlib -VERSION=1.14.0 +VERSION=1.13.0 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: 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" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/sys/w65/aclocal.m4 b/newlib/libc/sys/w65/aclocal.m4 index 55d5e67ce..0a1490998 100644 --- a/newlib/libc/sys/w65/aclocal.m4 +++ b/newlib/libc/sys/w65/aclocal.m4 @@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(newlib, 1.14.0) +AM_INIT_AUTOMAKE(newlib, 1.13.0) # FIXME: We temporarily define our own version of AC_PROG_CC. This is # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS. We @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/sys/w65/configure b/newlib/libc/sys/w65/configure index 9050c416e..52291f899 100755 --- a/newlib/libc/sys/w65/configure +++ b/newlib/libc/sys/w65/configure @@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" && PACKAGE=newlib -VERSION=1.14.0 +VERSION=1.13.0 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: 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" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; diff --git a/newlib/libc/sys/z8ksim/aclocal.m4 b/newlib/libc/sys/z8ksim/aclocal.m4 index 55d5e67ce..0a1490998 100644 --- a/newlib/libc/sys/z8ksim/aclocal.m4 +++ b/newlib/libc/sys/z8ksim/aclocal.m4 @@ -117,7 +117,7 @@ AC_SUBST(newlib_basedir) AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE(newlib, 1.14.0) +AM_INIT_AUTOMAKE(newlib, 1.13.0) # FIXME: We temporarily define our own version of AC_PROG_CC. This is # copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS. We @@ -165,9 +165,6 @@ AC_CHECK_TOOL(RANLIB, ranlib, :) AC_PROG_INSTALL -# Hack -ac_given_INSTALL=$INSTALL - AM_MAINTAINER_MODE # We need AC_EXEEXT to keep automake happy in cygnus mode. However, diff --git a/newlib/libc/sys/z8ksim/configure b/newlib/libc/sys/z8ksim/configure index 4330a5fb5..04155f15b 100755 --- a/newlib/libc/sys/z8ksim/configure +++ b/newlib/libc/sys/z8ksim/configure @@ -997,7 +997,7 @@ test "$host_alias" != "$target_alias" && PACKAGE=newlib -VERSION=1.14.0 +VERSION=1.13.0 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -1419,11 +1419,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -# Hack -ac_given_INSTALL=$INSTALL - echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1427: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1424: 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" @@ -1457,7 +1454,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1461: checking for executable suffix" >&5 +echo "configure:1458: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1467,7 +1464,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in *.c | *.o | *.obj) ;; |