Specify bake-time special ldflags in global.mk

Finally decouples Makefile.app-tools from platform/x/Makefile

diff --git a/global.mk b/global.mk
index b75838ceefb1268429c919bfdb8eccf9521fa856..a3bdd95f9770c3ad962b835769169aff8739fe7d 100644 (file)
--- 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 8776d51e44d34ff039bac6ef739f8433b60a80b0..8cb366f68eea239975f503de8edec9f55abfc9f3 100644 (file)
--- 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 0219456b9887e3429a962b115bd8b6bfe7686c11..c7bcb0471b8b3b45e1fd1a497d8b8f2e28ae3bd1 100644 (file)
--- 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 19b688414e87a52e876f287b64f7ec9a7dc3f8b9..81d6739e153e67106f37f71b75815063026524b9 100644 (file)
--- 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