Skip to content

R
riscv-gcc-1
Commit 9bcfe71d by Richard Henderson Committed by Richard Henderson
Options

Makefile.in (STROBJS): Get memmove.o from configure. 

        * Makefile.in (STROBJS): Get memmove.o from configure.
        * configure.in (RANLIB): Detect and substitute.
        (memmove): Detect and substitute.
        * memmove.c (memmove): Use size_t.

From-SVN: r34313
parent c74e2214
Showing with 143 additions and 39 deletions
libchill/ChangeLog
2000-05-31 Richard Henderson <rth@cygnus.com>
* Makefile.in (STROBJS): Get memmove.o from configure.
* configure.in (RANLIB): Detect and substitute.
(memmove): Detect and substitute.
* memmove.c (memmove): Use size_t.
2000-05-29 Zack Weinberg <zack@wolery.cumb.org> 2000-05-29 Zack Weinberg <zack@wolery.cumb.org>
* concatstr.c, exh.c: Include stdlib.h and string.h. * concatstr.c, exh.c: Include stdlib.h and string.h.
......
libchill/Makefile.in
...@@ -81,7 +81,7 @@ PSOBJS = andps.o cardps.o concatps.o copyps.o diffps.o eqps.o ffsetclrps.o \ ...@@ -81,7 +81,7 @@ PSOBJS = andps.o cardps.o concatps.o copyps.o diffps.o eqps.o ffsetclrps.o \
ffsetps.o flsetclrps.o flsetps.o inbitstr.o inps.o leps.o ltps.o \ ffsetps.o flsetclrps.o flsetps.o inbitstr.o inps.o leps.o ltps.o \
neps.o notps.o orps.o setbitps.o setbits.o sliceps.o xorps.o neps.o notps.o orps.o setbitps.o setbits.o sliceps.o xorps.o
STROBJS = concatstr.o eqstr.o ltstr.o memmove.o STROBJS = concatstr.o eqstr.o ltstr.o @MEMMOVE_O@
TIMEOBJS = abstime.o inttime.o waituntil.o remaintime.o convdurrtstime.o \ TIMEOBJS = abstime.o inttime.o waituntil.o remaintime.o convdurrtstime.o \
checkcycle.o checkcycle.o
......
libchill/configure
...@@ -811,8 +811,42 @@ fi ...@@ -811,8 +811,42 @@ fi
test "$AR" || AR=ar test "$AR" || AR=ar
if test "$RANLIB"; then :
else
# 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:821: 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
fi
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
echo "configure:816: checking whether ${MAKE-make} sets \${MAKE}" >&5 echo "configure:850: checking whether ${MAKE-make} sets \${MAKE}" >&5
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` 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 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
...@@ -842,7 +876,7 @@ fi ...@@ -842,7 +876,7 @@ fi
# Sanity check for the cross-compilation case: # Sanity check for the cross-compilation case:
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
echo "configure:846: checking how to run the C preprocessor" >&5 echo "configure:880: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory. # On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then if test -n "$CPP" && test -d "$CPP"; then
CPP= CPP=
...@@ -857,13 +891,13 @@ else ...@@ -857,13 +891,13 @@ else
# On the NeXT, cc -E runs the code through the compiler's parser, # On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. # not just through cpp.
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 861 "configure" #line 895 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <assert.h> #include <assert.h>
Syntax Error Syntax Error
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:867: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:901: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
: :
...@@ -874,13 +908,13 @@ else ...@@ -874,13 +908,13 @@ else
rm -rf conftest* rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp" CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 878 "configure" #line 912 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <assert.h> #include <assert.h>
Syntax Error Syntax Error
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:884: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:918: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
: :
...@@ -891,13 +925,13 @@ else ...@@ -891,13 +925,13 @@ else
rm -rf conftest* rm -rf conftest*
CPP="${CC-cc} -nologo -E" CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 895 "configure" #line 929 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <assert.h> #include <assert.h>
Syntax Error Syntax Error
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:901: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:935: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
: :
...@@ -923,17 +957,17 @@ echo "$ac_t""$CPP" 1>&6 ...@@ -923,17 +957,17 @@ echo "$ac_t""$CPP" 1>&6
ac_safe=`echo "stdio.h" | sed 'y%./+-%__p_%'` ac_safe=`echo "stdio.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for stdio.h""... $ac_c" 1>&6 echo $ac_n "checking for stdio.h""... $ac_c" 1>&6
echo "configure:927: checking for stdio.h" >&5 echo "configure:961: checking for stdio.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 932 "configure" #line 966 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdio.h> #include <stdio.h>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:937: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:971: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -961,12 +995,12 @@ fi ...@@ -961,12 +995,12 @@ fi
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
echo "configure:965: checking for ANSI C header files" >&5 echo "configure:999: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 970 "configure" #line 1004 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdlib.h> #include <stdlib.h>
#include <stdarg.h> #include <stdarg.h>
...@@ -974,7 +1008,7 @@ else ...@@ -974,7 +1008,7 @@ else
#include <float.h> #include <float.h>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:978: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:1012: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -991,7 +1025,7 @@ rm -f conftest* ...@@ -991,7 +1025,7 @@ rm -f conftest*
if test $ac_cv_header_stdc = yes; then if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI. # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 995 "configure" #line 1029 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <string.h> #include <string.h>
EOF EOF
...@@ -1009,7 +1043,7 @@ fi ...@@ -1009,7 +1043,7 @@ fi
if test $ac_cv_header_stdc = yes; then if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1013 "configure" #line 1047 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdlib.h> #include <stdlib.h>
EOF EOF
...@@ -1030,7 +1064,7 @@ if test "$cross_compiling" = yes; then ...@@ -1030,7 +1064,7 @@ if test "$cross_compiling" = yes; then
: :
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1034 "configure" #line 1068 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <ctype.h> #include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z') #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
...@@ -1041,7 +1075,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); ...@@ -1041,7 +1075,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
exit (0); } exit (0); }
EOF EOF
if { (eval echo configure:1045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:1079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
: :
else else
...@@ -1066,12 +1100,12 @@ fi ...@@ -1066,12 +1100,12 @@ fi
echo $ac_n "checking for posix""... $ac_c" 1>&6 echo $ac_n "checking for posix""... $ac_c" 1>&6
echo "configure:1070: checking for posix" >&5 echo "configure:1104: checking for posix" >&5
if eval "test \"`echo '$''{'chill_cv_header_posix'+set}'`\" = set"; then if eval "test \"`echo '$''{'chill_cv_header_posix'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1075 "configure" #line 1109 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h> #include <unistd.h>
...@@ -1097,12 +1131,12 @@ echo "$ac_t""$chill_cv_header_posix" 1>&6 ...@@ -1097,12 +1131,12 @@ echo "$ac_t""$chill_cv_header_posix" 1>&6
# We can rely on the GNU library being posix-ish. I guess checking the # We can rely on the GNU library being posix-ish. I guess checking the
# header isn't actually like checking the functions, though... # header isn't actually like checking the functions, though...
echo $ac_n "checking for GNU library""... $ac_c" 1>&6 echo $ac_n "checking for GNU library""... $ac_c" 1>&6
echo "configure:1101: checking for GNU library" >&5 echo "configure:1135: checking for GNU library" >&5
if eval "test \"`echo '$''{'chill_cv_lib_gnu'+set}'`\" = set"; then if eval "test \"`echo '$''{'chill_cv_lib_gnu'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1106 "configure" #line 1140 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdio.h> #include <stdio.h>
#ifdef __GNU_LIBRARY__ #ifdef __GNU_LIBRARY__
...@@ -1125,12 +1159,12 @@ fi ...@@ -1125,12 +1159,12 @@ fi
echo "$ac_t""$chill_cv_lib_gnu" 1>&6 echo "$ac_t""$chill_cv_lib_gnu" 1>&6
echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
echo "configure:1129: checking return type of signal handlers" >&5 echo "configure:1163: checking return type of signal handlers" >&5
if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1134 "configure" #line 1168 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <sys/types.h> #include <sys/types.h>
#include <signal.h> #include <signal.h>
...@@ -1147,7 +1181,7 @@ int main() { ...@@ -1147,7 +1181,7 @@ int main() {
int i; int i;
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:1151: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:1185: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
ac_cv_type_signal=void ac_cv_type_signal=void
else else
...@@ -1168,12 +1202,12 @@ EOF ...@@ -1168,12 +1202,12 @@ EOF
# we'll get atexit by default # we'll get atexit by default
if test $ac_cv_header_stdc != yes; then if test $ac_cv_header_stdc != yes; then
echo $ac_n "checking for atexit""... $ac_c" 1>&6 echo $ac_n "checking for atexit""... $ac_c" 1>&6
echo "configure:1172: checking for atexit" >&5 echo "configure:1206: checking for atexit" >&5
if eval "test \"`echo '$''{'ac_cv_func_atexit'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_atexit'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1177 "configure" #line 1211 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char atexit(); below. */ which can conflict with char atexit(); below. */
...@@ -1196,7 +1230,7 @@ atexit(); ...@@ -1196,7 +1230,7 @@ atexit();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:1200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:1234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_atexit=yes" eval "ac_cv_func_atexit=yes"
else else
...@@ -1221,12 +1255,12 @@ else ...@@ -1221,12 +1255,12 @@ else
EOF EOF
echo $ac_n "checking for onexit""... $ac_c" 1>&6 echo $ac_n "checking for onexit""... $ac_c" 1>&6
echo "configure:1225: checking for onexit" >&5 echo "configure:1259: checking for onexit" >&5
if eval "test \"`echo '$''{'ac_cv_func_onexit'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_onexit'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1230 "configure" #line 1264 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char onexit(); below. */ which can conflict with char onexit(); below. */
...@@ -1249,7 +1283,7 @@ onexit(); ...@@ -1249,7 +1283,7 @@ onexit();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:1253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:1287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_onexit=yes" eval "ac_cv_func_onexit=yes"
else else
...@@ -1267,12 +1301,12 @@ if eval "test \"`echo '$ac_cv_func_'onexit`\" = yes"; then ...@@ -1267,12 +1301,12 @@ if eval "test \"`echo '$ac_cv_func_'onexit`\" = yes"; then
else else
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
echo $ac_n "checking for on_exit""... $ac_c" 1>&6 echo $ac_n "checking for on_exit""... $ac_c" 1>&6
echo "configure:1271: checking for on_exit" >&5 echo "configure:1305: checking for on_exit" >&5
if eval "test \"`echo '$''{'ac_cv_func_on_exit'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_on_exit'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 1276 "configure" #line 1310 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char on_exit(); below. */ which can conflict with char on_exit(); below. */
...@@ -1295,7 +1329,7 @@ on_exit(); ...@@ -1295,7 +1329,7 @@ on_exit();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:1299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:1333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_on_exit=yes" eval "ac_cv_func_on_exit=yes"
else else
...@@ -1323,6 +1357,56 @@ fi ...@@ -1323,6 +1357,56 @@ fi
else true else true
fi fi
echo $ac_n "checking for memmove""... $ac_c" 1>&6
echo "configure:1362: checking for memmove" >&5
if eval "test \"`echo '$''{'ac_cv_func_memmove'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 1367 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char memmove(); below. */
#include <assert.h>
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char memmove();
int main() {
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
#if defined (__stub_memmove) || defined (__stub___memmove)
choke me
#else
memmove();
#endif
; return 0; }
EOF
if { (eval echo configure:1390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_memmove=yes"
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
eval "ac_cv_func_memmove=no"
fi
rm -f conftest*
fi
if eval "test \"`echo '$ac_cv_func_'memmove`\" = yes"; then
echo "$ac_t""yes" 1>&6
MEMMOVE_O=''
else
echo "$ac_t""no" 1>&6
MEMMOVE_O=memmove.o
fi
# We need multilib support, but only if configuring for the target. # We need multilib support, but only if configuring for the target.
trap '' 1 2 15 trap '' 1 2 15
...@@ -1471,8 +1555,10 @@ s%@infodir@%$infodir%g ...@@ -1471,8 +1555,10 @@ s%@infodir@%$infodir%g
s%@mandir@%$mandir%g s%@mandir@%$mandir%g
s%@CC@%$CC%g s%@CC@%$CC%g
s%@AR@%$AR%g s%@AR@%$AR%g
s%@RANLIB@%$RANLIB%g
s%@SET_MAKE@%$SET_MAKE%g s%@SET_MAKE@%$SET_MAKE%g
s%@CPP@%$CPP%g s%@CPP@%$CPP%g
s%@MEMMOVE_O@%$MEMMOVE_O%g
CEOF CEOF
EOF EOF
......
libchill/configure.in
...@@ -70,6 +70,11 @@ AC_PROG_CC ...@@ -70,6 +70,11 @@ AC_PROG_CC
test "$AR" || AR=ar test "$AR" || AR=ar
AC_SUBST(AR) AC_SUBST(AR)
if test "$RANLIB"; then :
AC_SUBST(RANLIB)
else
AC_PROG_RANLIB
fi
AC_PROG_MAKE_SET AC_PROG_MAKE_SET
dnl Checks for libraries. dnl Checks for libraries.
...@@ -123,6 +128,10 @@ AC_CHECK_FUNC(atexit, ...@@ -123,6 +128,10 @@ AC_CHECK_FUNC(atexit,
AC_DEFINE(onexit,on_exit),)])]) AC_DEFINE(onexit,on_exit),)])])
else true else true
fi fi
AC_CHECK_FUNC(memmove,
MEMMOVE_O='',
MEMMOVE_O=memmove.o)
AC_SUBST(MEMMOVE_O)
# We need multilib support, but only if configuring for the target. # We need multilib support, but only if configuring for the target.
AC_OUTPUT(Makefile, AC_OUTPUT(Makefile,
......
libchill/memmove.c
...@@ -26,9 +26,11 @@ Boston, MA 02111-1307, USA. */ ...@@ -26,9 +26,11 @@ Boston, MA 02111-1307, USA. */
This exception does not however invalidate any other reasons why This exception does not however invalidate any other reasons why
the executable file might be covered by the GNU General Public License. */ the executable file might be covered by the GNU General Public License. */
#include <string.h> #ifdef __STDC__
#include <stddef.h>
#define MIN(a, b) ((a) < (b) ? (a) : (b)) #else
#define size_t unsigned long
#endif
/* /*
...@@ -54,7 +56,7 @@ void * ...@@ -54,7 +56,7 @@ void *
memmove (s1, s2, n) memmove (s1, s2, n)
void *s1; void *s1;
const void *s2; const void *s2;
unsigned int n; size_t n;
{ {
char *sc1 = s1; char *sc1 = s1;
const char *sc2 = s2; const char *sc2 = s2;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment