Skip to contentSkip to conversation

unicore32: Fix build error

PATCH Superseded Guenter Roeck 3 participants 8 messages Aug 10, 2014 – Aug 18, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 unicore32: Fix build error

unicore32 builds fail with

arch/unicore32/kernel/signal.c: In function ‘setup_frame’:
arch/unicore32/kernel/signal.c:257: error:
‘usig’ undeclared (first use in this function)
arch/unicore32/kernel/signal.c:279: error:
‘usig’ undeclared (first use in this function)
arch/unicore32/kernel/signal.c: In function ‘handle_signal’:
arch/unicore32/kernel/signal.c:306: warning: unused variable ‘tsk’ arch/unicore32/kernel/signal.c: In function ‘do_signal’:
arch/unicore32/kernel/signal.c:376: error:
implicit declaration of function ‘get_signsl’
make[1]: *** [arch/unicore32/kernel/signal.o] Error 1
make: *** [arch/unicore32/kernel/signal.o] Error 2

Bisect points to commit 649671c90eaf ("unicore32: Use get_signal() signal_setup_done()").

This code never even compiled. Reverting the patch does not work, since previously used functions no longer exist, so try to fix it up. Compile tested only.

Cc Richard Weinberger <[email protected]>
---
 arch/unicore32/kernel/signal.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
arch/unicore32/kernel/signal.c +5 -4
index 780d773..7c8fb70 100644
@@ -254,7 +254,8 @@ static int setup_frame(struct ksignal *ksig, sigset_t *set,
 
 	err |= setup_sigframe(frame, regs, set);
 	if (err == 0)
-		err |= setup_return(regs, &ksig->ka, frame->retcode, frame, usig);
+		err |= setup_return(regs, &ksig->ka, frame->retcode, frame,
+				    ksig->sig);
 
 	return err;
 }
@@ -276,7 +277,8 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
 	err |= __save_altstack(&frame->sig.uc.uc_stack, regs->UCreg_sp);
 	err |= setup_sigframe(&frame->sig, regs, set);
 	if (err == 0)
