Skip to contentSkip to conversation

next: openrisc: Fix build

PATCH In review Guenter Roeck 4 participants 7 messages Sep 26, 2014 – Sep 27, 2014

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 next: openrisc: Fix build

openrisc:defconfig fails to build in next-20140926 with the following error.

In file included from arch/openrisc/kernel/signal.c:31:0:
./arch/openrisc/include/asm/syscall.h: In function 'syscall_get_arch':
./arch/openrisc/include/asm/syscall.h:77:9: error: 'EM_OPENRISC' undeclared

Fix by moving EM_OPENRISC to include/uapi/linux/elf-em.h.

Fixes ce5d112827e5 ("ARCH: AUDIT: implement syscall_get_arch for all arches")
Cc Eric Paris <[email protected]>
Cc Stefan Kristiansson <[email protected]>
Cc Geert Uytterhoeven <[email protected]>
Cc Stephen Rothwell <[email protected]>

---
v2: Only move EM_OPENRISC.

Another possible solution for the problem would be to include asm/elf.h in arch/openrisc/kernel/signal.c. I had actually submitted a patch with that fix back in August (maybe that is where I remembered the problem from). Wonder what happened with that patch.

Would it make sense to drop EM_OR32 and replace it with EM_OPENRISC where it is used ? binutils seems to suggest that EM_OPENRISC is the "official" definition.

 arch/openrisc/include/uapi/asm/elf.h | 3 +--
 include/uapi/linux/elf-em.h          | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/openrisc/include/uapi/asm/elf.h +1 -2
index f02ea58..8884276 100644
@@ -55,9 +55,8 @@ typedef elf_greg_t elf_gregset_t[ELF_NGREG];
 /* A placeholder; OR32 does not have fp support yes, so no fp regs for now.  */
 typedef unsigned long elf_fpregset_t;
 
-/* This should be moved to include/linux/elf.h */
+/* EM_OPENRISC is defined in linux/elf-em.h */
 #define EM_OR32         0x8472
-#define EM_OPENRISC     92     /* OpenRISC 32-bit embedded processor */
 
 /*
  * These are used to set parameters in the core dumps.
include/uapi/linux/elf-em.h +1 -0
index 01529bd..aa90bc9 100644
@@ -32,6 +32,7 @@
 #define EM_V850		87	/* NEC v850 */
 #define EM_M32R		88	/* Renesas M32R */
 #define EM_MN10300	89	/* Panasonic/MEI MN10300, AM33 */
+#define EM_OPENRISC     92     /* OpenRISC 32-bit embedded processor */
 #define EM_BLACKFIN     106     /* ADI Blackfin Processor */
 #define EM_TI_C6000	140	/* TI C6X DSPs */
 #define EM_AARCH64	183	/* ARM 64 bit */
Signature · 1 line
1.9.1
maintainer
#1 lore raw
Quoted 17 lines · Guenter Roeck

openrisc:defconfig fails to build in next-20140926 with the following error.

In file included from arch/openrisc/kernel/signal.c:31:0:
./arch/openrisc/include/asm/syscall.h: In function 'syscall_get_arch':
./arch/openrisc/include/asm/syscall.h:77:9: error: 'EM_OPENRISC' undeclared

Fix by moving EM_OPENRISC to include/uapi/linux/elf-em.h.

Fixes ce5d112827e5 ("ARCH: AUDIT: implement syscall_get_arch for all arches")
Cc Eric Paris <[email protected]>
Cc Stefan Kristiansson <[email protected]>
Cc Geert Uytterhoeven <[email protected]>
Cc Stephen Rothwell <[email protected]>

---
v2: Only move EM_OPENRISC.

Quoted 8 lines

Another possible solution for the problem would be to include asm/elf.h in arch/openrisc/kernel/signal.c. I had actually submitted a patch with that fix back in August (maybe that is where I remembered the problem from). Wonder what happened with that patch.

Would it make sense to drop EM_OR32 and replace it with EM_OPENRISC where it is used ? binutils seems to suggest that EM_OPENRISC is the "official" definition.

