Commit f0bc814c authored by Stuart Menefy's avatar Stuart Menefy Committed by Paul Mundt
Browse files

sh: gcc4 support. 



This fixes up the kernel for gcc4. The existing exception handlers
needed some wrapping for pt_regs access, acessing the registers
via a RELOC_HIDE() pointer.

The strcpy() issues popped up here too, so add -ffreestanding and
kill off the symbol export.

Signed-off-by: default avatarStuart Menefy <stuart.menefy@st.com>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 53644087

arch/sh/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ cflags-$(CONFIG_CPU_SH4A) := -m4a $(call cc-option,-m4a-nofpu,) 
cflags-$(CONFIG_CPU_BIG_ENDIAN)		+= -mb

cflags-$(CONFIG_CPU_LITTLE_ENDIAN)	+= -ml



cflags-y	+= $(call as-option,-Wa$(comma)-isa=$(isa-y),)

cflags-y	+= $(call as-option,-Wa$(comma)-isa=$(isa-y),) -ffreestanding



cflags-$(CONFIG_SH_DSP)			+= -Wa,-dsp

cflags-$(CONFIG_SH_KGDB)		+= -g

arch/sh/kernel/cpu/sh4/fpu.c

+10 −8
Original line number Diff line number Diff line
@@ -296,16 +296,17 @@ ieee_fpe_handler (struct pt_regs *regs) 
}



asmlinkage void

do_fpu_error(unsigned long r4, unsigned long r5, unsigned long r6, unsigned long r7,

	     struct pt_regs regs)

do_fpu_error(unsigned long r4, unsigned long r5, unsigned long r6,

	     unsigned long r7, struct pt_regs __regs)

