From a6cfaa996ac5cc6c9567352053bcd309c0022d93 Mon Sep 17 00:00:00 2001 From: florian Date: Fri, 3 Apr 2020 20:37:27 +0000 Subject: [PATCH] * few cleanups towards building the z80-embedded system unit git-svn-id: branches/z80@44550 - --- .gitattributes | 1 + rtl/inc/systemh.inc | 14 +++++--------- rtl/z80/cpuh.inc | 15 +++++++++++++++ 3 files changed, 21 insertions(+), 9 deletions(-) create mode 100644 rtl/z80/cpuh.inc diff --git a/.gitattributes b/.gitattributes index a21c363f21..c908dbd90d 100644 --- a/.gitattributes +++ b/.gitattributes @@ -12145,6 +12145,7 @@ rtl/xtensa/setjumph.inc svneol=native#text/plain rtl/xtensa/strings.inc svneol=native#text/plain rtl/xtensa/stringss.inc svneol=native#text/plain rtl/xtensa/xtensa.inc svneol=native#text/plain +rtl/z80/cpuh.inc svneol=native#text/plain rtl/z80/makefile.cpu svneol=native#text/plain rtl/z80/setjump.inc svneol=native#text/plain rtl/z80/setjumph.inc svneol=native#text/plain diff --git a/rtl/inc/systemh.inc b/rtl/inc/systemh.inc index 35f4e272d8..9e9b785ec3 100644 --- a/rtl/inc/systemh.inc +++ b/rtl/inc/systemh.inc @@ -363,11 +363,6 @@ Type {$endif} {$endif CPUXTENSA} -{$if not declared(FarPointer)} - FarPointer = Pointer; -{$endif} - - {$ifdef CPUZ80} {$define DEFAULT_SINGLE} @@ -384,14 +379,15 @@ Type ValReal = Real; {$endif} - { map comp to int64, but this doesn't mean we compile the comp support in! } - Comp = Int64; - PComp = ^Comp; - FarPointer = Pointer; {$endif CPUZ80} +{$if not declared(FarPointer)} + FarPointer = Pointer; +{$endif} + + {$ifdef CPU64} SizeInt = Int64; SizeUInt = QWord; diff --git a/rtl/z80/cpuh.inc b/rtl/z80/cpuh.inc new file mode 100644 index 0000000000..e3f3caf416 --- /dev/null +++ b/rtl/z80/cpuh.inc @@ -0,0 +1,15 @@ +{ + + This file is part of the Free Pascal run time library. + Copyright (c) 2016 by the Free Pascal development team. + + CPU specific system unit header file + + See the file COPYING.FPC, included in this distribution, + for details about the copyright. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + + **********************************************************************}