Do we even use EM_OR32? Will the kernel build with the old toolchain if we drop it? If yes, drop it altogether... I don't recall the details as to why we kept that define around at all. And really, why bother supporting the old toolchain at all... it's been at least two or three years since EM_OPENRISC was added, hopefully people have moved on. If users want to upgrade their kernel, they can update the toolchain, too, at this point.

/Jonas

Quoted 32 lines
 arch/openrisc/include/uapi/asm/elf.h | 3 +--
 include/uapi/linux/elf-em.h          | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/openrisc/include/uapi/asm/elf.h +1 -2
index f02ea58..8884276 100644
@@ -55,9 +55,8 @@ typedef elf_greg_t elf_gregset_t[ELF_NGREG];
 /* A placeholder; OR32 does not have fp support yes, so no fp regs for now.  */
 typedef unsigned long elf_fpregset_t;
 
-/* This should be moved to include/linux/elf.h */
+/* EM_OPENRISC is defined in linux/elf-em.h */
 #define EM_OR32         0x8472
-#define EM_OPENRISC     92     /* OpenRISC 32-bit embedded processor */
 
 /*
  * These are used to set parameters in the core dumps.
include/uapi/linux/elf-em.h +1 -0
index 01529bd..aa90bc9 100644
@@ -32,6 +32,7 @@
 #define EM_V850		87	/* NEC v850 */
 #define EM_M32R		88	/* Renesas M32R */
 #define EM_MN10300	89	/* Panasonic/MEI MN10300, AM33 */
+#define EM_OPENRISC     92     /* OpenRISC 32-bit embedded processor */
 #define EM_BLACKFIN     106     /* ADI Blackfin Processor */
 #define EM_TI_C6000	140	/* TI C6X DSPs */
 #define EM_AARCH64	183	/* ARM 64 bit */
#2 lore raw
Quoted 27 lines · Jonas Bonn
Quoted 17 lines · Guenter Roeck

openrisc:defconfig fails to build in next-20140926 with the following error.

In file included from arch/openrisc/kernel/signal.c:31:0:
./arch/openrisc/include/asm/syscall.h: In function 'syscall_get_arch':
./arch/openrisc/include/asm/syscall.h:77:9: error: 'EM_OPENRISC' undeclared

Fix by moving EM_OPENRISC to include/uapi/linux/elf-em.h.

Fixes ce5d112827e5 ("ARCH: AUDIT: implement syscall_get_arch for all arches")
Cc Eric Paris <[email protected]>
Cc Stefan Kristiansson <[email protected]>
Cc Geert Uytterhoeven <[email protected]>
Cc Stephen Rothwell <[email protected]>

---
v2: Only move EM_OPENRISC.

Quoted 8 lines

Another possible solution for the problem would be to include asm/elf.h in arch/openrisc/kernel/signal.c. I had actually submitted a patch with that fix back in August (maybe that is where I remembered the problem from). Wonder what happened with that patch.

Would it make sense to drop EM_OR32 and replace it with EM_OPENRISC where it is used ? binutils seems to suggest that EM_OPENRISC is the "official" definition.

Quoted 8 lines

Do we even use EM_OR32? Will the kernel build with the old toolchain if we drop it? If yes, drop it altogether... I don't recall the details as to why we kept that define around at all. And really, why bother supporting the old toolchain at all... it's been at least two or three years since EM_OPENRISC was added, hopefully people have moved on. If users want to upgrade their kernel, they can update the toolchain, too, at this point.

EM_OR32 is used to define ELF_ARCH, which per its comment is used in core dumps. No idea if that is important/relevant. You tell me ;-).

The kernel builds with both the old (or32) and new (or1k) toolchain after removing EM_OR32 and defining ELF_ARCH as EM_OPENRISC. I can not test the kernel built with the or32 toolchain, but qemu is happy with the image built using the or1k toolchain.

I'll be happy to submit a patch to remove EM_OR32 if it is not needed anymore.

Thanks,
Guenter

#3 lore raw
In reply to Jonas Bonn
Quoted 27 lines · Jonas Bonn
Quoted 17 lines · Guenter Roeck

openrisc:defconfig fails to build in next-20140926 with the following error.

In file included from arch/openrisc/kernel/signal.c:31:0:
./arch/openrisc/include/asm/syscall.h: In function 'syscall_get_arch':
./arch/openrisc/include/asm/syscall.h:77:9: error: 'EM_OPENRISC' undeclared

Fix by moving EM_OPENRISC to include/uapi/linux/elf-em.h.

Fixes ce5d112827e5 ("ARCH: AUDIT: implement syscall_get_arch for all arches")
Cc Eric Paris <[email protected]>
Cc Stefan Kristiansson <[email protected]>
Cc Geert Uytterhoeven <[email protected]>
Cc Stephen Rothwell <[email protected]>

---
v2: Only move EM_OPENRISC.

Quoted 8 lines

Another possible solution for the problem would be to include asm/elf.h in arch/openrisc/kernel/signal.c. I had actually submitted a patch with that fix back in August (maybe that is where I remembered the problem from). Wonder what happened with that patch.

Would it make sense to drop EM_OR32 and replace it with EM_OPENRISC where it is used ? binutils seems to suggest that EM_OPENRISC is the "official" definition.

Quoted 8 lines

Do we even use EM_OR32? Will the kernel build with the old toolchain if we drop it? If yes, drop it altogether... I don't recall the details as to why we kept that define around at all. And really, why bother supporting the old toolchain at all... it's been at least two or three years since EM_OPENRISC was added, hopefully people have moved on. If users want to upgrade their kernel, they can update the toolchain, too, at this point.

EM_OPENRISC was added about ten years ago, and when the OR32 things in binutils was removed in favour for OR1K earlier this year,
EM_OR1K was added as an alias to EM_OPENRISC.

With that said, I'm putting in a vote for removing EM_OR32 as well.

Stefan

#4 lore raw
In reply to Guenter Roeck

Would you like me to carry this in the audit tree, since I'm the one who broke it?

-Eric

Quoted 57 lines · Guenter Roeck

openrisc:defconfig fails to build in next-20140926 with the following error.

In file included from arch/openrisc/kernel/signal.c:31:0:
./arch/openrisc/include/asm/syscall.h: In function 'syscall_get_arch':
./arch/openrisc/include/asm/syscall.h:77:9: error: 'EM_OPENRISC' undeclared

Fix by moving EM_OPENRISC to include/uapi/linux/elf-em.h.

Fixes ce5d112827e5 ("ARCH: AUDIT: implement syscall_get_arch for all arches")
Cc Eric Paris <[email protected]>
Cc Stefan Kristiansson <[email protected]>
Cc Geert Uytterhoeven <[email protected]>
Cc Stephen Rothwell <[email protected]>

---
v2: Only move EM_OPENRISC.

Another possible solution for the problem would be to include asm/elf.h in arch/openrisc/kernel/signal.c. I had actually submitted a patch with that fix back in August (maybe that is where I remembered the problem from). Wonder what happened with that patch.

Would it make sense to drop EM_OR32 and replace it with EM_OPENRISC where it is used ? binutils seems to suggest that EM_OPENRISC is the "official" definition.

 arch/openrisc/include/uapi/asm/elf.h | 3 +--
 include/uapi/linux/elf-em.h          | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/openrisc/include/uapi/asm/elf.h +1 -2
index f02ea58..8884276 100644
@@ -55,9 +55,8 @@ typedef elf_greg_t elf_gregset_t[ELF_NGREG];
 /* A placeholder; OR32 does not have fp support yes, so no fp regs for now.  */
 typedef unsigned long elf_fpregset_t;
 
-/* This should be moved to include/linux/elf.h */
+/* EM_OPENRISC is defined in linux/elf-em.h */
 #define EM_OR32         0x8472
