Skip to contentSkip to conversation

ARM: fix compiling error due to debug_info change

PATCH New Bryan Wu 2 participants 3 messages Mar 7, 2011 – Mar 10, 2011 1 message not in the archive Arm (32-bit)

lore
Share & tools
lore

Bryan Wu

author
#0 lore raw

PATCH 1/2 ARM: fix compiling error due to debug_info change

CC [M] crypto/xcbc.o
In file included from /opt/git/ubuntu/roc/natty/fs/binfmt_aout.c:32:
/opt/git/ubuntu/roc/natty/arch/arm/include/asm/a.out-core.h: In function ?aout_dump_thread?:
/opt/git/ubuntu/roc/natty/arch/arm/include/asm/a.out-core.h:35: error: ?struct debug_info? has no member named ?bp? /opt/git/ubuntu/roc/natty/arch/arm/include/asm/a.out-core.h:36: error: ?struct debug_info? has no member named ?bp? /opt/git/ubuntu/roc/natty/arch/arm/include/asm/a.out-core.h:37: error: ?struct debug_info? has no member named ?bp? /opt/git/ubuntu/roc/natty/arch/arm/include/asm/a.out-core.h:38: error: ?struct debug_info? has no member named ?bp? /opt/git/ubuntu/roc/natty/arch/arm/include/asm/a.out-core.h:39: error: ?struct debug_info? has no member named ?nsaved? make[3]: *** [fs/binfmt_aout.o] Error 1
make[2]: *** [fs] Error 2

This bug was introduced by "ARM: 6668/1: ptrace: remove single-step emulation code" from Will Deacon

Cc Will Deacon <[email protected]>
Signed-off-by Bryan Wu <[email protected]>
---
 arch/arm/include/asm/a.out-core.h |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)
arch/arm/include/asm/a.out-core.h +0 -6
index 93d04ac..639f5c8 100644
@@ -32,12 +32,6 @@ static inline void aout_dump_thread(struct pt_regs *regs, struct user *dump)
 	dump->u_dsize = (tsk->mm->brk - tsk->mm->start_data + PAGE_SIZE - 1) >> PAGE_SHIFT;
 	dump->u_ssize = 0;
 
-	dump->u_debugreg[0] = tsk->thread.debug.bp[0].address;
-	dump->u_debugreg[1] = tsk->thread.debug.bp[1].address;
-	dump->u_debugreg[2] = tsk->thread.debug.bp[0].insn.arm;
-	dump->u_debugreg[3] = tsk->thread.debug.bp[1].insn.arm;
-	dump->u_debugreg[4] = tsk->thread.debug.nsaved;
-
 	if (dump->start_stack < 0x04000000)
 		dump->u_ssize = (0x04000000 - dump->start_stack) >> PAGE_SHIFT;
Signature · 1 line
1.7.1
#1 lore raw

PATCH 1/2 ARM: fix compiling error due to debug_info change

Hi Bryan,

Quoted 1 line

Subject: [PATCH 1/2] ARM: fix compiling error due to debug_info change

Is there a patch 2/2 as well? (I only received this one).

Quoted 14 lines

This bug was introduced by "ARM: 6668/1: ptrace: remove single-step emulation code" from Will Deacon

Cc Will Deacon <[email protected]>
Signed-off-by Bryan Wu <[email protected]>
---
 arch/arm/include/asm/a.out-core.h |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)
arch/arm/include/asm/a.out-core.h +0 -0
index 93d04ac..639f5c8 100644
@@ -32,12 +32,6 @@ static inline void aout_dump_thread(struct pt_regs *regs, struct user *dump)
 	dump->u_dsize = (tsk->mm->brk - tsk->mm->start_data + PAGE_SIZE - 1) >> PAGE_SHIFT;

arch/arm/include/asm/a.out-core.h static inline void aout_dump_thread(struct pt_regs *regs, struct user *dump) · line 36

Quoted 10 lines
arch/arm/include/asm/a.out-core.h +0 -6
 	dump->u_ssize = 0;
 
-	dump->u_debugreg[0] = tsk->thread.debug.bp[0].address;
-	dump->u_debugreg[1] = tsk->thread.debug.bp[1].address;
-	dump->u_debugreg[2] = tsk->thread.debug.bp[0].insn.arm;
-	dump->u_debugreg[3] = tsk->thread.debug.bp[1].insn.arm;
-	dump->u_debugreg[4] = tsk->thread.debug.nsaved;
-
 	if (dump->start_stack < 0x04000000)
 		dump->u_ssize = (0x04000000 - dump->start_stack) >> PAGE_SHIFT;

Damn, looks like I forgot to update this code. I think it might be better to memset zero the u_debugreg array rather than ignore the assignment and also add a comment to struct user to explain that thie field is no longer used.

Will

A message that is not in the archive (sent off-list or not yet received): -6991351870718115910@unknownmsgid

author
#3 lore raw

PATCH 1/2 ARM: fix compiling error due to debug_info change

Quoted 6 lines · Will Deacon

Hi Bryan,

Quoted 1 line

Subject: [PATCH 1/2] ARM: fix compiling error due to debug_info change

Is there a patch 2/2 as well? (I only received this one).

Oops, my mistake.

Quoted 16 lines
Quoted 16 lines

This bug was introduced by "ARM: 6668/1: ptrace: remove single-step emulation code" from Will Deacon

Cc Will Deacon <[email protected]>
Signed-off-by Bryan Wu <[email protected]>

---
?arch/arm/include/asm/a.out-core.h | ? ?6 ------
?1 files changed, 0 insertions(+), 6 deletions(-)

arch/arm/include/asm/a.out-core.h +0 -0
index 93d04ac..639f5c8 100644
@@ -32,12 +32,6 @@ static inline void aout_dump_thread(struct pt_regs *regs, struct user *dump)
 ? ? ? dump->u_dsize = (tsk->mm->brk - tsk->mm->start_data + PAGE_SIZE - 1) >> PAGE_SHIFT;
 ? ? ? dump->u_ssize = 0;
Quoted 14 lines

arch/arm/include/asm/a.out-core.h static inline void aout_dump_thread(struct pt_regs *regs, struct user *dump) · line 36

Quoted 8 lines
arch/arm/include/asm/a.out-core.h +0 -6
- ? ? dump->u_debugreg[0] = tsk->thread.debug.bp[0].address;
- ? ? dump->u_debugreg[1] = tsk->thread.debug.bp[1].address;
- ? ? dump->u_debugreg[2] = tsk->thread.debug.bp[0].insn.arm;
- ? ? dump->u_debugreg[3] = tsk->thread.debug.bp[1].insn.arm;
- ? ? dump->u_debugreg[4] = tsk->thread.debug.nsaved;
-
 ? ? ? if (dump->start_stack < 0x04000000)
 ? ? ? ? ? ? ? dump->u_ssize = (0x04000000 - dump->start_stack) >> PAGE_SHIFT;

Damn, looks like I forgot to update this code. I think it might be better to memset zero the u_debugreg array rather than ignore the assignment and also add a comment to struct user to explain that thie field is no longer used.

That makes sense. I will update a patch for you soon.

-Bryan