From 5d4eb092db7623f3d4394670846bfc233c8e567d Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Mon, 8 Apr 2002 15:22:58 +0000 Subject: [PATCH] Merge. --- ChangeLog | 4 ++++ elf/cache.c | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a826cfd57f0..a1945886850 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2002-04-08 Andreas Jaeger + * elf/cache.c (print_entry): Support x86-64. + + * sysdeps/unix/sysv/linux/x86_64/ldd-rewrite.sed: Fix rewrite rule. + * sysdeps/x86_64/fpu/s_llrint.S: New. * sysdeps/x86_64/fpu/s_llrintf.S: New. * sysdeps/x86_64/fpu/s_llrintl.S: New. diff --git a/elf/cache.c b/elf/cache.c index 36c36886e2c..015faf2edb4 100644 --- a/elf/cache.c +++ b/elf/cache.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc. +/* Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Andreas Jaeger , 1999. @@ -79,6 +79,11 @@ print_entry (const char *lib, int flag, unsigned int osversion, case FLAG_IA64_LIB64: fputs (",IA-64", stdout); #endif +#if defined __x86_64__ || defined __i386__ + case FLAG_X8664_LIB64: + fputs (",x86-64", stdout); + break; +#endif #if defined __s390__ || defined __s390x__ case FLAG_S390_LIB64: fputs(",64bit", stdout); -- 2.47.2