glibc: update to 2.18.
This commit is contained in:
parent
288e7c4f9e
commit
b50df0d7ec
2 changed files with 4 additions and 73 deletions
|
@ -1,68 +0,0 @@
|
||||||
diff --git a/elf/cache.c b/elf/cache.c
|
|
||||||
index 9901952..699550b 100644
|
|
||||||
--- elf/cache.c
|
|
||||||
+++ elf/cache.c
|
|
||||||
@@ -100,6 +100,10 @@ print_entry (const char *lib, int flag, unsigned int osversion,
|
|
||||||
case FLAG_AARCH64_LIB64:
|
|
||||||
fputs (",AArch64", stdout);
|
|
||||||
break;
|
|
||||||
+ /* Uses the ARM soft-float ABI. */
|
|
||||||
+ case FLAG_ARM_LIBSF:
|
|
||||||
+ fputs (",soft-float", stdout);
|
|
||||||
+ break;
|
|
||||||
case 0:
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
diff --git a/sysdeps/generic/ldconfig.h b/sysdeps/generic/ldconfig.h
|
|
||||||
index 57a9a46..91190aa 100644
|
|
||||||
--- sysdeps/generic/ldconfig.h
|
|
||||||
+++ sysdeps/generic/ldconfig.h
|
|
||||||
@@ -36,6 +36,7 @@
|
|
||||||
#define FLAG_X8664_LIBX32 0x0800
|
|
||||||
#define FLAG_ARM_LIBHF 0x0900
|
|
||||||
#define FLAG_AARCH64_LIB64 0x0a00
|
|
||||||
+#define FLAG_ARM_LIBSF 0x0b00
|
|
||||||
|
|
||||||
/* Name of auxiliary cache. */
|
|
||||||
#define _PATH_LDCONFIG_AUX_CACHE "/var/cache/ldconfig/aux-cache"
|
|
||||||
diff --git a/ports/sysdeps/unix/sysv/linux/arm/dl-cache.h b/ports/sysdeps/unix/sysv/linux/arm/dl-cache.h
|
|
||||||
index acc4f28..1221181 100644
|
|
||||||
--- ports/sysdeps/unix/sysv/linux/arm/dl-cache.h
|
|
||||||
+++ ports/sysdeps/unix/sysv/linux/arm/dl-cache.h
|
|
||||||
@@ -18,12 +18,17 @@
|
|
||||||
|
|
||||||
#include <ldconfig.h>
|
|
||||||
|
|
||||||
+/* In order to support the transition from unmarked objects
|
|
||||||
+ to marked objects we must treat unmarked objects as
|
|
||||||
+ compatible with either FLAG_ARM_LIBHF or FLAG_ARM_LIBSF. */
|
|
||||||
#ifdef __ARM_PCS_VFP
|
|
||||||
# define _dl_cache_check_flags(flags) \
|
|
||||||
- ((flags) == (FLAG_ARM_LIBHF | FLAG_ELF_LIBC6))
|
|
||||||
+ ((flags) == (FLAG_ARM_LIBHF | FLAG_ELF_LIBC6) \
|
|
||||||
+ || (flags) == FLAG_ELF_LIBC6)
|
|
||||||
#else
|
|
||||||
# define _dl_cache_check_flags(flags) \
|
|
||||||
- ((flags) == FLAG_ELF_LIBC6)
|
|
||||||
+ ((flags) == (FLAG_ARM_LIBSF | FLAG_ELF_LIBC6) \
|
|
||||||
+ || (flags) == FLAG_ELF_LIBC6)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include_next <dl-cache.h>
|
|
||||||
diff --git a/ports/sysdeps/unix/sysv/linux/arm/readelflib.c b/ports/sysdeps/unix/sysv/linux/arm/readelflib.c
|
|
||||||
index 81e5ccb..0fbd0dc 100644
|
|
||||||
--- ports/sysdeps/unix/sysv/linux/arm/readelflib.c
|
|
||||||
+++ ports/sysdeps/unix/sysv/linux/arm/readelflib.c
|
|
||||||
@@ -46,6 +46,12 @@ process_elf_file (const char *file_name, const char *lib, int *flag,
|
|
||||||
if (elf32_header->e_flags & EF_ARM_ABI_FLOAT_HARD)
|
|
||||||
*flag = FLAG_ARM_LIBHF|FLAG_ELF_LIBC6;
|
|
||||||
else if (elf32_header->e_flags & EF_ARM_ABI_FLOAT_SOFT)
|
|
||||||
+ *flag = FLAG_ARM_LIBSF|FLAG_ELF_LIBC6;
|
|
||||||
+ else
|
|
||||||
+ /* We must assume the unmarked objects are compatible
|
|
||||||
+ with all ABI variants. Such objects may have been
|
|
||||||
+ generated in a transitional period when the ABI
|
|
||||||
+ tags were not added to all objects. */
|
|
||||||
*flag = FLAG_ELF_LIBC6;
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,16 +1,15 @@
|
||||||
# Template file for 'glibc'
|
# Template file for 'glibc'
|
||||||
pkgname=glibc
|
pkgname=glibc
|
||||||
version=2.17
|
version=2.18
|
||||||
revision=8
|
revision=1
|
||||||
short_desc="The GNU C library"
|
short_desc="The GNU C library"
|
||||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||||
homepage="http://www.gnu.org/software/libc"
|
homepage="http://www.gnu.org/software/libc"
|
||||||
license="GPL-2, LGPL-2.1, BSD"
|
license="GPL-2, LGPL-2.1, BSD"
|
||||||
distfiles="http://ftp.gnu.org/gnu/glibc/glibc-${version}.tar.xz"
|
distfiles="http://ftp.gnu.org/gnu/glibc/glibc-${version}.tar.xz"
|
||||||
checksum=6914e337401e0e0ade23694e1b2c52a5f09e4eda3270c67e7c3ba93a89b5b23e
|
checksum=2cb4e1e381928f1e5e55e71ab1ba8e0ea7ede75ff9709770435bfd018ea257a3
|
||||||
|
|
||||||
hostmakedepends="bison perl kernel-libc-headers>=3.7<3.8"
|
|
||||||
|
|
||||||
|
hostmakedepends="bison perl"
|
||||||
# Force creation of -dbg pkg, required by valgrind.
|
# Force creation of -dbg pkg, required by valgrind.
|
||||||
force_debug_pkgs=yes
|
force_debug_pkgs=yes
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue