lkml.org 
[lkml]   [2015]   [May]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 3/3] CRIS: UAPI: fix elf.h export
Date
CRIS userspace (uClibc for one) expects asm/elf.h to be exported but
this header appears to have gone missing at some point. Move it to
uapi/ and export it.

Signed-off-by: Rabin Vincent <rabin@rab.in>
---
arch/cris/include/uapi/asm/Kbuild | 3 +++
arch/cris/include/{ => uapi}/asm/elf.h | 6 +++++-
arch/cris/include/{arch-v10/arch/elf.h => uapi/asm/elf_v10.h} | 0
arch/cris/include/{arch-v32/arch/elf.h => uapi/asm/elf_v32.h} | 0
4 files changed, 8 insertions(+), 1 deletion(-)
rename arch/cris/include/{ => uapi}/asm/elf.h (97%)
rename arch/cris/include/{arch-v10/arch/elf.h => uapi/asm/elf_v10.h} (100%)
rename arch/cris/include/{arch-v32/arch/elf.h => uapi/asm/elf_v32.h} (100%)

diff --git a/arch/cris/include/uapi/asm/Kbuild b/arch/cris/include/uapi/asm/Kbuild
index 8443dc8..d5564a0 100644
--- a/arch/cris/include/uapi/asm/Kbuild
+++ b/arch/cris/include/uapi/asm/Kbuild
@@ -6,6 +6,9 @@ header-y += ../arch-v32/arch/
header-y += auxvec.h
header-y += bitsperlong.h
header-y += byteorder.h
+header-y += elf.h
+header-y += elf_v10.h
+header-y += elf_v32.h
header-y += errno.h
header-y += ethernet.h
header-y += etraxgpio.h
diff --git a/arch/cris/include/asm/elf.h b/arch/cris/include/uapi/asm/elf.h
similarity index 97%
rename from arch/cris/include/asm/elf.h
rename to arch/cris/include/uapi/asm/elf.h
index 986adba..a5df05b 100644
--- a/arch/cris/include/asm/elf.h
+++ b/arch/cris/include/uapi/asm/elf.h
@@ -5,7 +5,11 @@
* ELF register definitions..
*/

-#include <arch/elf.h>
+#ifdef __arch_v32
+#include <asm/elf_v32.h>
+#else
+#include <asm/elf_v10.h>
+#endif

#define R_CRIS_NONE 0
#define R_CRIS_8 1
diff --git a/arch/cris/include/arch-v10/arch/elf.h b/arch/cris/include/uapi/asm/elf_v10.h
similarity index 100%
rename from arch/cris/include/arch-v10/arch/elf.h
rename to arch/cris/include/uapi/asm/elf_v10.h
diff --git a/arch/cris/include/arch-v32/arch/elf.h b/arch/cris/include/uapi/asm/elf_v32.h
similarity index 100%
rename from arch/cris/include/arch-v32/arch/elf.h
rename to arch/cris/include/uapi/asm/elf_v32.h
--
2.1.4


\
 
 \ /
  Last update: 2015-05-14 18:01    [W:0.062 / U:1.072 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site