moved all the ARM compiler definitions into one file

kernel/Makefile

@@ -28,24 +28,9 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 # "Raspberry Pi" is a trademark of the Raspberry Pi Foundation.
-
 MAKEFLAGS += -rR
-
-ARMDIR ?= /opt/gnuarm/bin
-ARMPREFIX ?= arm-none-eabi
-CC = $(ARMDIR)/$(ARMPREFIX)-gcc
-CPP = $(ARMDIR)/$(ARMPREFIX)-cpp
-AS = $(ARMDIR)/$(ARMPREFIX)-as
-LD = $(ARMDIR)/$(ARMPREFIX)-ld
-OBJDUMP = $(ARMDIR)/$(ARMPREFIX)-objdump
-OBJCOPY = $(ARMDIR)/$(ARMPREFIX)-objcopy
-
-DEFS = -D__COMROGUE_INTERNALS__
-INCLUDES = -I../include -I../idl
-CFLAGS = $(INCLUDES) -mabi=aapcs -mfloat-abi=hard -mcpu=arm1176jzf-s -Wall -O2 \
-	-nostdlib -nostartfiles -ffreestanding $(DEFS)
-AFLAGS = -mcpu=arm1176jzf-s -mfloat-abi=hard
-ASM_CPP_FLAGS = $(INCLUDES) $(DEFS) -D__ASM__
+CRBASEDIR := $(abspath ..)
+include $(CRBASEDIR)/armcompile.mk
 
 PRESTART_OBJS = prestart.o early_trace.o collect_startup.o early_mm.o
 LIB_OBJS = divide.o qdivrem.o intlib.o objhelp.o rbtree.o str.o strcopymem.o strcomparemem.o strsetmem.o lib_guids.o
@@ -54,24 +39,14 @@ INIT_OBJS = start.o kistart.o init_heap.o
 
 all:	kernel.img
 
-kernel.elf : $(PRESTART_OBJS) $(LIB_OBJS) $(RES_OBJS) $(INIT_OBJS) kernel.lds
+kernel.elf: $(PRESTART_OBJS) $(LIB_OBJS) $(RES_OBJS) $(INIT_OBJS) kernel.lds
 	$(LD) -T kernel.lds $(PRESTART_OBJS) $(LIB_OBJS) $(RES_OBJS) $(INIT_OBJS) -o kernel.elf
 
-kernel.img : kernel.elf
+kernel.img: kernel.elf
 	$(OBJDUMP) -D kernel.elf > kernel.list
 	$(OBJDUMP) -t kernel.elf > kernel.syms
 	sort kernel.syms > kernel.syms.sorted
 	$(OBJCOPY) kernel.elf -O binary kernel.img
 
-%.lds: %.Lds
-	$(CPP) $(ASM_CPP_FLAGS) -P -o $@ $<
-
-%.o: %.S
-	$(CPP) $(ASM_CPP_FLAGS) -o $(basename $<).s $<
-	$(AS) $(AFLAGS) -o $@ $(basename $<).s
-
-%.o: %.c
-	$(CC) $(CFLAGS) -c -o $@ $<
-
 clean:
 	-rm *.o *.s *.lds kernel.img kernel.elf kernel.list kernel.syms*