Commit 55c4dce3 authored by David S. Miller's avatar David S. Miller

Merge

parents 4ce6b618 8cab22d6
# $Id: Makefile,v 1.70 2002/02/09 19:49:30 davem Exp $ # $Id: Makefile,v 1.70 2002/02/09 19:49:30 davem Exp $
# Makefile for the linux kernel. # Makefile for the linux kernel.
# #
# Note! Dependencies are done automagically by 'make dep', which also
# removes any old dependencies. DON'T put your own dependencies here
# unless it's something special (ie not a .c file).
#
# Note 2! The CFLAGS definitions are now in the main makefile...
SH = $(CONFIG_SHELL) SH = $(CONFIG_SHELL)
.S.s: USE_STANDARD_AS_RULE := true
$(CPP) $(AFLAGS) -ansi $< -o $*.s EXTRA_AFLAGS := -ansi
.S.o:
$(CC) $(AFLAGS) -ansi -c $< -o $*.o
all: kernel.o head.o init_task.o all: kernel.o head.o init_task.o
......
...@@ -411,6 +411,7 @@ void do_rt_sigreturn(struct pt_regs *regs) ...@@ -411,6 +411,7 @@ void do_rt_sigreturn(struct pt_regs *regs)
struct rt_signal_frame *sf; struct rt_signal_frame *sf;
unsigned long tpc, tnpc, tstate; unsigned long tpc, tnpc, tstate;
__siginfo_fpu_t *fpu_save; __siginfo_fpu_t *fpu_save;
mm_segment_t old_fs;
sigset_t set; sigset_t set;
stack_t st; stack_t st;
int err; int err;
...@@ -455,7 +456,10 @@ void do_rt_sigreturn(struct pt_regs *regs) ...@@ -455,7 +456,10 @@ void do_rt_sigreturn(struct pt_regs *regs)
/* It is more difficult to avoid calling this function than to /* It is more difficult to avoid calling this function than to
call it and ignore errors. */ call it and ignore errors. */
old_fs = get_fs();
set_fs(KERNEL_DS);
do_sigaltstack(&st, NULL, (unsigned long)sf); do_sigaltstack(&st, NULL, (unsigned long)sf);
set_fs(old_fs);
sigdelsetmask(&set, ~_BLOCKABLE); sigdelsetmask(&set, ~_BLOCKABLE);
spin_lock_irq(&current->sigmask_lock); spin_lock_irq(&current->sigmask_lock);
......
...@@ -396,6 +396,7 @@ asmlinkage void do_rt_sigreturn32(struct pt_regs *regs) ...@@ -396,6 +396,7 @@ asmlinkage void do_rt_sigreturn32(struct pt_regs *regs)
struct rt_signal_frame32 *sf; struct rt_signal_frame32 *sf;
unsigned int psr; unsigned int psr;
unsigned pc, npc, fpu_save; unsigned pc, npc, fpu_save;
mm_segment_t old_fs;
sigset_t set; sigset_t set;
sigset_t32 seta; sigset_t32 seta;
stack_t st; stack_t st;
...@@ -453,7 +454,10 @@ asmlinkage void do_rt_sigreturn32(struct pt_regs *regs) ...@@ -453,7 +454,10 @@ asmlinkage void do_rt_sigreturn32(struct pt_regs *regs)
/* It is more difficult to avoid calling this function than to /* It is more difficult to avoid calling this function than to
call it and ignore errors. */ call it and ignore errors. */
old_fs = get_fs();
set_fs(KERNEL_DS);
do_sigaltstack(&st, NULL, (unsigned long)sf); do_sigaltstack(&st, NULL, (unsigned long)sf);
set_fs(old_fs);
switch (_NSIG_WORDS) { switch (_NSIG_WORDS) {
case 4: set.sig[3] = seta.sig[6] + (((long)seta.sig[7]) << 32); case 4: set.sig[3] = seta.sig[6] + (((long)seta.sig[7]) << 32);
...@@ -1031,6 +1035,7 @@ svr4_getcontext(svr4_ucontext_t *uc, struct pt_regs *regs) ...@@ -1031,6 +1035,7 @@ svr4_getcontext(svr4_ucontext_t *uc, struct pt_regs *regs)
asmlinkage int svr4_setcontext(svr4_ucontext_t *c, struct pt_regs *regs) asmlinkage int svr4_setcontext(svr4_ucontext_t *c, struct pt_regs *regs)
{ {
svr4_gregset_t *gr; svr4_gregset_t *gr;
mm_segment_t old_fs;
u32 pc, npc, psr; u32 pc, npc, psr;
sigset_t set; sigset_t set;
svr4_sigset_t setv; svr4_sigset_t setv;
...@@ -1086,7 +1091,10 @@ asmlinkage int svr4_setcontext(svr4_ucontext_t *c, struct pt_regs *regs) ...@@ -1086,7 +1091,10 @@ asmlinkage int svr4_setcontext(svr4_ucontext_t *c, struct pt_regs *regs)
/* It is more difficult to avoid calling this function than to /* It is more difficult to avoid calling this function than to
call it and ignore errors. */ call it and ignore errors. */
old_fs = get_fs();
set_fs(KERNEL_DS);
do_sigaltstack(&st, NULL, regs->u_regs[UREG_I6]); do_sigaltstack(&st, NULL, regs->u_regs[UREG_I6]);
set_fs(old_fs);
sigdelsetmask(&set, ~_BLOCKABLE); sigdelsetmask(&set, ~_BLOCKABLE);
spin_lock_irq(&current->sigmask_lock); spin_lock_irq(&current->sigmask_lock);
......
...@@ -2,13 +2,8 @@ ...@@ -2,13 +2,8 @@
# Makefile for Sparc64 library files.. # Makefile for Sparc64 library files..
# #
.S.s: USE_STANDARD_AS_RULE := true
$(CPP) $(AFLAGS) -ansi $< -o $*.s EXTRA_AFLAGS := -ansi
.S.o:
$(CC) $(AFLAGS) -ansi -c $< -o $*.o
CFLAGS := $(CFLAGS)
L_TARGET = lib.a L_TARGET = lib.a
obj-y := PeeCeeI.o blockops.o debuglocks.o strlen.o strncmp.o \ obj-y := PeeCeeI.o blockops.o debuglocks.o strlen.o strncmp.o \
......
# $Id: Makefile,v 1.8 2000/12/14 22:57:25 davem Exp $ # $Id: Makefile,v 1.8 2000/12/14 22:57:25 davem Exp $
# Makefile for the linux Sparc64-specific parts of the memory manager. # Makefile for the linux Sparc64-specific parts of the memory manager.
# #
# Note! Dependencies are done automagically by 'make dep', which also
# removes any old dependencies. DON'T put your own dependencies here
# unless it's something special (ie not a .c file).
#
# Note 2! The CFLAGS definition is now in the main makefile...
.S.s:
$(CPP) $(AFLAGS) -ansi $< -o $*.s
.S.o: USE_STANDARD_AS_RULE := true
$(CC) $(AFLAGS) -ansi -c $< -o $*.o EXTRA_AFLAGS := -ansi
O_TARGET := mm.o O_TARGET := mm.o
obj-y := ultra.o fault.o init.o generic.o extable.o modutil.o obj-y := ultra.o fault.o init.o generic.o extable.o modutil.o
......
...@@ -2,22 +2,14 @@ ...@@ -2,22 +2,14 @@
# Makefile for the Sun Boot PROM interface library under # Makefile for the Sun Boot PROM interface library under
# Linux. # Linux.
# #
# Note! Dependencies are done automagically by 'make dep', which also
# removes any old dependencies. DON'T put your own dependencies here USE_STANDARD_AS_RULE := true
# unless it's something special (ie not a .c file). EXTRA_AFLAGS := -ansi
#
# Note 2! The CFLAGS definitions are now in the main makefile...
L_TARGET = promlib.a L_TARGET = promlib.a
obj-y := bootstr.o devops.o init.o memory.o misc.o \ obj-y := bootstr.o devops.o init.o memory.o misc.o \
tree.o console.o printf.o p1275.o map.o tree.o console.o printf.o p1275.o map.o
.S.s:
$(CPP) $(AFLAGS) -ansi $< -o $*.s
.S.o:
$(CC) $(AFLAGS) -ansi -c $< -o $*.o
include $(TOPDIR)/Rules.make include $(TOPDIR)/Rules.make
%.o: %.c %.o: %.c
......
...@@ -2,16 +2,13 @@ ...@@ -2,16 +2,13 @@
# Makefile for the Solaris binary emulation. # Makefile for the Solaris binary emulation.
# #
USE_STANDARD_AS_RULE := true
EXTRA_AFLAGS := -ansi
ifeq ($(CONFIG_SOLARIS_EMUL),m) ifeq ($(CONFIG_SOLARIS_EMUL),m)
CPPFLAGS = $(MODFLAGS) EXTRA_AFLAGS += $(MODFLAGS)
endif endif
.S.s:
$(CPP) $(AFLAGS) $(CPPFLAGS) -ansi $< -o $*.s
.S.o:
$(CC) $(AFLAGS) $(CPPFLAGS) -ansi -c $< -o $*.o
solaris-objs := entry64.o fs.o misc.o signal.o systbl.o socket.o \ solaris-objs := entry64.o fs.o misc.o signal.o systbl.o socket.o \
ioctl.o ipc.o socksys.o timod.o ioctl.o ipc.o socksys.o timod.o
......
...@@ -58,6 +58,7 @@ ...@@ -58,6 +58,7 @@
#define _FP_FRAC_NEGP_1(X) ((_FP_WS_TYPE)X##_f < 0) #define _FP_FRAC_NEGP_1(X) ((_FP_WS_TYPE)X##_f < 0)
#define _FP_FRAC_ZEROP_1(X) (X##_f == 0) #define _FP_FRAC_ZEROP_1(X) (X##_f == 0)
#define _FP_FRAC_OVERP_1(fs,X) (X##_f & _FP_OVERFLOW_##fs) #define _FP_FRAC_OVERP_1(fs,X) (X##_f & _FP_OVERFLOW_##fs)
#define _FP_FRAC_CLEAR_OVERP_1(fs,X) (X##_f &= ~_FP_OVERFLOW_##fs)
#define _FP_FRAC_EQ_1(X, Y) (X##_f == Y##_f) #define _FP_FRAC_EQ_1(X, Y) (X##_f == Y##_f)
#define _FP_FRAC_GE_1(X, Y) (X##_f >= Y##_f) #define _FP_FRAC_GE_1(X, Y) (X##_f >= Y##_f)
#define _FP_FRAC_GT_1(X, Y) (X##_f > Y##_f) #define _FP_FRAC_GT_1(X, Y) (X##_f > Y##_f)
......
...@@ -114,6 +114,7 @@ ...@@ -114,6 +114,7 @@
#define _FP_FRAC_NEGP_2(X) ((_FP_WS_TYPE)X##_f1 < 0) #define _FP_FRAC_NEGP_2(X) ((_FP_WS_TYPE)X##_f1 < 0)
#define _FP_FRAC_ZEROP_2(X) ((X##_f1 | X##_f0) == 0) #define _FP_FRAC_ZEROP_2(X) ((X##_f1 | X##_f0) == 0)
#define _FP_FRAC_OVERP_2(fs,X) (_FP_FRAC_HIGH_##fs(X) & _FP_OVERFLOW_##fs) #define _FP_FRAC_OVERP_2(fs,X) (_FP_FRAC_HIGH_##fs(X) & _FP_OVERFLOW_##fs)
#define _FP_FRAC_CLEAR_OVERP_2(fs,X) (_FP_FRAC_HIGH_##fs(X) &= ~_FP_OVERFLOW_##fs)
#define _FP_FRAC_EQ_2(X, Y) (X##_f1 == Y##_f1 && X##_f0 == Y##_f0) #define _FP_FRAC_EQ_2(X, Y) (X##_f1 == Y##_f1 && X##_f0 == Y##_f0)
#define _FP_FRAC_GT_2(X, Y) \ #define _FP_FRAC_GT_2(X, Y) \
(X##_f1 > Y##_f1 || (X##_f1 == Y##_f1 && X##_f0 > Y##_f0)) (X##_f1 > Y##_f1 || (X##_f1 == Y##_f1 && X##_f0 > Y##_f0))
......
...@@ -132,6 +132,7 @@ ...@@ -132,6 +132,7 @@
#define _FP_FRAC_ZEROP_4(X) ((X##_f[0] | X##_f[1] | X##_f[2] | X##_f[3]) == 0) #define _FP_FRAC_ZEROP_4(X) ((X##_f[0] | X##_f[1] | X##_f[2] | X##_f[3]) == 0)
#define _FP_FRAC_NEGP_4(X) ((_FP_WS_TYPE)X##_f[3] < 0) #define _FP_FRAC_NEGP_4(X) ((_FP_WS_TYPE)X##_f[3] < 0)
#define _FP_FRAC_OVERP_4(fs,X) (_FP_FRAC_HIGH_##fs(X) & _FP_OVERFLOW_##fs) #define _FP_FRAC_OVERP_4(fs,X) (_FP_FRAC_HIGH_##fs(X) & _FP_OVERFLOW_##fs)
#define _FP_FRAC_CLEAR_OVERP_4(fs,X) (_FP_FRAC_HIGH_##fs(X) &= ~_FP_OVERFLOW_##fs)
#define _FP_FRAC_EQ_4(X,Y) \ #define _FP_FRAC_EQ_4(X,Y) \
(X##_f[0] == Y##_f[0] && X##_f[1] == Y##_f[1] \ (X##_f[0] == Y##_f[0] && X##_f[1] == Y##_f[1] \
......
...@@ -97,10 +97,9 @@ do { \ ...@@ -97,10 +97,9 @@ do { \
_FP_ROUND(wc, X); \ _FP_ROUND(wc, X); \
if (_FP_FRAC_OVERP_##wc(fs, X)) \ if (_FP_FRAC_OVERP_##wc(fs, X)) \
{ \ { \
_FP_FRAC_SRL_##wc(X, (_FP_WORKBITS+1)); \ _FP_FRAC_CLEAR_OVERP_##wc(fs, X); \
X##_e++; \ X##_e++; \
} \ } \
else \
_FP_FRAC_SRL_##wc(X, _FP_WORKBITS); \ _FP_FRAC_SRL_##wc(X, _FP_WORKBITS); \
if (X##_e >= _FP_EXPMAX_##fs) \ if (X##_e >= _FP_EXPMAX_##fs) \
{ \ { \
...@@ -780,9 +779,8 @@ do { \ ...@@ -780,9 +779,8 @@ do { \
X##_e -= (_FP_W_TYPE_SIZE - rsize); \ X##_e -= (_FP_W_TYPE_SIZE - rsize); \
X##_e = rsize - X##_e - 1; \ X##_e = rsize - X##_e - 1; \
\ \
r &= ~((rtype)1 << X##_e); \
if (_FP_FRACBITS_##fs < rsize && _FP_WFRACBITS_##fs < X##_e) \ if (_FP_FRACBITS_##fs < rsize && _FP_WFRACBITS_##fs < X##_e) \
__FP_FRAC_SRS_1(r, (X##_e - _FP_WFRACBITS_##fs), rsize); \ __FP_FRAC_SRS_1(r, (X##_e - _FP_WFRACBITS_##fs + 1), rsize); \
_FP_FRAC_DISASSEMBLE_##wc(X, ((unsigned rtype)r), rsize); \ _FP_FRAC_DISASSEMBLE_##wc(X, ((unsigned rtype)r), rsize); \
if ((_FP_WFRACBITS_##fs - X##_e - 1) > 0) \ if ((_FP_WFRACBITS_##fs - X##_e - 1) > 0) \
_FP_FRAC_SLL_##wc(X, (_FP_WFRACBITS_##fs - X##_e - 1)); \ _FP_FRAC_SLL_##wc(X, (_FP_WFRACBITS_##fs - X##_e - 1)); \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment