aclindsa/aedrix-kernel
1
0
Fork 0
Code Releases Activity

Fixup for latest Arch ARM toolchain

Browse Source
This commit is contained in:
Aaron Lindsay
2014-09-08 19:42:05 -04:00
parent b51f8f8422
commit 884913b350
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -20,7 +20,7 @@ OBJDUMP = $(CROSS_COMPILE)objdump
# Define the flags we'll need for our tools # Define the flags we'll need for our tools
INCLUDES = -I include -I arch/$(ARCH)/include INCLUDES = -I include -I arch/$(ARCH)/include
KCFLAGS = -g -Wall -Wextra -Werror -nostdlib -nostartfiles -fno-builtin -std=gnu99 $(ARCH_KCFLAGS) -include config.h $(INCLUDES) KCFLAGS = -g -Wall -Wextra -Werror -nostdlib -nostartfiles -fno-builtin -std=gnu99 $(ARCH_KCFLAGS) -include config.h $(INCLUDES)
KLDFLAGS = -T arch/$(ARCH)/kernel.ld -L /usr/lib/gcc/arm-elf/4.7.0/ $(ARCH_KLDFLAGS) KLDFLAGS = -T arch/$(ARCH)/kernel.ld $(ARCH_KLDFLAGS)
EXTRA_LIBS = $(ARCH_EXTRA_LIBS) EXTRA_LIBS = $(ARCH_EXTRA_LIBS)
# Include the config file so we don't compile/link unnecessary objects # Include the config file so we don't compile/link unnecessary objects

4
arch/arm/kernel.mk
View File

@@ -4,8 +4,8 @@ SUBDIRS := kernel
include $(BASEDIR)/header.mk include $(BASEDIR)/header.mk
# Architecture-specific definitions # Architecture-specific definitions
CROSS_COMPILE ?= arm-elf- CROSS_COMPILE ?= arm-none-eabi-
ARCH_KCFLAGS = ARCH_KLDFLAGS = -L /usr/lib/gcc/arm-none-eabi/4.9.1
ARCH_EXTRA_LIBS = -lgcc ARCH_EXTRA_LIBS = -lgcc
OBJS_$(d) := $(d)/start.o OBJS_$(d) := $(d)/start.o