From 9e81b69b92441a1cc800947213775424938e5f5f Mon Sep 17 00:00:00 2001 From: Kevin Rosenberg Date: Wed, 19 Nov 2003 22:46:22 +0000 Subject: [PATCH] 0.8.5.49: * Revert previous tools-for-build/modify-ldt-struct-name commit (which never actually included the necessary C file) for the simpler test of LINUX_VERSION_CODE suggested by Dan Barlow. --- make-config.sh | 4 ---- src/runtime/x86-linux-os.c | 5 ++--- version.lisp-expr | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/make-config.sh b/make-config.sh index bd409f7..e71a786 100644 --- a/make-config.sh +++ b/make-config.sh @@ -167,10 +167,6 @@ cd $original_dir # similar with :STACK-GROWS-FOOWARD, too. -- WHN 2002-03-03 if [ "$sbcl_arch" = "x86" ] ; then printf ' :gencgc :stack-grows-downward-not-upward :c-stack-is-control-stack' >> $ltf - cd tools-for-build - $GNUMAKE -I ../src/runtime modify-ldt-struct-name - ./modify-ldt-struct-name > ../src/runtime/modify-ldt-struct-name.h - cd .. elif [ "$sbcl_arch" = "mips" ] ; then # Use a little C program to try to guess the endianness. Ware # cross-compilers! diff --git a/src/runtime/x86-linux-os.c b/src/runtime/x86-linux-os.c index b39df5a..927d3c4 100644 --- a/src/runtime/x86-linux-os.c +++ b/src/runtime/x86-linux-os.c @@ -40,13 +40,12 @@ #include #include #include -#include "modify-ldt-struct-name.h" #include #include +#include #include "thread.h" /* dynamic_values_bytes */ -#ifndef MODIFY_LDT_STRUCT_NAMED_USER_DESC -/* old glibc */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) #define user_desc modify_ldt_ldt_s #endif diff --git a/version.lisp-expr b/version.lisp-expr index 1a6c967..a5955b3 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -17,4 +17,4 @@ ;;; checkins which aren't released. (And occasionally for internal ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"0.8.5.48" +"0.8.5.49" -- 1.7.10.4