feat: build userspace programs with the x86_64-montauk toolchain
Switch all program and library Makefiles from host g++ (or the bare-metal x86_64-elf compiler) to x86_64-montauk-g++/gcc and drop the flags the target now owns: -nostdinc + kernel freestanding -isystem paths, -m64/-march, -fno-PIC, -mno-red-zone, -mcmodel=small, -static, -Wl,-m,elf_x86_64, -z max-page-size, --build-id=none. Deliberate policy flags stay (-ffreestanding, per-app SSE, -nostdlib + link.ld). Program builds now require the montauk toolchain and fail with a pointer to build-montauk-toolchain.sh; lib/ and libs/ keep the host fallback since the toolchain script bootstraps libc through it. Userspace is also now pinned to the cross GCC instead of drifting with the distro compiler. Co-Authored-By: Claude Fable 5 <[email protected]>
This commit is contained in:
@@ -12,4 +12,4 @@
|
|||||||
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#define MONTAUK_BUILD_NUMBER 6
|
#define MONTAUK_BUILD_NUMBER 7
|
||||||
|
|||||||
+9
-19
@@ -6,50 +6,40 @@ MAKEFLAGS += -rR
|
|||||||
ARCH := x86_64
|
ARCH := x86_64
|
||||||
|
|
||||||
# Auto-detect cross compiler from toolchain/local/.
|
# Auto-detect cross compiler from toolchain/local/.
|
||||||
TOOLCHAIN_PREFIX := $(shell cd .. && pwd)/toolchain/local/bin/x86_64-elf-
|
TOOLCHAIN_PREFIX := $(shell cd .. && pwd)/toolchain/local/bin/x86_64-montauk-
|
||||||
ifneq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
ifeq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
||||||
|
CXX = $(error x86_64-montauk toolchain not found. Run ./toolchain/build-montauk-toolchain.sh first)
|
||||||
|
CC = $(error x86_64-montauk toolchain not found. Run ./toolchain/build-montauk-toolchain.sh first)
|
||||||
|
else
|
||||||
CXX := $(TOOLCHAIN_PREFIX)g++
|
CXX := $(TOOLCHAIN_PREFIX)g++
|
||||||
CC := $(TOOLCHAIN_PREFIX)gcc
|
CC := $(TOOLCHAIN_PREFIX)gcc
|
||||||
else
|
|
||||||
CXX := g++
|
|
||||||
CC := gcc
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Compiler flags: freestanding, no stdlib, kernel-mode compatible.
|
# Compiler flags. The x86_64-montauk toolchain supplies the target ABI
|
||||||
|
# (static ET_EXEC, 4 KiB pages, no red zone) and header paths; system
|
||||||
|
# programs additionally avoid FP/SIMD and their own runtime (-nostdlib).
|
||||||
override CXXFLAGS := \
|
override CXXFLAGS := \
|
||||||
-std=gnu++20 \
|
-std=gnu++20 \
|
||||||
-g -O2 -pipe \
|
-g -O2 -pipe \
|
||||||
-Wall \
|
-Wall \
|
||||||
-Wextra \
|
-Wextra \
|
||||||
-nostdinc \
|
|
||||||
-ffreestanding \
|
-ffreestanding \
|
||||||
-fno-stack-protector \
|
-fno-stack-protector \
|
||||||
-fno-stack-check \
|
-fno-stack-check \
|
||||||
-fno-PIC \
|
|
||||||
-fno-rtti \
|
-fno-rtti \
|
||||||
-fno-exceptions \
|
-fno-exceptions \
|
||||||
-ffunction-sections \
|
-ffunction-sections \
|
||||||
-fdata-sections \
|
-fdata-sections \
|
||||||
-m64 \
|
|
||||||
-march=x86-64 \
|
|
||||||
-mno-80387 \
|
-mno-80387 \
|
||||||
-mno-mmx \
|
-mno-mmx \
|
||||||
-mno-sse \
|
-mno-sse \
|
||||||
-mno-sse2 \
|
-mno-sse2 \
|
||||||
-mno-red-zone \
|
-I include
|
||||||
-mcmodel=small \
|
|
||||||
-I include \
|
|
||||||
-isystem ../kernel/freestnd-c-hdrs/x86_64/include \
|
|
||||||
-isystem ../kernel/freestnd-cxx-hdrs/x86_64/include
|
|
||||||
|
|
||||||
# Linker flags: freestanding static ELF.
|
# Linker flags: freestanding static ELF.
|
||||||
override LDFLAGS := \
|
override LDFLAGS := \
|
||||||
-nostdlib \
|
-nostdlib \
|
||||||
-static \
|
|
||||||
-Wl,--build-id=none \
|
|
||||||
-Wl,--gc-sections \
|
-Wl,--gc-sections \
|
||||||
-Wl,-m,elf_x86_64 \
|
|
||||||
-z max-page-size=0x1000 \
|
|
||||||
-T link.ld
|
-T link.ld
|
||||||
|
|
||||||
# Output directory.
|
# Output directory.
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ MAKEFLAGS += -rR
|
|||||||
|
|
||||||
# ---- Toolchain ----
|
# ---- Toolchain ----
|
||||||
|
|
||||||
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-elf-
|
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-montauk-
|
||||||
ifneq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
ifneq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
||||||
CC := $(TOOLCHAIN_PREFIX)gcc
|
CC := $(TOOLCHAIN_PREFIX)gcc
|
||||||
AR := $(TOOLCHAIN_PREFIX)ar
|
AR := $(TOOLCHAIN_PREFIX)ar
|
||||||
|
|||||||
Binary file not shown.
@@ -6,7 +6,7 @@ MAKEFLAGS += -rR
|
|||||||
|
|
||||||
# ---- Toolchain ----
|
# ---- Toolchain ----
|
||||||
|
|
||||||
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-elf-
|
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-montauk-
|
||||||
ifneq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
ifneq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
||||||
CC := $(TOOLCHAIN_PREFIX)gcc
|
CC := $(TOOLCHAIN_PREFIX)gcc
|
||||||
AR := $(TOOLCHAIN_PREFIX)ar
|
AR := $(TOOLCHAIN_PREFIX)ar
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
@@ -6,7 +6,7 @@ MAKEFLAGS += -rR
|
|||||||
|
|
||||||
# ---- Toolchain ----
|
# ---- Toolchain ----
|
||||||
|
|
||||||
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-elf-
|
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-montauk-
|
||||||
ifneq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
ifneq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
||||||
CC := $(TOOLCHAIN_PREFIX)gcc
|
CC := $(TOOLCHAIN_PREFIX)gcc
|
||||||
AR := $(TOOLCHAIN_PREFIX)ar
|
AR := $(TOOLCHAIN_PREFIX)ar
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
@@ -6,7 +6,7 @@ MAKEFLAGS += -rR
|
|||||||
|
|
||||||
# ---- Toolchain ----
|
# ---- Toolchain ----
|
||||||
|
|
||||||
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-elf-
|
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-montauk-
|
||||||
ifneq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
ifneq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
||||||
CXX := $(TOOLCHAIN_PREFIX)g++
|
CXX := $(TOOLCHAIN_PREFIX)g++
|
||||||
AR := $(TOOLCHAIN_PREFIX)ar
|
AR := $(TOOLCHAIN_PREFIX)ar
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
@@ -4,7 +4,7 @@
|
|||||||
MAKEFLAGS += -rR
|
MAKEFLAGS += -rR
|
||||||
.SUFFIXES:
|
.SUFFIXES:
|
||||||
|
|
||||||
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-elf-
|
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-montauk-
|
||||||
ifneq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
ifneq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
||||||
CXX := $(TOOLCHAIN_PREFIX)g++
|
CXX := $(TOOLCHAIN_PREFIX)g++
|
||||||
LD := $(TOOLCHAIN_PREFIX)ld
|
LD := $(TOOLCHAIN_PREFIX)ld
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
MAKEFLAGS += -rR
|
MAKEFLAGS += -rR
|
||||||
.SUFFIXES:
|
.SUFFIXES:
|
||||||
|
|
||||||
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-elf-
|
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-montauk-
|
||||||
ifneq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
ifneq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
||||||
CXX := $(TOOLCHAIN_PREFIX)g++
|
CXX := $(TOOLCHAIN_PREFIX)g++
|
||||||
LD := $(TOOLCHAIN_PREFIX)ld
|
LD := $(TOOLCHAIN_PREFIX)ld
|
||||||
|
|||||||
Binary file not shown.
@@ -4,7 +4,7 @@
|
|||||||
MAKEFLAGS += -rR
|
MAKEFLAGS += -rR
|
||||||
.SUFFIXES:
|
.SUFFIXES:
|
||||||
|
|
||||||
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-elf-
|
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-montauk-
|
||||||
ifneq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
ifneq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
||||||
CXX := $(TOOLCHAIN_PREFIX)g++
|
CXX := $(TOOLCHAIN_PREFIX)g++
|
||||||
LD := $(TOOLCHAIN_PREFIX)ld
|
LD := $(TOOLCHAIN_PREFIX)ld
|
||||||
|
|||||||
Binary file not shown.
@@ -4,11 +4,11 @@
|
|||||||
MAKEFLAGS += -rR
|
MAKEFLAGS += -rR
|
||||||
.SUFFIXES:
|
.SUFFIXES:
|
||||||
|
|
||||||
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-elf-
|
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-montauk-
|
||||||
ifneq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
ifeq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
||||||
CXX := $(TOOLCHAIN_PREFIX)g++
|
CXX = $(error x86_64-montauk toolchain not found. Run ./toolchain/build-montauk-toolchain.sh first)
|
||||||
else
|
else
|
||||||
CXX := g++
|
CXX := $(TOOLCHAIN_PREFIX)g++
|
||||||
endif
|
endif
|
||||||
|
|
||||||
PROG_INC := ../../include
|
PROG_INC := ../../include
|
||||||
@@ -24,34 +24,22 @@ CXXFLAGS := \
|
|||||||
-Wextra \
|
-Wextra \
|
||||||
-Wno-unused-parameter \
|
-Wno-unused-parameter \
|
||||||
-Wno-unused-function \
|
-Wno-unused-function \
|
||||||
-nostdinc \
|
|
||||||
-ffreestanding \
|
-ffreestanding \
|
||||||
-fno-stack-protector \
|
-fno-stack-protector \
|
||||||
-fno-stack-check \
|
-fno-stack-check \
|
||||||
-fno-PIC \
|
|
||||||
-fno-rtti \
|
-fno-rtti \
|
||||||
-fno-exceptions \
|
-fno-exceptions \
|
||||||
-ffunction-sections \
|
-ffunction-sections \
|
||||||
-fdata-sections \
|
-fdata-sections \
|
||||||
-m64 \
|
|
||||||
-march=x86-64 \
|
|
||||||
-msse \
|
-msse \
|
||||||
-msse2 \
|
-msse2 \
|
||||||
-mno-red-zone \
|
|
||||||
-mcmodel=small \
|
|
||||||
-MMD -MP \
|
-MMD -MP \
|
||||||
-I $(PROG_INC) \
|
-I $(PROG_INC) \
|
||||||
-isystem $(PROG_INC)/libc \
|
-isystem $(PROG_INC)/libc
|
||||||
-isystem ../../../kernel/freestnd-c-hdrs/x86_64/include \
|
|
||||||
-isystem ../../../kernel/freestnd-cxx-hdrs/x86_64/include
|
|
||||||
|
|
||||||
LDFLAGS := \
|
LDFLAGS := \
|
||||||
-nostdlib \
|
-nostdlib \
|
||||||
-static \
|
|
||||||
-Wl,--build-id=none \
|
|
||||||
-Wl,--gc-sections \
|
-Wl,--gc-sections \
|
||||||
-Wl,-m,elf_x86_64 \
|
|
||||||
-z max-page-size=0x1000 \
|
|
||||||
-T $(LINK_LD)
|
-T $(LINK_LD)
|
||||||
|
|
||||||
SRCS := main.cpp stb_truetype_impl.cpp
|
SRCS := main.cpp stb_truetype_impl.cpp
|
||||||
|
|||||||
@@ -6,11 +6,11 @@ MAKEFLAGS += -rR
|
|||||||
|
|
||||||
# ---- Toolchain ----
|
# ---- Toolchain ----
|
||||||
|
|
||||||
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-elf-
|
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-montauk-
|
||||||
ifneq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
ifeq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
||||||
CXX := $(TOOLCHAIN_PREFIX)g++
|
CXX = $(error x86_64-montauk toolchain not found. Run ./toolchain/build-montauk-toolchain.sh first)
|
||||||
else
|
else
|
||||||
CXX := g++
|
CXX := $(TOOLCHAIN_PREFIX)g++
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# ---- Paths ----
|
# ---- Paths ----
|
||||||
@@ -30,35 +30,23 @@ CXXFLAGS := \
|
|||||||
-Wextra \
|
-Wextra \
|
||||||
-Wno-unused-parameter \
|
-Wno-unused-parameter \
|
||||||
-Wno-unused-function \
|
-Wno-unused-function \
|
||||||
-nostdinc \
|
|
||||||
-ffreestanding \
|
-ffreestanding \
|
||||||
-fno-stack-protector \
|
-fno-stack-protector \
|
||||||
-fno-stack-check \
|
-fno-stack-check \
|
||||||
-fno-PIC \
|
|
||||||
-fno-rtti \
|
-fno-rtti \
|
||||||
-fno-exceptions \
|
-fno-exceptions \
|
||||||
-ffunction-sections \
|
-ffunction-sections \
|
||||||
-fdata-sections \
|
-fdata-sections \
|
||||||
-m64 \
|
|
||||||
-march=x86-64 \
|
|
||||||
-msse \
|
-msse \
|
||||||
-msse2 \
|
-msse2 \
|
||||||
-mno-red-zone \
|
|
||||||
-mcmodel=small \
|
|
||||||
-I $(PROG_INC) \
|
-I $(PROG_INC) \
|
||||||
-isystem $(PROG_INC)/libc \
|
-isystem $(PROG_INC)/libc
|
||||||
-isystem ../../../kernel/freestnd-c-hdrs/x86_64/include \
|
|
||||||
-isystem ../../../kernel/freestnd-cxx-hdrs/x86_64/include
|
|
||||||
|
|
||||||
# ---- Linker flags ----
|
# ---- Linker flags ----
|
||||||
|
|
||||||
LDFLAGS := \
|
LDFLAGS := \
|
||||||
-nostdlib \
|
-nostdlib \
|
||||||
-static \
|
|
||||||
-Wl,--build-id=none \
|
|
||||||
-Wl,--gc-sections \
|
-Wl,--gc-sections \
|
||||||
-Wl,-m,elf_x86_64 \
|
|
||||||
-z max-page-size=0x1000 \
|
|
||||||
-T $(LINK_LD)
|
-T $(LINK_LD)
|
||||||
|
|
||||||
# ---- Source files ----
|
# ---- Source files ----
|
||||||
|
|||||||
@@ -6,11 +6,11 @@ MAKEFLAGS += -rR
|
|||||||
|
|
||||||
# ---- Toolchain ----
|
# ---- Toolchain ----
|
||||||
|
|
||||||
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-elf-
|
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-montauk-
|
||||||
ifneq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
ifeq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
||||||
CXX := $(TOOLCHAIN_PREFIX)g++
|
CXX = $(error x86_64-montauk toolchain not found. Run ./toolchain/build-montauk-toolchain.sh first)
|
||||||
else
|
else
|
||||||
CXX := g++
|
CXX := $(TOOLCHAIN_PREFIX)g++
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# ---- Paths ----
|
# ---- Paths ----
|
||||||
@@ -30,35 +30,23 @@ CXXFLAGS := \
|
|||||||
-Wextra \
|
-Wextra \
|
||||||
-Wno-unused-parameter \
|
-Wno-unused-parameter \
|
||||||
-Wno-unused-function \
|
-Wno-unused-function \
|
||||||
-nostdinc \
|
|
||||||
-ffreestanding \
|
-ffreestanding \
|
||||||
-fno-stack-protector \
|
-fno-stack-protector \
|
||||||
-fno-stack-check \
|
-fno-stack-check \
|
||||||
-fno-PIC \
|
|
||||||
-fno-rtti \
|
-fno-rtti \
|
||||||
-fno-exceptions \
|
-fno-exceptions \
|
||||||
-ffunction-sections \
|
-ffunction-sections \
|
||||||
-fdata-sections \
|
-fdata-sections \
|
||||||
-m64 \
|
|
||||||
-march=x86-64 \
|
|
||||||
-msse \
|
-msse \
|
||||||
-msse2 \
|
-msse2 \
|
||||||
-mno-red-zone \
|
|
||||||
-mcmodel=small \
|
|
||||||
-I $(PROG_INC) \
|
-I $(PROG_INC) \
|
||||||
-isystem $(PROG_INC)/libc \
|
-isystem $(PROG_INC)/libc
|
||||||
-isystem ../../../kernel/freestnd-c-hdrs/x86_64/include \
|
|
||||||
-isystem ../../../kernel/freestnd-cxx-hdrs/x86_64/include
|
|
||||||
|
|
||||||
# ---- Linker flags ----
|
# ---- Linker flags ----
|
||||||
|
|
||||||
LDFLAGS := \
|
LDFLAGS := \
|
||||||
-nostdlib \
|
-nostdlib \
|
||||||
-static \
|
|
||||||
-Wl,--build-id=none \
|
|
||||||
-Wl,--gc-sections \
|
-Wl,--gc-sections \
|
||||||
-Wl,-m,elf_x86_64 \
|
|
||||||
-z max-page-size=0x1000 \
|
|
||||||
-T $(LINK_LD)
|
-T $(LINK_LD)
|
||||||
|
|
||||||
# ---- Source files ----
|
# ---- Source files ----
|
||||||
|
|||||||
@@ -6,11 +6,11 @@ MAKEFLAGS += -rR
|
|||||||
|
|
||||||
# ---- Toolchain ----
|
# ---- Toolchain ----
|
||||||
|
|
||||||
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-elf-
|
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-montauk-
|
||||||
ifneq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
ifeq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
||||||
CXX := $(TOOLCHAIN_PREFIX)g++
|
CXX = $(error x86_64-montauk toolchain not found. Run ./toolchain/build-montauk-toolchain.sh first)
|
||||||
else
|
else
|
||||||
CXX := g++
|
CXX := $(TOOLCHAIN_PREFIX)g++
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# ---- Paths ----
|
# ---- Paths ----
|
||||||
@@ -30,35 +30,23 @@ CXXFLAGS := \
|
|||||||
-Wextra \
|
-Wextra \
|
||||||
-Wno-unused-parameter \
|
-Wno-unused-parameter \
|
||||||
-Wno-unused-function \
|
-Wno-unused-function \
|
||||||
-nostdinc \
|
|
||||||
-ffreestanding \
|
-ffreestanding \
|
||||||
-fno-stack-protector \
|
-fno-stack-protector \
|
||||||
-fno-stack-check \
|
-fno-stack-check \
|
||||||
-fno-PIC \
|
|
||||||
-fno-rtti \
|
-fno-rtti \
|
||||||
-fno-exceptions \
|
-fno-exceptions \
|
||||||
-ffunction-sections \
|
-ffunction-sections \
|
||||||
-fdata-sections \
|
-fdata-sections \
|
||||||
-m64 \
|
|
||||||
-march=x86-64 \
|
|
||||||
-msse \
|
-msse \
|
||||||
-msse2 \
|
-msse2 \
|
||||||
-mno-red-zone \
|
|
||||||
-mcmodel=small \
|
|
||||||
-I $(PROG_INC) \
|
-I $(PROG_INC) \
|
||||||
-isystem $(PROG_INC)/libc \
|
-isystem $(PROG_INC)/libc
|
||||||
-isystem ../../../kernel/freestnd-c-hdrs/x86_64/include \
|
|
||||||
-isystem ../../../kernel/freestnd-cxx-hdrs/x86_64/include
|
|
||||||
|
|
||||||
# ---- Linker flags ----
|
# ---- Linker flags ----
|
||||||
|
|
||||||
LDFLAGS := \
|
LDFLAGS := \
|
||||||
-nostdlib \
|
-nostdlib \
|
||||||
-static \
|
|
||||||
-Wl,--build-id=none \
|
|
||||||
-Wl,--gc-sections \
|
-Wl,--gc-sections \
|
||||||
-Wl,-m,elf_x86_64 \
|
|
||||||
-z max-page-size=0x1000 \
|
|
||||||
-T $(LINK_LD)
|
-T $(LINK_LD)
|
||||||
|
|
||||||
# ---- Source files ----
|
# ---- Source files ----
|
||||||
|
|||||||
@@ -6,11 +6,11 @@ MAKEFLAGS += -rR
|
|||||||
|
|
||||||
# ---- Toolchain ----
|
# ---- Toolchain ----
|
||||||
|
|
||||||
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-elf-
|
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-montauk-
|
||||||
ifneq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
ifeq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
||||||
CXX := $(TOOLCHAIN_PREFIX)g++
|
CXX = $(error x86_64-montauk toolchain not found. Run ./toolchain/build-montauk-toolchain.sh first)
|
||||||
else
|
else
|
||||||
CXX := g++
|
CXX := $(TOOLCHAIN_PREFIX)g++
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# ---- Paths ----
|
# ---- Paths ----
|
||||||
@@ -30,35 +30,23 @@ CXXFLAGS := \
|
|||||||
-Wextra \
|
-Wextra \
|
||||||
-Wno-unused-parameter \
|
-Wno-unused-parameter \
|
||||||
-Wno-unused-function \
|
-Wno-unused-function \
|
||||||
-nostdinc \
|
|
||||||
-ffreestanding \
|
-ffreestanding \
|
||||||
-fno-stack-protector \
|
-fno-stack-protector \
|
||||||
-fno-stack-check \
|
-fno-stack-check \
|
||||||
-fno-PIC \
|
|
||||||
-fno-rtti \
|
-fno-rtti \
|
||||||
-fno-exceptions \
|
-fno-exceptions \
|
||||||
-ffunction-sections \
|
-ffunction-sections \
|
||||||
-fdata-sections \
|
-fdata-sections \
|
||||||
-m64 \
|
|
||||||
-march=x86-64 \
|
|
||||||
-msse \
|
-msse \
|
||||||
-msse2 \
|
-msse2 \
|
||||||
-mno-red-zone \
|
|
||||||
-mcmodel=small \
|
|
||||||
-I $(PROG_INC) \
|
-I $(PROG_INC) \
|
||||||
-isystem $(PROG_INC)/libc \
|
-isystem $(PROG_INC)/libc
|
||||||
-isystem ../../../kernel/freestnd-c-hdrs/x86_64/include \
|
|
||||||
-isystem ../../../kernel/freestnd-cxx-hdrs/x86_64/include
|
|
||||||
|
|
||||||
# ---- Linker flags ----
|
# ---- Linker flags ----
|
||||||
|
|
||||||
LDFLAGS := \
|
LDFLAGS := \
|
||||||
-nostdlib \
|
-nostdlib \
|
||||||
-static \
|
|
||||||
-Wl,--build-id=none \
|
|
||||||
-Wl,--gc-sections \
|
-Wl,--gc-sections \
|
||||||
-Wl,-m,elf_x86_64 \
|
|
||||||
-z max-page-size=0x1000 \
|
|
||||||
-T $(LINK_LD)
|
-T $(LINK_LD)
|
||||||
|
|
||||||
# ---- Source files ----
|
# ---- Source files ----
|
||||||
|
|||||||
@@ -4,11 +4,11 @@
|
|||||||
MAKEFLAGS += -rR
|
MAKEFLAGS += -rR
|
||||||
.SUFFIXES:
|
.SUFFIXES:
|
||||||
|
|
||||||
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-elf-
|
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-montauk-
|
||||||
ifneq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
ifeq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
||||||
CXX := $(TOOLCHAIN_PREFIX)g++
|
CXX = $(error x86_64-montauk toolchain not found. Run ./toolchain/build-montauk-toolchain.sh first)
|
||||||
else
|
else
|
||||||
CXX := g++
|
CXX := $(TOOLCHAIN_PREFIX)g++
|
||||||
endif
|
endif
|
||||||
|
|
||||||
PROG_INC := ../../include
|
PROG_INC := ../../include
|
||||||
@@ -24,35 +24,23 @@ CXXFLAGS := \
|
|||||||
-Wextra \
|
-Wextra \
|
||||||
-Wno-unused-parameter \
|
-Wno-unused-parameter \
|
||||||
-Wno-unused-function \
|
-Wno-unused-function \
|
||||||
-nostdinc \
|
|
||||||
-ffreestanding \
|
-ffreestanding \
|
||||||
-fno-stack-protector \
|
-fno-stack-protector \
|
||||||
-fno-stack-check \
|
-fno-stack-check \
|
||||||
-fno-PIC \
|
|
||||||
-fno-rtti \
|
-fno-rtti \
|
||||||
-fno-exceptions \
|
-fno-exceptions \
|
||||||
-ffunction-sections \
|
-ffunction-sections \
|
||||||
-fdata-sections \
|
-fdata-sections \
|
||||||
-m64 \
|
|
||||||
-march=x86-64 \
|
|
||||||
-msse \
|
-msse \
|
||||||
-msse2 \
|
-msse2 \
|
||||||
-mno-red-zone \
|
|
||||||
-mcmodel=small \
|
|
||||||
-MMD -MP \
|
-MMD -MP \
|
||||||
-I $(PROG_INC) \
|
-I $(PROG_INC) \
|
||||||
-isystem $(PROG_INC)/libc \
|
-isystem $(PROG_INC)/libc \
|
||||||
-I ../../lib/bearssl/inc \
|
-I ../../lib/bearssl/inc
|
||||||
-isystem ../../../kernel/freestnd-c-hdrs/x86_64/include \
|
|
||||||
-isystem ../../../kernel/freestnd-cxx-hdrs/x86_64/include
|
|
||||||
|
|
||||||
LDFLAGS := \
|
LDFLAGS := \
|
||||||
-nostdlib \
|
-nostdlib \
|
||||||
-static \
|
|
||||||
-Wl,--build-id=none \
|
|
||||||
-Wl,--gc-sections \
|
-Wl,--gc-sections \
|
||||||
-Wl,-m,elf_x86_64 \
|
|
||||||
-z max-page-size=0x1000 \
|
|
||||||
-T $(LINK_LD)
|
-T $(LINK_LD)
|
||||||
|
|
||||||
SRCS := main.cpp stb_truetype_impl.cpp font_data.cpp
|
SRCS := main.cpp stb_truetype_impl.cpp font_data.cpp
|
||||||
|
|||||||
@@ -6,11 +6,11 @@ MAKEFLAGS += -rR
|
|||||||
|
|
||||||
# ---- Toolchain ----
|
# ---- Toolchain ----
|
||||||
|
|
||||||
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-elf-
|
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-montauk-
|
||||||
ifneq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
ifeq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
||||||
CXX := $(TOOLCHAIN_PREFIX)g++
|
CXX = $(error x86_64-montauk toolchain not found. Run ./toolchain/build-montauk-toolchain.sh first)
|
||||||
else
|
else
|
||||||
CXX := g++
|
CXX := $(TOOLCHAIN_PREFIX)g++
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# ---- Paths ----
|
# ---- Paths ----
|
||||||
@@ -33,37 +33,25 @@ CXXFLAGS := \
|
|||||||
-Wextra \
|
-Wextra \
|
||||||
-Wno-unused-parameter \
|
-Wno-unused-parameter \
|
||||||
-Wno-unused-function \
|
-Wno-unused-function \
|
||||||
-nostdinc \
|
|
||||||
-ffreestanding \
|
-ffreestanding \
|
||||||
-fno-stack-protector \
|
-fno-stack-protector \
|
||||||
-fno-stack-check \
|
-fno-stack-check \
|
||||||
-fno-PIC \
|
|
||||||
-fno-rtti \
|
-fno-rtti \
|
||||||
-fno-exceptions \
|
-fno-exceptions \
|
||||||
-ffunction-sections \
|
-ffunction-sections \
|
||||||
-fdata-sections \
|
-fdata-sections \
|
||||||
-m64 \
|
|
||||||
-march=x86-64 \
|
|
||||||
-msse \
|
-msse \
|
||||||
-msse2 \
|
-msse2 \
|
||||||
-mno-red-zone \
|
|
||||||
-mcmodel=small \
|
|
||||||
-MMD -MP \
|
-MMD -MP \
|
||||||
-I $(PROG_INC) \
|
-I $(PROG_INC) \
|
||||||
-isystem $(PROG_INC)/libc \
|
-isystem $(PROG_INC)/libc \
|
||||||
-I $(BEARSSL)/inc \
|
-I $(BEARSSL)/inc
|
||||||
-isystem ../../../kernel/freestnd-c-hdrs/x86_64/include \
|
|
||||||
-isystem ../../../kernel/freestnd-cxx-hdrs/x86_64/include
|
|
||||||
|
|
||||||
# ---- Linker flags ----
|
# ---- Linker flags ----
|
||||||
|
|
||||||
LDFLAGS := \
|
LDFLAGS := \
|
||||||
-nostdlib \
|
-nostdlib \
|
||||||
-static \
|
|
||||||
-Wl,--build-id=none \
|
|
||||||
-Wl,--gc-sections \
|
-Wl,--gc-sections \
|
||||||
-Wl,-m,elf_x86_64 \
|
|
||||||
-z max-page-size=0x1000 \
|
|
||||||
-T $(LINK_LD)
|
-T $(LINK_LD)
|
||||||
|
|
||||||
# ---- C++ source files ----
|
# ---- C++ source files ----
|
||||||
|
|||||||
@@ -6,11 +6,11 @@ MAKEFLAGS += -rR
|
|||||||
|
|
||||||
# ---- Toolchain ----
|
# ---- Toolchain ----
|
||||||
|
|
||||||
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-elf-
|
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-montauk-
|
||||||
ifneq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
ifeq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
||||||
CXX := $(TOOLCHAIN_PREFIX)g++
|
CXX = $(error x86_64-montauk toolchain not found. Run ./toolchain/build-montauk-toolchain.sh first)
|
||||||
else
|
else
|
||||||
CXX := g++
|
CXX := $(TOOLCHAIN_PREFIX)g++
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# ---- Paths ----
|
# ---- Paths ----
|
||||||
@@ -30,36 +30,24 @@ CXXFLAGS := \
|
|||||||
-Wextra \
|
-Wextra \
|
||||||
-Wno-unused-parameter \
|
-Wno-unused-parameter \
|
||||||
-Wno-unused-function \
|
-Wno-unused-function \
|
||||||
-nostdinc \
|
|
||||||
-ffreestanding \
|
-ffreestanding \
|
||||||
-fno-stack-protector \
|
-fno-stack-protector \
|
||||||
-fno-stack-check \
|
-fno-stack-check \
|
||||||
-fno-PIC \
|
|
||||||
-fno-rtti \
|
-fno-rtti \
|
||||||
-fno-exceptions \
|
-fno-exceptions \
|
||||||
-ffunction-sections \
|
-ffunction-sections \
|
||||||
-fdata-sections \
|
-fdata-sections \
|
||||||
-m64 \
|
|
||||||
-march=x86-64 \
|
|
||||||
-msse \
|
-msse \
|
||||||
-msse2 \
|
-msse2 \
|
||||||
-mno-red-zone \
|
|
||||||
-mcmodel=small \
|
|
||||||
-I $(PROG_INC) \
|
-I $(PROG_INC) \
|
||||||
-isystem $(PROG_INC)/libc \
|
-isystem $(PROG_INC)/libc \
|
||||||
-I ../../lib/bearssl/inc \
|
-I ../../lib/bearssl/inc
|
||||||
-isystem ../../../kernel/freestnd-c-hdrs/x86_64/include \
|
|
||||||
-isystem ../../../kernel/freestnd-cxx-hdrs/x86_64/include
|
|
||||||
|
|
||||||
# ---- Linker flags ----
|
# ---- Linker flags ----
|
||||||
|
|
||||||
LDFLAGS := \
|
LDFLAGS := \
|
||||||
-nostdlib \
|
-nostdlib \
|
||||||
-static \
|
|
||||||
-Wl,--build-id=none \
|
|
||||||
-Wl,--gc-sections \
|
-Wl,--gc-sections \
|
||||||
-Wl,-m,elf_x86_64 \
|
|
||||||
-z max-page-size=0x1000 \
|
|
||||||
-T $(LINK_LD)
|
-T $(LINK_LD)
|
||||||
|
|
||||||
# ---- Source files ----
|
# ---- Source files ----
|
||||||
|
|||||||
@@ -4,17 +4,17 @@
|
|||||||
MAKEFLAGS += -rR
|
MAKEFLAGS += -rR
|
||||||
.SUFFIXES:
|
.SUFFIXES:
|
||||||
|
|
||||||
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-elf-
|
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-montauk-
|
||||||
ifneq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
ifeq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
||||||
|
CC = $(error x86_64-montauk toolchain not found. Run ./toolchain/build-montauk-toolchain.sh first)
|
||||||
|
CXX = $(error x86_64-montauk toolchain not found. Run ./toolchain/build-montauk-toolchain.sh first)
|
||||||
|
LD = $(error x86_64-montauk toolchain not found. Run ./toolchain/build-montauk-toolchain.sh first)
|
||||||
|
STRIP = $(error x86_64-montauk toolchain not found. Run ./toolchain/build-montauk-toolchain.sh first)
|
||||||
|
else
|
||||||
CC := $(TOOLCHAIN_PREFIX)gcc
|
CC := $(TOOLCHAIN_PREFIX)gcc
|
||||||
CXX := $(TOOLCHAIN_PREFIX)g++
|
CXX := $(TOOLCHAIN_PREFIX)g++
|
||||||
LD := $(TOOLCHAIN_PREFIX)ld
|
LD := $(TOOLCHAIN_PREFIX)ld
|
||||||
STRIP := $(TOOLCHAIN_PREFIX)strip
|
STRIP := $(TOOLCHAIN_PREFIX)strip
|
||||||
else
|
|
||||||
CC := gcc
|
|
||||||
CXX := g++
|
|
||||||
LD := ld
|
|
||||||
STRIP := strip
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
PROG_INC := ../../include
|
PROG_INC := ../../include
|
||||||
@@ -31,7 +31,6 @@ CXXFLAGS := \
|
|||||||
-Wextra \
|
-Wextra \
|
||||||
-Wno-unused-parameter \
|
-Wno-unused-parameter \
|
||||||
-Wno-unused-function \
|
-Wno-unused-function \
|
||||||
-nostdinc \
|
|
||||||
-ffreestanding \
|
-ffreestanding \
|
||||||
-fno-stack-protector \
|
-fno-stack-protector \
|
||||||
-fno-stack-check \
|
-fno-stack-check \
|
||||||
@@ -41,19 +40,13 @@ CXXFLAGS := \
|
|||||||
-fno-exceptions \
|
-fno-exceptions \
|
||||||
-ffunction-sections \
|
-ffunction-sections \
|
||||||
-fdata-sections \
|
-fdata-sections \
|
||||||
-m64 \
|
|
||||||
-march=x86-64 \
|
|
||||||
-msse \
|
-msse \
|
||||||
-msse2 \
|
-msse2 \
|
||||||
-mno-red-zone \
|
|
||||||
-mcmodel=small \
|
|
||||||
-MMD -MP \
|
-MMD -MP \
|
||||||
-DGUI_DIALOGS_LIBRARY_BUILD \
|
-DGUI_DIALOGS_LIBRARY_BUILD \
|
||||||
-I $(PROG_INC) \
|
-I $(PROG_INC) \
|
||||||
-isystem $(PROG_INC)/libc \
|
-isystem $(PROG_INC)/libc \
|
||||||
-I ../../lib/bearssl/inc \
|
-I ../../lib/bearssl/inc
|
||||||
-isystem ../../../kernel/freestnd-c-hdrs/x86_64/include \
|
|
||||||
-isystem ../../../kernel/freestnd-cxx-hdrs/x86_64/include
|
|
||||||
|
|
||||||
LDFLAGS := \
|
LDFLAGS := \
|
||||||
-shared \
|
-shared \
|
||||||
@@ -62,15 +55,13 @@ LDFLAGS := \
|
|||||||
--hash-style=sysv \
|
--hash-style=sysv \
|
||||||
-u dialogs_run_request \
|
-u dialogs_run_request \
|
||||||
-u dialogs_message_box \
|
-u dialogs_message_box \
|
||||||
-m elf_x86_64 \
|
-m elf_x86_64
|
||||||
-z max-page-size=0x1000
|
|
||||||
|
|
||||||
LIBC_CFLAGS := \
|
LIBC_CFLAGS := \
|
||||||
-std=gnu11 \
|
-std=gnu11 \
|
||||||
-g -O2 -pipe \
|
-g -O2 -pipe \
|
||||||
-Wall \
|
-Wall \
|
||||||
-Wno-unused-parameter \
|
-Wno-unused-parameter \
|
||||||
-nostdinc \
|
|
||||||
-ffreestanding \
|
-ffreestanding \
|
||||||
-fno-stack-protector \
|
-fno-stack-protector \
|
||||||
-fno-stack-check \
|
-fno-stack-check \
|
||||||
@@ -78,12 +69,8 @@ LIBC_CFLAGS := \
|
|||||||
-fvisibility=hidden \
|
-fvisibility=hidden \
|
||||||
-ffunction-sections \
|
-ffunction-sections \
|
||||||
-fdata-sections \
|
-fdata-sections \
|
||||||
-m64 \
|
|
||||||
-march=x86-64 \
|
|
||||||
-msse \
|
-msse \
|
||||||
-msse2 \
|
-msse2 \
|
||||||
-mno-red-zone \
|
|
||||||
-mcmodel=small \
|
|
||||||
-isystem $(PROG_INC)/libc \
|
-isystem $(PROG_INC)/libc \
|
||||||
-isystem $(GCC_INCLUDE)
|
-isystem $(GCC_INCLUDE)
|
||||||
|
|
||||||
|
|||||||
@@ -6,11 +6,11 @@ MAKEFLAGS += -rR
|
|||||||
|
|
||||||
# ---- Toolchain ----
|
# ---- Toolchain ----
|
||||||
|
|
||||||
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-elf-
|
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-montauk-
|
||||||
ifneq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
ifeq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
||||||
CXX := $(TOOLCHAIN_PREFIX)g++
|
CXX = $(error x86_64-montauk toolchain not found. Run ./toolchain/build-montauk-toolchain.sh first)
|
||||||
else
|
else
|
||||||
CXX := g++
|
CXX := $(TOOLCHAIN_PREFIX)g++
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# ---- Paths ----
|
# ---- Paths ----
|
||||||
@@ -30,35 +30,23 @@ CXXFLAGS := \
|
|||||||
-Wextra \
|
-Wextra \
|
||||||
-Wno-unused-parameter \
|
-Wno-unused-parameter \
|
||||||
-Wno-unused-function \
|
-Wno-unused-function \
|
||||||
-nostdinc \
|
|
||||||
-ffreestanding \
|
-ffreestanding \
|
||||||
-fno-stack-protector \
|
-fno-stack-protector \
|
||||||
-fno-stack-check \
|
-fno-stack-check \
|
||||||
-fno-PIC \
|
|
||||||
-fno-rtti \
|
-fno-rtti \
|
||||||
-fno-exceptions \
|
-fno-exceptions \
|
||||||
-ffunction-sections \
|
-ffunction-sections \
|
||||||
-fdata-sections \
|
-fdata-sections \
|
||||||
-m64 \
|
|
||||||
-march=x86-64 \
|
|
||||||
-msse \
|
-msse \
|
||||||
-msse2 \
|
-msse2 \
|
||||||
-mno-red-zone \
|
|
||||||
-mcmodel=small \
|
|
||||||
-I $(PROG_INC) \
|
-I $(PROG_INC) \
|
||||||
-isystem $(PROG_INC)/libc \
|
-isystem $(PROG_INC)/libc
|
||||||
-isystem ../../../kernel/freestnd-c-hdrs/x86_64/include \
|
|
||||||
-isystem ../../../kernel/freestnd-cxx-hdrs/x86_64/include
|
|
||||||
|
|
||||||
# ---- Linker flags ----
|
# ---- Linker flags ----
|
||||||
|
|
||||||
LDFLAGS := \
|
LDFLAGS := \
|
||||||
-nostdlib \
|
-nostdlib \
|
||||||
-static \
|
|
||||||
-Wl,--build-id=none \
|
|
||||||
-Wl,--gc-sections \
|
-Wl,--gc-sections \
|
||||||
-Wl,-m,elf_x86_64 \
|
|
||||||
-z max-page-size=0x1000 \
|
|
||||||
-T $(LINK_LD)
|
-T $(LINK_LD)
|
||||||
|
|
||||||
# ---- Source files ----
|
# ---- Source files ----
|
||||||
|
|||||||
@@ -6,15 +6,15 @@ MAKEFLAGS += -rR
|
|||||||
|
|
||||||
# ---- Toolchain ----
|
# ---- Toolchain ----
|
||||||
|
|
||||||
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-elf-
|
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-montauk-
|
||||||
ifneq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
ifeq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
||||||
|
CC = $(error x86_64-montauk toolchain not found. Run ./toolchain/build-montauk-toolchain.sh first)
|
||||||
|
CXX = $(error x86_64-montauk toolchain not found. Run ./toolchain/build-montauk-toolchain.sh first)
|
||||||
|
LD = $(error x86_64-montauk toolchain not found. Run ./toolchain/build-montauk-toolchain.sh first)
|
||||||
|
else
|
||||||
CC := $(TOOLCHAIN_PREFIX)gcc
|
CC := $(TOOLCHAIN_PREFIX)gcc
|
||||||
CXX := $(TOOLCHAIN_PREFIX)g++
|
CXX := $(TOOLCHAIN_PREFIX)g++
|
||||||
LD := $(TOOLCHAIN_PREFIX)gcc
|
LD := $(TOOLCHAIN_PREFIX)gcc
|
||||||
else
|
|
||||||
CC := gcc
|
|
||||||
CXX := g++
|
|
||||||
LD := gcc
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# ---- Paths ----
|
# ---- Paths ----
|
||||||
@@ -39,19 +39,13 @@ CFLAGS := \
|
|||||||
-Wno-missing-field-initializers \
|
-Wno-missing-field-initializers \
|
||||||
-Wno-sign-compare \
|
-Wno-sign-compare \
|
||||||
-Wno-pointer-sign \
|
-Wno-pointer-sign \
|
||||||
-nostdinc \
|
|
||||||
-ffreestanding \
|
-ffreestanding \
|
||||||
-fno-stack-protector \
|
-fno-stack-protector \
|
||||||
-fno-stack-check \
|
-fno-stack-check \
|
||||||
-fno-PIC \
|
|
||||||
-ffunction-sections \
|
-ffunction-sections \
|
||||||
-fdata-sections \
|
-fdata-sections \
|
||||||
-m64 \
|
|
||||||
-march=x86-64 \
|
|
||||||
-msse \
|
-msse \
|
||||||
-msse2 \
|
-msse2 \
|
||||||
-mno-red-zone \
|
|
||||||
-mcmodel=small \
|
|
||||||
-DNORMALUNIX \
|
-DNORMALUNIX \
|
||||||
-DLINUX \
|
-DLINUX \
|
||||||
-DFEATURE_SOUND \
|
-DFEATURE_SOUND \
|
||||||
@@ -66,36 +60,24 @@ CXXFLAGS := \
|
|||||||
-g -O2 -pipe \
|
-g -O2 -pipe \
|
||||||
-Wall \
|
-Wall \
|
||||||
-Wno-unused-parameter \
|
-Wno-unused-parameter \
|
||||||
-nostdinc \
|
|
||||||
-ffreestanding \
|
-ffreestanding \
|
||||||
-fno-stack-protector \
|
-fno-stack-protector \
|
||||||
-fno-stack-check \
|
-fno-stack-check \
|
||||||
-fno-PIC \
|
|
||||||
-fno-rtti \
|
-fno-rtti \
|
||||||
-fno-exceptions \
|
-fno-exceptions \
|
||||||
-ffunction-sections \
|
-ffunction-sections \
|
||||||
-fdata-sections \
|
-fdata-sections \
|
||||||
-m64 \
|
|
||||||
-march=x86-64 \
|
|
||||||
-msse \
|
-msse \
|
||||||
-msse2 \
|
-msse2 \
|
||||||
-mno-red-zone \
|
|
||||||
-mcmodel=small \
|
|
||||||
-isystem $(LIBC_INC) \
|
-isystem $(LIBC_INC) \
|
||||||
-I . \
|
-I . \
|
||||||
-I $(PROG_INC) \
|
-I $(PROG_INC)
|
||||||
-isystem ../../../kernel/freestnd-c-hdrs/x86_64/include \
|
|
||||||
-isystem ../../../kernel/freestnd-cxx-hdrs/x86_64/include
|
|
||||||
|
|
||||||
# ---- Linker flags ----
|
# ---- Linker flags ----
|
||||||
|
|
||||||
LDFLAGS := \
|
LDFLAGS := \
|
||||||
-nostdlib \
|
-nostdlib \
|
||||||
-static \
|
|
||||||
-Wl,--build-id=none \
|
|
||||||
-Wl,--gc-sections \
|
-Wl,--gc-sections \
|
||||||
-Wl,-m,elf_x86_64 \
|
|
||||||
-z max-page-size=0x1000 \
|
|
||||||
-T $(LINK_LD)
|
-T $(LINK_LD)
|
||||||
|
|
||||||
# ---- DOOM source files (excluding platform-specific ports and sound backends) ----
|
# ---- DOOM source files (excluding platform-specific ports and sound backends) ----
|
||||||
|
|||||||
@@ -6,11 +6,11 @@ MAKEFLAGS += -rR
|
|||||||
|
|
||||||
# ---- Toolchain ----
|
# ---- Toolchain ----
|
||||||
|
|
||||||
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-elf-
|
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-montauk-
|
||||||
ifneq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
ifeq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
||||||
CXX := $(TOOLCHAIN_PREFIX)g++
|
CXX = $(error x86_64-montauk toolchain not found. Run ./toolchain/build-montauk-toolchain.sh first)
|
||||||
else
|
else
|
||||||
CXX := g++
|
CXX := $(TOOLCHAIN_PREFIX)g++
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# ---- Paths ----
|
# ---- Paths ----
|
||||||
@@ -32,38 +32,26 @@ CXXFLAGS := \
|
|||||||
-Wall \
|
-Wall \
|
||||||
-Wextra \
|
-Wextra \
|
||||||
-Wno-unused-parameter \
|
-Wno-unused-parameter \
|
||||||
-nostdinc \
|
|
||||||
-ffreestanding \
|
-ffreestanding \
|
||||||
-fno-stack-protector \
|
-fno-stack-protector \
|
||||||
-fno-stack-check \
|
-fno-stack-check \
|
||||||
-fno-PIC \
|
|
||||||
-fno-rtti \
|
-fno-rtti \
|
||||||
-fno-exceptions \
|
-fno-exceptions \
|
||||||
-ffunction-sections \
|
-ffunction-sections \
|
||||||
-fdata-sections \
|
-fdata-sections \
|
||||||
-m64 \
|
|
||||||
-march=x86-64 \
|
|
||||||
-mno-80387 \
|
-mno-80387 \
|
||||||
-mno-mmx \
|
-mno-mmx \
|
||||||
-mno-sse \
|
-mno-sse \
|
||||||
-mno-sse2 \
|
-mno-sse2 \
|
||||||
-mno-red-zone \
|
|
||||||
-mcmodel=small \
|
|
||||||
-I $(PROG_INC) \
|
-I $(PROG_INC) \
|
||||||
-isystem $(LIBC_INC) \
|
-isystem $(LIBC_INC) \
|
||||||
-I $(BEARSSL)/inc \
|
-I $(BEARSSL)/inc
|
||||||
-isystem ../../../kernel/freestnd-c-hdrs/x86_64/include \
|
|
||||||
-isystem ../../../kernel/freestnd-cxx-hdrs/x86_64/include
|
|
||||||
|
|
||||||
# ---- Linker flags ----
|
# ---- Linker flags ----
|
||||||
|
|
||||||
LDFLAGS := \
|
LDFLAGS := \
|
||||||
-nostdlib \
|
-nostdlib \
|
||||||
-static \
|
|
||||||
-Wl,--build-id=none \
|
|
||||||
-Wl,--gc-sections \
|
-Wl,--gc-sections \
|
||||||
-Wl,-m,elf_x86_64 \
|
|
||||||
-z max-page-size=0x1000 \
|
|
||||||
-T $(LINK_LD)
|
-T $(LINK_LD)
|
||||||
|
|
||||||
# ---- Libraries ----
|
# ---- Libraries ----
|
||||||
|
|||||||
@@ -6,11 +6,11 @@ MAKEFLAGS += -rR
|
|||||||
|
|
||||||
# ---- Toolchain ----
|
# ---- Toolchain ----
|
||||||
|
|
||||||
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-elf-
|
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-montauk-
|
||||||
ifneq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
ifeq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
||||||
CXX := $(TOOLCHAIN_PREFIX)g++
|
CXX = $(error x86_64-montauk toolchain not found. Run ./toolchain/build-montauk-toolchain.sh first)
|
||||||
else
|
else
|
||||||
CXX := g++
|
CXX := $(TOOLCHAIN_PREFIX)g++
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# ---- Paths ----
|
# ---- Paths ----
|
||||||
@@ -30,34 +30,22 @@ CXXFLAGS := \
|
|||||||
-Wextra \
|
-Wextra \
|
||||||
-Wno-unused-parameter \
|
-Wno-unused-parameter \
|
||||||
-Wno-unused-function \
|
-Wno-unused-function \
|
||||||
-nostdinc \
|
|
||||||
-ffreestanding \
|
-ffreestanding \
|
||||||
-fno-stack-protector \
|
-fno-stack-protector \
|
||||||
-fno-stack-check \
|
-fno-stack-check \
|
||||||
-fno-PIC \
|
|
||||||
-fno-rtti \
|
-fno-rtti \
|
||||||
-fno-exceptions \
|
-fno-exceptions \
|
||||||
-ffunction-sections \
|
-ffunction-sections \
|
||||||
-fdata-sections \
|
-fdata-sections \
|
||||||
-m64 \
|
|
||||||
-march=x86-64 \
|
|
||||||
-msse \
|
-msse \
|
||||||
-msse2 \
|
-msse2 \
|
||||||
-mno-red-zone \
|
-I $(PROG_INC)
|
||||||
-mcmodel=small \
|
|
||||||
-I $(PROG_INC) \
|
|
||||||
-isystem ../../../kernel/freestnd-c-hdrs/x86_64/include \
|
|
||||||
-isystem ../../../kernel/freestnd-cxx-hdrs/x86_64/include
|
|
||||||
|
|
||||||
# ---- Linker flags ----
|
# ---- Linker flags ----
|
||||||
|
|
||||||
LDFLAGS := \
|
LDFLAGS := \
|
||||||
-nostdlib \
|
-nostdlib \
|
||||||
-static \
|
|
||||||
-Wl,--build-id=none \
|
|
||||||
-Wl,--gc-sections \
|
-Wl,--gc-sections \
|
||||||
-Wl,-m,elf_x86_64 \
|
|
||||||
-z max-page-size=0x1000 \
|
|
||||||
-T $(LINK_LD)
|
-T $(LINK_LD)
|
||||||
|
|
||||||
# ---- Libraries ----
|
# ---- Libraries ----
|
||||||
|
|||||||
@@ -6,11 +6,11 @@ MAKEFLAGS += -rR
|
|||||||
|
|
||||||
# ---- Toolchain ----
|
# ---- Toolchain ----
|
||||||
|
|
||||||
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-elf-
|
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-montauk-
|
||||||
ifneq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
ifeq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
||||||
CXX := $(TOOLCHAIN_PREFIX)g++
|
CXX = $(error x86_64-montauk toolchain not found. Run ./toolchain/build-montauk-toolchain.sh first)
|
||||||
else
|
else
|
||||||
CXX := g++
|
CXX := $(TOOLCHAIN_PREFIX)g++
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# ---- Paths ----
|
# ---- Paths ----
|
||||||
@@ -32,35 +32,23 @@ CXXFLAGS := \
|
|||||||
-Wextra \
|
-Wextra \
|
||||||
-Wno-unused-parameter \
|
-Wno-unused-parameter \
|
||||||
-Wno-unused-function \
|
-Wno-unused-function \
|
||||||
-nostdinc \
|
|
||||||
-ffreestanding \
|
-ffreestanding \
|
||||||
-fno-stack-protector \
|
-fno-stack-protector \
|
||||||
-fno-stack-check \
|
-fno-stack-check \
|
||||||
-fno-PIC \
|
|
||||||
-fno-rtti \
|
-fno-rtti \
|
||||||
-fno-exceptions \
|
-fno-exceptions \
|
||||||
-ffunction-sections \
|
-ffunction-sections \
|
||||||
-fdata-sections \
|
-fdata-sections \
|
||||||
-m64 \
|
|
||||||
-march=x86-64 \
|
|
||||||
-msse \
|
-msse \
|
||||||
-msse2 \
|
-msse2 \
|
||||||
-mno-red-zone \
|
|
||||||
-mcmodel=small \
|
|
||||||
-I $(PROG_INC) \
|
-I $(PROG_INC) \
|
||||||
-isystem $(LIBC_INC) \
|
-isystem $(LIBC_INC)
|
||||||
-isystem ../../../kernel/freestnd-c-hdrs/x86_64/include \
|
|
||||||
-isystem ../../../kernel/freestnd-cxx-hdrs/x86_64/include
|
|
||||||
|
|
||||||
# ---- Linker flags ----
|
# ---- Linker flags ----
|
||||||
|
|
||||||
LDFLAGS := \
|
LDFLAGS := \
|
||||||
-nostdlib \
|
-nostdlib \
|
||||||
-static \
|
|
||||||
-Wl,--build-id=none \
|
|
||||||
-Wl,--gc-sections \
|
-Wl,--gc-sections \
|
||||||
-Wl,-m,elf_x86_64 \
|
|
||||||
-z max-page-size=0x1000 \
|
|
||||||
-T $(LINK_LD)
|
-T $(LINK_LD)
|
||||||
|
|
||||||
# ---- Libraries ----
|
# ---- Libraries ----
|
||||||
|
|||||||
@@ -6,11 +6,11 @@ MAKEFLAGS += -rR
|
|||||||
|
|
||||||
# ---- Toolchain ----
|
# ---- Toolchain ----
|
||||||
|
|
||||||
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-elf-
|
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-montauk-
|
||||||
ifneq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
ifeq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
||||||
CXX := $(TOOLCHAIN_PREFIX)g++
|
CXX = $(error x86_64-montauk toolchain not found. Run ./toolchain/build-montauk-toolchain.sh first)
|
||||||
else
|
else
|
||||||
CXX := g++
|
CXX := $(TOOLCHAIN_PREFIX)g++
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# ---- Paths ----
|
# ---- Paths ----
|
||||||
@@ -30,36 +30,24 @@ CXXFLAGS := \
|
|||||||
-Wextra \
|
-Wextra \
|
||||||
-Wno-unused-parameter \
|
-Wno-unused-parameter \
|
||||||
-Wno-unused-function \
|
-Wno-unused-function \
|
||||||
-nostdinc \
|
|
||||||
-ffreestanding \
|
-ffreestanding \
|
||||||
-fno-stack-protector \
|
-fno-stack-protector \
|
||||||
-fno-stack-check \
|
-fno-stack-check \
|
||||||
-fno-PIC \
|
|
||||||
-fno-rtti \
|
-fno-rtti \
|
||||||
-fno-exceptions \
|
-fno-exceptions \
|
||||||
-ffunction-sections \
|
-ffunction-sections \
|
||||||
-fdata-sections \
|
-fdata-sections \
|
||||||
-m64 \
|
|
||||||
-march=x86-64 \
|
|
||||||
-msse \
|
-msse \
|
||||||
-msse2 \
|
-msse2 \
|
||||||
-mno-red-zone \
|
|
||||||
-mcmodel=small \
|
|
||||||
-MMD -MP \
|
-MMD -MP \
|
||||||
-I $(PROG_INC) \
|
-I $(PROG_INC) \
|
||||||
-isystem $(PROG_INC)/libc \
|
-isystem $(PROG_INC)/libc
|
||||||
-isystem ../../../kernel/freestnd-c-hdrs/x86_64/include \
|
|
||||||
-isystem ../../../kernel/freestnd-cxx-hdrs/x86_64/include
|
|
||||||
|
|
||||||
# ---- Linker flags ----
|
# ---- Linker flags ----
|
||||||
|
|
||||||
LDFLAGS := \
|
LDFLAGS := \
|
||||||
-nostdlib \
|
-nostdlib \
|
||||||
-static \
|
|
||||||
-Wl,--build-id=none \
|
|
||||||
-Wl,--gc-sections \
|
-Wl,--gc-sections \
|
||||||
-Wl,-m,elf_x86_64 \
|
|
||||||
-z max-page-size=0x1000 \
|
|
||||||
-T $(LINK_LD)
|
-T $(LINK_LD)
|
||||||
|
|
||||||
# ---- Source files ----
|
# ---- Source files ----
|
||||||
|
|||||||
@@ -4,11 +4,11 @@
|
|||||||
MAKEFLAGS += -rR
|
MAKEFLAGS += -rR
|
||||||
.SUFFIXES:
|
.SUFFIXES:
|
||||||
|
|
||||||
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-elf-
|
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-montauk-
|
||||||
ifneq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
ifeq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
||||||
CXX := $(TOOLCHAIN_PREFIX)g++
|
CXX = $(error x86_64-montauk toolchain not found. Run ./toolchain/build-montauk-toolchain.sh first)
|
||||||
else
|
else
|
||||||
CXX := g++
|
CXX := $(TOOLCHAIN_PREFIX)g++
|
||||||
endif
|
endif
|
||||||
|
|
||||||
PROG_INC := ../../include
|
PROG_INC := ../../include
|
||||||
@@ -24,33 +24,21 @@ CXXFLAGS := \
|
|||||||
-Wextra \
|
-Wextra \
|
||||||
-Wno-unused-parameter \
|
-Wno-unused-parameter \
|
||||||
-Wno-unused-function \
|
-Wno-unused-function \
|
||||||
-nostdinc \
|
|
||||||
-ffreestanding \
|
-ffreestanding \
|
||||||
-fno-stack-protector \
|
-fno-stack-protector \
|
||||||
-fno-stack-check \
|
-fno-stack-check \
|
||||||
-fno-PIC \
|
|
||||||
-fno-rtti \
|
-fno-rtti \
|
||||||
-fno-exceptions \
|
-fno-exceptions \
|
||||||
-ffunction-sections \
|
-ffunction-sections \
|
||||||
-fdata-sections \
|
-fdata-sections \
|
||||||
-m64 \
|
|
||||||
-march=x86-64 \
|
|
||||||
-msse \
|
-msse \
|
||||||
-msse2 \
|
-msse2 \
|
||||||
-mno-red-zone \
|
|
||||||
-mcmodel=small \
|
|
||||||
-I $(PROG_INC) \
|
-I $(PROG_INC) \
|
||||||
-isystem $(PROG_INC)/libc \
|
-isystem $(PROG_INC)/libc
|
||||||
-isystem ../../../kernel/freestnd-c-hdrs/x86_64/include \
|
|
||||||
-isystem ../../../kernel/freestnd-cxx-hdrs/x86_64/include
|
|
||||||
|
|
||||||
LDFLAGS := \
|
LDFLAGS := \
|
||||||
-nostdlib \
|
-nostdlib \
|
||||||
-static \
|
|
||||||
-Wl,--build-id=none \
|
|
||||||
-Wl,--gc-sections \
|
-Wl,--gc-sections \
|
||||||
-Wl,-m,elf_x86_64 \
|
|
||||||
-z max-page-size=0x1000 \
|
|
||||||
-T $(LINK_LD)
|
-T $(LINK_LD)
|
||||||
|
|
||||||
SRCS := main.cpp stb_truetype_impl.cpp font_data.cpp
|
SRCS := main.cpp stb_truetype_impl.cpp font_data.cpp
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
ARCH := x86_64
|
ARCH := x86_64
|
||||||
|
|
||||||
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-elf-
|
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-montauk-
|
||||||
CXX := $(TOOLCHAIN_PREFIX)g++
|
CXX := $(TOOLCHAIN_PREFIX)g++
|
||||||
AR := $(TOOLCHAIN_PREFIX)ar
|
AR := $(TOOLCHAIN_PREFIX)ar
|
||||||
|
|
||||||
@@ -11,28 +11,20 @@ override CXXFLAGS := \
|
|||||||
-g -O2 -pipe \
|
-g -O2 -pipe \
|
||||||
-Wall \
|
-Wall \
|
||||||
-Wextra \
|
-Wextra \
|
||||||
-nostdinc \
|
|
||||||
-ffreestanding \
|
-ffreestanding \
|
||||||
-fno-stack-protector \
|
-fno-stack-protector \
|
||||||
-fno-stack-check \
|
-fno-stack-check \
|
||||||
-fno-PIC \
|
|
||||||
-fno-rtti \
|
-fno-rtti \
|
||||||
-fno-exceptions \
|
-fno-exceptions \
|
||||||
-ffunction-sections \
|
-ffunction-sections \
|
||||||
-fdata-sections \
|
-fdata-sections \
|
||||||
-m64 \
|
|
||||||
-march=x86-64 \
|
|
||||||
-mno-80387 \
|
-mno-80387 \
|
||||||
-mno-mmx \
|
-mno-mmx \
|
||||||
-mno-sse \
|
-mno-sse \
|
||||||
-mno-sse2 \
|
-mno-sse2 \
|
||||||
-mno-red-zone \
|
|
||||||
-mcmodel=small \
|
|
||||||
-I ../../include \
|
-I ../../include \
|
||||||
-isystem ../../include/libc \
|
-isystem ../../include/libc \
|
||||||
-isystem ../../include/montauk \
|
-isystem ../../include/montauk
|
||||||
-isystem ../../../kernel/freestnd-c-hdrs/x86_64/include \
|
|
||||||
-isystem ../../../kernel/freestnd-cxx-hdrs/x86_64/include
|
|
||||||
|
|
||||||
LIBDIR := ../../lib/libloader
|
LIBDIR := ../../lib/libloader
|
||||||
LEGACY_BINDIR := ../../bin
|
LEGACY_BINDIR := ../../bin
|
||||||
|
|||||||
@@ -6,11 +6,11 @@ MAKEFLAGS += -rR
|
|||||||
|
|
||||||
# ---- Toolchain ----
|
# ---- Toolchain ----
|
||||||
|
|
||||||
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-elf-
|
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-montauk-
|
||||||
ifneq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
ifeq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
||||||
CXX := $(TOOLCHAIN_PREFIX)g++
|
CXX = $(error x86_64-montauk toolchain not found. Run ./toolchain/build-montauk-toolchain.sh first)
|
||||||
else
|
else
|
||||||
CXX := g++
|
CXX := $(TOOLCHAIN_PREFIX)g++
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# ---- Paths ----
|
# ---- Paths ----
|
||||||
@@ -32,36 +32,24 @@ CXXFLAGS := \
|
|||||||
-Wextra \
|
-Wextra \
|
||||||
-Wno-unused-parameter \
|
-Wno-unused-parameter \
|
||||||
-Wno-unused-function \
|
-Wno-unused-function \
|
||||||
-nostdinc \
|
|
||||||
-ffreestanding \
|
-ffreestanding \
|
||||||
-fno-stack-protector \
|
-fno-stack-protector \
|
||||||
-fno-stack-check \
|
-fno-stack-check \
|
||||||
-fno-PIC \
|
|
||||||
-fno-rtti \
|
-fno-rtti \
|
||||||
-fno-exceptions \
|
-fno-exceptions \
|
||||||
-ffunction-sections \
|
-ffunction-sections \
|
||||||
-fdata-sections \
|
-fdata-sections \
|
||||||
-m64 \
|
|
||||||
-march=x86-64 \
|
|
||||||
-msse \
|
-msse \
|
||||||
-msse2 \
|
-msse2 \
|
||||||
-mno-red-zone \
|
|
||||||
-mcmodel=small \
|
|
||||||
-I $(PROG_INC) \
|
-I $(PROG_INC) \
|
||||||
-isystem $(PROG_INC)/libc \
|
-isystem $(PROG_INC)/libc \
|
||||||
-I $(BEARSSL)/inc \
|
-I $(BEARSSL)/inc
|
||||||
-isystem ../../../kernel/freestnd-c-hdrs/x86_64/include \
|
|
||||||
-isystem ../../../kernel/freestnd-cxx-hdrs/x86_64/include
|
|
||||||
|
|
||||||
# ---- Linker flags ----
|
# ---- Linker flags ----
|
||||||
|
|
||||||
LDFLAGS := \
|
LDFLAGS := \
|
||||||
-nostdlib \
|
-nostdlib \
|
||||||
-static \
|
|
||||||
-Wl,--build-id=none \
|
|
||||||
-Wl,--gc-sections \
|
-Wl,--gc-sections \
|
||||||
-Wl,-m,elf_x86_64 \
|
|
||||||
-z max-page-size=0x1000 \
|
|
||||||
-T $(LINK_LD)
|
-T $(LINK_LD)
|
||||||
|
|
||||||
# ---- Source files ----
|
# ---- Source files ----
|
||||||
|
|||||||
@@ -1,13 +1,13 @@
|
|||||||
MAKEFLAGS += -rR
|
MAKEFLAGS += -rR
|
||||||
.SUFFIXES:
|
.SUFFIXES:
|
||||||
|
|
||||||
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-elf-
|
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-montauk-
|
||||||
ifneq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
ifeq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
||||||
|
CC = $(error x86_64-montauk toolchain not found. Run ./toolchain/build-montauk-toolchain.sh first)
|
||||||
|
AR = $(error x86_64-montauk toolchain not found. Run ./toolchain/build-montauk-toolchain.sh first)
|
||||||
|
else
|
||||||
CC := $(TOOLCHAIN_PREFIX)gcc
|
CC := $(TOOLCHAIN_PREFIX)gcc
|
||||||
AR := $(TOOLCHAIN_PREFIX)ar
|
AR := $(TOOLCHAIN_PREFIX)ar
|
||||||
else
|
|
||||||
CC := gcc
|
|
||||||
AR := ar
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
SRCDIR := src
|
SRCDIR := src
|
||||||
@@ -26,19 +26,13 @@ CFLAGS := \
|
|||||||
-Wno-sign-compare \
|
-Wno-sign-compare \
|
||||||
-Wno-misleading-indentation \
|
-Wno-misleading-indentation \
|
||||||
-Wno-implicit-fallthrough \
|
-Wno-implicit-fallthrough \
|
||||||
-nostdinc \
|
|
||||||
-ffreestanding \
|
-ffreestanding \
|
||||||
-fno-stack-protector \
|
-fno-stack-protector \
|
||||||
-fno-stack-check \
|
-fno-stack-check \
|
||||||
-fno-PIC \
|
|
||||||
-ffunction-sections \
|
-ffunction-sections \
|
||||||
-fdata-sections \
|
-fdata-sections \
|
||||||
-m64 \
|
|
||||||
-march=x86-64 \
|
|
||||||
-msse \
|
-msse \
|
||||||
-msse2 \
|
-msse2 \
|
||||||
-mno-red-zone \
|
|
||||||
-mcmodel=small \
|
|
||||||
-D__MONTAUKOS__=1 \
|
-D__MONTAUKOS__=1 \
|
||||||
-DLUA_COMPAT_5_3 \
|
-DLUA_COMPAT_5_3 \
|
||||||
-I$(SRCDIR) \
|
-I$(SRCDIR) \
|
||||||
@@ -47,11 +41,7 @@ CFLAGS := \
|
|||||||
|
|
||||||
LDFLAGS := \
|
LDFLAGS := \
|
||||||
-nostdlib \
|
-nostdlib \
|
||||||
-static \
|
|
||||||
-Wl,--build-id=none \
|
|
||||||
-Wl,--gc-sections \
|
-Wl,--gc-sections \
|
||||||
-Wl,-m,elf_x86_64 \
|
|
||||||
-z max-page-size=0x1000 \
|
|
||||||
-T ../../link.ld
|
-T ../../link.ld
|
||||||
|
|
||||||
CORE_SRCS := \
|
CORE_SRCS := \
|
||||||
|
|||||||
@@ -6,11 +6,11 @@ MAKEFLAGS += -rR
|
|||||||
|
|
||||||
# ---- Toolchain ----
|
# ---- Toolchain ----
|
||||||
|
|
||||||
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-elf-
|
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-montauk-
|
||||||
ifneq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
ifeq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
||||||
CXX := $(TOOLCHAIN_PREFIX)g++
|
CXX = $(error x86_64-montauk toolchain not found. Run ./toolchain/build-montauk-toolchain.sh first)
|
||||||
else
|
else
|
||||||
CXX := g++
|
CXX := $(TOOLCHAIN_PREFIX)g++
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# ---- Paths ----
|
# ---- Paths ----
|
||||||
@@ -30,35 +30,23 @@ CXXFLAGS := \
|
|||||||
-Wextra \
|
-Wextra \
|
||||||
-Wno-unused-parameter \
|
-Wno-unused-parameter \
|
||||||
-Wno-unused-function \
|
-Wno-unused-function \
|
||||||
-nostdinc \
|
|
||||||
-ffreestanding \
|
-ffreestanding \
|
||||||
-fno-stack-protector \
|
-fno-stack-protector \
|
||||||
-fno-stack-check \
|
-fno-stack-check \
|
||||||
-fno-PIC \
|
|
||||||
-fno-rtti \
|
-fno-rtti \
|
||||||
-fno-exceptions \
|
-fno-exceptions \
|
||||||
-ffunction-sections \
|
-ffunction-sections \
|
||||||
-fdata-sections \
|
-fdata-sections \
|
||||||
-m64 \
|
|
||||||
-march=x86-64 \
|
|
||||||
-msse \
|
-msse \
|
||||||
-msse2 \
|
-msse2 \
|
||||||
-mno-red-zone \
|
|
||||||
-mcmodel=small \
|
|
||||||
-I $(PROG_INC) \
|
-I $(PROG_INC) \
|
||||||
-isystem $(PROG_INC)/libc \
|
-isystem $(PROG_INC)/libc
|
||||||
-isystem ../../../kernel/freestnd-c-hdrs/x86_64/include \
|
|
||||||
-isystem ../../../kernel/freestnd-cxx-hdrs/x86_64/include
|
|
||||||
|
|
||||||
# ---- Linker flags ----
|
# ---- Linker flags ----
|
||||||
|
|
||||||
LDFLAGS := \
|
LDFLAGS := \
|
||||||
-nostdlib \
|
-nostdlib \
|
||||||
-static \
|
|
||||||
-Wl,--build-id=none \
|
|
||||||
-Wl,--gc-sections \
|
-Wl,--gc-sections \
|
||||||
-Wl,-m,elf_x86_64 \
|
|
||||||
-z max-page-size=0x1000 \
|
|
||||||
-T $(LINK_LD)
|
-T $(LINK_LD)
|
||||||
|
|
||||||
# ---- Source files ----
|
# ---- Source files ----
|
||||||
|
|||||||
@@ -6,11 +6,11 @@ MAKEFLAGS += -rR
|
|||||||
|
|
||||||
# ---- Toolchain ----
|
# ---- Toolchain ----
|
||||||
|
|
||||||
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-elf-
|
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-montauk-
|
||||||
ifneq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
ifeq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
||||||
CXX := $(TOOLCHAIN_PREFIX)g++
|
CXX = $(error x86_64-montauk toolchain not found. Run ./toolchain/build-montauk-toolchain.sh first)
|
||||||
else
|
else
|
||||||
CXX := g++
|
CXX := $(TOOLCHAIN_PREFIX)g++
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# ---- Paths ----
|
# ---- Paths ----
|
||||||
@@ -30,36 +30,24 @@ CXXFLAGS := \
|
|||||||
-Wextra \
|
-Wextra \
|
||||||
-Wno-unused-parameter \
|
-Wno-unused-parameter \
|
||||||
-Wno-unused-function \
|
-Wno-unused-function \
|
||||||
-nostdinc \
|
|
||||||
-ffreestanding \
|
-ffreestanding \
|
||||||
-fno-stack-protector \
|
-fno-stack-protector \
|
||||||
-fno-stack-check \
|
-fno-stack-check \
|
||||||
-fno-PIC \
|
|
||||||
-fno-rtti \
|
-fno-rtti \
|
||||||
-fno-exceptions \
|
-fno-exceptions \
|
||||||
-ffunction-sections \
|
-ffunction-sections \
|
||||||
-fdata-sections \
|
-fdata-sections \
|
||||||
-m64 \
|
|
||||||
-march=x86-64 \
|
|
||||||
-msse \
|
-msse \
|
||||||
-msse2 \
|
-msse2 \
|
||||||
-mno-red-zone \
|
|
||||||
-mcmodel=small \
|
|
||||||
-I $(PROG_INC) \
|
-I $(PROG_INC) \
|
||||||
-I . \
|
-I . \
|
||||||
-isystem $(PROG_INC)/libc \
|
-isystem $(PROG_INC)/libc
|
||||||
-isystem ../../../kernel/freestnd-c-hdrs/x86_64/include \
|
|
||||||
-isystem ../../../kernel/freestnd-cxx-hdrs/x86_64/include
|
|
||||||
|
|
||||||
# ---- Linker flags ----
|
# ---- Linker flags ----
|
||||||
|
|
||||||
LDFLAGS := \
|
LDFLAGS := \
|
||||||
-nostdlib \
|
-nostdlib \
|
||||||
-static \
|
|
||||||
-Wl,--build-id=none \
|
|
||||||
-Wl,--gc-sections \
|
-Wl,--gc-sections \
|
||||||
-Wl,-m,elf_x86_64 \
|
|
||||||
-z max-page-size=0x1000 \
|
|
||||||
-T $(LINK_LD)
|
-T $(LINK_LD)
|
||||||
|
|
||||||
# ---- Source files ----
|
# ---- Source files ----
|
||||||
|
|||||||
@@ -4,11 +4,11 @@
|
|||||||
MAKEFLAGS += -rR
|
MAKEFLAGS += -rR
|
||||||
.SUFFIXES:
|
.SUFFIXES:
|
||||||
|
|
||||||
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-elf-
|
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-montauk-
|
||||||
ifneq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
ifeq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
||||||
CXX := $(TOOLCHAIN_PREFIX)g++
|
CXX = $(error x86_64-montauk toolchain not found. Run ./toolchain/build-montauk-toolchain.sh first)
|
||||||
else
|
else
|
||||||
CXX := g++
|
CXX := $(TOOLCHAIN_PREFIX)g++
|
||||||
endif
|
endif
|
||||||
|
|
||||||
PROG_INC := ../../include
|
PROG_INC := ../../include
|
||||||
@@ -24,34 +24,22 @@ CXXFLAGS := \
|
|||||||
-Wextra \
|
-Wextra \
|
||||||
-Wno-unused-parameter \
|
-Wno-unused-parameter \
|
||||||
-Wno-unused-function \
|
-Wno-unused-function \
|
||||||
-nostdinc \
|
|
||||||
-ffreestanding \
|
-ffreestanding \
|
||||||
-fno-stack-protector \
|
-fno-stack-protector \
|
||||||
-fno-stack-check \
|
-fno-stack-check \
|
||||||
-fno-PIC \
|
|
||||||
-fno-rtti \
|
-fno-rtti \
|
||||||
-fno-exceptions \
|
-fno-exceptions \
|
||||||
-ffunction-sections \
|
-ffunction-sections \
|
||||||
-fdata-sections \
|
-fdata-sections \
|
||||||
-m64 \
|
|
||||||
-march=x86-64 \
|
|
||||||
-msse \
|
-msse \
|
||||||
-msse2 \
|
-msse2 \
|
||||||
-mno-red-zone \
|
|
||||||
-mcmodel=small \
|
|
||||||
-MMD -MP \
|
-MMD -MP \
|
||||||
-I $(PROG_INC) \
|
-I $(PROG_INC) \
|
||||||
-isystem $(PROG_INC)/libc \
|
-isystem $(PROG_INC)/libc
|
||||||
-isystem ../../../kernel/freestnd-c-hdrs/x86_64/include \
|
|
||||||
-isystem ../../../kernel/freestnd-cxx-hdrs/x86_64/include
|
|
||||||
|
|
||||||
LDFLAGS := \
|
LDFLAGS := \
|
||||||
-nostdlib \
|
-nostdlib \
|
||||||
-static \
|
|
||||||
-Wl,--build-id=none \
|
|
||||||
-Wl,--gc-sections \
|
-Wl,--gc-sections \
|
||||||
-Wl,-m,elf_x86_64 \
|
|
||||||
-z max-page-size=0x1000 \
|
|
||||||
-T $(LINK_LD)
|
-T $(LINK_LD)
|
||||||
|
|
||||||
SRCS := main.cpp stb_truetype_impl.cpp
|
SRCS := main.cpp stb_truetype_impl.cpp
|
||||||
|
|||||||
@@ -6,11 +6,11 @@ MAKEFLAGS += -rR
|
|||||||
|
|
||||||
# ---- Toolchain ----
|
# ---- Toolchain ----
|
||||||
|
|
||||||
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-elf-
|
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-montauk-
|
||||||
ifneq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
ifeq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
||||||
CXX := $(TOOLCHAIN_PREFIX)g++
|
CXX = $(error x86_64-montauk toolchain not found. Run ./toolchain/build-montauk-toolchain.sh first)
|
||||||
else
|
else
|
||||||
CXX := g++
|
CXX := $(TOOLCHAIN_PREFIX)g++
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# ---- Paths ----
|
# ---- Paths ----
|
||||||
@@ -30,35 +30,23 @@ CXXFLAGS := \
|
|||||||
-Wextra \
|
-Wextra \
|
||||||
-Wno-unused-parameter \
|
-Wno-unused-parameter \
|
||||||
-Wno-unused-function \
|
-Wno-unused-function \
|
||||||
-nostdinc \
|
|
||||||
-ffreestanding \
|
-ffreestanding \
|
||||||
-fno-stack-protector \
|
-fno-stack-protector \
|
||||||
-fno-stack-check \
|
-fno-stack-check \
|
||||||
-fno-PIC \
|
|
||||||
-fno-rtti \
|
-fno-rtti \
|
||||||
-fno-exceptions \
|
-fno-exceptions \
|
||||||
-ffunction-sections \
|
-ffunction-sections \
|
||||||
-fdata-sections \
|
-fdata-sections \
|
||||||
-m64 \
|
|
||||||
-march=x86-64 \
|
|
||||||
-msse \
|
-msse \
|
||||||
-msse2 \
|
-msse2 \
|
||||||
-mno-red-zone \
|
|
||||||
-mcmodel=small \
|
|
||||||
-I $(PROG_INC) \
|
-I $(PROG_INC) \
|
||||||
-isystem $(PROG_INC)/libc \
|
-isystem $(PROG_INC)/libc
|
||||||
-isystem ../../../kernel/freestnd-c-hdrs/x86_64/include \
|
|
||||||
-isystem ../../../kernel/freestnd-cxx-hdrs/x86_64/include
|
|
||||||
|
|
||||||
# ---- Linker flags ----
|
# ---- Linker flags ----
|
||||||
|
|
||||||
LDFLAGS := \
|
LDFLAGS := \
|
||||||
-nostdlib \
|
-nostdlib \
|
||||||
-static \
|
|
||||||
-Wl,--build-id=none \
|
|
||||||
-Wl,--gc-sections \
|
-Wl,--gc-sections \
|
||||||
-Wl,-m,elf_x86_64 \
|
|
||||||
-z max-page-size=0x1000 \
|
|
||||||
-T $(LINK_LD)
|
-T $(LINK_LD)
|
||||||
|
|
||||||
# ---- Source files ----
|
# ---- Source files ----
|
||||||
|
|||||||
@@ -6,11 +6,11 @@ MAKEFLAGS += -rR
|
|||||||
|
|
||||||
# ---- Toolchain ----
|
# ---- Toolchain ----
|
||||||
|
|
||||||
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-elf-
|
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-montauk-
|
||||||
ifneq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
ifeq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
||||||
CXX := $(TOOLCHAIN_PREFIX)g++
|
CXX = $(error x86_64-montauk toolchain not found. Run ./toolchain/build-montauk-toolchain.sh first)
|
||||||
else
|
else
|
||||||
CXX := g++
|
CXX := $(TOOLCHAIN_PREFIX)g++
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# ---- Paths ----
|
# ---- Paths ----
|
||||||
@@ -30,35 +30,23 @@ CXXFLAGS := \
|
|||||||
-Wextra \
|
-Wextra \
|
||||||
-Wno-unused-parameter \
|
-Wno-unused-parameter \
|
||||||
-Wno-unused-function \
|
-Wno-unused-function \
|
||||||
-nostdinc \
|
|
||||||
-ffreestanding \
|
-ffreestanding \
|
||||||
-fno-stack-protector \
|
-fno-stack-protector \
|
||||||
-fno-stack-check \
|
-fno-stack-check \
|
||||||
-fno-PIC \
|
|
||||||
-fno-rtti \
|
-fno-rtti \
|
||||||
-fno-exceptions \
|
-fno-exceptions \
|
||||||
-ffunction-sections \
|
-ffunction-sections \
|
||||||
-fdata-sections \
|
-fdata-sections \
|
||||||
-m64 \
|
|
||||||
-march=x86-64 \
|
|
||||||
-msse \
|
-msse \
|
||||||
-msse2 \
|
-msse2 \
|
||||||
-mno-red-zone \
|
|
||||||
-mcmodel=small \
|
|
||||||
-I $(PROG_INC) \
|
-I $(PROG_INC) \
|
||||||
-isystem $(PROG_INC)/libc \
|
-isystem $(PROG_INC)/libc
|
||||||
-isystem ../../../kernel/freestnd-c-hdrs/x86_64/include \
|
|
||||||
-isystem ../../../kernel/freestnd-cxx-hdrs/x86_64/include
|
|
||||||
|
|
||||||
# ---- Linker flags ----
|
# ---- Linker flags ----
|
||||||
|
|
||||||
LDFLAGS := \
|
LDFLAGS := \
|
||||||
-nostdlib \
|
-nostdlib \
|
||||||
-static \
|
|
||||||
-Wl,--build-id=none \
|
|
||||||
-Wl,--gc-sections \
|
-Wl,--gc-sections \
|
||||||
-Wl,-m,elf_x86_64 \
|
|
||||||
-z max-page-size=0x1000 \
|
|
||||||
-T $(LINK_LD)
|
-T $(LINK_LD)
|
||||||
|
|
||||||
# ---- Source files ----
|
# ---- Source files ----
|
||||||
|
|||||||
@@ -4,11 +4,11 @@
|
|||||||
MAKEFLAGS += -rR
|
MAKEFLAGS += -rR
|
||||||
.SUFFIXES:
|
.SUFFIXES:
|
||||||
|
|
||||||
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-elf-
|
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-montauk-
|
||||||
ifneq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
ifeq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
||||||
CXX := $(TOOLCHAIN_PREFIX)g++
|
CXX = $(error x86_64-montauk toolchain not found. Run ./toolchain/build-montauk-toolchain.sh first)
|
||||||
else
|
else
|
||||||
CXX := g++
|
CXX := $(TOOLCHAIN_PREFIX)g++
|
||||||
endif
|
endif
|
||||||
|
|
||||||
PROG_INC := ../../include
|
PROG_INC := ../../include
|
||||||
@@ -24,34 +24,22 @@ CXXFLAGS := \
|
|||||||
-Wextra \
|
-Wextra \
|
||||||
-Wno-unused-parameter \
|
-Wno-unused-parameter \
|
||||||
-Wno-unused-function \
|
-Wno-unused-function \
|
||||||
-nostdinc \
|
|
||||||
-ffreestanding \
|
-ffreestanding \
|
||||||
-fno-stack-protector \
|
-fno-stack-protector \
|
||||||
-fno-stack-check \
|
-fno-stack-check \
|
||||||
-fno-PIC \
|
|
||||||
-fno-rtti \
|
-fno-rtti \
|
||||||
-fno-exceptions \
|
-fno-exceptions \
|
||||||
-ffunction-sections \
|
-ffunction-sections \
|
||||||
-fdata-sections \
|
-fdata-sections \
|
||||||
-m64 \
|
|
||||||
-march=x86-64 \
|
|
||||||
-msse \
|
-msse \
|
||||||
-msse2 \
|
-msse2 \
|
||||||
-mno-red-zone \
|
|
||||||
-mcmodel=small \
|
|
||||||
-MMD -MP \
|
-MMD -MP \
|
||||||
-I $(PROG_INC) \
|
-I $(PROG_INC) \
|
||||||
-isystem $(PROG_INC)/libc \
|
-isystem $(PROG_INC)/libc
|
||||||
-isystem ../../../kernel/freestnd-c-hdrs/x86_64/include \
|
|
||||||
-isystem ../../../kernel/freestnd-cxx-hdrs/x86_64/include
|
|
||||||
|
|
||||||
LDFLAGS := \
|
LDFLAGS := \
|
||||||
-nostdlib \
|
-nostdlib \
|
||||||
-static \
|
|
||||||
-Wl,--build-id=none \
|
|
||||||
-Wl,--gc-sections \
|
-Wl,--gc-sections \
|
||||||
-Wl,-m,elf_x86_64 \
|
|
||||||
-z max-page-size=0x1000 \
|
|
||||||
-T $(LINK_LD)
|
-T $(LINK_LD)
|
||||||
|
|
||||||
SRCS := main.cpp stb_truetype_impl.cpp
|
SRCS := main.cpp stb_truetype_impl.cpp
|
||||||
|
|||||||
@@ -3,11 +3,11 @@
|
|||||||
MAKEFLAGS += -rR
|
MAKEFLAGS += -rR
|
||||||
.SUFFIXES:
|
.SUFFIXES:
|
||||||
|
|
||||||
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-elf-
|
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-montauk-
|
||||||
ifneq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
ifeq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
||||||
CXX := $(TOOLCHAIN_PREFIX)g++
|
CXX = $(error x86_64-montauk toolchain not found. Run ./toolchain/build-montauk-toolchain.sh first)
|
||||||
else
|
else
|
||||||
CXX := g++
|
CXX := $(TOOLCHAIN_PREFIX)g++
|
||||||
endif
|
endif
|
||||||
|
|
||||||
PROG_INC := ../../include
|
PROG_INC := ../../include
|
||||||
@@ -24,36 +24,24 @@ CXXFLAGS := \
|
|||||||
-Wall \
|
-Wall \
|
||||||
-Wextra \
|
-Wextra \
|
||||||
-Wno-unused-parameter \
|
-Wno-unused-parameter \
|
||||||
-nostdinc \
|
|
||||||
-ffreestanding \
|
-ffreestanding \
|
||||||
-fno-stack-protector \
|
-fno-stack-protector \
|
||||||
-fno-stack-check \
|
-fno-stack-check \
|
||||||
-fno-PIC \
|
|
||||||
-fno-rtti \
|
-fno-rtti \
|
||||||
-fno-exceptions \
|
-fno-exceptions \
|
||||||
-ffunction-sections \
|
-ffunction-sections \
|
||||||
-fdata-sections \
|
-fdata-sections \
|
||||||
-m64 \
|
|
||||||
-march=x86-64 \
|
|
||||||
-mno-80387 \
|
-mno-80387 \
|
||||||
-mno-mmx \
|
-mno-mmx \
|
||||||
-mno-sse \
|
-mno-sse \
|
||||||
-mno-sse2 \
|
-mno-sse2 \
|
||||||
-mno-red-zone \
|
|
||||||
-mcmodel=small \
|
|
||||||
-I $(PROG_INC) \
|
-I $(PROG_INC) \
|
||||||
-isystem $(PROG_INC)/libc \
|
-isystem $(PROG_INC)/libc \
|
||||||
-I $(BEARSSL)/inc \
|
-I $(BEARSSL)/inc
|
||||||
-isystem ../../../kernel/freestnd-c-hdrs/x86_64/include \
|
|
||||||
-isystem ../../../kernel/freestnd-cxx-hdrs/x86_64/include
|
|
||||||
|
|
||||||
LDFLAGS := \
|
LDFLAGS := \
|
||||||
-nostdlib \
|
-nostdlib \
|
||||||
-static \
|
|
||||||
-Wl,--build-id=none \
|
|
||||||
-Wl,--gc-sections \
|
-Wl,--gc-sections \
|
||||||
-Wl,-m,elf_x86_64 \
|
|
||||||
-z max-page-size=0x1000 \
|
|
||||||
-T $(LINK_LD)
|
-T $(LINK_LD)
|
||||||
|
|
||||||
TARGET := $(BINDIR)/os/printctl.elf
|
TARGET := $(BINDIR)/os/printctl.elf
|
||||||
|
|||||||
@@ -3,11 +3,11 @@
|
|||||||
MAKEFLAGS += -rR
|
MAKEFLAGS += -rR
|
||||||
.SUFFIXES:
|
.SUFFIXES:
|
||||||
|
|
||||||
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-elf-
|
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-montauk-
|
||||||
ifneq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
ifeq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
||||||
CXX := $(TOOLCHAIN_PREFIX)g++
|
CXX = $(error x86_64-montauk toolchain not found. Run ./toolchain/build-montauk-toolchain.sh first)
|
||||||
else
|
else
|
||||||
CXX := g++
|
CXX := $(TOOLCHAIN_PREFIX)g++
|
||||||
endif
|
endif
|
||||||
|
|
||||||
PROG_INC := ../../include
|
PROG_INC := ../../include
|
||||||
@@ -25,34 +25,22 @@ CXXFLAGS := \
|
|||||||
-Wall \
|
-Wall \
|
||||||
-Wextra \
|
-Wextra \
|
||||||
-Wno-unused-parameter \
|
-Wno-unused-parameter \
|
||||||
-nostdinc \
|
|
||||||
-ffreestanding \
|
-ffreestanding \
|
||||||
-fno-stack-protector \
|
-fno-stack-protector \
|
||||||
-fno-stack-check \
|
-fno-stack-check \
|
||||||
-fno-PIC \
|
|
||||||
-fno-rtti \
|
-fno-rtti \
|
||||||
-fno-exceptions \
|
-fno-exceptions \
|
||||||
-ffunction-sections \
|
-ffunction-sections \
|
||||||
-fdata-sections \
|
-fdata-sections \
|
||||||
-m64 \
|
|
||||||
-march=x86-64 \
|
|
||||||
-msse \
|
-msse \
|
||||||
-msse2 \
|
-msse2 \
|
||||||
-mno-red-zone \
|
|
||||||
-mcmodel=small \
|
|
||||||
-I $(PROG_INC) \
|
-I $(PROG_INC) \
|
||||||
-isystem $(PROG_INC)/libc \
|
-isystem $(PROG_INC)/libc \
|
||||||
-I $(BEARSSL)/inc \
|
-I $(BEARSSL)/inc
|
||||||
-isystem ../../../kernel/freestnd-c-hdrs/x86_64/include \
|
|
||||||
-isystem ../../../kernel/freestnd-cxx-hdrs/x86_64/include
|
|
||||||
|
|
||||||
LDFLAGS := \
|
LDFLAGS := \
|
||||||
-nostdlib \
|
-nostdlib \
|
||||||
-static \
|
|
||||||
-Wl,--build-id=none \
|
|
||||||
-Wl,--gc-sections \
|
-Wl,--gc-sections \
|
||||||
-Wl,-m,elf_x86_64 \
|
|
||||||
-z max-page-size=0x1000 \
|
|
||||||
-T $(LINK_LD)
|
-T $(LINK_LD)
|
||||||
|
|
||||||
SRCS := main.cpp test_page_jpeg.cpp font_data.cpp stb_truetype_impl.cpp
|
SRCS := main.cpp test_page_jpeg.cpp font_data.cpp stb_truetype_impl.cpp
|
||||||
|
|||||||
@@ -4,11 +4,11 @@
|
|||||||
MAKEFLAGS += -rR
|
MAKEFLAGS += -rR
|
||||||
.SUFFIXES:
|
.SUFFIXES:
|
||||||
|
|
||||||
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-elf-
|
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-montauk-
|
||||||
ifneq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
ifeq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
||||||
CXX := $(TOOLCHAIN_PREFIX)g++
|
CXX = $(error x86_64-montauk toolchain not found. Run ./toolchain/build-montauk-toolchain.sh first)
|
||||||
else
|
else
|
||||||
CXX := g++
|
CXX := $(TOOLCHAIN_PREFIX)g++
|
||||||
endif
|
endif
|
||||||
|
|
||||||
PROG_INC := ../../include
|
PROG_INC := ../../include
|
||||||
@@ -24,35 +24,23 @@ CXXFLAGS := \
|
|||||||
-Wextra \
|
-Wextra \
|
||||||
-Wno-unused-parameter \
|
-Wno-unused-parameter \
|
||||||
-Wno-unused-function \
|
-Wno-unused-function \
|
||||||
-nostdinc \
|
|
||||||
-ffreestanding \
|
-ffreestanding \
|
||||||
-fno-stack-protector \
|
-fno-stack-protector \
|
||||||
-fno-stack-check \
|
-fno-stack-check \
|
||||||
-fno-PIC \
|
|
||||||
-fno-rtti \
|
-fno-rtti \
|
||||||
-fno-exceptions \
|
-fno-exceptions \
|
||||||
-ffunction-sections \
|
-ffunction-sections \
|
||||||
-fdata-sections \
|
-fdata-sections \
|
||||||
-m64 \
|
|
||||||
-march=x86-64 \
|
|
||||||
-msse \
|
-msse \
|
||||||
-msse2 \
|
-msse2 \
|
||||||
-mno-red-zone \
|
|
||||||
-mcmodel=small \
|
|
||||||
-MMD -MP \
|
-MMD -MP \
|
||||||
-I $(PROG_INC) \
|
-I $(PROG_INC) \
|
||||||
-isystem $(PROG_INC)/libc \
|
-isystem $(PROG_INC)/libc \
|
||||||
-I ../../lib/bearssl/inc \
|
-I ../../lib/bearssl/inc
|
||||||
-isystem ../../../kernel/freestnd-c-hdrs/x86_64/include \
|
|
||||||
-isystem ../../../kernel/freestnd-cxx-hdrs/x86_64/include
|
|
||||||
|
|
||||||
LDFLAGS := \
|
LDFLAGS := \
|
||||||
-nostdlib \
|
-nostdlib \
|
||||||
-static \
|
|
||||||
-Wl,--build-id=none \
|
|
||||||
-Wl,--gc-sections \
|
-Wl,--gc-sections \
|
||||||
-Wl,-m,elf_x86_64 \
|
|
||||||
-z max-page-size=0x1000 \
|
|
||||||
-T $(LINK_LD)
|
-T $(LINK_LD)
|
||||||
|
|
||||||
SRCS := main.cpp stb_truetype_impl.cpp font_data.cpp
|
SRCS := main.cpp stb_truetype_impl.cpp font_data.cpp
|
||||||
|
|||||||
@@ -4,11 +4,11 @@
|
|||||||
MAKEFLAGS += -rR
|
MAKEFLAGS += -rR
|
||||||
.SUFFIXES:
|
.SUFFIXES:
|
||||||
|
|
||||||
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-elf-
|
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-montauk-
|
||||||
ifneq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
ifeq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
||||||
CXX := $(TOOLCHAIN_PREFIX)g++
|
CXX = $(error x86_64-montauk toolchain not found. Run ./toolchain/build-montauk-toolchain.sh first)
|
||||||
else
|
else
|
||||||
CXX := g++
|
CXX := $(TOOLCHAIN_PREFIX)g++
|
||||||
endif
|
endif
|
||||||
|
|
||||||
PROG_INC := ../../include
|
PROG_INC := ../../include
|
||||||
@@ -24,34 +24,22 @@ CXXFLAGS := \
|
|||||||
-Wextra \
|
-Wextra \
|
||||||
-Wno-unused-parameter \
|
-Wno-unused-parameter \
|
||||||
-Wno-unused-function \
|
-Wno-unused-function \
|
||||||
-nostdinc \
|
|
||||||
-ffreestanding \
|
-ffreestanding \
|
||||||
-fno-stack-protector \
|
-fno-stack-protector \
|
||||||
-fno-stack-check \
|
-fno-stack-check \
|
||||||
-fno-PIC \
|
|
||||||
-fno-rtti \
|
-fno-rtti \
|
||||||
-fno-exceptions \
|
-fno-exceptions \
|
||||||
-ffunction-sections \
|
-ffunction-sections \
|
||||||
-fdata-sections \
|
-fdata-sections \
|
||||||
-m64 \
|
|
||||||
-march=x86-64 \
|
|
||||||
-msse \
|
-msse \
|
||||||
-msse2 \
|
-msse2 \
|
||||||
-mno-red-zone \
|
|
||||||
-mcmodel=small \
|
|
||||||
-MMD -MP \
|
-MMD -MP \
|
||||||
-I $(PROG_INC) \
|
-I $(PROG_INC) \
|
||||||
-isystem $(PROG_INC)/libc \
|
-isystem $(PROG_INC)/libc
|
||||||
-isystem ../../../kernel/freestnd-c-hdrs/x86_64/include \
|
|
||||||
-isystem ../../../kernel/freestnd-cxx-hdrs/x86_64/include
|
|
||||||
|
|
||||||
LDFLAGS := \
|
LDFLAGS := \
|
||||||
-nostdlib \
|
-nostdlib \
|
||||||
-static \
|
|
||||||
-Wl,--build-id=none \
|
|
||||||
-Wl,--gc-sections \
|
-Wl,--gc-sections \
|
||||||
-Wl,-m,elf_x86_64 \
|
|
||||||
-z max-page-size=0x1000 \
|
|
||||||
-T $(LINK_LD)
|
-T $(LINK_LD)
|
||||||
|
|
||||||
SRCS := main.cpp stb_truetype_impl.cpp
|
SRCS := main.cpp stb_truetype_impl.cpp
|
||||||
|
|||||||
@@ -6,11 +6,11 @@ MAKEFLAGS += -rR
|
|||||||
|
|
||||||
# ---- Toolchain ----
|
# ---- Toolchain ----
|
||||||
|
|
||||||
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-elf-
|
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-montauk-
|
||||||
ifneq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
ifeq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
||||||
CXX := $(TOOLCHAIN_PREFIX)g++
|
CXX = $(error x86_64-montauk toolchain not found. Run ./toolchain/build-montauk-toolchain.sh first)
|
||||||
else
|
else
|
||||||
CXX := g++
|
CXX := $(TOOLCHAIN_PREFIX)g++
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# ---- Paths ----
|
# ---- Paths ----
|
||||||
@@ -34,37 +34,25 @@ CXXFLAGS := \
|
|||||||
-Wno-unused-parameter \
|
-Wno-unused-parameter \
|
||||||
-Wno-unused-function \
|
-Wno-unused-function \
|
||||||
-Wno-missing-field-initializers \
|
-Wno-missing-field-initializers \
|
||||||
-nostdinc \
|
|
||||||
-ffreestanding \
|
-ffreestanding \
|
||||||
-fno-stack-protector \
|
-fno-stack-protector \
|
||||||
-fno-stack-check \
|
-fno-stack-check \
|
||||||
-fno-PIC \
|
|
||||||
-fno-rtti \
|
-fno-rtti \
|
||||||
-fno-exceptions \
|
-fno-exceptions \
|
||||||
-ffunction-sections \
|
-ffunction-sections \
|
||||||
-fdata-sections \
|
-fdata-sections \
|
||||||
-fno-tree-loop-distribute-patterns \
|
-fno-tree-loop-distribute-patterns \
|
||||||
-m64 \
|
|
||||||
-march=x86-64 \
|
|
||||||
-msse \
|
-msse \
|
||||||
-msse2 \
|
-msse2 \
|
||||||
-mno-red-zone \
|
|
||||||
-mcmodel=small \
|
|
||||||
-I $(PROG_INC) \
|
-I $(PROG_INC) \
|
||||||
-I . \
|
-I . \
|
||||||
-isystem $(PROG_INC)/libc \
|
-isystem $(PROG_INC)/libc
|
||||||
-isystem ../../../kernel/freestnd-c-hdrs/x86_64/include \
|
|
||||||
-isystem ../../../kernel/freestnd-cxx-hdrs/x86_64/include
|
|
||||||
|
|
||||||
# ---- Linker flags ----
|
# ---- Linker flags ----
|
||||||
|
|
||||||
LDFLAGS := \
|
LDFLAGS := \
|
||||||
-nostdlib \
|
-nostdlib \
|
||||||
-static \
|
|
||||||
-Wl,--build-id=none \
|
|
||||||
-Wl,--gc-sections \
|
-Wl,--gc-sections \
|
||||||
-Wl,-m,elf_x86_64 \
|
|
||||||
-z max-page-size=0x1000 \
|
|
||||||
-T $(LINK_LD)
|
-T $(LINK_LD)
|
||||||
|
|
||||||
# ---- Source files ----
|
# ---- Source files ----
|
||||||
|
|||||||
@@ -6,11 +6,11 @@ MAKEFLAGS += -rR
|
|||||||
|
|
||||||
# ---- Toolchain ----
|
# ---- Toolchain ----
|
||||||
|
|
||||||
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-elf-
|
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-montauk-
|
||||||
ifneq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
ifeq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
||||||
CXX := $(TOOLCHAIN_PREFIX)g++
|
CXX = $(error x86_64-montauk toolchain not found. Run ./toolchain/build-montauk-toolchain.sh first)
|
||||||
else
|
else
|
||||||
CXX := g++
|
CXX := $(TOOLCHAIN_PREFIX)g++
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# ---- Paths ----
|
# ---- Paths ----
|
||||||
@@ -34,36 +34,24 @@ CXXFLAGS := \
|
|||||||
-Wextra \
|
-Wextra \
|
||||||
-Wno-unused-parameter \
|
-Wno-unused-parameter \
|
||||||
-Wno-unused-function \
|
-Wno-unused-function \
|
||||||
-nostdinc \
|
|
||||||
-ffreestanding \
|
-ffreestanding \
|
||||||
-fno-stack-protector \
|
-fno-stack-protector \
|
||||||
-fno-stack-check \
|
-fno-stack-check \
|
||||||
-fno-PIC \
|
|
||||||
-fno-rtti \
|
-fno-rtti \
|
||||||
-fno-exceptions \
|
-fno-exceptions \
|
||||||
-ffunction-sections \
|
-ffunction-sections \
|
||||||
-fdata-sections \
|
-fdata-sections \
|
||||||
-m64 \
|
|
||||||
-march=x86-64 \
|
|
||||||
-msse \
|
-msse \
|
||||||
-msse2 \
|
-msse2 \
|
||||||
-mno-red-zone \
|
|
||||||
-mcmodel=small \
|
|
||||||
-MMD -MP \
|
-MMD -MP \
|
||||||
-I $(PROG_INC) \
|
-I $(PROG_INC) \
|
||||||
-isystem $(PROG_INC)/libc \
|
-isystem $(PROG_INC)/libc
|
||||||
-isystem $(PROJECT_ROOT)/kernel/freestnd-c-hdrs/x86_64/include \
|
|
||||||
-isystem $(PROJECT_ROOT)/kernel/freestnd-cxx-hdrs/x86_64/include
|
|
||||||
|
|
||||||
# ---- Linker flags ----
|
# ---- Linker flags ----
|
||||||
|
|
||||||
LDFLAGS := \
|
LDFLAGS := \
|
||||||
-nostdlib \
|
-nostdlib \
|
||||||
-static \
|
|
||||||
-Wl,--build-id=none \
|
|
||||||
-Wl,--gc-sections \
|
-Wl,--gc-sections \
|
||||||
-Wl,-m,elf_x86_64 \
|
|
||||||
-z max-page-size=0x1000 \
|
|
||||||
-T $(LINK_LD)
|
-T $(LINK_LD)
|
||||||
|
|
||||||
# ---- Libraries ----
|
# ---- Libraries ----
|
||||||
|
|||||||
@@ -6,11 +6,11 @@ MAKEFLAGS += -rR
|
|||||||
|
|
||||||
# ---- Toolchain ----
|
# ---- Toolchain ----
|
||||||
|
|
||||||
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-elf-
|
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-montauk-
|
||||||
ifneq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
ifeq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
||||||
CXX := $(TOOLCHAIN_PREFIX)g++
|
CXX = $(error x86_64-montauk toolchain not found. Run ./toolchain/build-montauk-toolchain.sh first)
|
||||||
else
|
else
|
||||||
CXX := g++
|
CXX := $(TOOLCHAIN_PREFIX)g++
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# ---- Paths ----
|
# ---- Paths ----
|
||||||
@@ -28,38 +28,26 @@ CXXFLAGS := \
|
|||||||
-Wall \
|
-Wall \
|
||||||
-Wextra \
|
-Wextra \
|
||||||
-Wno-unused-parameter \
|
-Wno-unused-parameter \
|
||||||
-nostdinc \
|
|
||||||
-ffreestanding \
|
-ffreestanding \
|
||||||
-fno-stack-protector \
|
-fno-stack-protector \
|
||||||
-fno-stack-check \
|
-fno-stack-check \
|
||||||
-fno-PIC \
|
|
||||||
-fno-rtti \
|
-fno-rtti \
|
||||||
-fno-exceptions \
|
-fno-exceptions \
|
||||||
-ffunction-sections \
|
-ffunction-sections \
|
||||||
-fdata-sections \
|
-fdata-sections \
|
||||||
-m64 \
|
|
||||||
-march=x86-64 \
|
|
||||||
-mno-80387 \
|
-mno-80387 \
|
||||||
-mno-mmx \
|
-mno-mmx \
|
||||||
-mno-sse \
|
-mno-sse \
|
||||||
-mno-sse2 \
|
-mno-sse2 \
|
||||||
-mno-red-zone \
|
|
||||||
-mcmodel=small \
|
|
||||||
-MMD -MP \
|
-MMD -MP \
|
||||||
-I . \
|
-I . \
|
||||||
-I $(PROG_INC) \
|
-I $(PROG_INC)
|
||||||
-isystem ../../../kernel/freestnd-c-hdrs/x86_64/include \
|
|
||||||
-isystem ../../../kernel/freestnd-cxx-hdrs/x86_64/include
|
|
||||||
|
|
||||||
# ---- Linker flags ----
|
# ---- Linker flags ----
|
||||||
|
|
||||||
LDFLAGS := \
|
LDFLAGS := \
|
||||||
-nostdlib \
|
-nostdlib \
|
||||||
-static \
|
|
||||||
-Wl,--build-id=none \
|
|
||||||
-Wl,--gc-sections \
|
-Wl,--gc-sections \
|
||||||
-Wl,-m,elf_x86_64 \
|
|
||||||
-z max-page-size=0x1000 \
|
|
||||||
-T $(LINK_LD)
|
-T $(LINK_LD)
|
||||||
|
|
||||||
# ---- Source files ----
|
# ---- Source files ----
|
||||||
|
|||||||
@@ -6,11 +6,11 @@ MAKEFLAGS += -rR
|
|||||||
|
|
||||||
# ---- Toolchain ----
|
# ---- Toolchain ----
|
||||||
|
|
||||||
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-elf-
|
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-montauk-
|
||||||
ifneq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
ifeq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
||||||
CXX := $(TOOLCHAIN_PREFIX)g++
|
CXX = $(error x86_64-montauk toolchain not found. Run ./toolchain/build-montauk-toolchain.sh first)
|
||||||
else
|
else
|
||||||
CXX := g++
|
CXX := $(TOOLCHAIN_PREFIX)g++
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# ---- Paths ----
|
# ---- Paths ----
|
||||||
@@ -30,35 +30,23 @@ CXXFLAGS := \
|
|||||||
-Wextra \
|
-Wextra \
|
||||||
-Wno-unused-parameter \
|
-Wno-unused-parameter \
|
||||||
-Wno-unused-function \
|
-Wno-unused-function \
|
||||||
-nostdinc \
|
|
||||||
-ffreestanding \
|
-ffreestanding \
|
||||||
-fno-stack-protector \
|
-fno-stack-protector \
|
||||||
-fno-stack-check \
|
-fno-stack-check \
|
||||||
-fno-PIC \
|
|
||||||
-fno-rtti \
|
-fno-rtti \
|
||||||
-fno-exceptions \
|
-fno-exceptions \
|
||||||
-ffunction-sections \
|
-ffunction-sections \
|
||||||
-fdata-sections \
|
-fdata-sections \
|
||||||
-m64 \
|
|
||||||
-march=x86-64 \
|
|
||||||
-msse \
|
-msse \
|
||||||
-msse2 \
|
-msse2 \
|
||||||
-mno-red-zone \
|
|
||||||
-mcmodel=small \
|
|
||||||
-I $(PROG_INC) \
|
-I $(PROG_INC) \
|
||||||
-isystem $(PROG_INC)/libc \
|
-isystem $(PROG_INC)/libc
|
||||||
-isystem ../../../kernel/freestnd-c-hdrs/x86_64/include \
|
|
||||||
-isystem ../../../kernel/freestnd-cxx-hdrs/x86_64/include
|
|
||||||
|
|
||||||
# ---- Linker flags ----
|
# ---- Linker flags ----
|
||||||
|
|
||||||
LDFLAGS := \
|
LDFLAGS := \
|
||||||
-nostdlib \
|
-nostdlib \
|
||||||
-static \
|
|
||||||
-Wl,--build-id=none \
|
|
||||||
-Wl,--gc-sections \
|
-Wl,--gc-sections \
|
||||||
-Wl,-m,elf_x86_64 \
|
|
||||||
-z max-page-size=0x1000 \
|
|
||||||
-T $(LINK_LD)
|
-T $(LINK_LD)
|
||||||
|
|
||||||
# ---- Source files ----
|
# ---- Source files ----
|
||||||
|
|||||||
@@ -6,15 +6,15 @@ MAKEFLAGS += -rR
|
|||||||
|
|
||||||
# ---- Toolchain ----
|
# ---- Toolchain ----
|
||||||
|
|
||||||
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-elf-
|
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-montauk-
|
||||||
ifneq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
ifeq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
||||||
|
CC = $(error x86_64-montauk toolchain not found. Run ./toolchain/build-montauk-toolchain.sh first)
|
||||||
|
CXX = $(error x86_64-montauk toolchain not found. Run ./toolchain/build-montauk-toolchain.sh first)
|
||||||
|
AR = $(error x86_64-montauk toolchain not found. Run ./toolchain/build-montauk-toolchain.sh first)
|
||||||
|
else
|
||||||
CC := $(TOOLCHAIN_PREFIX)gcc
|
CC := $(TOOLCHAIN_PREFIX)gcc
|
||||||
CXX := $(TOOLCHAIN_PREFIX)g++
|
CXX := $(TOOLCHAIN_PREFIX)g++
|
||||||
AR := $(TOOLCHAIN_PREFIX)ar
|
AR := $(TOOLCHAIN_PREFIX)ar
|
||||||
else
|
|
||||||
CC := gcc
|
|
||||||
CXX := g++
|
|
||||||
AR := ar
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# ---- Paths ----
|
# ---- Paths ----
|
||||||
@@ -37,19 +37,13 @@ CFLAGS := \
|
|||||||
-Wno-implicit-fallthrough \
|
-Wno-implicit-fallthrough \
|
||||||
-Wno-stringop-truncation \
|
-Wno-stringop-truncation \
|
||||||
-Wno-format-truncation \
|
-Wno-format-truncation \
|
||||||
-nostdinc \
|
|
||||||
-ffreestanding \
|
-ffreestanding \
|
||||||
-fno-stack-protector \
|
-fno-stack-protector \
|
||||||
-fno-stack-check \
|
-fno-stack-check \
|
||||||
-fno-PIC \
|
|
||||||
-ffunction-sections \
|
-ffunction-sections \
|
||||||
-fdata-sections \
|
-fdata-sections \
|
||||||
-m64 \
|
|
||||||
-march=x86-64 \
|
|
||||||
-msse \
|
-msse \
|
||||||
-msse2 \
|
-msse2 \
|
||||||
-mno-red-zone \
|
|
||||||
-mcmodel=small \
|
|
||||||
-fno-tree-loop-distribute-patterns \
|
-fno-tree-loop-distribute-patterns \
|
||||||
-D__MONTAUKOS__=1 \
|
-D__MONTAUKOS__=1 \
|
||||||
-DONE_SOURCE=0 \
|
-DONE_SOURCE=0 \
|
||||||
@@ -61,11 +55,7 @@ CFLAGS := \
|
|||||||
|
|
||||||
LDFLAGS := \
|
LDFLAGS := \
|
||||||
-nostdlib \
|
-nostdlib \
|
||||||
-static \
|
|
||||||
-Wl,--build-id=none \
|
|
||||||
-Wl,--gc-sections \
|
-Wl,--gc-sections \
|
||||||
-Wl,-m,elf_x86_64 \
|
|
||||||
-z max-page-size=0x1000 \
|
|
||||||
-T ../../link.ld
|
-T ../../link.ld
|
||||||
|
|
||||||
# ---- Sources ----
|
# ---- Sources ----
|
||||||
|
|||||||
@@ -4,11 +4,11 @@
|
|||||||
MAKEFLAGS += -rR
|
MAKEFLAGS += -rR
|
||||||
.SUFFIXES:
|
.SUFFIXES:
|
||||||
|
|
||||||
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-elf-
|
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-montauk-
|
||||||
ifneq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
ifeq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
||||||
CXX := $(TOOLCHAIN_PREFIX)g++
|
CXX = $(error x86_64-montauk toolchain not found. Run ./toolchain/build-montauk-toolchain.sh first)
|
||||||
else
|
else
|
||||||
CXX := g++
|
CXX := $(TOOLCHAIN_PREFIX)g++
|
||||||
endif
|
endif
|
||||||
|
|
||||||
PROG_INC := ../../include
|
PROG_INC := ../../include
|
||||||
@@ -24,33 +24,21 @@ CXXFLAGS := \
|
|||||||
-Wextra \
|
-Wextra \
|
||||||
-Wno-unused-parameter \
|
-Wno-unused-parameter \
|
||||||
-Wno-unused-function \
|
-Wno-unused-function \
|
||||||
-nostdinc \
|
|
||||||
-ffreestanding \
|
-ffreestanding \
|
||||||
-fno-stack-protector \
|
-fno-stack-protector \
|
||||||
-fno-stack-check \
|
-fno-stack-check \
|
||||||
-fno-PIC \
|
|
||||||
-fno-rtti \
|
-fno-rtti \
|
||||||
-fno-exceptions \
|
-fno-exceptions \
|
||||||
-ffunction-sections \
|
-ffunction-sections \
|
||||||
-fdata-sections \
|
-fdata-sections \
|
||||||
-m64 \
|
|
||||||
-march=x86-64 \
|
|
||||||
-msse \
|
-msse \
|
||||||
-msse2 \
|
-msse2 \
|
||||||
-mno-red-zone \
|
|
||||||
-mcmodel=small \
|
|
||||||
-I $(PROG_INC) \
|
-I $(PROG_INC) \
|
||||||
-isystem $(PROG_INC)/libc \
|
-isystem $(PROG_INC)/libc
|
||||||
-isystem ../../../kernel/freestnd-c-hdrs/x86_64/include \
|
|
||||||
-isystem ../../../kernel/freestnd-cxx-hdrs/x86_64/include
|
|
||||||
|
|
||||||
LDFLAGS := \
|
LDFLAGS := \
|
||||||
-nostdlib \
|
-nostdlib \
|
||||||
-static \
|
|
||||||
-Wl,--build-id=none \
|
|
||||||
-Wl,--gc-sections \
|
-Wl,--gc-sections \
|
||||||
-Wl,-m,elf_x86_64 \
|
|
||||||
-z max-page-size=0x1000 \
|
|
||||||
-T $(LINK_LD)
|
-T $(LINK_LD)
|
||||||
|
|
||||||
SRCS := main.cpp stb_truetype_impl.cpp font_data.cpp
|
SRCS := main.cpp stb_truetype_impl.cpp font_data.cpp
|
||||||
|
|||||||
@@ -6,11 +6,11 @@ MAKEFLAGS += -rR
|
|||||||
|
|
||||||
# ---- Toolchain ----
|
# ---- Toolchain ----
|
||||||
|
|
||||||
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-elf-
|
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-montauk-
|
||||||
ifneq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
ifeq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
||||||
CXX := $(TOOLCHAIN_PREFIX)g++
|
CXX = $(error x86_64-montauk toolchain not found. Run ./toolchain/build-montauk-toolchain.sh first)
|
||||||
else
|
else
|
||||||
CXX := g++
|
CXX := $(TOOLCHAIN_PREFIX)g++
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# ---- Paths ----
|
# ---- Paths ----
|
||||||
@@ -30,35 +30,23 @@ CXXFLAGS := \
|
|||||||
-Wextra \
|
-Wextra \
|
||||||
-Wno-unused-parameter \
|
-Wno-unused-parameter \
|
||||||
-Wno-unused-function \
|
-Wno-unused-function \
|
||||||
-nostdinc \
|
|
||||||
-ffreestanding \
|
-ffreestanding \
|
||||||
-fno-stack-protector \
|
-fno-stack-protector \
|
||||||
-fno-stack-check \
|
-fno-stack-check \
|
||||||
-fno-PIC \
|
|
||||||
-fno-rtti \
|
-fno-rtti \
|
||||||
-fno-exceptions \
|
-fno-exceptions \
|
||||||
-ffunction-sections \
|
-ffunction-sections \
|
||||||
-fdata-sections \
|
-fdata-sections \
|
||||||
-m64 \
|
|
||||||
-march=x86-64 \
|
|
||||||
-msse \
|
-msse \
|
||||||
-msse2 \
|
-msse2 \
|
||||||
-mno-red-zone \
|
|
||||||
-mcmodel=small \
|
|
||||||
-I $(PROG_INC) \
|
-I $(PROG_INC) \
|
||||||
-isystem $(PROG_INC)/libc \
|
-isystem $(PROG_INC)/libc
|
||||||
-isystem ../../../kernel/freestnd-c-hdrs/x86_64/include \
|
|
||||||
-isystem ../../../kernel/freestnd-cxx-hdrs/x86_64/include
|
|
||||||
|
|
||||||
# ---- Linker flags ----
|
# ---- Linker flags ----
|
||||||
|
|
||||||
LDFLAGS := \
|
LDFLAGS := \
|
||||||
-nostdlib \
|
-nostdlib \
|
||||||
-static \
|
|
||||||
-Wl,--build-id=none \
|
|
||||||
-Wl,--gc-sections \
|
-Wl,--gc-sections \
|
||||||
-Wl,-m,elf_x86_64 \
|
|
||||||
-z max-page-size=0x1000 \
|
|
||||||
-T $(LINK_LD)
|
-T $(LINK_LD)
|
||||||
|
|
||||||
# ---- Source files ----
|
# ---- Source files ----
|
||||||
|
|||||||
@@ -4,11 +4,11 @@
|
|||||||
MAKEFLAGS += -rR
|
MAKEFLAGS += -rR
|
||||||
.SUFFIXES:
|
.SUFFIXES:
|
||||||
|
|
||||||
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-elf-
|
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-montauk-
|
||||||
ifneq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
ifeq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
||||||
CXX := $(TOOLCHAIN_PREFIX)g++
|
CXX = $(error x86_64-montauk toolchain not found. Run ./toolchain/build-montauk-toolchain.sh first)
|
||||||
else
|
else
|
||||||
CXX := g++
|
CXX := $(TOOLCHAIN_PREFIX)g++
|
||||||
endif
|
endif
|
||||||
|
|
||||||
PROG_INC := ../../include
|
PROG_INC := ../../include
|
||||||
@@ -24,34 +24,22 @@ CXXFLAGS := \
|
|||||||
-Wextra \
|
-Wextra \
|
||||||
-Wno-unused-parameter \
|
-Wno-unused-parameter \
|
||||||
-Wno-unused-function \
|
-Wno-unused-function \
|
||||||
-nostdinc \
|
|
||||||
-ffreestanding \
|
-ffreestanding \
|
||||||
-fno-stack-protector \
|
-fno-stack-protector \
|
||||||
-fno-stack-check \
|
-fno-stack-check \
|
||||||
-fno-PIC \
|
|
||||||
-fno-rtti \
|
-fno-rtti \
|
||||||
-fno-exceptions \
|
-fno-exceptions \
|
||||||
-ffunction-sections \
|
-ffunction-sections \
|
||||||
-fdata-sections \
|
-fdata-sections \
|
||||||
-m64 \
|
|
||||||
-march=x86-64 \
|
|
||||||
-msse \
|
-msse \
|
||||||
-msse2 \
|
-msse2 \
|
||||||
-mno-red-zone \
|
|
||||||
-mcmodel=small \
|
|
||||||
-MMD -MP \
|
-MMD -MP \
|
||||||
-I $(PROG_INC) \
|
-I $(PROG_INC) \
|
||||||
-isystem $(PROG_INC)/libc \
|
-isystem $(PROG_INC)/libc
|
||||||
-isystem ../../../kernel/freestnd-c-hdrs/x86_64/include \
|
|
||||||
-isystem ../../../kernel/freestnd-cxx-hdrs/x86_64/include
|
|
||||||
|
|
||||||
LDFLAGS := \
|
LDFLAGS := \
|
||||||
-nostdlib \
|
-nostdlib \
|
||||||
-static \
|
|
||||||
-Wl,--build-id=none \
|
|
||||||
-Wl,--gc-sections \
|
-Wl,--gc-sections \
|
||||||
-Wl,-m,elf_x86_64 \
|
|
||||||
-z max-page-size=0x1000 \
|
|
||||||
-T $(LINK_LD)
|
-T $(LINK_LD)
|
||||||
|
|
||||||
SRCS := main.cpp stb_truetype_impl.cpp font_data.cpp
|
SRCS := main.cpp stb_truetype_impl.cpp font_data.cpp
|
||||||
|
|||||||
@@ -4,11 +4,11 @@
|
|||||||
MAKEFLAGS += -rR
|
MAKEFLAGS += -rR
|
||||||
.SUFFIXES:
|
.SUFFIXES:
|
||||||
|
|
||||||
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-elf-
|
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-montauk-
|
||||||
ifneq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
ifeq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
||||||
CXX := $(TOOLCHAIN_PREFIX)g++
|
CXX = $(error x86_64-montauk toolchain not found. Run ./toolchain/build-montauk-toolchain.sh first)
|
||||||
else
|
else
|
||||||
CXX := g++
|
CXX := $(TOOLCHAIN_PREFIX)g++
|
||||||
endif
|
endif
|
||||||
|
|
||||||
PROG_INC := ../../include
|
PROG_INC := ../../include
|
||||||
@@ -24,34 +24,22 @@ CXXFLAGS := \
|
|||||||
-Wextra \
|
-Wextra \
|
||||||
-Wno-unused-parameter \
|
-Wno-unused-parameter \
|
||||||
-Wno-unused-function \
|
-Wno-unused-function \
|
||||||
-nostdinc \
|
|
||||||
-ffreestanding \
|
-ffreestanding \
|
||||||
-fno-stack-protector \
|
-fno-stack-protector \
|
||||||
-fno-stack-check \
|
-fno-stack-check \
|
||||||
-fno-PIC \
|
|
||||||
-fno-rtti \
|
-fno-rtti \
|
||||||
-fno-exceptions \
|
-fno-exceptions \
|
||||||
-ffunction-sections \
|
-ffunction-sections \
|
||||||
-fdata-sections \
|
-fdata-sections \
|
||||||
-m64 \
|
|
||||||
-march=x86-64 \
|
|
||||||
-msse \
|
-msse \
|
||||||
-msse2 \
|
-msse2 \
|
||||||
-mno-red-zone \
|
|
||||||
-mcmodel=small \
|
|
||||||
-I $(PROG_INC) \
|
-I $(PROG_INC) \
|
||||||
-I . \
|
-I . \
|
||||||
-isystem $(PROG_INC)/libc \
|
-isystem $(PROG_INC)/libc
|
||||||
-isystem ../../../kernel/freestnd-c-hdrs/x86_64/include \
|
|
||||||
-isystem ../../../kernel/freestnd-cxx-hdrs/x86_64/include
|
|
||||||
|
|
||||||
LDFLAGS := \
|
LDFLAGS := \
|
||||||
-nostdlib \
|
-nostdlib \
|
||||||
-static \
|
|
||||||
-Wl,--build-id=none \
|
|
||||||
-Wl,--gc-sections \
|
-Wl,--gc-sections \
|
||||||
-Wl,-m,elf_x86_64 \
|
|
||||||
-z max-page-size=0x1000 \
|
|
||||||
-T $(LINK_LD)
|
-T $(LINK_LD)
|
||||||
|
|
||||||
SRCS := main.cpp avi.cpp stb_image_impl.cpp stb_truetype_impl.cpp
|
SRCS := main.cpp avi.cpp stb_image_impl.cpp stb_truetype_impl.cpp
|
||||||
|
|||||||
@@ -6,11 +6,11 @@ MAKEFLAGS += -rR
|
|||||||
|
|
||||||
# ---- Toolchain ----
|
# ---- Toolchain ----
|
||||||
|
|
||||||
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-elf-
|
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-montauk-
|
||||||
ifneq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
ifeq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
||||||
CXX := $(TOOLCHAIN_PREFIX)g++
|
CXX = $(error x86_64-montauk toolchain not found. Run ./toolchain/build-montauk-toolchain.sh first)
|
||||||
else
|
else
|
||||||
CXX := g++
|
CXX := $(TOOLCHAIN_PREFIX)g++
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# ---- Paths ----
|
# ---- Paths ----
|
||||||
@@ -33,36 +33,24 @@ CXXFLAGS := \
|
|||||||
-Wextra \
|
-Wextra \
|
||||||
-Wno-unused-parameter \
|
-Wno-unused-parameter \
|
||||||
-Wno-unused-function \
|
-Wno-unused-function \
|
||||||
-nostdinc \
|
|
||||||
-ffreestanding \
|
-ffreestanding \
|
||||||
-fno-stack-protector \
|
-fno-stack-protector \
|
||||||
-fno-stack-check \
|
-fno-stack-check \
|
||||||
-fno-PIC \
|
|
||||||
-fno-rtti \
|
-fno-rtti \
|
||||||
-fno-exceptions \
|
-fno-exceptions \
|
||||||
-ffunction-sections \
|
-ffunction-sections \
|
||||||
-fdata-sections \
|
-fdata-sections \
|
||||||
-m64 \
|
|
||||||
-march=x86-64 \
|
|
||||||
-msse \
|
-msse \
|
||||||
-msse2 \
|
-msse2 \
|
||||||
-mno-red-zone \
|
|
||||||
-mcmodel=small \
|
|
||||||
-I $(PROG_INC) \
|
-I $(PROG_INC) \
|
||||||
-isystem $(LIBC_INC) \
|
-isystem $(LIBC_INC) \
|
||||||
-I $(BEARSSL)/inc \
|
-I $(BEARSSL)/inc
|
||||||
-isystem ../../../kernel/freestnd-c-hdrs/x86_64/include \
|
|
||||||
-isystem ../../../kernel/freestnd-cxx-hdrs/x86_64/include
|
|
||||||
|
|
||||||
# ---- Linker flags ----
|
# ---- Linker flags ----
|
||||||
|
|
||||||
LDFLAGS := \
|
LDFLAGS := \
|
||||||
-nostdlib \
|
-nostdlib \
|
||||||
-static \
|
|
||||||
-Wl,--build-id=none \
|
|
||||||
-Wl,--gc-sections \
|
-Wl,--gc-sections \
|
||||||
-Wl,-m,elf_x86_64 \
|
|
||||||
-z max-page-size=0x1000 \
|
|
||||||
-T $(LINK_LD)
|
-T $(LINK_LD)
|
||||||
|
|
||||||
# ---- Libraries ----
|
# ---- Libraries ----
|
||||||
|
|||||||
@@ -6,11 +6,11 @@ MAKEFLAGS += -rR
|
|||||||
|
|
||||||
# ---- Toolchain ----
|
# ---- Toolchain ----
|
||||||
|
|
||||||
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-elf-
|
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-montauk-
|
||||||
ifneq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
ifeq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
||||||
CXX := $(TOOLCHAIN_PREFIX)g++
|
CXX = $(error x86_64-montauk toolchain not found. Run ./toolchain/build-montauk-toolchain.sh first)
|
||||||
else
|
else
|
||||||
CXX := g++
|
CXX := $(TOOLCHAIN_PREFIX)g++
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# ---- Paths ----
|
# ---- Paths ----
|
||||||
@@ -32,38 +32,26 @@ CXXFLAGS := \
|
|||||||
-Wall \
|
-Wall \
|
||||||
-Wextra \
|
-Wextra \
|
||||||
-Wno-unused-parameter \
|
-Wno-unused-parameter \
|
||||||
-nostdinc \
|
|
||||||
-ffreestanding \
|
-ffreestanding \
|
||||||
-fno-stack-protector \
|
-fno-stack-protector \
|
||||||
-fno-stack-check \
|
-fno-stack-check \
|
||||||
-fno-PIC \
|
|
||||||
-fno-rtti \
|
-fno-rtti \
|
||||||
-fno-exceptions \
|
-fno-exceptions \
|
||||||
-ffunction-sections \
|
-ffunction-sections \
|
||||||
-fdata-sections \
|
-fdata-sections \
|
||||||
-m64 \
|
|
||||||
-march=x86-64 \
|
|
||||||
-mno-80387 \
|
-mno-80387 \
|
||||||
-mno-mmx \
|
-mno-mmx \
|
||||||
-mno-sse \
|
-mno-sse \
|
||||||
-mno-sse2 \
|
-mno-sse2 \
|
||||||
-mno-red-zone \
|
|
||||||
-mcmodel=small \
|
|
||||||
-I $(PROG_INC) \
|
-I $(PROG_INC) \
|
||||||
-isystem $(LIBC_INC) \
|
-isystem $(LIBC_INC) \
|
||||||
-I $(BEARSSL)/inc \
|
-I $(BEARSSL)/inc
|
||||||
-isystem ../../../kernel/freestnd-c-hdrs/x86_64/include \
|
|
||||||
-isystem ../../../kernel/freestnd-cxx-hdrs/x86_64/include
|
|
||||||
|
|
||||||
# ---- Linker flags ----
|
# ---- Linker flags ----
|
||||||
|
|
||||||
LDFLAGS := \
|
LDFLAGS := \
|
||||||
-nostdlib \
|
-nostdlib \
|
||||||
-static \
|
|
||||||
-Wl,--build-id=none \
|
|
||||||
-Wl,--gc-sections \
|
-Wl,--gc-sections \
|
||||||
-Wl,-m,elf_x86_64 \
|
|
||||||
-z max-page-size=0x1000 \
|
|
||||||
-T $(LINK_LD)
|
-T $(LINK_LD)
|
||||||
|
|
||||||
# ---- Libraries ----
|
# ---- Libraries ----
|
||||||
|
|||||||
@@ -6,11 +6,11 @@ MAKEFLAGS += -rR
|
|||||||
|
|
||||||
# ---- Toolchain ----
|
# ---- Toolchain ----
|
||||||
|
|
||||||
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-elf-
|
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-montauk-
|
||||||
ifneq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
ifeq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
||||||
CXX := $(TOOLCHAIN_PREFIX)g++
|
CXX = $(error x86_64-montauk toolchain not found. Run ./toolchain/build-montauk-toolchain.sh first)
|
||||||
else
|
else
|
||||||
CXX := g++
|
CXX := $(TOOLCHAIN_PREFIX)g++
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# ---- Paths ----
|
# ---- Paths ----
|
||||||
@@ -33,36 +33,24 @@ CXXFLAGS := \
|
|||||||
-Wextra \
|
-Wextra \
|
||||||
-Wno-unused-parameter \
|
-Wno-unused-parameter \
|
||||||
-Wno-unused-function \
|
-Wno-unused-function \
|
||||||
-nostdinc \
|
|
||||||
-ffreestanding \
|
-ffreestanding \
|
||||||
-fno-stack-protector \
|
-fno-stack-protector \
|
||||||
-fno-stack-check \
|
-fno-stack-check \
|
||||||
-fno-PIC \
|
|
||||||
-fno-rtti \
|
-fno-rtti \
|
||||||
-fno-exceptions \
|
-fno-exceptions \
|
||||||
-ffunction-sections \
|
-ffunction-sections \
|
||||||
-fdata-sections \
|
-fdata-sections \
|
||||||
-m64 \
|
|
||||||
-march=x86-64 \
|
|
||||||
-msse \
|
-msse \
|
||||||
-msse2 \
|
-msse2 \
|
||||||
-mno-red-zone \
|
|
||||||
-mcmodel=small \
|
|
||||||
-I $(PROG_INC) \
|
-I $(PROG_INC) \
|
||||||
-isystem $(LIBC_INC) \
|
-isystem $(LIBC_INC) \
|
||||||
-I $(BEARSSL)/inc \
|
-I $(BEARSSL)/inc
|
||||||
-isystem ../../../kernel/freestnd-c-hdrs/x86_64/include \
|
|
||||||
-isystem ../../../kernel/freestnd-cxx-hdrs/x86_64/include
|
|
||||||
|
|
||||||
# ---- Linker flags ----
|
# ---- Linker flags ----
|
||||||
|
|
||||||
LDFLAGS := \
|
LDFLAGS := \
|
||||||
-nostdlib \
|
-nostdlib \
|
||||||
-static \
|
|
||||||
-Wl,--build-id=none \
|
|
||||||
-Wl,--gc-sections \
|
-Wl,--gc-sections \
|
||||||
-Wl,-m,elf_x86_64 \
|
|
||||||
-z max-page-size=0x1000 \
|
|
||||||
-T $(LINK_LD)
|
-T $(LINK_LD)
|
||||||
|
|
||||||
# ---- Libraries ----
|
# ---- Libraries ----
|
||||||
|
|||||||
@@ -4,11 +4,11 @@
|
|||||||
MAKEFLAGS += -rR
|
MAKEFLAGS += -rR
|
||||||
.SUFFIXES:
|
.SUFFIXES:
|
||||||
|
|
||||||
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-elf-
|
TOOLCHAIN_PREFIX := $(shell cd ../../.. && pwd)/toolchain/local/bin/x86_64-montauk-
|
||||||
ifneq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
ifeq ($(wildcard $(TOOLCHAIN_PREFIX)gcc),)
|
||||||
CXX := $(TOOLCHAIN_PREFIX)g++
|
CXX = $(error x86_64-montauk toolchain not found. Run ./toolchain/build-montauk-toolchain.sh first)
|
||||||
else
|
else
|
||||||
CXX := g++
|
CXX := $(TOOLCHAIN_PREFIX)g++
|
||||||
endif
|
endif
|
||||||
|
|
||||||
PROG_INC := ../../include
|
PROG_INC := ../../include
|
||||||
@@ -24,34 +24,22 @@ CXXFLAGS := \
|
|||||||
-Wextra \
|
-Wextra \
|
||||||
-Wno-unused-parameter \
|
-Wno-unused-parameter \
|
||||||
-Wno-unused-function \
|
-Wno-unused-function \
|
||||||
-nostdinc \
|
|
||||||
-ffreestanding \
|
-ffreestanding \
|
||||||
-fno-stack-protector \
|
-fno-stack-protector \
|
||||||
-fno-stack-check \
|
-fno-stack-check \
|
||||||
-fno-PIC \
|
|
||||||
-fno-rtti \
|
-fno-rtti \
|
||||||
-fno-exceptions \
|
-fno-exceptions \
|
||||||
-ffunction-sections \
|
-ffunction-sections \
|
||||||
-fdata-sections \
|
-fdata-sections \
|
||||||
-m64 \
|
|
||||||
-march=x86-64 \
|
|
||||||
-msse \
|
-msse \
|
||||||
-msse2 \
|
-msse2 \
|
||||||
-mno-red-zone \
|
|
||||||
-mcmodel=small \
|
|
||||||
-I $(PROG_INC) \
|
-I $(PROG_INC) \
|
||||||
-isystem $(PROG_INC)/libc \
|
-isystem $(PROG_INC)/libc \
|
||||||
-I ../../lib/bearssl/inc \
|
-I ../../lib/bearssl/inc
|
||||||
-isystem ../../../kernel/freestnd-c-hdrs/x86_64/include \
|
|
||||||
-isystem ../../../kernel/freestnd-cxx-hdrs/x86_64/include
|
|
||||||
|
|
||||||
LDFLAGS := \
|
LDFLAGS := \
|
||||||
-nostdlib \
|
-nostdlib \
|
||||||
-static \
|
|
||||||
-Wl,--build-id=none \
|
|
||||||
-Wl,--gc-sections \
|
-Wl,--gc-sections \
|
||||||
-Wl,-m,elf_x86_64 \
|
|
||||||
-z max-page-size=0x1000 \
|
|
||||||
-T $(LINK_LD)
|
-T $(LINK_LD)
|
||||||
|
|
||||||
SRCS := main.cpp document.cpp render.cpp input.cpp print_export.cpp stb_truetype_impl.cpp
|
SRCS := main.cpp document.cpp render.cpp input.cpp print_export.cpp stb_truetype_impl.cpp
|
||||||
|
|||||||
Reference in New Issue
Block a user