From 60657f3c97c1fc7dbe98d438ad0f9218f968ce2c Mon Sep 17 00:00:00 2001 From: Baptiste Wicht Date: Sun, 10 Jul 2016 21:02:56 +0200 Subject: [PATCH] Prepare ACPICA compilation --- cpp.mk | 5 +- kernel/Makefile | 111 +++++++++++++++++++++++++++++----- kernel/include/acpi.hpp | 4 +- kernel/include/thor_acenv.hpp | 69 +-------------------- kernel/include/thor_acpi.hpp | 6 +- kernel/src/acpi.cpp | 14 +++-- programs/args/Makefile | 4 +- programs/cat/Makefile | 4 +- programs/cpuid/Makefile | 4 +- programs/date/Makefile | 4 +- programs/df/Makefile | 4 +- programs/keyboard/Makefile | 4 +- programs/long/Makefile | 4 +- programs/longone/Makefile | 4 +- programs/longtwo/Makefile | 4 +- programs/loop/Makefile | 4 +- programs/ls/Makefile | 4 +- programs/lspci/Makefile | 4 +- programs/mkdir/Makefile | 4 +- programs/mount/Makefile | 4 +- programs/readelf/Makefile | 4 +- programs/reboot/Makefile | 4 +- programs/rm/Makefile | 4 +- programs/shutdown/Makefile | 4 +- programs/stat/Makefile | 4 +- programs/touch/Makefile | 4 +- programs/tsh/Makefile | 4 +- programs/uptime/Makefile | 4 +- programs/which/Makefile | 4 +- programs/writer/Makefile | 4 +- tlib/Makefile | 4 +- 31 files changed, 166 insertions(+), 143 deletions(-) diff --git a/cpp.mk b/cpp.mk index 720da5d5..961eb1eb 100644 --- a/cpp.mk +++ b/cpp.mk @@ -1,4 +1,5 @@ -CC=x86_64-elf-g++ +CC=x86_64-elf-gcc +CXX=x86_64-elf-g++ AS=x86_64-elf-as OC=x86_64-elf-objcopy AR=x86_64-elf-ar @@ -25,6 +26,8 @@ KERNEL_CPP_FLAGS_64 += -fstack-protector KERNEL_CPP_FLAGS_64 += -Iacpica/source/include +ACPICA_CPP_FLAGS = $(KERNEL_CPP_FLAGS_64) -include include/thor_acenv.hpp + COMMON_LINK_FLAGS=-lgcc KERNEL_LINK_FLAGS=$(COMMON_LINK_FLAGS) -T linker.ld diff --git a/kernel/Makefile b/kernel/Makefile index 878b3ade..66218959 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -9,29 +9,54 @@ KERNEL_CPP_DRIVERS_FILES=$(wildcard src/drivers/*.cpp) KERNEL_CPP_FS_FILES=$(wildcard src/fs/*.cpp) KERNEL_CPP_VFS_FILES=$(wildcard src/vfs/*.cpp) +ACPICA_DISPATCHER_CPP_FILES=$(wildcard acpica/source/components/dispatcher/*.c) +ACPICA_EVENTS_CPP_FILES=$(wildcard acpica/source/components/events/*.c) +ACPICA_EXECUTER_CPP_FILES=$(wildcard acpica/source/components/executer/*.c) +ACPICA_NAMESPACE_CPP_FILES=$(wildcard acpica/source/components/namespace/*.c) +ACPICA_RESOURCES_CPP_FILES=$(wildcard acpica/source/components/resources/*.c) +ACPICA_TABLES_CPP_FILES=$(wildcard acpica/source/components/tables/*.c) +ACPICA_UTILITIES_CPP_FILES=$(wildcard acpica/source/components/utilities/*.c) + KERNEL_D_FILES=$(KERNEL_CPP_FILES:%.cpp=%.cpp.d) KERNEL_D_DRIVERS_FILES=$(KERNEL_CPP_DRIVERS_FILES:%.cpp=%.cpp.d) KERNEL_D_FS_FILES=$(KERNEL_CPP_FS_FILES:%.cpp=%.cpp.d) KERNEL_D_VFS_FILES=$(KERNEL_CPP_VFS_FILES:%.cpp=%.cpp.d) +ACPICA_DISPATCHER_D_FILES=$(ACPICA_DISPATCHER_CPP_FILES:%.c=%.c.d) +ACPICA_EVENTS_D_FILES=$(ACPICA_EVENTS_CPP_FILES:%.c=%.c.d) +ACPICA_EXECUTER_D_FILES=$(ACPICA_EXECUTER_CPP_FILES:%.c=%.c.d) +ACPICA_NAMESPACE_D_FILES=$(ACPICA_NAMESPACE_CPP_FILES:%.c=%.c.d) +ACPICA_RESOURCES_D_FILES=$(ACPICA_RESOURCES_CPP_FILES:%.c=%.c.d) +ACPICA_TABLES_D_FILES=$(ACPICA_TABLES_CPP_FILES:%.c=%.c.d) +ACPICA_UTILITIES_D_FILES=$(ACPICA_UTILITIES_CPP_FILES:%.c=%.c.d) + KERNEL_O_FILES=$(KERNEL_CPP_FILES:%.cpp=%.cpp.o) KERNEL_O_DRIVERS_FILES=$(KERNEL_CPP_DRIVERS_FILES:%.cpp=%.cpp.o) KERNEL_O_FS_FILES=$(KERNEL_CPP_FS_FILES:%.cpp=%.cpp.o) KERNEL_O_VFS_FILES=$(KERNEL_CPP_VFS_FILES:%.cpp=%.cpp.o) -#TODO Generate also the o files coming from s files automatically, ignoring crti and crtn -O_FILES=boot_16_64.o boot_32_64.o $(KERNEL_O_FILES) $(KERNEL_O_FS_FILES) $(KERNEL_O_VFS_FILES) $(KERNEL_O_DRIVERS_FILES) src/isrs.s.o src/irqs.s.o src/arch.s.o src/syscalls.s.o src/task_switch.s.o +ACPICA_DISPATCHER_O_FILES=$(ACPICA_DISPATCHER_CPP_FILES:%.c=%.c.o) +ACPICA_EVENTS_O_FILES=$(ACPICA_EVENTS_CPP_FILES:%.c=%.c.o) +ACPICA_EXECUTER_O_FILES=$(ACPICA_EXECUTER_CPP_FILES:%.c=%.c.o) +ACPICA_NAMESPACE_O_FILES=$(ACPICA_NAMESPACE_CPP_FILES:%.c=%.c.o) +ACPICA_RESOURCES_O_FILES=$(ACPICA_RESOURCES_CPP_FILES:%.c=%.c.o) +ACPICA_TABLES_O_FILES=$(ACPICA_TABLES_CPP_FILES:%.c=%.c.o) +ACPICA_UTILITIES_O_FILES=$(ACPICA_UTILITIES_CPP_FILES:%.c=%.c.o) +ACPICA_O_FILES=$(ACPICA_DISPATCHER_O_FILES) $(ACPICA_EVENTS_O_FILES) $(ACPICA_EXECUTER_O_FILES) $(ACPICA_NAMESPACE_O_FILES) $(ACPICA_RESOURCES_O_FILES) $(ACPICA_TABLES_O_FILES) $(ACPICA_UTILITIES_O_FILES) -CRTBEGIN_OBJ:=$(shell $(CC) $(CFLAGS) -print-file-name=crtbegin.o) -CRTEND_OBJ:=$(shell $(CC) $(CFLAGS) -print-file-name=crtend.o) +#TODO Generate also the o files coming from s files automatically, ignoring crti and crtn +O_FILES=boot_16_64.o boot_32_64.o $(KERNEL_O_FILES) $(KERNEL_O_FS_FILES) $(KERNEL_O_VFS_FILES) $(KERNEL_O_DRIVERS_FILES) $(ACPICA_O_FILES) src/isrs.s.o src/irqs.s.o src/arch.s.o src/syscalls.s.o src/task_switch.s.o + +CRTBEGIN_OBJ:=$(shell $(CXX) $(CFLAGS) -print-file-name=crtbegin.o) +CRTEND_OBJ:=$(shell $(CXX) $(CFLAGS) -print-file-name=crtend.o) LINK_O_FILES=src/crti.s.o $(CRTBEGIN_OBJ) $(O_FILES) $(CRTEND_OBJ) src/crtn.s.o boot_16.o: src/boot/boot_16.cpp - $(CC) $(CPP_FLAGS_16) $(THOR_FLAGS) $(WARNING_FLAGS) -c src/boot/boot_16.cpp -o boot_16.o + $(CXX) $(CPP_FLAGS_16) $(THOR_FLAGS) $(WARNING_FLAGS) -c src/boot/boot_16.cpp -o boot_16.o boot_32.o: src/boot/boot_32.cpp - $(CC) $(CPP_FLAGS_32) $(THOR_FLAGS) $(WARNING_FLAGS) -c src/boot/boot_32.cpp -o boot_32.o + $(CXX) $(CPP_FLAGS_32) $(THOR_FLAGS) $(WARNING_FLAGS) -c src/boot/boot_32.cpp -o boot_32.o boot_16_64.o: boot_16.o $(OC) -I elf32-i386 -O elf64-x86-64 boot_16.o boot_16_64.o @@ -43,36 +68,85 @@ src/%.s.o: src/%.s $(AS) -g -c $< -o $@ src/%.cpp.d: $(KERNEL_CPP_FILES) - @ $(CC) $(KERNEL_CPP_FLAGS_64) $(THOR_FLAGS) $(WARNING_FLAGS) -MM -MT src/$*.cpp.o src/$*.cpp | sed -e 's@^\(.*\)\.o:@\1.d \1.o:@' > $@ + @ $(CXX) $(KERNEL_CPP_FLAGS_64) $(THOR_FLAGS) $(WARNING_FLAGS) -MM -MT src/$*.cpp.o src/$*.cpp | sed -e 's@^\(.*\)\.o:@\1.d \1.o:@' > $@ src/drivers/%.cpp.d: $(KERNEL_CPP_DRIVERS_FILES) - @ $(CC) $(KERNEL_CPP_FLAGS_64) $(THOR_FLAGS) $(WARNING_FLAGS) -MM -MT src/drivers/$*.cpp.o src/drivers/$*.cpp | sed -e 's@^\(.*\)\.o:@\1.d \1.o:@' > $@ + @ $(CXX) $(KERNEL_CPP_FLAGS_64) $(THOR_FLAGS) $(WARNING_FLAGS) -MM -MT src/drivers/$*.cpp.o src/drivers/$*.cpp | sed -e 's@^\(.*\)\.o:@\1.d \1.o:@' > $@ src/fs/%.cpp.d: $(KERNEL_CPP_FS_FILES) - @ $(CC) $(KERNEL_CPP_FLAGS_64) $(THOR_FLAGS) $(WARNING_FLAGS) -MM -MT src/fs/$*.cpp.o src/fs/$*.cpp | sed -e 's@^\(.*\)\.o:@\1.d \1.o:@' > $@ + @ $(CXX) $(KERNEL_CPP_FLAGS_64) $(THOR_FLAGS) $(WARNING_FLAGS) -MM -MT src/fs/$*.cpp.o src/fs/$*.cpp | sed -e 's@^\(.*\)\.o:@\1.d \1.o:@' > $@ src/vfs/%.cpp.d: $(KERNEL_CPP_VFS_FILES) - @ $(CC) $(KERNEL_CPP_FLAGS_64) $(THOR_FLAGS) $(WARNING_FLAGS) -MM -MT src/vfs/$*.cpp.o src/vfs/$*.cpp | sed -e 's@^\(.*\)\.o:@\1.d \1.o:@' > $@ + @ $(CXX) $(KERNEL_CPP_FLAGS_64) $(THOR_FLAGS) $(WARNING_FLAGS) -MM -MT src/vfs/$*.cpp.o src/vfs/$*.cpp | sed -e 's@^\(.*\)\.o:@\1.d \1.o:@' > $@ + +acpica/source/components/dispatcher/%.c.d: $(ACPICA_DISPATCHER_CPP_FILES) + @ $(CXX) $(ACPICA_CPP_FLAGS) -include include/thor_acenv.hpp $(THOR_FLAGS) -MM -MT acpica/source/components/dispatcher/$*.c.o acpica/source/components/dispatcher/$*.c | sed -e 's@^\(.*\)\.o:@\1.d \1.o:@' > $@ + +acpica/source/components/events/%.c.d: $(ACPICA_EVENTS_CPP_FILES) + @ $(CXX) $(ACPICA_CPP_FLAGS) -include include/thor_acenv.hpp $(THOR_FLAGS) -MM -MT acpica/source/components/events/$*.c.o acpica/source/components/events/$*.c | sed -e 's@^\(.*\)\.o:@\1.d \1.o:@' > $@ + +acpica/source/components/executer/%.c.d: $(ACPICA_EXECUTER_CPP_FILES) + @ $(CXX) $(ACPICA_CPP_FLAGS) -include include/thor_acenv.hpp $(THOR_FLAGS) -MM -MT acpica/source/components/executer/$*.c.o acpica/source/components/executer/$*.c | sed -e 's@^\(.*\)\.o:@\1.d \1.o:@' > $@ + +acpica/source/components/namespace/%.c.d: $(ACPICA_NAMESPACE_CPP_FILES) + @ $(CXX) $(ACPICA_CPP_FLAGS) -include include/thor_acenv.hpp $(THOR_FLAGS) -MM -MT acpica/source/components/namespace/$*.c.o acpica/source/components/namespace/$*.c | sed -e 's@^\(.*\)\.o:@\1.d \1.o:@' > $@ + +acpica/source/components/resources/%.c.d: $(ACPICA_RESOURCES_CPP_FILES) + @ $(CXX) $(ACPICA_CPP_FLAGS) -include include/thor_acenv.hpp $(THOR_FLAGS) -MM -MT acpica/source/components/resources/$*.c.o acpica/source/components/resources/$*.c | sed -e 's@^\(.*\)\.o:@\1.d \1.o:@' > $@ + +acpica/source/components/tables/%.c.d: $(ACPICA_TABLES_CPP_FILES) + @ $(CXX) $(ACPICA_CPP_FLAGS) -include include/thor_acenv.hpp $(THOR_FLAGS) -MM -MT acpica/source/components/tables/$*.c.o acpica/source/components/tables/$*.c | sed -e 's@^\(.*\)\.o:@\1.d \1.o:@' > $@ + +acpica/source/components/utilities/%.c.d: $(ACPICA_UTILITIES_CPP_FILES) + @ $(CXX) $(ACPICA_CPP_FLAGS) -include include/thor_acenv.hpp $(THOR_FLAGS) -MM -MT acpica/source/components/utilities/$*.c.o acpica/source/components/utilities/$*.c | sed -e 's@^\(.*\)\.o:@\1.d \1.o:@' > $@ src/%.cpp.o: - $(CC) $(KERNEL_CPP_FLAGS_64) $(THOR_FLAGS) $(WARNING_FLAGS) -c $< -o $@ + $(CXX) $(KERNEL_CPP_FLAGS_64) $(THOR_FLAGS) $(WARNING_FLAGS) -c $< -o $@ src/drivers/%.cpp.o: - $(CC) $(KERNEL_CPP_FLAGS_64) $(THOR_FLAGS) $(WARNING_FLAGS) -c $< -o $@ + $(CXX) $(KERNEL_CPP_FLAGS_64) $(THOR_FLAGS) $(WARNING_FLAGS) -c $< -o $@ src/vfs/%.cpp.o: - $(CC) $(KERNEL_CPP_FLAGS_64) $(THOR_FLAGS) $(WARNING_FLAGS) -c $< -o $@ + $(CXX) $(KERNEL_CPP_FLAGS_64) $(THOR_FLAGS) $(WARNING_FLAGS) -c $< -o $@ src/fs/%.cpp.o: - $(CC) $(KERNEL_CPP_FLAGS_64) $(THOR_FLAGS) $(WARNING_FLAGS) -c $< -o $@ + $(CXX) $(KERNEL_CPP_FLAGS_64) $(THOR_FLAGS) $(WARNING_FLAGS) -c $< -o $@ + +acpica/source/components/dispatcher/%.c.o: + $(CC) $(ACPICA_CPP_FLAGS) $(THOR_FLAGS) -c $< -o $@ + +acpica/source/components/events/%.c.o: + $(CC) $(ACPICA_CPP_FLAGS) $(THOR_FLAGS) -c $< -o $@ + +acpica/source/components/executer/%.c.o: + $(CC) $(ACPICA_CPP_FLAGS) $(THOR_FLAGS) -c $< -o $@ + +acpica/source/components/namespace/%.c.o: + $(CC) $(ACPICA_CPP_FLAGS) $(THOR_FLAGS) -c $< -o $@ + +acpica/source/components/utilies/%.c.o: + $(CC) $(ACPICA_CPP_FLAGS) $(THOR_FLAGS) -c $< -o $@ + +acpica/source/components/resources/%.c.o: + $(CC) $(ACPICA_CPP_FLAGS) $(THOR_FLAGS) -c $< -o $@ + +acpica/source/components/tables/%.c.o: + $(CC) $(ACPICA_CPP_FLAGS) $(THOR_FLAGS) -c $< -o $@ -include $(KERNEL_D_FILES) -include $(KERNEL_D_DRIVERS_FILES) -include $(KERNEL_D_VFS_FILES) -include $(KERNEL_D_FS_FILES) +-include $(ACPICA_DISPATCHER_D_FILES) +-include $(ACPICA_EVENTS_D_FILES) +-include $(ACPICA_EXECUTER_D_FILES) +-include $(ACPICA_NAMESPACE_D_FILES) +-include $(ACPICA_RESOURCES_D_FILES) +-include $(ACPICA_TABLES_D_FILES) +-include $(ACPICA_UTILITIES_D_FILES) kernel.bin: $(LINK_O_FILES) - $(CC) $(KERNEL_LINK_FLAGS) $(KERNEL_CPP_FLAGS_64) -o kernel.bin.o $(LINK_O_FILES) + $(CXX) $(KERNEL_LINK_FLAGS) $(KERNEL_CPP_FLAGS_64) -o kernel.bin.o $(LINK_O_FILES) $(OC) -R .note -R .comment -O binary --set-section-flags .bss=alloc,load,contents kernel.bin.o kernel.bin clean: @@ -80,6 +154,13 @@ clean: rm -f $(KERNEL_D_DRIVERS_FILES) rm -f $(KERNEL_D_FS_FILES) rm -f $(KERNEL_D_VFS_FILES) + rm -f $(ACPICA_DISPATCHER_D_FILES) + rm -f $(ACPICA_EVENTS_D_FILES) + rm -f $(ACPICA_EXECUTER_D_FILES) + rm -f $(ACPICA_NAMESPACE_D_FILES) + rm -f $(ACPICA_RESOURCES_D_FILES) + rm -f $(ACPICA_TABLES_D_FILES) + rm -f $(ACPICA_UTILITIES_D_FILES) rm -f $(O_FILES) rm -f crti.o rm -f crts.o diff --git a/kernel/include/acpi.hpp b/kernel/include/acpi.hpp index dd3f7a58..b2de3219 100644 --- a/kernel/include/acpi.hpp +++ b/kernel/include/acpi.hpp @@ -5,8 +5,8 @@ // http://www.boost.org/LICENSE_1_0.txt) //======================================================================= -#ifndef ACPI_H -#define ACPI_H +#ifndef ACPI_HPP +#define ACPI_HPP namespace acpi { diff --git a/kernel/include/thor_acenv.hpp b/kernel/include/thor_acenv.hpp index 0b352367..6234a329 100644 --- a/kernel/include/thor_acenv.hpp +++ b/kernel/include/thor_acenv.hpp @@ -244,6 +244,7 @@ *****************************************************************************/ #include "thor_acpi.hpp" +#include /*! [End] no source code translation !*/ @@ -342,74 +343,6 @@ * *****************************************************************************/ -/* - * ACPI_USE_SYSTEM_CLIBRARY - Define this if linking to an actual C library. - * Otherwise, local versions of string/memory functions will be used. - * ACPI_USE_STANDARD_HEADERS - Define this if linking to a C library and - * the standard header files may be used. - * - * The ACPICA subsystem only uses low level C library functions that do not - * call operating system services and may therefore be inlined in the code. - * - * It may be necessary to tailor these include files to the target - * generation environment. - */ -#ifdef ACPI_USE_SYSTEM_CLIBRARY - -/* Use the standard C library headers. We want to keep these to a minimum. */ - -#ifdef ACPI_USE_STANDARD_HEADERS - -/* Use the standard headers from the standard locations */ - -#include -#include -#include -#include - -#endif /* ACPI_USE_STANDARD_HEADERS */ - -/* We will be linking to the standard Clib functions */ - -#else - -/****************************************************************************** - * - * Not using native C library, use local implementations - * - *****************************************************************************/ - -/* - * Use local definitions of C library macros and functions. These function - * implementations may not be as efficient as an inline or assembly code - * implementation provided by a native C library, but they are functionally - * equivalent. - */ -#ifndef va_arg - -#ifndef _VALIST -#define _VALIST -typedef char *va_list; -#endif /* _VALIST */ - -/* Storage alignment properties */ - -#define _AUPBND (sizeof (ACPI_NATIVE_INT) - 1) -#define _ADNBND (sizeof (ACPI_NATIVE_INT) - 1) - -/* Variable argument list macro definitions */ - -#define _Bnd(X, bnd) (((sizeof (X)) + (bnd)) & (~(bnd))) -#define va_arg(ap, T) (*(T *)(((ap) += (_Bnd (T, _AUPBND))) - (_Bnd (T,_ADNBND)))) -#define va_end(ap) (ap = (va_list) NULL) -#define va_start(ap, A) (void) ((ap) = (((char *) &(A)) + (_Bnd (A,_AUPBND)))) - -#endif /* va_arg */ - -/* Use the local (ACPICA) definitions of the clib functions */ - -#endif /* ACPI_USE_SYSTEM_CLIBRARY */ - #ifndef ACPI_FILE #ifdef ACPI_APPLICATION #include diff --git a/kernel/include/thor_acpi.hpp b/kernel/include/thor_acpi.hpp index 88751cf7..2c0a0dc6 100644 --- a/kernel/include/thor_acpi.hpp +++ b/kernel/include/thor_acpi.hpp @@ -5,11 +5,11 @@ // http://www.boost.org/LICENSE_1_0.txt) //======================================================================= -#ifndef THOR_ACPI_H -#define THOR_ACPI_H +#ifndef THOR_ACPI_HPP +#define THOR_ACPI_HPP // This file contains the OS specific layer for ACPICA for thor-os -#define ACPI_MACHINE_WIDTH 8 //thor works in 64 bits +#define ACPI_MACHINE_WIDTH 64 //thor works in 64 bits #endif diff --git a/kernel/src/acpi.cpp b/kernel/src/acpi.cpp index 1f26a2aa..6420e97c 100644 --- a/kernel/src/acpi.cpp +++ b/kernel/src/acpi.cpp @@ -5,17 +5,23 @@ // http://www.boost.org/LICENSE_1_0.txt) //======================================================================= -#include - //ACPICA #include "thor_acenv.hpp" //The OS Specific Layer + +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wunused-parameter" +#pragma GCC diagnostic ignored "-Wunused-function" //TODO Does not work #include "acpi.h" +#pragma GCC diagnostic pop + +#include #include "acpi.hpp" #include "kernel_utils.hpp" #include "timer.hpp" #include "paging.hpp" #include "console.hpp" +#include "logging.hpp" namespace { @@ -277,7 +283,7 @@ int init_acpi(){ bool initialize_acpica(){ auto status = AcpiInitializeSubsystem(); if(ACPI_FAILURE(status)){ - logging::logf("Impossible to initialize ACPICA subsystem\n"); + logging::logf(logging::log_level::ERROR, "Impossible to initialize ACPICA subsystem\n"); return false; } @@ -288,7 +294,7 @@ bool initialize_acpica(){ bool acpi::init(){ if(!initialize_acpica()){ - logging::logf("Impossible to initialize ACPICA\n"); + logging::logf(logging::log_level::ERROR, "Impossible to initialize ACPICA\n"); } return init_acpi() == 0; diff --git a/programs/args/Makefile b/programs/args/Makefile index 2b31c6df..dc6f8f1b 100644 --- a/programs/args/Makefile +++ b/programs/args/Makefile @@ -5,10 +5,10 @@ default: args include ../../cpp.mk %.cpp.o: src/%.cpp - $(CC) -c $< -o $@ $(PROGRAM_FLAGS) + $(CXX) -c $< -o $@ $(PROGRAM_FLAGS) args: main.cpp.o - $(CC) -o args main.cpp.o $(PROGRAM_LINK_FLAGS) + $(CXX) -o args main.cpp.o $(PROGRAM_LINK_FLAGS) clean: rm -f *.cpp.o diff --git a/programs/cat/Makefile b/programs/cat/Makefile index 26d73cf6..fc2c057e 100644 --- a/programs/cat/Makefile +++ b/programs/cat/Makefile @@ -5,10 +5,10 @@ default: cat include ../../cpp.mk %.cpp.o: src/%.cpp - $(CC) -c $< -o $@ $(PROGRAM_FLAGS) + $(CXX) -c $< -o $@ $(PROGRAM_FLAGS) cat: main.cpp.o - $(CC) -o cat main.cpp.o $(PROGRAM_LINK_FLAGS) + $(CXX) -o cat main.cpp.o $(PROGRAM_LINK_FLAGS) clean: rm -f *.cpp.o diff --git a/programs/cpuid/Makefile b/programs/cpuid/Makefile index 254d826b..5ff40373 100644 --- a/programs/cpuid/Makefile +++ b/programs/cpuid/Makefile @@ -5,10 +5,10 @@ default: cpuid include ../../cpp.mk %.cpp.o: src/%.cpp - $(CC) -c $< -o $@ $(PROGRAM_FLAGS) + $(CXX) -c $< -o $@ $(PROGRAM_FLAGS) cpuid: main.cpp.o - $(CC) -o cpuid main.cpp.o $(PROGRAM_LINK_FLAGS) + $(CXX) -o cpuid main.cpp.o $(PROGRAM_LINK_FLAGS) clean: rm -f *.cpp.o diff --git a/programs/date/Makefile b/programs/date/Makefile index b486c03a..1b9c1be5 100644 --- a/programs/date/Makefile +++ b/programs/date/Makefile @@ -5,10 +5,10 @@ default: date include ../../cpp.mk %.cpp.o: src/%.cpp - $(CC) -c $< -o $@ $(PROGRAM_FLAGS) + $(CXX) -c $< -o $@ $(PROGRAM_FLAGS) date: main.cpp.o - $(CC) -o date main.cpp.o $(PROGRAM_LINK_FLAGS) + $(CXX) -o date main.cpp.o $(PROGRAM_LINK_FLAGS) clean: rm -f *.cpp.o diff --git a/programs/df/Makefile b/programs/df/Makefile index a3d2ec48..e8a4f105 100644 --- a/programs/df/Makefile +++ b/programs/df/Makefile @@ -5,10 +5,10 @@ default: df include ../../cpp.mk %.cpp.o: src/%.cpp - $(CC) -c $< -o $@ $(PROGRAM_FLAGS) + $(CXX) -c $< -o $@ $(PROGRAM_FLAGS) df: main.cpp.o - $(CC) -o df main.cpp.o $(PROGRAM_LINK_FLAGS) + $(CXX) -o df main.cpp.o $(PROGRAM_LINK_FLAGS) clean: rm -f *.cpp.o diff --git a/programs/keyboard/Makefile b/programs/keyboard/Makefile index bb57fa91..7ec8bf8a 100644 --- a/programs/keyboard/Makefile +++ b/programs/keyboard/Makefile @@ -5,10 +5,10 @@ default: keyboard include ../../cpp.mk %.cpp.o: src/%.cpp - $(CC) -c $< -o $@ $(PROGRAM_FLAGS) + $(CXX) -c $< -o $@ $(PROGRAM_FLAGS) keyboard: main.cpp.o - $(CC) -o keyboard main.cpp.o $(PROGRAM_LINK_FLAGS) + $(CXX) -o keyboard main.cpp.o $(PROGRAM_LINK_FLAGS) clean: rm -f *.cpp.o diff --git a/programs/long/Makefile b/programs/long/Makefile index e1bf07ab..e8428d7c 100644 --- a/programs/long/Makefile +++ b/programs/long/Makefile @@ -5,10 +5,10 @@ default: long include ../../cpp.mk %.cpp.o: src/%.cpp - $(CC) -c $< -o $@ $(PROGRAM_FLAGS) + $(CXX) -c $< -o $@ $(PROGRAM_FLAGS) long: main.cpp.o - $(CC) -o long main.cpp.o $(PROGRAM_LINK_FLAGS) + $(CXX) -o long main.cpp.o $(PROGRAM_LINK_FLAGS) clean: rm -f *.cpp.o diff --git a/programs/longone/Makefile b/programs/longone/Makefile index d1a5f81a..2ee09269 100644 --- a/programs/longone/Makefile +++ b/programs/longone/Makefile @@ -5,10 +5,10 @@ default: longone include ../../cpp.mk %.cpp.o: src/%.cpp - $(CC) -c $< -o $@ $(PROGRAM_FLAGS) + $(CXX) -c $< -o $@ $(PROGRAM_FLAGS) longone: main.cpp.o - $(CC) -o longone main.cpp.o $(PROGRAM_LINK_FLAGS) + $(CXX) -o longone main.cpp.o $(PROGRAM_LINK_FLAGS) clean: rm -f *.cpp.o diff --git a/programs/longtwo/Makefile b/programs/longtwo/Makefile index 7c0a0a06..60b9ac12 100644 --- a/programs/longtwo/Makefile +++ b/programs/longtwo/Makefile @@ -5,10 +5,10 @@ default: longtwo include ../../cpp.mk %.cpp.o: src/%.cpp - $(CC) -c $< -o $@ $(PROGRAM_FLAGS) + $(CXX) -c $< -o $@ $(PROGRAM_FLAGS) longtwo: main.cpp.o - $(CC) -o longtwo main.cpp.o $(PROGRAM_LINK_FLAGS) + $(CXX) -o longtwo main.cpp.o $(PROGRAM_LINK_FLAGS) clean: rm -f *.cpp.o diff --git a/programs/loop/Makefile b/programs/loop/Makefile index f4e8dbcd..ec547f28 100644 --- a/programs/loop/Makefile +++ b/programs/loop/Makefile @@ -5,10 +5,10 @@ default: loop include ../../cpp.mk %.cpp.o: src/%.cpp - $(CC) $(PROGRAM_FLAGS) $(CPP_FLAGS_64) $(WARNING_FLAGS) -c $< -o $@ + $(CXX) $(PROGRAM_FLAGS) $(CPP_FLAGS_64) $(WARNING_FLAGS) -c $< -o $@ loop: main.cpp.o - $(CC) $(PROGRAM_LINK_FLAGS) $(CPP_FLAGS_64) -o loop main.cpp.o + $(CXX) $(PROGRAM_LINK_FLAGS) $(CPP_FLAGS_64) -o loop main.cpp.o clean: rm -f *.cpp.o diff --git a/programs/ls/Makefile b/programs/ls/Makefile index d1e4f302..e52eda19 100644 --- a/programs/ls/Makefile +++ b/programs/ls/Makefile @@ -5,10 +5,10 @@ default: ls include ../../cpp.mk %.cpp.o: src/%.cpp - $(CC) -c $< -o $@ $(PROGRAM_FLAGS) + $(CXX) -c $< -o $@ $(PROGRAM_FLAGS) ls: main.cpp.o - $(CC) -o ls main.cpp.o $(PROGRAM_LINK_FLAGS) + $(CXX) -o ls main.cpp.o $(PROGRAM_LINK_FLAGS) clean: rm -f *.cpp.o diff --git a/programs/lspci/Makefile b/programs/lspci/Makefile index 21f2fbe0..7ce5e136 100644 --- a/programs/lspci/Makefile +++ b/programs/lspci/Makefile @@ -5,10 +5,10 @@ default: lspci include ../../cpp.mk %.cpp.o: src/%.cpp - $(CC) -c $< -o $@ $(PROGRAM_FLAGS) + $(CXX) -c $< -o $@ $(PROGRAM_FLAGS) lspci: main.cpp.o - $(CC) -o lspci main.cpp.o $(PROGRAM_LINK_FLAGS) + $(CXX) -o lspci main.cpp.o $(PROGRAM_LINK_FLAGS) clean: rm -f *.cpp.o diff --git a/programs/mkdir/Makefile b/programs/mkdir/Makefile index 607ef741..906d94e3 100644 --- a/programs/mkdir/Makefile +++ b/programs/mkdir/Makefile @@ -5,10 +5,10 @@ default: mkdir include ../../cpp.mk %.cpp.o: src/%.cpp - $(CC) -c $< -o $@ $(PROGRAM_FLAGS) + $(CXX) -c $< -o $@ $(PROGRAM_FLAGS) mkdir: main.cpp.o - $(CC) -o mkdir main.cpp.o $(PROGRAM_LINK_FLAGS) + $(CXX) -o mkdir main.cpp.o $(PROGRAM_LINK_FLAGS) clean: rm -f *.cpp.o diff --git a/programs/mount/Makefile b/programs/mount/Makefile index edb98fcb..1b4bd6e1 100644 --- a/programs/mount/Makefile +++ b/programs/mount/Makefile @@ -5,10 +5,10 @@ default: mount include ../../cpp.mk %.cpp.o: src/%.cpp - $(CC) -c $< -o $@ $(PROGRAM_FLAGS) + $(CXX) -c $< -o $@ $(PROGRAM_FLAGS) mount: main.cpp.o - $(CC) -o mount main.cpp.o $(PROGRAM_LINK_FLAGS) + $(CXX) -o mount main.cpp.o $(PROGRAM_LINK_FLAGS) clean: rm -f *.cpp.o diff --git a/programs/readelf/Makefile b/programs/readelf/Makefile index b30d600f..013f316c 100644 --- a/programs/readelf/Makefile +++ b/programs/readelf/Makefile @@ -5,10 +5,10 @@ default: readelf include ../../cpp.mk %.cpp.o: src/%.cpp - $(CC) -c $< -o $@ $(PROGRAM_FLAGS) + $(CXX) -c $< -o $@ $(PROGRAM_FLAGS) readelf: main.cpp.o - $(CC) -o readelf main.cpp.o $(PROGRAM_LINK_FLAGS) + $(CXX) -o readelf main.cpp.o $(PROGRAM_LINK_FLAGS) clean: rm -f *.cpp.o diff --git a/programs/reboot/Makefile b/programs/reboot/Makefile index 9727845c..8a9ba019 100644 --- a/programs/reboot/Makefile +++ b/programs/reboot/Makefile @@ -5,10 +5,10 @@ default: reboot include ../../cpp.mk %.cpp.o: src/%.cpp - $(CC) -c $< -o $@ $(PROGRAM_FLAGS) + $(CXX) -c $< -o $@ $(PROGRAM_FLAGS) reboot: main.cpp.o - $(CC) -o reboot main.cpp.o $(PROGRAM_LINK_FLAGS) + $(CXX) -o reboot main.cpp.o $(PROGRAM_LINK_FLAGS) clean: rm -f *.cpp.o diff --git a/programs/rm/Makefile b/programs/rm/Makefile index c1384ea3..1860c1c7 100644 --- a/programs/rm/Makefile +++ b/programs/rm/Makefile @@ -5,10 +5,10 @@ default: rm include ../../cpp.mk %.cpp.o: src/%.cpp - $(CC) -c $< -o $@ $(PROGRAM_FLAGS) + $(CXX) -c $< -o $@ $(PROGRAM_FLAGS) rm: main.cpp.o - $(CC) -o rm main.cpp.o $(PROGRAM_LINK_FLAGS) + $(CXX) -o rm main.cpp.o $(PROGRAM_LINK_FLAGS) clean: rm -f *.cpp.o diff --git a/programs/shutdown/Makefile b/programs/shutdown/Makefile index ec2979d7..1669abd4 100644 --- a/programs/shutdown/Makefile +++ b/programs/shutdown/Makefile @@ -5,10 +5,10 @@ default: shutdown include ../../cpp.mk %.cpp.o: src/%.cpp - $(CC) -c $< -o $@ $(PROGRAM_FLAGS) + $(CXX) -c $< -o $@ $(PROGRAM_FLAGS) shutdown: main.cpp.o - $(CC) -o shutdown main.cpp.o $(PROGRAM_LINK_FLAGS) + $(CXX) -o shutdown main.cpp.o $(PROGRAM_LINK_FLAGS) clean: rm -f *.cpp.o diff --git a/programs/stat/Makefile b/programs/stat/Makefile index 05454106..ed1cbf12 100644 --- a/programs/stat/Makefile +++ b/programs/stat/Makefile @@ -5,10 +5,10 @@ default: stat include ../../cpp.mk %.cpp.o: src/%.cpp - $(CC) -c $< -o $@ $(PROGRAM_FLAGS) + $(CXX) -c $< -o $@ $(PROGRAM_FLAGS) stat: main.cpp.o - $(CC) -o stat main.cpp.o $(PROGRAM_LINK_FLAGS) + $(CXX) -o stat main.cpp.o $(PROGRAM_LINK_FLAGS) clean: rm -f *.cpp.o diff --git a/programs/touch/Makefile b/programs/touch/Makefile index e85298d6..5b3733e0 100644 --- a/programs/touch/Makefile +++ b/programs/touch/Makefile @@ -5,10 +5,10 @@ default: touch include ../../cpp.mk %.cpp.o: src/%.cpp - $(CC) -c $< -o $@ $(PROGRAM_FLAGS) + $(CXX) -c $< -o $@ $(PROGRAM_FLAGS) touch: main.cpp.o - $(CC) -o touch main.cpp.o $(PROGRAM_LINK_FLAGS) + $(CXX) -o touch main.cpp.o $(PROGRAM_LINK_FLAGS) clean: rm -f *.cpp.o diff --git a/programs/tsh/Makefile b/programs/tsh/Makefile index a211f826..97482409 100644 --- a/programs/tsh/Makefile +++ b/programs/tsh/Makefile @@ -5,10 +5,10 @@ default: tsh include ../../cpp.mk %.cpp.o: src/%.cpp - $(CC) -c $< -o $@ $(PROGRAM_FLAGS) + $(CXX) -c $< -o $@ $(PROGRAM_FLAGS) tsh: main.cpp.o - $(CC) -o tsh main.cpp.o $(PROGRAM_LINK_FLAGS) + $(CXX) -o tsh main.cpp.o $(PROGRAM_LINK_FLAGS) clean: rm -f *.cpp.o diff --git a/programs/uptime/Makefile b/programs/uptime/Makefile index 52f07af7..b51817b7 100644 --- a/programs/uptime/Makefile +++ b/programs/uptime/Makefile @@ -5,10 +5,10 @@ default: uptime include ../../cpp.mk %.cpp.o: src/%.cpp - $(CC) -c $< -o $@ $(PROGRAM_FLAGS) + $(CXX) -c $< -o $@ $(PROGRAM_FLAGS) uptime: main.cpp.o - $(CC) -o uptime main.cpp.o $(PROGRAM_LINK_FLAGS) + $(CXX) -o uptime main.cpp.o $(PROGRAM_LINK_FLAGS) clean: rm -f *.cpp.o diff --git a/programs/which/Makefile b/programs/which/Makefile index 77e8f71d..afd73ad2 100644 --- a/programs/which/Makefile +++ b/programs/which/Makefile @@ -5,10 +5,10 @@ default: which include ../../cpp.mk %.cpp.o: src/%.cpp - $(CC) -c $< -o $@ $(PROGRAM_FLAGS) + $(CXX) -c $< -o $@ $(PROGRAM_FLAGS) which: main.cpp.o - $(CC) -o which main.cpp.o $(PROGRAM_LINK_FLAGS) + $(CXX) -o which main.cpp.o $(PROGRAM_LINK_FLAGS) clean: rm -f *.cpp.o diff --git a/programs/writer/Makefile b/programs/writer/Makefile index 80297980..90575905 100644 --- a/programs/writer/Makefile +++ b/programs/writer/Makefile @@ -5,10 +5,10 @@ default: writer include ../../cpp.mk %.cpp.o: src/%.cpp - $(CC) -c $< -o $@ $(PROGRAM_FLAGS) + $(CXX) -c $< -o $@ $(PROGRAM_FLAGS) writer: main.cpp.o - $(CC) -o writer main.cpp.o $(PROGRAM_LINK_FLAGS) + $(CXX) -o writer main.cpp.o $(PROGRAM_LINK_FLAGS) clean: rm -f *.cpp.o diff --git a/tlib/Makefile b/tlib/Makefile index 2977ca07..f51fb3de 100644 --- a/tlib/Makefile +++ b/tlib/Makefile @@ -9,10 +9,10 @@ D_FILES=$(CPP_FILES:%.cpp=%.cpp.d) O_FILES=$(CPP_FILES:%.cpp=%.cpp.o) src/%.cpp.d: $(CPP_FILES) - @ $(CC) $(LIB_FLAGS) -MM -MT src/$*.cpp.o src/$*.cpp | sed -e 's@^\(.*\)\.o:@\1.d \1.o:@' > $@ + @ $(CXX) $(LIB_FLAGS) -MM -MT src/$*.cpp.o src/$*.cpp | sed -e 's@^\(.*\)\.o:@\1.d \1.o:@' > $@ src/%.cpp.o: - $(CC) $(LIB_FLAGS) -c $< -o $@ + $(CXX) $(LIB_FLAGS) -c $< -o $@ -include $(D_FILES)