summary refs log tree commit diff
diff options
context:
space:
mode:
authorPalmer Dabbelt <palmer@dabbelt.com>2018-01-13 01:59:12 -0800
committerPalmer Dabbelt <palmer@dabbelt.com>2018-01-25 10:06:19 -0800
commitfb58aac5fe5d6198b84ce43e7c53b2830b1b332c (patch)
treec03dcc059c0aca4e2e44a7d079711661ada382bb
parent128c43a2d6308668032b285ca08228bebf26e74e (diff)
downloadglibc-fb58aac5fe5d6198b84ce43e7c53b2830b1b332c.tar.gz
glibc-fb58aac5fe5d6198b84ce43e7c53b2830b1b332c.tar.xz
glibc-fb58aac5fe5d6198b84ce43e7c53b2830b1b332c.zip
Add support for the RISC-V-specific ELF flags
The RISC-V port defines ELF flags that enforce compatibility between
various objects.  This adds the shared support necessary for these
flags.

2018-01-25  Palmer Dabbelt  <palmer@sifive.com>

        * elf/cache.c (print_entry): Add FLAG_RISCV_FLOAT_ABI_SOFT and
        FLAG_RISCV_FLOAT_ABI_DOUBLE.
        * elf/elf.h (EF_RISCV_RVC): New define.
        (EF_RISCV_FLOAT_ABI): Likewise.
        (EF_RISCV_FLOAT_ABI_SOFT): Likewise.
        (EF_RISCV_FLOAT_ABI_SINGLE): Likewise.
        (EF_RISCV_FLOAT_ABI_DOUBLE): Likewise.
        (EF_RISCV_FLOAT_ABI_QUAD): Likewise.
        * sysdeps/generic/ldconfig.h (FLAG_RISCV_FLOAT_ABI_SOFT): New
        define.
        (FLAG_RISCV_FLOAT_ABI_DOUBLE): Likewise.
-rw-r--r--ChangeLog14
-rw-r--r--elf/cache.c6
-rw-r--r--elf/elf.h8
-rw-r--r--sysdeps/generic/ldconfig.h2
4 files changed, 30 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 67131c816b..76abf5326a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2018-01-25  Palmer Dabbelt  <palmer@sifive.com>
+
+	* elf/cache.c (print_entry): Add FLAG_RISCV_FLOAT_ABI_SOFT and
+	FLAG_RISCV_FLOAT_ABI_DOUBLE.
+	* elf/elf.h (EF_RISCV_RVC): New define.
+	(EF_RISCV_FLOAT_ABI): Likewise.
+	(EF_RISCV_FLOAT_ABI_SOFT): Likewise.
+	(EF_RISCV_FLOAT_ABI_SINGLE): Likewise.
+	(EF_RISCV_FLOAT_ABI_DOUBLE): Likewise.
+	(EF_RISCV_FLOAT_ABI_QUAD): Likewise.
+	* sysdeps/generic/ldconfig.h (FLAG_RISCV_FLOAT_ABI_SOFT): New
+	define.
+	(FLAG_RISCV_FLOAT_ABI_DOUBLE): Likewise.
+
 2018-01-25  Andreas Schwab  <schwab@suse.de>
 
 	* aclocal.m4 (LIBC_SLIBDIR_RTLDDIR): Consistently put arguments in
diff --git a/elf/cache.c b/elf/cache.c
index 1ec6ab36e7..c2c010f97b 100644
--- a/elf/cache.c
+++ b/elf/cache.c
@@ -114,6 +114,12 @@ print_entry (const char *lib, int flag, unsigned int osversion,
     case FLAG_MIPS64_LIBN64_NAN2008:
       fputs (",64bit,nan2008", stdout);
       break;
+    case FLAG_RISCV_FLOAT_ABI_SOFT:
+      fputs (",soft-float", stdout);
+      break;
+    case FLAG_RISCV_FLOAT_ABI_DOUBLE:
+      fputs (",double-float", stdout);
+      break;
     case 0:
       break;
     default:
diff --git a/elf/elf.h b/elf/elf.h
index 66af3dc0ea..954f3266f7 100644
--- a/elf/elf.h
+++ b/elf/elf.h
@@ -3766,6 +3766,14 @@ enum
 
 #define R_TILEGX_NUM		130
 
+/* RISC-V ELF Flags */
+#define EF_RISCV_RVC 			0x0001
+#define EF_RISCV_FLOAT_ABI 		0x0006
+#define EF_RISCV_FLOAT_ABI_SOFT 	0x0000
+#define EF_RISCV_FLOAT_ABI_SINGLE 	0x0002
+#define EF_RISCV_FLOAT_ABI_DOUBLE 	0x0004
+#define EF_RISCV_FLOAT_ABI_QUAD 	0x0006
+
 /* RISC-V relocations.  */
 #define R_RISCV_NONE          0
 #define R_RISCV_32            1
diff --git a/sysdeps/generic/ldconfig.h b/sysdeps/generic/ldconfig.h
index 74eb92e528..59e20dc3ef 100644
--- a/sysdeps/generic/ldconfig.h
+++ b/sysdeps/generic/ldconfig.h
@@ -42,6 +42,8 @@
 #define FLAG_MIPS_LIB32_NAN2008		0x0c00
 #define FLAG_MIPS64_LIBN32_NAN2008	0x0d00
 #define FLAG_MIPS64_LIBN64_NAN2008	0x0e00
+#define FLAG_RISCV_FLOAT_ABI_SOFT	0x0f00
+#define FLAG_RISCV_FLOAT_ABI_DOUBLE	0x1000
 
 /* Name of auxiliary cache.  */
 #define _PATH_LDCONFIG_AUX_CACHE "/var/cache/ldconfig/aux-cache"