OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update. 

1999-05-27  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>

	* malloc/malloc.h: Properly handle future GCC versions.

1999-05-27  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>

	* sysdeps/unix/sysv/linux/configure.in: Change version checks to
	use AC_EGREP_CPP.  Change sed pattern to not use alternation.  Fix
	text of error message.

	* aclocal.m4 (GLIBC_PROVIDES): Define AC_LANG to `C'.
This commit is contained in:
Ulrich Drepper 1999-05-29 22:56:42 +00:00
parent fb97136391
commit fc0a2d72e5
4 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
1999-05-27 Andreas Schwab <schwab@issan.cs.uni-dortmund.de>
* malloc/malloc.h: Properly handle future GCC versions.
1999-05-27 Andreas Schwab <schwab@issan.cs.uni-dortmund.de>
* sysdeps/unix/sysv/linux/configure.in: Change version checks to
use AC_EGREP_CPP. Change sed pattern to not use alternation. Fix
text of error message.
* aclocal.m4 (GLIBC_PROVIDES): Define AC_LANG to `C'.
1999-05-29 Ulrich Drepper <drepper@cygnus.com> 1999-05-29 Ulrich Drepper <drepper@cygnus.com>
* manual/filesys.texi: Extend (f)truncate documentation. * manual/filesys.texi: Extend (f)truncate documentation.

1
aclocal.m4 vendored
View File

@ -10,6 +10,7 @@ AC_PROVIDE([AC_PROG_INSTALL])dnl
AC_PROVIDE([AC_PROG_RANLIB])dnl AC_PROVIDE([AC_PROG_RANLIB])dnl
AC_PROVIDE([AC_PROG_CC])dnl AC_PROVIDE([AC_PROG_CC])dnl
AC_PROVIDE([AC_PROG_CPP])dnl AC_PROVIDE([AC_PROG_CPP])dnl
define([AC_LANG], [C])dnl
# This file is generated from configure.in by Autoconf. DO NOT EDIT! # This file is generated from configure.in by Autoconf. DO NOT EDIT!
])dnl ])dnl
dnl dnl

2
malloc/malloc.h
View File

@ -60,7 +60,7 @@
/* GCC can always grok prototypes. For C++ programs we add throw() /* GCC can always grok prototypes. For C++ programs we add throw()
to help it optimize the function calls. But this works only with to help it optimize the function calls. But this works only with
gcc 2.8.x and egcs. */ gcc 2.8.x and egcs. */
# if defined __cplusplus && __GNUC_MINOR__ >= 8 # if defined __cplusplus && (__GNUC__ >= 3 || __GNUC_MINOR__ >= 8)
# define __THROW throw () # define __THROW throw ()
# else # else
# define __THROW # define __THROW

26
sysdeps/unix/sysv/linux/configure.in
View File

@ -16,14 +16,14 @@ if test -n "$sysheaders"; then
fi fi
define([libc_cv_linuxVER], [libc_cv_linux]patsubst(LIBC_LINUX_VERSION,[\.]))dnl define([libc_cv_linuxVER], [libc_cv_linux]patsubst(LIBC_LINUX_VERSION,[\.]))dnl
AC_CACHE_CHECK(installed Linux kernel header files, libc_cv_linuxVER, [dnl AC_CACHE_CHECK(installed Linux kernel header files, libc_cv_linuxVER, [dnl
AC_TRY_COMPILE([#include <linux/version.h>], AC_EGREP_CPP([eat flaming death], [#include <linux/version.h>
[#if LINUX_VERSION_CODE < ]dnl #if !defined LINUX_VERSION_CODE || LINUX_VERSION_CODE < ]dnl
patsubst(LIBC_LINUX_VERSION,[^\([^.]*\)\.\([^.]*\)\.\([^.]*\)$],dnl patsubst(LIBC_LINUX_VERSION,[^\([^.]*\)\.\([^.]*\)\.\([^.]*\)$],dnl
[ (\1 *65536+ \2 *256+ \3) /* \1.\2.\3 */])[ [ (\1 *65536+ \2 *256+ \3) /* \1.\2.\3 */])[
eat flaming death eat flaming death
#endif], #endif],
libc_cv_linuxVER='LIBC_LINUX_VERSION or later', libc_cv_linuxVER='TOO OLD!',
libc_cv_linuxVER='TOO OLD!')]) libc_cv_linuxVER='LIBC_LINUX_VERSION or later')])
if test "$libc_cv_linuxVER" != 'LIBC_LINUX_VERSION or later'; then if test "$libc_cv_linuxVER" != 'LIBC_LINUX_VERSION or later'; then
AC_MSG_ERROR([GNU libc requires kernel header files from AC_MSG_ERROR([GNU libc requires kernel header files from
Linux LIBC_LINUX_VERSION or later to be installed before configuring. Linux LIBC_LINUX_VERSION or later to be installed before configuring.
@ -40,25 +40,19 @@ fi
if test -n "$minimum_kernel"; then if test -n "$minimum_kernel"; then
AC_MSG_CHECKING(for kernel header at least $minimum_kernel) AC_MSG_CHECKING(for kernel header at least $minimum_kernel)
changequote(,)dnl changequote(,)dnl
decnum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\(\([0-9]*\)\|\).*/(\1 * 65536 + \2 * 256 + \3)/'`; decnum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/(\1 * 65536 + \2 * 256 + \3)/'`;
changequote([,])dnl changequote([,])dnl
cat > conftest.$ac_ext <<EOF AC_EGREP_CPP([eat flaming death], [#include <linux/version.h>
#include <linux/version.h>
int main() {
#if LINUX_VERSION_CODE < $decnum #if LINUX_VERSION_CODE < $decnum
eat flaming death eat flaming death
#endif #endif], libc_minimum_kernel='too old!', libc_minimum_kernel=ok)
; return 0; } AC_MSG_RESULT($libc_minimum_kernel)
EOF if test "$libc_minimum_kernel" = ok; then
if { (eval echo configure:30: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
AC_DEFINE_UNQUOTED(__LINUX_KERNEL_VERSION, $decnum) AC_DEFINE_UNQUOTED(__LINUX_KERNEL_VERSION, $decnum)
AC_MSG_RESULT(ok)
else else
AC_MSG_RESULT(too old!) AC_MSG_ERROR([*** The available kernel headers are older than the requested
AC_MSG_ERROR([*** The available kernel headers are not at least as old as the requested
*** compatible kernel version]) *** compatible kernel version])
fi fi
rm -f conftest*
fi fi
if test -n "$sysheaders"; then if test -n "$sysheaders"; then