Attachment #346650 for bug #454200

View | Details | Raw Unified | Return to bug 454200
Collapse All | Expand All

Lines 100-105 print_entry (const char *lib, int flag, unsigned int osversion, Link Here

(-)a/elf/cache.c (+4 lines)
100	case FLAG_AARCH64_LIB64:	100	case FLAG_AARCH64_LIB64:
101	fputs (",AArch64", stdout);	101	fputs (",AArch64", stdout);
102	break;	102	break;
		103	/* Uses the ARM soft-float ABI. */
		104	case FLAG_ARM_LIBSF:
		105	fputs (",soft-float", stdout);
		106	break;
103	case 0:	107	case 0:
104	break;	108	break;
105	default:	109	default:

Lines 18-29 Link Here

(-)a/ports/sysdeps/unix/sysv/linux/arm/dl-cache.h (-2 / +7 lines)
18		18
19	#include <ldconfig.h>	19	#include <ldconfig.h>
20		20
		21	/* In order to support the transition from unmarked objects
		22	to marked objects we must treat unmarked objects as
		23	compatible with either FLAG_ARM_LIBHF or FLAG_ARM_LIBSF. */
21	#ifdef __ARM_PCS_VFP	24	#ifdef __ARM_PCS_VFP
22	# define _dl_cache_check_flags(flags) \	25	# define _dl_cache_check_flags(flags) \
23	((flags) == (FLAG_ARM_LIBHF \| FLAG_ELF_LIBC6))	26	((flags) == (FLAG_ARM_LIBHF \| FLAG_ELF_LIBC6) \
		27	\|\| (flags) == FLAG_ELF_LIBC6)
24	#else	28	#else
25	# define _dl_cache_check_flags(flags) \	29	# define _dl_cache_check_flags(flags) \
26	((flags) == FLAG_ELF_LIBC6)	30	((flags) == (FLAG_ARM_LIBSF \| FLAG_ELF_LIBC6) \
		31	\|\| (flags) == FLAG_ELF_LIBC6)
27	#endif	32	#endif
28		33
29	#include_next <dl-cache.h>	34	#include_next <dl-cache.h>

Lines 46-51 process_elf_file (const char file_name, const char lib, int *flag, Link Here

(-)a/ports/sysdeps/unix/sysv/linux/arm/readelflib.c (+6 lines)
46	if (elf32_header->e_flags & EF_ARM_ABI_FLOAT_HARD)	46	if (elf32_header->e_flags & EF_ARM_ABI_FLOAT_HARD)
47	*flag = FLAG_ARM_LIBHF\|FLAG_ELF_LIBC6;	47	*flag = FLAG_ARM_LIBHF\|FLAG_ELF_LIBC6;
48	else if (elf32_header->e_flags & EF_ARM_ABI_FLOAT_SOFT)	48	else if (elf32_header->e_flags & EF_ARM_ABI_FLOAT_SOFT)
		49	*flag = FLAG_ARM_LIBSF\|FLAG_ELF_LIBC6;
		50	else
		51	/* We must assume the unmarked objects are compatible
		52	with all ABI variants. Such objects may have been
		53	generated in a transitional period when the ABI
		54	tags were not added to all objects. */
49	*flag = FLAG_ELF_LIBC6;	55	*flag = FLAG_ELF_LIBC6;
50	}	56	}
51	}	57	}

Lines 36-41 Link Here

(-)a/sysdeps/generic/ldconfig.h (-1 / +1 lines)
36	#define FLAG_X8664_LIBX32 0x0800	36	#define FLAG_X8664_LIBX32 0x0800
37	#define FLAG_ARM_LIBHF 0x0900	37	#define FLAG_ARM_LIBHF 0x0900
38	#define FLAG_AARCH64_LIB64 0x0a00	38	#define FLAG_AARCH64_LIB64 0x0a00
		39	#define FLAG_ARM_LIBSF 0x0b00
39		40
40	/* Name of auxiliary cache. */	41	/* Name of auxiliary cache. */
41	#define _PATH_LDCONFIG_AUX_CACHE "/var/cache/ldconfig/aux-cache"	42	#define _PATH_LDCONFIG_AUX_CACHE "/var/cache/ldconfig/aux-cache"
42	-

Return to bug 454200