-		err |= setup_return(regs, &ksig->ka, frame->sig.retcode, frame, usig);
+		err |= setup_return(regs, &ksig->ka, frame->sig.retcode, frame,
+				    ksig->sig);
 
 	if (err == 0) {
 		/*
@@ -303,7 +305,6 @@ static void handle_signal(struct ksignal *ksig, struct pt_regs *regs,
 			  int syscall)
 {
 	struct thread_info *thread = current_thread_info();
-	struct task_struct *tsk = current;
 	sigset_t *oldset = sigmask_to_save();
 	int usig = ksig->sig;
 	int ret;
@@ -373,7 +374,7 @@ static void do_signal(struct pt_regs *regs, int syscall)
 	if (!user_mode(regs))
 		return;
 
-	if (get_signsl(&ksig)) {
+	if (get_signal(&ksig)) {
 		handle_signal(&ksig, regs, syscall);
 		return;
 	}
Signature · 1 line
1.9.1
#1 lore raw

Guenther,

Am 10.08.2014 17:29, schrieb Guenter Roeck:

Quoted 15 lines

unicore32 builds fail with

arch/unicore32/kernel/signal.c: In function ‘setup_frame’:
arch/unicore32/kernel/signal.c:257: error:
‘usig’ undeclared (first use in this function)
arch/unicore32/kernel/signal.c:279: error:
‘usig’ undeclared (first use in this function)
arch/unicore32/kernel/signal.c: In function ‘handle_signal’:
arch/unicore32/kernel/signal.c:306: warning: unused variable ‘tsk’ arch/unicore32/kernel/signal.c: In function ‘do_signal’:
arch/unicore32/kernel/signal.c:376: error:
implicit declaration of function ‘get_signsl’
make[1]: *** [arch/unicore32/kernel/signal.o] Error 1
make: *** [arch/unicore32/kernel/signal.o] Error 2

Quoted 6 lines

Bisect points to commit 649671c90eaf ("unicore32: Use get_signal() signal_setup_done()").

This code never even compiled. Reverting the patch does not work, since previously used functions no longer exist, so try to fix it up. Compile tested only.

Where did you get the unicore32 cross compiler from?

The collection on kernel.org is missing it:
https://www.kernel.org/pub/tools/crosstool/

This is why it did not get any build testing.

Thanks,
//richard

Quoted 48 lines
Cc Richard Weinberger <[email protected]>
---
 arch/unicore32/kernel/signal.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
arch/unicore32/kernel/signal.c +5 -4
index 780d773..7c8fb70 100644
@@ -254,7 +254,8 @@ static int setup_frame(struct ksignal *ksig, sigset_t *set,
 
 	err |= setup_sigframe(frame, regs, set);
 	if (err == 0)
-		err |= setup_return(regs, &ksig->ka, frame->retcode, frame, usig);
+		err |= setup_return(regs, &ksig->ka, frame->retcode, frame,
+				    ksig->sig);
 
 	return err;
 }
@@ -276,7 +277,8 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
 	err |= __save_altstack(&frame->sig.uc.uc_stack, regs->UCreg_sp);
 	err |= setup_sigframe(&frame->sig, regs, set);
 	if (err == 0)
-		err |= setup_return(regs, &ksig->ka, frame->sig.retcode, frame, usig);
+		err |= setup_return(regs, &ksig->ka, frame->sig.retcode, frame,
+				    ksig->sig);
 
 	if (err == 0) {
 		/*
@@ -303,7 +305,6 @@ static void handle_signal(struct ksignal *ksig, struct pt_regs *regs,
 			  int syscall)
 {
 	struct thread_info *thread = current_thread_info();
-	struct task_struct *tsk = current;
 	sigset_t *oldset = sigmask_to_save();
 	int usig = ksig->sig;
 	int ret;
@@ -373,7 +374,7 @@ static void do_signal(struct pt_regs *regs, int syscall)
 	if (!user_mode(regs))
 		return;
 
-	if (get_signsl(&ksig)) {
+	if (get_signal(&ksig)) {
 		handle_signal(&ksig, regs, syscall);
 		return;
 	}
#2 lore raw
Quoted 18 lines · Richard Weinberger

Guenther,

Am 10.08.2014 17:29, schrieb Guenter Roeck:

Quoted 15 lines

unicore32 builds fail with

arch/unicore32/kernel/signal.c: In function ‘setup_frame’:
arch/unicore32/kernel/signal.c:257: error:
‘usig’ undeclared (first use in this function)
arch/unicore32/kernel/signal.c:279: error:
‘usig’ undeclared (first use in this function)
arch/unicore32/kernel/signal.c: In function ‘handle_signal’:
arch/unicore32/kernel/signal.c:306: warning: unused variable ‘tsk’ arch/unicore32/kernel/signal.c: In function ‘do_signal’:
arch/unicore32/kernel/signal.c:376: error:
implicit declaration of function ‘get_signsl’
make[1]: *** [arch/unicore32/kernel/signal.o] Error 1
make: *** [arch/unicore32/kernel/signal.o] Error 2

Quoted 9 lines
Quoted 6 lines

Bisect points to commit 649671c90eaf ("unicore32: Use get_signal() signal_setup_done()").

This code never even compiled. Reverting the patch does not work, since previously used functions no longer exist, so try to fix it up. Compile tested only.

Where did you get the unicore32 cross compiler from?

mprc.pku.edu.cn/~guanxuetao/linux/uc4-1.0.5-hard.tgz

Guenter

#3 lore raw
Quoted 26 lines · ----- Guenter Roeck
Quoted 25 lines · Richard Weinberger

Guenther,

Am 10.08.2014 17:29, schrieb Guenter Roeck:

Quoted 21 lines

unicore32 builds fail with

arch/unicore32/kernel/signal.c: In function ‘setup_frame’:
arch/unicore32/kernel/signal.c:257: error:
‘usig’ undeclared (first use in this function)
arch/unicore32/kernel/signal.c:279: error:
‘usig’ undeclared (first use in this function)
arch/unicore32/kernel/signal.c: In function ‘handle_signal’:
arch/unicore32/kernel/signal.c:306: warning: unused variable ‘tsk’ arch/unicore32/kernel/signal.c: In function ‘do_signal’:
arch/unicore32/kernel/signal.c:376: error:
implicit declaration of function ‘get_signsl’
make[1]: *** [arch/unicore32/kernel/signal.o] Error 1
make: *** [arch/unicore32/kernel/signal.o] Error 2

Bisect points to commit 649671c90eaf ("unicore32: Use get_signal() signal_setup_done()").

This code never even compiled. Reverting the patch does not work, since previously used functions no longer exist, so try to fix it up. Compile tested only.

Quoted 5 lines
Quoted 2 lines

Where did you get the unicore32 cross compiler from?

mprc.pku.edu.cn/~guanxuetao/linux/uc4-1.0.5-hard.tgz

Guenter

Yes, this toolchain can generate unicore32 binaries. Thanks Guenter.

Xuetao

#4 lore raw
In reply to Guenter Roeck
Quoted 18 lines · Guenter Roeck

unicore32 builds fail with

arch/unicore32/kernel/signal.c: In function ‘setup_frame’:
arch/unicore32/kernel/signal.c:257: error:
‘usig’ undeclared (first use in this function)
arch/unicore32/kernel/signal.c:279: error:
‘usig’ undeclared (first use in this function)
arch/unicore32/kernel/signal.c: In function ‘handle_signal’:
arch/unicore32/kernel/signal.c:306: warning: unused variable ‘tsk’ arch/unicore32/kernel/signal.c: In function ‘do_signal’:
arch/unicore32/kernel/signal.c:376: error:
implicit declaration of function ‘get_signsl’
make[1]: *** [arch/unicore32/kernel/signal.o] Error 1
make: *** [arch/unicore32/kernel/signal.o] Error 2

Bisect points to commit 649671c90eaf ("unicore32: Use get_signal() signal_setup_done()").

Quoted 6 lines

This code never even compiled. Reverting the patch does not work, since previously used functions no longer exist, so try to fix it up. Compile tested only.

Cc Richard Weinberger <[email protected]>

ping ...

Failure is still present in upstream kernel (v3.16-11383-gc9d2642).

Guenter

Quoted 46 lines
---
  arch/unicore32/kernel/signal.c | 9 +++++----
  1 file changed, 5 insertions(+), 4 deletions(-)
arch/unicore32/kernel/signal.c +5 -4
index 780d773..7c8fb70 100644
@@ -254,7 +254,8 @@ static int setup_frame(struct ksignal *ksig, sigset_t *set,
 
  	err |= setup_sigframe(frame, regs, set);
  	if (err == 0)
-		err |= setup_return(regs, &ksig->ka, frame->retcode, frame, usig);
+		err |= setup_return(regs, &ksig->ka, frame->retcode, frame,
+				    ksig->sig);
 
  	return err;
  }
@@ -276,7 +277,8 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
  	err |= __save_altstack(&frame->sig.uc.uc_stack, regs->UCreg_sp);
  	err |= setup_sigframe(&frame->sig, regs, set);
  	if (err == 0)
-		err |= setup_return(regs, &ksig->ka, frame->sig.retcode, frame, usig);
+		err |= setup_return(regs, &ksig->ka, frame->sig.retcode, frame,
+				    ksig->sig);
 
  	if (err == 0) {
  		/*
@@ -303,7 +305,6 @@ static void handle_signal(struct ksignal *ksig, struct pt_regs *regs,
  			  int syscall)
  {
  	struct thread_info *thread = current_thread_info();
-	struct task_struct *tsk = current;
  	sigset_t *oldset = sigmask_to_save();
  	int usig = ksig->sig;
  	int ret;
@@ -373,7 +374,7 @@ static void do_signal(struct pt_regs *regs, int syscall)
  	if (!user_mode(regs))
  		return;
 
-	if (get_signsl(&ksig)) {
+	if (get_signal(&ksig)) {
  		handle_signal(&ksig, regs, syscall);
  		return;
  	}
#5 lore raw
Quoted 23 lines · ----- Guenter Roeck
Quoted 22 lines · Guenter Roeck

unicore32 builds fail with

arch/unicore32/kernel/signal.c: In function ‘setup_frame’:
arch/unicore32/kernel/signal.c:257: error:
‘usig’ undeclared (first use in this function)
arch/unicore32/kernel/signal.c:279: error:
‘usig’ undeclared (first use in this function)
arch/unicore32/kernel/signal.c: In function ‘handle_signal’:
arch/unicore32/kernel/signal.c:306: warning: unused variable ‘tsk’ arch/unicore32/kernel/signal.c: In function ‘do_signal’:
arch/unicore32/kernel/signal.c:376: error:
implicit declaration of function ‘get_signsl’
make[1]: *** [arch/unicore32/kernel/signal.o] Error 1
make: *** [arch/unicore32/kernel/signal.o] Error 2

Bisect points to commit 649671c90eaf ("unicore32: Use get_signal() signal_setup_done()").

This code never even compiled. Reverting the patch does not work, since previously used functions no longer exist, so try to fix it up. Compile tested only.

Quoted 9 lines
Quoted 2 lines
Cc Richard Weinberger <[email protected]>

ping ...

Failure is still present in upstream kernel (v3.16-11383-gc9d2642).

Guenter

Thanks. I'll fix it.

Xuetao

#6 lore raw
Quoted 28 lines · Xuetao Guan
Quoted 26 lines · ----- Guenter Roeck
Quoted 24 lines · Guenter Roeck

unicore32 builds fail with

arch/unicore32/kernel/signal.c: In function ‘setup_frame’:
arch/unicore32/kernel/signal.c:257: error:
‘usig’ undeclared (first use in this function)
arch/unicore32/kernel/signal.c:279: error:
‘usig’ undeclared (first use in this function)
arch/unicore32/kernel/signal.c: In function ‘handle_signal’:
arch/unicore32/kernel/signal.c:306: warning: unused variable ‘tsk’ arch/unicore32/kernel/signal.c: In function ‘do_signal’:
arch/unicore32/kernel/signal.c:376: error:
implicit declaration of function ‘get_signsl’
make[1]: *** [arch/unicore32/kernel/signal.o] Error 1
make: *** [arch/unicore32/kernel/signal.o] Error 2

Bisect points to commit 649671c90eaf ("unicore32: Use get_signal() signal_setup_done()").

This code never even compiled. Reverting the patch does not work, since previously used functions no longer exist, so try to fix it up. Compile tested only.

Cc Richard Weinberger <[email protected]>
Quoted 9 lines
Quoted 6 lines

ping ...

Failure is still present in upstream kernel (v3.16-11383-gc9d2642).

Guenter

Thanks. I'll fix it.

More a question of applying (and if possible testing) the patch I provided.

Thanks,
Guenter

#7 lore raw
Quoted 36 lines · ----- Guenter Roeck
Quoted 35 lines · Xuetao Guan
Quoted 32 lines · ----- Guenter Roeck
Quoted 18 lines · Guenter Roeck

unicore32 builds fail with

arch/unicore32/kernel/signal.c: In function ‘setup_frame’:
arch/unicore32/kernel/signal.c:257: error:
‘usig’ undeclared (first use in this function)
arch/unicore32/kernel/signal.c:279: error:
‘usig’ undeclared (first use in this function)
arch/unicore32/kernel/signal.c: In function ‘handle_signal’:
arch/unicore32/kernel/signal.c:306: warning: unused variable ‘tsk’ arch/unicore32/kernel/signal.c: In function ‘do_signal’:
arch/unicore32/kernel/signal.c:376: error:
implicit declaration of function ‘get_signsl’
make[1]: *** [arch/unicore32/kernel/signal.o] Error 1
make: *** [arch/unicore32/kernel/signal.o] Error 2

Bisect points to commit 649671c90eaf ("unicore32: Use get_signal() signal_setup_done()").

Quoted 6 lines

This code never even compiled. Reverting the patch does not work, since previously used functions no longer exist, so try to fix it up. Compile tested only.

Cc Richard Weinberger <[email protected]>

ping ...

Failure is still present in upstream kernel (v3.16-11383-gc9d2642).

Guenter

Quoted 9 lines
Quoted 2 lines

Thanks. I'll fix it.

More a question of applying (and if possible testing) the patch I provided.

Thanks,
Guenter

Ok, I'll do it.

Xuetao