From 82a35159c9f0bdde9442c3b49bb1093a8f340b3f Mon Sep 17 00:00:00 2001
From: Antti Kantee <pooka@iki.fi>
Date: Thu, 15 Oct 2015 20:10:31 +0000
Subject: [PATCH] Specify bake-time special ldflags in global.mk

Finally decouples Makefile.app-tools from platform/x/Makefile
---
 global.mk                           | 2 ++
 platform/hw/Makefile                | 4 ++--
 platform/hw/arch/amd64/Makefile.inc | 2 --
 tests/nolibc/Makefile               | 4 +---
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/global.mk b/global.mk
index b75838c..a3bdd95 100644
--- a/global.mk
+++ b/global.mk
@@ -7,3 +7,5 @@ CFLAGS+= -Wall -Wimplicit -Wmissing-prototypes -Wstrict-prototypes
 ifndef NOGCCERROR
 CFLAGS+= -Werror
 endif
+
+LDFLAGS.hw.x86_64= -z max-page-size=0x1000
diff --git a/platform/hw/Makefile b/platform/hw/Makefile
index 8776d51..8cb366f 100644
--- a/platform/hw/Makefile
+++ b/platform/hw/Makefile
@@ -63,10 +63,10 @@ APP_TOOLS_DIR:= $(abspath ../../app-tools)
 include ${APP_TOOLS_DIR}/Makefile.app-tools
 
 include/hw/machine:
-	@ln -s ../arch/${MACHINE_ARCH} include/hw/machine
+	ln -sf ../arch/${MACHINE_ARCH} include/hw/machine
 
 ../../include/bmk-pcpu:
-	@ln -sf ../platform/hw/include/hw/machine $@
+	ln -sf ../platform/hw/include/hw/machine $@
 
 links: include/hw/machine ../../include/bmk-pcpu
 
diff --git a/platform/hw/arch/amd64/Makefile.inc b/platform/hw/arch/amd64/Makefile.inc
index 0219456..c7bcb04 100644
--- a/platform/hw/arch/amd64/Makefile.inc
+++ b/platform/hw/arch/amd64/Makefile.inc
@@ -14,8 +14,6 @@ CFLAGS+=	-mno-sse -mno-mmx
 # avoid having to figure out routing
 CFLAGS+=	-DBMK_SCREW_INTERRUPT_ROUTING
 
-LDFLAGS_BAKE+=	-z max-page-size=0x1000
-
 arch/amd64/locore.o: arch/amd64/locore.S
 	${CC} ${CFLAGS} ${CPPFLAGS} -D_LOCORE -c -o arch/amd64/locore.o $<
 
diff --git a/tests/nolibc/Makefile b/tests/nolibc/Makefile
index 19b6884..81d6739 100644
--- a/tests/nolibc/Makefile
+++ b/tests/nolibc/Makefile
@@ -17,9 +17,7 @@ CPPFLAGS+= -nostdlib
 
 LDSCRIPT=$(abspath ../../platform/${PLATFORM}/bmk.ldscript)
 
-ifeq (${MACHINE},amd64)
-LDFLAGS+= -z max-page-size=0x1000
-endif
+LDFLAGS+= ${LDFLAGS.${PLATFORM}.${MACHINE_ARCH}}
 
 ifeq (${MACHINE},i386)
 LDFLAGS+= -m elf_i386
-- 
2.39.5