Commit 7d957de2 authored by elros34's avatar elros34

Set minimum kernel version to 3.0.0

parent a4b4c96b
diff --git a/elf/dl-load.c b/elf/dl-load.c
index c51e4b37..083ece0d 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -1530,7 +1530,6 @@ open_verify (const char *name, int fd,
ElfW(Phdr) *phdr, *ph;
ElfW(Word) *abi_note;
ElfW(Word) *abi_note_malloced = NULL;
- unsigned int osversion;
size_t maplength;
/* We successfully opened the file. Now verify it is a file
@@ -1741,11 +1740,7 @@ open_verify (const char *name, int fd,
if (size == 0)
continue;
- osversion = (abi_note[5] & 0xff) * 65536
- + (abi_note[6] & 0xff) * 256
- + (abi_note[7] & 0xff);
- if (abi_note[4] != __ABI_TAG_OS
- || (GLRO(dl_osversion) && GLRO(dl_osversion) < osversion))
+ if (abi_note[4] != __ABI_TAG_OS)
{
close_and_out:
__close_nocancel (fd);
diff --git a/sysdeps/unix/sysv/linux/configure b/sysdeps/unix/sysv/linux/configure
index cace758c..4c78904c 100644
--- a/sysdeps/unix/sysv/linux/configure
+++ b/sysdeps/unix/sysv/linux/configure
@@ -8,13 +8,13 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking installed Linux kernel header files" >&5
$as_echo_n "checking installed Linux kernel header files... " >&6; }
-if ${libc_cv_linux320+:} false; then :
+if ${libc_cv_linux300+:} false; then :
$as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <linux/version.h>
-#if !defined LINUX_VERSION_CODE || LINUX_VERSION_CODE < (3 *65536+ 2 *256+ 0) /* 3.2.0 */
+#if !defined LINUX_VERSION_CODE || LINUX_VERSION_CODE < (3 *65536+ 0 *256+ 0) /* 3.0.0 */
# error kernel headers missing or too old
#endif
int
@@ -26,20 +26,20 @@ main ()
}
_ACEOF
if ac_fn_c_try_compile "$LINENO"; then :
- libc_cv_linux320='3.2.0 or later'
+ libc_cv_linux300='3.0.0 or later'
else
- libc_cv_linux320='missing or too old!'
+ libc_cv_linux300='missing or too old!'
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_linux320" >&5
-$as_echo "$libc_cv_linux320" >&6; }
-if test "$libc_cv_linux320" != '3.2.0 or later'; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_linux300" >&5
+$as_echo "$libc_cv_linux300" >&6; }
+if test "$libc_cv_linux300" != '3.0.0 or later'; then
as_fn_error $? "GNU libc requires kernel header files from
-Linux 3.2.0 or later to be installed before configuring.
+Linux 3.0.0 or later to be installed before configuring.
The kernel header files are found usually in /usr/include/asm and
/usr/include/linux; make sure these directories use files from
-Linux 3.2.0 or later. This check uses <linux/version.h>, so
+Linux 3.0.0 or later. This check uses <linux/version.h>, so
make sure that file was built correctly when installing the kernel header
files. To use kernel headers not from /usr/include/linux, use the
configure option --with-headers." "$LINENO" 5
@@ -51,7 +51,7 @@ fi
# set arch_minimum_kernel already, let that override our defaults here.
# Note that we presume such a fragment has set libc_cv_gcc_unwind_find_fde
# if appropriate too.
-test -n "$arch_minimum_kernel" || arch_minimum_kernel=3.2.0
+test -n "$arch_minimum_kernel" || arch_minimum_kernel=3.0.0
if test -n "$minimum_kernel"; then
user_version=$((`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1 \* 65536 + \2 \* 256 + \3/'`))
diff --git a/sysdeps/unix/sysv/linux/configure.ac b/sysdeps/unix/sysv/linux/configure.ac
index 13abda0a..97f9836d 100644
--- a/sysdeps/unix/sysv/linux/configure.ac
+++ b/sysdeps/unix/sysv/linux/configure.ac
@@ -1,7 +1,7 @@
GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
# Local configure fragment for sysdeps/unix/sysv/linux.
-define([LIBC_LINUX_VERSION],[3.2.0])dnl
+define([LIBC_LINUX_VERSION],[3.0.0])dnl
if test -n "$sysheaders"; then
OLD_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $SYSINCLUDES"
@@ -33,7 +33,7 @@ fi
# set arch_minimum_kernel already, let that override our defaults here.
# Note that we presume such a fragment has set libc_cv_gcc_unwind_find_fde
# if appropriate too.
-test -n "$arch_minimum_kernel" || arch_minimum_kernel=3.2.0
+test -n "$arch_minimum_kernel" || arch_minimum_kernel=3.0.0
if test -n "$minimum_kernel"; then
changequote(,)
user_version=$((`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1 \* 65536 + \2 \* 256 + \3/'`))
......@@ -5,7 +5,7 @@
Name: glibc
Summary: GNU C library shared libraries
Version: 2.28+git6
Version: 2.28+git6+3.0.0
Release: 0
License: LGPLv2+ and LGPLv2+ with exceptions and GPLv2+
Group: System/Libraries
......@@ -25,6 +25,7 @@ Patch10: eglibc-2.15-fix-neon-libdl.patch
Patch11: eglibc-2.19-shlib-make.patch
Patch12: glibc-2.27-bits.patch
Patch13: git-updates.diff
Patch14: glibc-2.28-kernel-3.0.patch
Provides: ldconfig
# The dynamic linker supports DT_GNU_HASH
......@@ -46,7 +47,7 @@ BuildRequires: gawk, util-linux
# This gcc >= 3.2 is to ensure that __frame_state_for is exported by glibc
# will be compatible with egcs 1.x.y
BuildRequires: gcc >= 3.2
%define enablekernel 3.2
%define enablekernel 3.0.0
%ifarch %{ix86}
%ifarch i486
%define _target_cpu i486
......@@ -223,6 +224,7 @@ cd %{glibcsrcdir}
%patch11 -p1
%patch12 -p1
%patch13 -p1
%patch14 -p1
%build
GCC=gcc
......
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