From 918ca565f28be0b3e54fca634750a3001713e937 Mon Sep 17 00:00:00 2001 From: pierre <pierre@freepascal.org> Date: Sun, 20 Dec 2020 11:27:04 +0000 Subject: [PATCH] Merge commit 44291 ------------------------------------------------------------------------ r44291 | pierre | 2020-03-12 10:53:56 +0000 (Thu, 12 Mar 2020) | 1 line Add explicit dependency of AVR specific unit avrsim on consoleio and heapmgr units ------------------------------------------------------------------------ --- Merging r44291 into '.': C rtl/embedded/Makefile (resolved by recomputing Makefile using fpcmake) U rtl/embedded/Makefile.fpc --- Recording mergeinfo for merge of r44291 into '.': U . git-svn-id: branches/fixes_3_2@47823 - --- rtl/embedded/Makefile | 2 ++ rtl/embedded/Makefile.fpc | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/rtl/embedded/Makefile b/rtl/embedded/Makefile index 02ac585c10..3e34714b2f 100644 --- a/rtl/embedded/Makefile +++ b/rtl/embedded/Makefile @@ -2836,3 +2836,5 @@ fpcylix$(PPUEXT) : fpcylix.pp cthreads$(PPUEXT) cwstring$(PPUEXT) dynlibs$(PPUEX $(COMPILER) fpcylix.pp intrinsics$(PPUEXT) : $(PROCINC)/intrinsics.pp $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) $(PROCINC)/intrinsics.pp +avrsim$(PPUEXT): $(ARCH)/avrsim.pp heapmgr$(PPUEXT) consoleio$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) + $(COMPILER) $(ARCH)/avrsim.pp diff --git a/rtl/embedded/Makefile.fpc b/rtl/embedded/Makefile.fpc index 294cb6dd06..8855bfb886 100644 --- a/rtl/embedded/Makefile.fpc +++ b/rtl/embedded/Makefile.fpc @@ -377,3 +377,8 @@ fpcylix$(PPUEXT) : fpcylix.pp cthreads$(PPUEXT) cwstring$(PPUEXT) dynlibs$(PPUEX intrinsics$(PPUEXT) : $(PROCINC)/intrinsics.pp $(SYSTEMUNIT)$(PPUEXT) $(COMPILER) $(PROCINC)/intrinsics.pp +# AVR specific units + +avrsim$(PPUEXT): $(ARCH)/avrsim.pp heapmgr$(PPUEXT) consoleio$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT) + $(COMPILER) $(ARCH)/avrsim.pp +