{

	struct pt_regs *regs = RELOC_HIDE(&__regs, 0);

	struct task_struct *tsk = current;



	if (ieee_fpe_handler (&regs))

	if (ieee_fpe_handler(regs))

		return;



	regs.pc += 2;

	save_fpu(tsk, &regs);

	regs->pc += 2;

	save_fpu(tsk, regs);

	tsk->thread.trap_no = 11;

	tsk->thread.error_code = 0;

	force_sig(SIGFPE, tsk);
@@ -313,12 +314,13 @@ do_fpu_error(unsigned long r4, unsigned long r5, unsigned long r6, unsigned long 


asmlinkage void

do_fpu_state_restore(unsigned long r4, unsigned long r5, unsigned long r6,

		     unsigned long r7, struct pt_regs regs)

		     unsigned long r7, struct pt_regs __regs)

{

	struct pt_regs *regs = RELOC_HIDE(&__regs, 0);

	struct task_struct *tsk = current;



	grab_fpu(&regs);

	if (!user_mode(&regs)) {

	grab_fpu(regs);

	if (!user_mode(regs)) {

		printk(KERN_ERR "BUG: FPU is used in kernel mode.\n");

		return;

	}

arch/sh/kernel/irq.c

+3 −2
Original line number Diff line number Diff line
@@ -84,9 +84,10 @@ static union irq_ctx *softirq_ctx[NR_CPUS]; 


asmlinkage int do_IRQ(unsigned long r4, unsigned long r5,

		      unsigned long r6, unsigned long r7,

		      struct pt_regs regs)

		      struct pt_regs __regs)

{

	struct pt_regs *old_regs = set_irq_regs(&regs);

	struct pt_regs *regs = RELOC_HIDE(&__regs, 0);

	struct pt_regs *old_regs = set_irq_regs(regs);

	int irq;

#ifdef CONFIG_4KSTACKS

	union irq_ctx *curctx, *irqctx;

arch/sh/kernel/process.c

+18 −14
Original line number Diff line number Diff line
@@ -385,10 +385,11 @@ struct task_struct *__switch_to(struct task_struct *prev, struct task_struct *ne 


asmlinkage int sys_fork(unsigned long r4, unsigned long r5,

			unsigned long r6, unsigned long r7,

			struct pt_regs regs)

			struct pt_regs __regs)

{

	struct pt_regs *regs = RELOC_HIDE(&__regs, 0);

#ifdef CONFIG_MMU

	return do_fork(SIGCHLD, regs.regs[15], &regs, 0, NULL, NULL);

	return do_fork(SIGCHLD, regs->regs[15], regs, 0, NULL, NULL);

#else

	/* fork almost works, enough to trick you into looking elsewhere :-( */

	return -EINVAL;
@@ -398,11 +399,12 @@ asmlinkage int sys_fork(unsigned long r4, unsigned long r5, 
asmlinkage int sys_clone(unsigned long clone_flags, unsigned long newsp,

			 unsigned long parent_tidptr,

			 unsigned long child_tidptr,

			 struct pt_regs regs)

			 struct pt_regs __regs)

{

	struct pt_regs *regs = RELOC_HIDE(&__regs, 0);

	if (!newsp)

		newsp = regs.regs[15];

	return do_fork(clone_flags, newsp, &regs, 0,

		newsp = regs->regs[15];

	return do_fork(clone_flags, newsp, regs, 0,

			(int __user *)parent_tidptr, (int __user *)child_tidptr);

}
@@ -418,9 +420,10 @@ asmlinkage int sys_clone(unsigned long clone_flags, unsigned long newsp, 
 */

asmlinkage int sys_vfork(unsigned long r4, unsigned long r5,

			 unsigned long r6, unsigned long r7,

			 struct pt_regs regs)

			 struct pt_regs __regs)

{

	return do_fork(CLONE_VFORK | CLONE_VM | SIGCHLD, regs.regs[15], &regs,

	struct pt_regs *regs = RELOC_HIDE(&__regs, 0);

	return do_fork(CLONE_VFORK | CLONE_VM | SIGCHLD, regs->regs[15], regs,

		       0, NULL, NULL);

}
@@ -429,8 +432,9 @@ asmlinkage int sys_vfork(unsigned long r4, unsigned long r5, 
 */

asmlinkage int sys_execve(char *ufilename, char **uargv,

			  char **uenvp, unsigned long r7,

			  struct pt_regs regs)

			  struct pt_regs __regs)

{

	struct pt_regs *regs = RELOC_HIDE(&__regs, 0);

	int error;

	char *filename;
@@ -442,7 +446,7 @@ asmlinkage int sys_execve(char *ufilename, char **uargv, 
	error = do_execve(filename,

			  (char __user * __user *)uargv,

			  (char __user * __user *)uenvp,

			  &regs);

			  regs);

	if (error == 0) {

		task_lock(current);

		current->ptrace &= ~PT_DTRACE;
@@ -472,9 +476,7 @@ unsigned long get_wchan(struct task_struct *p) 
	return pc;

}



asmlinkage void break_point_trap(unsigned long r4, unsigned long r5,

				 unsigned long r6, unsigned long r7,

				 struct pt_regs regs)

asmlinkage void break_point_trap(void)

{

	/* Clear tracing.  */

#if defined(CONFIG_CPU_SH4A)
@@ -492,8 +494,10 @@ asmlinkage void break_point_trap(unsigned long r4, unsigned long r5, 


asmlinkage void break_point_trap_software(unsigned long r4, unsigned long r5,

					  unsigned long r6, unsigned long r7,

					  struct pt_regs regs)

					  struct pt_regs __regs)

{

	regs.pc -= 2;

	struct pt_regs *regs = RELOC_HIDE(&__regs, 0);



	regs->pc -= 2;

	force_sig(SIGTRAP, current);

}

arch/sh/kernel/sh_ksyms.c

+0 −2
Original line number Diff line number Diff line
@@ -73,8 +73,6 @@ DECLARE_EXPORT(__lshrdi3); 
DECLARE_EXPORT(__movstr);

DECLARE_EXPORT(__movstrSI16);



EXPORT_SYMBOL(strcpy);



#ifdef CONFIG_CPU_SH4

DECLARE_EXPORT(__movstr_i4_even);

DECLARE_EXPORT(__movstr_i4_odd);