about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSteve McIntyre <steve.mcintyre@linaro.org>2012-11-19 01:12:53 -0500
committerCarlos O'Donell <carlos@systemhalted.org>2012-11-19 01:12:53 -0500
commit6665d4a25da6dc1788010466f6f52e1df94a048b (patch)
tree726feade78221eaa2216546b08e3120433861402
parent6e63f4ff608820fa9247c1bbafc95dffbcbc0466 (diff)
downloadglibc-6665d4a25da6dc1788010466f6f52e1df94a048b.tar.gz
glibc-6665d4a25da6dc1788010466f6f52e1df94a048b.tar.xz
glibc-6665d4a25da6dc1788010466f6f52e1df94a048b.zip
Add ldconfig cache tag handling for ARM hard-float ABI
	* sysdeps/generic/ldconfig.h (FLAG_ARM_LIBHF): New macro.
	* elf/cache.c (print_entry): Print ",hard-float" for
	FLAG_ARM_LIBHF.

Signed-off-by: Steve McIntyre <steve.mcintyre@linaro.org>
Reviewed-by: Carlos O'Donell <carlos@systemhalted.org>
-rw-r--r--ChangeLog6
-rw-r--r--elf/cache.c5
-rw-r--r--sysdeps/generic/ldconfig.h3
3 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 00fa045a44..f16eab4b54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-11-19  Steve McIntyre  <steve.mcintyre@linaro.org>
+
+	* sysdeps/generic/ldconfig.h (FLAG_ARM_LIBHF): New macro.
+	* elf/cache.c (print_entry): Print ",hard-float" for
+	FLAG_ARM_LIBHF.
+
 2012-11-18  David S. Miller  <davem@davemloft.net>
 
 	With help from Joseph Myers.
diff --git a/elf/cache.c b/elf/cache.c
index db8b9fa2fa..3336babfe6 100644
--- a/elf/cache.c
+++ b/elf/cache.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999-2003,2005,2006,2007,2011 Free Software Foundation, Inc.
+/* Copyright (C) 1999-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Andreas Jaeger <aj@suse.de>, 1999.
 
@@ -94,6 +94,9 @@ print_entry (const char *lib, int flag, unsigned int osversion,
     case FLAG_X8664_LIBX32:
       fputs (",x32", stdout);
       break;
+    case FLAG_ARM_LIBHF:
+      fputs (",hard-float", stdout);
+      break;
     case 0:
       break;
     default:
diff --git a/sysdeps/generic/ldconfig.h b/sysdeps/generic/ldconfig.h
index ef3f4b99cb..a805284d59 100644
--- a/sysdeps/generic/ldconfig.h
+++ b/sysdeps/generic/ldconfig.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999,2000,2002,2003,2007,2012 Free Software Foundation, Inc.
+/* Copyright (C) 1999-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Andreas Jaeger <aj@suse.de>, 1999.
 
@@ -34,6 +34,7 @@
 #define FLAG_MIPS64_LIBN32	0x0600
 #define FLAG_MIPS64_LIBN64	0x0700
 #define FLAG_X8664_LIBX32	0x0800
+#define FLAG_ARM_LIBHF		0x0900
 
 /* Name of auxiliary cache.  */
 #define _PATH_LDCONFIG_AUX_CACHE "/var/cache/ldconfig/aux-cache"