RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 01:57:45 +00:00
Code Issues Activity Actions

AK: Fix problem when building i686-pc-serenity toolchain from scratch.

Browse source
This commit is contained in:
Andreas Kling 2019-04-05 03:58:40 +02:00
parent dd966c03c9
commit 9de7a0daaf
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
AK/kmalloc.h
View file

@ -1,9 +1,5 @@
#pragma once #pragma once
#ifndef KERNEL
#include <new>
#endif
#if defined(SERENITY) && defined(KERNEL) #if defined(SERENITY) && defined(KERNEL)
#define AK_MAKE_ETERNAL \ #define AK_MAKE_ETERNAL \
public: \ public: \
@ -48,4 +44,9 @@ inline void operator delete[](void* ptr)
return kfree(ptr); return kfree(ptr);
} }
inline void* operator new(size_t, void* ptr)
{
return ptr;
}
#endif #endif

2
LibC/Makefile
View file

@ -65,7 +65,7 @@ AS = i686-pc-serenity-as
all: $(LIBRARY) startfiles all: $(LIBRARY) startfiles
startfiles: startfiles:
@echo "CXX $<"; $(CXX) $(CXXFLAGS) -o crt0.o -c crt0.cpp @echo "CXX crt0.o"; $(CXX) $(CXXFLAGS) -o crt0.o -c crt0.cpp
cp crti.ao crti.o cp crti.ao crti.o
cp crtn.ao crtn.o cp crtn.ao crtn.o