From 712d9c026d1aacebc643b99f7c736c21bba03f03 Mon Sep 17 00:00:00 2001 From: Antti Kantee Date: Wed, 14 Oct 2015 14:00:16 +0000 Subject: [PATCH] Don't require every arch Makefile to specify LDSCRIPT. It's always ${ARCHDIR}/kern.ldscript. --- platform/hw/Makefile | 2 +- platform/hw/arch/amd64/Makefile.inc | 2 -- platform/hw/arch/arm/integrator/Makefile.inc | 1 - platform/hw/arch/i386/Makefile.inc | 2 -- 4 files changed, 1 insertion(+), 6 deletions(-) diff --git a/platform/hw/Makefile b/platform/hw/Makefile index bc94039..d51d015 100644 --- a/platform/hw/Makefile +++ b/platform/hw/Makefile @@ -58,7 +58,7 @@ include arch/${ARCHDIR}/Makefile.inc APP_TOOLS_PLATFORM= hw APP_TOOLS_OBJS_BAKE= ${MAINOBJ} -APP_TOOLS_LDSCRIPT_BAKE:= $(abspath ${LDSCRIPT}) +APP_TOOLS_LDSCRIPT_BAKE:= $(abspath arch/${ARCHDIR}/kern.ldscript) APP_TOOLS_DIR:= $(abspath ../../app-tools) include ${APP_TOOLS_DIR}/Makefile.app-tools diff --git a/platform/hw/arch/amd64/Makefile.inc b/platform/hw/arch/amd64/Makefile.inc index 8a00b56..0219456 100644 --- a/platform/hw/arch/amd64/Makefile.inc +++ b/platform/hw/arch/amd64/Makefile.inc @@ -8,8 +8,6 @@ OBJS_BMK+= arch/x86/x86_subr.o OBJS_BMK+= arch/x86/clock.o OBJS_BMK+= arch/x86/hypervisor.o -LDSCRIPT= arch/amd64/kern.ldscript - CFLAGS+= -mno-sse -mno-mmx # squash all interrupts to a single level to diff --git a/platform/hw/arch/arm/integrator/Makefile.inc b/platform/hw/arch/arm/integrator/Makefile.inc index 187efd8..98ea338 100644 --- a/platform/hw/arch/arm/integrator/Makefile.inc +++ b/platform/hw/arch/arm/integrator/Makefile.inc @@ -1,7 +1,6 @@ OBJS_BMK+= arch/arm/integrator/locore.o OBJS_BMK+= arch/arm/integrator/machdep.o OBJS_BMK+= arch/arm/integrator/serialcons.o -LDSCRIPT= arch/arm/integrator/kern.ldscript CPPFLAGS+= -Iarch/arm diff --git a/platform/hw/arch/i386/Makefile.inc b/platform/hw/arch/i386/Makefile.inc index 1abdee1..2ef586d 100644 --- a/platform/hw/arch/i386/Makefile.inc +++ b/platform/hw/arch/i386/Makefile.inc @@ -7,8 +7,6 @@ OBJS_BMK+= arch/x86/x86_subr.o OBJS_BMK+= arch/x86/clock.o OBJS_BMK+= arch/x86/hypervisor.o -LDSCRIPT= arch/i386/kern.ldscript - CFLAGS+= -mno-sse -mno-mmx -march=i686 arch/i386/locore.o: arch/i386/locore.S -- 2.39.5