Merge

diff --cc arch/sparc64/solaris/Makefile
index 8dbb83fa326d2cdd85cf17b427f48acae1127c4d,f29e6b8e004245c96d458aa1fa83ae6a7a12cdab..991fb75ecac343d1b537097d44e14daa9174c074
--- 1/arch/sparc64/solaris/Makefile
--- 2/arch/sparc64/solaris/Makefile
+++ b/arch/sparc64/solaris/Makefile
@@@ -1,17 -1,21 +1,14 @@@
  #
  # Makefile for the Solaris binary emulation.
  #
 -# 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...
  
+ USE_STANDARD_AS_RULE := true
+ EXTRA_AFLAGS := -ansi
+ 
  ifeq ($(CONFIG_SOLARIS_EMUL),m)
- CPPFLAGS = $(MODFLAGS)
+   EXTRA_AFLAGS += $(MODFLAGS)
  endif
  
- .S.s:
-       $(CPP) $(AFLAGS) $(CPPFLAGS) -ansi $< -o $*.s
- 
- .S.o:
-       $(CC) $(AFLAGS) $(CPPFLAGS) -ansi -c $< -o $*.o
 -list-multi := solaris.o
--
  solaris-objs := entry64.o fs.o misc.o signal.o systbl.o socket.o \
                ioctl.o ipc.o socksys.o timod.o