-#define EM_OPENRISC     92     /* OpenRISC 32-bit embedded processor */
 
 /*
  * These are used to set parameters in the core dumps.
include/uapi/linux/elf-em.h +1 -0
index 01529bd..aa90bc9 100644
@@ -32,6 +32,7 @@
 #define EM_V850		87	/* NEC v850 */
 #define EM_M32R		88	/* Renesas M32R */
 #define EM_MN10300	89	/* Panasonic/MEI MN10300, AM33 */
+#define EM_OPENRISC     92     /* OpenRISC 32-bit embedded processor */
 #define EM_BLACKFIN     106     /* ADI Blackfin Processor */
 #define EM_TI_C6000	140	/* TI C6X DSPs */
 #define EM_AARCH64	183	/* ARM 64 bit */
#5 lore raw
Quoted 3 lines · Eric Paris

Would you like me to carry this in the audit tree, since I'm the one who broke it?

Hi Eric,

guess you are asking Jonas, but it would make sense to me.

Guenter

Quoted 62 lines

-Eric

Quoted 57 lines · Guenter Roeck

openrisc:defconfig fails to build in next-20140926 with the following error.

In file included from arch/openrisc/kernel/signal.c:31:0:
./arch/openrisc/include/asm/syscall.h: In function 'syscall_get_arch':
./arch/openrisc/include/asm/syscall.h:77:9: error: 'EM_OPENRISC' undeclared

Fix by moving EM_OPENRISC to include/uapi/linux/elf-em.h.

Fixes ce5d112827e5 ("ARCH: AUDIT: implement syscall_get_arch for all arches")
Cc Eric Paris <[email protected]>
Cc Stefan Kristiansson <[email protected]>
Cc Geert Uytterhoeven <[email protected]>
Cc Stephen Rothwell <[email protected]>

---
v2: Only move EM_OPENRISC.

Another possible solution for the problem would be to include asm/elf.h in arch/openrisc/kernel/signal.c. I had actually submitted a patch with that fix back in August (maybe that is where I remembered the problem from). Wonder what happened with that patch.

Would it make sense to drop EM_OR32 and replace it with EM_OPENRISC where it is used ? binutils seems to suggest that EM_OPENRISC is the "official" definition.

 arch/openrisc/include/uapi/asm/elf.h | 3 +--
 include/uapi/linux/elf-em.h          | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/openrisc/include/uapi/asm/elf.h +1 -2
index f02ea58..8884276 100644
@@ -55,9 +55,8 @@ typedef elf_greg_t elf_gregset_t[ELF_NGREG];
 /* A placeholder; OR32 does not have fp support yes, so no fp regs for now.  */
 typedef unsigned long elf_fpregset_t;
 
-/* This should be moved to include/linux/elf.h */
+/* EM_OPENRISC is defined in linux/elf-em.h */
 #define EM_OR32         0x8472
-#define EM_OPENRISC     92     /* OpenRISC 32-bit embedded processor */
 
 /*
  * These are used to set parameters in the core dumps.
include/uapi/linux/elf-em.h +1 -0
index 01529bd..aa90bc9 100644
@@ -32,6 +32,7 @@
 #define EM_V850		87	/* NEC v850 */
 #define EM_M32R		88	/* Renesas M32R */
 #define EM_MN10300	89	/* Panasonic/MEI MN10300, AM33 */
+#define EM_OPENRISC     92     /* OpenRISC 32-bit embedded processor */
 #define EM_BLACKFIN     106     /* ADI Blackfin Processor */
 #define EM_TI_C6000	140	/* TI C6X DSPs */
 #define EM_AARCH64	183	/* ARM 64 bit */
maintainer
#6 lore raw
Signature · 2 lines
-- 
Sent from my Android phone with K-9 Mail. Please excuse my brevity.
Quoted 8 lines · Guenter Roeck
Quoted 1 line · Eric Paris

Would you like me to carry this in the audit tree, since I'm the one

who

Quoted 2 lines

broke it?

Hi Eric,

guess you are asking Jonas, but it would make sense to me.

Hi Eric,
Yes, please take this via the audit tree.
/Jonas

Quoted 79 lines

Guenter

Quoted 4 lines

-Eric

Quoted 1 line · Guenter Roeck

openrisc:defconfig fails to build in next-20140926 with the

following error.

Quoted 3 lines
Quoted 3 lines

In file included from arch/openrisc/kernel/signal.c:31:0:
./arch/openrisc/include/asm/syscall.h: In function

'syscall_get_arch':

Quoted 1 line
Quoted 1 line

./arch/openrisc/include/asm/syscall.h:77:9: error: 'EM_OPENRISC'

undeclared

Quoted 4 lines
Quoted 4 lines

Fix by moving EM_OPENRISC to include/uapi/linux/elf-em.h.

Fixes ce5d112827e5 ("ARCH: AUDIT: implement syscall_get_arch for

all arches")

Quoted 9 lines
Quoted 9 lines
Cc Eric Paris <[email protected]>
Cc Stefan Kristiansson <[email protected]>
Cc Geert Uytterhoeven <[email protected]>
Cc Stephen Rothwell <[email protected]>

---
v2: Only move EM_OPENRISC.

Another possible solution for the problem would be to include

asm/elf.h

Quoted 1 line
Quoted 1 line

in arch/openrisc/kernel/signal.c. I had actually submitted a patch

with

Quoted 1 line
Quoted 1 line

that fix back in August (maybe that is where I remembered the

problem from).

Quoted 3 lines
Quoted 3 lines

Wonder what happened with that patch.

Would it make sense to drop EM_OR32 and replace it with EM_OPENRISC

where

Quoted 1 line
Quoted 1 line

it is used ? binutils seems to suggest that EM_OPENRISC is the

"official"

Quoted 7 lines

Review

Quoted 7 lines

definition.

 arch/openrisc/include/uapi/asm/elf.h | 3 +--
 include/uapi/linux/elf-em.h          | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)
(quoted diff) +0 -0

b/arch/openrisc/include/uapi/asm/elf.h

Quoted 5 lines

arch/openrisc/include/uapi/asm/elf.h typedef elf_greg_t elf_gregset_t[ELF_NGREG]; · line 55

Quoted 5 lines

index f02ea58..8884276 100644

arch/openrisc/include/uapi/asm/elf.h +0 -0
@@ -55,9 +55,8 @@ typedef elf_greg_t elf_gregset_t[ELF_NGREG];
 /* A placeholder; OR32 does not have fp support yes, so no fp regs

for now. */

Quoted 6 lines

arch/openrisc/include/uapi/asm/elf.h typedef elf_greg_t elf_gregset_t[ELF_NGREG];

Quoted 6 lines
arch/openrisc/include/uapi/asm/elf.h +1 -2
 typedef unsigned long elf_fpregset_t;
 
-/* This should be moved to include/linux/elf.h */
+/* EM_OPENRISC is defined in linux/elf-em.h */
 #define EM_OR32         0x8472
-#define EM_OPENRISC     92     /* OpenRISC 32-bit embedded

processor */

Quoted 4 lines

Review

Quoted 4 lines
arch/openrisc/include/uapi/asm/elf.h +0 -0
 /*
  * These are used to set parameters in the core dumps.
(quoted diff) +0 -0

b/include/uapi/linux/elf-em.h

Quoted 8 lines

include/uapi/linux/elf-em.h line 35

Quoted 8 lines

index 01529bd..aa90bc9 100644

include/uapi/linux/elf-em.h +1 -0
@@ -32,6 +32,7 @@
 #define EM_V850		87	/* NEC v850 */
 #define EM_M32R		88	/* Renesas M32R */
 #define EM_MN10300	89	/* Panasonic/MEI MN10300, AM33 */
+#define EM_OPENRISC     92     /* OpenRISC 32-bit embedded

processor */

Quoted 5 lines
Quoted 3 lines
include/uapi/linux/elf-em.h +0 -0
 #define EM_BLACKFIN     106     /* ADI Blackfin Processor */
 #define EM_TI_C6000	140	/* TI C6X DSPs */
 #define EM_AARCH64	183	/* ARM 64 bit */